Updated the GF180MCU JSON file to use the most recent PDK commits. Corrected the magic techfile PDK variant ifdef blocks to fix an error in the expected layers for the MiM cap when reading GDS (the metal layers got shifted down by one due to the incorrect definition parsing).
diff --git a/VERSION b/VERSION index 21a05c7..4e118ec 100644 --- a/VERSION +++ b/VERSION
@@ -1 +1 @@ -1.0.368 +1.0.369
diff --git a/gf180mcu/gf180mcu.json b/gf180mcu/gf180mcu.json index 69b5568..22c2030 100644 --- a/gf180mcu/gf180mcu.json +++ b/gf180mcu/gf180mcu.json
@@ -84,13 +84,13 @@ "magic": "MAGIC_COMMIT" }, "reference": { - "open_pdks": "3b7c10b059e14066bef632f53ff0a00a4d5c9f4d", + "open_pdks": "b8c6129fb60851c452a3136c2b8c603bb92cb180", "magic": "fb091fa03f3646b0f90639a0798b711ca400941d", "gf180mcu_pdk": "a897aa30369d3bcec87d9d50ce9b01f320f854ef", - "gf180mcu_fd_pr": "6aa5432a368138e9e6b899daade4c666f5ec808a", + "gf180mcu_fd_pr": "44181b90d706c30c27a8acd6efe862ed78a120f3", "gf180mcu_fd_io": "2aeec51ea2824b6cc0b396acfc39f4535f40b23a", "gf180mcu_fd_sc_mcu7t5v0": "8743b6f9641eb8707179c4e51703380d4dc90f16", - "gf180mcu_fd_sc_mcu9t5v0": "ac89034a23595aea1e450374fe257102e5b172f1", + "gf180mcu_fd_sc_mcu9t5v0": "376ea56fa36ce7702595ce4e0e3c9357ee38c81c", "gf180mcu_fd_ip_sram": "9c411928870ce15226228fa52ddb6ecc0ea4ffbe" } }
diff --git a/gf180mcu/magic/gf180mcu.tech b/gf180mcu/magic/gf180mcu.tech index 21817c7..838e345 100644 --- a/gf180mcu/magic/gf180mcu.tech +++ b/gf180mcu/magic/gf180mcu.tech
@@ -2233,10 +2233,10 @@ and RESDEF and MET3RES -#ifdef MIM +#ifdef METALS3 && MIM templayer mimarea CAPDEF - and MET2 -#endif + and MET3 +#endif (METALS3 && MIM) layer m3 MET3,MET3TXT and-not MET3RES @@ -2250,14 +2250,14 @@ labels M3FILL layer m3c VIA2 -#ifdef METALS4 && MIM +#ifdef METALS3 && MIM and-not CAPM and-not mimarea -#endif (METALS4 && MIM) +#endif (METALS3 && MIM) grow 140 shrink 130 -#ifdef METALS4 && MIM +#ifdef METALS3 && MIM layer mimcc VIA2 and MET3 and CAPM @@ -2265,7 +2265,7 @@ grow 90 grow 250 shrink 250 -#endif (METALS4 && MIM) +#endif (METALS3 && MIM) #endif (METALS3 || METALS4 || METALS5 || METALS6) #ifdef METALS4 || METALS5 || METALS6 @@ -2290,14 +2290,14 @@ labels M4FILL layer via3 VIA3 -#ifdef METALS5 && MIM +#ifdef METALS4 && MIM and-not CAPM and-not mimarea -#endif (METALS5 && MIM) +#endif (METALS4 && MIM) grow 140 shrink 130 -#ifdef METALS5 && MIM +#ifdef METALS4 && MIM layer mimcc VIA3 and MET4 and CAPM @@ -2305,7 +2305,7 @@ grow 90 grow 250 shrink 250 -#endif (METALS5 && MIM) +#endif (METALS4 && MIM) #endif (METALS4 || METALS5 || METALS6) #ifdef METALS5 || METALS6 @@ -2319,10 +2319,10 @@ #endif (METALS5 && MIM) layer m5 MET5,MET5TXT -#ifdef MIM && METALS6 +#ifdef MIM && METALS5 and-not CAPM and-not mimarea -#endif (MIM && METALS6) +#endif (MIM && METALS5) and-not MET5RES labels MET5 labels MET5TXT port @@ -2334,14 +2334,14 @@ labels M5FILL layer via4 VIA4 -#ifdef MIM && METALS6 +#ifdef MIM && METALS5 and-not CAPM and-not mimarea -#endif (MIM && METALS6) +#endif (MIM && METALS5) grow 140 shrink 130 -#ifdef METALS6 && MIM +#ifdef METALS5 && MIM layer mimcc VIA4 and MET5 and CAPM @@ -2349,7 +2349,7 @@ grow 90 grow 250 shrink 250 -#endif (METALS6 && MIM) +#endif (METALS5 && MIM) #endif (METALS5 || METALS6) #ifdef METALS6