Merge pull request #108 from siliconcompiler/gadfort/migrate

general cleanup of API to match current SC

Author: gadfort

examples/chip/chip.py

@@ -1,6 +1,10 @@
-import lambdalib as ll
+import subprocess
+
 from siliconcompiler import DesignSchema
 
+from lambdalib.padring import Padring
+
+
 class Chip(DesignSchema):
     def __init__(self):
 
@@ -11,24 +15,18 @@ def __init__(self):
         dataroot = f'{name}'
         topmodule = name
 
-        sources = [f'rtl/{name}.v']
-
         self.set_dataroot(dataroot, __file__)
         self.set_topmodule(topmodule, fileset)
 
-        for item in sources:
-            self.add_file(item, fileset, dataroot=dataroot)
-
+        self.add_file("rtl/chip.v", fileset, dataroot=dataroot)
         self.add_idir('rtl', fileset, dataroot=dataroot)
 
         # dependencies
-        for dep in [ll.padring.Padring]:
-            self.add_depfileset(dep(), depfileset='rtl', fileset='rtl')
+        self.add_depfileset(Padring(), depfileset='rtl', fileset='rtl')
+
 
 if __name__ == "__main__":
     d = Chip()
-    d.write_fileset(f"{d.name()}.f", fileset="rtl")
-    cmd = ['yosys', '-f', script]
-    return subprocess.run(cmd,
-                          stderr=subprocess.STDOUT,
-                          check=True)
+    d.write_fileset(f"{d.name}.f", fileset="rtl")
+    cmd = ['yosys', '-f', f"{d.name}.f"]
+    subprocess.run(cmd, stderr=subprocess.STDOUT, check=True)

lambdalib/__init__.py

@@ -1,6 +1,3 @@
-#  main setup class to inherit
-from .lambdalib import Lambda
-
 #  individual modules
 from lambdalib import auxlib
 from lambdalib import fpgalib
@@ -11,3 +8,13 @@
 from lambdalib import veclib
 
 __version__ = "0.3.4"
+
+__all__ = [
+    "auxlib",
+    "fpgalib",
+    "iolib",
+    "padring",
+    "stdlib",
+    "ramlib",
+    "veclib"
+]

lambdalib/auxlib/__init__.py

@@ -1,11 +1,13 @@
+from siliconcompiler import DesignSchema
+
+from .la_drsync.la_drsync import Drsync
+from .la_dsync.la_dsync import Dsync
 from .la_antenna.la_antenna import Antenna
 from .la_clkicgand.la_clkicgand import Clkicgand
 from .la_clkicgor.la_clkicgor import Clkicgor
 from .la_clkmux2.la_clkmux2 import Clkmux2
 from .la_clkmux4.la_clkmux4 import Clkmux4
 from .la_decap.la_decap import Decap
-from .la_drsync.la_drsync import Drsync
-from .la_dsync.la_dsync import Dsync
 from .la_footer.la_footer import Footer
 from .la_header.la_header import Header
 from .la_ibuf.la_ibuf import Ibuf
@@ -43,3 +45,32 @@
            'Pwrbuf',
            'Rsync',
            'Tbuf']
+
+
+class AUXLib(DesignSchema):
+    def __init__(self):
+        super().__init__("la_auxlib")
+
+        with self.active_fileset("rtl"):
+            self.add_depfileset(Antenna(), depfileset="rtl")
+            self.add_depfileset(Clkicgand(), depfileset="rtl")
+            self.add_depfileset(Clkicgor(), depfileset="rtl")
+            self.add_depfileset(Clkmux2(), depfileset="rtl")
+            self.add_depfileset(Clkmux4(), depfileset="rtl")
+            self.add_depfileset(Decap(), depfileset="rtl")
+            self.add_depfileset(Drsync(), depfileset="rtl")
+            self.add_depfileset(Dsync(), depfileset="rtl")
+            self.add_depfileset(Footer(), depfileset="rtl")
+            self.add_depfileset(Header(), depfileset="rtl")
+            self.add_depfileset(Ibuf(), depfileset="rtl")
+            self.add_depfileset(Iddr(), depfileset="rtl")
+            self.add_depfileset(Idiff(), depfileset="rtl")
+            self.add_depfileset(Isohi(), depfileset="rtl")
+            self.add_depfileset(Isolo(), depfileset="rtl")
+            self.add_depfileset(Keeper(), depfileset="rtl")
+            self.add_depfileset(Obuf(), depfileset="rtl")
+            self.add_depfileset(Oddr(), depfileset="rtl")
+            self.add_depfileset(Odiff(), depfileset="rtl")
+            self.add_depfileset(Pwrbuf(), depfileset="rtl")
+            self.add_depfileset(Rsync(), depfileset="rtl")
+            self.add_depfileset(Tbuf(), depfileset="rtl")

lambdalib/auxlib/la_antenna/la_antenna.py

@@ -1,13 +1,12 @@
-from lambdalib import Lambda
+from lambdalib.lambdalib import Lambda
 
 
 class Antenna(Lambda):
     def __init__(self):
         name = 'la_antenna'
-        sources = [f'rtl/{name}.v']
-        super().__init__(name, sources, __file__)
+        super().__init__(name, __file__)
 
 
 if __name__ == "__main__":
     d = Antenna()
-    d.write_fileset(f"{d.name()}.f", fileset="rtl")
+    d.write_fileset(f"{d.name}.f", fileset="rtl")

lambdalib/auxlib/la_clkicgand/la_clkicgand.py

@@ -1,13 +1,12 @@
-from lambdalib import Lambda
+from lambdalib.lambdalib import Lambda
 
 
 class Clkicgand(Lambda):
     def __init__(self):
         name = 'la_clkicgand'
