projects / fleet.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: e961841)
works, took two inverters off of forward conditioning path
authorAdam Megacz <adam.megacz@sun.com>
Fri, 17 Jul 2009 04:36:52 +0000 (04:36 +0000)
committerAdam Megacz <adam.megacz@sun.com>
Fri, 17 Jul 2009 04:36:52 +0000 (04:36 +0000)
electric/omegaCounter.jelib patch | blob | history

diff --git a/electric/omegaCounter.jelib b/electric/omegaCounter.jelib
index 7b758bd..71ba90e 100644 (file)
--- a/electric/omegaCounter.jelib
+++ b/electric/omegaCounter.jelib
@@ -454,7 +454,7 @@ Enot_load_zero||D5G2;X-5.5;Y-0.5;|pin@31||I
 X
 
 # Cell oneBit;1{sch}
-ConeBit;1{sch}||schematic|1242942044308|1247804298936|
+ConeBit;1{sch}||schematic|1242942044308|1247805231773|
 IorangeTSMC090nm:LEload;1{ic}|LEload@0||-74|44|||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||-73.5|26.5|||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
@@ -470,20 +470,18 @@ NOff-Page|conn@6||-36.5|104||||
 NOff-Page|conn@7||-36.5|101.5||||
 Idelay;1{ic}|delay@1||-70.5|55|R||D5G4;
 Ifire;1{ic}|fire@0||-28|36|||D5G4;
-IredFive:inv;1{ic}|inv@9||-60|2|R||D5G4;|ATTR_Delay(D5G1;NPX2;Y-2;)I100|ATTR_X(D5FLeave alone;G1.5;NOLPX4;Y2;)S1|ATTR_drive0(P)Sstrong0|ATTR_drive1(P)Sstrong1
-IredFive:inv;1{ic}|inv@14||-48|57.5|XRR||D0G4;|ATTR_Delay(D5G1;NPX2;Y-2;)I100|ATTR_X(D5G1.5;NPX1.5;Y4.5;)S1|ATTR_drive0(P)Sstrong0|ATTR_drive1(P)Sstrong1
-IredFive:inv;1{ic}|inv@15||-18|43.5|X||D0G4;|ATTR_Delay(D5G1;NPX2;Y-2;)I100|ATTR_X(D5G1.5;NPX1.5;Y4.5;)S2|ATTR_drive0(P)Sstrong0|ATTR_drive1(P)Sstrong1
-IredFive:inv;1{ic}|inv@16||-18.5|28|X||D0G4;|ATTR_Delay(D5G1;NPX2;Y-2;)I100|ATTR_X(D5G1.5;NPX1.5;Y4.5;)S2|ATTR_drive0(P)Sstrong0|ATTR_drive1(P)Sstrong1
-IredFive:inv;1{ic}|inv@17||-70.5|80|XR||D0G4;|ATTR_Delay(D5G1;NPX2;Y-2;)I100|ATTR_X(D5G1.5;NPX1.5;Y4.5;)S1|ATTR_drive0(P)Sstrong0|ATTR_drive1(P)Sstrong1
-IredFive:inv;1{ic}|inv@18||-70.5|87.5|XR||D0G4;|ATTR_Delay(D5G1;NPX2;Y-2;)I100|ATTR_X(D5G1.5;NPX1.5;Y4.5;)S1|ATTR_drive0(P)Sstrong0|ATTR_drive1(P)Sstrong1
-IredFive:inv;1{ic}|inv@19||-48.5|28.5|XRR||D0G4;|ATTR_Delay(D5G1;NPX2;Y-2;)I100|ATTR_X(D5G1.5;NPX1.5;Y2.5;)S1|ATTR_drive0(P)Sstrong0|ATTR_drive1(P)Sstrong1
-IredFive:inv;1{ic}|inv@20||-70.5|1.5|RRR||D5G4;|ATTR_Delay(D5G1;NPX2;Y-2;)I100|ATTR_X(D5FLeave alone;G1.5;NOLPX4;Y2;)S1|ATTR_drive0(P)Sstrong0|ATTR_drive1(P)Sstrong1
-IredFive:inv;1{ic}|inv@21||-70.5|-8|RRR||D5G4;|ATTR_Delay(D5G1;NPX2;Y-2;)I100|ATTR_X(D5FLeave alone;G1.5;NOLPX4;Y2;)S1|ATTR_drive0(P)Sstrong0|ATTR_drive1(P)Sstrong1
-IredFive:nand2;1{ic}|nand2@0||-18|70.5|YRR||D5G4;|ATTR_Delay(D5G1;NPX2.5;Y-3;)I100|ATTR_X(D5FLeave alone;G1.5;NOLPX2.5;Y2.5;)S1|ATTR_drive0(P)Sstrong0|ATTR_drive1(P)Sstrong1
+IredFive:inv;1{ic}|inv@9||-60|2|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||-48|57.5|XRR||D0G4;|ATTR_X(D5G1.5;NPX1.5;Y4.5;)S1|ATTR_drive0(P)Sstrong0|ATTR_drive1(P)Sstrong1
+IredFive:inv;1{ic}|inv@15||-18|43.5|X||D0G4;|ATTR_X(D5G1.5;NPX1.5;Y4.5;)S2|ATTR_drive0(P)Sstrong0|ATTR_drive1(P)Sstrong1
+IredFive:inv;1{ic}|inv@16||-18.5|28|X||D0G4;|ATTR_X(D5G1.5;NPX1.5;Y4.5;)S2|ATTR_drive0(P)Sstrong0|ATTR_drive1(P)Sstrong1
+IredFive:inv;1{ic}|inv@19||-48.5|28.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@20||-70.5|1.5|RRR||D5G4;|ATTR_X(D5FLeave alone;G1.5;NOLPX4;Y2;)S1|ATTR_drive0(P)Sstrong0|ATTR_drive1(P)Sstrong1
+IredFive:inv;1{ic}|inv@21||-70.5|-8|RRR||D5G4;|ATTR_X(D5FLeave alone;G1.5;NOLPX4;Y2;)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|67|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|5|||D5G4;|ATTR_Delay(D5G1;NPX3.75;Y-0.25;)I100|ATTR_X(D5FLeave alone;G1.5;NPX-5;Y-3.25;)S8
-IredFive:nms1;2{ic}|nms1@1||-9.5|48|X||D5G4;|ATTR_Delay(D5G1;NPX-2.75;Y-1.25;)I100|ATTR_X(D5FLeave alone;G1.5;NPX-1.5;Y2.75;)S8
-IredFive:nor2n;1{ic}|nor2n@0||-60|-5.5|R||D5G4;|ATTR_Delay(D5G1;NPX2.5;Y-3;)I100|ATTR_X(D5FLeave alone;G1.5;NOLPX2.5;Y2.5;)S1|ATTR_drive0(P)Sstrong0|ATTR_drive1(P)Sstrong1
+IredFive:nms1;2{ic}|nms1@0||-9.5|5|||D5G4;|ATTR_X(D5FLeave alone;G1.5;NPX-5;Y-3.25;)S8
+IredFive:nms1;2{ic}|nms1@1||-9.5|48|X||D5G4;|ATTR_X(D5FLeave alone;G1.5;NPX-1.5;Y2.75;)S8
+IredFive:nor2n;1{ic}|nor2n@0||-60|-5.5|R||D5G4;|ATTR_X(D5FLeave alone;G1.5;NOLPX2.5;Y2.5;)S1|ATTR_drive0(P)Sstrong0|ATTR_drive1(P)Sstrong1
 IoneBit;1{ic}|oneBit@0||40|73|||D5G4;
 Ngeneric:Invisible-Pin|pin@6||-72|145|||||ART_message(D5G15;)SoneBit
 Ngeneric:Invisible-Pin|pin@149||-72.5|134.5|||||ART_message(D5G2;)Sam 13 Jul 2009
