From: Adam Megacz <adam.megacz@sun.com>
Date: Fri, 17 Jul 2009 06:49:23 +0000 (+0000)
Subject: topology tweaks
X-Git-Url: http://git.megacz.com/?a=commitdiff_plain;h=22b97ffe929a6a7ae1da12b3c4b6c04a6c36b4b5;p=fleet.git

topology tweaks
---

diff --git a/electric/omegaCounter.jelib b/electric/omegaCounter.jelib
index 5009c8b..f29b6dc 100644
--- a/electric/omegaCounter.jelib
+++ b/electric/omegaCounter.jelib
@@ -659,7 +659,7 @@ Enot_load_zero||D5G2;X-5.5;Y-0.5;|pin@31||I
 X
 
 # Cell oneBit;1{sch}
-ConeBit;1{sch}||schematic|1242942044308|1247812874433|
+ConeBit;1{sch}||schematic|1242942044308|1247813346544|
 IorangeTSMC090nm:LEload;1{ic}|LEload@0||-96.5|44|XY||D5G4;|ATTR_L(D5G1;OLPUDX1;)S100|ATTR_LEWIRE(P)I1|ATTR_layer(D5G1;NOLPX0.5;Y-1;)S1|ATTR_width(D5G1;NOLPX0.5;Y-2;)S3
 IorangeTSMC090nm:LEload;1{ic}|LEload@1||-96|26.5|X||D5G4;|ATTR_L(D5G1;OLPUDX1;)S100|ATTR_LEWIRE(P)I1|ATTR_layer(D5G1;NOLPX0.5;Y-1;)S1|ATTR_width(D5G1;NOLPX0.5;Y-2;)S3
 IorangeTSMC090nm:LEload;1{ic}|LEload@2||-2.5|11|||D5G4;|ATTR_L(D5G1;OLPUDX1;)S100|ATTR_LEWIRE(P)I1|ATTR_layer(D5G1;NOLPX0.5;Y-1;)S1|ATTR_width(D5G1;NOLPX0.5;Y-2;)S3
@@ -673,17 +673,17 @@ NOff-Page|conn@4||-95.5|76.5||||
 NOff-Page|conn@5||-95.5|73.5||||
 NOff-Page|conn@6||-36.5|83||||
 NOff-Page|conn@7||-36.5|80.5||||
-Idelay;1{ic}|delay@1||-71|46|YR||D5G4;
 Ifire;1{ic}|fire@0||-28|36|||D5G4;
-IredFive:inv;1{ic}|inv@9||-60|35|R||D5G4;|ATTR_X(D5FLeave alone;G1.5;NOLPX4;Y2;)S1|ATTR_drive0(P)Sstrong0|ATTR_drive1(P)Sstrong1
-IredFive:inv;1{ic}|inv@14||-54|53.5|XRR||D0G4;|ATTR_X(D5G1.5;NPX2.5;Y-2;)S1|ATTR_drive0(P)Sstrong0|ATTR_drive1(P)Sstrong1
+IredFive:inv;1{ic}|inv@9||-60|37.5|R||D5G4;|ATTR_X(D5FLeave alone;G1.5;NOLPX4;Y2;)S1|ATTR_drive0(P)Sstrong0|ATTR_drive1(P)Sstrong1
 IredFive:inv;1{ic}|inv@15||-18|41|X||D0G4;|ATTR_X(D5G1.5;NPX1.5;Y2.5;)S4|ATTR_drive0(P)Sstrong0|ATTR_drive1(P)Sstrong1
 IredFive:inv;1{ic}|inv@16||-18.5|35|X||D0G4;|ATTR_X(D5G1.5;NPX0.5;Y-3;)S4|ATTR_drive0(P)Sstrong0|ATTR_drive1(P)Sstrong1
-IredFive:inv;1{ic}|inv@19||-48.5|35|XRR||D0G4;|ATTR_X(D5G1.5;NPX1.5;Y2.5;)S1|ATTR_drive0(P)Sstrong0|ATTR_drive1(P)Sstrong1
 IredFive:inv;1{ic}|inv@20||-81.5|32.5|XRRR||D0G4;|ATTR_X(D5G1.5;NPX1.5;Y2.5;)S1|ATTR_drive0(P)Sstrong0|ATTR_drive1(P)Sstrong1
