Merge pull request #25 from siliconcompiler/lambdalib-softlib

gadfort · web-flow · commit 0c876d6ff6e1 · 2024-03-04T14:10:20.000-05:00
add lambdalib soft library to all pdk libs.
diff --git a/lambdapdk/asap7/libs/asap7sc7p5t.py b/lambdapdk/asap7/libs/asap7sc7p5t.py
@@ -114,7 +114,11 @@ def _setup_lib(chip, libname, suffix):
     lib.set('option', 'file', 'openroad_global_connect',
             libdir + '/apr/openroad/global_connect.tcl')
 
-    return lib
+    lambda_lib = siliconcompiler.Library(chip, f'lambdalib_{libname}', package='lambdapdk')
+    register_data_source(lambda_lib)
+    lambda_lib.add('option', 'ydir', libdir + '/lambda')
+
+    return [lib, lambda_lib]
 
 
 def setup(chip):
@@ -129,7 +133,7 @@ def setup(chip):
 
     libs = []
     for libname, suffix in all_libs.items():
-        libs.append(_setup_lib(chip, libname, suffix))
+        libs.extend(_setup_lib(chip, libname, suffix))
 
     return libs
 
diff --git a/lambdapdk/asap7/libs/fakeram7.py b/lambdapdk/asap7/libs/fakeram7.py
@@ -20,8 +20,12 @@ def setup(chip):
 
         lib.set('option', 'var', 'klayout_allow_missing_cell', mem_name)
 
-        lib.set('option', 'ydir', f'{path_base}/lambda')
-
         libs.append(lib)
 
+    lambda_lib = Library(chip, 'lambdalib_fakeram7', package='lambdapdk')
+    register_data_source(lambda_lib)
+    lambda_lib.add('option', 'ydir', 'lambdapdk/asap7/libs/fakeram7/lambda')
+
+    libs.append(lambda_lib)
+
     return libs
diff --git a/lambdapdk/freepdk45/libs/fakeram45.py b/lambdapdk/freepdk45/libs/fakeram45.py
@@ -19,8 +19,12 @@ def setup(chip):
 
         lib.set('option', 'var', 'klayout_allow_missing_cell', mem_name)
 
-        lib.set('option', 'ydir', f'{path_base}/lambda')
-
         libs.append(lib)
 
+    lambda_lib = Library(chip, 'lambdalib_fakeram45', package='lambdapdk')
+    register_data_source(lambda_lib)
+    lambda_lib.add('option', 'ydir', 'lambdapdk/freepdk45/libs/fakeram45/lambda')
+
+    libs.append(lambda_lib)
+
     return libs
diff --git a/lambdapdk/freepdk45/libs/nangate45.py b/lambdapdk/freepdk45/libs/nangate45.py
@@ -98,7 +98,11 @@ def setup(chip):
         lib.set('option', 'var', f'{tool}_tielow_cell', "LOGIC0_X1")
         lib.set('option', 'var', f'{tool}_tielow_port', "Z")
 
-    return lib
+    lambda_lib = siliconcompiler.Library(chip, 'lambdalib_nangate45', package='lambdapdk')
+    register_data_source(lambda_lib)
+    lambda_lib.add('option', 'ydir', 'lambdapdk/freepdk45/libs/nangate45/lambda')
+
+    return [lib, lambda_lib]
 
 
 #########################
diff --git a/lambdapdk/gf180/libs/gf180io.py b/lambdapdk/gf180/libs/gf180io.py
@@ -52,17 +52,16 @@ def setup(chip):
                                             'gf180mcu_fd_io__fill5',
                                             'gf180mcu_fd_io__fill10',
                                             'gf180mcu_fd_io__fillnc'])
-
-        lib.set('option', 'ydir', os.path.join(libdir, 'lambda'))
-        lib.set('option', 'idir', os.path.join(libdir, 'lambda'))
-
         libs.append(lib)
 
-    return libs
+    lambda_lib = siliconcompiler.Library(chip, 'lambdalib_gf180mcu_fd_io', package='lambdapdk')
+    register_data_source(lambda_lib)
+    lambda_lib.add('option', 'ydir', 'lambdapdk/gf180/libs/gf180mcu_fd_io/lambda')
+
+    return [*libs, lambda_lib]
 
 
 #########################
 if __name__ == "__main__":
-    lib = setup(siliconcompiler.Chip('<lib>'))
-    lib.write_manifest(f'{lib.top()}.json')
-    lib.check_filepaths()
+    for lib in setup(siliconcompiler.Chip('<lib>')):
+        lib.write_manifest(f'{lib.top()}.json')
diff --git a/lambdapdk/gf180/libs/gf180mcu.py b/lambdapdk/gf180/libs/gf180mcu.py
@@ -129,6 +129,12 @@ def setup(chip):
 
         libs.append(lib)
 
+        lambda_lib = siliconcompiler.Library(chip, f'lambdalib_{libname}', package='lambdapdk')
+        register_data_source(lambda_lib)
+        lambda_lib.add('option', 'ydir', libdir + '/lambda')
+
+        libs.append(lambda_lib)
+
     return libs
 
 
diff --git a/lambdapdk/gf180/libs/gf180sram.py b/lambdapdk/gf180/libs/gf180sram.py
@@ -1,4 +1,4 @@
-from siliconcompiler import Library
+from siliconcompiler import Chip, Library
 from lambdapdk import register_data_source
 
 
@@ -40,8 +40,18 @@ def setup(chip):
 
         lib.set('option', 'file', 'openroad_pdngen', f'{path_base}/pdngen.tcl')
 
-        lib.set('option', 'ydir', f'{path_base}/lambda')
-
         libs.append(lib)
 
