opencos-eda 0.3.3__py3-none-any.whl → 0.3.5__py3-none-any.whl

opencos/deps/defaults.py

@@ -33,6 +33,7 @@ SUPPORTED_TARGET_TABLE_KEYS = set([
     'defines',
     'parameters',
     'incdirs',
+    'plusargs',
     'top',
     'deps',
     'reqs',

opencos/deps/deps_processor.py

@@ -77,7 +77,7 @@ class DepsProcessor: # pylint: disable=too-many-instance-attributes
         ).get('command_handler', {}).keys()
 
 
-    def apply_defines(self, defines_dict: dict):
+    def apply_defines(self, defines_dict: dict) -> None:
         '''Given defines_dict, applies them to our self.command_design_ref obj'''
         if not isinstance(defines_dict, dict):
             self.error(f"{defines_dict=} is not type dict, can't apply defines,",
@@ -95,7 +95,19 @@ class DepsProcessor: # pylint: disable=too-many-instance-attributes
                 self.command_design_ref.process_plusarg(f'+define+{k}={v}')
 
 
-    def apply_parameters(self, parameters_dict: dict):
+    def apply_plusargs(self, plusargs_dict: dict) -> None:
+        '''Given plusarsg_dict, applies them to our self.command_design_ref obj'''
+        if not isinstance(plusargs_dict, dict):
+            self.error(f"{plusargs_dict=} is not type dict, can't apply plusargs,",
+                       f"in {self.caller_info}")
+        for k,v in plusargs_dict.items():
+            if v is None or v == '':
+                self.command_design_ref.process_plusarg(f'+{k}')
+            else:
+                self.command_design_ref.process_plusarg(f'+{k}={v}')
+
+
+    def apply_parameters(self, parameters_dict: dict) -> None:
         '''Given parameters_dict, applies them to our self.command_design_ref obj'''
         if not isinstance(parameters_dict, dict):
             self.error(f"{parameters_dict=} is not type dict, can't apply defines,",
@@ -110,7 +122,7 @@ class DepsProcessor: # pylint: disable=too-many-instance-attributes
                 )
 
 
-    def apply_incdirs(self, incdirs_list:list):
+    def apply_incdirs(self, incdirs_list:list) -> None:
         '''Given incdirs_list, applies them to our self.command_design_ref obj'''
         if not isinstance(incdirs_list, (str, list)):
             self.error(f"{incdirs_list=} is not type str/list, can't apply incdirs",
@@ -290,7 +302,9 @@ class DepsProcessor: # pylint: disable=too-many-instance-attributes
                 caller_info=self.caller_info
             )
 
-    def process_deps_entry(self):
+    def process_deps_entry( # pylint: disable=too-many-branches
+            self
+    ) -> list:
         '''Main entry point (after creating DepsProcessor obj) to resolve a deps target
 
         Example usage:
@@ -303,22 +317,6 @@ class DepsProcessor: # pylint: disable=too-many-instance-attributes
         This method will apply all target features to the CommandDesign ref object as
         we traverse.
 
-        Supported target keys:
-         -- tags (or equivalent, to support multiple define/incdir/deps for a target)
-            -- supports tag-name, with-tools, with-args, args, defines, incdirs, deps
-                 ** to be applied if a tool matches.
-            -- TODO(drew): other features in docs/DEPS.md not yet implemented.
-         -- multi: ignore-this-target: - commands (handled in eda.py CommandMulti.resolve_target)
-         -- Named eda commands
-            -- (partially done) sim or other eda commands (eda.py command specific things)
-                basically, check the command, and apply/merge values to 'entry'?
-         -- args
-         -- defines
-         -- incdirs
-         -- top.
-         -- commands (not in deps)
-         -- deps
-
         TODO(drew): This does not yet support conditional inclusions based on defines,
          like the old DEPS files did with pattern:
             SOME_DEFINE ?  dep_if_define_present : dep_if_define_not_present
@@ -344,6 +342,8 @@ class DepsProcessor: # pylint: disable=too-many-instance-attributes
                 remaining_deps_list += self.process_tags()
             elif key == 'defines':
                 self.process_defines()
+            elif key == 'plusargs':
+                self.process_plusargs()
             elif key == 'parameters':
                 self.process_parameters()
             elif key == 'incdirs':
@@ -520,6 +520,10 @@ class DepsProcessor: # pylint: disable=too-many-instance-attributes
                         # apply defines:
                         self.apply_defines(value.get('defines', {}))
 
+                    if key == 'plusargs':
+                        # apply plusargs:
+                        self.apply_plusargs(value.get('plusargs', {}))
+
                     elif key == 'parameters':
                         self.apply_parameters(value.get('parameters', {}))
 
@@ -598,7 +602,7 @@ class DepsProcessor: # pylint: disable=too-many-instance-attributes
         return ret_deps_added_from_tags
 
 
-    def process_defines(self):
+    def process_defines(self) -> None:
         '''Returns None, applies defines (dict, if any) from self.deps_entry to
         self.command_design_ref.'''
 
@@ -614,7 +618,28 @@ class DepsProcessor: # pylint: disable=too-many-instance-attributes
 
         self.apply_defines(entry_defines)
 
-    def process_parameters(self):
+
+    def process_plusargs(self) -> None:
+        '''Returns None, applies plusargs (dict, if any) from self.deps_entry to
+        self.command_design_ref.
+
+        These work w/ the same rules as defines (no value, or value int/str)
+        '''
+
+        # Plusargs:
+        # apply command specific plusargs, with higher priority than the a
+        # deps_entry['sim']['plusargs'] entry,
+        # do this with dict1.update(dict2):
+        entry_plusargs = {}
+        entry_plusargs.update(self.deps_entry.get('plusargs', {}))
+        entry_plusargs.update(self.entry_eda_command.get('plusargs', {}))
+        assert isinstance(entry_plusargs, dict), \
+            f'{entry_plusargs=} for in {self.caller_info} must be a dict'
+
+        self.apply_plusargs(entry_plusargs)
+
+
+    def process_parameters(self) -> None:
         '''Returns None, applies parameters (dict, if any) from self.deps_entry to
         self.command_design_ref.'''
 

opencos/deps_schema.py

@@ -17,6 +17,9 @@ my_target_name:
   incdirs:                           <---- incdirs, optional array (or string)
     - ./
 
+  plusargs:                          <---- plusargs, optional table
+    some_plusarg: 32
+
   top: tb                            <---- top, optional string
 
   deps:
@@ -63,6 +66,7 @@ my_target_name:
   defines:                           <---- defines, optional table
   parameters:                        <---- parameters, optional table
   incdirs:                           <---- incdirs, optional array (or string)
+  plusargs:                          <---- plusargs, optional table
   top: tb                            <---- top, optional string
   deps:                              <---- TARGET_DEPS_CONTENTS schema
     - some_file.sv                   <---- string file name
@@ -216,6 +220,9 @@ TARGET_EDA_COMMAND_ENTRY_TABLE = {
     Optional('defines'): {
         Optional(str): Or(str, int, type(None)),
     },
+    Optional('plusargs'): {
+        Optional(str): Or(str, int, type(None)),
+    },
     Optional('parameters'): {
         Optional(str): Or(str, int),
     },
@@ -241,6 +248,9 @@ TARGET_TAGS_TABLE = {
         Optional('defines'): {
             Optional(str): Or(str, int, type(None)),
         },
+        Optional('plusargs'): {
+            Optional(str): Or(str, int, type(None)),
+        },
         Optional('parameters'): {
             Optional(str): Or(str, int),
         },
@@ -262,6 +272,10 @@ TARGET_CONTENTS = Or(
         Optional('defines'): {
             Optional(str): Or(str, int, type(None)),
         },
+        # plusargs: table of key-value; value null or string
+        Optional('plusargs'): {
+            Optional(str): Or(str, int, type(None)),
+        },
         # parameters: table of key-value
         Optional('parameters'): {
             Optional(str): Or(str, int),
@@ -324,6 +338,9 @@ FILE_SIMPLIFIED = Schema(
                     Optional('defines'): {
                         Optional(str): Or(type(None), str),
                     },
+                    Optional('plusargs'): {
+                        Optional(str): Or(type(None), str),
+                    },
                     Optional('parameters'): {
                         Optional(str): str,
                     },

opencos/eda.py

@@ -23,7 +23,7 @@ from opencos import util, eda_config, eda_base
 from opencos.eda_base import Tool, which_tool, get_eda_exec
 from opencos.utils import vsim_helper, vscode_helper
 from opencos.utils.subprocess_helpers import subprocess_run_background
-from opencos.utils import status_constants, str_helpers
+from opencos.utils import status_constants, str_helpers, subprocess_helpers
 
 # Configure util:
 util.progname = "EDA"
@@ -50,7 +50,7 @@ def init_config(
     # For key DEFAULT_HANDLERS, we'll update config['command_handler'] with
     # the actual class using importlib (via opencos.util)
 
-    eda_config.tool_try_add_to_path(tool)
+    eda_config.update_config_auto_tool_order_for_tool(tool=tool, config=config)
 
     config['command_handler'] = {}
     for _cmd, str_class in config['DEFAULT_HANDLERS'].items():
@@ -163,10 +163,7 @@ def auto_tool_setup( # pylint: disable=too-many-locals,too-many-branches,too-man
       If so, updates config['auto_tools_order'][tool]['exe']
     '''
 
-
-    tool = eda_config.update_config_auto_tool_order_for_tool(
-        tool=tool, config=config
-    )
+    tool = eda_config.tool_arg_remove_path_information(tool)
 
     assert 'auto_tools_order' in config
     assert isinstance(config['auto_tools_order'], list)
@@ -275,9 +272,7 @@ def tool_setup(tool: str, config: dict, quiet: bool = False, auto_setup: bool =
 
     '''
 
-    tool = eda_config.update_config_auto_tool_order_for_tool(
-        tool=tool, config=config
-    )
+    tool = eda_config.tool_arg_remove_path_information(tool)
 
     if not quiet and not auto_setup:
         util.info(f"Setup for tool: '{tool}'")
@@ -389,6 +384,8 @@ def process_tokens( # pylint: disable=too-many-branches,too-many-statements,too-
     if not is_interactive:
         # Run init_config() now, we deferred it in main(), but only run it
         # for this tool (or tool=None to figure it out)
+        # This will handle any --tool=<name>=/path/to/bin also, so don't have to
+        # run tool_setup(..) on its own.
         config = init_config(
             config, tool=parsed.tool,
             run_auto_tool_setup=run_auto_tool_setup
@@ -406,13 +403,8 @@ def process_tokens( # pylint: disable=too-many-branches,too-many-statements,too-
             for arg in unparsed:
                 if not arg.startswith('-'):
                     command = arg
-        if parsed.tool:
-            tool_setup(parsed.tool, config=config)
         return usage(tokens=unparsed, config=config, command=command, tool=parsed.tool)
 
-    if parsed.tool:
-        tool_setup(parsed.tool, config=config)
-
     deferred_tokens = unparsed
     if not command:
         util.error("Didn't get a command!")
@@ -504,6 +496,7 @@ def signal_handler(sig, frame) -> None: # pylint: disable=unused-argument
     '''Handles Ctrl-C, called by main_cli() if running from command line'''
     util.fancy_stop()
     util.info('Received Ctrl+C...', start='\nINFO: [EDA] ')
+    subprocess_helpers.cleanup_all()
     util.exit(-1)
 
 # **************************************************************

opencos/eda_base.py

@@ -594,6 +594,7 @@ class Command: # pylint: disable=too-many-public-methods
                 help_kwargs = {'help': f'default={value}'}
             else:
                 help_kwargs = {'help': f'{type(value).__name__} default={value}'}
+            help_kwargs['help'] = help_kwargs['help'].replace('%', '%%')
 
 
             # It's important to set the default=None on these, except for list types where default

opencos/eda_config.py

@@ -18,7 +18,10 @@ from opencos import util
 from opencos.utils.markup_helpers import yaml_safe_load, yaml_safe_writer
 
 class Defaults:
-    '''Defaults is a global placeholder for constants and supported features.'''
+    '''Defaults is a global namespace for constants and supported features.
+
+    Defaults.config_yml is set depending on search order for default eda_config[_defaults].yml
+    '''
 
     environ_override_config_yml = os.environ.get('EDA_CONFIG_YML', '')
     home_override_config_yml = os.path.join(
@@ -63,14 +66,15 @@ class Defaults:
         'simulate-args',
         'simulate-waves-args',
         'simulate-waivers',
+        'simulate-coverage-tcl',
         'coverage-args',
     ])
 
 EDA_OUTPUT_CONFIG_FNAME = 'eda_output_config.yml'
 
-if os.path.exists(Defaults.environ_override_config_yml):
+if os.path.isfile(Defaults.environ_override_config_yml):
     Defaults.config_yml = Defaults.environ_override_config_yml
-elif os.path.exists(Defaults.home_override_config_yml):
+elif os.path.isfile(Defaults.home_override_config_yml):
     Defaults.config_yml = Defaults.home_override_config_yml
 else:
     Defaults.config_yml = Defaults.opencos_config_yml
@@ -149,29 +153,9 @@ def update_config_auto_tool_order_for_tool(tool: str, config: dict) -> str:
     Input arg tool can be in the form (for example):
       tool='verlator', tool='verilator=/path/to/verilator.exe'
 
-    Performs no update if tool has no = in it. Returns tool (str) w/out = in it
+    Performs no update if tool has no = or : in it. Returns tool (str) w/out = in it
     '''
-    if not tool or '=' not in tool:
-        return tool
-
-    tool, user_exe = tool.split('=')[0:2]
-
-    user_exe = shutil.which(user_exe)
-
-    # try adding to $PATH if in form --tool=/path/to/exe
-    tool_try_add_to_path(tool)
-
-    if tool not in config['auto_tools_order'][0]:
-        return tool
-    if not user_exe:
-        return tool
-
-    old_exe = config['auto_tools_order'][0][tool].get('exe', str())
-    if isinstance(old_exe, list):
-        config['auto_tools_order'][0][tool]['exe'][0] = user_exe
-    else:
-        config['auto_tools_order'][0][tool]['exe'] = user_exe
-    return tool
+    return tool_try_add_to_path(tool=tool, config=config, update_config=True)
 
 
 def update_config_auto_tool_order_for_tools(tools: list, config: dict) -> list:
@@ -327,32 +311,92 @@ def write_eda_config_and_args(
     yaml_safe_writer(data=data, filepath=fullpath)
 
 
-def tool_try_add_to_path(tool: str) -> None:
-    '''Since we support --tool=<name>=/path/to/bin/exe, attempt to prepend $PATH
+def tool_arg_get_parts(tool: str) -> list:
+    '''Given a tool (str or None) that may be in form <name>=/path/to/something
+
+    Return the parts [<name>, <path>, ..]
+    '''
+    if not tool or ('=' not in tool and ':' not in tool):
+        return [tool]
+
+    if '=' in tool:
+        parts = tool.split('=')
+    else:
+        parts = tool.split(':')
+
+    return parts
+
+def tool_arg_remove_path_information(tool: str) -> str:
+    '''Given a tool (str or None) that may be in form <name>=/path/to/something
+
+    Return the <name> only
+    '''
+    if not tool:
+        return tool
+    return tool_arg_get_parts(tool)[0]
+
+
+def tool_try_add_to_path( # pylint: disable=too-many-branches
+        tool: str, config: dict, update_config: bool
+) -> str:
+    '''Since we support --tool=<name>=/path/to/bin[/exe], attempt to prepend $PATH
+
+    (also works for --tool=<name>:/path/to/bin[/exe] )
 
     with this information for this tool (which will nicely affect all subprocesses,
     but not wreck our original shell).'''
 
-    if not tool or '=' not in tool:
-        return
+    name_path_parts = tool_arg_get_parts(tool)
+    if len(name_path_parts) == 1:
+        return name_path_parts[0]
+
+    name, path_arg = name_path_parts[0:2]
+
+    if name not in config['auto_tools_order'][0]:
+        return name
+
+    config_exe = config['auto_tools_order'][0][name].get('exe', str())
+    if isinstance(config_exe, list):
+        orig_exe = config_exe[0]
+    else:
+        orig_exe = config_exe
 
-    name, exe = tool.split('=')
-    if os.path.isdir(name):
+    if path_arg and os.path.isfile(path_arg):
+        # Someone passes us --tool=<name>=/path/to/bin/exe, remove the exe from path:
+        path, exe = os.path.split(path_arg)
+    elif path_arg and os.path.isdir(path_arg):
         # Someone passes us --tool=<name>=/path/to/bin/ (did not have exe)
-        path = name
+        path, exe = path_arg, orig_exe
     else:
-        # Someone passes us --tool=<name>=/path/to/bin/exe, remove the exe.
-        path, _ = os.path.split(exe)
-    if not path:
-        return
+        path, exe = '', ''
+
+    if not path or not exe:
+        util.error(f'Can not find path or exe for --tool={tool}: {name=} path={path_arg}')
+        return name
 
     path = os.path.abspath(path)
     if os.path.isdir(path):
-        paths = os.environ['PATH'].split(':')
+        paths = os.environ.get('PATH', '').split(':')
         if path not in paths:
-            os.environ['PATH'] = path + ':' + os.environ['PATH']
             util.info(f'--tool={tool} has path information, prepending PATH with: {path}')
+            os.environ['PATH'] = path + ':' + os.environ.get('PATH', '')
         else:
             util.info(f'--tool={tool} has path information, but {path} already in $PATH')
-    if exe and os.path.isfile(exe):
-        util.info(f'--tool={tool} has path information, using exe {shutil.which(exe)}')
+
+    user_exe = os.path.join(path, exe)
+    if not os.access(user_exe, os.X_OK):
+        util.error(f'--tool setting for {tool}: {user_exe} is not an executable')
+        return name
+
+    user_exe = shutil.which(exe)
+
+    if update_config:
+        if isinstance(config_exe, list):
+            config['auto_tools_order'][0][name]['exe'][0] = user_exe
+        else:
+            config['auto_tools_order'][0][name]['exe'] = user_exe
+        util.debug(f'For {tool=}, auto_tools_order config updated')
+
+    util.debug(f'For {tool=}, final {user_exe=}')
+
+    return name

opencos/eda_config_defaults.yml

@@ -247,6 +247,9 @@ tools:
       +accb +accr +access +r+w
     coverage-args: |
       -acdb -acdb_cov sbfectapm
+    simulate-coverage-tcl:
+      - acdb save
+      - acdb report -db work.acdb -txt -o cov.txt
 
 
   modelsim_ase:

opencos/eda_tool_helper.py

@@ -68,3 +68,22 @@ def get_all_handler_commands(config=None, tools_loaded=None) -> dict:
                 all_handler_commands[command].append(tool)
 
     return all_handler_commands
+
+
+def get_handler_tool_version(tool: str, eda_command: str, config: dict) -> str:
+    '''Attempts to get a Command Handler's version given tool + eda_command'''
+
+    entry = config['auto_tools_order'][0].get(tool, {})
+    if not entry:
+        return ''
+
+    handler_name = entry.get('handlers', {}).get(eda_command, '')
+    if not handler_name:
+        return ''
+
+    module = util.import_class_from_string(handler_name)
+    obj = module(config=config)
+    if not getattr(obj, 'get_versions', None):
+        return ''
+
+    return obj.get_versions()

opencos/tests/helpers.py

@@ -16,6 +16,7 @@ from opencos.utils.subprocess_helpers import subprocess_run_background
 
 # Figure out what tools the system has available, without calling eda.main(..)
 config, tools_loaded = eda_tool_helper.get_config_and_tools_loaded()
+known_tool_versions = {}
 
 
 def eda_wrap_is_sim_fail(rc: int, quiet: bool = False) -> bool:
@@ -32,6 +33,16 @@ def eda_wrap_is_sim_fail(rc: int, quiet: bool = False) -> bool:
         status_constants.EDA_DEFAULT_ERROR
     )
 
+def handle_tool_version(tool: str, eda_command: str, cfg: dict = config) -> None:
+    '''Attempts to use a command handler for tool + eda_command and we'll
+    track the version globally'''
+
+    if not known_tool_versions.get(tool, ''):
+        handler_version = eda_tool_helper.get_handler_tool_version(
+            tool=tool, eda_command=eda_command, config=cfg
+        )
+        known_tool_versions[tool] = handler_version
+
 def can_run_eda_command(*commands, cfg: dict = config) -> bool:
     '''Returns True if we have any installed tool that can run: eda <command>'''
     runnable = []
@@ -50,10 +61,36 @@ def can_run_eda_command(*commands, cfg: dict = config) -> bool:
             if entry and entry.get('disable-auto', False):
                 # This tool cannot automatically run our command.
                 return False
+            # While we're here, set known tool versions.
+            handle_tool_version(tool=tool, eda_command=command, cfg=cfg)
 
         runnable.append(True)
     return runnable and all(runnable)
 
+def can_uvm(tool: str) -> bool:
+    '''Returns True if we can run UVM, per tool'''
+
+    if tool not in tools_loaded:
+        return False
+
+    if tool == 'verilator':
+        # requires UVM_HOME to be set with uvm_pkg.sv existing.
+        uvm_home = os.environ.get('UVM_HOME', '')
+        uvm_pkg = os.path.join(uvm_home, 'uvm_pkg.sv')
+        if not all((os.path.isdir(uvm_home), os.path.isfile(uvm_pkg))):
+            return False
+
+        handle_tool_version(tool=tool, eda_command='sim', cfg=config)
+        version_list = known_tool_versions.get('verilator', '').split('.')
+        if int(version_list[0]) < 5 or \
+           (int(version_list[0]) == 5 and int(version_list[1]) < 42):
+            return False
+
+        return True
+
+    # default return False:
+    return False
+
 def can_run_eda_sim(cfg: dict = config) -> bool:
     '''Returns True if we have any installed tool that can run: eda sim'''
     return can_run_eda_command('sim', cfg=cfg)

opencos/tests/test_eda.py

@@ -100,9 +100,19 @@ class TestsRequiresVerilator( # pylint: disable=too-many-public-methods
     def test_args_sim_tool_with_path(self):
         '''Test for calling a tool as --tool=<tool>=</path/to/tool-exe>'''
         verilator_fullpath = shutil.which('verilator')
+        verilator_path, _ = os.path.split(verilator_fullpath)
+
         chdir_remove_work_dir('../../lib/tests')
         rc = eda_sim_wrap('--tool', f'verilator={verilator_fullpath}', 'oclib_fifo_test')
-        print(f'{rc=}')
+        assert rc == 0
+
+        rc = eda_sim_wrap('--tool', f'verilator:{verilator_fullpath}', 'oclib_fifo_test')
+        assert rc == 0
+
+        rc = eda_sim_wrap('--tool', f'verilator={verilator_path}', 'oclib_fifo_test')
+        assert rc == 0
+
+        rc = eda_sim_wrap('--tool', f'verilator:{verilator_fullpath}', 'oclib_fifo_test')
         assert rc == 0
 
     def test_args_sim_with_coverage(self):

opencos/tools/iverilog.py

@@ -160,6 +160,10 @@ class CommandSimIverilog(CommandSim, ToolIverilog):
         cmd_list += self.tool_config.get('simulate-args', '').split()
         if self.args['waves']:
             cmd_list += self.tool_config.get('simulate-waves-args', '').split()
+        for x in self.args['sim-plusargs']:
+            if x[0] != '+':
+                x = f'+{x}'
+            cmd_list.append(x)
         return [ util.ShellCommandList(cmd_list, tee_fpath='sim.log') ]
 
     def get_post_simulate_command_lists(self, **kwargs) -> list:

opencos/tools/riviera.py

@@ -13,6 +13,7 @@ import subprocess
 from opencos import util
 from opencos.tools.modelsim_ase import ToolModelsimAse, CommandSimModelsimAse
 from opencos.utils.str_helpers import sanitize_defines_for_sh
+from opencos.utils import status_constants
 
 class ToolRiviera(ToolModelsimAse):
     '''ToolRiviera used by opencos.eda for --tool=riviera'''
@@ -61,6 +62,7 @@ class CommandSimRiviera(CommandSimModelsimAse, ToolRiviera):
             'gui': False,
             'waves-fst': True,
             'waves-vcd': False,
+            'coverage-tcl': '',
         })
         self.args_help.update({
             'waves-fst': (
@@ -70,6 +72,10 @@ class CommandSimRiviera(CommandSimModelsimAse, ToolRiviera):
             ),
             'waves-vcd': 'If using --waves, apply simulation runtime arg +trace=vcd',
             'waves': 'Save a .asdb offline wavefile, can be used with --waves-fst or --waves-vcd',
+            'coverage-tcl': (
+                'bring your own .tcl file to run in Riviera (vsim) for coverage. The default'
+                ' tcl steps are (from tool config in --config-yml):   '
+            ) + '; '.join(self.tool_config.get('simulate-coverage-tcl', [])),
         })
 
     def set_tool_defines(self):
@@ -183,7 +189,9 @@ class CommandSimRiviera(CommandSimModelsimAse, ToolRiviera):
 
 
 
-    def write_vsim_dot_do(self, dot_do_to_write: list) -> None:
+    def write_vsim_dot_do( # pylint: disable=too-many-branches
+            self, dot_do_to_write: list
+    ) -> None:
         '''Writes files(s) based on dot_do_to_write(list of str)
 
         list arg values can be empty (all) or have items 'all', 'sim', 'lint', 'vlog'.'''
@@ -278,18 +286,21 @@ class CommandSimRiviera(CommandSimModelsimAse, ToolRiviera):
             "}",
         ]
 
+        vsim_dot_do_lines += [
+            "run -all;",
+        ]
         if self.args['coverage']:
-            vsim_dot_do_lines += [
-                "run -all;",
-                "acdb save",
-                "acdb report -db work.acdb -txt -o cov.txt",
-                # Note - could try:
-                ##"cover report -o cov.report.txt -fullverbose -all_columns",
-            ]
-        else:
-            vsim_dot_do_lines += [
-                "run -all;",
-            ]
+            if self.args['coverage-tcl']:
+                tclfile = os.path.abspath(self.args['coverage-tcl'])
+                if not os.path.isfile(tclfile):
+                    self.error(f'--coverage-tcl file not found: {tclfile}',
+                               error_code=status_constants.EDA_COMMAND_OR_ARGS_ERROR)
+                vsim_dot_do_lines += [
+                    f'source {tclfile}'
+                ]
+            else:
+                # default TCL for coverage:
+                vsim_dot_do_lines += self.tool_config.get('simulate-coverage-tcl', [])
 
 
         vsim_dot_do_lines += [

opencos/tools/verilator.py

@@ -83,6 +83,7 @@ class VerilatorSim(CommandSim, ToolVerilator):
             'lint-only': False,
             'cc-mode': False,
             'verilator-coverage-args': [],
+            'uvm': False,
             'x-assign': '',
             'x-initial': '',
         })
