More corrections: Put the correct GDS import script for the I/O in
the Makefile, and removed the older script that was no longer
supposed to be used. Corrected the LEF view for the HVC power pad
so that it does not have shapes overlapping the area where the
metal3 resistor cut is placed by the fix scripts.
diff --git a/VERSION b/VERSION
index 34f81b7..514ec94 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-1.0.351
+1.0.352
diff --git a/sky130/Makefile.in b/sky130/Makefile.in
index a2717eb..31eb7be 100644
--- a/sky130/Makefile.in
+++ b/sky130/Makefile.in
@@ -1344,7 +1344,7 @@
-lib %l/latest/timing/*.lib \
-gds %l/latest/cells/*/*.gds compile-only \
sort=../common/sort_pdkfiles.py \
- options=custom/scripts/sky130_fd_io_import.tcl \
+ options=custom/scripts/gds_import_io.tcl \
no-copy=sky130_fd_io__top_gpiov2.gds,sky130_fd_io__top_ground_hvc_wpad.gds,sky130_fd_io__top_power_hvc_wpadv2.gds,sky130_fd_io__overlay_vssio_hvc.gds,sky130_fd_io__overlay_vddio_hvc.gds \
include=sky130_fd_io__top_gpiov2.gds,sky130_fd_io__top_ground_hvc_wpad.gds,sky130_fd_io__top_power_hvc_wpadv2.gds,sky130_fd_io__overlay_vssio_hvc.gds,sky130_fd_io__overlay_vddio_hvc.gds \
-verilog %l/latest/cells/*/*.*.v \
diff --git a/sky130/custom/scripts/gds_import_io.tcl b/sky130/custom/scripts/gds_import_io.tcl
index 6602ac9..22546c6 100644
--- a/sky130/custom/scripts/gds_import_io.tcl
+++ b/sky130/custom/scripts/gds_import_io.tcl
@@ -8,7 +8,9 @@
gds flatglob *sky130_fd_pr__*_example_*
# ! flatten within the 120x2 ESD device
-gds flatglob *sky130_fd_io__gnd2gnd_*
+gds flatglob *sky130_fd_io__gnd2gnd_s*
+gds flatglob *sky130_fd_io__gnd2gnd_d*
+gds flatglob *sky130_fd_io__gnd2gnd_t*
# The following cells have to be flattened for the gpiov2 pad to read in
# correctly, and produce a layout that can be extracted and generate an
diff --git a/sky130/custom/scripts/sky130_fd_io_import.tcl b/sky130/custom/scripts/sky130_fd_io_import.tcl
deleted file mode 100644
index 3f18a42..0000000
--- a/sky130/custom/scripts/sky130_fd_io_import.tcl
+++ /dev/null
@@ -1,7 +0,0 @@
-# Special options passed to magic for GDS import of the I/O library cells.
-# This line flattens all the cells containing "__example_" in the name,
-# which includes all contacts and primitive devices. This prevents the
-# primitive devices from being split across the hierarchy, which causes
-# magic to misinterpret the device type.
-gds flatglob *__example_*
-cif istyle sky130(vendor)
diff --git a/sky130/custom/sky130_fd_io/lef/sky130_fd_io__top_power_hvc_wpadv2.lef b/sky130/custom/sky130_fd_io/lef/sky130_fd_io__top_power_hvc_wpadv2.lef
index 4614b6f..d0afca0 100644
--- a/sky130/custom/sky130_fd_io/lef/sky130_fd_io__top_power_hvc_wpadv2.lef
+++ b/sky130/custom/sky130_fd_io/lef/sky130_fd_io__top_power_hvc_wpadv2.lef
@@ -1382,7 +1382,6 @@
END
PORT
LAYER met3 ;
- RECT 50.390000 0.000000 74.290000 90.185000 ;
RECT 50.540000 90.185000 74.290000 90.335000 ;
RECT 50.690000 90.335000 74.290000 90.485000 ;
RECT 50.840000 90.485000 74.290000 90.635000 ;