+    lambda_lib = Library(chip, 'lambdalib_gf180sram', package='lambdapdk')
+    register_data_source(lambda_lib)
+    lambda_lib.add('option', 'ydir', 'lambdapdk/gf180/libs/gf180mcu_fd_ip_sram/lambda')
+
+    libs.append(lambda_lib)
+
     return libs
+
+
+#########################
+if __name__ == "__main__":
+    for lib in setup(Chip('<lib>')):
+        lib.write_manifest(f'{lib.top()}.json')
diff --git a/lambdapdk/sky130/libs/sky130hd.py b/lambdapdk/sky130/libs/sky130hd.py
@@ -145,10 +145,14 @@ def setup(chip):
         lib.set('option', 'var', f'{tool}_tielow_cell', "sky130_fd_sc_hd__conb_1")
         lib.set('option', 'var', f'{tool}_tielow_port', "LO")
 
-    return lib
+    lambda_lib = siliconcompiler.Library(chip, f'lambdalib_{libname}', package='lambdapdk')
+    register_data_source(lambda_lib)
+    lambda_lib.add('option', 'ydir', 'lambdapdk/sky130/libs/sky130hd/lambda')
+
+    return [lib, lambda_lib]
 
 
 #########################
 if __name__ == "__main__":
-    lib = setup(siliconcompiler.Chip('<lib>'))
-    lib.write_manifest(f'{lib.top()}.json')
+    for lib in setup(siliconcompiler.Chip('<lib>')):
+        lib.write_manifest(f'{lib.top()}.json')
diff --git a/lambdapdk/sky130/libs/sky130io.py b/lambdapdk/sky130/libs/sky130io.py
@@ -37,10 +37,14 @@ def setup(chip):
 
     lib.set('output', 'blackbox', 'verilog', os.path.join(libdir, 'bb', 'sky130_io.blackbox.v'))
 
-    return lib
+    lambda_lib = siliconcompiler.Library(chip, f'lambdalib_{libname}', package='lambdapdk')
+    register_data_source(lambda_lib)
+    lambda_lib.add('option', 'ydir', 'lambdapdk/sky130/libs/sky130io/lambda')
+
+    return [lib, lambda_lib]
 
 
 #########################
 if __name__ == "__main__":
-    lib = setup(siliconcompiler.Chip('<lib>'))
-    lib.write_manifest(f'{lib.top()}.json')
+    for lib in setup(siliconcompiler.Chip('<lib>')):
+        lib.write_manifest(f'{lib.top()}.json')
diff --git a/lambdapdk/sky130/libs/sky130sram.py b/lambdapdk/sky130/libs/sky130sram.py
@@ -1,4 +1,4 @@
-from siliconcompiler import Library
+from siliconcompiler import Chip, Library
 from lambdapdk import register_data_source
 
 
@@ -22,8 +22,18 @@ def setup(chip):
 
         lib.set('option', 'file', 'openroad_pdngen', f'{path_base}/pdngen.tcl')
 
-        lib.set('option', 'ydir', f'{path_base}/lambda')
-
         libs.append(lib)
 
+    lambda_lib = Library(chip, 'lambdalib_gf130sram', package='lambdapdk')
+    register_data_source(lambda_lib)
+    lambda_lib.add('option', 'ydir', 'lambdapdk/sky130/libs/sky130sram/lambda')
+
+    libs.append(lambda_lib)
+
     return libs
+
+
+#########################
+if __name__ == "__main__":
+    for lib in setup(Chip('<lib>')):
+        lib.write_manifest(f'{lib.top()}.json')
diff --git a/pyproject.toml b/pyproject.toml
@@ -31,7 +31,7 @@ dev = [
     "pytest >= 6.2.4",
     "pytest-timeout >= 2.1.0",
     "tclint >= 0.1.4",
-    "lambdalib >= 0.1.5"
+    "lambdalib >= 0.2.0"
 ]
 
 [tool.tclint]
diff --git a/tests/test_lambda.py b/tests/test_lambda.py
@@ -2,10 +2,10 @@
 from siliconcompiler import Chip
 import lambdalib
 
-from lambdapdk.asap7.libs import asap7sc7p5t
-from lambdapdk.freepdk45.libs import nangate45
-from lambdapdk.sky130.libs import sky130hd
-from lambdapdk.gf180.libs import gf180mcu
+from lambdapdk.asap7.libs import asap7sc7p5t, fakeram7
+from lambdapdk.freepdk45.libs import nangate45, fakeram45
+from lambdapdk.gf180.libs import gf180mcu, gf180io, gf180sram
+from lambdapdk.sky130.libs import sky130hd, sky130io, sky130sram
 
 
 @pytest.mark.parametrize('module,path', [
@@ -20,6 +20,8 @@ def test_la_stdlib(module, path):
         libs = [libs]
     for lib in libs:
         lib_name = lib.design
+        if "lambdalib" in lib_name:
+            continue
         assert lambdalib.check(path.format(lib_name=lib_name), 'stdlib')
 
 
@@ -39,3 +41,21 @@ def test_la_ramlib(path):
     ])
 def test_la_iolib(path):
     assert lambdalib.check(path, 'iolib')
+
+
+@pytest.mark.parametrize('module', [
+    asap7sc7p5t, fakeram7,
+    nangate45, fakeram45,
+    gf180mcu, gf180io, gf180sram,
+    sky130hd, sky130io, sky130sram
+])
+def test_lambdalib_is_present(module):
+    chip = Chip('<lib>')
+    chip.use(module)
+
+    has_lambda = False
+    for libs in chip.getkeys('library'):
+        if libs.startswith('lambdalib_'):
+            has_lambda = True
+
+    assert has_lambda, f"{module.__name__} does not have a lambdalib"
