esiaccel 0.1.5.dev247__cp310-cp310-win_amd64.whl → 0.1.5.dev262__cp310-cp310-win_amd64.whl

esiaccel/cosim/questa.py

@@ -4,9 +4,9 @@
 
 import os
 from pathlib import Path
-from typing import List
+from typing import List, Optional, Callable, Dict
 
-from .simulator import CosimCollateralDir, Simulator
+from .simulator import CosimCollateralDir, Simulator, SourceFiles
 
 
 class Questa(Simulator):
@@ -14,6 +14,32 @@ class Questa(Simulator):
 
   DefaultDriver = CosimCollateralDir / "driver.sv"
 
+  def __init__(
+      self,
+      sources: SourceFiles,
+      run_dir: Path,
+      debug: bool,
+      run_stdout_callback: Optional[Callable[[str], None]] = None,
+      run_stderr_callback: Optional[Callable[[str], None]] = None,
+      compile_stdout_callback: Optional[Callable[[str], None]] = None,
+      compile_stderr_callback: Optional[Callable[[str], None]] = None,
+      make_default_logs: bool = True,
+      macro_definitions: Optional[Dict[str, str]] = None,
+      # An optional list of questa error codes to suppress
+      suppressed_questa_errors: Optional[List[int]] = None):
+    super().__init__(
+        sources=sources,
+        run_dir=run_dir,
+        debug=debug,
+        run_stdout_callback=run_stdout_callback,
+        run_stderr_callback=run_stderr_callback,
+        compile_stdout_callback=compile_stdout_callback,
+        compile_stderr_callback=compile_stderr_callback,
+        make_default_logs=make_default_logs,
+        macro_definitions=macro_definitions,
+    )
+    self.suppressed_questa_errors = suppressed_questa_errors
+
   # Questa doesn't use stderr for error messages. Everything goes to stdout.
   UsesStderr = False
 
@@ -23,9 +49,27 @@ class Questa(Simulator):
     ]
     sources = self.sources.rtl_sources
     sources.append(Questa.DefaultDriver)
+
+    # Format macro definition command
+    if self.macro_definitions:
+      macro_definitions_cmd = " ".join([
+          f"+define+{k}={v}" if v is not None else f"+define+{k}"
+          for k, v in self.macro_definitions.items()
+      ])
+    else:
+      macro_definitions_cmd = ""
+
+    # Format error suppression command
+    if self.suppressed_questa_errors:
+      suppressed_questa_errors_cmd = " ".join(
+          [f"-suppress {ec}" for ec in self.suppressed_questa_errors])
+    else:
+      suppressed_questa_errors_cmd = ""
+
     for src in sources:
-      cmds.append(f"vlog -incr +acc -sv +define+TOP_MODULE={self.sources.top}"
-                  f" +define+SIMULATION {src.as_posix()}")
+      cmds.append(
+          f"vlog -incr +acc -sv {macro_definitions_cmd} {suppressed_questa_errors_cmd} +define+TOP_MODULE={self.sources.top}"
+          f" +define+SIMULATION {src.as_posix()}")
     cmds.append(f"vopt -incr driver -o driver_opt +acc")
     return cmds
 
@@ -53,9 +97,28 @@ class Questa(Simulator):
           vsim,
           "driver_opt",
           "-batch",
+      ]
+
+      if self.debug:
+        # Create waveform dump .do file
+        wave_file = Path("wave.do")
+        with wave_file.open("w") as f:
+          f.write("log -r /*\n")
+        cmd += [
+            "-do",
+            str(wave_file.resolve()),
+        ]
+        # Questa will by default log to a vsim.wlf file in the current
+        # directory.
+        print(
+            f"Debug mode enabled - waveform will be in {wave_file.resolve().parent / 'vsim.wlf'}"
+        )
+
+      cmd += [
           "-do",
           "run -all",
       ]
+
     for lib in self.sources.dpi_so_paths():
       svLib = os.path.splitext(lib)[0]
       cmd.append("-sv_lib")