-IredFive:inv;1{ic}|inv@21||-81.5|39|XRRR||D0G4;|ATTR_X(D5G1.5;NPX1.5;Y2.5;)S1|ATTR_drive0(P)Sstrong0|ATTR_drive1(P)Sstrong1
-IredFive:inv;1{ic}|inv@22||-76|28.5|XR||D0G4;|ATTR_X(D5G1.5;NPX1.5;Y2.5;)S1|ATTR_drive0(P)Sstrong0|ATTR_drive1(P)Sstrong1
-IredFive:inv;1{ic}|inv@23||-76|35|XR||D0G4;|ATTR_X(D5G1.5;NPX1.5;Y2.5;)S1|ATTR_drive0(P)Sstrong0|ATTR_drive1(P)Sstrong1
+IredFive:inv;1{ic}|inv@21||-81.5|47|XRRR||D0G4;|ATTR_X(D5G1.5;NPX1.5;Y2.5;)S1|ATTR_drive0(P)Sstrong0|ATTR_drive1(P)Sstrong1
+IredFive:inv;1{ic}|inv@22||-70|28.5|XR||D0G4;|ATTR_X(D5G1.5;NPX1.5;Y2.5;)S1|ATTR_drive0(P)Sstrong0|ATTR_drive1(P)Sstrong1
+IredFive:inv;1{ic}|inv@23||-70|46.5|XR||D0G4;|ATTR_X(D5G1.5;NPX1.5;Y2.5;)S1|ATTR_drive0(P)Sstrong0|ATTR_drive1(P)Sstrong1
+IredFive:inv;1{ic}|inv@24||-70|14|XRR||D0G4;|ATTR_X(D5G1.5;NPX1.5;Y2.5;)S1|ATTR_drive0(P)Sstrong0|ATTR_drive1(P)Sstrong1
+IredFive:inv;1{ic}|inv@25||-76.5|-2.5|XRR||D0G4;|ATTR_X(D5G1.5;NPX1.5;Y2.5;)S1|ATTR_drive0(P)Sstrong0|ATTR_drive1(P)Sstrong1
+IredFive:inv;1{ic}|inv@26||-77|14|XRR||D0G4;|ATTR_X(D5G1.5;NPX1.5;Y2.5;)S1|ATTR_drive0(P)Sstrong0|ATTR_drive1(P)Sstrong1
 IredFive:nand2;1{ic}|nand2@0||-18|70.5|YRR||D5G4;|ATTR_X(D5FLeave alone;G1.5;NOLPX2.5;Y2.5;)S1|ATTR_drive0(P)Sstrong0|ATTR_drive1(P)Sstrong1
 IredFive:nand2;1{ic}|nand2@1||-54.5|76|X||D5G4;|ATTR_X(D5FLeave alone;G1.5;NOLPX-1.5;Y3;)S1|ATTR_drive0(P)Sstrong0|ATTR_drive1(P)Sstrong1
 IredFive:nms1;2{ic}|nms1@0||-9.5|11|||D5G4;|ATTR_X(D5FLeave alone;G1.5;NPX-5;Y-3.25;)S8
@@ -721,23 +721,16 @@ NWire_Pin|pin@371||-22.5|11||||
 NWire_Pin|pin@372||7.5|48||||
 NWire_Pin|pin@373||-33|71||||
 NWire_Pin|pin@374||-29.5|74.5||||
-NWire_Pin|pin@375||-39|17.5||||
-NWire_Pin|pin@376||-39|35||||
 NWire_Pin|pin@380||-67|72.5||||
 NWire_Pin|pin@395||-44|49||||
 NWire_Pin|pin@397||-44|49.5||||
 NWire_Pin|pin@398||-26.5|73.5||||
 NWire_Pin|pin@401||-33|80.5||||
 NWire_Pin|pin@402||-29.5|83||||
-NWire_Pin|pin@418||-71|50.5||||
 NWire_Pin|pin@435||-44|44.5||||
-NWire_Pin|pin@457||-41|20||||
+NWire_Pin|pin@457||-44|20||||
 NWire_Pin|pin@463||-60|44.5||||
-NWire_Pin|pin@466||-65|29||||
 NWire_Pin|pin@471||-44.5|17.5||||
