Fix 5k timing data

2 files changed, 88 insertions, 143 deletions

diff --git a/icefuzz/timings_up5k.txt b/icefuzz/timings_up5k.txt
index 9806216..3f64d60 100644
--- a/icefuzz/timings_up5k.txt
+++ b/icefuzz/timings_up5k.txt
@@ -1,17 +1,14 @@
 CELL CascadeBuf
-IOPATH  I  O  118.382:130.906:147.283  146.568:162.074:182.35
-IOPATH  I  O  210:210:210              260:260:260
+IOPATH  I  O  210:210:210  260:260:260
 
 CELL CascadeMux
 IOPATH  I  O  0:0:0  0:0:0
 
 CELL CEMux
-IOPATH  I  O  484.803:536.092:603.157  445.342:492.457:554.063
-IOPATH  I  O  530:530:530              370:370:370
+IOPATH  I  O  530:530:530  370:370:370
 
 CELL ClkMux
-IOPATH  I  O  248.039:274.28:308.592  186.029:205.71:231.444
-IOPATH  I  O  670:670:670             700:700:700
+IOPATH  I  O  670:670:670  700:700:700
 
 CELL DummyBuf
 IOPATH  I  O  0:0:0  0:0:0
@@ -20,12 +17,10 @@ CELL gio2CtrlBuf
 IOPATH  I  O  0:0:0  0:0:0
 
 CELL Glb2LocalMux
-IOPATH  I  O  360.783:398.952:448.861  287.499:317.915:357.686
-IOPATH  I  O  440:440:440              400:400:400
+IOPATH  I  O  440:440:440  400:400:400
 
 CELL GlobalMux
-IOPATH  I  O  124.019:137.14:154.296  62.0096:68.5699:77.148
-IOPATH  I  O  190:190:190             210:210:210
+IOPATH  I  O  190:190:190  210:210:210
 
 CELL ICE_CARRY_IN_MUX
 IOPATH  carryinitin  carryinitout  420:420:420  340:340:340
@@ -34,15 +29,13 @@ CELL ICE_GB
 IOPATH  USERSIGNALTOGLOBALBUFFER  GLOBALBUFFEROUTPUT  1200:1200:1200  600:600:600
 
 CELL InMux
-IOPATH  I  O  208.578:230.644:259.498  174.754:193.243:217.417
-IOPATH  I  O  500:500:500              380:380:380
+IOPATH  I  O  500:500:500  380:380:380
 
 CELL INV
 IOPATH  I  O  0:0:0  0:0:0
 
 CELL IO_PAD
 IOPATH  DIN         PACKAGEPIN  2291.5:2291.5:2291.5  2353.2:2353.2:2353.2
-IOPATH  OE          PACKAGEPIN  1902:1902:1902        1990:1990:1990
 IOPATH  OE          PACKAGEPIN  1973:1973:1973        1942:1942:1942
 IOPATH  OE          PACKAGEPIN  2291.5:2291.5:2291.5  2353.2:2353.2:2353.2
 IOPATH  PACKAGEPIN  DOUT        590:590:590           540:540:540
@@ -58,16 +51,13 @@ IOPATH  OE          PACKAGEPIN  0:0:0  0:0:0
 IOPATH  PACKAGEPIN  DOUT        0:0:0  0:0:0
 
 CELL IoInMux
-IOPATH  I  O  208.578:230.644:259.498  174.754:193.243:217.417
-IOPATH  I  O  500:500:500              380:380:380
+IOPATH  I  O  500:500:500  380:380:380
 
 CELL IoSpan4Mux
-IOPATH  I  O  231.127:255.579:287.552  259.313:286.747:322.619
-IOPATH  I  O  470:470:470              560:560:560
+IOPATH  I  O  470:470:470  560:560:560
 
 CELL LocalMux
-IOPATH  I  O  264.95:292.981:329.632  248.039:274.28:308.592
-IOPATH  I  O  830:830:830             580:580:580
+IOPATH  I  O  830:830:830  580:580:580
 
 CELL LogicCell40
 HOLD      negedge:ce   posedge:clk  0:0:0
