Merge pull request #109 from siliconcompiler/ci-update

fix CI, still not runnable due to circular dependency in SC for the time being.

Author: gadfort

lambdalib/veclib/la_vmux2b/la_vmux2b.py

@@ -3,7 +3,7 @@
 
 class Vmux2b(Lambda):
     def __init__(self):
-        name = 'la_vmux2'
+        name = 'la_vmux2b'
         super().__init__(name, __file__)
 
 

lambdalib/veclib/la_vmux2b/rtl/la_vmux2b.v

@@ -4,9 +4,9 @@
 //# License:  MIT (see LICENSE file in Lambda repository)                    #
 //############################################################################
 
-module la_vmux2 #(parameter W = 1,           // width of mux
-                  parameter PROP = "DEFAULT" // cell property
-                  )
+module la_vmux2b #(parameter W = 1,           // width of mux
+                   parameter PROP = "DEFAULT" // cell property
+                   )
    (
     input          sel,
     input [W-1:0]  in1,

tests/test_generate.py

@@ -2,7 +2,8 @@
 import pytest
 import lambdalib
 
-pytestmark = pytest.mark.skip(reason="Skipping until SC update finished")
+pytestmark = pytest.skip(reason="Skipping until SC update finished",
+                         allow_module_level=True)
 
 
 def test_check():

tests/test_lint.py

@@ -1,53 +1,47 @@
-import subprocess
+import pytest
+
 import lambdalib as ll
+from siliconcompiler import Project
+from siliconcompiler.flows import lintflow
 
 
 def lint(design):
-    script = f"{design.name}.f"
-    design.write_fileset(script, fileset="rtl")
-    cmd = ['slang', '-f', script]
-    return subprocess.run(cmd,
-                          stderr=subprocess.STDOUT,
-                          check=True)
+    proj = Project(design)
+    proj.add_fileset("rtl")
+    proj.set_flow(lintflow.LintFlow())
+    return proj.run()
 
 
-def test_lint_stdlib():
-    for name in ll.stdlib.__all__:
-        design = getattr(ll.stdlib, name)
-        assert lint(design())
+@pytest.mark.parametrize("name", ll.stdlib.__all__)
+def test_lint_stdlib(name):
+    assert lint(getattr(ll.stdlib, name)())
 
 
-def test_lint_auxlib():
-    for name in ll.auxlib.__all__:
-        design = getattr(ll.auxlib, name)
-        assert lint(design())
+@pytest.mark.parametrize("name", ll.auxlib.__all__)
+def test_lint_auxlib(name):
+    assert lint(getattr(ll.auxlib, name)())
 
 
-def test_lint_ramlib():
-    for name in ll.ramlib.__all__:
-        design = getattr(ll.ramlib, name)
-        assert lint(design())
+@pytest.mark.parametrize("name", ll.ramlib.__all__)
+def test_lint_ramlib(name):
+    assert lint(getattr(ll.ramlib, name)())
 
 
-def test_lint_veclib():
-    for name in ll.veclib.__all__:
-        design = getattr(ll.veclib, name)
-        assert lint(design())
+@pytest.mark.parametrize("name", ll.veclib.__all__)
+def test_lint_veclib(name):
+    assert lint(getattr(ll.veclib, name)())
 
 
-def test_lint_iolib():
-    for name in ll.iolib.__all__:
-        design = getattr(ll.iolib, name)
-        assert lint(design())
+@pytest.mark.parametrize("name", ll.iolib.__all__)
+def test_lint_iolib(name):
+    assert lint(getattr(ll.iolib, name)())
 
 
-def test_lint_padring():
-    for name in ll.padring.__all__:
-        design = getattr(ll.padring, name)
-        assert lint(design())
+@pytest.mark.parametrize("name", ll.padring.__all__)
+def test_lint_padring(name):
+    assert lint(getattr(ll.padring, name)())
 
 
-def test_lint_fpgalib():
-    for name in ll.fpgalib.__all__:
-        design = getattr(ll.fpgalib, name)
-        assert lint(design())
+@pytest.mark.parametrize("name", ll.fpgalib.__all__)
+def test_lint_fpgalib(name):
+    assert lint(getattr(ll.fpgalib, name)())

tests/test_local_detect.py

@@ -1,11 +1,38 @@
-from siliconcompiler import Chip
 import pytest
-import lambdalib
 
-pytestmark = pytest.mark.skip(reason="Skipping until SC update finished")
+import lambdalib as ll
 
 
-def test_pdk_paths():
-    chip = Chip('<lib>')
-    chip.use(lambdalib)
-    assert chip.check_filepaths()
+@pytest.mark.parametrize("name", ll.stdlib.__all__)
+def test_lint_stdlib(name):
+    assert getattr(ll.stdlib, name)().check_filepaths()
+
+
+@pytest.mark.parametrize("name", ll.auxlib.__all__)
+def test_lint_auxlib(name):
+    assert getattr(ll.auxlib, name)().check_filepaths()
+
+
+@pytest.mark.parametrize("name", ll.ramlib.__all__)
+def test_lint_ramlib(name):
+    assert getattr(ll.ramlib, name)().check_filepaths()
+
+
+@pytest.mark.parametrize("name", ll.veclib.__all__)
+def test_lint_veclib(name):
+    assert getattr(ll.veclib, name)().check_filepaths()
+
+
+@pytest.mark.parametrize("name", ll.iolib.__all__)
+def test_lint_iolib(name):
+    assert getattr(ll.iolib, name)().check_filepaths()
+
+
+@pytest.mark.parametrize("name", ll.padring.__all__)
+def test_lint_padring(name):
+    assert getattr(ll.padring, name)().check_filepaths()
+
+
+@pytest.mark.parametrize("name", ll.fpgalib.__all__)
+def test_lint_fpgalib(name):
+    assert getattr(ll.fpgalib, name)().check_filepaths()