-NWire_Pin|pin@473||-59|53.5||||
-NWire_Pin|pin@474||-59|50.5||||
-NWire_Pin|pin@477||-43|53.5||||
 NWire_Pin|pin@478||-43|37||||
 NWire_Pin|pin@479||-14|41||||
 NWire_Pin|pin@480||-22.5|41||||
@@ -751,16 +744,14 @@ NWire_Pin|pin@491||-14|69.5||||
 NWire_Pin|pin@492||-11.5|71.5||||
 NWire_Pin|pin@495||-51|77||||
 NWire_Pin|pin@496||-51|50.5||||
-NWire_Pin|pin@497||-39|35||||
-NWire_Pin|pin@498||-39|75||||
+NWire_Pin|pin@497||-40.5|35||||
+NWire_Pin|pin@498||-40.5|75||||
 NWire_Pin|pin@499||-22.5|70.5||||
 NWire_Pin|pin@501||-60|39||||
 NWire_Pin|pin@505||-43|47||||
 NWire_Pin|pin@506||-67|81||||
 NWire_Pin|pin@507||-51|81||||
 NWire_Pin|pin@508||-54.5|71.5||||
-NWire_Pin|pin@509||-54.5|56.5||||
-NWire_Pin|pin@510||-65|56.5||||
 NWire_Pin|pin@511||-91|44||||
 NWire_Pin|pin@512||-91|50.5||||
 NWire_Pin|pin@513||-91|26.5||||
@@ -769,23 +760,24 @@ NWire_Pin|pin@515||-7.5|11||||
 NWire_Pin|pin@516||-7.5|18.5||||
 NWire_Pin|pin@517||-7|67.5||||
 NWire_Pin|pin@518||-7|61||||
-NWire_Pin|pin@521||-53|35||||
 NWire_Pin|pin@531||-59|21||||
-NWire_Pin|pin@534||-65|14||||
-NWire_Pin|pin@537||-41|14||||
-NWire_Pin|pin@540||-71|25||||
-NWire_Pin|pin@541||-65|25||||
+NWire_Pin|pin@537||-44|14||||
 NWire_Pin|pin@542||-61|23||||
 NWire_Pin|pin@545||-81.5|50.5||||
 NWire_Pin|pin@546||-81.5|26||||
-NWire_Pin|pin@548||-65|26||||
 NWire_Pin|pin@549||-11.5|37||||
 NWire_Pin|pin@552||-81.5|25||||
-NWire_Pin|pin@554||-76|60||||
-NWire_Pin|pin@555||-76|21||||
+NWire_Pin|pin@554||-70|60||||
+NWire_Pin|pin@555||-70|21||||
 NWire_Pin|pin@556||-81.5|23||||
-NWire_Pin|pin@558||-67.5|23||||
-NWire_Pin|pin@559||-67.5|29||||
+NWire_Pin|pin@560||-81.5|14||||
+NWire_Pin|pin@563||-76.5|23||||
+NWire_Pin|pin@564||-76.5|63.5||||
+NWire_Pin|pin@565||-54.5|63.5||||
+NWire_Pin|pin@567||-81.5|43||||
+NWire_Pin|pin@568||-43|43||||
+NWire_Pin|pin@571||-70|35||||
+NWire_Pin|pin@572||-40.5|17.5||||
 IredFive:pms1;2{ic}|pms1@0||-9.5|80|||D5G4;|ATTR_X(D5FLeave alone;G1.5;NOLPX3.25;Y1;)S8
 IredFive:pms1;2{ic}|pms1@1||-9.5|30|X||D5G4;|ATTR_X(D5FLeave alone;G1.5;NOLPX-2.75;Y3;)S8
 IpredCondMSC;1{ic}|predCond@3||-18|18.5|||D5G4;|ATTR_X(D5G2;NPX0.25;Y-5.25;)S8
@@ -814,9 +806,6 @@ Awire|net@789|||2700|nms1@1|d|-9.5|50|pin@367||-9.5|61
 Awire|net@793|||0|fire@0|MSN[ZeroOrDone]|-39|39|pin@351||-53|39
 Awire|net@795|||2700|fire@0|not_disable@174670546|-33|45.5|pin@373||-33|71
 Awire|net@798|||2700|fire@0|not_disable|-29.5|45.5|pin@374||-29.5|74.5