@@ -98,39 +88,26 @@ SETUP     posedge:in1  posedge:clk  800:800:800
 SETUP     posedge:in2  posedge:clk  740:740:740
 SETUP     posedge:in3  posedge:clk  550:550:550
 SETUP     posedge:sr   posedge:clk  400:400:400
-IOPATH    carryin      carryout     101.47:112.205:126.242   84.5586:93.5045:105.202
-IOPATH    carryin      carryout     210:210:210              210:210:210
-IOPATH    in0          lcout        360.783:398.952:448.861  310.048:342.85:385.74
-IOPATH    in0          lcout        940:940:940              970:970:970
-IOPATH    in0          ltout        293.136:324.149:364.7    310.048:342.85:385.74
-IOPATH    in0          ltout        640:640:640              680:680:680
-IOPATH    in1          carryout     208.578:230.644:259.498  197.303:218.177:245.471
-IOPATH    in1          carryout     510:510:510              500:500:500
-IOPATH    in1          lcout        321.323:355.317:399.767  304.411:336.616:378.727
-IOPATH    in1          lcout        890:890:890              930:930:930
-IOPATH    in1          ltout        259.313:286.747:322.619  304.411:336.616:378.727
-IOPATH    in1          ltout        560:560:560              670:670:670
-IOPATH    in2          carryout     186.029:205.71:231.444   107.108:118.439:133.256
-IOPATH    in2          carryout     460:460:460              270:270:270
-IOPATH    in2          lcout        304.411:336.616:378.727  281.862:311.682:350.673
-IOPATH    in2          lcout        890:890:890              910:910:910
-IOPATH    in2          ltout        248.039:274.28:308.592   276.225:305.448:343.659
-IOPATH    in2          ltout        530:530:530              590:590:590
-IOPATH    in3          lcout        253.676:280.513:315.606  231.127:255.579:287.552
-IOPATH    in3          lcout        650:650:650              660:660:660
-IOPATH    in3          ltout        214.215:236.878:266.511  219.852:243.112:273.525
-IOPATH    in3          ltout        440:440:440              460:460:460
-IOPATH    posedge:clk  lcout        1050:1050:1050           1050:1050:1050
-IOPATH    sr           lcout        0:0:0                    1200:1200:1200
-IOPATH    sr           lcout        854.3:854.3:854.3        0:0:0
+IOPATH    carryin      carryout     210:210:210        210:210:210
+IOPATH    in0          lcout        940:940:940        970:970:970
+IOPATH    in0          ltout        640:640:640        680:680:680
+IOPATH    in1          carryout     510:510:510        500:500:500
+IOPATH    in1          lcout        890:890:890        930:930:930
+IOPATH    in1          ltout        560:560:560        670:670:670
+IOPATH    in2          carryout     460:460:460        270:270:270
+IOPATH    in2          lcout        890:890:890        910:910:910
+IOPATH    in2          ltout        530:530:530        590:590:590
+IOPATH    in3          lcout        650:650:650        660:660:660
+IOPATH    in3          ltout        440:440:440        460:460:460
+IOPATH    posedge:clk  lcout        1050:1050:1050     1050:1050:1050
+IOPATH    sr           lcout        0:0:0              1200:1200:1200
+IOPATH    sr           lcout        854.3:854.3:854.3  0:0:0
 
 CELL Odrv4
-IOPATH  I  O  281.862:311.682:350.673  298.774:330.382:371.713
-IOPATH  I  O  450:450:450              490:490:490
+IOPATH  I  O  450:450:450  490:490:490
 
 CELL Odrv12
-IOPATH  I  O  394.607:436.354:490.942  434.067:479.99:540.036
-IOPATH  I  O  810:810:810              930:930:930
+IOPATH  I  O  810:810:810  930:930:930
 
 CELL PLL40
 HOLD    negedge:SDI   negedge:SCLK  0:0:0
@@ -178,40 +155,32 @@ HOLD    posedge:DOUT1         negedge:OUTPUTCLK  0:0:0
 HOLD    posedge:OUTPUTENABLE  posedge:OUTPUTCLK  0:0:0
 HOLD    posedge:PADIN         negedge:INPUTCLK   0:0:0
 HOLD    posedge:PADIN         posedge:INPUTCLK   0:0:0
