Merge pull request #173 from siliconcompiler/fix2

gadfort · web-flow · commit ceadb458f5b4 · 2025-09-05T14:53:32.000-04:00
fix verilog files
diff --git a/lambdapdk/__init__.py b/lambdapdk/__init__.py
@@ -11,7 +11,7 @@
 from siliconcompiler.tools.bambu import BambuStdCellLibrary
 from siliconcompiler.tools.klayout import KLayoutLibrary
 
-__version__ = "0.2.0-rc4"
+__version__ = "0.2.0-rc5"
 
 
 class _LambdaPath(PathSchema):
diff --git a/lambdapdk/asap7/libs/asap7sc7p5t.py b/lambdapdk/asap7/libs/asap7sc7p5t.py
@@ -93,15 +93,19 @@ def __init__(self, vt, suffix):
 
         # Setup for openroad
         with self.active_dataroot("lambdapdk"):
+            with self.active_fileset("openroad.powergrid"):
+                self.add_file(lib_path / "apr" / "openroad" / "pdngen.tcl")
+                self.add_openroad_powergridfileset()
+            with self.active_fileset("openroad.globalconnect"):
+                self.add_file(lib_path / "apr" / "openroad" / "global_connect.tcl")
+                self.add_openroad_globalconnectfileset()
+
             self.set_openroad_placement_density(0.60)
             self.set_openroad_tielow_cell(f"TIELOx1_ASAP7_75t_{suffix}", "L")
             self.set_openroad_tiehigh_cell(f"TIEHIx1_ASAP7_75t_{suffix}", "H")
             self.set_openroad_macro_placement_halo(5, 5)
             self.set_openroad_tracks_file(lib_path / "apr" / "openroad" / "tracks.tcl")
             self.set_openroad_tapcells_file(lib_path / "apr" / "openroad" / "tapcells.tcl")
-            self.add_openroad_global_connect_file(lib_path / "apr" / "openroad" /
-                                                  "global_connect.tcl")
-            self.add_openroad_power_grid_file(lib_path / "apr" / "openroad" / "pdngen.tcl")
 
         # Setup for bambu
         self.set_bambu_device_name("asap7-WC")
diff --git a/lambdapdk/asap7/libs/fakeram7.py b/lambdapdk/asap7/libs/fakeram7.py
@@ -23,9 +23,12 @@ def __init__(self, config):
                     self.add_file(path_base / "nldm" / f"{self.name}.lib")
                     self.add_asic_libcornerfileset("generic", "nldm")
 
-            self.add_openroad_power_grid_file(path_base / "apr" / "openroad" / "pdngen.tcl")
-            self.add_openroad_global_connect_file(
-                path_base / "apr" / "openroad" / "global_connect.tcl")
+            with self.active_fileset("openroad.powergrid"):
+                self.add_file(path_base / "apr" / "openroad" / "pdngen.tcl")
+                self.add_openroad_powergridfileset()
+            with self.active_fileset("openroad.globalconnect"):
+                self.add_file(path_base / "apr" / "openroad" / "global_connect.tcl")
+                self.add_openroad_globalconnectfileset()
 
             self.add_klayout_allowmissingcell(self.name)
 
diff --git a/lambdapdk/freepdk45/libs/fakeram45.py b/lambdapdk/freepdk45/libs/fakeram45.py
@@ -23,9 +23,12 @@ def __init__(self, config):
                     self.add_file(path_base / "nldm" / f"{self.name}.lib")
                     self.add_asic_libcornerfileset("generic", "nldm")
 
-            self.add_openroad_power_grid_file(path_base / "apr" / "openroad" / "pdngen.tcl")
-            self.add_openroad_global_connect_file(
-                path_base / "apr" / "openroad" / "global_connect.tcl")
+            with self.active_fileset("openroad.powergrid"):
+                self.add_file(path_base / "apr" / "openroad" / "pdngen.tcl")
+                self.add_openroad_powergridfileset()
+            with self.active_fileset("openroad.globalconnect"):
+                self.add_file(path_base / "apr" / "openroad" / "global_connect.tcl")
+                self.add_openroad_globalconnectfileset()
 
             self.add_klayout_allowmissingcell(self.name)
 
diff --git a/lambdapdk/freepdk45/libs/nangate45.py b/lambdapdk/freepdk45/libs/nangate45.py
@@ -77,14 +77,18 @@ def __init__(self):
 
         # Setup for openroad
         with self.active_dataroot("lambdapdk"):
+            with self.active_fileset("openroad.powergrid"):
+                self.add_file(lib_path / "apr" / "openroad" / "pdngen.tcl")
+                self.add_openroad_powergridfileset()
+            with self.active_fileset("openroad.globalconnect"):
+                self.add_file(lib_path / "apr" / "openroad" / "global_connect.tcl")
+                self.add_openroad_globalconnectfileset()
+
             self.set_openroad_placement_density(0.50)
             self.set_openroad_tielow_cell("LOGIC0_X1", "Z")
             self.set_openroad_tiehigh_cell("LOGIC1_X1", "Z")
             self.set_openroad_macro_placement_halo(22.4, 15.12)
             self.set_openroad_tapcells_file(lib_path / "apr" / "openroad" / "tapcell.tcl")
-            self.add_openroad_global_connect_file(
-                lib_path / "apr" / "openroad" / "global_connect.tcl")
-            self.add_openroad_power_grid_file(lib_path / "apr" / "openroad" / "pdngen.tcl")
 
         # Setup for bambu
         self.set_bambu_device_name("nangate45")