@@ -116,6 +117,15 @@ class VerilatorSim(CommandSim, ToolVerilator):
                          ' where valid string values are: 0, unique, fast.'
                          ' Also conditinally adds to verilated exe call:'
                          ' +verilator+rand+reset+[0,2] for arg values 0, unique|fast'),
+            'uvm': (
+                'Warns on Verilator < 5.042, or missing $UVM_HOME environment var set (or in'
+                ' .env, $UVM_HOME/uvm_pkg.sv should exist), and will run verilator with args:'
+                ' -Wno-fatal +define+UVM_NO_DPI'
+            ),
+            'verilator-coverage-args': (
+                'Requires --coverage, args to be applied to verilator_coverage, which runs'
+                ' after running the compiled executable simulation'
+            ),
         })
 
         self.verilate_command_lists = []
@@ -212,12 +222,19 @@ class VerilatorSim(CommandSim, ToolVerilator):
 
         verilate_command_list = self._get_start_verilator_command_list(lint_only=lint_only)
 
+        # Handle UVM things (return args), but also handles uvm_pkg.sv in self.files_sv:
+        # since we run this 2x (lint-only and normal) only do warnings for one of them:
+        verilate_command_list += self._verilator_args_uvm(
+            warnings=(not lint_only), add_uvm_pkg_if_found=True
+        )
+
         verilate_command_list += self._get_verilator_tool_config_waivers()
 
         verilate_command_list += self._verilator_args_defaults_cflags_nproc()
 
         verilate_command_list += self._get_verilator_waves_args(lint_only=lint_only)
 