-SETUP   negedge:CLOCKENABLE   posedge:INPUTCLK   56.3724:62.3363:70.1346
 SETUP   negedge:CLOCKENABLE   posedge:INPUTCLK   141.1:141.1:141.1
 SETUP   negedge:CLOCKENABLE   posedge:OUTPUTCLK  141.1:141.1:141.1
 SETUP   negedge:DOUT0         posedge:OUTPUTCLK  141.1:141.1:141.1
 SETUP   negedge:DOUT1         negedge:OUTPUTCLK  141.1:141.1:141.1
 SETUP   negedge:OUTPUTENABLE  posedge:OUTPUTCLK  141.1:141.1:141.1
-SETUP   negedge:PADIN         negedge:INPUTCLK   1316.46:1455.74:1637.85
 SETUP   negedge:PADIN         negedge:INPUTCLK   3146.1:3146.1:3146.1
 SETUP   negedge:PADIN         posedge:INPUTCLK   3146.1:3146.1:3146.1
-SETUP   posedge:CLOCKENABLE   posedge:INPUTCLK   62.0096:68.5699:77.148
 SETUP   posedge:CLOCKENABLE   posedge:INPUTCLK   153.2:153.2:153.2
 SETUP   posedge:CLOCKENABLE   posedge:OUTPUTCLK  153.2:153.2:153.2
 SETUP   posedge:DOUT0         posedge:OUTPUTCLK  153.2:153.2:153.2
 SETUP   posedge:DOUT1         negedge:OUTPUTCLK  153.2:153.2:153.2
 SETUP   posedge:OUTPUTENABLE  posedge:OUTPUTCLK  153.2:153.2:153.2
-SETUP   posedge:PADIN         negedge:INPUTCLK   1322.1:1461.97:1644.87
 SETUP   posedge:PADIN         negedge:INPUTCLK   3158.2:3158.2:3158.2
 SETUP   posedge:PADIN         posedge:INPUTCLK   3158.2:3158.2:3158.2
-IOPATH  DOUT0                 PADOUT             570:570:570              580:580:580
-IOPATH  DOUT0                 PADOUT             1612.25:1782.82:2005.85  1798.28:1988.53:2237.29
-IOPATH  LATCHINPUTVALUE       DIN0               492.3:492.3:492.3        531.8:531.8:531.8
-IOPATH  negedge:INPUTCLK      DIN1               112.745:124.673:140.269  112.745:124.673:140.269
-IOPATH  negedge:INPUTCLK      DIN1               752:752:752              602:602:602
-IOPATH  negedge:OUTPUTCLK     PADOUT             1002:1002:1002           1159:1159:1159
-IOPATH  OUTPUTENABLE          PADOEN             344.3:344.3:344.3        403.3:403.3:403.3
-IOPATH  PADIN                 DIN0               370:370:370              370:370:370
-IOPATH  PADIN                 DIN0               496.077:548.56:617.184   372.058:411.42:462.888
-IOPATH  posedge:INPUTCLK      DIN0               759:759:759              667:667:667
-IOPATH  posedge:OUTPUTCLK     PADOEN             1067:1067:1067           1152:1152:1152
-IOPATH  posedge:OUTPUTCLK     PADOUT             1067:1067:1067           1152:1152:1152
+IOPATH  DOUT0                 PADOUT             570:570:570           580:580:580
+IOPATH  LATCHINPUTVALUE       DIN0               492.3:492.3:492.3     531.8:531.8:531.8
+IOPATH  negedge:INPUTCLK      DIN1               752:752:752           602:602:602
+IOPATH  negedge:OUTPUTCLK     PADOUT             1002:1002:1002        1159:1159:1159
+IOPATH  OUTPUTENABLE          PADOEN             344.3:344.3:344.3     403.3:403.3:403.3
+IOPATH  PADIN                 DIN0               370:370:370           370:370:370
+IOPATH  posedge:INPUTCLK      DIN0               759:759:759           667:667:667
+IOPATH  posedge:OUTPUTCLK     PADOEN             1067:1067:1067        1152:1152:1152
+IOPATH  posedge:OUTPUTCLK     PADOUT             1067:1067:1067        1152:1152:1152
 
 CELL PRE_IO_GBUF
