improved performance: 7ps/bit settling time, 20ghz counting
authorAdam Megacz <adam@megacz.com>
Mon, 21 Sep 2009 02:46:51 +0000 (19:46 -0700)
committerAdam Megacz <adam@megacz.com>
Mon, 21 Sep 2009 02:46:51 +0000 (19:46 -0700)
chips/omegaCounter/40nm/electric/omegaCounter.jelib

index b90fbd6..58c2de3 100644 (file)
@@ -1152,7 +1152,7 @@ Evdd_5||D5G2;|pin@70||P
 X
 
 # Cell nand2nand2;1{sch}
-Cnand2nand2;1{sch}||schematic|1247526811643|1253480812581||ATTR_LEGATE(D5G1;HNPX-24.25;Y-4;)I1|ATTR_X(D5G1;HNOJPX-32.75;Y13;)SLE.getdrive()|ATTR_su(D5G1;HNPX-15.75;Y-2;)I-1
+Cnand2nand2;1{sch}||schematic|1247526811643|1253499567425||ATTR_LEGATE(D5G1;HNPX-38.75;Y15;)I1|ATTR_X(D5G1;HNOJPX-32.75;Y13;)SLE.getdrive()|ATTR_su(D5G1;HNPX-40.25;Y17.5;)I-1
 IredFive:NMOS;1{ic}|NMOS@0||2.75|-3.25|YRR||D5G4;|ATTR_X(D5G1.5;NOLPX-1.75;Y-3;)S2*@X
 IredFive:NMOS;1{ic}|NMOS@1||-2.5|-3.25|XYRR||D5G4;|ATTR_X(D5G1.5;NOLPX-2;Y-3;)S2*@X
 Ngeneric:Facet-Center|art@0||0|0||||AV
@@ -1162,7 +1162,6 @@ NOff-Page|conn@8||0|15.25|||YRRR|
 NOff-Page|conn@15||17.75|-17.5|||R|
 Inand2nand2;4{ic}|fire@0||16|13.75|||D5G4;
 IredFive:nms1;2{ic}|nms1@6||0|-13.5|X||D5G4;|ATTR_X(D5FLeave alone;G1.5;NOLPX3.5;Y0.25;)S2*@X
-NWire_Pin|pin@87||-6.25|0.5|||Y|
 NWire_Pin|pin@90||2.75|0.5|||Y|
 NWire_Pin|pin@103||0|0.5|||Y|
 NWire_Pin|pin@110||-2.5|0.5||||
@@ -1172,19 +1171,15 @@ NWire_Pin|pin@116||2.75|-9.75||||
 NWire_Pin|pin@119||17.75|4.25||||
 NWire_Pin|pin@120||17.75|-13.5||||
 NWire_Pin|pin@124||0|-9.75||||
-NWire_Pin|pin@125||-11.25|4.25||||
-NWire_Pin|pin@127||11.25|8.25||||
 NWire_Pin|pin@128||11.25|-3.25||||
 NWire_Pin|pin@129||7|0.5||||
 Ngeneric:Invisible-Pin|pin@130||-1.25|23.5|||||ART_message(D5G3;)Snand2nand2
-Ngeneric:Invisible-Pin|pin@132||-34.5|5.5|||||ART_message(D5G1;)S["when pulling up (done firing),",inb/c and ina do not always work together]
+Ngeneric:Invisible-Pin|pin@133||-50|7|||||ART_message(D6G1;)S["When firing (pulling \"out\" low):",- we always have one of inb or inc working (ie high),- we always have ina working (ie high),"therefore, the pull-down network is sized such that",ina plus either inb or inc gives a total net drive of X=15,(via two X=30 in sieres)]
+Ngeneric:Invisible-Pin|pin@134||-52|-2.5|||||ART_message(D6G1;)S["When unfiring (pulling \"out\" back high):",- we always have ina working (ie low),"- in the case where the left side is transitioning Two->One or Done->Done,",we get no help from the inb/inc stack.  Unfortunately in the Two->One case,"we really need the fire signal to go away promptly, so we must size these",transistors in such a way that the ina pmos is able to clear the state all by itself.]
 IredFive:pms1;2{ic}|pms1@5||7|4.25|X||D5G4;|ATTR_X(D5FLeave alone;G1.5;NOLPX3.5;)S@X
