40nm omega counter: switch design to use a timing constraint.

Massive simplification; the design now runs at 20.0Ghz and has a
25ps/bit settling time in schematics with 4000 lambda of load on each
state wire and reasonable (100-400 lambda) loads on internal wires.

diff --git a/chips/omegaCounter/40nm/Makefile b/chips/omegaCounter/40nm/Makefile
index e0b7340..a0295cc 100644 (file)
--- a/chips/omegaCounter/40nm/Makefile
+++ b/chips/omegaCounter/40nm/Makefile
@@ -358,8 +358,8 @@ runtest: fleet.jar marina/testCode/marina.xml marina/testCode/marina.v marina/te
        time ssh -t -Y ${sun_server} 'cd ~/fleet/; make testlocal'
 
 spice: fleet.jar
-       cp ~/omegaCounter.spi marina/testCode/omegaCounter.spi
-       cp ~/omegaCounter-extracted.spi marina/testCode/omegaCounter-extracted.spi
+       cp ~/omegaCounter.spi omegaCounter.spi
+       cp ~/omegaCounter-extracted.spi marina/testCode/omegaCounter-extracted.spi || true
        rsync -azre ssh --delete --progress --verbose ./ ${sun_server}:~/fleet/
        ssh -t -Y ${sun_server} 'cd ~/fleet/marina/testCode/; export PATH=/proj/async/cad/linux/bin/:$$PATH; echo -e "rcf commands\n" | hsim64 -time 90000 go.spi -o go.spi'
 

diff --git a/chips/omegaCounter/40nm/electric/omegaCounter.jelib b/chips/omegaCounter/40nm/electric/omegaCounter.jelib
index 26731d1..b90fbd6 100644 (file)
--- a/chips/omegaCounter/40nm/electric/omegaCounter.jelib
+++ b/chips/omegaCounter/40nm/electric/omegaCounter.jelib
@@ -1,7 +1,8 @@
 # header information:
-HomegaCounter|8.10g
+HomegaCounter|8.10i
 
 # Views:
+Vdocumentation|doc
 Vicon|ic
 Vlayout|lay
 Vschematic|sch
@@ -17,11 +18,77 @@ LredFive|redFive
 # Tools:
 Ouser|DefaultTechnology()Scmos90|SchematicTechnology()Scmos90
 Oio|GDSOutputConvertsBracketsInExports()BF|GDSWritesExportPins()BT
+OSTA|GlobalSDCCommands()S"\n### 4 GHz clock setup\ncreate_clock -period 0.250 -name clk -waveform \"0 0.125\" clk\nset_clock_uncertainty -setup 0.010 clk\nset_clock_uncertainty -hold 0.010 clk\nset_propagated_clock clk\nset_clock_transition -rise 0.030 clk\nset_clock_transition -fall 0.030 clk\n#set_driving_cell -lib_cell inv_X008_0 clk\n\n### remove scan path from timing\nset_false_path -through */so\nset_false_path -from {sin}\nset_false_path -from {scanEn}\nset_false_path -to {sout}\n"
 
 # Technologies:
 Tcmos90|"GDS(ST)LayerForPad-FrameINcmos90"()S43|"GDS(TSMC)LayerForPad-FrameINcmos90"()S43
 Tmocmos|SelectedFoundryFormocmos()STSMC
 
+# Cell buf;1{doc}
+Cbuf;1{doc}||artwork|1012171260000|1012171294000||FACET_message()S[This is the one parameter inverter.,Drawn by Ivan Sutherland 27 January 2002,""]
+X
+
+# Cell buf;1{ic}
+Cbuf;1{ic}||artwork|1021415734000|1252885438357|E|ATTR_Delay(D5G1;HNPX2;Y-2;)I100|ATTR_LEGATE(D5G1;HPT)I1|ATTR_LEPARALLGRP(D5G1;HPT)I-1|ATTR_X(D5G1.5;HNOJPX1.5;Y2;)SLE.getdrive()|ATTR_drive0(D5G1;HPT)Sstrong0|ATTR_drive1(D5G1;HPT)Sstrong1|ATTR_su(D5G1;HPT)I-1|prototype_center()I[6000,0]
+Ngeneric:Facet-Center|art@0||0|0||||AV
+NPin|pin@0||1.5|0|1|1||
+Nschematic:Bus_Pin|pin@1||-2.5|0|-2|-2||
+NPin|pin@2||-1.5|0|1|1||
+NPin|pin@3||-2.5|0||||
+Nschematic:Bus_Pin|pin@4||1.5|0|-2|-2||
+NPin|pin@5||-1.5|2|1|1||
+NPin|pin@6||-1.5|-2|1|1||
+AThicker|net@0|||FS3263|pin@0||1.5|0|pin@5||-1.5|2|ART_color()I78
+AThicker|net@1|||FS337|pin@0||1.5|0|pin@6||-1.5|-2|ART_color()I78
+AThicker|net@2|||FS0|pin@2||-1.5|0|pin@3||-2.5|0|ART_color()I78
+AThicker|net@3|||FS2700|pin@6||-1.5|-2|pin@5||-1.5|2|ART_color()I78
+Ein||D5G1;|pin@1||I
+Eout||D5G1;|pin@4||O
+X
+
+# Cell buf;2{sch}
+Cbuf;2{sch}||schematic|1021415734000|1253487811856||ATTR_Delay(D5G1;HNPX-12;Y-5.5;)I100|ATTR_LEGATE(D5G1;HNPTX-12;Y-10.5;)I1|ATTR_LEPARALLGRP(D5G1;HNPTX-12;Y-6.5;)I-1|ATTR_X(D5G1;HNOJPX-12.5;Y-4.5;)SLE.getdrive()|ATTR_drive0(D5G1;HNPTX-12;Y-7.5;)Sstrong0|ATTR_drive1(D5G1;HNPTX-12;Y-8.5;)Sstrong1|ATTR_su(D5G1;HNPTX-12;Y-9.5;)I-1|prototype_center()I[0,0]
+Ngeneric:Facet-Center|art@0||0|0||||AV
+NOff-Page|conn@0||11|0||||
+NOff-Page|conn@1||-14|0||||
+Ibuf;1{ic}|inv@1||20|13.5|||D0G4;|ATTR_Delay(D5G1;NPX2;Y-2;)I100|ATTR_LEGATE(P)I1|ATTR_LEPARALLGRP(P)I-1|ATTR_X(D5G1.5;NOJPX1.5;Y2;)SLE.getdrive()|ATTR_drive0(P)Sstrong0|ATTR_drive1(P)Sstrong1|ATTR_su(P)S""
+IredFive:inv;1{ic}|inv@2||-4.5|0|||D5G4;|ATTR_X(D5FLeave alone;G1.5;NOLPX1.5;Y3.5;)S@X|ATTR_drive0(P)Sstrong0|ATTR_drive1(P)Sstrong1
+IredFive:invI;2{ic}|invI@0||2|0|||D5G4;|ATTR_X(D5FLeave alone;G1.5;NOLPX1.25;Y3.5;)S@X|ATTR_drive0(P)Sstrong0|ATTR_drive1(P)Sstrong1
+Ngeneric:Invisible-Pin|pin@1||11|-12|||||ART_message(D5G2;)S[X is drive strength,P and N drive strengths are equal]
+Ngeneric:Invisible-Pin|pin@2||-1.5|14.5|||||ART_message(D5G2;)S[a pair of inverters,"sized to have \"one gate delay\""]
+Ngeneric:Invisible-Pin|pin@3||-1.5|20|||||ART_message(D5G6;)Sbuf
+Awire|net@4|||0|invI@0|in|-0.5|0|inv@2|out|-2|0
+Awire|net@5|||1800|invI@0|out|4.5|0|conn@0|a|9|0
+Awire|net@6|||0|inv@2|in|-7|0|conn@1|y|-12|0
+Ein||D5G2;|conn@1|a|I|ATTR_le(D5G1;NY-2;)S.25
+Eout||D5G2;|conn@0|y|O|ATTR_le(D5G1;NY2;)I1
+X
+
+# Cell contactGallery;1{lay}
+CcontactGallery;1{lay}||tsmcSun40GP|1252818322426|1252875051985|
+Ngeneric:Facet-Center|art@0||0|0||||AV
+NX-Metal-1-Metal-2-Con|contact@0||-63|-30|||R|
+NMetal-1-Metal-2-Con|contact@1||-135|-30||||
+NZ-Metal-1-Metal-2-Con|contact@2||-135|-45||||
+NA-Metal-1-Metal-2-Con|contact@3||-99|-30||||
+NAW-Metal-1-Metal-2-Con|contact@4||-99|-45||||
+NXW-Metal-1-Metal-2-Con|contact@5||-63|-45|||R|
+NAWM-Metal-1-Metal-2-Con|contact@6||-99|-60|||R|
+NXWM-Metal-1-Metal-2-Con|contact@7||-63|-60|||R|
+NXDWM1-Metal-1-Metal-2-Con|contact@8||-63|-75|||R|
+NXDWM2-Metal-1-Metal-2-Con|contact@9||-63|-90|||R|
+Ngeneric:Invisible-Pin|pin@0||-81|-30|||||ART_message(D5G8;)SX
+Ngeneric:Invisible-Pin|pin@1||-153|-30|||||ART_message(D5G8;)S*
+Ngeneric:Invisible-Pin|pin@2||-153|-45|||||ART_message(D5G8;)SZ
+Ngeneric:Invisible-Pin|pin@3||-117|-30|||||ART_message(D5G8;)SA
+Ngeneric:Invisible-Pin|pin@4||-117|-45|||||ART_message(D5G8;)SAW
+Ngeneric:Invisible-Pin|pin@5||-81|-45|||||ART_message(D5G8;)SXW
+Ngeneric:Invisible-Pin|pin@6||-117|-60|||||ART_message(D5G8;)SAWM
+Ngeneric:Invisible-Pin|pin@7||-81|-60|||||ART_message(D5G8;)SXWM
+Ngeneric:Invisible-Pin|pin@8||-81|-75|||||ART_message(D5G8;)SXWM1
+Ngeneric:Invisible-Pin|pin@9||-81|-90|||||ART_message(D5G8;)SXWM2
+X
+
 # Cell fakeForDRC;1{lay}
 CfakeForDRC;1{lay}|oneCell|tsmcSun40GP|1250309607249|1250370709293||ATTR_NCC(D5G10;NTX-360;Y618.75;)S["exportsConnectedByParent vdd /vdd_[0-9]+/","exportsConnectedByParent gnd /gnd_[0-9]+/","exportsConnectedByParent disableLO /disableLO_[0-9]+/","exportsConnectedByParent disable /disable_[0-9]+/"]
 Ngeneric:Facet-Center|art@0||0|0||||AV
@@ -176,7 +243,7 @@ Evdd_5||D5G2;|pin@16||P
 X
 
 # Cell inv_x1x1;1{lay}
-Cinv_x1x1;1{lay}||tsmcSun40GP|1249617237093|1250231759130||DRC_last_good_drc_area_date()G1250207852688|DRC_last_good_drc_bit()I34|DRC_last_good_drc_date()G1250207852688
+Cinv_x1x1;1{lay}|inv_x1|tsmcSun40GP|1249617237093|1252874433106||DRC_last_good_drc_area_date()G1250207852688|DRC_last_good_drc_bit()I34|DRC_last_good_drc_date()G1250207852688
 Ngeneric:Facet-Center|art@0||0|0||||AV
 NX-Metal-1-Metal-2-Con|contact@5||-9|105|||YR|
 NX-Metal-1-Metal-2-Con|contact@6||-9|-45|||YR|
@@ -314,7 +381,7 @@ Evdd_7||D5G2;|pin@30||P
 X
 
 # Cell inv_x1x1NEW;1{lay}
-Cinv_x1x1NEW;1{lay}||tsmcSun40GP|1249617237093|1250399459054||ATTR_NCC(D5G10;NTX6;Y197;)S["exportsConnectedByParent vdd /vdd_[0-9]+/","exportsConnectedByParent gnd /gnd_[0-9]+/","exportsConnectedByParent disableLO /disableLO_[0-9]+/","exportsConnectedByParent disable /disable_[0-9]+/"]|DRC_last_good_drc_area_date()G1250399462128|DRC_last_good_drc_bit()I34|DRC_last_good_drc_date()G1250399462128
+Cinv_x1x1NEW;1{lay}|inv_x1|tsmcSun40GP|1249617237093|1252874443454||ATTR_NCC(D5G10;NTX6;Y197;)S["exportsConnectedByParent vdd /vdd_[0-9]+/","exportsConnectedByParent gnd /gnd_[0-9]+/","exportsConnectedByParent disableLO /disableLO_[0-9]+/","exportsConnectedByParent disable /disable_[0-9]+/"]|DRC_last_good_drc_area_date()G1250399462128|DRC_last_good_drc_bit()I34|DRC_last_good_drc_date()G1252874887745
 Ngeneric:Facet-Center|art@0||0|0||||AV
 NMetal-1-Poly-Con|contact@12||-18|-6.5|-2|18||
 NAN-Metal-1-N-Diff-Con|contact@32||-9|-58.5|||R|
@@ -440,7 +507,7 @@ Evdd_5||D5G2;|pin@31||P
 X
 
 # Cell inv_x2;1{lay}
-Cinv_x2;1{lay}||tsmcSun40GP|1249617237093|1250310567418||ATTR_NCC(D5G10;NTX22;Y136.5;)S["exportsConnectedByParent vdd /vdd_[0-9]+/","exportsConnectedByParent gnd /gnd_[0-9]+/"]|DRC_last_good_drc_area_date()G1250231598292|DRC_last_good_drc_bit()I34|DRC_last_good_drc_date()G1250365539836
+Cinv_x2;1{lay}|inv_x1|tsmcSun40GP|1249617237093|1252874448622||ATTR_NCC(D5G10;NTX22;Y136.5;)S["exportsConnectedByParent vdd /vdd_[0-9]+/","exportsConnectedByParent gnd /gnd_[0-9]+/"]|DRC_last_good_drc_area_date()G1250231598292|DRC_last_good_drc_bit()I34|DRC_last_good_drc_date()G1252874887745
 Ngeneric:Facet-Center|art@0||0|0||||AV
 NAN-Metal-1-P-Diff-Con|contact@1||0|66|36||YR|
 NX-Metal-1-Metal-2-Con|contact@2||0|45|||YR|
@@ -524,7 +591,7 @@ Evdd_5||D5G2;|pin@19||P
 X
 
 # Cell inv_x2x1;1{lay}
-Cinv_x2x1;1{lay}||tsmcSun40GP|1249617237093|1250571193631||ATTR_NCC(D5G10;NTX6;Y197;)S["exportsConnectedByParent vdd /vdd_[0-9]+/","exportsConnectedByParent gnd /gnd_[0-9]+/","exportsConnectedByParent disableLO /disableLO_[0-9]+/","exportsConnectedByParent disable /disable_[0-9]+/"]|DRC_last_good_drc_area_date()G1250571196474|DRC_last_good_drc_bit()I34|DRC_last_good_drc_date()G1250571196474
+Cinv_x2x1;1{lay}|inv_x1|tsmcSun40GP|1249617237093|1252874452847||ATTR_NCC(D5G10;NTX6;Y197;)S["exportsConnectedByParent vdd /vdd_[0-9]+/","exportsConnectedByParent gnd /gnd_[0-9]+/","exportsConnectedByParent disableLO /disableLO_[0-9]+/","exportsConnectedByParent disable /disable_[0-9]+/"]|DRC_last_good_drc_area_date()G1250571196474|DRC_last_good_drc_bit()I34|DRC_last_good_drc_date()G1252874887745
 Ngeneric:Facet-Center|art@0||0|0||||AV
 NMetal-1-Poly-Con|contact@12||-9|-6.5|-2|18||
 NAN-Metal-1-N-Diff-Con|contact@32||-9|-73.5|12||R|
@@ -640,62 +707,243 @@ Evdd_4||D5G2;|pin@30||P
 Evdd_5||D5G2;|pin@31||P
 X
 