-IOPATH  PADSIGNALTOGLOBALBUFFER  GLOBALBUFFEROUTPUT  1132.07:1251.84:1408.44  1008.05:1114.7:1254.15
-IOPATH  PADSIGNALTOGLOBALBUFFER  GLOBALBUFFEROUTPUT  3300:3300:3300           2250:2250:2250
+IOPATH  PADSIGNALTOGLOBALBUFFER  GLOBALBUFFEROUTPUT  3300:3300:3300  2250:2250:2250
 
 CELL SB_LEDDA_IP
 HOLD    negedge:LEDDADDR0  posedge:LEDDCLK  -118.471:-118.471:-118.471
@@ -3453,155 +3422,117 @@ IOPATH  posedge:SLEEP        DATAOUT[14]    830:830:830        830:830:830
 IOPATH  posedge:SLEEP        DATAOUT[15]    830:830:830        830:830:830
 
 CELL Sp12to4
-IOPATH  I  O  343.872:380.251:427.821  360.783:398.952:448.861
-IOPATH  I  O  450:450:450              640:640:640
+IOPATH  I  O  450:450:450  640:640:640
 
 CELL Span4Mux_h0
-IOPATH  I  O  118.382:130.906:147.283  112.745:124.673:140.269
-IOPATH  I  O  190:190:190              180:180:180
+IOPATH  I  O  190:190:190  180:180:180
 
 CELL Span4Mux_h1
-IOPATH  I  O  140.931:155.841:175.336  135.294:149.607:168.323
-IOPATH  I  O  230:230:230              220:220:220
+IOPATH  I  O  230:230:230  220:220:220
 
 CELL Span4Mux_h2
-IOPATH  I  O  163.48:180.775:203.39  163.48:180.775:203.39
-IOPATH  I  O  260:260:260            260:260:260
+IOPATH  I  O  260:260:260  260:260:260
 
 CELL Span4Mux_h3
-IOPATH  I  O  186.029:205.71:231.444  186.029:205.71:231.444
-IOPATH  I  O  300:300:300             300:300:300
+IOPATH  I  O  300:300:300  300:300:300
 
 CELL Span4Mux_h4
-IOPATH  I  O  242.401:268.046:301.579  253.676:280.513:315.606
-IOPATH  I  O  390:390:390              410:410:410
+IOPATH  I  O  390:390:390  410:410:410
 
 CELL Span4Mux_v0
-IOPATH  I  O  163.48:180.775:203.39  152.205:168.308:189.363
-IOPATH  I  O  260:260:260            260:260:260
+IOPATH  I  O  260:260:260  260:260:260
 
 CELL Span4Mux_v1
-IOPATH  I  O  163.48:180.775:203.39  157.843:174.542:196.377
-IOPATH  I  O  260:260:260            260:260:260
+IOPATH  I  O  260:260:260  260:260:260
 
 CELL Span4Mux_v2
-IOPATH  I  O  202.941:224.411:252.484  202.941:224.411:252.484
-IOPATH  I  O  330:330:330              340:340:340
+IOPATH  I  O  330:330:330  340:340:340
 
 CELL Span4Mux_v3
-IOPATH  I  O  253.676:280.513:315.606  270.588:299.214:336.646
-IOPATH  I  O  410:410:410              440:440:440
+IOPATH  I  O  410:410:410  440:440:440
 
 CELL Span4Mux_v4
-IOPATH  I  O  281.862:311.682:350.673  298.774:330.382:371.713
-IOPATH  I  O  450:450:450              490:490:490
+IOPATH  I  O  450:450:450  490:490:490
 
 CELL Span12Mux_h0
-IOPATH  I  O  112.745:124.673:140.269  118.382:130.906:147.283
-IOPATH  I  O  230:230:230              250:250:250
+IOPATH  I  O  230:230:230  250:250:250
 
 CELL Span12Mux_h1