@@ -529,7 +527,6 @@ NWire_Pin|pin@419||-70.5|74.5||||
 NWire_Pin|pin@435||-44|44.5||||
 NWire_Pin|pin@448||-70.5|21||||
 NWire_Pin|pin@449||-70.5|-21.5||||
-NWire_Pin|pin@450||-24.5|-21.5||||
 NWire_Pin|pin@451||-24.5|60||||
 NWire_Pin|pin@455||-70.5|96||||
 NWire_Pin|pin@456||-41|96||||
@@ -564,7 +561,6 @@ NWire_Pin|pin@499||-22.5|70.5||||
 NWire_Pin|pin@501||-60|6||||
 NWire_Pin|pin@502||-60|18||||
 NWire_Pin|pin@503||-70.5|74.5||||
-NWire_Pin|pin@504||-70.5|91.5||||
 NWire_Pin|pin@505||-43|47||||
 NWire_Pin|pin@506||-67|72||||
 NWire_Pin|pin@507||-51|72||||
@@ -582,8 +578,12 @@ NWire_Pin|pin@518||-7|61||||
 NWire_Pin|pin@521||-53|28.5||||
 NWire_Pin|pin@522||-44.5|28.5||||
 NWire_Pin|pin@523||-70.5|18.5||||
-IredFive:pms1;2{ic}|pms1@0||-9.5|80|||D5G4;|ATTR_Delay(D5G1;NPX-2;Y-1.5;)I100|ATTR_X(D5FLeave alone;G1.5;NOLPX3.25;Y1;)S8
-IredFive:pms1;2{ic}|pms1@1||-9.5|30|X||D5G4;|ATTR_Delay(D5G1;NPX-2;Y-1.5;)I100|ATTR_X(D5FLeave alone;G1.5;NOLPX-2.75;Y3;)S8
+NWire_Pin|pin@525||-70.5|77.5||||
+NWire_Pin|pin@526||-56|21||||
+NWire_Pin|pin@527||-56|9||||
+NWire_Pin|pin@528||-24.5|9||||
+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|19|||D5G4;
 IpredCondMSC;1{ic}|predCond@4||-18|61|||D5G4;
 IpredCondMSC;1{ic}|predCond@5||-60.5|63.5|YRR||D5G4;
