SimplHDL 0.12.1__tar.gz → 0.13.2__tar.gz

{simplhdl-0.12.1/src/simplhdl.egg-info → simplhdl-0.13.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: simplhdl
-Version: 0.12.1
+Version: 0.13.2
 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>

{simplhdl-0.12.1 → simplhdl-0.13.2}/pyproject.toml

@@ -73,6 +73,7 @@ entry-points."simplhdl.plugins".chisel_generator = "simplhdl_chisel.chisel:Chise
 entry-points."simplhdl.plugins".encrypt = "simplhdl_encrypt.encrypt.encryptflow:EncryptFlow"
 entry-points."simplhdl.plugins".fusersoc_parser = "simplhdl_fusesocparser.fusesocparser:FuseSocParser"
 entry-points."simplhdl.plugins".icarus = "simplhdl_icarus.icarusflow:IcarusFlow"
+entry-points."simplhdl.plugins".jinja2 = "simplhdl_jinja2.jinja2:Jinja2Generator"
 entry-points."simplhdl.plugins".lint = "simplhdl_lint.lint.lintflow:LintFlow"
 entry-points."simplhdl.plugins".modelsim = "simplhdl_modelsim.modelsim.modelsimflow:ModelSimFlow"
 entry-points."simplhdl.plugins".peakrdl_generator = "simplhdl_peakrdl.systemrdl:PeakRdlGenerator"
@@ -108,6 +109,7 @@ lint.isort = { known-first-party = [
   "simplhdl_encrypt",
   "simplhdl_fusesocparser",
   "simplhdl_icarus",
+  "simplhdl_jinja2",
   "simplhdl_lint",
   "simplhdl_modelsim",
   "simplhdl_parser",

{simplhdl-0.12.1 → simplhdl-0.13.2}/src/simplhdl/__init__.py

@@ -1,6 +1,6 @@
 from __future__ import annotations
 
-__version__ = "0.12.1"
+__version__ = "0.13.2"
 
 from .__main__ import parse_arguments
 from .project.design import *

{simplhdl-0.12.1 → simplhdl-0.13.2}/src/simplhdl/cli/info.py

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 import os
 from argparse import Namespace
 from pathlib import Path
@@ -28,11 +30,13 @@ class Info(FlowBase):
     def import_matplotlib(self):
         if "MPLCONFIGDIR" not in os.environ:
             os.environ["MPLCONFIGDIR"] = str(self.builddir.resolve())
+        import matplotlib
         import matplotlib.pyplot as plt
-        import matplotlib.cm as cm
+        from matplotlib import cm
 
         self.plt = plt
         self.cm = cm
+        self.colormaps = matplotlib.colormaps
 
     @classmethod
     def parse_args(self, subparsers) -> None:
@@ -75,7 +79,7 @@ class Info(FlowBase):
             list(set(getattr(n, "parent", None) for n in G.nodes() if getattr(n, "parent", None))),
             key=lambda p: str(p),
         )
-        cmap = self.cm.get_cmap("tab20", len(unique_parents))
+        cmap = self.colormaps["tab20"].resampled(len(unique_parents))
         parent_to_color = {p: cmap(i) for i, p in enumerate(unique_parents)}
         node_colors = [parent_to_color.get(getattr(n, "parent", None), (0.5, 0.5, 0.5, 1.0)) for n in G.nodes()]
 

{simplhdl-0.12.1 → simplhdl-0.13.2}/src/simplhdl/cocotb.py

@@ -54,6 +54,10 @@ class Cocotb:
             raise FileNotFoundError(f"{path}: not found")
         return path
 
+    def pygpi_entry_point(self) -> str:
+        output = sh(["cocotb-config", "--pygpi-entry-point"])
+        return output.strip()
+
     def pythonbin(self) -> str:
         output = sh(["cocotb-config", "--python-bin"])
         path = Path(output)
@@ -167,16 +171,23 @@ class Cocotb:
     def env(self) -> dict[str, str]:
         cocotb_version = Version(version("cocotb"))
         e = os.environ.copy()
-        if cocotb_version >= Version("2.0.0"):
+        if cocotb_version >= Version("2.1.0"):
+            e["COCOTB_TEST_MODULES"] = self.top
+            e["COCOTB_TOPLEVEL"] = self.dut
+            e["PYGPI_PYTHON_BIN"] = self.pythonbin()
+            e["COCOTB_RANDOM_SEED"] = str(self.seed)
+            e["GPI_USERS"] = f"{self.libpython()};{self.pygpi_entry_point()}"
+        elif cocotb_version >= Version("2.0.0"):
             e["COCOTB_TEST_MODULES"] = self.top
             e["COCOTB_TOPLEVEL"] = self.dut
             e["PYGPI_PYTHON_BIN"] = self.pythonbin()
             e["COCOTB_RANDOM_SEED"] = str(self.seed)
+            e["LIBPYTHON_LOC"] = self.libpython()
         else:
             e["MODULE"] = self.top
             e["TOPLEVEL"] = self.dut
+            e["LIBPYTHON_LOC"] = self.libpython()
         e["PYTHONPYCACHEPREFIX"] = "./pycache"
-        e["LIBPYTHON_LOC"] = self.libpython()
         e["GPI_EXTRA"] = ""
         if self.has_verilog and self.has_vhdl:
             if self.duttype == VhdlFile:

{simplhdl-0.12.1 → simplhdl-0.13.2}/src/simplhdl/project/files.py

@@ -1,9 +1,9 @@
 from __future__ import annotations
 
-from enum import Enum
 import logging
+from enum import Enum
 from pathlib import Path
-from typing import TYPE_CHECKING, Callable, Type, Iterable, Generator
+from typing import TYPE_CHECKING, Callable, Generator, Iterable, Type
 from weakref import WeakValueDictionary
 
 if TYPE_CHECKING:
@@ -448,3 +448,7 @@ class SystemRdlFile(File): ...
 
 @FileFactory.register(extension=".tcl")
 class TclFile(File): ...
+
+
+@FileFactory.register(extension=".j2")
+class Jinja2File(File): ...

{simplhdl-0.12.1 → simplhdl-0.13.2}/src/simplhdl/utils.py

@@ -10,6 +10,7 @@ from subprocess import PIPE, STDOUT, Popen
 from time import sleep
 from typing import Generator, Union
 
+import jinja2
 from jinja2 import Template
 
 logger = logging.getLogger(__name__)
@@ -165,3 +166,26 @@ def chdir(directory: Path) -> Generator[Path, None, None]:
         yield directory
     finally:
         os.chdir(old)
+
+
+def jinja2_copy(src: Path, dest: Path, **kwargs) -> None:
+    """
+    Copy a file or directory to a destination using Jinja2.
+    """
+    template_loader = jinja2.FileSystemLoader(searchpath=src.parent)
+    template_env = jinja2.Environment(loader=template_loader, undefined=jinja2.StrictUndefined)
+
+    if src.is_file():
+        template = template_env.get_template(src.name)
+        text = template.render(**kwargs)
+        with src.open("r") as f:
+            src_text = f.read()
+        if text != src_text:
+            logger.debug(f"Render {src} to {dest}")
+        else:
+            logger.debug(f"Copy {src} to {dest}")
+
+        with dest.open("w") as f:
+            f.write(text)
+    else:
+        raise ValueError(f"{src} is not a file")

{simplhdl-0.12.1 → simplhdl-0.13.2/src/simplhdl.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: simplhdl
-Version: 0.12.1
+Version: 0.13.2
 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>

{simplhdl-0.12.1 → simplhdl-0.13.2}/src/simplhdl.egg-info/SOURCES.txt

@@ -47,6 +47,7 @@ src/simplhdl_icarus/resources/templates/icarus/cmds.f.j2
 src/simplhdl_icarus/resources/templates/icarus/cocotb.mk.j2
 src/simplhdl_icarus/resources/templates/icarus/simplhdl_iverilog_dump.v.j2
 src/simplhdl_icarus/resources/templates/icarus/sources.mk.j2
+src/simplhdl_jinja2/jinja2.py
 src/simplhdl_lint/__init__.py
 src/simplhdl_lint/flake8/flake8flow.py
 src/simplhdl_lint/lint/lintflow.py

{simplhdl-0.12.1 → simplhdl-0.13.2}/src/simplhdl.egg-info/entry_points.txt

@@ -6,6 +6,7 @@ chisel_generator = simplhdl_chisel.chisel:ChiselGenerator
 encrypt = simplhdl_encrypt.encrypt.encryptflow:EncryptFlow
 fusersoc_parser = simplhdl_fusesocparser.fusesocparser:FuseSocParser
 icarus = simplhdl_icarus.icarusflow:IcarusFlow
+jinja2 = simplhdl_jinja2.jinja2:Jinja2Generator
 lint = simplhdl_lint.lint.lintflow:LintFlow
 modelsim = simplhdl_modelsim.modelsim.modelsimflow:ModelSimFlow
 peakrdl_generator = simplhdl_peakrdl.systemrdl:PeakRdlGenerator

{simplhdl-0.12.1 → simplhdl-0.13.2}/src/simplhdl.egg-info/top_level.txt

@@ -3,6 +3,7 @@ simplhdl_chisel
 simplhdl_encrypt
 simplhdl_fusesocparser
 simplhdl_icarus
+simplhdl_jinja2
 simplhdl_lint
 simplhdl_modelsim
 simplhdl_parser

simplhdl-0.13.2/src/simplhdl_jinja2/jinja2.py

@@ -0,0 +1,25 @@
+from __future__ import annotations
+
+import logging
+import os
+
+from simplhdl.plugin import FlowBase, GeneratorBase
+from simplhdl.project.files import Jinja2File
+from simplhdl.utils import jinja2_copy
+
+logger = logging.getLogger(__name__)
+
+
+class Jinja2Generator(GeneratorBase):
+    def run(self, flow: FlowBase):
+        files = list(self.project.defaultDesign.files(type=Jinja2File))
+        if files:
+            logger.debug("Running Jinja2 Generator")
+            dest_dir = self.builddir.joinpath("jinja2")
+            dest_dir.mkdir(parents=True, exist_ok=True)
+
+        kwargs = {"os": os}
+        for file in files:
+            dest_file = dest_dir.joinpath(file.path.name).with_suffix("").resolve()
+            jinja2_copy(file.path, dest_file, **kwargs)
+            file._path = dest_file

{simplhdl-0.12.1 → simplhdl-0.13.2}/src/simplhdl_quartus/quartusexport/quartusexportflow.py

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 import logging
 import os
 import shutil
@@ -15,10 +17,10 @@ from simplhdl.project.files import (
     QuartusQipFile,
     QuartusQsfFile,
     SystemVerilogFile,
-    VerilogIncludeFile,
+    UsedIn,
     VerilogFile,
+    VerilogIncludeFile,
     VhdlFile,
-    UsedIn,
 )
 from simplhdl_encrypt.encrypt.encryptflow import encrypt
 
@@ -59,25 +61,36 @@ class QuartusExportFlow(ImplementationFlow):
         self.rootdir = self.directory_root()
 
     def directory_root(self):
-        files = list()
+        files = []
         for file in [f for f in self.project.defaultDesign.files(usedin=UsedIn.IMPLEMENTATION)]:
+            resolved = file.path.resolve()
             if isinstance(file, QuartusQsfFile):
                 continue
             elif isinstance(file, (ConstraintFile, QuartusQipFile)):
                 pass
             elif isinstance(file, (HdlSearchPath, QuartusIpFile)):
                 continue
-            files.append(file.path.resolve())
+            # Ignore files generated inside builddir when determining source root
+            if not resolved.is_relative_to(self.builddir.resolve()):
+                files.append(resolved)
         return Path(os.path.commonpath(files))
 
     def copy_files(self):
-        seen = dict()
+        seen = {}
         files = [f for f in self.project.defaultDesign.files(usedin=UsedIn.IMPLEMENTATION)]
         for file in files:
             fileid = str(file.path.resolve())
-            dest = self.builddir.joinpath("src", file.path.relative_to(self.rootdir))
+            resolved_path = file.path.resolve()
+
+            # Determine destination based on structure or relative path existence
             if self.args.structure == "flat":
                 dest = self.builddir.joinpath("src", file.path.name)
+            elif resolved_path.is_relative_to(self.rootdir):
+                dest = self.builddir.joinpath("src", resolved_path.relative_to(self.rootdir))
+            else:
+                # Fallback for builddir/generated files outside rootdir
+                dest = self.builddir.joinpath("src", file.path.name)
+
             if fileid in seen:
                 file._path = seen.get(fileid)._path
                 continue

{simplhdl-0.12.1 → simplhdl-0.13.2}/src/simplhdl_quartus/spd.py

@@ -1,6 +1,7 @@
 from __future__ import annotations
 
 import logging
+import os
 import re
 from pathlib import Path
 from shutil import copy, copytree, ignore_patterns, rmtree
@@ -28,11 +29,11 @@ from simplhdl.project.files import (
     QuartusQsysZipFile,
     SdcFile,
     SystemVerilogFile,
+    UsedIn,
     VerilogFile,
     VhdlFile,
-    UsedIn,
 )
-from simplhdl.utils import md5check, md5write, sh
+from simplhdl.utils import jinja2_copy, md5check, md5write, sh
 
 logger = logging.getLogger(__name__)
 
@@ -322,9 +323,9 @@ def copy_ipfile(file: QuartusIpFile, dest: Path) -> QuartusIpFile:
             md5write(file.path, srcdir, filename=md5file)
     else:
         if not md5file.exists() or not md5check(file.path, filename=md5file):
-            logger.debug(f"Copy {file.path} to {destfile}")
             rmtree(destdir, ignore_errors=True)
-            copy(str(file.path), str(destfile))
+            kwargs = {"os": os}
+            jinja2_copy(file.path, destfile, **kwargs)
             md5write(file.path, filename=md5file)
     file.__class__ = QuartusIpFile
     file._path = destfile.resolve()

{simplhdl-0.12.1 → simplhdl-0.13.2}/src/simplhdl_vivado/vivadoexport/vivadoexportflow.py

@@ -59,19 +59,28 @@ class VivadoExportFlow(ImplementationFlow):
     def directory_root(self):
         files = []
         for file in [f for f in self.project.defaultDesign.files(usedin=UsedIn.IMPLEMENTATION)]:
-            if isinstance(file, (ConstraintFile)):
-                pass
-            files.append(file.path.resolve())
-        return Path(os.path.commonpath(files))
+            resolved = file.path.resolve()
+            # Ignore files generated inside builddir when determining source root
+            if not resolved.is_relative_to(self.builddir.resolve()):
+                files.append(resolved)
+        return Path(os.path.commonpath(files)) if files else self.builddir
 
     def copy_files(self):
         seen = {}
         files = [f for f in self.project.defaultDesign.files(usedin=UsedIn.IMPLEMENTATION)]
         for file in files:
             fileid = str(file.path.resolve())
-            dest = self.builddir.joinpath("src", file.path.relative_to(self.rootdir))
+            resolved_path = file.path.resolve()
+
+            # Determine destination based on structure or relative path existence
             if self.args.structure == "flat":
                 dest = self.builddir.joinpath("src", file.path.name)
+            elif resolved_path.is_relative_to(self.rootdir):
+                dest = self.builddir.joinpath("src", resolved_path.relative_to(self.rootdir))
+            else:
+                # Fallback for builddir/generated files outside rootdir
+                dest = self.builddir.joinpath("src", file.path.name)
+
             if fileid in seen:
                 file._path = seen.get(fileid)._path
                 continue
@@ -93,6 +102,7 @@ class VivadoExportFlow(ImplementationFlow):
             else:
                 dest.parent.mkdir(parents=True, exist_ok=True)
                 shutil.copyfile(file.path, dest)
+
             # Convert to relative path
             file._path = dest
             seen[fileid] = file