esiaccel/cosim/simulator.py

@@ -119,7 +119,8 @@ class Simulator:
                run_stderr_callback: Optional[Callable[[str], None]] = None,
                compile_stdout_callback: Optional[Callable[[str], None]] = None,
                compile_stderr_callback: Optional[Callable[[str], None]] = None,
-               make_default_logs: bool = True):
+               make_default_logs: bool = True,
+               macro_definitions: Optional[Dict[str, str]] = None):
     """Simulator base class.
 
     Optional sinks can be provided for capturing output. If not provided,
@@ -135,10 +136,13 @@ class Simulator:
       compile_stderr_callback: Line-based callback for compile stderr.
       make_default_logs: If True and corresponding callback is not supplied,
         create log file and emit via internally-created callback.
+      macro_definitions: Optional dictionary of macro definitions to be defined
+        during compilation.
     """
     self.sources = sources
     self.run_dir = run_dir
     self.debug = debug
+    self.macro_definitions = macro_definitions
 
     # Unified list of any log file handles we opened.
     self._default_files: List[IO[str]] = []

esiaccel/cosim/verilator.py

@@ -4,7 +4,7 @@
 
 import os
 from pathlib import Path
-from typing import List, Optional, Callable
+from typing import List, Optional, Callable, Dict
 
 from .simulator import CosimCollateralDir, Simulator, SourceFiles
 
@@ -14,23 +14,29 @@ class Verilator(Simulator):
 
   DefaultDriver = CosimCollateralDir / "driver.cpp"
 
-  def __init__(self,
-               sources: SourceFiles,
-               run_dir: Path,
-               debug: bool,
-               run_stdout_callback: Optional[Callable[[str], None]] = None,
-               run_stderr_callback: Optional[Callable[[str], None]] = None,
-               compile_stdout_callback: Optional[Callable[[str], None]] = None,
-               compile_stderr_callback: Optional[Callable[[str], None]] = None,
-               make_default_logs: bool = True):
-    super().__init__(sources=sources,
-                     run_dir=run_dir,
-                     debug=debug,
-                     run_stdout_callback=run_stdout_callback,
-                     run_stderr_callback=run_stderr_callback,
-                     compile_stdout_callback=compile_stdout_callback,
-                     compile_stderr_callback=compile_stderr_callback,
-                     make_default_logs=make_default_logs)
+  def __init__(
+      self,
+      sources: SourceFiles,
+      run_dir: Path,
+      debug: bool,
+      run_stdout_callback: Optional[Callable[[str], None]] = None,
+      run_stderr_callback: Optional[Callable[[str], None]] = None,
+      compile_stdout_callback: Optional[Callable[[str], None]] = None,
+      compile_stderr_callback: Optional[Callable[[str], None]] = None,
+      make_default_logs: bool = True,
+      macro_definitions: Optional[Dict[str, str]] = None,
+  ):
+    super().__init__(
+        sources=sources,
+        run_dir=run_dir,
+        debug=debug,
+        run_stdout_callback=run_stdout_callback,
+        run_stderr_callback=run_stderr_callback,
+        compile_stdout_callback=compile_stdout_callback,
+        compile_stderr_callback=compile_stderr_callback,
+        make_default_logs=make_default_logs,
+        macro_definitions=macro_definitions,
+    )
     self.verilator = "verilator"
     if "VERILATOR_PATH" in os.environ:
       self.verilator = os.environ["VERILATOR_PATH"]