@@ -629,7 +629,6 @@ Awire|net@857|||2700|pin@374||-29.5|74.5|pin@402||-29.5|104
 Awire|net@893|||900|delay@1|in|-70.5|52.5|pin@418||-70.5|50.5
 Awire|net@896|||2700|delay@1|out|-70.5|69.5|pin@419||-70.5|74.5
 Awire|net@924|||2700|pin@435||-44|44.5|pin@395||-44|49
-Awire|net@949|||2700|pin@450||-24.5|-21.5|pin@451||-24.5|60
 Awire|net@956|||1800|pin@455||-70.5|96|pin@456||-41|96
 Awire|net@957|||900|pin@456||-41|96|pin@457||-41|20
 Awire|net@958|||0|pin@457||-41|20|sucDri20@0|cond|-46|20
@@ -639,7 +638,6 @@ Awire|net@971|||900|nor2n@0|inb|-61|-8|pin@464||-61|-10.5
 Awire|net@972|||0|pin@464||-61|-10.5|pin@465||-64.5|-10.5
 Awire|net@974|||0|pin@466||-64.5|74.5|pin@419||-70.5|74.5
 Awire|net@976|||1800|pin@449||-70.5|-21.5|pin@467||-59|-21.5
-Awire|net@977|||1800|pin@467||-59|-21.5|pin@450||-24.5|-21.5
 Awire|net@978|||900|nor2n@0|ina|-59|-8|pin@467||-59|-21.5
 Awire|net@985|||0|pin@471||-44.5|17.5|sucDri20@0|not_succ|-49.25|17.5
 Awire|net@987|||1800|pin@472||-44.5|35|pin@376||-39|35
@@ -684,7 +682,6 @@ Awire|net@1051|||900|pin@463||-60|44.5|pin@502||-60|18
 Awire|net@1052|||900|pin@502||-60|18|pin@501||-60|6
 Awire|net@1053|||1800|pin@451||-24.5|60|predCond@4|cond|-20.5|60
 Awire|net@1054|||0|pin@419||-70.5|74.5|pin@503||-70.5|74.5
-Awire|net@1055|||900|pin@455||-70.5|96|pin@504||-70.5|91.5
 Awire|net@1057|||1800|inv@14|out|-45.5|57.5|pin@477||-43|57.5
 Awire|net@1058|||900|pin@477||-43|57.5|pin@505||-43|47
 Awire|net@1059|||900|pin@505||-43|47|pin@478||-43|37
@@ -697,9 +694,6 @@ Awire|net@1066|||900|pin@508||-54.5|62.5|pin@509||-54.5|59
 Awire|net@1067|||2700|pin@465||-64.5|-10.5|pin@510||-64.5|59
 Awire|net@1068|||2700|pin@510||-64.5|59|pin@466||-64.5|74.5
 Awire|net@1069|||0|pin@509||-54.5|59|pin@510||-64.5|59
-Awire|net@1070|||900|inv@17|in|-70.5|77.5|pin@503||-70.5|74.5
-Awire|net@1071|||900|inv@18|in|-70.5|85|inv@17|out|-70.5|82.5
-Awire|net@1072|||2700|inv@18|out|-70.5|90|pin@504||-70.5|91.5
 Awire|net@1073|||0|LEload@0|a|-77|44|pin@511||-79|44
 Awire|net@1074|||1800|conn@2|y|-81|50.5|pin@512||-79|50.5
 Awire|net@1075|||1800|pin@512||-79|50.5|pin@418||-70.5|50.5
@@ -722,11 +716,17 @@ Awire|net@1093|||0|inv@19|in|-51|28.5|pin@521||-53|28.5
 Awire|net@1094|||2700|pin@471||-44.5|17.5|pin@522||-44.5|28.5
 Awire|net@1095|||2700|pin@522||-44.5|28.5|pin@472||-44.5|35
 Awire|net@1096|||1800|inv@19|out|-46|28.5|pin@522||-44.5|28.5
-Awire|net@1097|||0|pin@296||-53|21|pin@448||-70.5|21
 Awire|net@1098|||900|pin@448||-70.5|21|pin@523||-70.5|18.5
 Awire|net@1100|||2700|inv@21|in|-70.5|-5.5|inv@20|out|-70.5|-1
 Awire|net@1101|||2700|inv@20|in|-70.5|4|pin@523||-70.5|18.5
 Awire|net@1102|||900|inv@21|out|-70.5|-10.5|pin@449||-70.5|-21.5
+Awire|net@1103|||2700|pin@503||-70.5|74.5|pin@525||-70.5|77.5
+Awire|net@1104|||2700|pin@525||-70.5|77.5|pin@455||-70.5|96
+Awire|net@1105|||0|pin@296||-53|21|pin@526||-56|21
+Awire|net@1106|||0|pin@526||-56|21|pin@448||-70.5|21
+Awire|net@1107|||900|pin@526||-56|21|pin@527||-56|9
+Awire|net@1109|||2700|pin@528||-24.5|9|pin@451||-24.5|60
+Awire|net@1110|||1800|pin@527||-56|9|pin@528||-24.5|9
 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
The FleetCode -- http://fleet.cs.berkeley.edu/