diff --git a/lambdapdk/gf180/libs/gf180mcu.py b/lambdapdk/gf180/libs/gf180mcu.py
@@ -156,14 +156,18 @@ def __init__(self, libtype, stackup):
 
         # Setup for OpenROAD
         with self.active_dataroot("lambdapdk"):
+            with self.active_fileset("openroad.powergrid"):
+                self.add_file(lib_path / "apr" / "openroad" / "pdngen.tcl")
+                self.add_openroad_powergridfileset()
+            with self.active_fileset("openroad.globalconnect"):
+                self.add_file(lib_path / "apr" / "openroad" / "global_connect.tcl")
+                self.add_openroad_globalconnectfileset()
+
             self.set_openroad_placement_density(0.50)
             self.set_openroad_tielow_cell(f"gf180mcu_fd_sc_mcu{libtype}5v0__tiel", "ZN")
             self.set_openroad_tiehigh_cell(f"gf180mcu_fd_sc_mcu{libtype}5v0__tieh", "Z")
             self.set_openroad_macro_placement_halo(15, 15)
             self.set_openroad_tapcells_file(lib_path / "apr" / "openroad" / "tapcell.tcl")
-            self.add_openroad_global_connect_file(
-                lib_path / "apr" / "openroad" / "global_connect.tcl")
-            self.add_openroad_power_grid_file(lib_path / "apr" / "openroad" / "pdngen.tcl")
 
         # Setup for bambu
         self.set_bambu_clock_multiplier(1)
diff --git a/lambdapdk/gf180/libs/gf180sram.py b/lambdapdk/gf180/libs/gf180sram.py
@@ -77,9 +77,11 @@ def __init__(self, config):
             with self.active_fileset("models.spice"):
                 self.add_file(path_base / "spice" / f"{self.name}.spice")
 
-            self.add_openroad_power_grid_file(path_base / "apr" / "openroad" / "pdngen.tcl")
-            self.add_openroad_global_connect_file(
-                path_base / "apr" / "openroad" / "global_connect.tcl")
+            with self.active_fileset("openroad.powergrid"):
+                self.add_file(path_base / "apr" / "openroad" / "pdngen.tcl")
+                self.add_openroad_powergridfileset()
+            with self.active_fileset("openroad.globalconnect"):
+                self.add_file(path_base / "apr" / "openroad" / "global_connect.tcl")
 
 
 class GF180_SRAM_64x8(_GF180SRAMLibrary):
diff --git a/lambdapdk/ihp130/libs/sg13g2_sram.py b/lambdapdk/ihp130/libs/sg13g2_sram.py
@@ -38,9 +38,12 @@ def __init__(self, config):
                               "RM_IHPSG13_1P_core_behavioral_bm_bist.v")
 
         with self.active_dataroot("lambdapdk"):
-            self.add_openroad_power_grid_file(path_base / "apr" / "openroad" / "pdngen.tcl")
-            self.add_openroad_global_connect_file(
-                path_base / "apr" / "openroad" / "global_connect.tcl")
+            with self.active_fileset("openroad.powergrid"):
+                self.add_file(path_base / "apr" / "openroad" / "pdngen.tcl")
+                self.add_openroad_powergridfileset()
+            with self.active_fileset("openroad.globalconnect"):
+                self.add_file(path_base / "apr" / "openroad" / "global_connect.tcl")
+                self.add_openroad_globalconnectfileset()
 
 
 class IHP130_SRAM_1024x64(_IHP130SRAMLibrary):
diff --git a/lambdapdk/ihp130/libs/sg13g2_stdcell.py b/lambdapdk/ihp130/libs/sg13g2_stdcell.py
@@ -94,14 +94,18 @@ def __init__(self, voltage):
 
         # Setup for OpenROAD
         with self.active_dataroot("lambdapdk"):
+            with self.active_fileset("openroad.powergrid"):
+                self.add_file(lib_path / "apr" / "openroad" / "pdngen.tcl")
+                self.add_openroad_powergridfileset()
+            with self.active_fileset("openroad.globalconnect"):
+                self.add_file(lib_path / "apr" / "openroad" / "global_connect.tcl")
+                self.add_openroad_globalconnectfileset()
+
             self.set_openroad_placement_density(0.65)
             self.set_openroad_tielow_cell("sg13g2_tielo", "L_LO")
             self.set_openroad_tiehigh_cell("sg13g2_tiehi", "L_HI")
             self.set_openroad_macro_placement_halo(40, 40)
             self.set_openroad_tapcells_file(lib_path / "apr" / "openroad" / "tapcell.tcl")
-            self.add_openroad_global_connect_file(
-                lib_path / "apr" / "openroad" / "global_connect.tcl")
-            self.add_openroad_power_grid_file(lib_path / "apr" / "openroad" / "pdngen.tcl")
 
         # Setup for bambu
         self.set_bambu_clock_multiplier(1)
diff --git a/lambdapdk/sky130/libs/sky130io/blackbox/sky130_ef_io.v b/lambdapdk/sky130/libs/sky130io/blackbox/sky130_ef_io.v
diff --git a/lambdapdk/sky130/libs/sky130io/lambda/la_iobidir.v b/lambdapdk/sky130/libs/sky130io/lambda/la_iobidir.v
diff --git a/lambdapdk/sky130/libs/sky130sc.py b/lambdapdk/sky130/libs/sky130sc.py
diff --git a/lambdapdk/sky130/libs/sky130sram.py b/lambdapdk/sky130/libs/sky130sram.py
