switch to registering with the objects

siliconcompiler · Dec 12, 2023 · 8ab4109 · 8ab4109
1 parent 53b7f06
commit 8ab4109
Show file tree

Hide file tree

Showing 10 changed files with 10 additions and 13 deletions.
diff --git a/lambdapdk/asap7/__init__.py b/lambdapdk/asap7/__init__.py
@@ -52,8 +52,8 @@ def setup(chip):
     libtype = '7p5t'
     pdkdir = os.path.join('lambdapdk', 'asap7', 'base')
 
-    register_data_source(chip)
     pdk = siliconcompiler.PDK(chip, process, package='lambdapdk')
+    register_data_source(pdk)
 
     # process name
     pdk.set('pdk', process, 'foundry', foundry)

diff --git a/lambdapdk/asap7/libs/asap7sc7p5t.py b/lambdapdk/asap7/libs/asap7sc7p5t.py
@@ -4,8 +4,8 @@
 
 
 def _setup_lib(chip, libname, suffix):
-    register_data_source(chip)
     lib = siliconcompiler.Library(chip, libname, package='lambdapdk')
+    register_data_source(lib)
 
     process = 'asap7'
     stackup = '10M'

diff --git a/lambdapdk/asap7/libs/fakeram7.py b/lambdapdk/asap7/libs/fakeram7.py
@@ -6,11 +6,10 @@ def setup(chip):
     libs = []
     stackup = '10M'
 
-    register_data_source(chip)
-
     for config in ('64x32', '128x32', '256x32', '256x64', '512x32', '512x64'):
         mem_name = f'fakeram7_{config}'
         lib = Library(chip, mem_name, package='lambdapdk')
+        register_data_source(lib)
         path_base = 'lambdapdk/asap7/libs/fakeram7'
         lib.add('output', stackup, 'lef', f'{path_base}/lef/{mem_name}.lef')
 

diff --git a/lambdapdk/freepdk45/__init__.py b/lambdapdk/freepdk45/__init__.py
@@ -45,8 +45,8 @@ def setup(chip):
 
     pdkdir = os.path.join('lambdapdk', 'freepdk45', 'base')
 
-    register_data_source(chip)
     pdk = siliconcompiler.PDK(chip, process, package='lambdapdk')
+    register_data_source(pdk)
 
     # process name
     pdk.set('pdk', process, 'foundry', foundry)

diff --git a/lambdapdk/freepdk45/libs/fakeram45.py b/lambdapdk/freepdk45/libs/fakeram45.py
@@ -7,11 +7,10 @@ def setup(chip):
     stackup = '10M'
     corner = 'typical'
 
-    register_data_source(chip)
-
     for config in ('64x32', '128x32', '256x32', '256x64', '512x32', '512x64'):
         mem_name = f'fakeram45_{config}'
         lib = Library(chip, mem_name, package='lambdapdk')
+        register_data_source(lib)
         path_base = 'lambdapdk/freepdk45/libs/fakeram45'
         lib.add('output', stackup, 'lef', f'{path_base}/lef/{mem_name}.lef')
         lib.add('output', corner, 'nldm', f'{path_base}/nldm/{mem_name}.lib')

diff --git a/lambdapdk/freepdk45/libs/nangate45.py b/lambdapdk/freepdk45/libs/nangate45.py
@@ -14,8 +14,8 @@ def setup(chip):
     version = 'r1p0'
     corner = 'typical'
 
-    register_data_source(chip)
     lib = siliconcompiler.Library(chip, libname, package='lambdapdk')
+    register_data_source(lib)
 
     libdir = os.path.join('lambdapdk', process, 'libs', libname)
 

diff --git a/lambdapdk/sky130/__init__.py b/lambdapdk/sky130/__init__.py
@@ -53,8 +53,8 @@ def setup(chip):
 
     pdkdir = os.path.join('lambdapdk', 'sky130', 'base')
 
-    register_data_source(chip)
     pdk = siliconcompiler.PDK(chip, process, package='lambdapdk')
+    register_data_source(pdk)
 
     # process name
     pdk.set('pdk', process, 'foundry', foundry)

diff --git a/lambdapdk/sky130/libs/sky130hd.py b/lambdapdk/sky130/libs/sky130hd.py
@@ -15,8 +15,8 @@ def setup(chip):
 
     libdir = os.path.join('lambdapdk', 'sky130', 'libs', libname)
 
-    register_data_source(chip)
     lib = siliconcompiler.Library(chip, libname, package='lambdapdk')
+    register_data_source(lib)
 
     # version
     lib.set('package', 'version', version)

diff --git a/lambdapdk/sky130/libs/sky130io.py b/lambdapdk/sky130/libs/sky130io.py
@@ -11,8 +11,8 @@ def setup(chip):
     libname = 'sky130io'
     stackup = '5M1LI'
 
-    register_data_source(chip)
     lib = siliconcompiler.Library(chip, libname, package='lambdapdk')
+    register_data_source(lib)
 
     libdir = os.path.join('lambdapdk', 'sky130', 'libs', libname)
 

diff --git a/lambdapdk/sky130/libs/sky130sram.py b/lambdapdk/sky130/libs/sky130sram.py
@@ -6,11 +6,10 @@ def setup(chip):
     libs = []
     stackup = '5M1LI'
 
-    register_data_source(chip)
-
     for config in ('64x256',):
         mem_name = f'sky130_sram_1rw1r_{config}_8'
         lib = Library(chip, mem_name, package='lambdapdk')
+        register_data_source(lib)
         path_base = 'lambdapdk/sky130/libs/sky130sram'
         lib.add('output', stackup, 'lef', f'{path_base}/{mem_name}/lef/{mem_name}.lef.gz')
         lib.add('output', stackup, 'gds', f'{path_base}/{mem_name}/gds/{mem_name}.gds')