opencos-eda 0.3.13__py3-none-any.whl → 0.3.15__py3-none-any.whl

opencos/_version.py

@@ -2,6 +2,8 @@
 
 import sys
 
+# pylint: disable=invalid-name
+
 NAME = 'opencos-eda'
 
 # Use standard library metadata module starting Python 3.8
@@ -19,4 +21,4 @@ else:
     ver = "unknown" # Or raise an error, or handle differently
 
 
-VERSION = ver # pylint: disable=invalid-name
+VERSION = ver

opencos/_waves_pkg.sv

@@ -26,27 +26,25 @@ package _waves_pkg;
       automatic string trace_str_value = "";
       void'($value$plusargs("trace=%s", trace_str_value));
       if (trace_str_value.tolower() == "vcd") begin
-        $display("%t %m: Starting tracing to ./dump.vcd, plusarg +trace=%s",
-                 $realtime, trace_str_value);
+        $display("%t %m: Starting tracing to ./dump.vcd, plusarg +trace=vcd", $realtime);
         $dumpfile("dump.vcd");
         $dumpvars();
-        return 1;
+      end else begin
+        $display("%t %m: Starting tracing to ./dump.fst", $realtime);
+        $dumpfile("dump.fst");
+        $dumpvars();
       end
     end
 
-    $display("%t %m: Starting tracing to ./dump.fst", $realtime);
-    $dumpfile("dump.fst");
-    $dumpvars();
     return 1;
 
   endfunction : init_trace
 
-`elsif RIVIERA
+`elsif IVERILOG
 
   bit        trace_en_init = 0;
   bit        trace_en      = init_trace();
 
-  // Note: must be non-automatic function for --tool=riviera
   function bit init_trace();
 
     if (trace_en_init) // only do this once.
@@ -55,26 +53,59 @@ package _waves_pkg;
     trace_en_init = 1;
 
     if ($test$plusargs("trace") != 0) begin
-      automatic string trace_str_value = "";
+      $display("%t %m: Starting tracing to ./dump.vcd, plusarg +trace present", $realtime);
+      $dumpfile("dump.vcd");
+      $dumpvars();
+      return 1;
+    end
+
+  endfunction : init_trace
+
+`endif
+`endif
+`endif
+
+endpackage : _waves_pkg
+
+//
+// For RIVIERA (and SIMULATION, and not disabled):
+// - it will not run system calls from a package function, unless that package was
+//   used by the testbench
+// - so we have to
+//   - create a side module _waves_module. Fortunately the $dumpvars() in riviera
+//     dumps all module hier, not just that from _waves_module.
+//   - We will have to include work._waves_module in the vsim call (in riviera.py)
+//
+
+// TODO(drew): please test this on a file that doesn't involve ocsim_pkg.sv
+
+`ifdef SIMULATION
+`ifndef _WAVES_PKG_DISABLE_DUMPFILE // hook to disable this if user chooses
+`ifdef RIVIERA
+
+module _waves_module;
+
+  string trace_str_value = "";
+
+  initial begin
+
+    if ($test$plusargs("trace") != 0) begin
       void'($value$plusargs("trace=%s", trace_str_value));
       if (trace_str_value.tolower() == "vcd") begin
-        $display("%t %m: Starting tracing to ./dump.vcd, plusarg +trace=%s",
-                 $realtime, trace_str_value);
+        $display("%t %m: Starting tracing to ./dump.vcd, plusarg +trace=vcd", $realtime);
         $dumpfile("dump.vcd");
         $dumpvars();
-        return 1;
+      end else begin
+        $display("%t %m: Starting tracing to ./dump.fst", $realtime);
+        $dumpfile("dump.fst");
+        $dumpvars();
       end
     end
 
-    $display("%t %m: Starting tracing to ./dump.fst", $realtime);
-    $dumpfile("dump.fst");
-    $dumpvars();
-    return 1;
+  end
 