-IOPATH  I  O  107.108:118.439:133.256  107.108:118.439:133.256
-IOPATH  I  O  220:220:220              230:230:230
+IOPATH  I  O  220:220:220  230:230:230
 
 CELL Span12Mux_h2
-IOPATH  I  O  129.657:143.374:161.31  135.294:149.607:168.323
-IOPATH  I  O  260:260:260             290:290:290
+IOPATH  I  O  260:260:260  290:290:290
 
 CELL Span12Mux_h3
-IOPATH  I  O  135.294:149.607:168.323  146.568:162.074:182.35
-IOPATH  I  O  280:280:280              310:310:310
+IOPATH  I  O  280:280:280  310:310:310
 
 CELL Span12Mux_h4
-IOPATH  I  O  157.843:174.542:196.377  174.754:193.243:217.417
-IOPATH  I  O  320:320:320              370:370:370
+IOPATH  I  O  320:320:320  370:370:370
 
 CELL Span12Mux_h5
-IOPATH  I  O  186.029:205.71:231.444  208.578:230.644:259.498
-IOPATH  I  O  380:380:380             440:440:440
+IOPATH  I  O  380:380:380  440:440:440
 
 CELL Span12Mux_h6
-IOPATH  I  O  202.941:224.411:252.484  225.49:249.345:280.538
-IOPATH  I  O  420:420:420              490:490:490
+IOPATH  I  O  420:420:420  490:490:490
 
 CELL Span12Mux_h7
-IOPATH  I  O  231.127:255.579:287.552  259.313:286.747:322.619
-IOPATH  I  O  470:470:470              560:560:560
+IOPATH  I  O  470:470:470  560:560:560
 
 CELL Span12Mux_h8
-IOPATH  I  O  276.225:305.448:343.659  310.048:342.85:385.74
-IOPATH  I  O  570:570:570              660:660:660
+IOPATH  I  O  570:570:570  660:660:660
 
 CELL Span12Mux_h9
-IOPATH  I  O  315.685:349.083:392.754  349.509:386.485:434.834
-IOPATH  I  O  650:650:650              740:740:740
+IOPATH  I  O  650:650:650  740:740:740
 
 CELL Span12Mux_h10
-IOPATH  I  O  343.872:380.251:427.821  377.695:417.653:469.902
-IOPATH  I  O  710:710:710              810:810:810
+IOPATH  I  O  710:710:710  810:810:810
 
 CELL Span12Mux_h11
-IOPATH  I  O  377.695:417.653:469.902  422.793:467.522:526.009
-IOPATH  I  O  780:780:780              900:900:900
+IOPATH  I  O  780:780:780  900:900:900
 
 CELL Span12Mux_h12
-IOPATH  I  O  394.607:436.354:490.942  434.067:479.99:540.036
-IOPATH  I  O  810:810:810              930:930:930
+IOPATH  I  O  810:810:810  930:930:930
 
 CELL Span12Mux_v0
-IOPATH  I  O  78.9214:87.2708:98.1884  84.5586:93.5045:105.202
-IOPATH  I  O  150:150:150              150:150:150
+IOPATH  I  O  150:150:150  150:150:150
 
 CELL Span12Mux_v1
-IOPATH  I  O  84.5586:93.5045:105.202  84.5586:93.5045:105.202
-IOPATH  I  O  150:150:150              160:160:160
+IOPATH  I  O  150:150:150  160:160:160
 
 CELL Span12Mux_v2
-IOPATH  I  O  112.745:124.673:140.269  124.019:137.14:154.296
-IOPATH  I  O  210:210:210              230:230:230
+IOPATH  I  O  210:210:210  230:230:230
 
 CELL Span12Mux_v3
-IOPATH  I  O  118.382:130.906:147.283  135.294:149.607:168.323
-IOPATH  I  O  230:230:230              250:250:250
+IOPATH  I  O  230:230:230  250:250:250
 
 CELL Span12Mux_v4
-IOPATH  I  O  146.568:162.074:182.35  169.117:187.009:210.404
-IOPATH  I  O  280:280:280             310:310:310
+IOPATH  I  O  280:280:280  310:310:310
 
 CELL Span12Mux_v5
