SimplHDL 0.7.0__tar.gz → 0.7.1__tar.gz

{simplhdl-0.7.0 → simplhdl-0.7.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: SimplHDL
-Version: 0.7.0
+Version: 0.7.1
 Summary: A framework for simulating and implementing HDL designs
 Author-email: Rasmus Grøndahl Olsen <simplhdl@gmail.com>
 Maintainer-email: Rasmus Grøndahl Olsen <simplhdl@gmail.com>
@@ -38,6 +38,7 @@ Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
+Classifier: Programming Language :: Python :: 3.14
 Classifier: Intended Audience :: Developers
 Classifier: License :: OSI Approved :: MIT License
 Classifier: Operating System :: OS Independent
@@ -58,7 +59,7 @@ Requires-Dist: flake8
 Requires-Dist: black
 Requires-Dist: systemrdl-compiler
 Requires-Dist: peakrdl-html
-Requires-Dist: peakrdl-regblock
+Requires-Dist: peakrdl-regblock>=1.2.0
 Requires-Dist: peakrdl-pyuvm
 Dynamic: license-file
 

{simplhdl-0.7.0 → simplhdl-0.7.1}/pyproject.toml

@@ -26,7 +26,7 @@ dependencies = [
     "black",
     "systemrdl-compiler",
     "peakrdl-html",
-    "peakrdl-regblock",
+    "peakrdl-regblock>=1.2.0",
     "peakrdl-pyuvm",
 ]
 requires-python = ">=3.8"
@@ -48,6 +48,7 @@ classifiers = [
     "Programming Language :: Python :: 3.11",
     "Programming Language :: Python :: 3.12",
     "Programming Language :: Python :: 3.13",
+    "Programming Language :: Python :: 3.14",
     "Intended Audience :: Developers",
     "License :: OSI Approved :: MIT License",
     "Operating System :: OS Independent",

{simplhdl-0.7.0 → simplhdl-0.7.1}/src/SimplHDL.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: SimplHDL
-Version: 0.7.0
+Version: 0.7.1
 Summary: A framework for simulating and implementing HDL designs
 Author-email: Rasmus Grøndahl Olsen <simplhdl@gmail.com>
 Maintainer-email: Rasmus Grøndahl Olsen <simplhdl@gmail.com>
@@ -38,6 +38,7 @@ Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
+Classifier: Programming Language :: Python :: 3.14
 Classifier: Intended Audience :: Developers
 Classifier: License :: OSI Approved :: MIT License
 Classifier: Operating System :: OS Independent
@@ -58,7 +59,7 @@ Requires-Dist: flake8
 Requires-Dist: black
 Requires-Dist: systemrdl-compiler
 Requires-Dist: peakrdl-html
-Requires-Dist: peakrdl-regblock
+Requires-Dist: peakrdl-regblock>=1.2.0
 Requires-Dist: peakrdl-pyuvm
 Dynamic: license-file
 

{simplhdl-0.7.0 → simplhdl-0.7.1}/src/SimplHDL.egg-info/requires.txt

@@ -11,7 +11,7 @@ flake8
 black
 systemrdl-compiler
 peakrdl-html
-peakrdl-regblock
+peakrdl-regblock>=1.2.0
 peakrdl-pyuvm
 
 [:python_version < "3.9"]

simplhdl-0.7.1/src/simplhdl/__init__.py

@@ -0,0 +1 @@
+__version__ = "0.7.1"

{simplhdl-0.7.0 → simplhdl-0.7.1}/src/simplhdl/generators/systemrdl.py

@@ -1,6 +1,7 @@
 import os
 import logging
 import jinja2
+import tomllib
 
 from typing import List
 from pathlib import Path
@@ -189,16 +190,17 @@ class SystemRDL(GeneratorBase):
         if outputfile.suffix == '.v':
             fileset.InsertFileAfter(rdlfile, VerilogSourceFile(outputfile))
 
-    def peakrdl_template(self, node, outputdir) -> None:
+    def peakrdl_regmodel(self, node, outputdir, config) -> None:
         RegblockExporter().export(
             node=node,
             output_dir=str(outputdir.absolute()),
             cpuif_cls=AXI4Lite_Cpuif_flattened,
-            module_name=f'{node.type_name}_addrmap',
-            package_name=f'{node.type_name}_pkg',
-            address_width=32,
-            default_reset_activelow=True
-
+            module_name=config.get('module_name', f'{node.type_name}_addrmap'),
+            package_name=config.get('package_name', f'{node.type_name}_pkg'),
+            address_width=config.get('address_width', 32),
+            default_reset_activelow=config.get('default_reset_activelow', True),
+            err_if_bad_addr=config.get('err_if_bad_addr', False),
+            err_if_bad_rw=config.get('err_if_bad_rw', False)
         )
         modulefile: Path = outputdir.joinpath(f'{node.type_name}_pkg.sv').absolute()
         packetfile: Path = outputdir.joinpath(f'{node.type_name}_addrmap.sv').absolute()
@@ -212,6 +214,18 @@ class SystemRDL(GeneratorBase):
     def run(self, flow: FlowBase):
         rdlfiles = list(self.project.DefaultDesign.DefaultFileSet.Files(fileType=SystemRDLSourceFile))
         output_dir = self.builddir.joinpath('systemrdl')
+        config = dict()
+        if os.getenv('SIMPLHDL_CONFIG'):
+            tomlfile = Path(os.getenv('SIMPLHDL_CONFIG'))
+            try:
+                with tomlfile.open('rb') as f:
+                    config = tomllib.load(f)
+            except FileNotFoundError:
+                raise FileNotFoundError(f"SimplHDL config file set by environment 'SIMPLHDL_CONFIG={tomlfile}' does not exist")
+
+        pearkdl_config = config.get('peakrdl', {})
+        html_config = pearkdl_config.get('html', {})
+        regblock_config = pearkdl_config.get('regblock', {})
 
         if not rdlfiles:
             return
@@ -253,7 +267,7 @@ class SystemRDL(GeneratorBase):
             template = env.find_template('registermap')
             for node in leafnodetypes:
                 self.render_template(template=template, node=node, outputdir=sub_dir)
-                self.peakrdl_template(node=node, outputdir=output_dir.joinpath('hdl'))
+                self.peakrdl_regmodel(node=node, outputdir=output_dir.joinpath('hdl'), config=regblock_config)
 
             template = env.find_template('hierachymap')
             for node in hierachynodetypes:
@@ -268,4 +282,8 @@ class SystemRDL(GeneratorBase):
             fileset.InsertFileAfter(rdlfile, CocotbPythonFile(output))
 
         logger.info("Generate HTML Documentation")
-        HTMLExporter().export(root, output_dir.joinpath('docs'))
+        HTMLExporter().export(
+            root,
+            output_dir.joinpath('docs'),
+            skip_not_present=html_config.get('skip_not_present', False),
+        )

{simplhdl-0.7.0 → simplhdl-0.7.1}/src/simplhdl/resources/templates/vcs/cocotb.mk.j2

@@ -9,6 +9,8 @@ export LIBPYTHON_LOC := $(shell cocotb-config --libpython)
 VCS_FLAGS += +warn=noVPI-CT-NS +vpi -P pli.tab -load $(shell cocotb-config --lib-name-path vpi vcs)
 VCS_FLAGS += -debug_access+r+w+nomemcbk -debug_region+cell+encrypt -debug_acc+pp+f+dmptf
 
+export PYGPI_PYTHON_BIN := $(shell cocotb-config --python-bin)
+export COCOTB_TEST_MODULES := {{cocotbtop}}
+export COCOTB_TOPLEVEL := {{cocotbdut}}
 export MODULE := {{cocotbtop}}
 export TOPLEVEL := {{cocotbdut}}
-

simplhdl-0.7.0/src/simplhdl/__init__.py

@@ -1 +0,0 @@
-__version__ = "0.7.0"