@@ -39,6 +45,15 @@ class Verilator(Simulator):
     cmd: List[str] = [
         self.verilator,
         "--cc",
+    ]
+
+    if self.macro_definitions:
+      cmd += [
+          f"+define+{k}={v}" if v is not None else f"+define+{k}"
+          for k, v in self.macro_definitions.items()
+      ]
+
+    cmd += [
         "--top-module",
         self.sources.top,
         "-DSIMULATION",

{esiaccel-0.1.5.dev247.dist-info → esiaccel-0.1.5.dev262.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: esiaccel
-Version: 0.1.5.dev247
+Version: 0.1.5.dev262
 Summary: ESI accelerators runtime
 Author-email: John Demme <John.Demme@microsoft.com>
 License: ==============================================================================

{esiaccel-0.1.5.dev247.dist-info → esiaccel-0.1.5.dev262.dist-info}/RECORD

@@ -1,35 +1,35 @@
-esiaccel/CosimBackend.dll,sha256=hWJt7dexov0xM3y4vYANAWpigf4ipQSUh2h8PNOjYKI,7190016
+esiaccel/CosimBackend.dll,sha256=ehUkzjhDmG76UpMSmlevksatGpCyANwMZFUeVsplGhU,7190016
 esiaccel/CosimBackend.lib,sha256=SyCRBGdCRe98CGWnyS4no71odzAyrV48KwZwQ2oOwBo,4903888
-esiaccel/ESICppRuntime.dll,sha256=oiLSvbHHultxFguJAAe3mopYkxAx1Fm9Trg9TD38ZUQ,4078592
-esiaccel/ESICppRuntime.lib,sha256=6bkxsK5pLXzw60BEBFr9E99tNPJSWDqipL5OpwtXSvI,15154004
-esiaccel/EsiCosimDpiServer.dll,sha256=B1immXwkUO0VuxgFUcsNrX-ZVAzOcPDr0gvHHFBzh78,159744
+esiaccel/ESICppRuntime.dll,sha256=o5MTLvOa_3rf5412RDMDwr_PUgB_VpdfDpsj53u7xPE,4099072
+esiaccel/ESICppRuntime.lib,sha256=STOfSJGRyNmvbmcgrStHtVZVWbcP_S-7z9ZdOJbrBhg,15212020
+esiaccel/EsiCosimDpiServer.dll,sha256=DhKMlOE9iuHvxbXTLRdkgui50umNXs3l6PnIKM03od0,159744
 esiaccel/EsiCosimDpiServer.lib,sha256=zn3bIX10e2HQtwZOi1xpqeNfy4AdZm8Jx634HVTVQ8w,604164
-esiaccel/MtiPli.dll,sha256=HVbujHN9GTkLBgKyYkOQAxzbXGYw79j2zCThGpxGgV8,14848
+esiaccel/MtiPli.dll,sha256=qoZSCeKHF_L5Uf4drWjAzImbc5cYgAwjdufXZ5Pd3sQ,14848
 esiaccel/MtiPli.lib,sha256=juJ2Asmv6cnozNPpXvGeKkieYFcXK8MOYmDQZz-dAy4,14570
 esiaccel/__init__.py,sha256=65xXWHwJwRePsyhWk837NpzuN0qsNhoAX29TOiSYKGc,905
-esiaccel/abseil_dll.dll,sha256=vHCsxmLpiLVAgJDopuMiFk2PKE37Cc2Tk3mN8KbXs78,1584640
+esiaccel/abseil_dll.dll,sha256=xSmeKWjGRHiWvzceYL5xrctmhtmRgLcepiJmul0-EuQ,1584640
 esiaccel/accelerator.py,sha256=BcXPsUqcQV3YsVVyYbz9P6JnZLlcnuageFbJwID9_3s,3318
-esiaccel/cares.dll,sha256=BN1J5dXq3k7jJlddQt7d8XIjQ4QZjuV4vS2a0yaB1WA,199168
+esiaccel/cares.dll,sha256=glzin4EpS3snPWMfh11rFsJMaW82GTC5eq6IaRem4ss,199168
 esiaccel/codegen.py,sha256=uoYELtnIabVvgLeCABj-mWras0BvmSKABPH-cd9nDFk,6560
 esiaccel/esi-cosim.py,sha256=P7n3SBgKPnXynwghY5zK1FmpqZkbC_YxfVIvNNQNl6Q,3817
-esiaccel/esiCppAccel.cp310-win_amd64.pyd,sha256=coOpS9Ow3Nee2pAlP-viWhJAtcLpBmeAvT99IssQh-M,500224
-esiaccel/esiquery.exe,sha256=0tuszpqzXhsibbpy_84P6hsJDPi_hTcvfIEw7kkuubM,441856
-esiaccel/libcrypto-3-x64.dll,sha256=RhMyGArz7RsAgMDq1p3A3TiUwegKrtTJoygCUCqHGj4,5266944
-esiaccel/libprotobuf.dll,sha256=iyVuSYxr5A4W8mUfYF--6BGJQmR4avpn3xaM0gKqEng,12566528
-esiaccel/libssl-3-x64.dll,sha256=9-ZSgjBREtWftV7sydLtX2liTPF-79KRo6gQAXyzgPY,867328
-esiaccel/re2.dll,sha256=9jPOhPSKLDQROq9vOlQPCpcXRHqlP0N8TYegIjVAwaA,1213952
+esiaccel/esiCppAccel.cp310-win_amd64.pyd,sha256=8RJG0R3TwJaDhf2G1PQ31MQo9-wFAyb8sHBPuL4dA_k,500224
+esiaccel/esiquery.exe,sha256=07pVkPJRO7893kWAH3nHSJAYzWV0rBUzFq4Uj47kZhU,441856
+esiaccel/libcrypto-3-x64.dll,sha256=CW-Wy8cNTlvshsEF15pK7NY1N9oamQgbBn060pXPUQY,5266944
+esiaccel/libprotobuf.dll,sha256=U-jOBn7BtyCLuD0plnDwzuQuxnsL-RY4mCCFil6AH-E,12566528
+esiaccel/libssl-3-x64.dll,sha256=13seUhlHKt7I5HT2Y5tUTRJS2_nx1g7rwkvty0s7Bdc,867328
+esiaccel/re2.dll,sha256=s2iTLskD_Gj5Y6CiXSD-OgNUl_FJ9fhIS3QPX5XeIb4,1213952
 esiaccel/types.py,sha256=LFLzUCvtYF6FLsmKet6eJTMq2ija2Z5kxd5Ks6tkS4U,19044
 esiaccel/utils.py,sha256=q-8fmgJ9tUvmBsIvqZiZ7u845IJhOjvjYTQLhhrNYl0,1515
-esiaccel/zlib1.dll,sha256=VF0a7oz7mZ2ptD125fL3BXCdqMarr1kTzQlglc19K-w,90112
+esiaccel/zlib1.dll,sha256=H3UqOwNrPa3TL5alX7OkOjhhBgR0fhCzprEbX7xcNyU,90112
 esiaccel/cmake/esiaccelConfig.cmake,sha256=u2aW99k1lEcmYTG1P3BTJqtmDrj53wUUaBz_jzw8kYY,565
 esiaccel/cosim/Cosim_DpiPkg.sv,sha256=9qGn1VyAVrzBP5At1thV6xrovg0WghICD01Zz9J221E,3458
 esiaccel/cosim/Cosim_Endpoint.sv,sha256=-XXrGvvk6hdiZ-Ex6_QtdKXXUwKJLKSvpTUK3o0gPZ8,7589
 esiaccel/cosim/Cosim_Manifest.sv,sha256=vl9b6XieEkP880IBw1ferekBnDJwFanZZggJJGertXM,1123
 esiaccel/cosim/driver.cpp,sha256=Lvmo03pzzhoswdxAtdXAm-oU6UkfTyl1LgoCpyDzLhY,3842
 esiaccel/cosim/driver.sv,sha256=LAkFEXTwX3KKwZLSzYZFwMPWxZwVStuhUsfecHHpGzU,1890
-esiaccel/cosim/questa.py,sha256=yGsS-k49rQunj21p63Utnq3LLG1CYYp3aH5ctWd_xSY,2392
-esiaccel/cosim/simulator.py,sha256=6ppyVahxw3Ghr40zghr4-vAjRuj8QQNbKotQ-x3GFvw,13715
-esiaccel/cosim/verilator.py,sha256=WPZT14EkjtF1214P2noZyQC58GR7021xWaQ5oQwVcIg,2696
+esiaccel/cosim/questa.py,sha256=2xALwRzsOFZ1_xk3f2d849GMvGspNCK4XL8zVDBjXlA,4626
+esiaccel/cosim/simulator.py,sha256=HpkvKPbpyqalRp8poRYU3E0taYxTRmxcmBEJ7YOecx4,13941
+esiaccel/cosim/verilator.py,sha256=dwiEkKOem5OKPV9AK6O1ohr22MTsyDxBVnriDRFoVa8,2877
 esiaccel/include/esi/Accelerator.h,sha256=RhkZ2HeMZ0iHc5BkHdDWXoeg9J9lyPQciH5bWq5Qc_w,9772
 esiaccel/include/esi/CLI.h,sha256=Nn8tHn_xtEfkrD7USE2tao6ktYOJ6xcbnhZkS9-ox0A,2540
 esiaccel/include/esi/Common.h,sha256=IGJvAU72dlearXFbSmlXFFriy8aomirp7opEBjgewek,5775
@@ -45,9 +45,9 @@ esiaccel/include/esi/Utils.h,sha256=KPd75GajIFeTBVJocXBjwsJqhbZg-ShWZCIe3oQdBss,
 esiaccel/include/esi/backends/Cosim.h,sha256=s7vYd0ra6m1nvk-n37MjvBoGVI-CCUKBt0DU4PKlaHM,2838
 esiaccel/include/esi/backends/RpcServer.h,sha256=WMwnhwU2qnrcglGNeiKg9QQHpkDx1QE1JydKYDK4jqE,1856
 esiaccel/include/esi/backends/Trace.h,sha256=kx4wwLH3a0ndmRUdaDyYGZ1SP83zlpFrk30Nw8ZrJJA,3286
-esiaccel-0.1.5.dev247.dist-info/licenses/LICENSE,sha256=vtnVnB8_lN1yPYcA5MeT56R8UsQtBhyzZLBvu_KMf7I,13468
-esiaccel-0.1.5.dev247.dist-info/METADATA,sha256=Uo2zcU1qkNibFYgL2V_BQ2Gk1awfDEaQPyjU9NH_Cow,16148
-esiaccel-0.1.5.dev247.dist-info/WHEEL,sha256=KUuBC6lxAbHCKilKua8R9W_TM71_-9Sg5uEP3uDWcoU,101
-esiaccel-0.1.5.dev247.dist-info/entry_points.txt,sha256=_CuNLV0fyTURxRREFwpzGycifZW_-7-MyuJNEwKK9J8,137
-esiaccel-0.1.5.dev247.dist-info/top_level.txt,sha256=fYWTWMDK4PDu4ePQ9NtcFHas2k8-d1kWhTs2avPpgB4,9
-esiaccel-0.1.5.dev247.dist-info/RECORD,,
+esiaccel-0.1.5.dev262.dist-info/licenses/LICENSE,sha256=vtnVnB8_lN1yPYcA5MeT56R8UsQtBhyzZLBvu_KMf7I,13468
+esiaccel-0.1.5.dev262.dist-info/METADATA,sha256=HJVA86FXO5sdnXMAHQ6J4LTjSZlZygMz0pJiuyxqwKk,16148
+esiaccel-0.1.5.dev262.dist-info/WHEEL,sha256=KUuBC6lxAbHCKilKua8R9W_TM71_-9Sg5uEP3uDWcoU,101
+esiaccel-0.1.5.dev262.dist-info/entry_points.txt,sha256=_CuNLV0fyTURxRREFwpzGycifZW_-7-MyuJNEwKK9J8,137
+esiaccel-0.1.5.dev262.dist-info/top_level.txt,sha256=fYWTWMDK4PDu4ePQ9NtcFHas2k8-d1kWhTs2avPpgB4,9
+esiaccel-0.1.5.dev262.dist-info/RECORD,,