-IredFive:pms2;1{ic}|pms2@0||-6.25|8.25|X||D5G4;|ATTR_X(D5FLeave alone;G1.5;NOLPX4.75;Y1;)S@X
-Awire|net@213|||900|pms2@0|d|-6.25|2.25|pin@87||-6.25|0.5
 Awire|net@228|||2700|NMOS@0|d|2.75|-1.25|pin@90||2.75|0.5
 Awire|net@256|||1800|pin@103||0|0.5|pin@90||2.75|0.5
 Awire|net@257|||900|conn@8|a|0|13.25|pin@103||0|0.5
-Awire|net@298|||1800|pin@87||-6.25|0.5|pin@110||-2.5|0.5
 Awire|net@299|||1800|pin@110||-2.5|0.5|pin@103||0|0.5
 Awire|net@300|||2700|NMOS@1|d|-2.5|-1.25|pin@110||-2.5|0.5
 Awire|net@303|||0|NMOS@1|g|-5.5|-3.25|pin@112||-11.25|-3.25
@@ -1195,11 +1190,7 @@ Awire|net@326|||0|pin@120||17.75|-13.5|nms1@6|g|3|-13.5
 Awire|net@335|||1800|pin@115||-2.5|-9.75|pin@124||0|-9.75
 Awire|net@336|||1800|pin@124||0|-9.75|pin@116||2.75|-9.75
 Awire|net@337|||2700|nms1@6|d|0|-11.5|pin@124||0|-9.75
-Awire|net@342|||0|pms2@0|g2|-9.25|4.25|pin@125||-11.25|4.25
-Awire|net@344|||2700|pin@112||-11.25|-3.25|pin@125||-11.25|4.25
-Awire|net@348|||1800|pms2@0|g|-3.25|8.25|pin@127||11.25|8.25
 Awire|net@349|||1800|NMOS@0|g|5.75|-3.25|pin@128||11.25|-3.25
-Awire|net@351|||900|pin@127||11.25|8.25|pin@128||11.25|-3.25
 Awire|net@353|||1800|pin@90||2.75|0.5|pin@129||7|0.5
 Awire|net@354|||900|pms1@5|d|7|2.25|pin@129||7|0.5
 Awire|net@355|||2700|conn@3|y|-11.25|-15.5|pin@112||-11.25|-3.25
@@ -1207,9 +1198,9 @@ Awire|net@356|||2700|conn@2|y|11.25|-15.5|pin@128||11.25|-3.25
 Awire|net@357|||900|pin@119||17.75|4.25|pin@120||17.75|-13.5
 Awire|net@358|||2700|conn@15|y|17.75|-15.5|pin@120||17.75|-13.5
 EinRight|ina|D5G2;X-1.75;|conn@15|a|I|ATTR_le(D5G1;NY-1.5;)S1.333
-EMSN[ZeroOrDone]|inb|D4G2;X-0.5;|conn@2|a|I|ATTR_le(D5G1;NX-0.5;Y-3;)S2
-EMSN[ZeroOrTwo]|inc|D6G2;X-7;|conn@3|y|I|ATTR_le(D5G1;NX-1.5;Y-1;)S2
-Efire[1]|out|D6G2;X4.5;|conn@8|a|O|ATTR_le(D5G1;NY3;)S3.333
+EMSN[ZeroOrDone]|inb|D4G2;X-0.5;|conn@2|a|I|ATTR_le(D5G1;NX-0.5;Y-3;)S0.666
+EMSN[ZeroOrTwo]|inc|D6G2;X-7;|conn@3|y|I|ATTR_le(D5G1;NX-1.5;Y-1;)S0.666
+Efire[1]|out|D6G2;X4.5;|conn@8|a|O|ATTR_le(D5G1;NY3;)S2
 X
 
 # Cell newCell;1{ic}