-# Cell ivanWantsThis;1{sch}
-CivanWantsThis;1{sch}||schematic|1248842349511|1248928586663||LEDRIVE_inv@1()F63.674084|LEDRIVE_inv@2()F63.674084|LEDRIVE_inv@3()F63.674084|LEDRIVE_inv@5()F52.500854|LEDRIVE_inv@6()F52.500854|LEDRIVE_nor2@0()F166.66039|LEDRIVE_nor3@0()F144.65405
-IpurpleFive:LEsettings;1{ic}|LEsettin@0||10|-13|||D5G4;|ATTR_LESETTINGS(D6G1;NPX-5.5;Y-3.25;)I1|ATTR_alpha(D5G1;NPX-3;Y-1.25;)F0.7|ATTR_epsilon(D6G1;NPX-5.5;Y1.75;)F0.0010|ATTR_gate_cap(D6G1;NPX-5.5;Y-0.25;)F0.19|ATTR_keeper_ratio(D5G1;NPX-1.5;Y-2.25;)F0.1|ATTR_max_iter(D6G1;NPX-5.5;Y0.75;)I30|ATTR_su(D6G1;NPX-5.5;Y3.75;)S6|ATTR_wire_ratio(D6G1;NPX-5.5;Y2.75;)F0.16
+# Cell inv_x8;1{lay}
+Cinv_x8;1{lay}|inv_x1|tsmcSun40GP|1249617237093|1252874457591||ATTR_NCC(D5G10;NTX9;Y194.5;)S["exportsConnectedByParent vdd /vdd_[0-9]+/","exportsConnectedByParent gnd /gnd_[0-9]+/","exportsConnectedByParent disableLO /disableLO_[0-9]+/","exportsConnectedByParent disable /disable_[0-9]+/"]|DRC_last_good_drc_area_date()G1252822534715|DRC_last_good_drc_bit()I34|DRC_last_good_drc_date()G1252822654103
+Ngeneric:Facet-Center|art@0||0|0||||AV
+NAN-Metal-1-P-Diff-Con|contact@19||0|74|84||R|
+NAN-Metal-1-P-Diff-Con|contact@26||-18|74|84||R|
+NAN-Metal-1-P-Diff-Con|contact@27||18|74|84||R|
+NAN-Metal-1-N-Diff-Con|contact@39||-18|-87|36||R|
+NAN-Metal-1-N-Diff-Con|contact@40||18|-87|36||R|
+NAN-Metal-1-N-Diff-Con|contact@41||0|-87|36||R|
+NAN-Metal-1-N-Diff-Con|contact@59||0|-87|||R|
+NA-Metal-1-Poly-Con|contact@61||-9|-15||||
+NX-Metal-1-Metal-2-Con|contact@72||18|-75|||R|
+NX-Metal-1-Metal-2-Con|contact@73||-18|-105|||R|
+NX-Metal-1-Metal-2-Con|contact@74||-18|-75|||R|
+NX-Metal-1-Metal-2-Con|contact@75||-18|45|||R|
+NX-Metal-1-Metal-2-Con|contact@76||-18|75|||R|
+NX-Metal-1-Metal-2-Con|contact@77||-18|105|||R|
+NX-Metal-1-Metal-2-Con|contact@78||18|45|||R|
+NX-Metal-1-Metal-2-Con|contact@79||18|75|||R|
+NX-Metal-1-Metal-2-Con|contact@80||18|105|||R|
+NX-Metal-1-Metal-2-Con|contact@81||18|-105|||R|
+NN-Transistor|nmos@0||-9|-87|36||YR|
+NN-Transistor|nmos@2||9|-87|36||YR|
+NMetal-1-Pin|pin@2||18|0|||Y|
+NMetal-2-Pin|pin@5||-27.5|-105|||R|
+NMetal-2-Pin|pin@9||-27.5|-75|||R|
+NMetal-2-Pin|pin@10||-27.5|-45|||R|
+NMetal-2-Pin|pin@11||-27|45||||
+NMetal-2-Pin|pin@12||-27|75||||
+NMetal-2-Pin|pin@13||-27|105||||
+NMetal-2-Pin|pin@14||27|105||||
+NMetal-2-Pin|pin@15||27|75||||
+NMetal-2-Pin|pin@16||27|45||||
+NMetal-2-Pin|pin@18||26.5|-75|||R|
+NMetal-2-Pin|pin@19||26.5|-45|||R|
+NMetal-2-Pin|pin@20||26.5|-105|||R|
+NPoly-Pin|pin@27||27|128||||
+NPoly-Pin|pin@28||27|-118||||
+NPoly-Pin|pin@29||-27|128||||
+NPoly-Pin|pin@30||-27|-118||||
+NPoly-Pin|pin@36||9|-15||||
+NPoly-Pin|pin@37||9|-17||||
+NPoly-Pin|pin@38||9|-15.5||||
+NMetal-1-Pin|pin@39||0|15||||
+NMetal-1-Pin|pin@40||18|15||||
+NMetal-1-Pin|pin@41||18|-30||||
+NMetal-1-Pin|pin@42||0|-30||||
+NprBoundary-Node|plnode@2||0|10|54|270||A
+NN-Well-Node|plnode@5||0|75|66|136||A
+NPPlus-Node|plnode@6||0|75|60|136||A
+NP-Transistor|pmos@0||-9|74|84||YR|
+NP-Transistor|pmos@1||9|74|84||YR|
+AMetal-2|net@59|||S0|contact@74||-18|-75|pin@9||-27.5|-75
+AMetal-2|net@65|||S0|contact@73||-18|-105|pin@5||-27.5|-105
+AP-Diff|net@75|||S1800|pmos@1|diff-top|0|64|pmos@0|diff-bottom|0|64
+AP-Diff|net@76|||S0|pmos@1|diff-top|0|75|contact@19||0|75
+AMetal-2|net@78|||S1800|pin@11||-27|45|contact@75||-18|45
+AMetal-2|net@81|||S1800|pin@12||-27|75|contact@76||-18|75
+AMetal-2|net@84|||S1800|pin@13||-27|105|contact@77||-18|105
+AMetal-2|net@87|||S1800|contact@75||-18|45|contact@78||18|45
+AMetal-2|net@88|||S1800|contact@78||18|45|pin@16||27|45
+AMetal-2|net@90|||S1800|contact@76||-18|75|contact@79||18|75
+AMetal-2|net@91|||S1800|contact@79||18|75|pin@15||27|75
+AMetal-2|net@93|||S1800|contact@77||-18|105|contact@80||18|105
+AMetal-2|net@94|||S1800|contact@80||18|105|pin@14||27|105
+AP-Diff|net@95|||S0|pmos@0|diff-top|-18|75|contact@26||-18|75
+AMetal-1|net@96||-7|IJS0|contact@75||-18|45|contact@26||-18|45
+AP-Diff|net@97|||S0|pmos@0|diff-top|-18|74|pmos@0|diff-top|-18|74
+AMetal-1|net@98|||S0|contact@77||-18|105|contact@26||-18|105
+AP-Diff|net@99|||S0|pmos@1|diff-bottom|18|75|contact@27||18|75
+AMetal-1|net@100||-7|IJS0|contact@79||18|75|contact@27||18|75
+AMetal-1|net@101|||S0|contact@78||18|45|contact@27||18|45
+AMetal-1|net@102|||S0|contact@80||18|105|contact@27||18|105
+APoly|net@103|||S900|pin@27||27|128|pin@28||27|-118
+APoly|net@104|||S900|pin@29||-27|128|pin@30||-27|-118
+APoly|net@116|||S2700|contact@61||-9|-15|pmos@0|poly-right|-9|17
+AMetal-2|net@126|||S0|pin@18||26.5|-75|contact@72||18|-75
+AMetal-2|net@127|||S0|contact@72||18|-75|contact@74||-18|-75
+AMetal-2|net@136|||S0|pin@20||26.5|-105|contact@81||18|-105
+AMetal-2|net@137|||S0|contact@81||18|-105|contact@73||-18|-105
+AN-Diff|net@141|||S0|nmos@0|diff-bottom|0|-79|nmos@2|diff-top|0|-79
+AMetal-2|net@157|||S1800|pin@10||-27.5|-45|pin@19||26.5|-45
+AN-Diff|net@158|||S0|nmos@0|diff-top|-18|-82|contact@39||-18|-82
+AMetal-1|net@159||-7|IJS0|contact@74||-18|-75|contact@39||-18|-75
+AMetal-1|net@160|||S2700|contact@73||-18|-105|contact@39||-18|-82
+AN-Diff|net@161|||S0|nmos@2|diff-bottom|18|-82|contact@40||18|-82
+AMetal-1|net@162|||S2700|contact@81||18|-105|contact@40||18|-82
+AMetal-1|net@163||-7|IJS0|contact@72||18|-75|contact@40||18|-75
+AN-Diff|net@164|||S0|nmos@2|diff-top|0|-82|contact@41||0|-82
+APoly|net@166|||S900|pmos@1|poly-right|9|17|pin@36||9|-15
+APoly|net@167||4|IJS0|pin@36||9|-15|contact@61||-9|-15
+APoly|net@168|||S2700|pin@37||9|-17|pin@38||9|-15.5
+APoly|net@169|||JS2700|pin@38||9|-15.5|pin@36||9|-15
+AN-Diff|net@177|||S0|nmos@0|diff-bottom|0|-87|contact@59||0|-87
+APoly|net@239|||S2700|nmos@0|poly-left|-9|-54|contact@61||-9|-15
+APoly|net@240|||S900|pin@37||9|-17|nmos@2|poly-left|9|-54
+AMetal-1|net@241|||S900|contact@19||0|74|pin@39||0|15
+AMetal-1|net@242|||S1800|pin@39||0|15|pin@40||18|15
+AMetal-1|net@243|||S2700|pin@2||18|0|pin@40||18|15
+AMetal-1|net@244|||S900|pin@2||18|0|pin@41||18|-30
+AMetal-1|net@245|||S0|pin@41||18|-30|pin@42||0|-30
+AMetal-1|net@246|||S2700|contact@41||0|-87|pin@42||0|-30
+Egnd_5||D5G2;|pin@5||U
+Egnd_6||D5G2;|pin@9||U
+Egnd_7||D5G2;|pin@10||U
+Egnd_8||D5G2;|pin@18||U
+Egnd_9||D5G2;|pin@19||U
+Egnd_10||D5G2;|pin@20||U
+Ein||D5G2;|contact@61||I
+Eout||D5G2;|pin@2||O
+Evdd||D5G2;|pin@11||P
+Evdd_1||D5G2;|pin@12||P
+Evdd_2||D5G2;|pin@13||P
+Evdd_3||D5G2;|pin@14||P
+Evdd_4||D5G2;|pin@15||P
+Evdd_5||D5G2;|pin@16||P
+X
+
+# Cell inverterStudy;1{lay}
+CinverterStudy;1{lay}||tsmcSun40GP|1252802494607|1252824721138||ATTR_NCC(D5G10;NTX65.5;Y178.5;)S["exportsConnectedByParent vdd /vdd_[0-9]+/","exportsConnectedByParent gnd /gnd_[0-9]+/","exportsConnectedByParent disableLO /disableLO_[0-9]+/","exportsConnectedByParent disable /disable_[0-9]+/"]|DRC_last_good_drc_area_date()G1252823366734|DRC_last_good_drc_bit()I34|DRC_last_good_drc_date()G1252823366734
 Ngeneric:Facet-Center|art@0||0|0||||AV
-IredFive:inv;1{ic}|inv@0||8.5|-1.75|XRR||D5G4;|ATTR_X(D5FLeave alone;G1.5;NOLPX1.5;Y2;)S100|ATTR_drive0(P)Sstrong0|ATTR_drive1(P)Sstrong1
-IpurpleFive:inv;1{ic}|inv@1||-27.25|-0.25|||D5G4;|ATTR_LEGATE(P)I1|ATTR_LEPARALLGRP(P)I-1|ATTR_X(D5G1.5;NOJPX1.5;Y2;)SLE.getdrive()|ATTR_drive0(P)Sstrong0|ATTR_drive1(P)Sstrong1|ATTR_su(P)I-1
-IpurpleFive:inv;1{ic}|inv@2||-27.25|-6.25|||D5G4;|ATTR_LEGATE(P)I1|ATTR_LEPARALLGRP(P)I-1|ATTR_X(D5G1.5;NOJPX1.5;Y2;)SLE.getdrive()|ATTR_drive0(P)Sstrong0|ATTR_drive1(P)Sstrong1|ATTR_su(P)I-1
-IpurpleFive:inv;1{ic}|inv@3||-26.25|-13.25|||D5G4;|ATTR_LEGATE(P)I1|ATTR_LEPARALLGRP(P)I-1|ATTR_X(D5G1.5;NOJPX1.5;Y2;)SLE.getdrive()|ATTR_drive0(P)Sstrong0|ATTR_drive1(P)Sstrong1|ATTR_su(P)I-1
-IredFive:inv;1{ic}|inv@4||10.25|-21|XRR||D5G4;|ATTR_X(D5FLeave alone;G1.5;NOLPX1.5;Y2;)S100|ATTR_drive0(P)Sstrong0|ATTR_drive1(P)Sstrong1
-IpurpleFive:inv;1{ic}|inv@5||-23.25|-20|||D5G4;|ATTR_LEGATE(P)I1|ATTR_LEPARALLGRP(P)I-1|ATTR_X(D5G1.5;NOJPX1.5;Y2;)SLE.getdrive()|ATTR_drive0(P)Sstrong0|ATTR_drive1(P)Sstrong1|ATTR_su(P)I-1
-IpurpleFive:inv;1{ic}|inv@6||-28|-22.5|||D5G4;|ATTR_LEGATE(P)I1|ATTR_LEPARALLGRP(P)I-1|ATTR_X(D5G1.5;NOJPX1.5;Y2;)SLE.getdrive()|ATTR_drive0(P)Sstrong0|ATTR_drive1(P)Sstrong1|ATTR_su(P)I-1
-IpurpleFive:nor2;1{ic}|nor2@0||-11.75|-21|||D5G4;|ATTR_Delay(D5G1;NPX2.5;Y-2;)I100|ATTR_LEGATE(P)I1|ATTR_LEPARALLGRP(P)I-1|ATTR_X(D5G1.5;NOJPX2.25;Y2.5;)SLE.getdrive()|ATTR_drive0(P)Sstrong0|ATTR_drive1(P)Sstrong1|ATTR_su(P)I-1
-Inor3;1{ic}|nor3@0||-3.75|-1.75|XRR||D5G4;
-NWire_Pin|pin@0||18.5|-1.75||||
-NWire_Pin|pin@1||-8.75|-0.25||||
-NWire_Pin|pin@2||-15.75|-6.25||||
-NWire_Pin|pin@3||-15.75|-1.5||||
-NWire_Pin|pin@4||-8.75|-1.5||||
-NWire_Pin|pin@5||-13.75|-13.25||||
-NWire_Pin|pin@6||-13.75|-3.5||||
-NWire_Pin|pin@7||-8.75|-3.5||||
-NWire_Pin|pin@8||-36.75|-13.25||||
-NWire_Pin|pin@9||-36.5|-6.25||||
-NWire_Pin|pin@10||-36|-0.25||||
-NWire_Pin|pin@12||4.25|-21||||
-NWire_Pin|pin@13||-19|-22.5||||
-NWire_Pin|pin@14||-18.75|-22.5||||
-NWire_Pin|pin@15||-14.25|-22.5||||
-Awire|net@1|||1800|inv@0|out|11|-1.75|pin@0||18.5|-1.75
-Awire|net@2|||1800|inv@1|out|-24.75|-0.25|pin@1||-8.75|-0.25
-Awire|net@4|||1800|inv@2|out|-24.75|-6.25|pin@2||-15.75|-6.25
-Awire|net@5|||2700|pin@2||-15.75|-6.25|pin@3||-15.75|-1.5
-Awire|net@6|||1800|pin@3||-15.75|-1.5|pin@4||-8.75|-1.5
-Awire|net@8|||1800|inv@3|out|-23.75|-13.25|pin@5||-13.75|-13.25
-Awire|net@9|||2700|pin@5||-13.75|-13.25|pin@6||-13.75|-3.5
-Awire|net@10|||1800|pin@6||-13.75|-3.5|pin@7||-8.75|-3.5
-Awire|net@12|||0|inv@3|in|-28.75|-13.25|pin@8||-36.75|-13.25
-Awire|net@13|||0|inv@2|in|-29.75|-6.25|pin@9||-36.5|-6.25
-Awire|net@14|||0|inv@1|in|-29.75|-0.25|pin@10||-36|-0.25
-Awire|net@17|||1800|nor2@0|out|-9.25|-21|pin@12||4.25|-21
-Awire|net@20|||0|inv@4|in|7.75|-21|pin@12||4.25|-21
-Awire|net@21|||1800|inv@5|out|-20.75|-20|nor2@0|inb|-14.25|-20
-Awire|net@22|||1800|inv@6|out|-25.5|-22.5|pin@13||-19|-22.5
-Awire|net@23|||1800|pin@13||-19|-22.5|pin@14||-18.75|-22.5
-Awire|net@24|||1800|pin@14||-18.75|-22.5|pin@15||-14.25|-22.5
-Awire|net@25|||900|nor2@0|ina|-14.25|-22|pin@15||-14.25|-22.5
+NX-Metal-1-Metal-2-Con|contact@1||90|0|||R|
+NAWM-Metal-1-Metal-2-Con|contact@30||-27|0|-2|2|RRR|
+NAWM-Metal-1-Metal-2-Con|contact@32||126|-30|-2|2|R|
+NAWM-Metal-1-Metal-2-Con|contact@34||9|-30|-2|2|R|
+NAWM-Metal-1-Metal-2-Con|contact@35||153|15|-2|2|R|
+NAWM-Metal-1-Metal-2-Con|contact@36||54|15|-2|2|R|
+Iinv_x8;1{lay}|inv_x8@0||0|0|||D5G4;
+Iinv_x8;1{lay}|inv_x8@1||72|0|||D5G4;
+Iinv_x8;1{lay}|inv_x8@2||144|0|||D5G4;
+NMetal-1-Pin|pin@0||54|-15||||
+NMetal-1-Pin|pin@1||162|15||||
+NMetal-1-Pin|pin@2||18|-30||||
+NMetal-1-Pin|pin@3||-27|-15||||
+NN-Well-Node|plnode@0||72|75|210|136||A
+NPPlus-Node|plnode@1||72|75|204|136||A
+NMetal-1-Node|plnode@3||126|-15|7|7||
+NP-Diff-Node|plnode@4||78|74|249|96||
+NN-Diff-Node|plnode@5||75.5|-87|236|48||
+Iselect_x16;1{lay}|select_x@2||73|0||A|D5G4;
+Iwells;1{lay}|wells@0||-130|0|||D5G4;
+AMetal-2|net@5|||S1800|inv_x8@0|gnd_9|26.5|-45|inv_x8@1|gnd_7|44.5|-45
+AMetal-2|net@6|||S1800|inv_x8@0|gnd_8|26.5|-75|inv_x8@1|gnd_6|44.5|-75
+AMetal-2|net@7|||S1800|inv_x8@0|gnd_10|26.5|-105|inv_x8@1|gnd_5|44.5|-105
+AMetal-2|net@8|||S1800|inv_x8@1|gnd_9|98.5|-45|inv_x8@2|gnd_7|116.5|-45
+AMetal-2|net@9|||S1800|inv_x8@1|gnd_8|98.5|-75|inv_x8@2|gnd_6|116.5|-75
+AMetal-2|net@10|||S1800|inv_x8@1|gnd_10|98.5|-105|inv_x8@2|gnd_5|116.5|-105
+AMetal-2|net@11|||S1800|inv_x8@0|vdd_3|27|105|inv_x8@1|vdd_2|45|105
+AMetal-2|net@12|||S1800|inv_x8@0|vdd_4|27|75|inv_x8@1|vdd_1|45|75
+AMetal-2|net@13|||S1800|inv_x8@0|vdd_5|27|45|inv_x8@1|vdd|45|45
+AMetal-2|net@14|||S1800|inv_x8@1|vdd_5|99|45|inv_x8@2|vdd|117|45
+AMetal-2|net@15|||S1800|inv_x8@1|vdd_4|99|75|inv_x8@2|vdd_1|117|75
+AMetal-2|net@16|||S1800|inv_x8@1|vdd_3|99|105|inv_x8@2|vdd_2|117|105
+AMetal-2|net@29|||S1800|wells@0|gnd_2|-133|-105|inv_x8@0|gnd_5|-27.5|-105
+AMetal-2|net@30|||S1800|wells@0|gnd_1|-133|-75|inv_x8@0|gnd_6|-27.5|-75
+AMetal-2|net@31|||S1800|wells@0|gnd|-133|-45|inv_x8@0|gnd_7|-27.5|-45
+AMetal-2|net@32|||S1800|wells@0|vdd|-133|45|inv_x8@0|vdd|-27|45
+AMetal-2|net@33|||S1800|wells@0|vdd_1|-133|75|inv_x8@0|vdd_1|-27|75
+AMetal-2|net@34|||S1800|wells@0|vdd_2|-133|105|inv_x8@0|vdd_2|-27|105
+AMetal-1|net@39|||S2700|contact@1||90|0|inv_x8@1|out|90|0
+AMetal-1|net@75|||IJS900|plnode@3||126|-15|contact@32||126|-30
+AMetal-1|net@82|||IJS1800|plnode@3||126|-15|inv_x8@2|in|135|-15
+AMetal-2|net@101|||S0|contact@1||90|0|contact@30||-27|0
+AMetal-2|net@105|||S1800|contact@34||9|-30|contact@32||126|-30
+AMetal-2|net@107|||S1800|contact@36||54|15|contact@35||153|15
+AMetal-1|net@108|||IS900|contact@36||54|15|pin@0||54|-15
+AMetal-1|net@109|||S0|inv_x8@1|in|63|-15|pin@0||54|-15
+AMetal-1|net@110|||S0|pin@1||162|15|contact@35||153|15
+AMetal-1|net@111|||S900|pin@1||162|15|inv_x8@2|out|162|0
+AMetal-1|net@112|||S2700|pin@2||18|-30|inv_x8@0|out|18|0
+AMetal-1|net@113|||S0|pin@2||18|-30|contact@34||9|-30
+AMetal-1|net@114|||S2700|pin@3||-27|-15|contact@30||-27|0
+AMetal-1|net@115|||S1800|pin@3||-27|-15|inv_x8@0|in|-9|-15
+Egnd_9|gnd|D5G2;|inv_x8@2|gnd_9|U
+Egnd_8||D5G2;|inv_x8@2|gnd_8|U
+Egnd_10||D5G2;|inv_x8@2|gnd_10|U
+Evdd_5|vdd|D5G2;|inv_x8@2|vdd_5|P
+Evdd_3||D5G2;|inv_x8@2|vdd_3|P
+Evdd_4||D5G2;|inv_x8@2|vdd_4|P
+X
+
+# Cell inverterStudy;1{sch}
+CinverterStudy;1{sch}||schematic|1252801918221|1252892550179|
+IpurpleFive:LEsettings;1{ic}|LEsettin@8||11|-10|||D5G4;|ATTR_LESETTINGS(D5G1;NPY-3.75;)I1|ATTR_alpha(D5G1;NPY-1.75;)F0.7|ATTR_epsilon(D5G1;NPY1.25;)F0.0010|ATTR_gate_cap(D5G1;NPY-0.75;)F0.19|ATTR_keeper_ratio(D5G1;NPY-2.75;)F0.1|ATTR_max_iter(D5G1;NPY0.25;)I30|ATTR_su(D5G1;NPY3.25;)F4.7|ATTR_wire_ratio(D5G1;NPY2.25;)F0.16|ATTR_x1inverter_length(D5G1;P)F2.0|ATTR_x1inverter_nwidth(D5G1;P)F3.0|ATTR_x1inverter_pwidth(D5G1;P)F6.0
+Ngeneric:Facet-Center|art@0||0|0||||AV
+IpurpleFive:inv;1{ic}|inv@5||-18|-3|R||D5G4;|ATTR_Delay(D5G1;NPX2;Y-2;)I100|ATTR_LEGATE(P)I1|ATTR_LEPARALLGRP(P)I-1|ATTR_X(D5G1.5;NOJPX1.5;Y2;)SLE.getdrive()|ATTR_drive0(P)Sstrong0|ATTR_drive1(P)Sstrong1|ATTR_su(P)I-1
+IpurpleFive:inv;1{ic}|inv@6||5|-2|RRR||D5G4;|ATTR_Delay(D5G1;NPX2;Y-2;)I100|ATTR_LEGATE(P)I1|ATTR_LEPARALLGRP(P)I-1|ATTR_X(D5G1.5;NOJPX1.5;Y2;)SLE.getdrive()|ATTR_drive0(P)Sstrong0|ATTR_drive1(P)Sstrong1|ATTR_su(P)I-1
+IpurpleFive:inv;1{ic}|inv@7||-6|7|||D5G4;|ATTR_Delay(D5G1;NOJPX2;Y-2;)S100|ATTR_LEGATE(P)I1|ATTR_LEPARALLGRP(P)I-1|ATTR_X(D5G1.5;NOJPX1.5;Y2;)SLE.getdrive()|ATTR_drive0(P)Sstrong0|ATTR_drive1(P)Sstrong1|ATTR_su(P)I-1
+NWire_Pin|pin@0||-18|5||||
+NWire_Pin|pin@1||5|5||||
+NWire_Pin|pin@6||-27|5||||
+NWire_Pin|pin@7||-27|10||||
+NWire_Pin|pin@8||-15|10||||
+NWire_Pin|pin@9||-15|7||||
+NWire_Pin|pin@10||0|7||||
+NWire_Pin|pin@11||11|10||||
+NWire_Pin|pin@12||11|7||||
+NWire_Pin|pin@13||11|5||||
+NWire_Pin|pin@14||-18|-9||||
+NWire_Pin|pin@15||5|-9||||
+Iorange40nm:wire40;1{ic}|wire40@0||-21.5|10|||D5G4;|ATTR_L(D5FLeave alone;G1;PUD)D973.5|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||5.5|10|||D5G4;|ATTR_L(D5FLeave alone;G1;PUD)D985.5|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||-7.5|-9|||D5G4;|ATTR_L(D5FLeave alone;G1;PUD)D976.5|ATTR_LEWIRE(P)I1|ATTR_layer(D5FLeave alone;G1;NOLPY-1;)S2|ATTR_width(D5FLeave alone;G1;NOLPY-2;)S7
+Awire|net@0|||2700|inv@5|out|-18|-0.5|pin@0||-18|5
+Awire|net@2|||2700|inv@6|in|5|0.5|pin@1||5|5
+Awire|net@10|||0|pin@0||-18|5|pin@6||-27|5
+Awire|net@11|||2700|pin@6||-27|5|pin@7||-27|10
+Awire|net@12|||1800|pin@7||-27|10|wire40@0|a|-24|10
+Awire|net@13|||1800|wire40@0|b|-19|10|pin@8||-15|10
+Awire|net@14|||900|pin@8||-15|10|pin@9||-15|7
+Awire|net@15|||1800|pin@9||-15|7|inv@7|in|-8.5|7
+Awire|net@16|||1800|inv@7|out|-3.5|7|pin@10||0|7
+Awire|net@17|||2250|pin@10||0|7|wire40@1|a|3|10
+Awire|net@18|||1800|wire40@1|b|8|10|pin@11||11|10
+Awire|net@19|||900|pin@11||11|10|pin@12||11|7
+Awire|net@20|||900|pin@12||11|7|pin@13||11|5
+Awire|net@21|||1800|pin@1||5|5|pin@13||11|5
+Awire|net@22|||0|wire40@2|a|-10|-9|pin@14||-18|-9
+Awire|net@23|||900|inv@5|in|-18|-5.5|pin@14||-18|-9
+Awire|net@24|||1800|wire40@2|b|-5|-9|pin@15||5|-9
+Awire|net@25|||900|inv@6|out|5|-4.5|pin@15||5|-9
+X
+
+# Cell inverterStudyRotated;1{lay}
+CinverterStudyRotated;1{lay}||tsmcSun40GP|1252816454336|1252816462264|
+Ngeneric:Facet-Center|art@0||0|0||||AV
+IinverterStudy;1{lay}|inverter@0||0|0|R||D5G4;
 X
 
 # Cell nand2nand2;4{ic}
