update caliptra to use libraries

pyproject.toml

@@ -21,7 +21,7 @@ readme = "README.md"
 requires-python = ">=3.8"
 license = {file = "LICENSE"}
 dependencies = [
-    "siliconcompiler>=0.25.0",
+    "siliconcompiler>=0.26.2",
     "Jinja2>=3.1.2",
     "lambdapdk>=0.1.12",
     "lambdalib>=0.2.0"

scgallery/designs/caliptra/datavault.py

@@ -10,7 +10,7 @@
 
 from siliconcompiler import Chip
 from siliconcompiler.targets import freepdk45_demo
-from scgallery.designs import caliptra
+from scgallery.designs.caliptra.src import datavault
 from scgallery import Gallery
 
 
@@ -22,12 +22,7 @@ def setup(target=freepdk45_demo):
 
     sdc_root = os.path.join('caliptra', 'constraints', 'datavault')
 
-    chip.use(caliptra)
-    chip.add('option', 'library', [
-        'caliptra_datavault',
-        'caliptra_libs',
-        'caliptra_top_defines'
-    ])
+    chip.use(datavault)
 
     chip.set('option', 'entrypoint', 'dv')
 

scgallery/designs/caliptra/keyvault.py

@@ -10,7 +10,7 @@
 
 from siliconcompiler import Chip
 from siliconcompiler.targets import freepdk45_demo
-from scgallery.designs import caliptra
+from scgallery.designs.caliptra.src import keyvault
 from scgallery import Gallery
 
 
@@ -22,12 +22,7 @@ def setup(target=freepdk45_demo):
 
     sdc_root = os.path.join('caliptra', 'constraints', 'keyvault')
 
-    chip.use(caliptra)
-    chip.add('option', 'library', [
-        'caliptra_keyvault',
-        'caliptra_libs',
-        'caliptra_top_defines'
-    ])
+    chip.use(keyvault)
 
     chip.set('option', 'entrypoint', 'kv')
 

scgallery/designs/caliptra/sha512.py

@@ -10,7 +10,7 @@
 
 from siliconcompiler import Chip
 from siliconcompiler.targets import freepdk45_demo
-from scgallery.designs import caliptra
+from scgallery.designs.caliptra.src import sha512
 from scgallery import Gallery
 
 
@@ -22,14 +22,7 @@ def setup(target=freepdk45_demo):
 
     sdc_root = os.path.join('caliptra', 'constraints', 'sha512')
 
-    chip.use(caliptra)
-    chip.add('option', 'library', [
-        'caliptra_sha512',
-        'caliptra_pcrvault',
-        'caliptra_keyvault',
-        'caliptra_libs',
-        'caliptra_top_defines'
-    ])
+    chip.use(sha512)
 
     chip.set('option', 'entrypoint', 'sha512_ctrl')
 

scgallery/designs/caliptra/src/__init__.py

@@ -0,0 +1,26 @@
+import os
+from siliconcompiler import Library
+
+
+def __register(lib):
+    lib.register_source(
+        name='caliptra-rtl',
+        path='git+https://github.com/chipsalliance/caliptra-rtl.git',
+        ref='v1.0')
+
+
+def __add_sources(lib, root, files):
+    for src in files:
+        lib.input(os.path.join(root, src))
+
+
+def make_lib(chip, name, root, files, idirs=None):
+    lib = Library(chip, name, package='caliptra-rtl', auto_enable=True)
+    __register(lib)
+
+    __add_sources(lib, root, files)
+
+    if idirs:
+        lib.add('option', 'idir', idirs)
+
+    return lib

scgallery/designs/caliptra/src/datavault.py

@@ -0,0 +1,21 @@
+from ..src import make_lib
+from ..src import libs
+
+
+def setup(chip):
+    lib = make_lib(
+        chip,
+        'caliptra_datavault',
+        'src/datavault/rtl',
+        (
+            'dv_reg_pkg.sv',
+            'dv_reg.sv',
+            'dv_defines_pkg.sv',
+            'dv.sv'
+        ),
+        [
+            'src/datavault/rtl'
+        ])
+    lib.use(libs)
+
+    return lib

scgallery/designs/caliptra/src/keyvault.py

@@ -0,0 +1,24 @@
+from ..src import make_lib
+from ..src import libs
+
+
+def setup(chip):
+    lib = make_lib(
+        chip,
+        'caliptra_keyvault',
+        'src/keyvault/rtl',
+        (
+            'kv_reg_pkg.sv',
+            'kv_reg.sv',
+            'kv_defines_pkg.sv',
+            'kv.sv',
+            'kv_fsm.sv',
+            'kv_read_client.sv',
+            'kv_write_client.sv'
+        ),
+        [
+            'src/keyvault/rtl'
+        ])
+    lib.use(libs)
+
+    return lib

scgallery/designs/caliptra/src/libs.py

@@ -0,0 +1,26 @@
+from ..src import make_lib
+from ..src import top_defines
+
+
+def setup(chip):
+    lib = make_lib(
+        chip,
+        'caliptra_libs',
+        'src/libs/rtl',
+        (
+            'caliptra_sram.sv',
+            'ahb_defines_pkg.sv',
+            'caliptra_ahb_srom.sv',
+            'apb_slv_sif.sv',
+            'ahb_slv_sif.sv',
+            'caliptra_icg.sv',
+            'clk_gate.sv',
+            'caliptra_2ff_sync.sv',
+            'ahb_to_reg_adapter.sv'
+        ),
+        [
+            'src/libs/rtl'
+        ])
+    lib.use(top_defines)
+
+    return lib

scgallery/designs/caliptra/src/pcrvault.py

@@ -0,0 +1,22 @@
+from ..src import make_lib
+from ..src import libs
+
+
+def setup(chip):
+    lib = make_lib(
+        chip,
+        'caliptra_pcrvault',
+        'src/pcrvault/rtl',
+        (
+            'pv_reg_pkg.sv',
+            'pv_reg.sv',
+            'pv_defines_pkg.sv',
+            'pv.sv',
+            'pv_gen_hash.sv'
+        ),
+        [
+            'src/pcrvault/rtl'
+        ])
+    lib.use(libs)
+
+    return lib

scgallery/designs/caliptra/src/sha512.py

@@ -0,0 +1,24 @@
+from ..src import make_lib
+from ..src import pcrvault, keyvault
+
+
+def setup(chip):
+    lib = make_lib(
+        chip,
+        'caliptra_sha512',
+        'src/sha512/rtl',
+        (
+            'sha512_reg_pkg.sv',
+            'sha512_params_pkg.sv',
+            'sha512_ctrl.sv',
+            'sha512.sv',
+            'sha512_core.v',
+            'sha512_h_constants.v',
+            'sha512_k_constants.v',
+            'sha512_w_mem.v',
+            'sha512_reg.sv'
+        ))
+    lib.use(pcrvault)
+    lib.use(keyvault)
+
+    return lib

scgallery/designs/caliptra/src/top_defines.py

@@ -0,0 +1,14 @@
+from ..src import make_lib
+
+
+def setup(chip):
+    lib = make_lib(
+        chip,
+        'caliptra_top_defines',
+        'src/integration/rtl',
+        [],
+        [
+            'src/integration/rtl'
+        ])
+
+    return lib