-IOPATH  I  O  191.666:211.943:238.458  214.215:236.878:266.511
-IOPATH  I  O  350:350:350              400:400:400
+IOPATH  I  O  350:350:350  400:400:400
 
 CELL Span12Mux_v6
-IOPATH  I  O  208.578:230.644:259.498  231.127:255.579:287.552
-IOPATH  I  O  390:390:390              440:440:440
+IOPATH  I  O  390:390:390  440:440:440
 
 CELL Span12Mux_v7
-IOPATH  I  O  225.49:249.345:280.538  253.676:280.513:315.606
-IOPATH  I  O  420:420:420             480:480:480
+IOPATH  I  O  420:420:420  480:480:480
 
 CELL Span12Mux_v8
-IOPATH  I  O  287.499:317.915:357.686  315.685:349.083:392.754
-IOPATH  I  O  540:540:540              600:600:600
+IOPATH  I  O  540:540:540  600:600:600
 
 CELL Span12Mux_v9
-IOPATH  I  O  304.411:336.616:378.727  338.234:374.018:420.807
-IOPATH  I  O  570:570:570              630:630:630
+IOPATH  I  O  570:570:570  630:630:630
 
 CELL Span12Mux_v10
-IOPATH  I  O  315.685:349.083:392.754  349.509:386.485:434.834
-IOPATH  I  O  590:590:590              660:660:660
+IOPATH  I  O  590:590:590  660:660:660
 
 CELL Span12Mux_v11
-IOPATH  I  O  332.597:367.784:413.794  366.421:405.186:455.875
-IOPATH  I  O  610:610:610              690:690:690
+IOPATH  I  O  610:610:610  690:690:690
 
 CELL Span12Mux_v12
-IOPATH  I  O  394.607:436.354:490.942  434.067:479.99:540.036
-IOPATH  I  O  740:740:740              810:810:810
-IOPATH  I  O  810:810:810              930:930:930
+IOPATH  I  O  740:740:740  810:810:810
+IOPATH  I  O  810:810:810  930:930:930
 
 CELL SRMux
-IOPATH  I  O  372.058:411.42:462.888  287.499:317.915:357.686
-IOPATH  I  O  480:480:480             400:400:400
+IOPATH  I  O  480:480:480  400:400:400
 
diff --git a/icefuzz/tmedges.txt b/icefuzz/tmedges.txt
index 1949507..8ed0532 100644
--- a/icefuzz/tmedges.txt
+++ b/icefuzz/tmedges.txt
@@ -54,6 +54,7 @@ DummyBuf.O SB_LEDDA_IP.LEDDDAT6
 DummyBuf.O SB_LEDDA_IP.LEDDDAT7
 DummyBuf.O SB_LEDDA_IP.LEDDDEN
 DummyBuf.O SB_LEDDA_IP.LEDDEXE
+GND.Y INV.I
 GND.Y LogicCell40.carryin
 GND.Y LogicCell40.clk
 GND.Y LogicCell40.in0
@@ -63,6 +64,7 @@ GND.Y LogicCell40.in3
 GND.Y LogicCell40.sr
 GND.Y PRE_IO.DOUT0
 GND.Y SB_MAC16.CLK
+GND.Y SB_RAM40_4K.RCLK
 GND.Y SB_RAM40_4K.WCLK
 Glb2LocalMux.O LocalMux.I
 GlobalMux.O CEMux.I
@@ -426,6 +428,7 @@ SB_LEDDA_IP.PWMOUT2 DummyBuf.I
 SB_LFOSC.CLKLF GlobalMux.I
 SB_LFOSC.CLKLF Odrv12.I
 SB_MAC16.ACCUMCO SB_MAC16.ACCUMCI
+SB_MAC16.CO LocalMux.I
 SB_MAC16.CO Odrv12.I
 SB_MAC16.CO Odrv4.I
 SB_MAC16.O[0] LocalMux.I
@@ -455,6 +458,7 @@ SB_MAC16.O[16] Odrv4.I
 SB_MAC16.O[17] LocalMux.I
 SB_MAC16.O[17] Odrv12.I
 SB_MAC16.O[17] Odrv4.I
