Corrected some errors in the netgen setup, including incorrect
references to circuit1 vs. circuit2, and specifically ignoring the
monte carlo parameters "nf" for transistors and "mf" for MiM
capacitors.
diff --git a/sky130/netgen/sky130_setup.tcl b/sky130/netgen/sky130_setup.tcl
index 6e19f8b..20d8f09 100644
--- a/sky130/netgen/sky130_setup.tcl
+++ b/sky130/netgen/sky130_setup.tcl
@@ -57,18 +57,18 @@
property "-circuit1 $dev" parallel {value par}
property "-circuit1 $dev" tolerance {l 0.01} {w 0.01}
# Ignore these properties
- property "-circuit2 $dev" delete mult
+ property "-circuit1 $dev" delete mult
}
if {[lsearch $cells2 $dev] >= 0} {
permute "-circuit2 $dev" 1 2
- property "-circuit1 $dev" series enable
- property "-circuit1 $dev" series {w critical}
- property "-circuit1 $dev" series {l add}
- property "-circuit1 $dev" parallel enable
- property "-circuit1 $dev" parallel {l critical}
- property "-circuit1 $dev" parallel {w add}
- property "-circuit1 $dev" parallel {value par}
- property "-circuit1 $dev" tolerance {l 0.01} {w 0.01}
+ property "-circuit2 $dev" series enable
+ property "-circuit2 $dev" series {w critical}
+ property "-circuit2 $dev" series {l add}
+ property "-circuit2 $dev" parallel enable
+ property "-circuit2 $dev" parallel {l critical}
+ property "-circuit2 $dev" parallel {w add}
+ property "-circuit2 $dev" parallel {value par}
+ property "-circuit2 $dev" tolerance {l 0.01} {w 0.01}
# Ignore these properties
property "-circuit2 $dev" delete mult
}
@@ -100,18 +100,18 @@
property "-circuit1 $dev" parallel {value par}
property "-circuit1 $dev" tolerance {l 0.01} {w 0.01}
# Ignore these properties
- property "-circuit2 $dev" delete mult
+ property "-circuit1 $dev" delete mult
}
if {[lsearch $cells2 $dev] >= 0} {
permute "-circuit2 $dev" 1 2
- property "-circuit1 $dev" series enable
- property "-circuit1 $dev" series {w critical}
- property "-circuit1 $dev" series {l add}
- property "-circuit1 $dev" parallel enable
- property "-circuit1 $dev" parallel {l critical}
- property "-circuit1 $dev" parallel {w add}
- property "-circuit1 $dev" parallel {value par}
- property "-circuit1 $dev" tolerance {l 0.01} {w 0.01}
+ property "-circuit2 $dev" series enable
+ property "-circuit2 $dev" series {w critical}
+ property "-circuit2 $dev" series {l add}
+ property "-circuit2 $dev" parallel enable
+ property "-circuit2 $dev" parallel {l critical}
+ property "-circuit2 $dev" parallel {w add}
+ property "-circuit2 $dev" parallel {value par}
+ property "-circuit2 $dev" tolerance {l 0.01} {w 0.01}
# Ignore these properties
property "-circuit2 $dev" delete mult
}
@@ -146,16 +146,16 @@
property "-circuit1 $dev" parallel {w add}
property "-circuit1 $dev" tolerance {w 0.01} {l 0.01}
# Ignore these properties
- property "-circuit2 $dev" delete as ad ps pd mult sa sb sd
+ property "-circuit1 $dev" delete as ad ps pd mult sa sb sd nf
}
if {[lsearch $cells2 $dev] >= 0} {
permute "-circuit2 $dev" 1 3
- property "-circuit1 $dev" parallel enable
- property "-circuit1 $dev" parallel {l critical}
- property "-circuit1 $dev" parallel {w add}
+ property "-circuit2 $dev" parallel enable
+ property "-circuit2 $dev" parallel {l critical}
+ property "-circuit2 $dev" parallel {w add}
property "-circuit2 $dev" tolerance {w 0.01} {l 0.01}
# Ignore these properties
- property "-circuit2 $dev" delete as ad ps pd mult sa sb sd
+ property "-circuit2 $dev" delete as ad ps pd mult sa sb sd nf
}
}
@@ -180,12 +180,12 @@
property "-circuit1 $dev" parallel {value add}
property "-circuit1 $dev" tolerance {area 0.02}
# Ignore these properties
- property "-circuit2 $dev" delete mult perim
+ property "-circuit1 $dev" delete mult perim
}
if {[lsearch $cells2 $dev] >= 0} {
property "-circuit2 $dev" parallel enable
- property "-circuit1 $dev" parallel {area add}
- property "-circuit1 $dev" parallel {value add}
+ property "-circuit2 $dev" parallel {area add}
+ property "-circuit2 $dev" parallel {value add}
property "-circuit2 $dev" tolerance {area 0.02}
# Ignore these properties
property "-circuit2 $dev" delete mult perim
@@ -208,15 +208,15 @@
property "-circuit1 $dev" parallel {value add}
property "-circuit1 $dev" tolerance {l 0.01} {w 0.01}
# Ignore these properties
- property "-circuit2 $dev" delete mult perim
+ property "-circuit1 $dev" delete mult perim mf
}
if {[lsearch $cells2 $dev] >= 0} {
- property "-circuit1 $dev" parallel enable
- property "-circuit1 $dev" parallel {area add}
- property "-circuit1 $dev" parallel {value add}
- property "-circuit1 $dev" tolerance {l 0.01} {w 0.01}
+ property "-circuit2 $dev" parallel enable
+ property "-circuit2 $dev" parallel {area add}
+ property "-circuit2 $dev" parallel {value add}
+ property "-circuit2 $dev" tolerance {l 0.01} {w 0.01}
# Ignore these properties
- property "-circuit2 $dev" delete mult perim
+ property "-circuit2 $dev" delete mult perim mf
}
}
@@ -259,7 +259,7 @@
if {[lsearch $cells1 $dev] >= 0} {
property "-circuit1 $dev" parallel enable
# Ignore these properties
- property "-circuit2 $dev" delete mult
+ property "-circuit1 $dev" delete mult
}
if {[lsearch $cells2 $dev] >= 0} {
property "-circuit2 $dev" parallel enable