@@ -1252,7 +1243,7 @@ EdisableLO_1|valLO|D5G2;|pin@43||I
 X
 
 # Cell newCell;1{sch}
-CnewCell;1{sch}||schematic|1242942044308|1253489001185||LEDRIVE_buf@0()F4.030023|LEDRIVE_fire@0()F14.772854|LEDRIVE_inv@62()F4.205448|LEDRIVE_inv@63()F9.042407|LEDRIVE_inv@64()F8.013138|LEDRIVE_nor3@0()F4.5933|LEDRIVE_pred@1()F25.599825|LEDRIVE_predCond@1()F25.599825|LEDRIVE_predCond@2()F26.838697|LEDRIVE_succCond@3()F26.838697
+CnewCell;1{sch}||schematic|1242942044308|1253500627821||LEDRIVE_fire@0()F13.074144|LEDRIVE_inv@63()F8.063929|LEDRIVE_inv@64()F6.9886765|LEDRIVE_nor3@0()F4.111517|LEDRIVE_pred@1()F22.301716|LEDRIVE_predCond@1()F22.301716|LEDRIVE_predCond@2()F23.221292|LEDRIVE_succCond@3()F23.221292
 IpurpleFive:LEsettings;1{ic}|LEsettin@1||52|25|||D5G4;|ATTR_LESETTINGS(D5G1;NPY-1.5;)I1|ATTR_alpha(D5G1;NPY0.5;)S0|ATTR_epsilon(D5G1;NPY3.5;)F0.0010|ATTR_gate_cap(D5G1;NPY1.5;)F0.19|ATTR_keeper_ratio(D5G1;NPY-0.5;)F0.1|ATTR_max_iter(D5G1;NPY2.5;)I30|ATTR_su(D5G1;NPY5.5;)S4.7|ATTR_wire_ratio(D5G1;NPY4.5;)F0.16|ATTR_x1inverter_length(D5G1;NPY-3.5;)F2.0|ATTR_x1inverter_nwidth(D5G1;NPY-4.5;)F3.0|ATTR_x1inverter_pwidth(D5G1;NPY-5.5;)F6.0
 Ngeneric:Facet-Center|art@0||0|0||||AV
 NOff-Page|conn@0||58.5|-7.5|||Y|
@@ -1262,9 +1253,9 @@ NOff-Page|conn@3||58.5|-37.5|||Y|
 NOff-Page|conn@9||38|-49|||XYRR|
 NOff-Page|conn@10||38|-52.5|||XYRR|
 NOff-Page|conn@11||38|-55.5|||XYRR|
