Merge branch 'master' of opencircuitdesign.com:/home/tim/gitsrc/open_pdks/
Pull before push
diff --git a/VERSION b/VERSION
index 1c66c9e..272e0b2 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-1.0.259
+1.0.260
diff --git a/sky130/custom/scripts/sp_to_spice.py b/sky130/custom/scripts/sp_to_spice.py
index 1d0c91d..3c9ed3c 100755
--- a/sky130/custom/scripts/sp_to_spice.py
+++ b/sky130/custom/scripts/sp_to_spice.py
@@ -4,7 +4,11 @@
#
# This script runs as a filter to foundry_install.sh and converts file
# names ending with ".sp" to ".spice". If the file has multiple extensions
-# then all are stripped before adding ".spice".
+# then all are stripped before adding ".spice". The script is specifically
+# intended to run on the SRAM macro library ".lvs.sp" files, which include
+# two parasitic devices that make them compatible with the extracted layout,
+# but have a few syntactical incompatibilities that can be corrected by
+# filtering the file during the copy.
#
# This script is a filter to be run by setting the name of this script as
# the value to "filter=" for the model install in the sky130 Makefile.
@@ -88,6 +92,9 @@
print('sp_to_spice.py: failed to open ' + outname + ' for writing.', file=sys.stderr)
return 1
+ # If the name was changed, remove the original file.
+ if filename != newname:
+ os.remove(inname)
if __name__ == '__main__':
diff --git a/sky130/netgen/sky130_setup.tcl b/sky130/netgen/sky130_setup.tcl
index fe6ade2..6bbdbde 100644
--- a/sky130/netgen/sky130_setup.tcl
+++ b/sky130/netgen/sky130_setup.tcl
@@ -155,7 +155,7 @@
property "-circuit1 $dev" parallel {w add}
property "-circuit1 $dev" tolerance {w 0.01} {l 0.01}
# Ignore these properties
- property "-circuit1 $dev" delete as ad ps pd mult sa sb sd nf nrd nrs
+ property "-circuit1 $dev" delete as ad ps pd mult sa sb sd nf nrd nrs area perim topography
}
if {[lsearch $cells2 $dev] >= 0} {
permute "-circuit2 $dev" 1 3
@@ -164,7 +164,7 @@
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 nf nrd nrs
+ property "-circuit2 $dev" delete as ad ps pd mult sa sb sd nf nrd nrs area perim topography
}
}
