Merge pull request #42 from siliconcompiler/fix-libs

cleanup lambdalib and make it ready for softlib support

Author: gadfort

lambdalib/__init__.py

@@ -1,10 +1,43 @@
-from siliconcompiler import Chip
+from siliconcompiler import Chip, Library
 import siliconcompiler.package as sc_package
 import glob
 import os
 import shutil
 __version__ = "0.1.5"
 
+_libraries = (
+    'iolib',
+    'stdlib',
+    'ramlib',
+    'padring',
+    'syslib',
+    'vectorlib'
+)
+
+
+########################
+# SiliconCompiler Setup
+########################
+def setup(chip):
+    '''Lambdalib library setup script'''
+
+    add_idirs = ('padring',)
+
+    libs = []
+    # Iterate over all libs
+    for name in _libraries:
+        lib = Library(chip, f'lambdalib_{name}', package='lambdalib')
+        register_data_source(lib)
+
+        lib.add('option', 'ydir', f"lambdalib/{name}/rtl")
+
+        if name in add_idirs:
+            lib.add('option', 'idir', f"lambdalib/{name}/rtl")
+
+        libs.append(lib)
+
+    return libs
+
 
 def register_data_source(chip):
     sc_package.register_python_data_source(

lambdalib/lambdalib.py

@@ -1,6 +1,6 @@
 from siliconcompiler import Chip
 
-from lambdalib import lambdalib
+import lambdalib
 
 
 def test_pdk_paths():

lambdalib/padring/floorplan/la_iopadring.py

@@ -1,24 +1,32 @@
+import pytest
 from siliconcompiler import Chip
 
-from lambdalib import lambdalib
+import lambdalib
 
 
-def test_setup_without_depencency():
+@pytest.mark.parametrize('lib', lambdalib._libraries)
+def test_setup(lib):
     chip = Chip('<lib>')
     chip.use(lambdalib)
 
-    assert 'la_stdlib' in chip.getkeys('library')
+    lib_name = f'lambdalib_{lib}'
 
-    assert len(chip.get('library', 'la_stdlib', 'option', 'ydir')) == 1
+    assert lib_name in chip.getkeys('library')
+    assert len(chip.get('library', lib_name, 'option', 'ydir')) == 1
 
 
-def test_setup_with_depencency():
+@pytest.mark.parametrize(
+        'lib,has_idir',
+        [(lib, lib == 'padring') for lib in lambdalib._libraries])
+def test_setup_with_idir(lib, has_idir):
     chip = Chip('<lib>')
     chip.use(lambdalib)
 
-    assert 'la_stdlib' in chip.getkeys('library')
-    assert 'la_iolib' in chip.getkeys('library')
-    assert 'la_ramlib' in chip.getkeys('library')
+    lib_name = f'lambdalib_{lib}'
+    assert lib_name in chip.getkeys('library')
 
-    assert len(chip.get('library', 'la_iolib', 'option', 'ydir')) == 2
-    assert len(chip.get('library', 'la_ramlib', 'option', 'ydir')) == 2
+    excpect_idir = 0
+    if has_idir:
+        excpect_idir = 1
+
+    assert len(chip.get('library', lib_name, 'option', 'idir')) == excpect_idir