Revised the script that reads the SRAM from gf180mcu_ocd_ip_sram
so that it does not flatten small cells; otherwise, the resulting
layout netlist is different from the one used to validate the
macros within the repository, and they can fail LVS in projects
using the macros. Updated references to catch updates to the
gf180mcu_cd_ip_sram macros where some label placements were fixed,
especially in the 256-byte macro.
diff --git a/.gitignore b/.gitignore
index 20d39f4..a76d6c9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -23,3 +23,5 @@
# can use this file to aid in local installations
reconfigure.sh
+reconfigure_sky.sh
+reconfigure_gf.sh
diff --git a/VERSION b/VERSION
index b6135cf..64ad8f8 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-1.0.571
+1.0.572
diff --git a/gf180mcu/Makefile.in b/gf180mcu/Makefile.in
index f69d410..89d4a28 100644
--- a/gf180mcu/Makefile.in
+++ b/gf180mcu/Makefile.in
@@ -1486,6 +1486,7 @@
-lib cells/*/*.lib \
-spice cells/*/*.spice \
-gds cells/*/*.gds \
+ options=custom/scripts/gds_import_ocd_sram.tcl \
-lef cells/*/*.lef \
-verilog cells/*/*.v \
-library general gf180mcu_ocd_ip_sram 2>&1 | tee -a ${GF180MCU$*}_make.log
diff --git a/gf180mcu/custom/scripts/gds_import_ocd_sram.tcl b/gf180mcu/custom/scripts/gds_import_ocd_sram.tcl
new file mode 100644
index 0000000..2254cf9
--- /dev/null
+++ b/gf180mcu/custom/scripts/gds_import_ocd_sram.tcl
@@ -0,0 +1,6 @@
+# Set GDS import styles as needed to deal with the Open Circuit Design
+# SRAM layouts. The SRAM layouts within the library are validated
+# directly from the magic version. Therefore do *not* use the default
+# "gds flatten true" because it messes with the hierarchy and produces
+# a result that has not been directly validated.
+gds flatten false
diff --git a/gf180mcu/gf180mcu.json b/gf180mcu/gf180mcu.json
index a2bbb1d..a5c8569 100644
--- a/gf180mcu/gf180mcu.json
+++ b/gf180mcu/gf180mcu.json
@@ -96,8 +96,8 @@
"magic": "MAGIC_COMMIT"
},
"reference": {
- "open_pdks": "f29ae08ec8263842df8d6242cc662838f86db03b",
- "magic": "00c692b14085b7047542bf65b90bda6a230ac6d1",
+ "open_pdks": "aee66ce1fa4fa3cd5cb59bb9982dcdccbf8ab12a",
+ "magic": "bd417aa54b4e75499c57a009fa75bbb6b463aece",
"gf180mcu_pdk": "a897aa30369d3bcec87d9d50ce9b01f320f854ef",
"gf180mcu_fd_pr": "41918f5a2356b9fb49a897ecc4fb4716b0ab1041",
"gf180mcu_fd_pv": "50cc2fe338c81925e24a6ac4907ddaab534c1312",
@@ -109,7 +109,7 @@
"gf180mcu_as_sc_mcu7t3v3": "94449964567d710e3dab608f1a932f87c718d4f3",
"gf180mcu_ocd_io": "b6dcaaba63912ba3cf878bfa0adb749e1c8caa31",
"gf180mcu_ocd_alpha": "0597ebd5732987dbcd149e02c38525c1c5bf2a58",
- "gf180mcu_ocd_ip_sram": "f979bc259c71020d0da9a69a3040b268e8ff3a32",
+ "gf180mcu_ocd_ip_sram": "5b9a87a7c1e3ba5dee54440e7673d9293099168e",
"gf180mcu_osu_sc_gf12t3v3": "aa2fa8cd1bcb8fe98669acd05c0b0c65879268b3",
"gf180mcu_osu_sc_gf9t3v3": "aa2fa8cd1bcb8fe98669acd05c0b0c65879268b3"
}
diff --git a/sky130/sky130.json b/sky130/sky130.json
index 21f6731..28470a4 100644
--- a/sky130/sky130.json
+++ b/sky130/sky130.json
@@ -94,8 +94,8 @@
"magic": "MAGIC_COMMIT"
},
"reference": {
- "open_pdks": "f29ae08ec8263842df8d6242cc662838f86db03b",
- "magic": "00c692b14085b7047542bf65b90bda6a230ac6d1",
+ "open_pdks": "aee66ce1fa4fa3cd5cb59bb9982dcdccbf8ab12a",
+ "magic": "bd417aa54b4e75499c57a009fa75bbb6b463aece",
"sky130_fd_pr": "c996d0e7417d7574714079050e2768da70f7fdca",
"sky130_fd_io": "e60737bf624df95c211fe99c007ddec78e3e081d",
"sky130_fd_sc_hs": "c4cfcd760f1964f1670a1ed99c71c7c12b7ad49f",