-Inand2nand2;4{ic}|fire@0||7.75|22.75|||D5G4;|ATTR_X(D5G3;NOJPX-12;Y3;)S15
-IpurpleFive:inv;1{ic}|inv@63||16.5|34.75|YRRR||D5G4;|ATTR_LEGATE(P)I1|ATTR_LEPARALLGRP(P)I-1|ATTR_X(D5G3;NOJPRRRX-1;Y13;)S9|ATTR_drive0(P)Sstrong0|ATTR_drive1(P)Sstrong1|ATTR_su(P)I-1
-IpurpleFive:inv;1{ic}|inv@64||24.5|-30.5|||D5G4;|ATTR_LEGATE(P)I1|ATTR_LEPARALLGRP(P)I-1|ATTR_X(D5G3;NOJPX4;Y6;)S6|ATTR_drive0(P)Sstrong0|ATTR_drive1(P)Sstrong1|ATTR_su(P)I-1
+Inand2nand2;4{ic}|fire@0||7.75|22.75|||D5G4;|ATTR_X(D5G3;NOJPX-12;Y3;)S12
+IpurpleFive:inv;1{ic}|inv@63||16.5|34.75|YRRR||D5G4;|ATTR_LEGATE(P)I1|ATTR_LEPARALLGRP(P)I-1|ATTR_X(D5G3;NOJPRRRX-1;Y13;)S8|ATTR_drive0(P)Sstrong0|ATTR_drive1(P)Sstrong1|ATTR_su(P)I-1
+IpurpleFive:inv;1{ic}|inv@64||24.5|-30.5|||D5G4;|ATTR_LEGATE(P)I1|ATTR_LEPARALLGRP(P)I-1|ATTR_X(D5G3;NOJPX4;Y6;)S8|ATTR_drive0(P)Sstrong0|ATTR_drive1(P)Sstrong1|ATTR_su(P)I-1
 IredFive:inv;1{ic}|inv@68||53|4|RR||D5G4;|ATTR_X(D5FLeave alone;G1.5;NOLPX-1;Y3.5;)S2|ATTR_drive0(P)Sstrong0|ATTR_drive1(P)Sstrong1
 IredFive:inv;1{ic}|inv@70||59|4|RR||D5G4;|ATTR_X(D5FLeave alone;G1.5;NOLPX-1;Y3.5;)S1|ATTR_drive0(P)Sstrong0|ATTR_drive1(P)Sstrong1
 IredFive:inv;1{ic}|inv@73||41.5|4|RR||D5G4;|ATTR_X(D5FLeave alone;G1.5;NOLPX-1;Y3.5;)S8|ATTR_drive0(P)Sstrong0|ATTR_drive1(P)Sstrong1