-Awire|net@799|||0|predCond@3|cond|-20.5|17.5|pin@375||-39|17.5
-Awire|net@801|||1800|pin@376||-39|35|fire@0|NotMSN[ZeroOrDone]|-39|35
-Awire|net@802|||2700|pin@375||-39|17.5|pin@376||-39|35
 Awire|net@809|||1800|pin@353||-67|41|fire@0|MSN[ZeroOrOne]|-39|41
 Awire|net@812|||0|predCond@5|state[1]|-63|72.5|pin@380||-67|72.5
 Awire|net@844|||2700|pin@395||-44|49|pin@397||-44|49.5
@@ -828,15 +817,11 @@ Awire|net@854|||1800|conn@7|y|-34.5|80.5|pin@401||-33|80.5
 Awire|net@855|||900|pin@401||-33|80.5|pin@373||-33|71
 Awire|net@856|||1800|conn@6|y|-34.5|83|pin@402||-29.5|83
 Awire|net@857|||2700|pin@374||-29.5|74.5|pin@402||-29.5|83
-Awire|net@893|||2700|delay@1|in|-71|48.5|pin@418||-71|50.5
 Awire|net@924|||2700|pin@435||-44|44.5|pin@395||-44|49
-Awire|net@958|||0|pin@457||-41|20|sucDri20@0|cond|-46|20
-Awire|net@968|||2700|nor2n@0|out|-60|30|inv@9|in|-60|32.5
+Awire|net@958|||0|pin@457||-44|20|sucDri20@0|cond|-46|20
+Awire|net@968|||2700|nor2n@0|out|-60|30|inv@9|in|-60|35
 Awire|net@970|||1800|pin@463||-60|44.5|pin@435||-44|44.5
 Awire|net@985|||0|pin@471||-44.5|17.5|sucDri20@0|not_succ|-49.25|17.5
-Awire|net@989|||0|inv@14|in|-56.5|53.5|pin@473||-59|53.5
-Awire|net@990|||1800|pin@293||-67|50.5|pin@474||-59|50.5
-Awire|net@992|||900|pin@473||-59|53.5|pin@474||-59|50.5
 Awire|net@998|||1800|pin@478||-43|37|fire@0|NotMSN[ZeroOrOne]|-39|37
 Awire|net@1000|||0|pin@344||-35.5|51.5|sucDri20@1|in|-46|51.5
 Awire|net@1001|||2700|pin@335||-14|39|pin@479||-14|41
@@ -858,26 +843,18 @@ Awire|net@1027|||900|pin@491||-14|69.5|pin@312||-14|61
 Awire|net@1028|||1800|nand2@0|ina|-15.5|69.5|pin@491||-14|69.5
 Awire|net@1029|||1800|nand2@0|inb|-15.5|71.5|pin@492||-11.5|71.5
 Awire|net@1037|||1800|nand2@1|inb|-52|77|pin@495||-51|77
-Awire|net@1038|||1800|pin@474||-59|50.5|pin@496||-51|50.5
-Awire|net@1039|||0|pin@496||-51|50.5|pin@418||-71|50.5
-Awire|net@1042|||2700|pin@497||-39|35|pin@498||-39|75
-Awire|net@1043|||0|pin@498||-39|75|nand2@1|ina|-52|75
+Awire|net@1042|||2700|pin@497||-40.5|35|pin@498||-40.5|75
+Awire|net@1043|||0|pin@498||-40.5|75|nand2@1|ina|-52|75
 Awire|net@1044|||0|nand2@1|out|-57|76|predCond@5|not_state|-60|76
 Awire|net@1046|||900|pin@499||-22.5|70.5|pin@482||-22.5|64.5
 Awire|net@1047|||0|nand2@0|out|-20.5|70.5|pin@499||-22.5|70.5
 Awire|net@1049|||900|pin@380||-67|72.5|pin@293||-67|50.5