-Cnand2nand2;4{ic}||artwork|1247529105994|1248944238671|E|ATTR_X(D5G1;HNOLPX8.25;Y-1.5;)S""
+Cnand2nand2;4{ic}||artwork|1247529105994|1253147877494|E|ATTR_LEGATE(D5G1;HNPX8.25;Y-9.5;)I1|ATTR_X(D5G1;HNOJPX8.25;Y-5.5;)SLE.getdrive()|ATTR_su(D5G1;HNPX8.25;Y-7.5;)I-1
 Ngeneric:Facet-Center|art@0||0|0||||AV
-NThick-Circle|art@19||-0.25|-2|8|7|YRR||ART_color()I10|ART_degrees()F[0.0,1.0471976]
-NThick-Circle|art@20||-4.25|-2|8|7|||ART_color()I10|ART_degrees()F[0.0,1.0471976]
-NThick-Circle|art@21||-2.25|-4.25|6|6|500||ART_color()I10|ART_degrees()I800
-NThick-Circle|art@24||-0.25|4.5|1|1|R||ART_color()I10
-NThick-Circle|art@25||-0.25|2|4|4|||ART_color()I10|ART_degrees()F[0.0,3.1415927]
+NThick-Circle|art@19||-0.25|-2|8|7|YRR||ART_color()I-1174339839|ART_degrees()F[0.0,1.0471976]
+NThick-Circle|art@20||-4.25|-2|8|7|||ART_color()I-1174339839|ART_degrees()F[0.0,1.0471976]
+NThick-Circle|art@21||-2.25|-4.25|6|6|500||ART_color()I-1174339839|ART_degrees()I800
+NThick-Circle|art@24||-0.25|4.5|1|1|R||ART_color()I-1174339839
+NThick-Circle|art@25||-0.25|2|4|4|||ART_color()I-1174339839|ART_degrees()F[0.0,3.1415927]
 Nschematic:Bus_Pin|pin@4||-1.25|-3||||
 Nschematic:Bus_Pin|pin@6||-3.25|-3||||
 Nschematic:Bus_Pin|pin@10||1.25|-3|||X|
@@ -704,38 +952,38 @@ Nschematic:Bus_Pin|pin@46||0|5|-2|-2|R|
 Nschematic:Bus_Pin|pin@54||0|4|-2|-2|R|
 Nschematic:Bus_Pin|pin@85||0|0|-2|-2|R|
 Nschematic:Bus_Pin|pin@86||0|4|-2|-2|R|
-NPin|pin@91||-3.25|-1.5|1|1|R|
-NPin|pin@92||-3.25|-3|||R|
+NPin|pin@91||-3.25|-1.5|1|1|R||ART_color()I-1174339839
+NPin|pin@92||-3.25|-3|||R||ART_color()I-1174339839
 Nschematic:Bus_Pin|pin@93||-1|-1|-2|-2|R|
 Nschematic:Bus_Pin|pin@99||-5.5|-2.5|-2|-2|R|
 Nschematic:Bus_Pin|pin@100||-3|-1|-2|-2|R|
-NPin|pin@102||-1.25|-3|||R|
-NPin|pin@103||-1.25|-1.5|1|1|R|
-NPin|pin@104||-1.25|-1.5|1|1|R|
-NPin|pin@105||-0.5|-0.75|1|1|R|
+NPin|pin@102||-1.25|-3|||R||ART_color()I-1174339839
+NPin|pin@103||-1.25|-1.5|1|1|R||ART_color()I-1174339839
+NPin|pin@104||-1.25|-1.5|1|1|R||ART_color()I-1174339839
+NPin|pin@105||-0.5|-0.75|1|1|R||ART_color()I-1174339839
 Nschematic:Bus_Pin|pin@108||0.75|0|-2|-2|R|
-NPin|pin@109||0.5|-2|1|1|R|
-NPin|pin@110||1.75|-0.75|1|1|R|
-NPin|pin@111||1.75|2|1|1|R|
-NPin|pin@112||1.75|-2|1|1|R|
-NPin|pin@113||-2.25|1|1|1|R|
+NPin|pin@109||0.5|-2|1|1|R||ART_color()I-1174339839
+NPin|pin@110||1.75|-0.75|1|1|R||ART_color()I-1174339839
+NPin|pin@111||1.75|2|1|1|R||ART_color()I-1174339839
+NPin|pin@112||1.75|-2|1|1|R||ART_color()I-1174339839
+NPin|pin@113||-2.25|1|1|1|R||ART_color()I-1174339839
 Nschematic:Bus_Pin|pin@114||-0.25|5|-2|-2|R|
 Nschematic:Bus_Pin|pin@115||-1.25|1|-2|-2|R|
-NPin|pin@116||-2.25|2|1|1|R|
-NPin|pin@117||1.25|-3|||R|
-NPin|pin@118||1.25|-2|1|1|R|
-NPin|pin@119||0.25|-2|1|1||
-NPin|pin@120||0.25|1|1|1||
-AThicker|net@36|||FS900|pin@91||-3.25|-1.5|pin@92||-3.25|-3|ART_color()I10
-AThicker|net@40|||FS900|pin@103||-1.25|-1.5|pin@102||-1.25|-3|ART_color()I10
-AThicker|net@42|||FS450|pin@105||-0.5|-0.75|pin@104||-1.25|-1.5|ART_color()I10
-AThicker|net@44|||FS900|pin@111||1.75|2|pin@112||1.75|-2|ART_color()I10
-AThicker|net@46|||FS900|pin@116||-2.25|2|pin@113||-2.25|1|ART_color()I10
-AThicker|net@47|||FS900|pin@118||1.25|-2|pin@117||1.25|-3|ART_color()I10
-AThicker|net@48|||FS450|pin@110||1.75|-0.75|pin@109||0.5|-2|ART_color()I10
-AThicker|net@49|||FS0|pin@112||1.75|-2|pin@119||0.25|-2|ART_color()I-16777215
-AThicker|net@50|||FS2700|pin@119||0.25|-2|pin@120||0.25|1|ART_color()I-16777215
-AThicker|net@51|||FS0|pin@120||0.25|1|pin@113||-2.25|1|ART_color()I-16777215
+NPin|pin@116||-2.25|2|1|1|R||ART_color()I-1174339839
+NPin|pin@117||1.25|-3|||R||ART_color()I-1174339839
+NPin|pin@118||1.25|-2|1|1|R||ART_color()I-1174339839
+NPin|pin@119||0.25|-2|1|1|||ART_color()I-1174339839
+NPin|pin@120||0.25|1|1|1|||ART_color()I-1174339839
+AThicker|net@36|||FS900|pin@91||-3.25|-1.5|pin@92||-3.25|-3|ART_color()I-1174339839
+AThicker|net@40|||FS900|pin@103||-1.25|-1.5|pin@102||-1.25|-3|ART_color()I-1174339839
+AThicker|net@42|||FS450|pin@105||-0.5|-0.75|pin@104||-1.25|-1.5|ART_color()I-1174339839
+AThicker|net@44|||FS900|pin@111||1.75|2|pin@112||1.75|-2|ART_color()I-1174339839
+AThicker|net@46|||FS900|pin@116||-2.25|2|pin@113||-2.25|1|ART_color()I-1174339839
+AThicker|net@47|||FS900|pin@118||1.25|-2|pin@117||1.25|-3|ART_color()I-1174339839
+AThicker|net@48|||FS450|pin@110||1.75|-0.75|pin@109||0.5|-2|ART_color()I-1174339839
+AThicker|net@49|||FS0|pin@112||1.75|-2|pin@119||0.25|-2|ART_color()I-1174339839
+AThicker|net@50|||FS2700|pin@119||0.25|-2|pin@120||0.25|1|ART_color()I-1174339839
+AThicker|net@51|||FS0|pin@120||0.25|1|pin@113||-2.25|1|ART_color()I-1174339839
 ELSN[ZeroOrTwo]|ina|D5G1;RY-2;|pin@10||I
 EMSN[ZeroOrDone]|inb|D4G1;R|pin@4||I
 EMSN[ZeroOrTwo]|inc|D4G1;R|pin@6||I
@@ -904,7 +1152,7 @@ Evdd_5||D5G2;|pin@70||P
 X
 
 # Cell nand2nand2;1{sch}
-Cnand2nand2;1{sch}||schematic|1247526811643|1250619787673||ATTR_X(D5G1;HNOLPX-15.75;Y-5.5;)S""
+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
 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
@@ -929,8 +1177,9 @@ 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
-IredFive:pms1;2{ic}|pms1@5||7|4.25|X||D5G4;|ATTR_X(D5FLeave alone;G1.5;NOLPX3;)S@X
-IredFive:pms2;1{ic}|pms2@0||-6.25|8.25|X||D5G4;|ATTR_X(D5FLeave alone;G1.5;NOLPX4.75;Y1;)S1
+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]
+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
@@ -957,10 +1206,280 @@ Awire|net@355|||2700|conn@3|y|-11.25|-15.5|pin@112||-11.25|-3.25
 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