@@ -1273,8 +1264,8 @@ IredFive:inv;1{ic}|inv@75||-6|-15.5|RR||D5G4;|ATTR_X(D5FLeave alone;G3;NOLPX-0.5
 IredFive:invI;2{ic}|invI@0||-12.5|-15.5|RR||D5G4;|ATTR_X(D5FLeave alone;G3;NOLPX1.25;Y3.5;)S4|ATTR_drive0(P)Sstrong0|ATTR_drive1(P)Sstrong1
 IredFive:invLT;1{ic}|invLT@0||-11|-29.5|RR||D5G4;|ATTR_X(D5G3;NOJPX-5.5;Y4;)S1|ATTR_drive0(P)Sstrong0|ATTR_drive1(P)Sstrong1|ATTR_LEGATE()I1|ATTR_LEPARALLGRP()I-1|ATTR_su()I-1
 InewCell;1{ic}|newCell@0||-40|53.25|||D5G4;
-IredFive:nms1;2{ic}|nms1@0||81|-14.5|||D5G4;|ATTR_X(D5FLeave alone;G1.5;NPX4;Y0.75;)S10
-IredFive:nms2b;1{ic}|nms2b@0||110.5|-45|X||D5G4;|ATTR_X(D5FLeave alone;G1.5;NPX6;Y-3.5;)S.5
+IredFive:nms1;2{ic}|nms1@0||81|-14.5|||D5G4;|ATTR_X(D5FLeave alone;G1.5;NPX4;Y0.75;)S6
+IredFive:nms2b;1{ic}|nms2b@0||110.5|-45|X||D5G4;|ATTR_X(D5FLeave alone;G1.5;NPX6;Y-3.5;)S6
 Inor3;1{ic}|nor3@0||20|11.75|X||D5G4;|ATTR_X(D5G3;NOJPX-11.5;Y6.5;)S4
 Ngeneric:Invisible-Pin|pin@6||16.75|64.5|||||ART_message(D5G15;)SnewCell
 Ngeneric:Invisible-Pin|pin@149||16.25|56|||||ART_message(D5G3;)Sam 13 Sep 2009
@@ -1351,11 +1342,11 @@ NWire_Pin|pin@1061||110.5|-37.5||||
 NWire_Pin|pin@1062||75.5|4||||
 NWire_Pin|pin@1063||18|-37.5||||
 NWire_Pin|pin@1066||-17.5|-15.5||||
-IredFive:pms2;1{ic}|pms2@0||110.5|-29.5|X||D5G4;|ATTR_X(D5FLeave alone;G1.5;NOLPX8.75;Y3.25;)S.5
-Ipred;1{ic}|pred@1||41|-17|||D5G4;|ATTR_X(D5G3;NOJPX-5.5;Y4.5;)S24
-IpredCond;1{ic}|predCond@1||-30|-14.5|RR||D5G4;|ATTR_X(D5G3;NOJPX-2;Y-4.5;)S24
-IpredCond;1{ic}|predCond@2||-30|-30.5|YRR||D5G4;|ATTR_X(D5G3;NOJPX-4;Y-4;)S24
-IsuccCond;1{ic}|succCond@3||41.5|-29.5|||D5G4;|ATTR_X(D5G3;NOJPX-4;Y-4.5;)S24
+IredFive:pms2;1{ic}|pms2@0||110.5|-29.5|X||D5G4;|ATTR_X(D5FLeave alone;G1.5;NOLPX8.75;Y3.25;)S6
+Ipred;1{ic}|pred@1||41|-17|||D5G4;|ATTR_X(D5G3;NOJPX-5.5;Y4.5;)S22
+IpredCond;1{ic}|predCond@1||-30|-14.5|RR||D5G4;|ATTR_X(D5G3;NOJPX-2;Y-4.5;)S22
+IpredCond;1{ic}|predCond@2||-30|-30.5|YRR||D5G4;|ATTR_X(D5G3;NOJPX-4;Y-4;)S22
+IsuccCond;1{ic}|succCond@3||41.5|-29.5|||D5G4;|ATTR_X(D5G3;NOJPX-4;Y-4.5;)S22
 Iorange40nm:wire40;1{ic}|wire40@0||-9.5|43.5|||D5G4;|ATTR_L(D5FLeave alone;G1;OLPUD)S400|ATTR_LEWIRE(P)I1|ATTR_layer(D5FLeave alone;G1;NOLPY-1;)S2|ATTR_width(D5FLeave alone;G1;NOLPY-2;)S7
 Iorange40nm:wire40;1{ic}|wire40@1||-69|2|||D5G4;|ATTR_L(D5FLeave alone;G3;OLPUDY2.5;)S4000|ATTR_LEWIRE(P)I1|ATTR_layer(D5FLeave alone;G1;NOLPY-1;)S2|ATTR_width(D5FLeave alone;G1;NOLPY-2;)S7
 Iorange40nm:wire40;1{ic}|wire40@2||-69|-41|||D5G4;|ATTR_L(D5FLeave alone;G3;OLPUDY-5;)S4000|ATTR_LEWIRE(P)I1|ATTR_layer(D5FLeave alone;G1;NOLPY-1;)S2|ATTR_width(D5FLeave alone;G1;NOLPY-2;)S7
@@ -1658,7 +1649,7 @@ Eout||D5G2;Y1.5;|pin@22||O
 X
 
 # Cell nor3;1{ic}
-Cnor3;1{ic}||artwork|1248842297142|1253147654971|E|ATTR_LEGATE(D5G1;HNPX-8;Y-5;)I1|ATTR_LEPARALLGRP(D5G1;HNPX-7.5;Y-6;)I-1|ATTR_X(D5G1;HNOJPX-4;Y-7;)SLE.getdrive()|ATTR_su(D5G1;HNPX-9;Y-4;)I-1
+Cnor3;1{ic}||artwork|1248842297142|1253499814027|E|ATTR_LEGATE(D5G1;HNPX-8;Y-5;)I1|ATTR_LEPARALLGRP(D5G1;HNPX-7.5;Y-6;)I-1|ATTR_X(D5G1;HNOJPX-4;Y-7;)SLE.getdrive()|ATTR_su(D5G1;HNPX-9;Y-4;)I-1
 Ngeneric:Facet-Center|art@0||0|0||||AV
 NThick-Circle|art@8||0|-0.25|6|6|||ART_color()I-1174339839|ART_degrees()F[0.0,3.1415927]
 NThick-Circle|art@9||-2|-2|1|1|R||ART_color()I-1174339839
@@ -1681,12 +1672,10 @@ Nschematic:Bus_Pin|pin@31||0|-3.5|-2|-2|R|
 Nschematic:Bus_Pin|pin@32||0|3.75|-2|-2|R|
 NPin|pin@33||-3|-1.5|1|1|R||ART_color()I-1174339839
 NPin|pin@34||3|-1.5|1|1|R||ART_color()I-1174339839
-NPin|pin@35||3|-0.25|1|1|R||ART_color()I-1174339839
-NPin|pin@36||1.75|-1.5|1|1|R||ART_color()I-1174339839
 NPin|pin@37||3|-0.25|1|1|R||ART_color()I-1174339839
+Ngeneric:Invisible-Pin|pin@38||-2|-1|||||ART_message(D5G3;)S*
 AThicker|net@8|||FS900|pin@24||0|-2.5|pin@23||0|-3.5|ART_color()I-1174339839
 AThicker|net@9|||FS900|pin@25||-2|-2.5|pin@26||-2|-3.5|ART_color()I-1174339839
-AThicker|net@10|||FS450|pin@35||3|-0.25|pin@36||1.75|-1.5|ART_color()I-1174339839
 AThicker|net@11|||FS900|pin@28||2|-2.5|pin@29||2|-3.5|ART_color()I-1174339839
 AThicker|net@12|||FS900|pin@30||-3|-0.25|pin@33||-3|-1.5|ART_color()I-1174339839
 AThicker|net@13|||FS0|pin@34||3|-1.5|pin@33||-3|-1.5|ART_color()I-1174339839
@@ -1855,10 +1844,10 @@ Evdd_5||D5G2;|pin@146||P
 X
 
 # Cell nor3;1{sch}
-Cnor3;1{sch}||schematic|1248841634466|1253485185675||ATTR_LEGATE(D5G1;HNPX3;Y21.5;)I1|ATTR_LEPARALLGRP(D5G1;HNPX3;Y19.5;)I-1|ATTR_X(D5G1;HNOJPX3;Y22.75;)SLE.getdrive()|ATTR_su(D5G1;HNPX3;Y20.5;)I-1
+Cnor3;1{sch}||schematic|1248841634466|1253500525323||ATTR_LEGATE(D5G1;HNPX3;Y21.5;)I1|ATTR_LEPARALLGRP(D5G1;HNPX3;Y19.5;)I-1|ATTR_X(D5G1;HNOJPX3;Y22.75;)SLE.getdrive()|ATTR_su(D5G1;HNPX3;Y20.5;)I-1
 Ngeneric:Facet-Center|art@0||0|0||||AV
-NOff-Page|conn@0||15.5|4.25|||RR|
-NOff-Page|conn@1||15.5|8.25|||RR|
+NOff-Page|conn@0||15.5|8.25|||RR|
+NOff-Page|conn@1||15.5|4.25|||RR|
 NOff-Page|conn@2||15.5|12.25|||RR|
 NOff-Page|conn@3||-34.75|-0.25|||RR|
 IredFive:nms1;2{ic}|nms1@0||-16|-13.75|X||D5G4;|ATTR_X(D5FLeave alone;G1.5;NOJPX0.5;Y-3.75;)S@X
@@ -1866,7 +1855,6 @@ IredFive:nms1;2{ic}|nms1@1||-8|-13.75|X||D5G4;|ATTR_X(D5FLeave alone;G1.5;NOJPX0
 IredFive:nms1;2{ic}|nms1@2||0|-13.75|X||D5G4;|ATTR_X(D5FLeave alone;G1.5;NOJPX0.75;Y-3.75;)S@X
 Inor3;1{ic}|nor3@0||22.5|19.75|||D5G4;
 NWire_Pin|pin@1||-13|8.25|||Y|
-NWire_Pin|pin@2||5.5|4.25|||Y|
 NWire_Pin|pin@3||-8|-0.25|||Y|
 NWire_Pin|pin@4||-16|-0.25|||Y|
 NWire_Pin|pin@5||0|-0.25|||Y|
@@ -1875,14 +1863,20 @@ NWire_Pin|pin@7||-16|-0.25|||Y|
 NWire_Pin|pin@8||-10.5|-13.75|||Y|
 NWire_Pin|pin@9||-10.5|12.25|||Y|
 NWire_Pin|pin@10||-3|-13.75|||Y|
-NWire_Pin|pin@11||-3|8.25|||Y|
-NWire_Pin|pin@12||5.5|-13.75|||Y|
 NWire_Pin|pin@13||-19|12.25||||
 NWire_Pin|pin@14||-22.75|8.5||||
 NWire_Pin|pin@16||-26.5|8.5||||
 NWire_Pin|pin@17||-23|12.25||||
 NWire_Pin|pin@18||-19|8.25||||
 NWire_Pin|pin@19||-29.5|-0.25||||
+NWire_Pin|pin@20||-27.25|4||||
+NWire_Pin|pin@21||-32.5|4||||
+NWire_Pin|pin@22||-22.25|7.5||||
+NWire_Pin|pin@23||-22.25|12.25||||
+NWire_Pin|pin@24||10|8.25||||
+NWire_Pin|pin@25||-3|8.25||||
+NWire_Pin|pin@26||6|-13.75||||
+NWire_Pin|pin@27||6|4.25||||
 IredFive:pms3a;1{ic}|pms3a@0||-16|12.25|||D5G4;|ATTR_X(D5G1.5;NOJPX-0.25;Y8;)S0.5*@X
 IredFive:pms3a;1{ic}|pms3a@1||-29.5|12.25|||D5G4;|ATTR_X(D5G1.5;NOJPX-0.25;Y8;)S0.5*@X
 Awire|net@0|||1800|nms1@0|g|-13|-13.75|pin@8||-10.5|-13.75
@@ -1890,10 +1884,6 @@ Awire|net@1|||0|pin@9||-10.5|12.25|pms3a@0|g|-13|12.25
 Awire|net@2|||900|pin@1||-13|8.25|pms3a@0|g2|-13|8.25
 Awire|net@3|||2700|pin@8||-10.5|-13.75|pin@9||-10.5|12.25
 Awire|net@4|||1800|nms1@1|g|-5|-13.75|pin@10||-3|-13.75
-Awire|net@5|||0|pin@11||-3|8.25|pin@1||-13|8.25
-Awire|net@6|||2700|pin@10||-3|-13.75|pin@11||-3|8.25
-Awire|net@7|||1800|nms1@2|g|3|-13.75|pin@12||5.5|-13.75
-Awire|net@9|||2700|pin@12||5.5|-13.75|pin@2||5.5|4.25
 Awire|net@10|||2700|nms1@1|d|-8|-11.75|pin@3||-8|-0.25
 Awire|net@11|||900|pin@4||-16|-0.25|nms1@0|d|-16|-11.75
 Awire|net@12|||2700|nms1@2|d|0|-11.75|pin@5||0|-0.25
@@ -1902,24 +1892,33 @@ Awire|net@14|||900|pin@4||-16|-0.25|pin@6||-16|-2.25
 Awire|net@15|||900|pms3a@0|d|-16|2.25|pin@7||-16|-0.25
 Awire|net@16|||2700|pin@7||-16|-0.25|pin@4||-16|-0.25
 Awire|net@17|||0|pin@3||-8|-0.25|pin@4||-16|-0.25
-Awire|net@20|||0|pin@2||5.5|4.25|pms3a@0|g3|-19|4.25
-Awire|net@23|||0|conn@0|y|13.5|4.25|pin@2||5.5|4.25
-Awire|net@24|||0|conn@1|y|13.5|8.25|pin@11||-3|8.25
 Awire|net@25|||0|conn@2|y|13.5|12.25|pin@9||-10.5|12.25
 Awire|net@27|||0|pms3a@0|g|-13|12.25|pin@13||-19|12.25
 Awire|net@28|||450|pin@13||-19|12.25|pin@14||-22.75|8.5
-Awire|net@31|||0|pin@14||-22.75|8.5|pin@16||-26.5|8.5
 Awire|net@32|||2700|pms3a@1|g2|-26.5|8.25|pin@16||-26.5|8.5
 Awire|net@33|||1800|pms3a@1|g|-26.5|12.25|pin@17||-23|12.25
-Awire|net@34|||1350|pin@17||-23|12.25|pin@18||-19|8.25
 Awire|net@35|||1800|pin@18||-19|8.25|pms3a@0|g2|-13|8.25
-Awire|net@36|||1800|pms3a@1|g3|-32.5|4.25|pms3a@0|g3|-19|4.25
 Awire|net@37|||1800|conn@3|a|-32.75|-0.25|pin@19||-29.5|-0.25
 Awire|net@38|||1800|pin@19||-29.5|-0.25|pin@4||-16|-0.25
 Awire|net@39|||900|pms3a@1|d|-29.5|2.25|pin@19||-29.5|-0.25
+Awire|net@40|||450|pin@14||-22.75|8.5|pin@20||-27.25|4
+Awire|net@41|||0|pin@20||-27.25|4|pin@21||-32.5|4
+Awire|net@42|||900|pms3a@1|g3|-32.5|4.25|pin@21||-32.5|4
+Awire|net@44|||3150|pms3a@0|g3|-19|4.25|pin@22||-22.25|7.5
+Awire|net@45|||2700|pin@22||-22.25|7.5|pin@23||-22.25|12.25
+Awire|net@46|||1800|pms3a@1|g|-26.5|12.25|pin@23||-22.25|12.25
+Awire|net@47|||1800|pms3a@1|g2|-26.5|8.25|pms3a@0|g2|-13|8.25
+Awire|net@49|||0|conn@0|y|13.5|8.25|pin@24||10|8.25
+Awire|net@50|||1800|pms3a@0|g2|-13|8.25|pin@25||-3|8.25
+Awire|net@51|||1800|pin@25||-3|8.25|pin@24||10|8.25
+Awire|net@52|||2700|pin@10||-3|-13.75|pin@25||-3|8.25
+Awire|net@53|||1800|nms1@2|g|3|-13.75|pin@26||6|-13.75
+Awire|net@54|||0|conn@1|y|13.5|4.25|pin@27||6|4.25
+Awire|net@55|||0|pin@27||6|4.25|pms3a@0|g3|-19|4.25
+Awire|net@56|||2700|pin@26||6|-13.75|pin@27||6|4.25
 Einb_1|ina|D5G2;X-1.75;|conn@2|a|I|ATTR_le(D5G1;NX2;Y-1.5;)S2.333
 Einb||D5G2;X-1.5;|conn@1|a|I|ATTR_le(D5G1;NX2.5;Y-1.5;)S2.333
-Einc||D5G2;X-1.75;|conn@0|a|I|ATTR_le(D5G1;NX1.75;Y-1.75;)S2.333
+Einc||D5G2;X-1.75;|conn@0|a|I
 Eout||D5G2;X1.75;|conn@3|y|O|ATTR_le(D5G1;NX-1.5;Y-1.5;)S3
 X