-  endfunction : init_trace
+endmodule : _waves_module
 
 `endif
 `endif
 `endif
-
-endpackage : _waves_pkg

opencos/commands/shell.py

@@ -9,7 +9,7 @@ Not intended to be overriden by Tool based classes.'''
 #   These also share a lot with CommandSim.* methods, so consider refactoring to share code,
 #   for example, CommandShell.do_export could move to CommandDesign, and derived classes
 #   set the allow-listed args to pass to export.
-# pylint: disable=too-many-arguments,too-many-positional-arguments
+# pylint: disable=too-many-arguments
 
 import os
 

opencos/commands/sim.py

@@ -9,17 +9,22 @@ Note that CommandSim is also a base class for opencos.commands.elab.CommandElab.
 # pylint: disable=R0801
 
 # TODO(drew): clean up CommandSim.check_logs_for_errors and CommandSim.run_commands_check_logs
-# pylint: disable=too-many-arguments,too-many-positional-arguments
+# pylint: disable=too-many-arguments
 
 import os
 import shlex
 
+from pathlib import Path
+
 from opencos import util, export_helper
 from opencos.eda_base import CommandDesign, Tool
 from opencos.utils import status_constants
 
 from opencos.utils.str_helpers import strip_outer_quotes
 
+THISPATH = os.path.dirname(__file__)
+WAVES_PKG_SV_FNAME = str((Path(THISPATH) / '..' / '_waves_pkg.sv').resolve())
+
 def parameters_dict_get_command_list(
         params: dict, arg_prefix: str = '-G',
         hier_delimiter: str = '.',
@@ -84,6 +89,7 @@ class CommandSim(CommandDesign): # pylint: disable=too-many-public-methods
     error_on_no_files_or_targets = True
     error_on_missing_top = True
     tool_config = {} # Children with Tool parent classes will set on Tool constructor.
+    library_map_supported = False
 
     command_name = 'sim'
 
@@ -114,6 +120,8 @@ class CommandSim(CommandDesign): # pylint: disable=too-many-public-methods
             'verilate-args': [],
             'ext-defines-sv-fname': '',
             'license-queue': False,
+            'library-map': [],
+            'add-top-library': [],
         })
         self.args_help.update({
             'pre-sim-tcl': (
@@ -168,6 +176,17 @@ class CommandSim(CommandDesign): # pylint: disable=too-many-public-methods
             'license-queue': (
                 'Set to enable env vars LICENSE_QUEUE=1 which has effects on certain simulators'
             ),
+            'library-map': (
+                'list arg (can set multiple) with values LibName:Path, only supported'
+                ' by certain simulation tools.'
+                ' The Path search is relative to the tool exe, one level above the tool exe,'
+                ' or can be absolute path.'
+            ),
+            'add-top-library': (
+                'Add additional top levels, for example if you added the "unisim" library'
+                ' you may need to --add-top-library=unisim.glbl for it to work with Xilinx'
+                ' based projects that require "glbl" to be present at simulation $root scope.'
+            ),
 
         })
 
@@ -175,6 +194,9 @@ class CommandSim(CommandDesign): # pylint: disable=too-many-public-methods
             'uvm-version': { 'choices': ['1.2'] },
         })
 
+        # only used if self.library_map_supported=True:
+        self.library_map = {} # lib-name: path-to.lib dict from self.args['library-map']
+
 
 
     def process_parameters_get_list(
@@ -425,7 +447,7 @@ class CommandSim(CommandDesign): # pylint: disable=too-many-public-methods
             cmds2 = self.get_simulate_command_lists()
             cmds3 = self.get_post_simulate_command_lists()
         '''
-        return
+        self.update_library_map()
 
 
     def check_logs_for_errors( # pylint: disable=dangerous-default-value,too-many-locals,too-many-branches
@@ -619,8 +641,7 @@ class CommandSim(CommandDesign): # pylint: disable=too-many-public-methods
                         break
 
         if not found_dumpfile:
-            thispath = os.path.dirname(__file__)
-            file_to_add = os.path.join(thispath, '..', '_waves_pkg.sv')
+            file_to_add = WAVES_PKG_SV_FNAME
             util.info(f'--waves arg present, no $dumpfile found, adding SV file: {file_to_add}')
             self.add_file(file_to_add)
 
@@ -686,3 +707,56 @@ class CommandSim(CommandDesign): # pylint: disable=too-many-public-methods
 
         if 'LICENSE_QUEUE' not in os.environ:
             os.environ['LICENSE_QUEUE'] = '1'
+
+    def update_library_map( # pylint: disable=dangerous-default-value
+            self, base_search_paths: list = []
+    ) -> None:
+        '''
+        Returns None, uses self.args['library-map'] to update:
+
+        - self.library_map (dict)
+        - self.args['sim-library']
+        '''
+        if not self.args['library-map']:
+            return
+
+        if not self.library_map_supported:
+            tool = self.config.get('tool', None)
+            util.warning(f'Command: sim, --tool={tool}, args for --library-map are not supported:',
+                         f'{self.args["library-map"]}')
+            return
+
+        for libmap in self.args['library-map']:
+            parts = libmap.split(':')
+            lib_name = parts[0]
+            lib_path = Path(':'.join(parts[1:]))
+            lib_abs_path = None
+
+            if not lib_name or not lib_path:
+                util.warning(f'library-map={libmap} could not parse {lib_name=} or {lib_path=}')
+                continue
+
+            if lib_name in self.library_map:
+                util.warning(
+                    f'We have already mapped "{lib_name}" to {self.library_map[lib_name]}'
+                )
+
+            # We have to go looking for lib_path though
+            search_files = [lib_path]
+            if base_search_paths:
+                for x in base_search_paths:
+                    search_files.append(Path(x) / lib_path)
+            for x in search_files:
+                if x.exists():
+                    lib_abs_path = x.resolve()
+                    util.info(f'library-map={libmap} found "{lib_name}" in: {lib_abs_path}')
+                    break
+                util.debug(f'library-map={libmap} searching for "{lib_name}" in: {x}')
+
+
+            if lib_abs_path:
+                self.library_map[lib_name] = lib_abs_path
+                if lib_name not in self.args['sim-library']:
+                    self.args['sim-library'].append(lib_name)
+            else:
+                util.warning(f'library-map={libmap}, for "{lib_name}" could not find {lib_path=}')

opencos/commands/upload.py

@@ -123,7 +123,7 @@ class CommandUpload(Command):
     def get_list_bitfiles(self, display: bool = True) -> list:
         '''Returns a list of bit files (ending with self.SUPPORTED_BIT_EXT)'''
 
-        bitfiles: list[Path] = []
+        bitfiles = [] # list[Path]
 
         targets, files = self.get_targets_or_files_from_unparsed_args()
         targets.extend(files)
@@ -136,7 +136,7 @@ class CommandUpload(Command):
                     if os.path.isfile(fullpath) and fullpath not in bitfiles:
                         bitfiles.append(fullpath)
 
-        matched: list[Path] = []
+        matched = [] # list[Path]
         for cand in bitfiles:
             debug(f"Looking for {cand=} in {targets=}")
             passing = all(re.search(t, str(cand)) for t in targets)

opencos/eda_config_defaults.yml

@@ -412,7 +412,8 @@ tools:
       -acdb -acdb_cov sbfectapm
     simulate-coverage-tcl:
       - acdb save
-      - acdb report -db work.acdb -txt -o cov.txt
+      - acdb report -i work.acdb -txt -o cov.txt
+      - acdb report -i work.acdb -txt -o covg.txt -show covergroups
 
 
   modelsim_ase:

opencos/eda_tool_helper.py

@@ -111,8 +111,8 @@ def get_handler_tool_version(tool: str, eda_command: str, config: dict) -> str:
 
 
 
-def get_handler_info_with_versions( # pylint: disable=too-many-branches
-        config: dict | None = None,
+def get_handler_info_with_versions( # pylint: disable=too-many-branches,dangerous-default-value
+        config: dict = {},
         include_commands: bool = True,
         sort: bool = True
 ) -> str:
@@ -202,8 +202,8 @@ def get_handler_info_with_versions( # pylint: disable=too-many-branches
     return info
 
 
-def pretty_info_handler_tools(
-        info: dict | None = None, config: dict | None = None, command: str | None = ''
+def pretty_info_handler_tools( # pylint: disable=dangerous-default-value
+        info: dict = {}, config: dict = {}, command: str = ''
 ) -> None:
     '''Pretty print (via util.info) the result from get_handler_info_with_versions()
 

opencos/tools/iverilog.py

@@ -70,6 +70,7 @@ class CommandSimIverilog(CommandSim, ToolIverilog):
     # We do not override CommandSim.do_it()
     def prepare_compile(self):
         self.set_tool_defines()
+        self.update_library_map()
 
         self.iverilog_command_lists = self.get_compile_command_lists()
         self.iverilog_exec_command_lists  = self.get_simulate_command_lists()

opencos/tools/questa_common.py

@@ -150,6 +150,8 @@ class CommonSimQuesta(CommandSim, ToolQuesta):
 
     def prepare_compile(self):
         self.set_tool_defines()
+        self.update_library_map()
+        self.add_waves_pkg_file()
         self.write_vlog_dot_f()
         self.write_vsim_dot_do(dot_do_to_write='all')
 
@@ -388,6 +390,10 @@ class CommonSimQuesta(CommandSim, ToolQuesta):
                 + f" -sv_seed {self.args['seed']} {sim_plusargs_str} {vsim_suppress_list_str}" \
                 + f" {voptargs_str} {vsim_ext_args} work.{self.args['top']}"
 
+        # If there are additional top level libs, we wont' add them to the vopt step, add
+        # to vsim only (after work.TOP):
+        for l in self.args['add-top-library']:
+            vsim_one_liner += f' {l}'
 
         vsim_one_liner = vsim_one_liner.replace('\n', ' ')
 

opencos/tools/riviera.py

@@ -9,9 +9,12 @@ Contains classes for ToolRiviera, CommandSimRiviera, CommandElabRiviera.
 import os
 import subprocess
 
+from pathlib import Path
+
 from opencos import util
 from opencos.commands import CommandFList
 from opencos.files import safe_shutil_which
+from opencos.commands.sim import WAVES_PKG_SV_FNAME
 from opencos.tools.questa_common import ToolQuesta, CommonSimQuesta
 from opencos.utils.str_helpers import sanitize_defines_for_sh
 from opencos.utils import status_constants
@@ -65,6 +68,8 @@ class ToolRiviera(ToolQuesta):
 class CommandSimRiviera(CommonSimQuesta, ToolRiviera):
     '''CommandSimRiviera is a command handler for: eda sim --tool=riviera'''
 
+    library_map_supported = True
+
     def __init__(self, config: dict):
         CommonSimQuesta.__init__(self, config=config)
 
@@ -123,8 +128,6 @@ class CommandSimRiviera(CommonSimQuesta, ToolRiviera):
     def compile(self):
         '''Override for CommandSimModelsimAse.compile() so we can set our own must_strings'''
 
-        self.add_waves_pkg_file()
-
         if self.args['stop-before-compile']:
             # don't run anything, save everyting we've already run in _prep_compile()
             return
@@ -190,6 +193,9 @@ class CommandSimRiviera(CommonSimQuesta, ToolRiviera):
                 '-dbg'
             ])
 
+        # Note, in Riviera we have to put sim libs in vsim call (with -L) and in vlog (with -l)
+        vlog_dot_f_lines.extend([f'-l {x}' for x in self.args['sim-library']])
+
         for value in self.incdirs:
             vlog_dot_f_lines += [ f"+incdir+{value}" ]
 
@@ -233,7 +239,7 @@ class CommandSimRiviera(CommonSimQuesta, ToolRiviera):
 
 
 
-    def write_vsim_dot_do( # pylint: disable=too-many-branches,too-many-locals
+    def write_vsim_dot_do( # pylint: disable=too-many-branches,too-many-locals,too-many-statements
             self, dot_do_to_write: list
     ) -> None:
         '''Writes files(s) based on dot_do_to_write(list of str)
@@ -278,7 +284,10 @@ class CommandSimRiviera(CommonSimQuesta, ToolRiviera):
                 )
             )
 
-        vsim_libs = ' '.join([f'-l {x}' for x in self.args['sim-library']])
+        # Note, in Riviera we have to put sim libs in vsim call (with -L) and in vlog (with -l)
+        # we previously updated self.args['sim-library'] with self.update_library_map()
+        vmap_lines_str = self.get_vmap_lines_str()
+        vsim_libs = ' '.join([f'-L {x}' for x in self.args['sim-library']])
 
         vsim_one_liner = (
             "vsim"
@@ -286,11 +295,20 @@ class CommandSimRiviera(CommonSimQuesta, ToolRiviera):
             f" {voptargs_str} {vsim_ext_args} {vsim_libs} work.{self.args['top']}"
         )
 
+        if self.args['waves'] and WAVES_PKG_SV_FNAME in self.files:
+            # kind of a hack, but add _waves_module (from _waves_pkg.sv) if that file
+            # was in our files list.
+            vsim_one_liner += ' work._waves_module'
+
+        for l in self.args['add-top-library']:
+            vsim_one_liner += f' {l}'
+
         vsim_one_liner = vsim_one_liner.replace('\n', ' ') # needs to be a one-liner
 
         vsim_vlogonly_dot_do_lines = [
             "if {[file exists work]} { vdel -all work; }",
             "vlib work;",
+            vmap_lines_str,
             "if {[catch {vlog -f vlog.f} result]} {",
             "    echo \"Caught $result \";",
             "    if {[batch_mode]} {",
@@ -306,6 +324,7 @@ class CommandSimRiviera(CommonSimQuesta, ToolRiviera):
             "if {[file exists work]} { vdel -all work; }",
             "vlib work;",
             "set qc 30;",
+            vmap_lines_str,
             "if {[catch {vlog -f vlog.f} result]} {",
             "    echo \"Caught $result \";",
             "    if {[batch_mode]} {",
@@ -327,6 +346,7 @@ class CommandSimRiviera(CommonSimQuesta, ToolRiviera):
             "if {[file exists work]} { vdel -all work; }",
             "vlib work;",
             "set qc 30;",
+            vmap_lines_str,
             "if {[catch {vlog -f vlog.f} result]} {",
             "    echo \"Caught $result \";",
             "    if {[batch_mode]} {",
@@ -407,6 +427,38 @@ class CommandSimRiviera(CommonSimQuesta, ToolRiviera):
 
         return ' '.join(vsim_suppress_list)
 
+    def update_library_map( # pylint: disable=dangerous-default-value
+            self, base_search_paths: list = []
+    ) -> None:
+        '''Override from sim::CommandSim
+
+        We add some common places to look relative to the Riviera install paths
+        '''
+        bsp = [] + base_search_paths
+        bsp += [
+            Path(self.sim_exe_base_path),
+            Path(self.sim_exe_base_path) / '..',
+            Path(self.sim_exe_base_path) / '..' / 'vlib',
+        ]
+        super().update_library_map(base_search_paths=bsp)
+
+    def get_vmap_lines_str(self) -> str:
+        '''Returns an empty str, or single str in the form:
+
+        vmap -global LibraryName  AbsolutePathToDotLibFile
+        vmap -global LibraryName2 AbsolutePathToAnotherDotLibFile
+        ...
+        uses self.args['library-map'], updates self.args['sim-library']
+        '''
+        if not self.library_map:
+            return ''
+
+        lines = []
+        for lib_name, lib_file_path in self.library_map.items():
+            lines.append(f'vmap -global {lib_name} {lib_file_path}')
+
+        return '\n'.join(lines)
+
 
 class CommandElabRiviera(CommandSimRiviera):
     '''CommandElabRiviera is a command handler for: eda elab --tool=riviera'''

opencos/tools/verilator.py

@@ -147,6 +147,7 @@ class VerilatorSim(CommandSim, ToolVerilator):
     # We do not override CommandSim.do_it()
     def prepare_compile(self):
         self.set_tool_defines()
+        self.update_library_map()
 
         # If there are C++ files here, then we will run Verilator in --cc mode:
         if self.files_cpp:
@@ -249,6 +250,10 @@ class VerilatorSim(CommandSim, ToolVerilator):
             '-top', self.args['top'],
         ]
 
+        if self.args['add-top-library']:
+            util.warning('--add-top-library: currently not supported in eda --tool=verilator:',
+                         f'{self.args["add-top-library"]}')
+
         if not lint_only:
             verilate_command_list += [
                 '-o', 'sim.exe',

opencos/tools/vivado.py

@@ -39,7 +39,10 @@ class ToolVivado(Tool):
         })
         self.args_help.update({
             'part': 'Device used for commands: synth, build.',
-            'add-glbl-v': '(for simulation) add glbl.v to filelist',
+            'add-glbl-v': (
+                '(for simulation) add glbl.v to filelist, "glbl" to sim libraries, and "glbl"'
+                ' as an additional top level hier.'
+            ),
         })
 
 
@@ -124,6 +127,8 @@ class CommandSimVivado(CommandSim, ToolVivado):
     Note that we attempt to run a generated .tcl script within vivado, that will perform the
     3-step compile/elaborate/simulate steps'''
 
+    library_map_supported = True
+
     def __init__(self, config: dict):
         CommandSim.__init__(self, config)
         ToolVivado.__init__(self, config=self.config)
@@ -139,7 +144,16 @@ class CommandSimVivado(CommandSim, ToolVivado):
             'gui':        'Run Vivado XSim in GUI mode',
             'tcl-file':   'name of TCL file to be created for XSim',
             'fpga':       'FPGA device name, can be used for various Xilinx IP or XCIs',
-            'add-glbl-v': 'Use the glbl.v in xvlog for this version of Vivado',
+            'add-glbl-v': (
+                'Use the glbl.v in xvlog, xelab for this version of Vivado. Adds glbl.v to'
+                ' filelist(s), and add "glbl" as an additional top level hier to xelab.'
+            ),
+            'library-map': (
+                'list arg (can set multiple) with values LibName:Path, for example:'
+                ' --library-map=unisim:path/to/custom_lib_name.lib'
+                ' The Path search is relative to the tool exe, one level above the tool exe,'
+                ' or can be absolute path.'
+            )
         })
 
         self.sim_libraries = self.tool_config.get('sim-libraries', [])
@@ -165,6 +179,7 @@ class CommandSimVivado(CommandSim, ToolVivado):
 
     def prepare_compile(self):
         self.set_tool_defines()
+        self.update_library_map()
 
         # Don't use the return values, these will set values in self.vivado_tcl:
         self.get_compile_command_lists()
@@ -321,11 +336,13 @@ class CommandSimVivado(CommandSim, ToolVivado):
             command_list += ['-debug', 'wave']
         if util.args['verbose']:
             command_list += ['-v', '2']
-        if self.args['sim-library'] or self.args['add-glbl-v']:
+        if self.args['sim-library']:
             self.sim_libraries += self.args['sim-library'] # Add any command line libraries
-            for x in self.sim_libraries:
-                command_list += ['-L', x]
-            command_list += ['glbl']
+        for x in self.sim_libraries:
+            command_list += ['-L', x]
+        if self.args['add-top-library']:
+            command_list += self.args['add-top-library'] # list
+
         command_list += self.args['elab-args']
 
         # For Windows compatibility, we have some issues with command/Powershell passing args
@@ -447,6 +464,10 @@ class CommandSimVivado(CommandSim, ToolVivado):
         command_list += self.tool_config.get('compile-args', '').split()
         if util.args['verbose']:
             command_list += ['-v', '2']
+
+        # If there were any external .lib files from --library-map args, add those now:
+        command_list.extend(self._get_xvlog_library_map_list())
+
         for value in self.incdirs:
             command_list.append('-i')
             command_list.append(Path(value).as_posix())
@@ -491,13 +512,28 @@ class CommandSimVivado(CommandSim, ToolVivado):
         glbl_v = self.vivado_base_path.replace(
             'bin', os.path.join('data', 'verilog', 'src', 'glbl.v')
         )
-        if any(x.endswith('glbl.v') for x in self.files_v):
+        if any(x and os.path.split(x)[1] == 'glbl.v' for x in self.files_v):
             util.warning(f'--add-glbl-v: Not adding {glbl_v=} b/c glbl.v already in',
                          f'{self.files_v=}')
         elif not os.path.exists(glbl_v):
             self.error(f"Could not find file {glbl_v=}")
         else:
             self.files_v.insert(0, glbl_v)
+            # add to self.args['add-top-library']
+            if 'glbl' not in self.args['add-top-library']:
+                self.args['add-top-library'].append('glbl')
+
+    def _get_xvlog_library_map_list(self) -> list:
+        '''Returns list of lines used in vlog step for --library-map args
+
+        Note that Vivado does not do library name re-mapping, the name comes
+        from the .lib file internals.
+        '''
+
+        lines = []
+        for _, lib_file_path in self.library_map.items():
+            lines.append(f'-libmap {lib_file_path}')
+        return lines
 
 
     def artifacts_add(self, name: str, typ: str, description: str) -> None:

opencos/tools/yosys.py

@@ -22,7 +22,7 @@ def get_commands_to_run_scriptfiles(
 
     list of yoysys script(s)'''
 
-    if script_fnames_list:
+    if not script_fnames_list:
         return []
 
     yosys_cmdlists = []
@@ -142,7 +142,12 @@ class CommonSynthYosys(CommandSynth, ToolYosys):
             'yosys-scriptfile': (
                 'Instead of using a built-in flow from eda, use your own scripts that are called'
                 ' via: yosys --scriptfile <this-arg>. You can set multiple args for multiple'
-                ' scriptfile (appends)'
+                ' scriptfile (appends). NOTE: the default for eda is to run in a work-dir such as'
+                ' ./eda.work/<target>.synth/, which means you may want to use absolute paths for'
+                ' source files (.sv, etc) in your custom scriptfile, or use ../.. to get back to '
+                ' the current directory. If you want to run in place and avoid'
+                ' ./eda.work/<target>.synth/ you can use arg --work-dir=. or to run in place from'
+                ' the DEPS target directory, use --work-dir-use-target-dir'
             ),
             'sta-scriptfile': (
                 'Instead of using a built-in flow from eda, use your own script that is called'

{opencos_eda-0.3.13.dist-info → opencos_eda-0.3.15.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: opencos-eda
-Version: 0.3.13
+Version: 0.3.15
 Summary: A simple Python package for wrapping RTL simuliatons and synthesis
 Author-email: Simon Sabato <simon@cognichip.ai>, Drew Ranck <drew@cognichip.ai>
 Project-URL: Homepage, https://github.com/cognichip/opencos

{opencos_eda-0.3.13.dist-info → opencos_eda-0.3.15.dist-info}/RECORD

@@ -1,16 +1,16 @@
 opencos/__init__.py,sha256=RwJA9oc1uUlvNX7v5zoqwjnSRNq2NZwRlHqtS-ICJkI,122
-opencos/_version.py,sha256=KaWIjS0c08g-C0fgYY1kXwSPqhOFxaq5pYEeoZhOR_I,617
-opencos/_waves_pkg.sv,sha256=TL5YT9lT-fn2FD54MbVVZROmZ7vtW3ScA_rM2eRzKmU,2068
+opencos/_version.py,sha256=FLlmTepF7P0hC-506fgEvv3NSxGxtWgeR7g2UkNK7PI,618
+opencos/_waves_pkg.sv,sha256=yWojzRYVIqV2H5xa5e0v34LgK4oLMu3k9_N8EYXy2f0,2852
 opencos/deps_schema.py,sha256=wKRMuFzOIapwpCPFGvWGM8Mcwdh9yngHOiDRMmvUaIg,17394
 opencos/eda.py,sha256=2vJLMYMW9muWieNaOJz-U5EIVchmVyhTfmEcnZwQtvg,37382
 opencos/eda_base.py,sha256=-nguHrrYVb8a853HEMfFrOoXlsEEeRnDdFR66nTwX0s,124332
 opencos/eda_config.py,sha256=EPW0rhnbrpfV9h0OtKrp7By19FcEyDXT2-ud7y4jbRU,17266
-opencos/eda_config_defaults.yml,sha256=xRJWps4On748MAFIfOIvLNOv5cyON7xAeaW5XquJSp0,21534
+opencos/eda_config_defaults.yml,sha256=0rq6DNw2U0OjuoZPmYVDgPwu_WoaGUQmaNE3l7sP4wA,21601
 opencos/eda_config_reduced.yml,sha256=BOKGfe-OmVIF0SKhTTglPIzfAoGuCZ8n-f2KpoLF8dk,883
 opencos/eda_deps_bash_completion.bash,sha256=o1yZvGUQSbN-AYq95sDTzMFw7gNHCUSlv9tASEHnACA,2763
 opencos/eda_deps_sanitize.py,sha256=SQjvrte9Hv9JesRY0wljvbdC6pAmLCikI-Wdzzy-D04,1939
 opencos/eda_extract_targets.py,sha256=POlxZfqf2dNH2nc1CEw5B_53vSHAicSTkpU9_-2_6Zw,2851
-opencos/eda_tool_helper.py,sha256=NoVUvUeqvM18Svx1Oy4R8xM4Numq_YZneKyHSDnMMnY,8546
+opencos/eda_tool_helper.py,sha256=7KY-E7wnWCNRHXeekDg1tFivcZw86-MsrmXiw7Fc6h0,8578
 opencos/export_helper.py,sha256=zDkvsUS6FVrpXl1UTy53QG3CuhYp5FFplI9rRzAE2g8,25395
 opencos/export_json_convert.py,sha256=tSIMbLFtc_Fo66EhFovMii1v_qJYyFZJrPNnoPdW7L0,4182
 opencos/files.py,sha256=-vHrddbFrwxEHU47VzeyLOU93q8XSXAmPiopClfV-bs,2296
@@ -29,12 +29,12 @@ opencos/commands/lint.py,sha256=piPb0l0zE3sAtNJkFQ-oNpuHxnaV_RNXkXtEj_9mwGs,1594
 opencos/commands/multi.py,sha256=urm-IDllnMZWScH7e6Pg4ukHGHILBd4NbPlPmHU3vsw,27624
 opencos/commands/open.py,sha256=XckvKUNwvc5KHbYGV-eQ2i0WG4X-yckroDaMC610MB4,804
 opencos/commands/proj.py,sha256=cExW9ZZkw6nkpVyNfeQzJADzmPtbYgBgWml82tqO6jY,1158
-opencos/commands/shell.py,sha256=upHpFs8Gdtzi-boVXwsC-QzEsnvtoZNMAu4oN10kdxw,7801
-opencos/commands/sim.py,sha256=ifdSpOVmxMWkQ65-9lhwMNZM4F3MXokjJJBm4puyVX4,28573
+opencos/commands/shell.py,sha256=WPKS27fTr0MG4Gqz_RzSwv4n8AINuQ_ntSmJtHeat_I,7771
+opencos/commands/sim.py,sha256=-dBxyHWMlUeLllsyhHa82jYKcLWxZA9qntS_vbeV3V0,31569
 opencos/commands/sweep.py,sha256=62XmDHT-prdxJNy-6MbK6wEGJm1YC9caOaJapoekQ8s,9325
 opencos/commands/synth.py,sha256=Qs6FP9Ge_gp9TH3EFzVXKFlrrqrMwIbr38VYVlZvmeA,4557
 opencos/commands/targets.py,sha256=_jRNhm2Fqj0fmMvTw6Ba39DCsRHf_r_uZCy_R064kpA,1472
-opencos/commands/upload.py,sha256=D5ln2gXsRHbPkOcy8S9jcwv-x6N4SK3m49urr1CLKo0,7915
+opencos/commands/upload.py,sha256=OGMI4By0942jL9LK7xBy5_WjvVzRbAr_RB3rS5fNobI,7917
 opencos/commands/waves.py,sha256=LYF1UcxkHFYYtYoebnh9iE_on80PbbmzIpaSk-XtZcI,9232
 opencos/deps/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 opencos/deps/defaults.py,sha256=Z6mIVJEV0zQ9rC-HkQFMBFAkixjqKS1TATPSc27wOeA,1502
@@ -61,21 +61,21 @@ opencos/tools/cocotb.py,sha256=mkhdbBbkOcPPct1TZcKH6wPPT7pjzRH_6wCNH2qgXOM,19660
 opencos/tools/invio.py,sha256=pxrS5oaNTcEv-ToXdhFBJZF5XhTmZnJz9CQ8NnLoty8,3155
 opencos/tools/invio_helpers.py,sha256=86WOGmSf4m_lEqBtK3DLjWqI0jnqAWzBEBRYfBUGiSY,8804
 opencos/tools/invio_yosys.py,sha256=zPVX5Bv-mR4zaUZiH0QqGF4Vbm_LXAf75mDW6ywse5c,6026
-opencos/tools/iverilog.py,sha256=7R4wL1udfn0WdckPDsYM75GgYW9DeCfPUQEOe-8SGVM,6755
+opencos/tools/iverilog.py,sha256=aehXQV22U7MIaH8XuEI9ApWztsez0NaW960_Z01oZWc,6789
 opencos/tools/modelsim_ase.py,sha256=NEzAXJtiVWkKb3N-O3PYxSnnFmrq8LNrqjxFNBwzfKI,2254
 opencos/tools/quartus.py,sha256=gtswIhpnHjUTmw5g1BRxhjB6tofXEsx-I6IySjwyF94,32303
 opencos/tools/questa.py,sha256=QP0JCt8rWf0-snncNP0_Pi6oRY6_Z9Hwix1IYlRdGEc,2057
-opencos/tools/questa_common.py,sha256=oVytNlwLK-W6yUYqOwlWjPrDd0kWJV4-FnWgppkSX8k,21647
+opencos/tools/questa_common.py,sha256=JYF4MrAcELurcA-t3Hzjb9KKtzHBEEYmXWKWAt8Gi0c,21931
 opencos/tools/questa_fe.py,sha256=yYNlUnA2pQ8-gELLajnvJgqg6ZXb6F26YRmyvrlNFOA,2155
 opencos/tools/questa_fse.py,sha256=CjOAn1Ik-3Hd-vyUH_WyTTJxH2yPfhNEfXbedCir7J4,2116
-opencos/tools/riviera.py,sha256=LgLartBXWwJIoI4zRFL7X2wk6hu2wa0CIJCNBZOGxUc,17509
+opencos/tools/riviera.py,sha256=SsBOQ-xQQeBr_jPKI50bGzFHXKQeAa7WX3Ql6AC-3wE,19535
 opencos/tools/slang.py,sha256=MxRwu4laSbv7oa3lO-BKg4McL7KAckSA003sL-9sY3U,9682
 opencos/tools/slang_yosys.py,sha256=z8gUcNSGDl5S6Ufxdx54WWe5v73w0UydErBKFWBR6ZI,10154
 opencos/tools/surelog.py,sha256=QaXS1EWI2b1TqBoekpXndoHxS6t2e8SD-I2Ryi-gHGs,6666
 opencos/tools/tabbycad_yosys.py,sha256=J4RgfuzYLiBK1U8odXiovXZhgkcDFPlbxt73SppksVA,7657
-opencos/tools/verilator.py,sha256=cx4q1WrterA5Kcn8bt8ukqthS0030swGOFOsoMRBYvw,25131
-opencos/tools/vivado.py,sha256=c8iHVK76de_25iOqN-PJ7O6n1lRopvO_XCM0HZV3c04,48702
-opencos/tools/yosys.py,sha256=DZyqAnrHT-6Wv6TlIwzuv4qw7HZs4vOXPpxZzErRsnY,28292
+opencos/tools/verilator.py,sha256=uxJs5VpE6pHIR3c5bJbQbjSoymIqNOG861ix2IR_c3Y,25363
+opencos/tools/vivado.py,sha256=BHnfJ-TqUYwdKFC1zHJ3x6xkLOgn2xdQbxySbBEWFYk,50149
+opencos/tools/yosys.py,sha256=8r3pxNod-ntWAHrDDL0HCT9mCkZ6qcNnOtLnIpOTi9g,28807
 opencos/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 opencos/utils/dict_helpers.py,sha256=xCdfE8SE-D6hNu5dG_d46A2g6au6h1h7SFpzYmeyRtA,810
 opencos/utils/markup_helpers.py,sha256=F_Emh2kT2gETYf7C-Jy5yJjsiHiPUtBpQzONsCka6Eo,4604
@@ -84,10 +84,10 @@ opencos/utils/str_helpers.py,sha256=ctl0Zh0h0JW7OlReeSdGxB9wODQYzmMO-9-h55rSRv0,
 opencos/utils/subprocess_helpers.py,sha256=Wqqs8FKm3XIjmD9GUYM-HWVJH7TxWJJA37A07J4fQ4w,6619
 opencos/utils/vscode_helper.py,sha256=8epyEeYfXONwiSoc5KZjUfKc8vgLryct8yckJYie88U,1398
 opencos/utils/vsim_helper.py,sha256=-TJK4Dh8LZ4DCM8GrS9Wka4HE_WMGG_aKwTZtKBrEOE,2994
-opencos_eda-0.3.13.dist-info/licenses/LICENSE,sha256=HyVuytGSiAUQ6ErWBHTqt1iSGHhLmlC8fO7jTCuR8dU,16725
-opencos_eda-0.3.13.dist-info/licenses/LICENSE.spdx,sha256=8gn1610RMP6eFgT3Hm6q9VKXt0RvdTItL_oxMo72jII,189
-opencos_eda-0.3.13.dist-info/METADATA,sha256=ryUfx_mmUFaZcwGr8lXFXrkY2whYhLB-HcQCfKSMtn8,1165
-opencos_eda-0.3.13.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-opencos_eda-0.3.13.dist-info/entry_points.txt,sha256=QOlMZnQeqqwOzIaeKBcY_WlMR3idmOAEbGFh2dXlqJw,290
-opencos_eda-0.3.13.dist-info/top_level.txt,sha256=J4JDP-LpRyJqPNeh9bSjx6yrLz2Mk0h6un6YLmtqql4,8
-opencos_eda-0.3.13.dist-info/RECORD,,
+opencos_eda-0.3.15.dist-info/licenses/LICENSE,sha256=HyVuytGSiAUQ6ErWBHTqt1iSGHhLmlC8fO7jTCuR8dU,16725
+opencos_eda-0.3.15.dist-info/licenses/LICENSE.spdx,sha256=8gn1610RMP6eFgT3Hm6q9VKXt0RvdTItL_oxMo72jII,189
+opencos_eda-0.3.15.dist-info/METADATA,sha256=eMegaTVGReQYdwr58zGGkc8fmhuJywlujQ1wawgA4dA,1165
+opencos_eda-0.3.15.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
+opencos_eda-0.3.15.dist-info/entry_points.txt,sha256=QOlMZnQeqqwOzIaeKBcY_WlMR3idmOAEbGFh2dXlqJw,290
+opencos_eda-0.3.15.dist-info/top_level.txt,sha256=J4JDP-LpRyJqPNeh9bSjx6yrLz2Mk0h6un6YLmtqql4,8
+opencos_eda-0.3.15.dist-info/RECORD,,

{opencos_eda-0.3.13.dist-info → opencos_eda-0.3.15.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (80.9.0)
+Generator: setuptools (80.10.2)
 Root-Is-Purelib: true
 Tag: py3-none-any