+SB_MAC16.O[18] LocalMux.I
 SB_MAC16.O[18] Odrv12.I
 SB_MAC16.O[18] Odrv4.I
 SB_MAC16.O[19] Odrv12.I
@@ -462,6 +466,7 @@ SB_MAC16.O[19] Odrv4.I
 SB_MAC16.O[1] LocalMux.I
 SB_MAC16.O[1] Odrv12.I
 SB_MAC16.O[1] Odrv4.I
+SB_MAC16.O[20] LocalMux.I
 SB_MAC16.O[20] Odrv12.I
 SB_MAC16.O[20] Odrv4.I
 SB_MAC16.O[21] LocalMux.I
@@ -480,6 +485,7 @@ SB_MAC16.O[25] Odrv12.I
 SB_MAC16.O[25] Odrv4.I
 SB_MAC16.O[26] Odrv12.I
 SB_MAC16.O[26] Odrv4.I
+SB_MAC16.O[27] LocalMux.I
 SB_MAC16.O[27] Odrv12.I
 SB_MAC16.O[27] Odrv4.I
 SB_MAC16.O[28] Odrv12.I
@@ -489,6 +495,7 @@ SB_MAC16.O[29] Odrv4.I
 SB_MAC16.O[2] LocalMux.I
 SB_MAC16.O[2] Odrv12.I
 SB_MAC16.O[2] Odrv4.I
+SB_MAC16.O[30] LocalMux.I
 SB_MAC16.O[30] Odrv12.I
 SB_MAC16.O[30] Odrv4.I
 SB_MAC16.O[31] LocalMux.I
@@ -703,8 +710,11 @@ Span12Mux_s2_h.O Span12Mux_v.I
 Span12Mux_s2_v.O LocalMux.I
 Span12Mux_s2_v.O Sp12to4.I
 Span12Mux_s2_v.O Span12Mux_h.I
+Span12Mux_s2_v.O Span12Mux_s11_h.I
 Span12Mux_s2_v.O Span12Mux_s2_h.I
 Span12Mux_s2_v.O Span12Mux_s5_h.I
+Span12Mux_s2_v.O Span12Mux_s7_h.I
+Span12Mux_s2_v.O Span12Mux_s8_h.I
 Span12Mux_s2_v.O Span12Mux_s9_h.I
 Span12Mux_s2_v.O Span12Mux_v.I
 Span12Mux_s3_h.O LocalMux.I
@@ -724,7 +734,9 @@ Span12Mux_s3_h.O Span12Mux_v.I
 Span12Mux_s3_v.O LocalMux.I
 Span12Mux_s3_v.O Sp12to4.I
 Span12Mux_s3_v.O Span12Mux_h.I
+Span12Mux_s3_v.O Span12Mux_s7_h.I
 Span12Mux_s3_v.O Span12Mux_s8_h.I
+Span12Mux_s3_v.O Span12Mux_s9_h.I
 Span12Mux_s3_v.O Span12Mux_v.I
 Span12Mux_s4_h.O LocalMux.I
 Span12Mux_s4_h.O Sp12to4.I
@@ -783,6 +795,7 @@ Span12Mux_s6_v.O Sp12to4.I
 Span12Mux_s6_v.O Span12Mux_h.I
 Span12Mux_s6_v.O Span12Mux_s10_h.I
 Span12Mux_s6_v.O Span12Mux_s5_h.I
+Span12Mux_s6_v.O Span12Mux_s6_h.I
 Span12Mux_s6_v.O Span12Mux_s7_h.I
 Span12Mux_s6_v.O Span12Mux_s8_h.I
 Span12Mux_s6_v.O Span12Mux_s9_h.I
@@ -855,6 +868,7 @@ Span12Mux_s9_h.O Span12Mux_v.I
 Span12Mux_s9_v.O LocalMux.I
 Span12Mux_s9_v.O Sp12to4.I
 Span12Mux_s9_v.O Span12Mux_h.I
+Span12Mux_s9_v.O Span12Mux_s10_h.I
 Span12Mux_s9_v.O Span12Mux_s11_h.I
 Span12Mux_s9_v.O Span12Mux_s5_h.I
 Span12Mux_s9_v.O Span12Mux_s6_v.I