-        sources = [f'rtl/{name}.v']
-        super().__init__(name, sources, __file__)
+        super().__init__(name, __file__)
 
 
 if __name__ == "__main__":
     d = Clkicgand()
-    d.write_fileset(f"{d.name()}.f", fileset="rtl")
+    d.write_fileset(f"{d.name}.f", fileset="rtl")

lambdalib/auxlib/la_clkicgor/la_clkicgor.py

@@ -1,13 +1,12 @@
-from lambdalib import Lambda
+from lambdalib.lambdalib import Lambda
 
 
 class Clkicgor(Lambda):
     def __init__(self):
         name = 'la_clkicgor'
-        sources = [f'rtl/{name}.v']
-        super().__init__(name, sources, __file__)
+        super().__init__(name, __file__)
 
 
 if __name__ == "__main__":
     d = Clkicgor()
-    d.write_fileset(f"{d.name()}.f", fileset="rtl")
+    d.write_fileset(f"{d.name}.f", fileset="rtl")

lambdalib/auxlib/la_clkmux2/la_clkmux2.py

@@ -1,20 +1,25 @@
-import lambdalib as ll
+from lambdalib.lambdalib import Lambda
 
+from lambdalib.stdlib import Inv
+from lambdalib.stdlib import And2
+from lambdalib.stdlib import Clkor2
+from lambdalib.auxlib import Drsync
+from lambdalib.auxlib import Clkicgand
 
-class Clkmux2(ll.Lambda):
+
+class Clkmux2(Lambda):
     def __init__(self):
         name = 'la_clkmux2'
-        sources = [f'rtl/{name}.v']
-        super().__init__(name, sources, __file__)
+        super().__init__(name, __file__)
+
         # dependencies
-        for dep in [ll.stdlib.Inv,
-                    ll.stdlib.And2,
-                    ll.stdlib.Clkor2,
-                    ll.auxlib.Drsync,
-                    ll.auxlib.Clkicgand]:
-            self.add_depfileset(dep(), depfileset='rtl', fileset='rtl')
+        self.add_depfileset(Inv(), depfileset='rtl', fileset='rtl')
+        self.add_depfileset(And2(), depfileset='rtl', fileset='rtl')
+        self.add_depfileset(Clkor2(), depfileset='rtl', fileset='rtl')
+        self.add_depfileset(Drsync(), depfileset='rtl', fileset='rtl')
+        self.add_depfileset(Clkicgand(), depfileset='rtl', fileset='rtl')
 
 
 if __name__ == "__main__":
     d = Clkmux2()
-    d.write_fileset(f"{d.name()}.f", fileset="rtl")
+    d.write_fileset(f"{d.name}.f", fileset="rtl")

lambdalib/auxlib/la_clkmux4/la_clkmux4.py

@@ -1,21 +1,27 @@
-import lambdalib as ll
+from lambdalib.lambdalib import Lambda
 
+from lambdalib.stdlib import Inv
+from lambdalib.stdlib import And2
+from lambdalib.stdlib import Or3
+from lambdalib.stdlib import Clkor4
+from lambdalib.auxlib import Drsync
+from lambdalib.auxlib import Clkicgand
 
-class Clkmux4(ll.Lambda):
+
+class Clkmux4(Lambda):
     def __init__(self):
         name = 'la_clkmux4'
-        sources = [f'rtl/{name}.v']
-        super().__init__(name, sources, __file__)
+        super().__init__(name, __file__)
+
         # dependencies
-        for dep in [ll.stdlib.Inv,
-                    ll.stdlib.And2,
-                    ll.stdlib.Or3,
-                    ll.stdlib.Clkor4,
-                    ll.auxlib.Drsync,
-                    ll.auxlib.Clkicgand]:
-            self.add_depfileset(dep(), depfileset='rtl', fileset='rtl')
+        self.add_depfileset(Inv(), depfileset='rtl', fileset='rtl')
+        self.add_depfileset(And2(), depfileset='rtl', fileset='rtl')
+        self.add_depfileset(Or3(), depfileset='rtl', fileset='rtl')
+        self.add_depfileset(Clkor4(), depfileset='rtl', fileset='rtl')
+        self.add_depfileset(Drsync(), depfileset='rtl', fileset='rtl')
+        self.add_depfileset(Clkicgand(), depfileset='rtl', fileset='rtl')
 
 
 if __name__ == "__main__":
     d = Clkmux4()
-    d.write_fileset(f"{d.name()}.f", fileset="rtl")
+    d.write_fileset(f"{d.name}.f", fileset="rtl")

lambdalib/auxlib/la_decap/la_decap.py

@@ -1,13 +1,12 @@
-from lambdalib import Lambda
+from lambdalib.lambdalib import Lambda
 
 
 class Decap(Lambda):
     def __init__(self):
         name = 'la_decap'
-        sources = [f'rtl/{name}.v']
-        super().__init__(name, sources, __file__)
+        super().__init__(name, __file__)
 
 
 if __name__ == "__main__":
     d = Decap()
-    d.write_fileset(f"{d.name()}.f", fileset="rtl")
+    d.write_fileset(f"{d.name}.f", fileset="rtl")

lambdalib/auxlib/la_drsync/la_drsync.py

@@ -1,13 +1,12 @@
-from lambdalib import Lambda
+from lambdalib.lambdalib import Lambda
 
 
 class Drsync(Lambda):
     def __init__(self):
         name = 'la_drsync'
-        sources = [f'rtl/{name}.v']
-        super().__init__(name, sources, __file__)
+        super().__init__(name, __file__)
 
 
 if __name__ == "__main__":
     d = Drsync()
-    d.write_fileset(f"{d.name()}.f", fileset="rtl")
+    d.write_fileset(f"{d.name}.f", fileset="rtl")