-Awire|net@1050|||2700|inv@9|out|-60|37.5|pin@501||-60|39
-Awire|net@1057|||1800|inv@14|out|-51.5|53.5|pin@477||-43|53.5
-Awire|net@1058|||900|pin@477||-43|53.5|pin@505||-43|47
-Awire|net@1059|||900|pin@505||-43|47|pin@478||-43|37
+Awire|net@1050|||900|inv@9|out|-60|40|pin@501||-60|39
 Awire|net@1061|||1800|sucDri20@1|not_succ|-49.25|47|pin@505||-43|47
 Awire|net@1062|||2700|pin@380||-67|72.5|pin@506||-67|81
 Awire|net@1063|||1800|pin@506||-67|81|pin@507||-51|81
 Awire|net@1064|||900|pin@507||-51|81|pin@495||-51|77
 Awire|net@1065|||1800|predCond@5|cond|-58|71.5|pin@508||-54.5|71.5
-Awire|net@1066|||900|pin@508||-54.5|71.5|pin@509||-54.5|56.5
-Awire|net@1068|||900|pin@510||-65|56.5|pin@466||-65|29
-Awire|net@1069|||0|pin@509||-54.5|56.5|pin@510||-65|56.5
 Awire|net@1073|||1800|LEload@0|a|-93.5|44|pin@511||-91|44
 Awire|net@1074|||1800|conn@2|y|-93|50.5|pin@512||-91|50.5
 Awire|net@1076|||2700|pin@511||-91|44|pin@512||-91|50.5
@@ -892,44 +869,50 @@ Awire|net@1085|||0|LEload@4|a|-3.5|67.5|pin@517||-7|67.5
 Awire|net@1086|||1800|pin@367||-9.5|61|pin@518||-7|61
 Awire|net@1087|||1800|pin@518||-7|61|conn@3|a|-3|61
 Awire|net@1088|||900|pin@517||-7|67.5|pin@518||-7|61
-Awire|net@1091|||2700|pin@296||-53|21|pin@521||-53|35
-Awire|net@1092|||2700|pin@521||-53|35|pin@351||-53|39
-Awire|net@1093|||0|inv@19|in|-51|35|pin@521||-53|35
 Awire|net@1114|||2700|pin@501||-60|39|pin@463||-60|44.5
 Awire|net@1117|||900|nor2n@0|ina|-59|25|pin@531||-59|21
-Awire|net@1131|||1800|pin@471||-44.5|17.5|pin@375||-39|17.5
-Awire|net@1132|||0|pin@376||-39|35|inv@19|out|-46|35
-Awire|net@1133|||0|pin@497||-39|35|inv@19|out|-46|35
-Awire|net@1134|||1800|pin@534||-65|14|pin@537||-41|14
-Awire|net@1135|||900|pin@457||-41|20|pin@537||-41|14
+Awire|net@1135|||900|pin@457||-44|20|pin@537||-44|14
 Awire|net@1141|||0|sucDri20@1|succ|-50|50.5|pin@293||-67|50.5
-Awire|net@1142|||900|delay@1|out|-71|31.5|pin@540||-71|25
-Awire|net@1145|||1800|pin@540||-71|25|pin@541||-65|25
-Awire|net@1152|||900|inv@21|out|-81.5|36.5|inv@20|in|-81.5|35
 Awire|net@1153|||1800|pin@512||-91|50.5|pin@545||-81.5|50.5
-Awire|net@1154|||1800|pin@545||-81.5|50.5|pin@418||-71|50.5
-Awire|net@1155|||2700|inv@21|in|-81.5|41.5|pin@545||-81.5|50.5
+Awire|net@1155|||2700|inv@21|in|-81.5|49.5|pin@545||-81.5|50.5
 Awire|net@1156|||900|inv@20|out|-81.5|30|pin@546||-81.5|26
 Awire|net@1160|||900|nor2n@0|inb|-61|25|pin@542||-61|23
 Awire|net@1165|||1800|pin@308||-11.5|18.5|pin@369||-9.5|18.5
 Awire|net@1166|||1800|fire@0|LSN[ZeroOrDone]|-23.5|37|pin@549||-11.5|37
 Awire|net@1167|||1800|pin@549||-11.5|37|pin@305||-11.5|37
 Awire|net@1168|||2700|pin@549||-11.5|37|pin@492||-11.5|71.5
-Awire|net@1169|||900|pin@548||-65|26|pin@541||-65|25
-Awire|net@1172|||900|pin@541||-65|25|pin@534||-65|14
 Awire|net@1173|||0|pin@296||-53|21|pin@531||-59|21
 Awire|net@1176|||900|pin@546||-81.5|26|pin@552||-81.5|25