+
         if self.args.get('coverage', True):
             verilate_command_list += self.tool_config.get(
                 'compile-coverage-args', '--coverage').split()
@@ -486,6 +503,75 @@ class VerilatorSim(CommandSim, ToolVerilator):
         return verilate_args
 
 
+    def _verilator_support_uvm_pkg_fpath(self, add_if_found: bool = True) -> bool:
+        '''Returns False if we could not find a suitable uvm_pkg.sv to use, or if --no-uvm.
+
+        This will also auto-add uvm_pkg.sv from $UVM_HOME/uvm_pkg.sv if not present in
+        self.files already (adds to front of self.files_sv)
+        '''
+
+        if not self.args['uvm']:
+            return False
+
+        for fname, exists in self.files.items():
+            if exists and os.path.split(fname)[1] == 'uvm_pkg.sv':
+                # already present in our source files (assume someone doing it manually
+                # or via DEPS)
+                return True
+
+        uvm_home = os.environ.get('UVM_HOME', '')
+        if not uvm_home:
+            return False
+
+        uvm_pkg_fpath = os.path.join(uvm_home, 'uvm_pkg.sv')
+        if add_if_found and os.path.isfile(uvm_pkg_fpath):
+            uvm_pkg_fpath = os.path.abspath(uvm_pkg_fpath)
+            util.info(f'For --uvm, adding to source files: {uvm_pkg_fpath}')
+            self.files[uvm_pkg_fpath] = True
+            self.files_sv.insert(0, uvm_pkg_fpath)
+            self.files_caller_info[uvm_pkg_fpath] = 'verilator.py'
+            util.info(f'For --uvm, adding +incdir+: {uvm_home}')
+            self.incdirs.append(os.path.abspath(uvm_home))
+            return True
+
+        return False
+
+
+    def _verilator_args_uvm(
+            self, warnings: bool = True, add_uvm_pkg_if_found: bool = True
+    ) -> list:
+        '''Returns list of args to be added to verilator (compile) step if --uvm present
+
+        Warnings on potential issues (Veriltor version, missing uvm_pkg.sv).
+        Optionally adds uvm_pkg.sv to source files.
+        '''
+
+        # Handle --uvm args:
+        if not self.args['uvm']:
+            return []
+
+        if warnings:
+
+            # prefers Verilator >= v5.042, $UVM_HOME to be set, or warning.
+            version_list = self._VERSION.split('.')
+            if int(version_list[0]) < 5 or \
+               (int(version_list[0]) == 5 and int(version_list[1]) < 42):
+                util.warning(f'Verilator version is {self._VERSION}, --uvm set prefers Verilator',
+                             'version > v5.042')
+
+            if not os.environ.get('UVM_HOME', ''):
+                util.warning('--uvm set, however env (or .env or --env-file) $UVM_HOME is not set')
+
+        uvm_pkg_found = self._verilator_support_uvm_pkg_fpath(add_if_found=add_uvm_pkg_if_found)
+        if warnings and not uvm_pkg_found:
+            util.warning(
+                '--uvm set, however no suitable uvm_pkg.sv is source files,',
+                f'nor in $UVM_HOME/uvm_pkg.sv. $UVM_HOME={os.environ.get("UVM_HOME", "")}'
+            )
+
+        return ['-Wno-fatal', '+define+UVM_NO_DPI']
+
+
     def artifacts_add(self, name: str, typ: str, description: str) -> None:
         '''Override from Command.artifacts_add, so we can catch known file
 

opencos/tools/vivado.py

@@ -272,6 +272,7 @@ class CommandSimVivado(CommandSim, ToolVivado):
             xsim_plusargs_list.append('--testplusarg')
             if x[0] == '+':
                 x = x[1:]
+            x = x.replace('"', '\\\"') # we have to preserve " in the value.
             xsim_plusargs_list.append(f'\"{x}\"')
 
         # execute snapshot

opencos/util.py

@@ -21,6 +21,7 @@ from dotenv import load_dotenv
 from supports_color import supportsColor
 
 from opencos.utils import status_constants
+from opencos.utils.str_helpers import strip_ansi_color
 
 global_exit_allowed = False # pylint: disable=invalid-name
 progname = "UNKNOWN"        # pylint: disable=invalid-name
@@ -383,8 +384,10 @@ def get_argparser() -> argparse.ArgumentParser:
                             'Input .f file to be expanded as eda'
                             ' args/defines/incdirs/files/targets'))
     parser.add_argument('--env-file', default=[], action='append',
-                        help='dotenv file(s) to pass ENV vars, (default: .env, loaded last)'
-                        )
+                        help=(
+                            "dotenv file(s) to pass ENV vars, (default: .env loaded first,"
+                            " subsequent files' vars override .env"
+                        ))
     return parser
 
 
@@ -407,10 +410,10 @@ def get_argparser_short_help(parser: object = None) -> str:
     '''Returns short help for our ArgumentParser'''
     if not parser:
         parser = get_argparser()
-    full_lines = parser.format_help().split('\n')
+    full_lines = strip_ansi_color(parser.format_help()).split('\n')
     lineno = 0
     for lineno, line in enumerate(full_lines):
-        if line.startswith('options:'):
+        if any(line.startswith(x) for x in ('options:', 'optional arguments:')):
             break
     # skip the line that says 'options:', repalce with the progname:
     return f'{parser.prog}:\n' + '\n'.join(full_lines[lineno + 1:])
@@ -432,11 +435,12 @@ def process_token(arg: list) -> bool:
 def load_env_file(env_file: str) -> None:
     '''Handles .env file (from util CLI args --env-file)'''
     if os.path.isfile(env_file):
-        load_dotenv(env_file)
+        load_dotenv(env_file, override=True)
         env_files_loaded.add(os.path.abspath(env_file))
     else:
         warning(f'--env-file {env_file} does not exist and is not loaded.')
 
+
 def patch_args_for_dir(tokens: list, patch_dir: str, caller_info: str) -> list:
     '''Given list of args, attempt to correct for relative dir'''
 
@@ -536,8 +540,10 @@ def process_tokens( # pylint: disable=too-many-branches
     parser.add_argument('--debug-level', type=int, default=0,
                         help='Set debug level messaging (default: 0)')
     parser.add_argument('--env-file', default=[], action='append',
-                        help='dotenv file(s) to pass ENV vars, (default: .env, loaded last)'
-                        )
+                        help=(
+                            "dotenv file(s) to pass ENV vars, (default: .env loaded first,"
+                            " subsequent files' vars override .env"
+                        ))
     parser.add_argument('-f', '--input-file', default=[], action='append',
                         help=(
                             'Input .f file to be expanded as eda args, defines, incdirs,'
@@ -553,7 +559,7 @@ def process_tokens( # pylint: disable=too-many-branches
     debug(f'util.process_tokens: {parsed=} {unparsed=} from: {tokens}')
 
     if os.path.isfile(str(Path('.env'))):
-        parsed.env_file.append('.env')
+        parsed.env_file.insert(0, '.env')
     if parsed.env_file:
         for env_file in parsed.env_file:
             load_env_file(env_file)

opencos/utils/str_helpers.py

@@ -172,7 +172,7 @@ def pretty_list_columns_manual(data: list, num_columns: int = 4, auto_columns: b
                 pretty_list_columns_manual(data=data, num_columns=num_columns-1, auto_columns=True)
             )
             return ret_lines
-        if max_line_len + max_item_len + _spacing < window_cols:
+        if max_line_len + max_item_len + _spacing <= window_cols:
             # add 1 more column if we're guaranteed to have room.
             ret_lines.extend(
                 pretty_list_columns_manual(data=data, num_columns=num_columns+1, auto_columns=True)
@@ -198,3 +198,8 @@ def print_columns_manual(data: list, num_columns: int = 4, auto_columns: bool =
         data=data, num_columns=num_columns, auto_columns=auto_columns
     )
     print('\n'.join(lines))
+
+def strip_ansi_color(text: str) -> str:
+    '''Strip ANSI color characters from str'''
+    ansi_escape = re.compile(r'\x1B(?:[@-Z\\-_]|\[[0-?]*[ -/]*[@-~])')
+    return ansi_escape.sub('', text)

opencos/utils/subprocess_helpers.py

@@ -5,10 +5,18 @@ import shutil
 import subprocess
 import sys
 
-from opencos.util import debug, error, info, progname, global_log
+import psutil
+from opencos.util import debug, error, info, warning, progname, global_log
 
 IS_WINDOWS = sys.platform.startswith('win')
 
+# For non-Windows, we track the background parent PIDs, because some tools (vivado XSim,
+# most Modelsim/Questa variants) tend to spawn children PIDs that don't always respond
+# nicely to a friendly *nix SIGTERM. So we'll remember what our parent PIDs are, and
+# eda.py's (or other CLI opencos script) can use signal to cleanup any remaining
+# parents + children using subprocess_helpers.cleanup_all()
+ALL_PARENT_PIDS = set()
+
 def subprocess_run(
         work_dir: str, command_list: list, fake: bool = False, shell: bool = False
 ) -> int:
@@ -35,10 +43,11 @@ def subprocess_run(
 
     debug(f"subprocess_run: About to call subprocess.run({c}, **{proc_kwargs}")
     proc = subprocess.run(c, check=True, **proc_kwargs)
+    # Note - we do not get PID management for subprocess_run(...)
     return proc.returncode
 
 
-def subprocess_run_background(
+def subprocess_run_background( # pylint: disable=too-many-branches
         work_dir: str, command_list: list, background: bool = True, fake : bool = False,
         shell: bool = False, tee_fpath: str = ''
 ) -> (str, str, int):
@@ -76,6 +85,9 @@ def subprocess_run_background(
 
     debug(f"subprocess_run_background: about to call subprocess.Popen({c}, **{proc_kwargs})")
     proc = subprocess.Popen(c, **proc_kwargs) # pylint: disable=consider-using-with
+    if not background:
+        info(f'PID {proc.pid} for {command_list[0]}')
+    add_running_parent_pid(proc.pid)
 
     stdout = ''
     tee_fpath_f = None
@@ -99,10 +111,61 @@ def subprocess_run_background(
         stdout += line + '\n'
 
     proc.communicate()
+    remove_completed_parent_pid(proc.pid)
+
     rc = proc.returncode
     if tee_fpath_f:
         tee_fpath_f.write(f'INFO: [{progname}] subprocess_run_background: returncode={rc}\n')
         tee_fpath_f.close()
-        info('subprocess_run_background: wrote: ' + os.path.abspath(tee_fpath))
+        if not background:
+            info('subprocess_run_background: wrote: ' + os.path.abspath(tee_fpath))
 
     return stdout, '', rc
+
+
+def add_running_parent_pid(pid: int) -> None:
+    '''Adds pid (if still alive) to ALL_PARENT_PIDS'''
+    try:
+        p = psutil.Process(pid)
+        ALL_PARENT_PIDS.add(p.pid)
+    except psutil.NoSuchProcess:
+        pass
+    except Exception as e:
+        error(f'{pid=} exception {e}')
+
+def remove_completed_parent_pid(pid: int) -> None:
+    '''Removes pid (if no longer alive) from ALL_PARENT_PIDS.'''
+    try:
+        p = psutil.Process(pid)
+        warning(f'PID {p.pid} still running')
+    except psutil.NoSuchProcess:
+        ALL_PARENT_PIDS.remove(pid)
+    except Exception as e:
+        error(f'{pid=} exception {e}')
+
+
+def cleanup_all() -> None:
+    '''Kills everything from ALL_PARENT_PIDS.'''
+    for parent in ALL_PARENT_PIDS:
+        kill_proc_tree(parent)
+
+
+def kill_proc_tree(pid: int, including_parent: bool = True) -> None:
+    '''Kills a process and its entire descendant tree'''
+    try:
+        parent = psutil.Process(pid)
+        children = parent.children(recursive=True)
+        info(f'{pid=} {parent=} {children=}')
+        for child in children:
+            if psutil.Process(child.pid):
+                info(f'parent {pid=} killing {child=}')
+                child.kill()
+        _, still_alive = psutil.wait_procs(children, timeout=5)
+        if still_alive:
+            warning(f'parent {pid=} {still_alive=}')
+        if including_parent:
+            info(f'parent {pid=} killing {parent=}')
+            parent.kill()
+            parent.wait(5)
+    except psutil.NoSuchProcess:
+        pass # Process already terminated

{opencos_eda-0.3.3.dist-info → opencos_eda-0.3.5.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: opencos-eda
-Version: 0.3.3
+Version: 0.3.5
 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
@@ -9,8 +9,8 @@ License-File: LICENSE
 License-File: LICENSE.spdx
 Requires-Dist: mergedeep>=1.3.4
 Requires-Dist: peakrdl>=1.1.0
+Requires-Dist: psutil>=7.0.0
 Requires-Dist: pyyaml>=6.0.2
-Requires-Dist: pytest>=8.3.5
 Requires-Dist: python-dotenv>=1.0.1
 Requires-Dist: schema>=0.7.7
 Requires-Dist: toml>=0.10.2
@@ -18,4 +18,12 @@ Requires-Dist: yamllint>=1.35.1
 Requires-Dist: PySerial>=3.5
 Requires-Dist: cocotb>=2.0
 Requires-Dist: supports_color>=0.2.0
+Provides-Extra: dev
+Requires-Dist: pylint>=3.0.0; extra == "dev"
+Requires-Dist: pytest>=8.3.5; extra == "dev"
+Provides-Extra: docs
+Requires-Dist: mkdocs; extra == "docs"
+Requires-Dist: mkdocs-material; extra == "docs"
+Requires-Dist: mkdocs-wavedrom-plugin; extra == "docs"
+Requires-Dist: mkdocs-plantuml; extra == "docs"
 Dynamic: license-file

{opencos_eda-0.3.3.dist-info → opencos_eda-0.3.5.dist-info}/RECORD

@@ -1,24 +1,24 @@
 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/deps_schema.py,sha256=VUdXuq43mKfM-U4x7DSA28-MH1Xqxre6V7Ttw2DeOqI,16762
-opencos/eda.py,sha256=91E-EsyZS-uRadApP-h2onW6rpvLBnrpJoT_9tRtsS8,23322
-opencos/eda_base.py,sha256=jf4t11UPj39swL41z-EJiGTOnHvRScaQc-SAjpZ5XI4,109651
-opencos/eda_config.py,sha256=z3yQOPGBX7-yKp6BdQYfJ9eOJf-Jctl-mwCDj3vj2BI,12712
-opencos/eda_config_defaults.yml,sha256=Bs9UyXckIpauK_tf27iRkig6hBvsuI-PL7HhgCQpA1k,16168
+opencos/deps_schema.py,sha256=fx1_IJhsDYkUciwwCPTXHP6ftFjTsPVjO4xg12twIjw,17384
+opencos/eda.py,sha256=m_Jq1Iht0I7dSN4ceI4c4QZCkKjW85ewvoLfCaOo7-s,23315
+opencos/eda_base.py,sha256=PK89dJMmTHAqvfrxkVXkYZlvyk4er2AVDJ5FMVHry6A,109724
+opencos/eda_config.py,sha256=afimZEfvVitWS-k3IsR7fwzIz5dHWKfiJp5qHzzBF6c,14110
+opencos/eda_config_defaults.yml,sha256=2IX9i7VCwgXHKzsjcEGdLJ6SqxiQqXbVIupYNhjHIes,16263
 opencos/eda_config_max_verilator_waivers.yml,sha256=lTAU4IOEbUWVlPzuer1YYhIyxpPINeA4EJqcRIT-Ymk,840
 opencos/eda_config_reduced.yml,sha256=cQ9jY4J7EvAbeHTiP6bvpDSVJAYiitjLZPSxxLKIEbk,1440
 opencos/eda_deps_bash_completion.bash,sha256=jMkQKY82HBgOnQeMdA1hMrXguRFtB52SMBxUemKovL4,1958
 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=_YgobDLEWW6Fzdr976LxaCDZ4DKRyuMs5CrYQHaTPrU,2558
+opencos/eda_tool_helper.py,sha256=Xm6nr9XweCjueWFLkrH5U3nK96JGeeh86f2GCPhwY-o,3108
 opencos/export_helper.py,sha256=5BnrkhiieJBgYKAryhXD7HSGtrgvXQpZ8B5ltdrhbRY,22649
 opencos/export_json_convert.py,sha256=tSIMbLFtc_Fo66EhFovMii1v_qJYyFZJrPNnoPdW7L0,4182
 opencos/files.py,sha256=AQOnsrvoc0r76LiFrkoMbwOGdUO1FpBiFY_jyyI_ve8,1566
 opencos/names.py,sha256=Y2aJ5wgpbNIJ-_P5xUXnHMv_h-zMOX2Rt6iLuduqC1Q,1213
 opencos/peakrdl_cleanup.py,sha256=vHNGtalTrIVP335PhRjPt9RhoccgpK1HJAi-E4M8Kc8,736
 opencos/seed.py,sha256=IL9Yg-r9SLSRseMVWaEHmuw2_DNi_eyut11EafoNTsU,942
-opencos/util.py,sha256=tgDOvkIGCPfuuJmP1nMsxsxaxmhlH9DOUsJ3SVjtXy4,42123
+opencos/util.py,sha256=PGkc0JYKsx2sKiuoCmL3rLdEFyXeM6xY3r42Q-8KUJw,42454
 opencos/commands/__init__.py,sha256=oOOQmn5_jHAMSOfA3swJJ7mdoyHsJA0lJwKPTudlTns,1125
 opencos/commands/build.py,sha256=mvJYxk5J15k0Cr8R7oIdIIdsEtWV3gE-LnPweVwtSDo,1487
 opencos/commands/deps_help.py,sha256=WDrU7H9sypzDAxe_CHqhW5B_scbQMzBEdf-v-Jcfd5Q,10682
@@ -38,20 +38,20 @@ opencos/commands/targets.py,sha256=_jRNhm2Fqj0fmMvTw6Ba39DCsRHf_r_uZCy_R064kpA,1
 opencos/commands/upload.py,sha256=oyImgcEFGxDkdeY9EYyX2R6fTOmN-lTs-HYxAZqXUUo,871
 opencos/commands/waves.py,sha256=nrp3ALwfJujZns44tgCgia_dEedQyKe0T3fuws8h39U,7697
 opencos/deps/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-opencos/deps/defaults.py,sha256=NXh3V4oInrBVlDw64B2OCI77wzdn1NtaD64srhBnmZU,1486
+opencos/deps/defaults.py,sha256=Z6mIVJEV0zQ9rC-HkQFMBFAkixjqKS1TATPSc27wOeA,1502
 opencos/deps/deps_commands.py,sha256=q4JfSfzRO2nM2zdNT4enCy33FokEytZYQJn1HJ6osJk,16606
 opencos/deps/deps_file.py,sha256=YQ5ftYvppRTqUto22r-XDH6-bcMO7cA-WiJ7QzPjljY,17103
-opencos/deps/deps_processor.py,sha256=DBaMUEnpoIL4xaNPs2f2AFGcWLST5pP_Qgup9r-8D7M,41403
+opencos/deps/deps_processor.py,sha256=5eGE__Isssm6JDnVxI2hM1_ljS968K-24eUWGDEr_vs,42303
 opencos/hw/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 opencos/hw/oc_cli.py,sha256=U1JGlshLZhtd0LgndZFBZVltAj_HemdhbjO_Zo8ZuVM,132252
 opencos/hw/pcie.py,sha256=VUJljaZJYgScAAx5yn7F6GoA8K9eTcw24otYZbkMpYs,3035
 opencos/tests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 opencos/tests/custom_config.yml,sha256=TRoVM9ZFKPOA_8JmlpzaMhnGO1txmaD14N_8P1oqzew,257
-opencos/tests/helpers.py,sha256=0KWHUQNXeyQ40F2sdW_R2r0P8qZpV88ndTZmoix3NcU,12474
+opencos/tests/helpers.py,sha256=77ljULYa-DhnC9VgT_R1wic_GdgeqsAJdkOXDt1KjDo,13839
 opencos/tests/test_build.py,sha256=FQAxOpLVQShAHD_L5rqJctPeSAoqoOCNFI0RXflLuY0,387
 opencos/tests/test_deps_helpers.py,sha256=uQZxleh6aKO-mZQhagHh5xLIBbpQ8dav7-5D0eemq_g,8164
 opencos/tests/test_deps_schema.py,sha256=T3P9KjaMyKsk8b7snNVvNSsom2hIJcg6Z9apYiXoH9Y,941
-opencos/tests/test_eda.py,sha256=PhAFCqoZxUhjuSvNeHpTHdwt8UhHjRdVppesgcWBX64,37407
+opencos/tests/test_eda.py,sha256=8X6kej5-uPv2l0xeWOhitCE640XZtiGLwzCktra_Ehg,37784
 opencos/tests/test_eda_elab.py,sha256=AjU4WMYtFoHpNe1Z4yWWpxDKy4V_hAjL5rl3jqphZrk,3179
 opencos/tests/test_eda_synth.py,sha256=BtBrNVJ9C-LJt3K0wNNS5ukEVrET16AbRXl2IzxudJ8,5744
 opencos/tests/test_oc_cli.py,sha256=w-F-LjSSWVql3D2WG8tcV4_C52i-hL_2WT3oDpKQn9s,734
@@ -68,30 +68,30 @@ opencos/tools/cocotb.py,sha256=hlBR6M4k_amOOWa7cZDuw9fTGJtJha1jSpGgyJN8Iis,17734
 opencos/tools/invio.py,sha256=S2ChWr8xMZHSOOhX2hGKQhMmtQY2potVQjc-lsMg73o,3299
 opencos/tools/invio_helpers.py,sha256=86WOGmSf4m_lEqBtK3DLjWqI0jnqAWzBEBRYfBUGiSY,8804
 opencos/tools/invio_yosys.py,sha256=CszGeTdE1ilnMmWPLW77BrtobbsGb1CKXqot0hGimFU,5996
-opencos/tools/iverilog.py,sha256=8dK4z8ktbNYS9cW5QQPm586WoE-pSmOAVJfXajw-Sbg,6420
+opencos/tools/iverilog.py,sha256=3IQIZVDioChKEJIVVJki-q7NlvBg0k3n61oM7ltG9c8,6551
 opencos/tools/modelsim_ase.py,sha256=Jt-6N3BZZyu25fT1ehFQLRUTVvrcCo4e2Gl7UtsQcuk,17834
 opencos/tools/quartus.py,sha256=_TfmPSYpbhmDLw7Dur-rRP0iGwv9hhQ6E5G-XLiYPEM,30486
 opencos/tools/questa.py,sha256=nHImM0Wydcf4YHGibHmQAwmqKHmMxKZUqY-E-vz1o8M,9827
 opencos/tools/questa_fse.py,sha256=hytkeuGg4qImj7rStV1i2kxkz9B0KFheGtcadxmpYAo,2550
-opencos/tools/riviera.py,sha256=FAumXIt9u4JXwR5BHe-0APX3K0Lg3RT2lWQ-GNGL3vA,13016
+opencos/tools/riviera.py,sha256=_-vsN7TD6WdW4PVsSJaEhJls3RgXGRowhY_QV1hdFqE,13678
 opencos/tools/slang.py,sha256=S_vODMT5Zl5vi9FMGHfahp5B0oMNyDIRJXtRAldVCwY,8625
 opencos/tools/slang_yosys.py,sha256=MKh13eAmLJDkynZiezyT8E2gI4CKnXipzgFCZppaMXo,10230
 opencos/tools/surelog.py,sha256=S2RAZJyjdISm_tRvAhXbla7_z_tJfotZih5f9Y3m7DQ,5648
 opencos/tools/tabbycad_yosys.py,sha256=2LePPgYXBVdsy7YcffPIWN-I0B7queLQ_f_pme2SCGw,7803
-opencos/tools/verilator.py,sha256=yh3DZXhGxt9RyJVtbn2RoqIiwxZW6_sTiXs8xGf3iNg,21065
-opencos/tools/vivado.py,sha256=GQdPd1mp02it_uyhMqpFfJgh0AKIMn-20BhHNEDp5HY,41398
+opencos/tools/verilator.py,sha256=42SLAuqP2TmAE8pPgcLZBcXaALlvgc7z7v48FFvnCyo,24654
+opencos/tools/vivado.py,sha256=I9yVFK5wnFl1268l8WCk5Xh8wZBlSCODVTg4qStVF8c,41475
 opencos/tools/yosys.py,sha256=t3Au8gdwTepIKCPCXHpRXEdtmORQK8xqNvF6baIa7DM,28260
 opencos/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 opencos/utils/markup_helpers.py,sha256=A8Ev5UJ4EVKjdcF2g85SQbjdPZR4jGpNqCLaBy_4v7Q,4569
 opencos/utils/status_constants.py,sha256=na6YsqlsCwIYzTXWE14dPadUYRNTrOS6YTXHCer2NbA,635
-opencos/utils/str_helpers.py,sha256=726ScK5-v7QkBi-zqESKZLsOl2_ya4vVJ5ZhxJqmBFo,6440
-opencos/utils/subprocess_helpers.py,sha256=xemAGPey6M0sWY_FElvr-Z0phCfdjaC-znP8FKihPaE,3535
+opencos/utils/str_helpers.py,sha256=-hR7MAQLOoY2lIfqtxNtnzb3apeJPkh8shEGFzkwQfs,6637
+opencos/utils/subprocess_helpers.py,sha256=idWc-sy_XJaxIl06tt_QjThYWoLL_Wmy7aLCpEo9y3c,5829
 opencos/utils/vscode_helper.py,sha256=9nHyMUIL-gzfW-qLH06sgaCnVK-YTOtu6pusitNNhL8,1363
 opencos/utils/vsim_helper.py,sha256=1johPOGbjbMgnCDSTpgsQcSuAquiqq1Y2MBxS6WY6b4,1552
-opencos_eda-0.3.3.dist-info/licenses/LICENSE,sha256=HyVuytGSiAUQ6ErWBHTqt1iSGHhLmlC8fO7jTCuR8dU,16725
-opencos_eda-0.3.3.dist-info/licenses/LICENSE.spdx,sha256=8gn1610RMP6eFgT3Hm6q9VKXt0RvdTItL_oxMo72jII,189
-opencos_eda-0.3.3.dist-info/METADATA,sha256=MGcmalurglc-9-KPz1YHp-KOVgLwqOZRRu3cOz6asI0,703
-opencos_eda-0.3.3.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-opencos_eda-0.3.3.dist-info/entry_points.txt,sha256=6n1T5NwVYDhN5l1h5zmyT197G4pE0SySDreB0QJzJR0,218
-opencos_eda-0.3.3.dist-info/top_level.txt,sha256=J4JDP-LpRyJqPNeh9bSjx6yrLz2Mk0h6un6YLmtqql4,8
-opencos_eda-0.3.3.dist-info/RECORD,,
+opencos_eda-0.3.5.dist-info/licenses/LICENSE,sha256=HyVuytGSiAUQ6ErWBHTqt1iSGHhLmlC8fO7jTCuR8dU,16725
+opencos_eda-0.3.5.dist-info/licenses/LICENSE.spdx,sha256=8gn1610RMP6eFgT3Hm6q9VKXt0RvdTItL_oxMo72jII,189
+opencos_eda-0.3.5.dist-info/METADATA,sha256=1H76gr0Vw6Cz16Kf3sbAQR2pMjBzxGLAHbdm2oSNEvI,1024
+opencos_eda-0.3.5.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+opencos_eda-0.3.5.dist-info/entry_points.txt,sha256=6n1T5NwVYDhN5l1h5zmyT197G4pE0SySDreB0QJzJR0,218
+opencos_eda-0.3.5.dist-info/top_level.txt,sha256=J4JDP-LpRyJqPNeh9bSjx6yrLz2Mk0h6un6YLmtqql4,8
+opencos_eda-0.3.5.dist-info/RECORD,,