projects / fleet.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: e8a3398)
works, shorter delay line
authorAdam Megacz <adam.megacz@sun.com>
Fri, 17 Jul 2009 04:13:26 +0000 (04:13 +0000)
committerAdam Megacz <adam.megacz@sun.com>
Fri, 17 Jul 2009 04:13:26 +0000 (04:13 +0000)
electric/omegaCounter.jelib patch | blob | history

diff --git a/electric/omegaCounter.jelib b/electric/omegaCounter.jelib
index 6eaf3d3..1413b17 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|1247803544778|
+ConeBit;1{sch}||schematic|1242942044308|1247803771685|
 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
@@ -468,16 +468,17 @@ NOff-Page|conn@4||-95.5|76.5||||
 NOff-Page|conn@5||-95.5|73.5||||
 NOff-Page|conn@6||-36.5|104||||
 NOff-Page|conn@7||-36.5|101.5||||
-Idelay;1{ic}|delay@0||-70.5|16|RRR||D5G4;
 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@13||-50.5|11|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@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;)S1|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;)S1|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;Y4.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: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
@@ -538,9 +539,6 @@ NWire_Pin|pin@464||-61|-10.5||||
 NWire_Pin|pin@465||-64.5|-10.5||||
 NWire_Pin|pin@466||-64.5|74.5||||
 NWire_Pin|pin@467||-59|-21.5||||
-NWire_Pin|pin@468||-55.5|21||||
-NWire_Pin|pin@469||-55.5|11||||
-NWire_Pin|pin@470||-44.5|11||||
 NWire_Pin|pin@471||-44.5|17.5||||
 NWire_Pin|pin@472||-44.5|35||||
 NWire_Pin|pin@473||-59|57.5||||
@@ -581,6 +579,9 @@ NWire_Pin|pin@515||-7.5|11||||
 NWire_Pin|pin@516||-7.5|19||||
 NWire_Pin|pin@517||-7|67.5||||
 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
 IpredCondMSC;1{ic}|predCond@3||-18|19|||D5G4;
@@ -599,7 +600,6 @@ Awire|net@703|||2700|pin@337||-35.5|22|fire@0|not_fire|-35.5|28
 Awire|net@715|||1800|sucDri20@0|in|-46|22|pin@337||-35.5|22
 Awire|net@717|||900|fire@0|fire[2]|-26.5|30.5|pin@343||-26.5|20
 Awire|net@719|||2700|fire@0|not_fire[2]|-35.5|48|pin@344||-35.5|51.5
-Awire|net@737|||2700|pin@296||-53|21|pin@351||-53|39
 Awire|net@745|||900|pin@293||-67|50.5|pin@353||-67|41
 Awire|net@754|||0|predCond@3|in[1]|-21|20|pin@343||-26.5|20
 Awire|net@765|||0|pin@312||-14|61|predCond@4|state[1]|-15.5|61
@@ -629,8 +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@946|||2700|delay@0|in|-70.5|18.5|pin@448||-70.5|21
-Awire|net@947|||900|delay@0|out|-70.5|1.5|pin@449||-70.5|-21.5
 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
@@ -643,15 +641,8 @@ 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@979|||0|pin@296||-53|21|pin@468||-55.5|21
-Awire|net@980|||0|pin@468||-55.5|21|pin@448||-70.5|21
-Awire|net@981|||900|pin@468||-55.5|21|pin@469||-55.5|11
-Awire|net@982|||1800|pin@469||-55.5|11|inv@13|in|-53|11
-Awire|net@983|||1800|inv@13|out|-48|11|pin@470||-44.5|11
-Awire|net@984|||2700|pin@470||-44.5|11|pin@471||-44.5|17.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
-Awire|net@988|||2700|pin@471||-44.5|17.5|pin@472||-44.5|35
 Awire|net@989|||0|inv@14|in|-50.5|57.5|pin@473||-59|57.5
 Awire|net@990|||1800|pin@293||-67|50.5|pin@474||-59|50.5
 Awire|net@992|||900|pin@473||-59|57.5|pin@474||-59|50.5
@@ -725,6 +716,17 @@ 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|28.5
+Awire|net@1092|||2700|pin@521||-53|28.5|pin@351||-53|39
+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|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/