-EMSN[ZeroOrDone]|inb|D4G2;X-0.5;|conn@2|a|I
-EMSN[ZeroOrTwo]|inc|D6G2;X-7;|conn@3|y|I
-Efire[1]|out|D6G2;X4.5;|conn@8|a|O
+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
+X
+
+# Cell newCell;1{ic}
+CnewCell;1{ic}||artwork|1242937501096|1253477744345|E
+Ngeneric:Facet-Center|art@0||0|0||||AV
+NTriangle|art@2||3|6.5|3|2|R|
+NTriangle|art@3||3|-8|3|2|R|
+NTriangle|art@4||-5|6.5|3|2|RRR|
+NPin|pin@0||-6|8.5|1|1||
+NPin|pin@1||-6|-10|1|1||
+NPin|pin@2||4|-10|1|1||
+NPin|pin@3||4|8.5|1|1||
+Nschematic:Wire_Pin|pin@9||-6|-7.5||||
+Nschematic:Wire_Pin|pin@16||4|-8.5||||
+Nschematic:Wire_Pin|pin@17||4|6||||
+Nschematic:Wire_Pin|pin@18||-6|6||||
+NPin|pin@20||-6|6|1|1||
+NPin|pin@33||-6|-7.5|1|1||
+Nschematic:Bus_Pin|pin@38||-3.5|-10||||
+Nschematic:Wire_Pin|pin@39||-3.5|-10||||
+Ngeneric:Invisible-Pin|pin@40||-1|-0.5|||||ART_message(D5G2;)S[Counter,GasP,Module]
+Nschematic:Bus_Pin|pin@41||1.5|-10||||
+Nschematic:Wire_Pin|pin@42||2|-10||||
+Nschematic:Bus_Pin|pin@43||-1|-10||||
+Nschematic:Wire_Pin|pin@44||0.5|-10||||
+ASolid|net@0|||FS900|pin@0||-6|8.5|pin@1||-6|-10
+ASolid|net@1|||FS1800|pin@1||-6|-10|pin@2||4|-10
+ASolid|net@2|||FS2700|pin@2||4|-10|pin@3||4|8.5
+ASolid|net@3|||FS0|pin@3||4|8.5|pin@0||-6|8.5
+Aschematic:wire|net@12|||2700|pin@39||-3.5|-10|pin@38||-3.5|-10
+Aschematic:wire|net@13|||0|pin@42||2|-10|pin@41||1.5|-10
+Aschematic:wire|net@14|||0|pin@44||0.5|-10|pin@43||-1|-10
+ELSN[OneOrTwo]|LSN[TwoOrDone]|D5G1;X5;|pin@17||B
+ELSN[OneOrDone]|LSN[TwoOrOne]|D6G1;X1;|pin@16||B
+EMSN[OneOrTwo]|MSN[TwoOrDone]|D4G1;X-1;|pin@18||B
+EMSN[OneOrDone]|MSN[TwoOrOne]|D4G1;X-1;|pin@9||B
+Edisable||D5G2;X6;Y-1;|pin@41||I
+EdisableLO||D5G2;X-6.5;Y-1;|pin@38||I
+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
+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|
+NOff-Page|conn@1||-42.5|-7|||YRR|
+NOff-Page|conn@2||-42.5|-37.5|||Y|
+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
+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
+IredFive:inv;1{ic}|inv@74||46|4|RR||D5G4;|ATTR_X(D5FLeave alone;G1.5;NOLPX-1;Y3.5;)S4|ATTR_drive0(P)Sstrong0|ATTR_drive1(P)Sstrong1
+IredFive:inv;1{ic}|inv@75||-6|-15.5|RR||D5G4;|ATTR_X(D5FLeave alone;G3;NOLPX-0.5;Y4.5;)S1|ATTR_drive0(P)Sstrong0|ATTR_drive1(P)Sstrong1
+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
+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
+NWire_Pin|pin@308||14.75|-7.5|||Y|
+NWire_Pin|pin@832||55.25|-37.5|||Y|
+NWire_Pin|pin@840||10.25|-7|||Y|
+NWire_Pin|pin@874||-14.75|-37.5|||Y|
+NWire_Pin|pin@911||20|17.25||||
+NWire_Pin|pin@912||9|17.25||||
+NWire_Pin|pin@915||7.5|46.25||||
+NWire_Pin|pin@931||16.5|29.5||||
+NWire_Pin|pin@932||7.5|29.5||||
+NWire_Pin|pin@933||16.5|45.5||||
+NWire_Pin|pin@942||16|-37.5||||
+NWire_Pin|pin@949||47.5|-37.5||||
+NWire_Pin|pin@951||10|-37.5||||
+NWire_Pin|pin@957||2|-15.5||||
+NWire_Pin|pin@958||2|-37.5||||
+NWire_Pin|pin@959||-2.5|-29.5||||
+NWire_Pin|pin@960||-2.5|-7||||
+NWire_Pin|pin@967||22|4||||
+NWire_Pin|pin@969||20|-7.5||||
+NWire_Pin|pin@971||4.5|-7||||
+NWire_Pin|pin@972||6.5|-37.5||||
+NWire_Pin|pin@989||-37|-14.5||||
+NWire_Pin|pin@990||-37|-7||||
+NWire_Pin|pin@996||-37|-30.5||||
+NWire_Pin|pin@998||-37|-37.5||||
+NWire_Pin|pin@999||47.5|-34.5||||
+NWire_Pin|pin@1002||47.5|-29.5||||
+NWire_Pin|pin@1005||47.5|-17||||
+NWire_Pin|pin@1006||47.5|-7.5||||
+NWire_Pin|pin@1007||29.5|-17||||
+NWire_Pin|pin@1008||-81|-7||||
+NWire_Pin|pin@1009||-81|73.5||||
+NWire_Pin|pin@1010||102|73.5||||
+NWire_Pin|pin@1011||102|-4.5||||
+NWire_Pin|pin@1012||102|-7.5||||
+NWire_Pin|pin@1013||122|-37.5||||
+NWire_Pin|pin@1014||122|-59.5||||
+NWire_Pin|pin@1015||-82|-59.5||||
+NWire_Pin|pin@1019||-81|2||||
+NWire_Pin|pin@1021||12|20||||
+NWire_Pin|pin@1024||-20.5|-25||||
+NWire_Pin|pin@1026||-20.5|-19.5||||
+NWire_Pin|pin@1029||-82|-41||||
+NWire_Pin|pin@1032||7.5|43.5||||
+NWire_Pin|pin@1033||16.5|44||||
+NWire_Pin|pin@1034||12|17.25||||
+NWire_Pin|pin@1035||-20.5|-15.5||||
+NWire_Pin|pin@1036||-20.5|-29.5||||
+NWire_Pin|pin@1037||28|-28.5||||
+NWire_Pin|pin@1038||-20.5|-31.5||||
+NWire_Pin|pin@1039||-19.5|-13.5||||
+NWire_Pin|pin@1040||29.5|-40||||
+NWire_Pin|pin@1041||29.5|-30.5||||
+NWire_Pin|pin@1042||116.75|-56||||
+NWire_Pin|pin@1043||90|-49||||
+NWire_Pin|pin@1044||116.75|-45||||
+NWire_Pin|pin@1046||74|-14.5||||
+NWire_Pin|pin@1047||74|-52.5||||
+NWire_Pin|pin@1049||116.75|-29.5||||
+NWire_Pin|pin@1050||90|-33.5||||
+NWire_Pin|pin@1051||95|-52.5||||
+NWire_Pin|pin@1052||95|-41||||
+NWire_Pin|pin@1053||81|-7.5||||
+NWire_Pin|pin@1055||40|-56||||
+Ngeneric:Invisible-Pin|pin@1056||72.5|45|||||ART_message(D5G3;)S[REMOVE THE,"\"disable\" INPUT",FROM THE LE CALCULATION,SEE IVAN'S OTHER COMMENT]
+NWire_Pin|pin@1057||-82|-37.5||||
+NWire_Pin|pin@1058||6.5|-30.5||||
+NWire_Pin|pin@1059||21|-30.5||||
+NWire_Pin|pin@1060||10|-30.5||||
+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
+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
+Iorange40nm:wire40;1{ic}|wire40@3||16.5|20|||D5G4;|ATTR_L(D5FLeave alone;G1;OLPUD)S100|ATTR_LEWIRE(P)I1|ATTR_layer(D5FLeave alone;G1;NOLPY-1;)S1|ATTR_width(D5FLeave alone;G1;NOLPY-2;)S7
+Iorange40nm:wire40;1{ic}|wire40@4||25.5|44|||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@5||-25.5|-19.5|||D5G4;|ATTR_L(D5FLeave alone;G1;OLPUD)S100|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@6||-25.5|-25|||D5G4;|ATTR_L(D5FLeave alone;G1;OLPUD)S100|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@7||34.5|-40|||D5G4;|ATTR_L(D5FLeave alone;G1;OLPUD)S100|ATTR_LEWIRE(P)I1|ATTR_layer(D5FLeave alone;G1;NOLPY-1;)S2|ATTR_width(D5FLeave alone;G1;NOLPY-2;)S7
+Awire|disable|D5G2;||1800|inv@70|in|61.5|4|pin@1062||75.5|4
+Awire|fireHI|D5G2;||2700|inv@63|out|16.5|37.25|pin@1033||16.5|44
+Awire|fireHI|D5G2;||1800|predCond@2|fire|-27|-31.5|pin@1038||-20.5|-31.5
+Awire|fireHI|D5G2;||1800|predCond@1|fire|-27|-13.5|pin@1039||-19.5|-13.5
+Awire|fireLO|D5G2;||0|pred@1|in|37.5|-17|pin@1007||29.5|-17
+Awire|fireLO|D5G2;||2700|pin@932||7.5|29.5|pin@1032||7.5|43.5
+Awire|fireLO|D5G2;||0|succCond@3|in|38.5|-28.5|pin@1037||28|-28.5
+Awire|net@1910|||0|conn@3|a|56.5|-37.5|pin@832||55.25|-37.5
+Awire|net@2131|||2700|nor3@0|out|20|14.5|pin@911||20|17.25
+Awire|net@2137|||900|fire@0|LSN[ZeroOrTwo]|9|19.75|pin@912||9|17.25
+Awire|net@2178|||900|inv@63|in|16.5|32.25|pin@931||16.5|29.5
+Awire|net@2179|||2700|fire@0|fireHI|7.5|27.75|pin@932||7.5|29.5
+Awire|net@2180|||0|pin@931||16.5|29.5|pin@932||7.5|29.5
+Awire|net@2211|||0|pin@832||55.25|-37.5|pin@949||47.5|-37.5
+Awire|net@2228|||1800|pin@874||-14.75|-37.5|pin@958||2|-37.5
+Awire|net@2230|||900|pin@957||2|-15.5|pin@958||2|-37.5
+Awire|net@2235|||2700|pin@959||-2.5|-29.5|pin@960||-2.5|-7
+Awire|net@2249|||1800|pin@308||14.75|-7.5|pin@969||20|-7.5
+Awire|net@2251|||900|nor3@0|inb|20|8.25|pin@969||20|-7.5
+Awire|net@2255|||0|pin@840||10.25|-7|pin@971||4.5|-7
+Awire|net@2256|||0|pin@971||4.5|-7|pin@960||-2.5|-7
+Awire|net@2257|||900|fire@0|MSN[ZeroOrTwo]|4.5|19.75|pin@971||4.5|-7
+Awire|net@2258|||1800|pin@958||2|-37.5|pin@972||6.5|-37.5
+Awire|net@2259|||1800|pin@972||6.5|-37.5|pin@951||10|-37.5
+Awire|net@2295|||0|predCond@1|state|-32.5|-14.5|pin@989||-37|-14.5
+Awire|net@2296|||1800|conn@1|a|-40.5|-7|pin@990||-37|-7
+Awire|net@2297|||1800|pin@990||-37|-7|pin@960||-2.5|-7
+Awire|net@2298|||2700|pin@989||-37|-14.5|pin@990||-37|-7
+Awire|net@2306|||0|predCond@2|state|-32.5|-30.5|pin@996||-37|-30.5
+Awire|net@2309|||1800|conn@2|y|-40.5|-37.5|pin@998||-37|-37.5
+Awire|net@2310|||1800|pin@998||-37|-37.5|pin@874||-14.75|-37.5
+Awire|net@2311|||900|pin@996||-37|-30.5|pin@998||-37|-37.5
+Awire|net@2312|||2700|pin@949||47.5|-37.5|pin@999||47.5|-34.5
+Awire|net@2316|||1800|succCond@3|state|43.5|-29.5|pin@1002||47.5|-29.5
+Awire|net@2317|||2700|pin@999||47.5|-34.5|pin@1002||47.5|-29.5
+Awire|net@2320|||1800|pred@1|out|42.5|-17|pin@1005||47.5|-17
+Awire|net@2321|||0|conn@0|a|56.5|-7.5|pin@1006||47.5|-7.5
+Awire|net@2322|||0|pin@1006||47.5|-7.5|pin@969||20|-7.5
+Awire|net@2323|||2700|pin@1005||47.5|-17|pin@1006||47.5|-7.5
+Awire|net@2326|||1800|pin@1009||-81|73.5|pin@1010||102|73.5
+Awire|net@2327|||900|pin@1010||102|73.5|pin@1011||102|-4.5
+Awire|net@2328|||900|pin@1011||102|-4.5|pin@1012||102|-7.5
+Awire|net@2331|||900|pin@1013||122|-37.5|pin@1014||122|-59.5
+Awire|net@2332|||0|pin@1014||122|-59.5|pin@1015||-82|-59.5
+Awire|net@2339|||2700|pin@1019||-81|2|pin@1009||-81|73.5
+Awire|net@2340|||0|wire40@1|a|-71.5|2|pin@1019||-81|2
+Awire|net@2344|||0|wire40@3|a|14|20|pin@1021||12|20
+Awire|net@2350|||1800|wire40@6|b|-23|-25|pin@1024||-20.5|-25
+Awire|net@2354|||1800|wire40@5|b|-23|-19.5|pin@1026||-20.5|-19.5
+Awire|net@2368|||2700|pin@1015||-82|-59.5|pin@1029||-82|-41
+Awire|net@2370|||0|wire40@2|a|-71.5|-41|pin@1029||-82|-41
+Awire|net@2377|||2700|pin@1032||7.5|43.5|pin@915||7.5|46.25
+Awire|net@2378|||1800|wire40@0|b|-7|43.5|pin@1032||7.5|43.5
+Awire|net@2379|||2700|pin@1033||16.5|44|pin@933||16.5|45.5
+Awire|net@2380|||0|wire40@4|a|23|44|pin@1033||16.5|44
+Awire|net@2387|||1800|pin@1008||-81|-7|conn@1|y|-44.5|-7
+Awire|net@2388|||0|pin@911||20|17.25|pin@1034||12|17.25
+Awire|net@2389|||0|pin@1034||12|17.25|pin@912||9|17.25
+Awire|net@2390|||900|pin@1021||12|20|pin@1034||12|17.25
+Awire|net@2393|||2700|pin@1026||-20.5|-19.5|pin@1035||-20.5|-15.5
+Awire|net@2396|||900|pin@1024||-20.5|-25|pin@1036||-20.5|-29.5
+Awire|net@2411|||0|pin@1036||-20.5|-29.5|predCond@2|cond|-27|-29.5
+Awire|net@2413|||1800|predCond@1|cond|-27|-15.5|pin@1035||-20.5|-15.5
+Awire|net@2415|||0|wire40@7|a|32|-40|pin@1040||29.5|-40
+Awire|net@2416|||1800|inv@64|out|27|-30.5|pin@1041||29.5|-30.5
+Awire|net@2417|||1800|pin@1041||29.5|-30.5|succCond@3|cond|38.5|-30.5
+Awire|net@2418|||2700|pin@1040||29.5|-40|pin@1041||29.5|-30.5
+Awire|net@2421|||1800|pms2@0|g|113.5|-29.5|pin@1049||116.75|-29.5
+Awire|net@2422|||2700|pin@1043||90|-49|pin@1050||90|-33.5
+Awire|net@2423|||0|nms1@0|g|78|-14.5|pin@1046||74|-14.5
+Awire|net@2424|||900|pin@1046||74|-14.5|pin@1047||74|-52.5
+Awire|net@2427|||0|pms2@0|g2|107.5|-33.5|pin@1050||90|-33.5
+Awire|net@2428|||1800|pin@1047||74|-52.5|pin@1051||95|-52.5
+Awire|net@2429|||2700|pin@1051||95|-52.5|pin@1052||95|-41
+Awire|net@2430|||0|nms2b@0|g2|107.5|-41|pin@1052||95|-41
+Awire|net@2431|||2700|pin@1042||116.75|-56|pin@1044||116.75|-45
+Awire|net@2432|||2700|pin@1044||116.75|-45|pin@1049||116.75|-29.5
+Awire|net@2433|||1800|nms2b@0|g|113.5|-45|pin@1044||116.75|-45
+Awire|net@2435|||1800|conn@0|y|60.5|-7.5|pin@1053||81|-7.5
+Awire|net@2436|||1800|pin@1053||81|-7.5|pin@1012||102|-7.5
+Awire|net@2437|||2700|nms1@0|d|81|-12.5|pin@1053||81|-7.5
+Awire|net@2440|||1800|conn@10|y|40|-52.5|pin@1047||74|-52.5
+Awire|net@2441|||900|conn@11|y|40|-55.5|pin@1055||40|-56
+Awire|net@2442|||0|pin@1042||116.75|-56|pin@1055||40|-56
+Awire|net@2443|||1800|conn@9|y|40|-49|pin@1043||90|-49
+Awire|net@2446|||0|conn@2|a|-44.5|-37.5|pin@1057||-82|-37.5
+Awire|net@2451|||900|fire@0|MSN[ZeroOrDone]|6.5|19.75|pin@1058||6.5|-30.5
+Awire|net@2452|||900|pin@1058||6.5|-30.5|pin@972||6.5|-37.5
+Awire|net@2454|||0|inv@64|in|22|-30.5|pin@1059||21|-30.5
+Awire|net@2455|||1800|pin@1058||6.5|-30.5|pin@1060||10|-30.5
+Awire|net@2456|||0|pin@1059||21|-30.5|pin@1060||10|-30.5
+Awire|net@2457|||1800|conn@3|y|60.5|-37.5|pin@1061||110.5|-37.5
+Awire|net@2458|||1800|pin@1061||110.5|-37.5|pin@1013||122|-37.5
+Awire|net@2459|||900|pms2@0|d|110.5|-35.5|pin@1061||110.5|-37.5
+Awire|net@2460|||2700|nms2b@0|d|110.5|-39|pin@1061||110.5|-37.5
+Awire|net@2462|||0|inv@70|out|56.5|4|inv@68|in|55.5|4
+Awire|net@2470|||1800|inv@74|out|43.5|4|inv@73|in|44|4
+Awire|net@2471|||1800|inv@74|in|48.5|4|inv@68|out|50.5|4
+Awire|net@2477|||0|inv@73|out|39|4|pin@967||22|4
+Awire|net@2484|||1800|invLT@0|in|-8.5|-29.5|pin@959||-2.5|-29.5
+Awire|net@2486|||0|pin@949||47.5|-37.5|pin@1063||18|-37.5
+Awire|net@2487|||0|pin@1063||18|-37.5|pin@942||16|-37.5
+Awire|net@2488|||900|nor3@0|ina|18|8.25|pin@1063||18|-37.5
+Awire|net@2489|||2700|pin@967||22|4|nor3@0|inc|22|8.25
+Awire|net@2496|||1800|pin@1036||-20.5|-29.5|invLT@0|out|-13.5|-29.5
+Awire|net@2501|||1800|pin@1035||-20.5|-15.5|pin@1066||-17.5|-15.5
+Awire|net@2502|||1800|invI@0|in|-10|-15.5|inv@75|out|-8.5|-15.5
+Awire|net@2503|||0|invI@0|out|-15|-15.5|pin@1066||-17.5|-15.5
+Awire|net@2504|||1800|inv@75|in|-3.5|-15.5|pin@957||2|-15.5
+ELSN[OneOrTwo]|LSN[TwoOrDone]|D5G2;X4.25;Y-2.75;|conn@0|a|B
+ELSN[OneOrDone]|LSN[TwoOrOne]|D5G2;X3.75;Y2.75;|conn@3|a|B
+EMSN[OneOrTwo]|MSN[TwoOrDone]|D5G2;X2.75;Y3.75;|conn@1|a|B
+EMSN[OneOrDone]|MSN[TwoOrOne]|D5G2;X3;Y2.5;|conn@2|a|B
+Edisable||D5G2;X-5;|conn@10|a|I
+EdisableLO||D5G2;X-6;|conn@9|a|I
+EdisableLO_1|valLO|D5G2;X-6;|conn@11|a|I
 X
 
 # Cell nor2;1{lay}
@@ -1139,39 +1658,39 @@ Eout||D5G2;Y1.5;|pin@22||O
 X
 
 # Cell nor3;1{ic}
-Cnor3;1{ic}||artwork|1248842297142|1251231625434|E|ATTR_LEGATE(D5G1;HNPY-2;)I1|ATTR_LEPARALLGRP(D5G1;HNPY-4;)I-1|ATTR_X(D5G1;HNOJP)SLE.getdrive()|ATTR_su(D5G1;HNPY-6;)I-1
+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
 Ngeneric:Facet-Center|art@0||0|0||||AV
-NThick-Circle|art@8||0|-0.25|6|6|||ART_color()I1677786881|ART_degrees()F[0.0,3.1415927]
-NThick-Circle|art@9||-2|-2|1|1|R||ART_color()I1677786881
-NThick-Circle|art@10||0|-2|1|1|R||ART_color()I1677786881
-NThick-Circle|art@11||2|-2|1|1|R||ART_color()I1677786881
+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
+NThick-Circle|art@10||0|-2|1|1|R||ART_color()I-1174339839
+NThick-Circle|art@11||2|-2|1|1|R||ART_color()I-1174339839
 Nschematic:Bus_Pin|pin@12||-3.25|-2|-2|-2|R|
 Nschematic:Wire_Pin|pin@19||2|-3.5||||
 Nschematic:Wire_Pin|pin@20||0|-3.5||||
 Nschematic:Wire_Pin|pin@21||-2|-3.5||||
 Nschematic:Wire_Pin|pin@22||0|2.75||||
-NPin|pin@23||0|-3.5|||R|
-NPin|pin@24||0|-2.5|1|1|R|
-NPin|pin@25||-2|-2.5|1|1|R|
-NPin|pin@26||-2|-3.5|||R|
+NPin|pin@23||0|-3.5|||R||ART_color()I-1174339839
+NPin|pin@24||0|-2.5|1|1|R||ART_color()I-1174339839
+NPin|pin@25||-2|-2.5|1|1|R||ART_color()I-1174339839
+NPin|pin@26||-2|-3.5|||R||ART_color()I-1174339839
 Nschematic:Bus_Pin|pin@27||2|-3.5|-2|-2|R|
-NPin|pin@28||2|-2.5|1|1|R|
-NPin|pin@29||2|-3.5|||R|
-NPin|pin@30||-3|-0.25|1|1|R|
+NPin|pin@28||2|-2.5|1|1|R||ART_color()I-1174339839
+NPin|pin@29||2|-3.5|||R||ART_color()I-1174339839
+NPin|pin@30||-3|-0.25|1|1|R||ART_color()I-1174339839
 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|
-NPin|pin@34||3|-1.5|1|1|R|
-NPin|pin@35||3|-0.25|1|1|R|
-NPin|pin@36||1.75|-1.5|1|1|R|
-NPin|pin@37||3|-0.25|1|1|R|
-AThicker|net@8|||FS900|pin@24||0|-2.5|pin@23||0|-3.5|ART_color()I1677786881
-AThicker|net@9|||FS900|pin@25||-2|-2.5|pin@26||-2|-3.5|ART_color()I1677786881
-AThicker|net@10|||FS450|pin@35||3|-0.25|pin@36||1.75|-1.5|ART_color()I1677786881
-AThicker|net@11|||FS900|pin@28||2|-2.5|pin@29||2|-3.5|ART_color()I1677786881
-AThicker|net@12|||FS900|pin@30||-3|-0.25|pin@33||-3|-1.5|ART_color()I1677786881
-AThicker|net@13|||FS0|pin@34||3|-1.5|pin@33||-3|-1.5|ART_color()I1677786881
-AThicker|net@14|||FS900|pin@37||3|-0.25|pin@34||3|-1.5|ART_color()I1677786881
+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
+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
+AThicker|net@14|||FS900|pin@37||3|-0.25|pin@34||3|-1.5|ART_color()I-1174339839
 Eina||D5G2;Y-1.25;|pin@19||I
 Einb||D5G2;Y-1.25;|pin@20||I
 Einc||D5G2;Y-1.25;|pin@21||I
@@ -1336,17 +1855,16 @@ Evdd_5||D5G2;|pin@146||P
 X
 
 # Cell nor3;1{sch}
-Cnor3;1{sch}||schematic|1248841634466|1251231697195||ATTR_LEGATE(D5G1;HNPX-29.5;Y19;)I1|ATTR_LEPARALLGRP(D5G1;HNPX-28.5;Y15;)I-1|ATTR_X(D5G1;HNOJPX-29.5;Y20.25;)SLE.getdrive()|ATTR_su(D5G1;HNPX-29.5;Y17;)I-1
+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
 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@2||15.5|12.25|||RR|
-NOff-Page|conn@3||-24.25|-0.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
 IredFive:nms1;2{ic}|nms1@1||-8|-13.75|X||D5G4;|ATTR_X(D5FLeave alone;G1.5;NOJPX0.25;Y-4;)S@X
 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;
-Inor3;2{ic}|nor3@1||10.75|18.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|
@@ -1359,7 +1877,14 @@ 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|
-IredFive:pms3a;1{ic}|pms3a@0||-16|12.25|||D5G4;|ATTR_X(D5G1.5;NOJPX-0.25;Y8;)S@X
+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||||
+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
 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
@@ -1381,7 +1906,17 @@ 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@26|||1800|conn@3|a|-22.25|-0.25|pin@4||-16|-0.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
 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
@@ -2158,16 +2693,18 @@ Evdd_28||D5G2;|oneCell@0|vdd_28|P
 X
 
 # Cell omegaCounter;1{sch}
-ComegaCounter;1{sch}||schematic|1242939100334|1250539930641|
+ComegaCounter;1{sch}||schematic|1242939100334|1253486597177|
 Ngeneric:Facet-Center|art@0||0|0||||AV
 NOff-Page|conn@0||74.75|-4.25|||X|
-NOff-Page|conn@4||39|50|||X|
+NOff-Page|conn@4||26|64|||X|
 NOff-Page|conn@8||-48|56.5|||X|
 IomegaCounter;1{ic}|counter@0||48|75|||D5G4;
 NGround|gnd@2||61|38||||
-NGround|gnd@3||-72|14||||
+NGround|gnd@3||-72.5|14||||
 IredFive:inv;1{ic}|inv@2||38.75|1.25|RR||D5G4;|ATTR_X(D5FLeave alone;G1.5;NOLPX2;Y2.5;)S16|ATTR_drive0(P)Sstrong0|ATTR_drive1(P)Sstrong1
 IredFive:inv;1{ic}|inv@11||68.75|23.25|RR||D5G4;|ATTR_X(D5FLeave alone;G1.5;NOLPX2;Y2.5;)S16|ATTR_drive0(P)Sstrong0|ATTR_drive1(P)Sstrong1
+IredFive:inv;1{ic}|inv@12||46.25|53.25|||D5G4;|ATTR_X(D5FLeave alone;G1.5;NOLPX1;Y3.5;)S1|ATTR_drive0(P)Sstrong0|ATTR_drive1(P)Sstrong1
+IredFive:nor2n;1{ic}|nor2n@0||53.5|52.5|||D5G4;|ATTR_Delay(D5G1;NPX3;Y-3;)I100|ATTR_X(D5FLeave alone;G1.5;NOLPX-0.5;Y4.5;)S1|ATTR_drive0(P)Sstrong0|ATTR_drive1(P)Sstrong1
 IoneCell;1{ic}|oneCell@0||30|25|||D5G4;
 IoneCell;1{ic}|oneCell@1||13|25|||D5G4;
 IoneCell;1{ic}|oneCell@2||-4|25|||D5G4;
@@ -2208,8 +2745,6 @@ NWire_Pin|pin@368||31.75|1.25||||
 NWire_Pin|pin@369||31.75|-19.75||||
 NWire_Pin|pin@373||56.5|-4.25||||
 NWire_Pin|pin@374||56.5|-17.25||||
-NWire_Pin|pin@416||-72|27.5||||
-NWire_Pin|pin@417||-75|19.5||||
 NWire_Pin|pin@420||50.5|5||||
 NWire_Pin|pin@421||30|5||||
 NWire_Pin|pin@422||30|1.25||||
@@ -2223,13 +2758,20 @@ NWire_Pin|pin@429||64|19.5||||
 NWire_Pin|pin@430||64|23.25||||
 NWire_Pin|pin@431||74|23.25||||
 NWire_Pin|pin@432||74|44||||
-NWire_Pin|pin@433||41|44||||
-NWire_Pin|pin@434||41|27.5||||
-NWire_Pin|pin@435||-72|23||||
-NWire_Pin|pin@436||-75|23||||
-NPower|pwr@0||-75|26.75||||
+NWire_Pin|pin@436||-72.5|19.5||||
+NWire_Pin|pin@437||-72.5|27.5||||
+NWire_Pin|pin@438||42|44||||
+NWire_Pin|pin@439||42|19.5||||
+NWire_Pin|pin@440||51|53.25||||
+NWire_Pin|pin@441||75|52.5||||
+NWire_Pin|pin@442||33.5|53.25||||
+NWire_Pin|pin@443||33.5|27.5||||
+NWire_Pin|pin@444||36|51.5||||
+NWire_Pin|pin@445||36|19.5||||
+NPower|pwr@0||-72.5|31.75||||
 Awire|disable|D5G2;||900|pin@373||56.5|-4.25|pin@374||56.5|-17.25
 Awire|disableLO|D5G2;||900|pin@368||31.75|1.25|pin@369||31.75|-19.75
+Awire|empty|D5G2;||1800|nor2n@0|out|56|52.5|pin@441||75|52.5
 Awire|inLO[1]|D5G2;||2700|oneCell@0|val_bar|26.5|35|pin@148||26.5|56
 Awire|inLO[2]|D5G2;||2700|oneCell@1|val_bar|9.5|35|pin@149||9.5|56
 Awire|inLO[3]|D5G2;||2700|oneCell@2|val_bar|-7.5|35|pin@150||-7.5|55
@@ -2273,8 +2815,6 @@ Awire|net@728|||1800|inv@2|in|41.25|1.25|pin@289||47.5|1.25
 Awire|net@729|||1800|pin@269||27|-4.25|pin@290||47.5|-4.25
 Awire|net@818|||0|inv@2|out|36.25|1.25|pin@368||31.75|1.25
 Awire|net@826|||1800|pin@373||56.5|-4.25|conn@0|y|72.75|-4.25
-Awire|net@908|||0|oneCell@5|MSN[ZeroOrTwo]|-68|27.5|pin@416||-72|27.5
-Awire|net@911|||0|oneCell@5|MSN[ZeroOrDone]|-68|19.5|pin@417||-75|19.5
 Awire|net@916|||900|oneCell@6|loadLO|50.5|11|pin@420||50.5|5
 Awire|net@917|||0|pin@420||50.5|5|pin@421||30|5
 Awire|net@918|||0|pin@368||31.75|1.25|pin@422||30|1.25
@@ -2288,7 +2828,6 @@ Awire|net@925|||900|pin@424||52|2|pin@425||52|-4.25
 Awire|net@928|||2700|oneCell@6|val_bar|57.5|35|pin@426||57.5|41
 Awire|net@929|||1800|pin@426||57.5|41|pin@427||61|41
 Awire|net@932|||2700|gnd@2||61|40|pin@427||61|41
-Awire|net@972|||0|oneCell@6|MSN[ZeroOrDone]|48|19.5|oneCell@0|LSN[ZeroOrDone]|29|19.5
 Awire|net@973|||1800|oneCell@6|LSN[ZeroOrTwo]|60|27.5|pin@428||64|27.5
 Awire|net@975|||1800|oneCell@6|LSN[ZeroOrDone]|60|19.5|pin@429||64|19.5
 Awire|net@976|||900|pin@428||64|27.5|pin@430||64|23.25
@@ -2296,13 +2835,23 @@ Awire|net@977|||900|pin@430||64|23.25|pin@429||64|19.5
 Awire|net@978|||0|inv@11|out|66.25|23.25|pin@430||64|23.25
 Awire|net@979|||1800|inv@11|in|71.25|23.25|pin@431||74|23.25
 Awire|net@980|||2700|pin@431||74|23.25|pin@432||74|44
-Awire|net@981|||0|pin@432||74|44|pin@433||41|44
-Awire|net@982|||0|oneCell@6|MSN[ZeroOrTwo]|48|27.5|pin@434||41|27.5
-Awire|net@983|||0|pin@434||41|27.5|oneCell@0|LSN[ZeroOrTwo]|29|27.5
-Awire|net@984|||900|pin@433||41|44|pin@434||41|27.5
-Awire|net@986|||900|pin@416||-72|27.5|pin@435||-72|23
-Awire|net@987|||900|pwr@0||-75|26.75|pin@436||-75|23
-Awire|net@992|||900|pin@435||-72|23|gnd@3||-72|16
+Awire|net@994|||0|oneCell@5|MSN[ZeroOrDone]|-68|19.5|pin@436||-72.5|19.5
+Awire|net@995|||2700|gnd@3||-72.5|16|pin@436||-72.5|19.5
+Awire|net@996|||0|oneCell@5|MSN[ZeroOrTwo]|-68|27.5|pin@437||-72.5|27.5
+Awire|net@997|||900|pwr@0||-72.5|31.75|pin@437||-72.5|27.5
+Awire|net@999|||0|pin@432||74|44|pin@438||42|44
+Awire|net@1001|||0|oneCell@6|MSN[ZeroOrDone]|48|19.5|pin@439||42|19.5
+Awire|net@1003|||900|pin@438||42|44|pin@439||42|19.5
+Awire|net@1004|||1800|inv@12|out|48.75|53.25|pin@440||51|53.25
+Awire|net@1005|||900|nor2n@0|inb|51|53.5|pin@440||51|53.25
+Awire|net@1009|||0|inv@12|in|43.75|53.25|pin@442||33.5|53.25
+Awire|net@1010|||0|oneCell@6|MSN[ZeroOrTwo]|48|27.5|pin@443||33.5|27.5
+Awire|net@1011|||0|pin@443||33.5|27.5|oneCell@0|LSN[ZeroOrTwo]|29|27.5
+Awire|net@1012|||900|pin@442||33.5|53.25|pin@443||33.5|27.5
+Awire|net@1013|||0|nor2n@0|ina|51|51.5|pin@444||36|51.5
+Awire|net@1014|||0|pin@439||42|19.5|pin@445||36|19.5
+Awire|net@1015|||0|pin@445||36|19.5|oneCell@0|LSN[ZeroOrDone]|29|19.5
+Awire|net@1016|||900|pin@444||36|51.5|pin@445||36|19.5
 Abus|scan[1:3]|D5G2;|-0.5|IJ2700|oneCell@0|s[1:3]|20|36|pin@204||20|46
 Abus|scan[4:6]|D5G2;|-0.5|IJ2700|oneCell@1|s[1:3]|3|36|pin@206||3|46
 Abus|scan[7:9]|D5G2;|-0.5|IJ2700|oneCell@2|s[1:3]|-14|36|pin@208||-14|46
@@ -2315,7 +2864,7 @@ Escan[1:18]||D5G2;X5.5;|conn@8|y|O
 X
 
 # Cell oneCell;1{ic}
-ConeCell;1{ic}||artwork|1242938717727|1250057914773|E|ATTR_LOAD_DRIVER_SIZE(D5G1;HNOLP)S8
+ConeCell;1{ic}||artwork|1242938717727|1253251361522|E|ATTR_LOAD_DRIVER_SIZE(D5G1;HNOLP)S8
 Ngeneric:Facet-Center|art@0||0|0||||AV
 NTriangle|art@8||-12|-5.5|3|2|XR|
 NTriangle|art@9||-12|2.5|3|2|XR|
@@ -2337,18 +2886,22 @@ Nschematic:Bus_Pin|pin@73||-10|11|-1|-1||
 Nschematic:Bus_Pin|pin@76||-10|10|-1|-1||
 Nschematic:Wire_Pin|pin@78||-3|-14||||
 Nschematic:Bus_Pin|pin@80||-10.5|-14||||
+Nschematic:Bus_Pin|pin@81||-11.5|-14.5||||
+Nschematic:Wire_Pin|pin@82||-11.5|-12.5||||
 ASolid|net@0|||FS900|pin@0||-1|10|pin@1||-1|-14
 ASolid|net@1|||FS0|pin@1||-1|-14|pin@2||-13|-14
 ASolid|net@2|||FS2700|pin@2||-13|-14|pin@3||-13|10
 ASolid|net@3|||FS1800|pin@3||-13|10|pin@0||-1|10
 Aschematic:bus|net@23||-0.5|IJ900|pin@73||-10|11|pin@76||-10|10
-ELSN[ZeroOrDone]|LSN[OneOrDone]|D5G2;X-9.5;|pin@20||B
-ELSN[ZeroOrTwo]|LSN[OneOrTwo]|D5G2;X-9;|pin@13||B
-EMSN[ZeroOrDone]|MSN[OneOrDone]|D5G2;X9.5;|pin@19||B
-EMSN[ZeroOrTwo]|MSN[OneOrTwo]|D5G2;X8.5;|pin@17||B
+Aschematic:wire|net@24|||900|pin@82||-11.5|-12.5|pin@81||-11.5|-14.5
+ELSN[ZeroOrTwo]|LSN[TwoOrDone]|D5G2;X-9;|pin@13||B
+ELSN[ZeroOrDone]|LSN[TwoOrOne]|D5G2;X-9.5;|pin@20||B
+EMSN[ZeroOrTwo]|MSN[TwoOrDone]|D5G2;X8.5;|pin@17||B
+EMSN[ZeroOrDone]|MSN[TwoOrOne]|D5G2;X9.5;|pin@19||B
 Eload||D5G2;X0.5;Y-3.5;|pin@78||I
 EloadLO||D5G2;Y-3.5;|pin@80||I
 Es[1:3]||D5G2;|pin@73||O
+EvalLO_1|val|D5G2;|pin@81||I
 Eval_bar|valLO|D5G2;Y2;|pin@15||I
 X
 
@@ -2754,130 +3307,49 @@ Evdd|vdd_99|D5G2;|pin@0||P
 X
 
 # Cell oneCell;1{sch}
-ConeCell;1{sch}||schematic|1242938375621|1250100652077||ATTR_LOAD_DRIVER_SIZE(D5G3;HNOLPX45.5;Y25.5;)S8
-IredFive:NMOS;1{ic}|NMOS@2||11.75|0.75|||D5G4;|ATTR_X(D5G1.5;NOLPX-1;Y-3.25;)S@LOAD_DRIVER_SIZE/2
-IredFive:NMOS;1{ic}|NMOS@3||11.75|-5.25|||D5G4;|ATTR_X(D5G1.5;NOLPX-1;Y-2.5;)S@LOAD_DRIVER_SIZE/2
-IredFive:PMOS;1{ic}|PMOS@0||35|0.75|||D5G4;|ATTR_X(D5G1.5;NOLPX-2.25;Y2;)S@LOAD_DRIVER_SIZE/2
-IredFive:PMOS;1{ic}|PMOS@1||35|-5.25|||D5G4;|ATTR_X(D5G1.5;NOLPX-2.25;Y2.25;)S@LOAD_DRIVER_SIZE/2
+ConeCell;1{sch}||schematic|1242938375621|1253256011632||ATTR_LOAD_DRIVER_SIZE(D5G3;HNOLPX45.5;Y25.5;)S8
 Ngeneric:Facet-Center|art@0||0|0||||AV
 NOff-Page|conn@11||-41.25|-28|||XRR|
-NOff-Page|conn@16||-45.5|3.5|||XRR|
-NOff-Page|conn@17||48.5|2.5|||XRR|
-NOff-Page|conn@20||-45.5|-7|||XRR|
-NOff-Page|conn@21||48.5|-7|||XRR|
+NOff-Page|conn@16||-54.5|3.5|||XRR|
+NOff-Page|conn@17||53|2.5|||XRR|
+NOff-Page|conn@20||-54.5|-8.5|||XRR|
+NOff-Page|conn@21||54|-9|||XRR|
 NOff-Page|conn@27||5|16|||R|
 NOff-Page|conn@29||-41.25|-24.5|||XRR|
 NOff-Page|conn@30||-41.25|-21|||XRR|
 NGround|gnd@1||9|15.25||||
-IredFive:nms1;2{ic}|nms1@3||15.5|-4|X||D5G4;|ATTR_X(D5FLeave alone;G1.5;NOLPX-2;Y3;)S2*@LOAD_DRIVER_SIZE
-IoneCellGasP;1{ic}|oneBitIv@0||-22|-1|||D5G4;
+InewCell;1{ic}|newCell@0||-22|-1|||D5G4;
 IoneCell;1{ic}|oneCell@0||-27.25|38|||D5G4;
 Ngeneric:Invisible-Pin|pin@67||26.25|43.75|||||ART_message(D5G4;)Sone cell of the Omega Counter
 Ngeneric:Invisible-Pin|pin@68||28.25|39.5|||||ART_message(D5G3;)Sam 28 Jul 2009
 Ngeneric:Invisible-Pin|pin@69||28.25|49.25|||||ART_message(D5G6;)SoneCell
 NWire_Pin|pin@93||9|23.5||||
-NWire_Pin|pin@189||-12.5|-14.5||||
-NWire_Pin|pin@190||-12.5|-7||||
-NWire_Pin|pin@193||14|-7||||
-NWire_Pin|pin@197||14|2.5||||
-NWire_Pin|pin@198||-12.5|10||||
-NWire_Pin|pin@199||-12.5|2.5||||
-NWire_Pin|pin@200||-38.5|-14.5||||
-NWire_Pin|pin@202||-38.5|10||||
-NWire_Pin|pin@237||-38.5|3.5||||
-NWire_Pin|pin@238||-38.5|-7||||
-NWire_Pin|pin@239||-12|10||||
-NWire_Pin|pin@240||-12|2.5||||
-NWire_Pin|pin@298||44.25|-0.25||||
 NWire_Pin|pin@300||-25.5|-21||||
-NWire_Pin|pin@301||44.25|-28||||
-NWire_Pin|pin@341||11.75|2.5||||
-NWire_Pin|pin@342||11.75|-7||||
-NWire_Pin|pin@349||22.75|-4||||
-NWire_Pin|pin@350||22.75|-28||||
-NWire_Pin|pin@351||5.75|0.75||||
-NWire_Pin|pin@352||5.75|-24.5||||
-NWire_Pin|pin@353||5.75|-5.25||||
-NWire_Pin|pin@354||35|-7||||
-NWire_Pin|pin@355||35|2.5||||
-NWire_Pin|pin@356||35|-2.25||||
-NWire_Pin|pin@357||11.75|-2||||
-NWire_Pin|pin@358||27.5|0.75||||
-NWire_Pin|pin@359||27.5|-21||||
-NWire_Pin|pin@360||27.5|-5.25||||
 NWire_Pin|pin@361||-20.5|-24.5||||
 NWire_Pin|pin@362||-28|3.5||||
-NWire_Pin|pin@363||-38.5|-8.5||||
 NWire_Pin|pin@364||-18|2.5||||
 NWire_Pin|pin@365||-18|-7||||
-IredFive:pms1;2{ic}|pms1@2||39|-0.25|X||D5G4;|ATTR_X(D5FLeave alone;G1.5;NOLPX-1.5;Y-2.75;)S2*@LOAD_DRIVER_SIZE
-Iorange40nm:wire;1{ic}|wire@0||-43.5|-14.5|X||D5G4;|ATTR_C(D5G1;NOLPUCY-2.5;)S0.0000223p|ATTR_L(D5G1;OLPUDX1;)S100|ATTR_R(D5G1;NOLPURY-1.5;)S0.024|ATTR_LEWIRE()I1|ATTR_layer(D5G1;NOLX0.5;Y-1;)S1|ATTR_width(D5G1;NOLX0.5;Y-2;)S3
-Iorange40nm:wire;1{ic}|wire@1||-7.5|-14.5|||D5G4;|ATTR_C(D5G1;NOLPUCY-2.5;)S0.0000223p|ATTR_L(D5G1;OLPUDX1;)S100|ATTR_R(D5G1;NOLPURY-1.5;)S0.024|ATTR_LEWIRE()I1|ATTR_layer(D5G1;NOLX0.5;Y-1;)S1|ATTR_width(D5G1;NOLX0.5;Y-2;)S3
-Iorange40nm:wire;1{ic}|wire@2||-6.5|10|||D5G4;|ATTR_C(D5G1;NOLPUCY-2.5;)S0.0000223p|ATTR_L(D5G1;OLPUDX1;)S100|ATTR_R(D5G1;NOLPURY-1.5;)S0.024|ATTR_LEWIRE()I1|ATTR_layer(D5G1;NOLX0.5;Y-1;)S1|ATTR_width(D5G1;NOLX0.5;Y-2;)S3
-Iorange40nm:wire;1{ic}|wire@3||-44|10|XY||D5G4;|ATTR_C(D5G1;NOLPUCY-2.5;)S0.0000223p|ATTR_L(D5G1;OLPUDX1;)S100|ATTR_R(D5G1;NOLPURY-1.5;)S0.024|ATTR_LEWIRE()I1|ATTR_layer(D5G1;NOLX0.5;Y-1;)S1|ATTR_width(D5G1;NOLX0.5;Y-2;)S3
-Awire|net@560|||0|wire@1|a|-11.5|-14.5|pin@189||-12.5|-14.5
-Awire|net@575|||1800|wire@0|a|-39.5|-14.5|pin@200||-38.5|-14.5
-Awire|net@579|||1800|wire@3|a|-40|10|pin@202||-38.5|10
-Awire|net@667|||900|pin@202||-38.5|10|pin@237||-38.5|3.5
-Awire|net@668|||1800|conn@20|y|-43.5|-7|pin@238||-38.5|-7
-Awire|net@671|||2700|pin@189||-12.5|-14.5|pin@190||-12.5|-7
-Awire|net@672|||0|wire@2|a|-10.5|10|pin@239||-12|10
-Awire|net@673|||0|pin@239||-12|10|pin@198||-12.5|10
-Awire|net@676|||900|pin@239||-12|10|pin@240||-12|2.5
+NWire_Pin|pin@366||-18|-9||||
+NWire_Pin|pin@384||-23|-28||||
 Awire|net@811|||1800|conn@30|y|-39.25|-21|pin@300||-25.5|-21
-Awire|net@813|||900|oneBitIv@0|disable|-25.5|-11|pin@300||-25.5|-21
-Awire|net@837|||1800|pms1@2|g|42|-0.25|pin@298||44.25|-0.25
-Awire|net@841|||900|pin@298||44.25|-0.25|pin@301||44.25|-28
-Awire|net@868|||1800|pin@190||-12.5|-7|pin@193||14|-7
-Awire|net@898|||1800|pin@199||-12.5|2.5|pin@341||11.75|2.5
-Awire|net@899|||1800|pin@341||11.75|2.5|pin@197||14|2.5
-Awire|net@900|||900|NMOS@2|d|11.75|2.75|pin@341||11.75|2.5
-Awire|net@903|||2700|NMOS@3|s|11.75|-7.25|pin@342||11.75|-7
-Awire|net@912|||1800|nms1@3|g|18.5|-4|pin@349||22.75|-4
-Awire|net@914|||1800|pin@350||22.75|-28|pin@301||44.25|-28
-Awire|net@915|||900|pin@349||22.75|-4|pin@350||22.75|-28
-Awire|net@917|||1800|conn@11|y|-39.25|-28|pin@350||22.75|-28
-Awire|net@918|||0|NMOS@2|g|8.75|0.75|pin@351||5.75|0.75
-Awire|net@922|||900|pin@351||5.75|0.75|pin@353||5.75|-5.25
-Awire|net@923|||900|pin@353||5.75|-5.25|pin@352||5.75|-24.5
-Awire|net@924|||0|NMOS@3|g|8.75|-5.25|pin@353||5.75|-5.25
-Awire|net@928|||0|conn@21|a|46.5|-7|pin@354||35|-7
-Awire|net@929|||0|pin@354||35|-7|pin@342||11.75|-7
-Awire|net@930|||2700|PMOS@1|d|35|-7.25|pin@354||35|-7
-Awire|net@931|||0|conn@17|a|46.5|2.5|pin@355||35|2.5
-Awire|net@932|||900|PMOS@0|s|35|2.75|pin@355||35|2.5
-Awire|net@933|||2700|PMOS@1|s|35|-3.25|pin@356||35|-2.25
-Awire|net@934|||2700|pin@356||35|-2.25|PMOS@0|d|35|-1.25
-Awire|net@935|||0|pms1@2|d|39|-2.25|pin@356||35|-2.25
-Awire|net@937|||2700|NMOS@3|d|11.75|-3.25|pin@357||11.75|-2
-Awire|net@938|||2700|pin@357||11.75|-2|NMOS@2|s|11.75|-1.25
-Awire|net@939|||0|nms1@3|d|15.5|-2|pin@357||11.75|-2
-Awire|net@940|||0|PMOS@0|g|32|0.75|pin@358||27.5|0.75
-Awire|net@944|||0|pin@359||27.5|-21|pin@300||-25.5|-21
-Awire|net@945|||900|pin@358||27.5|0.75|pin@360||27.5|-5.25
-Awire|net@946|||900|pin@360||27.5|-5.25|pin@359||27.5|-21
-Awire|net@947|||0|PMOS@1|g|32|-5.25|pin@360||27.5|-5.25
-Awire|net@949|||0|pin@237||-38.5|3.5|conn@16|y|-43.5|3.5
+Awire|net@813|||900|newCell@0|disableLO|-25.5|-11|pin@300||-25.5|-21
 Awire|net@951|||1800|conn@29|y|-39.25|-24.5|pin@361||-20.5|-24.5
-Awire|net@952|||1800|pin@361||-20.5|-24.5|pin@352||5.75|-24.5
-Awire|net@953|||900|oneBitIv@0|disable@533180212|-20.5|-11|pin@361||-20.5|-24.5
-Awire|net@954|||1800|conn@16|y|-43.5|3.5|pin@362||-28|3.5
-Awire|net@955|||900|oneBitIv@0|MSN[ZeroOrDone]|-28|5|pin@362||-28|3.5
-Awire|net@956|||2700|pin@200||-38.5|-14.5|pin@363||-38.5|-8.5
-Awire|net@957|||2700|pin@363||-38.5|-8.5|pin@238||-38.5|-7
-Awire|net@958|||1800|pin@363||-38.5|-8.5|oneBitIv@0|MSN[ZeroOrTwo]|-28|-8.5
-Awire|net@959|||0|pin@199||-12.5|2.5|pin@364||-18|2.5
-Awire|net@960|||900|oneBitIv@0|LSN[ZeroOrDone]|-18|5|pin@364||-18|2.5
-Awire|net@961|||0|pin@190||-12.5|-7|pin@365||-18|-7
-Awire|net@962|||2700|oneBitIv@0|LSN[ZeroOrTwo]|-18|-9.5|pin@365||-18|-7
-Awire|net@963|||1800|pin@240||-12|2.5|pin@197||14|2.5
-Awire|s[1]|D5G2;Y-3;||0|pin@342||11.75|-7|pin@190||-12.5|-7
-Awire|s[2]|D5G2;X4;Y2.5;||0|pin@355||35|2.5|pin@199||-12.5|2.5
+Awire|net@953|||900|newCell@0|disable|-20.5|-11|pin@361||-20.5|-24.5
+Awire|net@954|||1800|conn@16|y|-52.5|3.5|pin@362||-28|3.5
+Awire|net@955|||900|newCell@0|MSN[OneOrTwo]|-28|5|pin@362||-28|3.5
+Awire|net@960|||900|newCell@0|LSN[OneOrTwo]|-18|5|pin@364||-18|2.5
+Awire|net@962|||2700|newCell@0|LSN[OneOrDone]|-18|-9.5|pin@365||-18|-7
+Awire|net@973|||1800|conn@20|y|-52.5|-8.5|newCell@0|MSN[OneOrDone]|-28|-8.5
+Awire|net@978|||2700|newCell@0|LSN[OneOrDone]|-18|-9.5|pin@366||-18|-9
+Awire|net@1026|||0|pin@384||-23|-28|conn@11|y|-39.25|-28
+Awire|net@1027|||900|newCell@0|disableLO_1|-23|-11|pin@384||-23|-28
+Awire|net@1028|||0|conn@17|a|51|2.5|pin@364||-18|2.5
+Awire|net@1029|||0|conn@21|a|52|-9|pin@366||-18|-9
 Awire|s[3]|D5G2;||2700|gnd@1||9|17.25|pin@93||9|23.5
-ELSN[ZeroOrDone]|LSN[OneOrDone]|D5G2;X13;|conn@21|a|B
-ELSN[ZeroOrTwo]|LSN[OneOrTwo]|D6G2;X5;|conn@17|a|B
-EMSN[ZeroOrDone]|MSN[OneOrDone]|D5G2;X-8.5;|conn@20|a|B
-EMSN[ZeroOrTwo]|MSN[OneOrTwo]|D5G2;X-12.5;|conn@16|y|B
+ELSN[ZeroOrTwo]|LSN[TwoOrDone]|D6G2;X-9;Y-4;|conn@17|a|B
+ELSN[ZeroOrDone]|LSN[TwoOrOne]|D5G2;X13;|conn@21|a|B
+EMSN[ZeroOrTwo]|MSN[TwoOrDone]|D5G2;X-2;Y-3;|conn@16|y|B
+EMSN[ZeroOrDone]|MSN[TwoOrOne]|D5G2;X2;Y3.5;|conn@20|a|B
 Eload||D5G2;X-4.5;|conn@29|a|I
 EloadLO||D5G2;X-5.25;|conn@30|a|I
 Es[1:3]||D5G2;RX6.5;|conn@27|a|O
@@ -2920,7 +3392,7 @@ Edisable|disableLO|D5G2;X-2;Y-2;|pin@38||I
 X
 
 # Cell oneCellGasP;1{lay}
-ConeCellGasP;1{lay}||tsmcSun40GP|1249587657602|1250925057800||ATTR_NCC(D5G10;NTX-151;Y486;)S["exportsConnectedByParent vdd /vdd_[0-9]+/","exportsConnectedByParent gnd /gnd_[0-9]+/","exportsConnectedByParent disableLO /disableLO_[0-9]+/","exportsConnectedByParent disable /disable_[0-9]+/"]|DRC_last_good_drc_area_date()G1250576725677|DRC_last_good_drc_bit()I34|DRC_last_good_drc_date()G1250576725677
+ConeCellGasP;1{lay}||tsmcSun40GP|1249587657602|1252874887744||ATTR_NCC(D5G10;NTX-151;Y486;)S["exportsConnectedByParent vdd /vdd_[0-9]+/","exportsConnectedByParent gnd /gnd_[0-9]+/","exportsConnectedByParent disableLO /disableLO_[0-9]+/","exportsConnectedByParent disable /disable_[0-9]+/"]|DRC_last_good_drc_area_date()G1252874887745
 Ngeneric:Facet-Center|art@0||0|0||||AV
 NX-Metal-1-Metal-2-Con|contact@13||0|-150|||R|
 NX-Metal-1-Metal-2-Con|contact@14||243|-210|||R|
@@ -3307,28 +3779,14 @@ AMetal-2|net@1576|||S1800|pin@109||-620|345|wells@1|gnd_1|-579|345
 AMetal-2|net@1577|||S1800|wells@1|gnd_1|-579|345|inv_x1@3|gnd_8|-79.5|345
 AMetal-2|net@1578|||S1800|pin@114||-620|315|wells@1|gnd|-579|315
 AMetal-2|net@1579|||S1800|wells@1|gnd|-579|315|inv_x1@3|gnd_9|-79.5|315
-AMetal-2|net@1580|||S0|inv_x1@3|vdd_5|-80|225|wells@1|vdd_2|-577.5|225
-AMetal-2|net@1581|||S0|wells@1|vdd_2|-577.5|225|pin@113||-620|225
-AMetal-2|net@1582|||S1800|pin@112||-620|195|wells@1|vdd_1|-577.5|195
-AMetal-2|net@1583|||S1800|wells@1|vdd_1|-577.5|195|inv_x1@3|vdd_4|-80|195
-AMetal-2|net@1584|||S1800|pin@111||-620|165|wells@1|vdd|-577.5|165
-AMetal-2|net@1585|||S1800|wells@1|vdd|-577.5|165|inv_x1@3|vdd_3|-80|165
-AMetal-2|net@1586|||S1800|pin@100||-620|105|wells@2|vdd|-577.5|105
-AMetal-2|net@1588|||S1800|pin@101||-620|75|wells@2|vdd_1|-577.5|75
-AMetal-2|net@1590|||S1800|pin@102||-620|45|wells@2|vdd_2|-577.5|45
 AMetal-2|net@1592|||S0|pin@297||-494|-45|wells@2|gnd|-579|-45
 AMetal-2|net@1594|||S1800|pin@98||-620|-75|wells@2|gnd_1|-579|-75
 AMetal-2|net@1600|||S1800|pin@104||-620|-195|wells@3|gnd_1|-579|-195
 AMetal-2|net@1602|||S1800|pin@103||-620|-225|wells@3|gnd|-579|-225
-AMetal-2|net@1604|||S1800|pin@108||-620|-315|wells@3|vdd_2|-577.5|-315
-AMetal-2|net@1606|||S1800|pin@107||-620|-345|wells@3|vdd_1|-577.5|-345
-AMetal-2|net@1608|||S1800|pin@106||-620|-375|wells@3|vdd|-577.5|-375
 AMetal-2|net@1612|||S1800|pin@110||-620|375|inv_x1@3|gnd_10|-79.5|375
 AMetal-2|net@1613|||S1800|pin@105||-620|-165|wells@3|gnd_2|-578|-165
 AMetal-2|net@1614|||S1800|pin@244||-620|-105|wells@2|gnd_2|-578|-105
 AMetal-2|net@1617|||S1800|pin@110||-620|375|wells@1|gnd_2|-578|375
-AMetal-1|net@1618|||S2700|wells@3|x|-555|-184.5|wells@2|x|-555|-85.5
-AMetal-1|net@1619|||S2700|wells@2|y|-554|85.5|wells@1|y|-554|184.5
 AMetal-1|net@1621|||RS0|pin@344||-45|-287|nor2@0|out|-45|-287
 AMetal-1|net@1660|||S900|pin@365||18|-323|contact@147||18|-360
 AMetal-1|net@1661|||S2700|pin@329||18|-276|predCond@1|disable[2]|18|-265.5
@@ -3391,9 +3849,6 @@ AMetal-2|net@1767|||S0|nor2@0|gnd_5|0.5|-165|predCond@1|gnd_5|0|-165
 AMetal-2|net@1768|||S0|inv_x2x1@0|gnd_4|-117|-165|wells@3|gnd_2|-555|-165
 AMetal-2|net@1769|||S0|inv_x2x1@0|gnd|-117|-195|wells@3|gnd_1|-555|-195
 AMetal-2|net@1772|||S0|inv_x2x1@0|gnd_3|-117|-225|wells@3|gnd|-555|-225
-AMetal-2|net@1774|||S0|inv_x2x1@0|vdd|-117|-315|wells@3|vdd_2|-553.5|-315
-AMetal-2|net@1775|||S0|inv_x2x1@0|vdd_1|-117|-345|wells@3|vdd_1|-553.5|-345
-AMetal-2|net@1776|||S0|inv_x2x1@0|vdd_2|-117|-375|wells@3|vdd|-553.5|-375
 AMetal-2|net@1791|||S1800|succCond@7|vdd_6|71|105|inv_x1x1@0|vdd_3|72|105
 AMetal-2|net@1792|||S1800|succCond@7|vdd_7|71|75|inv_x1x1@0|vdd_4|72|75
 AMetal-2|net@1793|||S1800|succCond@7|vdd_8|71|45|inv_x1x1@0|vdd_5|72|45
@@ -3403,9 +3858,6 @@ AMetal-2|net@1796|||S1800|succCond@7|gnd_8|70|-105|inv_x1x1@0|gnd_7|72|-105
 AMetal-2|net@1797|||S0|succCond@7|gnd_5|-108|-105|wells@2|gnd_2|-555|-105
 AMetal-2|net@1798|||S0|succCond@7|gnd_4|-108|-75|wells@2|gnd_1|-555|-75
 AMetal-2|net@1799|||S0|succCond@7|gnd|-108|-45|pin@297||-494|-45
-AMetal-2|net@1800|||S0|succCond@7|vdd|-108|45|wells@2|vdd_2|-553.5|45
-AMetal-2|net@1801|||S0|succCond@7|vdd_4|-108|75|wells@2|vdd_1|-553.5|75
-AMetal-2|net@1802|||S0|succCond@7|vdd_3|-108|105|wells@2|vdd|-553.5|105
 AMetal-2|net@1805|||S0|contact@102||296.5|-15|contact@191||36|-15
 AMetal-2|net@1806|||S1800|contact@191||36|-15|contact@103||99|-15
 AMetal-1|net@1809|||S1800|pin@333||18|30|pin@390||45|30
@@ -3475,6 +3927,24 @@ AMetal-1|net@1909|||S2700|contact@63||351|-120|pin@414||351|299
 AMetal-2|net@1910|||S1800|contact@15||279|330|contact@216||351|330
 AMetal-2|net@1911|||S1800|contact@216||351|330|pin@34||400|330
 AMetal-1|net@1912|||S2700|pin@414||351|299|contact@216||351|330
+AMetal-2|net@1913|||S0|wells@1|vdd|-555|225|pin@113||-620|225
+AMetal-2|net@1914|||S0|wells@1|vdd_1|-555|195|pin@112||-620|195
+AMetal-2|net@1915|||S0|wells@1|vdd_2|-555|165|pin@111||-620|165
+AMetal-2|net@1916|||S1800|wells@1|vdd|-555|225|inv_x1@3|vdd_5|-80|225
+AMetal-2|net@1917|||S1800|wells@1|vdd_1|-555|195|inv_x1@3|vdd_4|-80|195
+AMetal-2|net@1918|||S1800|wells@1|vdd_2|-555|165|inv_x1@3|vdd_3|-80|165
+AMetal-2|net@1919|||S1800|pin@100||-620|105|wells@2|vdd_2|-555|105
+AMetal-2|net@1920|||S1800|wells@2|vdd_2|-555|105|succCond@7|vdd_3|-108|105
+AMetal-2|net@1921|||S1800|pin@101||-620|75|wells@2|vdd_1|-555|75
+AMetal-2|net@1922|||S1800|wells@2|vdd_1|-555|75|succCond@7|vdd_4|-108|75
+AMetal-2|net@1923|||S1800|pin@102||-620|45|wells@2|vdd|-555|45
+AMetal-2|net@1924|||S1800|wells@2|vdd|-555|45|succCond@7|vdd|-108|45
+AMetal-2|net@1925|||S1800|pin@108||-620|-315|wells@3|vdd|-555|-315
+AMetal-2|net@1926|||S1800|wells@3|vdd|-555|-315|inv_x2x1@0|vdd|-117|-315
+AMetal-2|net@1927|||S1800|pin@107||-620|-345|wells@3|vdd_1|-555|-345
+AMetal-2|net@1928|||S1800|wells@3|vdd_1|-555|-345|inv_x2x1@0|vdd_1|-117|-345
+AMetal-2|net@1929|||S1800|pin@106||-620|-375|wells@3|vdd_2|-555|-375
+AMetal-2|net@1930|||S1800|wells@3|vdd_2|-555|-375|inv_x2x1@0|vdd_3|-54|-375
 ELSN[OneOrDone]||D5G2;|pin@31||B
 ELSN[OneOrTwo]||D5G2;|pin@34||B
 EMSN[OneOrDone]||D5G2;|pin@29||B
@@ -3526,7 +3996,7 @@ Evdd_33||D5G2;|pin@269||P
 X
 
 # Cell oneCellGasP;1{sch}
-ConeCellGasP;1{sch}||schematic|1242942044308|1250619846416|
+ConeCellGasP;1{sch}||schematic|1242942044308|1252892057457|
 Ngeneric:Facet-Center|art@0||0|0||||AV
 NOff-Page|conn@0||9.75|70.25|||Y|
 NOff-Page|conn@1||-92.25|65.25|||YRR|
@@ -3534,7 +4004,7 @@ NOff-Page|conn@2||-92.25|37.75|||Y|
 NOff-Page|conn@3||10.25|26.75|||Y|
 NOff-Page|conn@9||21|43|||YRR|
 NOff-Page|conn@10||21|47|||YRR|
-Inand2nand2;4{ic}|fire@0||-32.75|90.25|||D5G4;|ATTR_X(D5G3;NOLPX-10.25;Y1;)S4
+Inand2nand2;4{ic}|fire@0||-32.75|90.25|||D5G4;
 IredFive:inv;1{ic}|inv@39||-57.75|50.75|XY||D0G4;|ATTR_X(D5G1.5;NPX1.75;Y2.5;)S1|ATTR_drive0(P)Sstrong0|ATTR_drive1(P)Sstrong1
 IredFive:inv;1{ic}|inv@49||-44.75|58.25|YRR||D5G4;|ATTR_X(D5FLeave alone;G1.5;NOLPX1;Y2.75;)S1|ATTR_drive0(P)Sstrong0|ATTR_drive1(P)Sstrong1
 IredFive:inv;1{ic}|inv@50||-44.75|50.75|YRR||D5G4;|ATTR_X(D5FLeave alone;G1.5;NOLPX0.5;Y-3;)S1|ATTR_drive0(P)Sstrong0|ATTR_drive1(P)Sstrong1
@@ -3733,6 +4203,144 @@ Edisable||D5G2;X-5;|conn@10|a|I
 EdisableLO||D5G2;X-6;|conn@9|a|I
 X
 
+# Cell pred;1{ic}
+Cpred;1{ic}||artwork|1021415734000|1253254419402|E|ATTR_LEGATE(D5G1;HNPX1.5;Y-2;)I1|ATTR_X(D5G1.5;HNOLPX1.5;Y2;)S@X|prototype_center()I[6000,0]
+Ngeneric:Facet-Center|art@0||0|0||||AV
+NThick-Circle|art@1||-2|0|1|1|||ART_color()I78
+NPin|pin@0||1.5|0|1|1||
+Nschematic:Bus_Pin|pin@1||-3.5|0|-2|-2||
+NPin|pin@2||-2.5|0|1|1||
+NPin|pin@3||-3.5|0||||
+Nschematic:Bus_Pin|pin@4||1.5|0|-2|-2||
+NPin|pin@5||-1.5|2|1|1||
+NPin|pin@6||-1.5|-2|1|1||
+Ngeneric:Invisible-Pin|pin@7||-0.75|0|||||ART_message(C26;D5G2;)SK
+AThicker|net@0|||FS3263|pin@0||1.5|0|pin@5||-1.5|2|ART_color()I78
+AThicker|net@1|||FS337|pin@0||1.5|0|pin@6||-1.5|-2|ART_color()I78
+AThicker|net@2|||FS0|pin@2||-2.5|0|pin@3||-3.5|0|ART_color()I78
+AThicker|net@3|||FS2700|pin@6||-1.5|-2|pin@5||-1.5|2|ART_color()I78
+Ein|fire|D5G1;|pin@1||I
+Eout|state|D5G1;|pin@4||O
+X
+
+# Cell pred;1{sch}
+Cpred;1{sch}||schematic|1227920907034|1253478659183||ATTR_LEGATE(D5G1;HNPX-40;Y5.5;)I1|ATTR_X(D5G4;HNOLPX-23;Y28;)S@X
+Ngeneric:Facet-Center|art@0||0|0||||AV
+NOff-Page|conn@0||-23|2.5||||
+NOff-Page|conn@2||9.75|2.5||||
+IredFive:inv;1{ic}|inv@0||1.5|-3|X||D5G4;|ATTR_X(D5FLeave alone;G1.5;NOLPX-2;Y-3.5;)S1|ATTR_drive0(P)Sstrong0|ATTR_drive1(P)Sstrong1
+IredFive:nms2b;1{ic}|nms2b@0||-6.5|-7|||D5G4;|ATTR_X(D5FLeave alone;G1.5;NPX4.25;Y-6;)S0.5
+Ngeneric:Invisible-Pin|pin@0||-0.5|39|||||ART_message(D5G5;)Spred
+Ngeneric:Invisible-Pin|pin@1||0|35|||||ART_message(D5G3;)Sam 13 Sep 2009
+NWire_Pin|pin@29||-18|-6|||X|
+NWire_Pin|pin@42||-18|2.5||||
+NWire_Pin|pin@78||-6.5|2.5||||
+NWire_Pin|pin@80||5.5|-3||||
+NWire_Pin|pin@81||5.5|2.5||||
+NWire_Pin|pin@87||-18|10.5||||
+NWire_Pin|pin@90||-18|-7||||
+IredFive:pms1;2{ic}|pms1@0||-6.5|10.5|||D5G4;|ATTR_X(D5FLeave alone;G1.5;NOLPX5.75;Y-0.5;)S@X
+Ipred;1{ic}|pred@1||-36|14|||D5G4;|ATTR_X(D5G1.5;NOJPX1.5;Y2;)SLE.getdrive()|ATTR_LEPARALLGRP()I-1|ATTR_drive0()Sstrong0|ATTR_drive1()Sstrong1|ATTR_su()I-1
+Awire|net@103|||2700|pin@29||-18|-6|pin@42||-18|2.5
+Awire|net@105|||1800|conn@0|y|-21|2.5|pin@42||-18|2.5
+Awire|net@203|||1800|inv@0|in|4|-3|pin@80||5.5|-3
+Awire|net@205|||0|pin@81||5.5|2.5|pin@78||-6.5|2.5
+Awire|net@206|||2700|pin@80||5.5|-3|pin@81||5.5|2.5
+Awire|net@221|||900|pin@29||-18|-6|pin@90||-18|-7
+Awire|net@222|||0|conn@2|a|7.75|2.5|pin@81||5.5|2.5
+Awire|net@227|||0|nms2b@0|g|-9.5|-7|pin@90||-18|-7
+Awire|net@228|||2700|nms2b@0|d|-6.5|-1|pin@78||-6.5|2.5
+Awire|net@229|||0|inv@0|out|-1|-3|nms2b@0|g2|-3.5|-3
+Awire|net@230|||900|pms1@0|d|-6.5|8.5|pin@78||-6.5|2.5
+Awire|net@231|||1800|pin@87||-18|10.5|pms1@0|g|-9.5|10.5
+Awire|net@232|||2700|pin@42||-18|2.5|pin@87||-18|10.5
+Efire||D4G2;|conn@0|a|I|ATTR_le(D5G1;NX-1.5;Y-1.5;)S0.666
+Estate||D4G2;X9;|conn@2|a|O|ATTR_le(D5G1;NX-3;Y-2;)S0.666
+X
+
+# Cell predCond;1{ic}
+CpredCond;1{ic}||artwork|1227921780535|1252892392018|E|ATTR_LEGATE(D5G1;HNPX-0.5;Y-5;)I1|ATTR_X(D5G1;HNOLPX-0.5;Y-3;)S@X
+Ngeneric:Facet-Center|art@0||0|0||||AV
+NThick-Circle|art@2||2|0|1|1|||ART_color()I-1174339839
+NThick-Circle|art@6||-0.5|0|4|4|RRR||ART_color()I-1174339839|ART_degrees()F[0.0,3.1415927]
+Nschematic:Bus_Pin|pin@2||-3|-1|-1|-1||
+Nschematic:Bus_Pin|pin@6||2.5|0|-1|-1||
+NPin|pin@25||-2.5|2|1|1|||ART_color()I-1174339839
+NPin|pin@26||-0.5|2|1|1|||ART_color()I-1174339839
+NPin|pin@27||-2.5|-2|1|1|||ART_color()I-1174339839
+NPin|pin@29||-2.5|1|1|1|||ART_color()I-1174339839
+NPin|pin@30||-3|1|1|1||
+NPin|pin@34||-0.5|-2|1|1|||ART_color()I-1174339839
+Nschematic:Bus_Pin|pin@41||-3|1||||
+NPin|pin@48||-1.5|2|1|1|||ART_color()I-1174339839
+NPin|pin@49||-2.5|1|1|1|||ART_color()I-1174339839
+NPin|pin@57||-2.5|-1|1|1|||ART_color()I-1174339839
+NPin|pin@58||-3|-1|1|1||
+Ngeneric:Invisible-Pin|pin@59||-0.75|0|||||ART_message(C26;D5G2;)SK
+AThicker|net@19|||FS900|pin@25||-2.5|2|pin@29||-2.5|1|ART_color()I-1174339839
+AThicker|net@20|||FS0|pin@29||-2.5|1|pin@30||-3|1|ART_color()I-1174339839
+AThicker|net@26|||FS900|pin@29||-2.5|1|pin@27||-2.5|-2|ART_color()I-1174339839
+AThicker|net@31|||FS1800|pin@27||-2.5|-2|pin@34||-0.5|-2|ART_color()I-1174339839
+AThicker|net@32|||FS450|pin@48||-1.5|2|pin@49||-2.5|1|ART_color()I-1174339839
+AThicker|net@39|||FS0|pin@57||-2.5|-1|pin@58||-3|-1|ART_color()I-1174339839
+AThicker|net@67|||FS1800|pin@25||-2.5|2|pin@26||-0.5|2|ART_color()I-1174339839
+Econd||D5G2;X-3;|pin@41||I
+Efire||D5G2;X-2.5;|pin@2||I
+Estate||D5G2;X2.5;|pin@6||O
+X
+
+# Cell predCond;1{sch}
+CpredCond;1{sch}||schematic|1227920907034|1253202569195||ATTR_LEGATE(D5G1;HNPX-30.5;Y-9;)I1|ATTR_X(D5G4;HNOLPX-23;Y28;)S@X
+IredFive:PMOS;1{ic}|PMOS@0||-7.5|7.5|||D5G4;|ATTR_X(D5G1.5;NOLPX-3;Y1.5;)S1
+IredFive:PMOS;1{ic}|PMOS@1||-5.5|7.5|X||D5G4;|ATTR_X(D5G1.5;NOLPX-3;Y1.5;)S1
+Ngeneric:Facet-Center|art@0||0|0||||AV
+NOff-Page|conn@0||-23|0.5||||
+NOff-Page|conn@2||9.75|0.5||||
+NOff-Page|conn@4||9.5|-10|||X|
+IredFive:inv;1{ic}|inv@0||1.5|14.5|X||D5G4;|ATTR_X(D5FLeave alone;G1.5;NOLPX1.5;Y2;)S1|ATTR_drive0(P)Sstrong0|ATTR_drive1(P)Sstrong1
+IredFive:nms2b;1{ic}|nms2b@0||-6.5|-10|X||D5G4;|ATTR_X(D5FLeave alone;G1.5;NOLPX1.25;Y-5.5;)S@X|ATTR_LEGATE()I1|ATTR_LEPARALLGRP()I-1|ATTR_su()I-1
+Ngeneric:Invisible-Pin|pin@0||-0.5|39|||||ART_message(D5G5;)SpredCond
+Ngeneric:Invisible-Pin|pin@1||0|35|||||ART_message(D5G3;)Sam 13 Sep 2009
+NWire_Pin|pin@29||-18|-6|||X|
+NWire_Pin|pin@42||-18|0.5||||
+NWire_Pin|pin@58||-6.5|9.5||||
+NWire_Pin|pin@59||-18|7.5||||
+NWire_Pin|pin@60||-6.5|5.5||||
+NWire_Pin|pin@61||-1|-10||||
+NWire_Pin|pin@64||-1|7.5||||
+NWire_Pin|pin@76||-6.5|-4||||
+NWire_Pin|pin@78||-6.5|0.5||||
+NWire_Pin|pin@80||5.5|14.5||||
+NWire_Pin|pin@81||5.5|0.5||||
+IredFive:pms1;2{ic}|pms1@0||-6.5|14.5|X||D5G4;|ATTR_X(D5FLeave alone;G1.5;NOLPX3.25;Y1;)S1
+IpredCond;1{ic}|predCond@2||-40|-2|||D5G4;
+Awire|net@103|||2700|pin@29||-18|-6|pin@42||-18|0.5
+Awire|net@105|||1800|conn@0|y|-21|0.5|pin@42||-18|0.5
+Awire|net@146|||1800|PMOS@0|s|-7.5|9.5|pin@58||-6.5|9.5
+Awire|net@147|||1800|pin@58||-6.5|9.5|PMOS@1|s|-5.5|9.5
+Awire|net@150|||2700|pin@42||-18|0.5|pin@59||-18|7.5
+Awire|net@151|||0|PMOS@0|g|-10.5|7.5|pin@59||-18|7.5
+Awire|net@153|||1800|PMOS@0|d|-7.5|5.5|pin@60||-6.5|5.5
+Awire|net@154|||1800|pin@60||-6.5|5.5|PMOS@1|d|-5.5|5.5
+Awire|net@156|||0|conn@4|y|7.5|-10|pin@61||-1|-10
+Awire|net@161|||0|pin@64||-1|7.5|PMOS@1|g|-2.5|7.5
+Awire|net@171|||900|pin@64||-1|7.5|pin@61||-1|-10
+Awire|net@186|||2700|nms2b@0|d|-6.5|-4|pin@76||-6.5|-4
+Awire|net@188|||0|pin@61||-1|-10|nms2b@0|g|-3.5|-10
+Awire|net@195|||900|pin@60||-6.5|5.5|pin@78||-6.5|0.5
+Awire|net@196|||900|pin@78||-6.5|0.5|pin@76||-6.5|-4
+Awire|net@198|||1800|pin@29||-18|-6|nms2b@0|g2|-9.5|-6
+Awire|net@201|||2700|pin@58||-6.5|9.5|pms1@0|d|-6.5|12.5
+Awire|net@202|||0|inv@0|out|-1|14.5|pms1@0|g|-3.5|14.5
+Awire|net@203|||1800|inv@0|in|4|14.5|pin@80||5.5|14.5
+Awire|net@205|||0|pin@81||5.5|0.5|pin@78||-6.5|0.5
+Awire|net@206|||900|pin@80||5.5|14.5|pin@81||5.5|0.5
+Awire|net@207|||1800|pin@81||5.5|0.5|conn@2|a|7.75|0.5
+Econd||D6G2;X-5;|conn@4|a|I|ATTR_le(D5G1;NX-2.5;Y-1.5;)S0.666
+Efire||D4G2;|conn@0|a|I|ATTR_le(D5G1;NX-1.5;Y-2;)S0.666
+Estate||D4G2;X9.5;|conn@2|a|O|ATTR_le(D5G1;NX2;Y-1.5;)S0.666
+X
+
 # Cell predCond2;2{ic}
 CpredCond2;2{ic}||artwork|1227921780535|1248818530302|E|ATTR_X(D5G1;HNOLPX-0.5;Y-3;)S@X
 Ngeneric:Facet-Center|art@0||0|0||||AV
@@ -3937,7 +4545,7 @@ Evdd_8||D5G2;|pin@36||P
 X
 
 # Cell predCond2;1{sch}
-CpredCond2;1{sch}||schematic|1227920907034|1250619765607||ATTR_X(D5G4;HNOLPX-23;Y28;)S@X
+CpredCond2;1{sch}||schematic|1227920907034|1252874551489||ATTR_X(D5G4;HNOLPX-23;Y28;)S@X
 IredFive:PMOS;1{ic}|PMOS@0||-7.5|7.5|||D5G4;|ATTR_X(D5G1.5;NOLPX-3;Y1.5;)S1
 IredFive:PMOS;1{ic}|PMOS@1||-5.5|7.5|X||D5G4;|ATTR_X(D5G1.5;NOLPX-3;Y1.5;)S1
 Ngeneric:Facet-Center|art@0||0|0||||AV
@@ -3957,7 +4565,6 @@ NWire_Pin|pin@60||-6.5|5.5||||
 NWire_Pin|pin@61||-1|-10||||
 NWire_Pin|pin@64||-1|7.5||||
 NWire_Pin|pin@76||-6.5|-4||||
-NWire_Pin|pin@77||-11|-6||||
 NWire_Pin|pin@78||-6.5|0.5||||
 IredFive:pms2a;2{ic}|pms2a@0||-6.5|18|X||D5G4;|ATTR_X(D5FLeave alone;G1.5;NOLPX-3.75;Y3;)S1
 IpredCond2;2{ic}|predCond@1||-37.5|-2|||D5G4;
@@ -3972,9 +4579,7 @@ Awire|net@154|||1800|pin@60||-6.5|5.5|PMOS@1|d|-5.5|5.5
 Awire|net@156|||0|conn@4|y|7.5|-10|pin@61||-1|-10
 Awire|net@161|||0|pin@64||-1|7.5|PMOS@1|g|-2.5|7.5
 Awire|net@171|||900|pin@64||-1|7.5|pin@61||-1|-10
-Awire|net@184|||1800|pin@29||-18|-6|pin@77||-11|-6
 Awire|net@186|||2700|nms2a@1|d|-6.5|-4|pin@76||-6.5|-4
-Awire|net@187|||0|nms2a@1|g2|-3.5|-6|pin@77||-11|-6
 Awire|net@188|||0|pin@61||-1|-10|nms2a@1|g|-3.5|-10
 Awire|net@191|||2700|pin@58||-6.5|9.5|pms2a@0|d|-6.5|12
 Awire|net@192|||0|conn@5|y|9.5|14|pms2a@0|g2|-3.5|14
@@ -3982,39 +4587,134 @@ Awire|net@193|||0|conn@6|y|9.5|18|pms2a@0|g|-3.5|18
 Awire|net@195|||900|pin@60||-6.5|5.5|pin@78||-6.5|0.5
 Awire|net@196|||900|pin@78||-6.5|0.5|pin@76||-6.5|-4
 Awire|net@197|||0|conn@2|y|7.75|0.5|pin@78||-6.5|0.5
+Awire|net@198|||1800|pin@29||-18|-6|nms2a@1|g2|-3.5|-6
 Econd||D6G2;X-5;|conn@4|a|I
-Enot_keep_up|disable[1]|D5G2;X-7.5;|conn@5|a|I
-Enot_keep_up[2]|disable[2]|D5G2;X-8;|conn@6|a|I
+Enot_keep_up|disable[1]|D5G2;X-5;|conn@5|a|I
+Enot_keep_up[2]|disable[2]|D5G2;X-5;|conn@6|a|I
 Efire||D4G2;|conn@0|a|I
 Estate||D4G2;|conn@2|a|B
 X
 
-# Cell studyOfThePurpleNor3WithIvanInPortlandAtTheArcJunk;1{sch}
-CstudyOfThePurpleNor3WithIvanInPortlandAtTheArcJunk;1{sch}||schematic|1251231748009|1252708306607||LEDRIVE_inv@0()F179.3889|LEDRIVE_inv@1()F179.3889|LEDRIVE_inv@4()F179.3889|LEDRIVE_inv@5()F200.00002|LEDRIVE_nor3@0()F307.64874
-IpurpleFive:LEsettings;1{ic}|LEsettin@2||-24|17|||D5G4;|ATTR_LESETTINGS(D5G1;NPY-3.75;)I1|ATTR_alpha(D5G1;NPY-1.75;)F0.7|ATTR_epsilon(D5G1;NPY1.25;)F0.0010|ATTR_gate_cap(D5G1;NPY-0.75;)F0.19|ATTR_keeper_ratio(D5G1;NPY-2.75;)F0.1|ATTR_max_iter(D5G1;NPY0.25;)I30|ATTR_su(D5G1;NPY3.25;)F4.7|ATTR_wire_ratio(D5G1;NPY2.25;)F0.16|ATTR_x1inverter_length()F2.0|ATTR_x1inverter_nwidth()F3.0|ATTR_x1inverter_pwidth()F6.0
+# Cell select_x2;1{lay}
+Cselect_x2;1{lay}||tsmcSun40GP|1252813494176|1252814970756||DRC_last_good_drc_bit()I34|DRC_last_good_drc_date()G1252815456456
+Ngeneric:Facet-Center|art@0||0|0||||AV
+NN-Well-Node|plnode@0||9|80.5|18|161||A
+NNPlus-Node|plnode@1||9|-65.5|18|131||
+NPPlus-Node|plnode@2||9|75.5|18|151||
+NN-Well-Node|plnode@3||-9|80.5|18|161||A
+NNPlus-Node|plnode@4||-9|-65.5|18|131||
+NPPlus-Node|plnode@5||-9|75.5|18|151||
+X
+
+# Cell select_x4;1{lay}
+Cselect_x4;1{lay}|select_x2|tsmcSun40GP|1252813531937|1252814994407||DRC_last_good_drc_bit()I34|DRC_last_good_drc_date()G1252815456456
 Ngeneric:Facet-Center|art@0||0|0||||AV
-IpurpleFive:inv;1{ic}|inv@0||-49|-13|R||D5G4;|ATTR_Delay(D5G1;NPX2;Y-2;)I100|ATTR_LEGATE(P)I1|ATTR_LEPARALLGRP(P)I-1|ATTR_X(D5G1.5;NOJPX1.5;Y2;)SLE.getdrive()|ATTR_drive0(P)Sstrong0|ATTR_drive1(P)Sstrong1|ATTR_su(P)I-1
-IpurpleFive:inv;1{ic}|inv@1||-31|-13|R||D5G4;|ATTR_Delay(D5G1;NPX2;Y-2;)I100|ATTR_LEGATE(P)I1|ATTR_LEPARALLGRP(P)I-1|ATTR_X(D5G1.5;NOJPX1.5;Y2;)SLE.getdrive()|ATTR_drive0(P)Sstrong0|ATTR_drive1(P)Sstrong1|ATTR_su(P)I-1
-IredFive:inv;1{ic}|inv@3||-46|18|R||D5G4;|ATTR_Delay(D5G1;NPX2;Y-2;)I100|ATTR_X(D5FLeave alone;G1.5;NOLPX1.5;Y2;)S100|ATTR_drive0(P)Sstrong0|ATTR_drive1(P)Sstrong1
-IpurpleFive:inv;1{ic}|inv@4||-41|-13|R||D5G4;|ATTR_Delay(D5G1;NPX2;Y-2;)I100|ATTR_LEGATE(P)I1|ATTR_LEPARALLGRP(P)I-1|ATTR_X(D5G1.5;NOJPX1.5;Y2;)SLE.getdrive()|ATTR_drive0(P)Sstrong0|ATTR_drive1(P)Sstrong1|ATTR_su(P)I-1
-IpurpleFive:inv;1{ic}|inv@5||-19|-15|R||D5G4;|ATTR_Delay(D5G1;NPX2;Y-2;)I100|ATTR_LEGATE(P)I1|ATTR_LEPARALLGRP(P)I-1|ATTR_X(D5G1.5;NOJPX-4.5;Y3;)SLE.getdrive()|ATTR_drive0(P)Sstrong0|ATTR_drive1(P)Sstrong1|ATTR_su(P)I-1
-IredFive:inv;1{ic}|inv@6||-19|-6|R||D5G4;|ATTR_Delay(D5G1;NPX2;Y-2;)I100|ATTR_X(D5FLeave alone;G1.5;NOLPX5.5;Y3;)S100|ATTR_drive0(P)Sstrong0|ATTR_drive1(P)Sstrong1
-Inor3;1{ic}|nor3@0||-46|6|||D5G4;|ATTR_LEGATE(D5G1;NPX12;)I1|ATTR_LEPARALLGRP(D5G1;NPX12;Y-2;)I-1|ATTR_X(D5G1;NOJPX12;Y-1;)SLE.getdrive()|ATTR_su(D5G1;NPX12;Y-3;)I-1
-NWire_Pin|pin@0||-49|2.5||||
-NWire_Pin|pin@1||-41|-5.5||||
-NWire_Pin|pin@2||-43.5|-3||||
-NWire_Pin|pin@3||-45.5|-1||||
-NWire_Pin|pin@4||-45.5|2.5||||
-Awire|net@1|||2700|nor3@0|out|-46|8.75|inv@3|in|-46|15.5
-Awire|net@2|||2700|inv@0|out|-49|-10.5|pin@0||-49|2.5
-Awire|net@3|||0|nor3@0|inc|-48|2.5|pin@0||-49|2.5
-Awire|net@4|||2700|inv@4|out|-41|-10.5|pin@1||-41|-5.5
-Awire|net@6|||3150|inv@1|out|-31|-10.5|nor3@0|ina|-44|2.5
-Awire|net@7|||3150|pin@1||-41|-5.5|pin@2||-43.5|-3
-Awire|net@8|||3150|pin@2||-43.5|-3|pin@3||-45.5|-1
-Awire|net@9|||2700|pin@3||-45.5|-1|pin@4||-45.5|2.5
-Awire|net@10|||1800|nor3@0|inb|-46|2.5|pin@4||-45.5|2.5
-Awire|net@12|||2700|inv@5|out|-19|-12.5|inv@6|in|-19|-8.5
+Iselect_x2;1{lay}|select_x@0||-18|0|||D5G4;
+Iselect_x2;1{lay}|select_x@1||18|0|||D5G4;
+X
+
+# Cell select_x8;1{lay}
+Cselect_x8;1{lay}|select_x2|tsmcSun40GP|1252813560969|1252815001517||DRC_last_good_drc_bit()I34|DRC_last_good_drc_date()G1252815775417
+Ngeneric:Facet-Center|art@0||0|0||||AV
+Iselect_x4;1{lay}|select_x@0||-36|0|||D5G4;
+Iselect_x4;1{lay}|select_x@1||36|0|||D5G4;
+X
+
+# Cell select_x16;1{lay}
+Cselect_x16;1{lay}|select_x2|tsmcSun40GP|1252813615290|1252815008341||DRC_last_good_drc_bit()I34|DRC_last_good_drc_date()G1252818222491
+Ngeneric:Facet-Center|art@0||0|0||||AV
+Iselect_x8;1{lay}|select_x@0||-72|0|||D5G4;
+Iselect_x8;1{lay}|select_x@1||72|0|||D5G4;
+X
+
+# Cell succCond;1{ic}
+CsuccCond;1{ic}||artwork|1188825505548|1253481132730|EI|ATTR_LEGATE(D5G5;HNPY-2;)I1|ATTR_X(D5G1;HNPY3;)I8
+Ngeneric:Facet-Center|art@0||0|0||||AV
+NThick-Circle|art@10||-2.5|1|1|1|||ART_color()I-1174339839
+NThick-Circle|art@11||0|0|4|4|RRR||ART_color()I-1174339839|ART_degrees()F[0.0,3.1415927]
+NThick-Circle|art@12||-2.5|-1|1|1|||ART_color()I-1174339839
+Nschematic:Bus_Pin|pin@0||-3|1|-1|-1|Y|
+Nschematic:Bus_Pin|pin@2||2|0|-1|-1||
+NPin|pin@68||-2|-2|1|1|||ART_color()I-1174339839
+NPin|pin@69||-2|2|1|1|||ART_color()I-1174339839
+NPin|pin@71||0|2|1|1|||ART_color()I-1174339839
+NPin|pin@72||0|-2|1|1|||ART_color()I-1174339839
+Nschematic:Bus_Pin|pin@73||-3|-1|-1|-1|Y|
+NPin|pin@74||-2|-1|1|1|||ART_color()I-1174339839
+NPin|pin@75||-1|-2|1|1|||ART_color()I-1174339839
+Ngeneric:Invisible-Pin|pin@76||-0.25|0|||||ART_message(C26;D5G2;)SK
+AThicker|net@55|||FS2700|pin@74||-2|-1|pin@69||-2|2|ART_color()I-1174339839
+AThicker|net@58|||FS1800|pin@69||-2|2|pin@71||0|2|ART_color()I-1174339839
+AThicker|net@59|||FS1800|pin@68||-2|-2|pin@72||0|-2|ART_color()I-1174339839
+AThicker|net@60|||FS2700|pin@68||-2|-2|pin@74||-2|-1|ART_color()I-1174339839
+AThicker|net@61|||FS1350|pin@74||-2|-1|pin@75||-1|-2|ART_color()I-1174339839
+Econd||D5G2;X-2.5;|pin@73||I
+Ein||D5G2;X-1.5;|pin@0||I
+Estate||D5G2;X2.5;|pin@2||O
+X
+
+# Cell succCond;1{sch}
+CsuccCond;1{sch}||schematic|1188777360591|1253481136907||ATTR_LEGATE(D5G5;HNPX-19.5;Y14.5;)I1|ATTR_X(D5G1;HNPX-14;Y-9;)I8
+IredFive:NMOS;1{ic}|NMOS@0||-3|-4|||D0G4;|ATTR_X(D5G1.5;NOLPX-0.5;Y3;)S1
+IredFive:NMOS;1{ic}|NMOS@1||3|-4|X||D0G4;|ATTR_X(D5G1.5;NOLPX-1.5;Y2;)S1
+Ngeneric:Facet-Center|art@0||0|0||||AV
+NOff-Page|conn@0||-17|0||||
+NOff-Page|conn@1||23.5|0||||
+NOff-Page|conn@2||18|6|||X|
+IredFive:inv;1{ic}|inv@0||8|-14|RR||D5G4;|ATTR_X(D5FLeave alone;G1.5;NOLPX-1;Y3.5;)S1|ATTR_drive0(P)Sstrong0|ATTR_drive1(P)Sstrong1
+IredFive:nms1;2{ic}|nms1@0||0|-14|X||D5G4;|ATTR_X(D5FLeave alone;G1.5;NPX3;Y0.25;)I1
+Ngeneric:Invisible-Pin|pin@0||2.5|24|||||ART_message(D5G6;)SsuccCond
+Ngeneric:Invisible-Pin|pin@1||1.5|19|||||ART_message(D5G3;)Sam 13 Sep 2009
+NWire_Pin|pin@4||-3|0||||
+NWire_Pin|pin@37||-9|0||||
+NWire_Pin|pin@39||-9|-4||||
+NWire_Pin|pin@54||-3|-8||||
+NWire_Pin|pin@55||3|-8||||
+NWire_Pin|pin@56||3|0||||
+NWire_Pin|pin@57||9|6||||
+NWire_Pin|pin@59||9|-4||||
+NWire_Pin|pin@61||0|0||||
+NWire_Pin|pin@62||9|10||||
+NWire_Pin|pin@63||-9|6||||
+NWire_Pin|pin@66||3|10||||
+NWire_Pin|pin@67||-3|6||||
+NWire_Pin|pin@68||0|4||||
+NWire_Pin|pin@71||0|-8||||
+NWire_Pin|pin@72||16.5|-14||||
+NWire_Pin|pin@73||16.5|0||||
+IredFive:pms2;1{ic}|pms2@3||0|10|X||D5G4;|ATTR_X(D5G1.5;NOLPX-0.5;Y6;)S@X|ATTR_LEGATE()I1|ATTR_LEPARALLGRP()I-1|ATTR_su()I-1
+IsuccCond;1{ic}|succCond@3||-14|-14|||D5G4;
+Awire|net@109|||2700|pin@39||-9|-4|pin@37||-9|0
+Awire|net@111|||2700|pin@37||-9|0|pin@63||-9|6
+Awire|net@122|||0|pin@37||-9|0|conn@0|y|-15|0
+Awire|net@160|||900|NMOS@0|s|-3|-6|pin@54||-3|-8
+Awire|net@162|||2700|pin@55||3|-8|NMOS@1|s|3|-6
+Awire|net@163|||0|pin@61||0|0|pin@4||-3|0
+Awire|net@164|||2700|NMOS@1|d|3|-2|pin@56||3|0
+Awire|net@165|||1800|pin@57||9|6|conn@2|y|16|6
+Awire|net@168|||0|pin@59||9|-4|NMOS@1|g|6|-4
+Awire|net@169|||900|pin@4||-3|0|NMOS@0|d|-3|-2
+Awire|net@170|||1800|pin@39||-9|-4|NMOS@0|g|-6|-4
+Awire|net@171|||900|pin@57||9|6|pin@59||9|-4
+Awire|net@174|||0|pin@56||3|0|pin@61||0|0
+Awire|net@178|||900|pin@62||9|10|pin@57||9|6
+Awire|net@206|||0|pin@62||9|10|pin@66||3|10
+Awire|net@207|||1800|pin@63||-9|6|pin@67||-3|6
+Awire|net@208|||2700|pin@61||0|0|pin@68||0|4
+Awire|net@209|||0|pms2@3|g|3|10|pin@66||3|10
+Awire|net@210|||0|pms2@3|g2|-3|6|pin@67||-3|6
+Awire|net@211|||900|pms2@3|d|0|4|pin@68||0|4
+Awire|net@215|||0|pin@55||3|-8|pin@71||0|-8
+Awire|net@216|||0|pin@71||0|-8|pin@54||-3|-8
+Awire|net@217|||2700|nms1@0|d|0|-12|pin@71||0|-8
+Awire|net@218|||0|inv@0|out|5.5|-14|nms1@0|g|3|-14
+Awire|net@219|||1800|inv@0|in|10.5|-14|pin@72||16.5|-14
+Awire|net@220|||0|conn@1|a|21.5|0|pin@73||16.5|0
+Awire|net@221|||0|pin@73||16.5|0|pin@56||3|0
+Awire|net@222|||2700|pin@72||16.5|-14|pin@73||16.5|0
+Econd||D4G2;|conn@2|a|I|ATTR_le(D5G1;NX2;Y-1.5;)S1.333
+Ein||D4G2;|conn@0|a|I|ATTR_le(D5G1;NX-1;Y-2;)S1.333
+Estate||D6G2;|conn@1|y|O|ATTR_le(D5G1;NX1.5;Y-2;)S1.333
 X
 
 # Cell succCond3;2{ic}
@@ -4827,28 +5527,32 @@ Evdd_8||D5G2;|pin@34||U
 X
 
 # Cell wells;1{lay}
-Cwells;1{lay}||tsmcSun40GP|1250223472728|1250309878850||DRC_last_good_drc_bit()I34|DRC_last_good_drc_date()G1250309887492
+Cwells;1{lay}||tsmcSun40GP|1250223472728|1252814923322||ATTR_NCC(D5G10;NTX-9;Y224.5;)S["exportsConnectedByParent vdd /vdd_[0-9]+/","exportsConnectedByParent gnd /gnd_[0-9]+/","exportsConnectedByParent disableLO /disableLO_[0-9]+/","exportsConnectedByParent disable /disable_[0-9]+/"]|DRC_last_good_drc_bit()I34|DRC_last_good_drc_date()G1252818222491
 Ngeneric:Facet-Center|art@0||0|0||||AV
-NX-Metal-1-Metal-2-Con|contact@0||-1.5|105||53|R|
-NX-Metal-1-Metal-2-Con|contact@1||-1.5|75||53|R|
-NX-Metal-1-Metal-2-Con|contact@2||-1.5|45||53|R|
-NX-Metal-1-Metal-2-Con|contact@3||-3|-45||53|R|
-NX-Metal-1-Metal-2-Con|contact@4||-3|-75||53|R|
-NX-Metal-1-Metal-2-Con|contact@5||-3|-105||53|R|
-NP-Well-Node|plnode@0||2|-76.5|114|149||A
-NN-Well-Node|plnode@1||2|72|114|148||A
-NA-Metal-1-P-Well-Con|substr@2||-3|-85.5|88|52|R|
-NA-Metal-1-N-Well-Con|well@2||-2|85.5|88|52|R|
+NX-Metal-1-Metal-2-Con|contact@0||-1.5|105||51|R|
+NX-Metal-1-Metal-2-Con|contact@1||-1.5|75||51|R|
+NX-Metal-1-Metal-2-Con|contact@2||-1.5|45||51|R|
+NX-Metal-1-Metal-2-Con|contact@3||-3|-45||52|R|
+NX-Metal-1-Metal-2-Con|contact@4||-3|-75||52|R|
+NX-Metal-1-Metal-2-Con|contact@5||-3|-105||52|R|
+NMetal-2-Pin|pin@0||-3|45||||
+NMetal-2-Pin|pin@1||-3|75||||
+NMetal-2-Pin|pin@2||-3|105||||
+NP-Well-Node|plnode@0||2|-65.5|114|131||A
+NN-Well-Node|plnode@1||2|80.5|114|161||A
+NA-Metal-1-P-Well-Con|substr@2||-3|-70.5|88|52|R|
+NA-Metal-1-N-Well-Con|well@2||-2|70.5|88|52|R|
 AMetal-1|net@0|||S1800|contact@0||-1.5|105|well@2||2.5|105
 AMetal-1|net@1|||S0|contact@3||-3|-45|substr@2||-3|-45
 AMetal-1|net@2|||S0|contact@4||-3|-75|substr@2||-3|-75
 AMetal-1|net@3|||S0|contact@5||-9|-105|substr@2||-9|-105
+AMetal-2|net@4|||S0|pin@2||-3|105|contact@0||-3|105
+AMetal-2|net@5|||S0|pin@1||-3|75|contact@1||-3|75
+AMetal-2|net@6|||S0|pin@0||-3|45|contact@2||-3|45
 Egnd||D5G2;|contact@3||G
 Egnd_1||D5G2;|contact@4||G
 Egnd_2||D5G2;|contact@5||G
-Evdd||D5G2;|contact@0||P
-Evdd_1||D5G2;|contact@1||P
-Evdd_2||D5G2;|contact@2||P
-Ex||D5G2;|substr@2||U
-Ey||D5G2;|well@2||U
+Evdd||D5G2;|pin@0||P
+Evdd_1||D5G2;|pin@1||P
+Evdd_2||D5G2;|pin@2||P
 X

diff --git a/chips/omegaCounter/40nm/electric/purpleFive.jelib b/chips/omegaCounter/40nm/electric/purpleFive.jelib
index 960e101..6911755 100644 (file)
--- a/chips/omegaCounter/40nm/electric/purpleFive.jelib
+++ b/chips/omegaCounter/40nm/electric/purpleFive.jelib
@@ -1,5 +1,5 @@
 # header information:
-HpurpleFive|8.10g|USER_electrical_units()I70464
+HpurpleFive|8.10h|USER_electrical_units()I70464
 
 # Views:
 Vdocumentation|doc
@@ -15,21 +15,22 @@ LredFive|redFive
 # Tools:
 Ouser|DefaultTechnology()Scmos90|SchematicTechnology()Scmos90
 Oio|GDSOutputConvertsBracketsInExports()BF|GDSWritesExportPins()BT
+OSTA|GlobalSDCCommands()S"\n### 4 GHz clock setup\ncreate_clock -period 0.250 -name clk -waveform \"0 0.125\" clk\nset_clock_uncertainty -setup 0.010 clk\nset_clock_uncertainty -hold 0.010 clk\nset_propagated_clock clk\nset_clock_transition -rise 0.030 clk\nset_clock_transition -fall 0.030 clk\n#set_driving_cell -lib_cell inv_X008_0 clk\n\n### remove scan path from timing\nset_false_path -through */so\nset_false_path -from {sin}\nset_false_path -from {scanEn}\nset_false_path -to {sout}\n"
 
 # Technologies:
 Tcmos90|"GDS(ST)LayerForPad-FrameINcmos90"()S43|"GDS(TSMC)LayerForPad-FrameINcmos90"()S43
 Tmocmos|SelectedFoundryFormocmos()STSMC
 
 # Cell LEsettings;1{ic}
-CLEsettings;1{ic}||artwork|1023920563000|1252708283504|E|ATTR_LESETTINGS(D5G1;HNPX1.5;Y-4;)I1|ATTR_alpha(D5G1;HNPX1.5;Y-2;)D0.7|ATTR_epsilon(D5G1;HNPX1.5;Y1;)S0.01|ATTR_gate_cap(D5G1;HNPX1.5;Y-1;)F0.4|ATTR_keeper_ratio(D5G1;HNPX1.5;Y-3;)F0.1|ATTR_max_iter(D5G1;HNPX1.5;)I40|ATTR_su(D5G1;HNPX1.5;Y3;)S4.5|ATTR_wire_ratio(D5G1;HNPX1.5;Y2;)S0.22|prototype_center()I[0,0]
+CLEsettings;1{ic}||artwork|1023920563000|1253203134284|E|ATTR_LESETTINGS(D5G1;HNPX1.5;Y-4;)I1|ATTR_alpha(D5G1;HNPX1.5;Y-2;)S0.7|ATTR_epsilon(D5G1;HNPX1.5;Y1;)S0.01|ATTR_gate_cap(D5G1;HNPX1.5;Y-1;)S0.4|ATTR_keeper_ratio(D5G1;HNPX1.5;Y-3;)F0.1|ATTR_max_iter(D5G1;HNPX1.5;)I40|ATTR_su(D5G1;HNPX1.5;Y3;)S4.5|ATTR_wire_ratio(D5G1;HNPX1.5;Y2;)S0.22|ATTR_x1inverter_length(D5G1;HNPX1.5;Y-6;)I4|ATTR_x1inverter_nwidth(D5G1;HNPX1.5;Y-7;)I12|ATTR_x1inverter_pwidth(D5G1;HNPX1.5;Y-8;)S24|prototype_center()I[0,0]
 Ngeneric:Facet-Center|art@0||0|0||||AV
-NBox|art@2||1.5|-0.5|9|9|||ART_color()I-1728014079
+NBox|art@2||1.5|-2.75|11|13.5|||ART_color()I-1174339839
 Ngeneric:Invisible-Pin|pin@0||1.5|4.5|||||ART_message(D5G1;)S[LEsettings]
 X
 
-# Cell LEsettings;1{sch}
-CLEsettings;1{sch}||schematic|1023920036000|1213471981644||ATTR_LESETTINGS(D6G1;HNPX-21;Y23;)I1|ATTR_alpha(D5G1;HNPX-18.5;Y25;)D0.7|ATTR_epsilon(D6G1;HNPX-21;Y28;)S0.01|ATTR_gate_cap(D6G1;HNPX-21;Y26;)F0.4|ATTR_keeper_ratio(D5G1;HNPX-17;Y24;)F0.1|ATTR_max_iter(D6G1;HNPX-21;Y27;)I40|ATTR_su(D6G1;HNPX-21;Y30;)S4.5|ATTR_wire_ratio(D6G1;HNPX-21;Y29;)S0.22|ATTR_SPICE_template(D5G1;NTX-7;Y9;)S**LEsettings: None needed for LEsettings|prototype_center()I[12000,48000]
-ILEsettings;1{ic}|LEsettin@2||-4|2|||D5G4;|ATTR_LESETTINGS(D6G1;NPX-4;Y-3.5;)I1|ATTR_alpha(D5G1;NPX-1.5;Y-1.5;)F0.7|ATTR_epsilon(D6G1;NPX-4;Y1.5;)F0.0010|ATTR_gate_cap(D6G1;NPX-4;Y-0.5;)F0.19|ATTR_keeper_ratio(D5G1;NPY-2.5;)F0.1|ATTR_max_iter(D6G1;NPX-4;Y0.5;)I30|ATTR_su(D6G1;NPX-4;Y3.5;)S3.7|ATTR_wire_ratio(D6G1;NPX-4;Y2.5;)F0.16
+# Cell LEsettings;2{sch}
+CLEsettings;2{sch}||schematic|1023920036000|1253147132016||ATTR_LESETTINGS(D6G1;HNPX-21;Y23;)I1|ATTR_alpha(D5G1;HNPX-18.5;Y25;)S0.7|ATTR_epsilon(D6G1;HNPX-21;Y28;)S0.01|ATTR_gate_cap(D6G1;HNPX-21;Y26;)S0.4|ATTR_keeper_ratio(D5G1;HNPX-17;Y24;)F0.1|ATTR_max_iter(D6G1;HNPX-21;Y27;)I40|ATTR_su(D6G1;HNPX-21;Y30;)S4.5|ATTR_wire_ratio(D6G1;HNPX-21;Y29;)S0.22|ATTR_x1inverter_length(D5G1;HNPX-18.75;Y17;)I4|ATTR_x1inverter_nwidth(D5G1;HNPX-18.75;Y18;)I12|ATTR_x1inverter_pwidth(D5G1;HNPX-18.75;Y19;)S24|ATTR_SPICE_template(D5G1;NTX-25;Y2;)S**LEsettings: None needed for LEsettings|prototype_center()I[12000,48000]
+ILEsettings;1{ic}|LEsettin@5||-1|0|||D5G4;|ATTR_LESETTINGS(D5G1;NPY-1.5;)I1|ATTR_alpha(D5G1;NPY0.5;)S0.7|ATTR_epsilon(D5G1;NPY3.5;)S0.01|ATTR_gate_cap(D5G1;NPY1.5;)S0.4|ATTR_keeper_ratio(D5G1;NPY-0.5;)F0.1|ATTR_max_iter(D5G1;NPY2.5;)I40|ATTR_su(D5G1;NPY5.5;)S4.5|ATTR_wire_ratio(D5G1;NPY4.5;)S0.22|ATTR_x1inverter_length(D5G1;NPY-3.5;)I4|ATTR_x1inverter_nwidth(D5G1;NPY-4.5;)I12|ATTR_x1inverter_pwidth(D5G1;NPY-5.5;)S24
 Ngeneric:Facet-Center|art@0||0|0||||AV
 Ngeneric:Invisible-Pin|pin@0||-9.5|12|||||ART_message(D6G1;)S[this is the diffusion effort of PMOS gates (Cdiffp/Cgate)]
 Ngeneric:Invisible-Pin|pin@1||-9.5|13|||||ART_message(D6G1;)S[this is the diffusion effort of NMOS gates (Cdiffn/Cgate)]
@@ -39,6 +40,9 @@ Ngeneric:Invisible-Pin|pin@4||-9.5|16|||||ART_message(D6G1;)S[epsilon is the con
 Ngeneric:Invisible-Pin|pin@5||-9.5|17|||||ART_message(D6G1;)S[wire ratio is the default wire ratio: Cwire/Cgate]
 Ngeneric:Invisible-Pin|pin@6||-9.5|18|||||ART_message(D6G1;)S[su is the global step-up (fan-out)]
 Ngeneric:Invisible-Pin|pin@7||-24|21|||||ART_message(D6G2;)S[This Facet is used to set Logical Effort Settings]
+Ngeneric:Invisible-Pin|pin@8||-9.5|11|||||ART_message(D6G1;)Sx1inverter_nwidth is the width of the nmos in an X=1 inverter
+Ngeneric:Invisible-Pin|pin@9||-9.5|10|||||ART_message(D6G1;)Sx1inverter_pwidth is the width of the pmos in an X=1 inverter
+Ngeneric:Invisible-Pin|pin@10||-9.5|9|||||ART_message(D6G1;)Sx1inverter_length is the length of the pmos and nmos in an X=1 inverter
 X
 
 # Cell aChangeRecord;1{doc}

diff --git a/chips/omegaCounter/40nm/header.hsp b/chips/omegaCounter/40nm/header.hsp
index 15d02b0..c445ef8 100644 (file)
--- a/chips/omegaCounter/40nm/header.hsp
+++ b/chips/omegaCounter/40nm/header.hsp
@@ -58,13 +58,13 @@ vvdd vdd gnd 'sup'
 * .param HSIMPRINTSIMSTATUS=1
 * .param HSIMOUTPUTFLUSH=1n
 
-* .param HSIMSPEED=8
+.param HSIMSPEED=8
 
 * for extracted-layout simulation
-.param HSIMPOSTL=3
+* .param HSIMPOSTL=3
 
 * I used to use HSIMSPEED=5, but the omega counter has simulation artifacts at that level
-.param HSIMSPEED=4
+* .param HSIMSPEED=4
 
 * defaults -- play with these?
 * .param HSIMSPEED=3

diff --git a/chips/omegaCounter/40nm/waveform.txt b/chips/omegaCounter/40nm/waveform.txt
new file mode 100644 (file)
index 0000000..3da2a14
--- /dev/null
+++ b/chips/omegaCounter/40nm/waveform.txt
@@ -0,0 +1,63 @@
+panel Transient
+zoom -0.1125 1.0125 2.999218750000001E-7 3.00703125E-7
+signal load 127,0,255
+signal inlo[5] 255,127,0
+
+panel Transient
+zoom -0.1125 1.0125 2.999218750000001E-7 3.00703125E-7
+signal onecell@5.newcell@0.firelo 255,0,0
+
+panel Transient
+zoom -0.1124 1.0116 2.999218750000001E-7 3.00703125E-7
+signal net@417 0,127,255
+signal net@419 0,235,0
+
+panel Transient
+zoom -0.1125 1.0125 2.999218750000001E-7 3.00703125E-7
+signal onecell@4.newcell@0.firelo 255,0,0
+
+panel Transient
+zoom -0.11243750000000001 1.0119375000000002 2.999218750000001E-7 3.00703125E-7
+signal net@414 0,127,255
+signal net@416 0,235,0
+
+panel Transient
+zoom -0.1125 1.0125 2.999218750000001E-7 3.00703125E-7
+signal onecell@3.newcell@0.firelo 255,0,0
+
+panel Transient
+zoom -0.1124125 1.0117125 2.999218750000001E-7 3.00703125E-7
+signal net@410 0,127,255
+signal net@413 0,235,0
+
+panel Transient
+zoom -0.1125 1.0125 2.999218750000001E-7 3.00703125E-7
+signal onecell@2.newcell@0.firelo 255,0,0
+
+panel Transient
+zoom -0.11242500000000001 1.0118250000000002 2.999218750000001E-7 3.00703125E-7
+signal net@407 0,127,255
+signal net@409 0,235,0
+
+panel Transient
+zoom -0.1125 1.0125 2.999218750000001E-7 3.00703125E-7
+signal onecell@1.newcell@0.firelo 255,0,0
+
+panel Transient
+zoom -0.1124125 1.0117125 2.999218750000001E-7 3.00703125E-7
+signal net@404 0,127,255
+signal net@406 0,235,0
+
+panel Transient
+zoom -0.1125 1.0125 2.999218750000001E-7 3.00703125E-7
+signal onecell@0.newcell@0.firelo 255,0,0
+
+panel Transient
+zoom -0.1096375 0.9867375 2.999218750000001E-7 3.00703125E-7
+signal net@979 0,235,0
+signal net@1009 0,127,255
+
+panel Transient
+zoom -0.1125 1.0125 2.999218750000001E-7 3.00703125E-7
+signal onecell@6.newcell@0.firelo 255,127,0
+signal empty 0,255,255