-Awire|net@1182|||0|predCond@4|cond|-20.5|60|pin@554||-76|60
-Awire|net@1183|||900|inv@23|in|-76|32.5|inv@22|out|-76|31
-Awire|net@1184|||1800|pin@514||-91|21|pin@555||-76|21
-Awire|net@1185|||1800|pin@555||-76|21|pin@531||-59|21
-Awire|net@1186|||900|inv@22|in|-76|26|pin@555||-76|21
-Awire|net@1187|||2700|inv@23|out|-76|37.5|pin@554||-76|60
+Awire|net@1182|||0|predCond@4|cond|-20.5|60|pin@554||-70|60
+Awire|net@1184|||1800|pin@514||-91|21|pin@555||-70|21
+Awire|net@1185|||1800|pin@555||-70|21|pin@531||-59|21
+Awire|net@1186|||900|inv@22|in|-70|26|pin@555||-70|21
+Awire|net@1187|||2700|inv@23|out|-70|49|pin@554||-70|60
 Awire|net@1190|||2700|pin@556||-81.5|23|pin@552||-81.5|25
-Awire|net@1192|||0|pin@542||-61|23|pin@558||-67.5|23
-Awire|net@1193|||0|pin@558||-67.5|23|pin@556||-81.5|23
-Awire|net@1194|||2700|pin@558||-67.5|23|pin@559||-67.5|29
-Awire|net@1195|||1800|pin@559||-67.5|29|pin@466||-65|29
+Awire|net@1196|||1800|inv@26|out|-74.5|14|inv@24|in|-72.5|14
+Awire|net@1198|||900|pin@556||-81.5|23|pin@560||-81.5|14
+Awire|net@1199|||1800|pin@560||-81.5|14|inv@26|in|-79.5|14
+Awire|net@1200|||0|pin@537||-44|14|inv@24|out|-67.5|14
+Awire|net@1203|||0|pin@496||-51|50.5|pin@545||-81.5|50.5
+Awire|net@1205|||0|pin@542||-61|23|pin@563||-76.5|23
+Awire|net@1206|||0|pin@563||-76.5|23|pin@556||-81.5|23
+Awire|net@1207|||2700|pin@563||-76.5|23|pin@564||-76.5|63.5
+Awire|net@1208|||1800|pin@564||-76.5|63.5|pin@565||-54.5|63.5
+Awire|net@1209|||900|pin@508||-54.5|71.5|pin@565||-54.5|63.5
+Awire|net@1211|||1800|pin@293||-67|50.5|pin@496||-51|50.5
+Awire|net@1212|||900|inv@21|out|-81.5|44.5|pin@567||-81.5|43
+Awire|net@1213|||900|pin@567||-81.5|43|inv@20|in|-81.5|35
+Awire|net@1214|||900|pin@505||-43|47|pin@568||-43|43
+Awire|net@1215|||900|pin@568||-43|43|pin@478||-43|37
+Awire|net@1216|||1800|pin@567||-81.5|43|pin@568||-43|43
+Awire|net@1220|||2700|pin@296||-53|21|pin@351||-53|39
+Awire|net@1222|||900|inv@23|in|-70|44|pin@571||-70|35
+Awire|net@1223|||900|pin@571||-70|35|inv@22|out|-70|31
+Awire|net@1224|||0|pin@497||-40.5|35|pin@571||-70|35
+Awire|net@1226|||0|fire@0|NotMSN[ZeroOrDone]|-39|35|pin@497||-40.5|35
+Awire|net@1227|||0|predCond@3|cond|-20.5|17.5|pin@572||-40.5|17.5
+Awire|net@1228|||0|pin@572||-40.5|17.5|pin@471||-44.5|17.5
+Awire|net@1229|||900|pin@497||-40.5|35|pin@572||-40.5|17.5
 Awire|not_load_zero|D5G2;X-3.5;||0|pms1@0|g|-12.5|80|pin@368||-20|80
 Awire|not_load_zero|D5G2;X7;||1800|pms1@1|g|-6.5|30|pin@370||2|30
 Esucc[OneOrTwo]|LSN[ZeroOrDone]|D5G2;X12.5;|conn@0|a|B