opencos-eda 0.2.50__py3-none-any.whl → 0.2.51__py3-none-any.whl

opencos/commands/lec.py

@@ -69,16 +69,13 @@ class CommandLec(CommandDesign):
         if self.status_any_error():
             return unparsed
 
-        # add defines for this job type
-        if not self.args['top']:
-            self.args['top'] = 'eda.lec'
-
         # we require there to be two --designs set.
         if not self.args['designs'] and len(self.args['designs']) != 2:
             self.error('Requires two designs via --designs=<target1> --designs=<target2>',
                        f'designs={self.args["designs"]}')
             return []
 
+
         # Before we do anything else, make sure the two designs actually exist.
         for design in self.args['designs']:
             # maybe it's a file?
@@ -89,6 +86,12 @@ class CommandLec(CommandDesign):
             else:
                 self.error(f'--designs={design}, value is not a file or target')
 
+        if not self.args['top']:
+            # Correct the 'top' name so it's eda.<target1>.<target2>.lec (shortnames)
+            _, short_target1 = os.path.split(self.args['designs'][0])
+            _, short_target2 = os.path.split(self.args['designs'][1])
+            self.args['top'] = f'eda.{short_target1}.{short_target2}'
+
         # create our work dir
         self.create_work_dir()
         self.run_dep_commands()

opencos/commands/shell.py

@@ -16,6 +16,8 @@ import os
 from opencos import util, export_helper
 from opencos.eda_base import CommandDesign
 
+from opencos.utils import status_constants
+
 
 class CommandShell(CommandDesign):
     '''Base class command handler for: eda sim ...'''
@@ -181,7 +183,6 @@ class CommandShell(CommandDesign):
             _must_strings.append(self.args['pass-pattern'])
 
         if len(_bad_strings) > 0 or len(_must_strings) > 0:
-            hit_bad_string = False
             hit_must_string_dict = dict.fromkeys(_must_strings)
             fname = os.path.join(self.args['work-dir'], filename)
             with open(fname, 'r', encoding='utf-8') as f:
@@ -191,12 +192,14 @@ class CommandShell(CommandDesign):
                             if k in line:
                                 hit_must_string_dict[k] = True
                     if any(bad_str in line for bad_str in _bad_strings):
-                        hit_bad_string = True
-                        self.error(f"log {fname}:{lineno} contains one of {_bad_strings=}")
+                        self.error(
+                            f"log {fname}:{lineno} contains one of {_bad_strings=}",
+                            error_code=status_constants.EDA_SHELL_LOG_HAS_BAD_STRING
+                        )
 
-            if hit_bad_string:
-                self.status += 1
             if any(x is None for x in hit_must_string_dict.values()):
-                self.error(f"Didn't get all passing patterns in log {fname}: {_must_strings=}",
-                           f" {hit_must_string_dict=}")
-                self.status += 1
+                self.error(
+                    f"Didn't get all passing patterns in log {fname}: {_must_strings=}",
+                    f" {hit_must_string_dict=}",
+                    error_code=status_constants.EDA_SHELL_LOG_MISSING_MUST_STRING
+                )

opencos/commands/sim.py

@@ -15,6 +15,7 @@ import os
 
 from opencos import util, export_helper
 from opencos.eda_base import CommandDesign, Tool
+from opencos.utils import status_constants
 
 class CommandSim(CommandDesign):
     '''Base class command handler for: eda sim ...'''
@@ -170,11 +171,14 @@ class CommandSim(CommandDesign):
             if log_filename:
                 log_fname = log_filename
 
-            self.exec(work_dir=self.args['work-dir'], command_list=clist, tee_fpath=tee_fpath)
+            _, stdout, _ = self.exec(
+                work_dir=self.args['work-dir'], command_list=clist, tee_fpath=tee_fpath
+            )
 
             if check_logs and log_fname:
                 self.check_logs_for_errors(
-                    filename=log_fname, bad_strings=bad_strings, must_strings=must_strings,
+                    filename='', file_contents_str=stdout,
+                    bad_strings=bad_strings, must_strings=must_strings,
                     use_bad_strings=use_bad_strings, use_must_strings=use_must_strings
                 )
             if log_fname:
@@ -273,8 +277,8 @@ class CommandSim(CommandDesign):
         '''
         return
 
-    def check_logs_for_errors( # pylint: disable=dangerous-default-value
-            self, filename: str,
+    def check_logs_for_errors( # pylint: disable=dangerous-default-value,too-many-locals,too-many-branches
+            self, filename: str = '', file_contents_str: str = '',
             bad_strings: list = [], must_strings: list = [],
             use_bad_strings: bool = True, use_must_strings: bool = True
     ) -> None:
@@ -294,26 +298,38 @@ class CommandSim(CommandDesign):
         if self.args['pass-pattern'] != "":
             _must_strings.append(self.args['pass-pattern'])
 
-        if len(_bad_strings) > 0 or len(_must_strings) > 0:
-            hit_bad_string = False
-            hit_must_string_dict = dict.fromkeys(_must_strings)
+        if len(_bad_strings) == 0 and len(_must_strings) == 0:
+            return
+
+        hit_must_string_dict = dict.fromkeys(_must_strings)
+
+        lines = []
+        fname = ''
+        if file_contents_str:
+            lines = file_contents_str.split('\n')
+        elif filename:
             fname = os.path.join(self.args['work-dir'], filename)
             with open(fname, 'r', encoding='utf-8') as f:
-                for lineno, line in enumerate(f):
-                    if any(must_str in line for must_str in _must_strings):
-                        for k, _ in hit_must_string_dict.items():
-                            if k in line:
-                                hit_must_string_dict[k] = True
-                    if any(bad_str in line for bad_str in _bad_strings):
-                        hit_bad_string = True
-                        self.error(f"log {fname}:{lineno} contains one of {_bad_strings=}")
-
-            if hit_bad_string:
-                self.status += 1
-            if any(x is None for x in hit_must_string_dict.values()):
-                self.error(f"Didn't get all passing patterns in log {fname}: {_must_strings=}",
-                           f" {hit_must_string_dict=}")
-                self.status += 1
+                lines = f.readl.splitlines()
+
+        if lines:
+            for lineno, line in enumerate(lines):
+                if any(must_str in line for must_str in _must_strings):
+                    for k, _ in hit_must_string_dict.items():
+                        if k in line:
+                            hit_must_string_dict[k] = True
+                if any(bad_str in line for bad_str in _bad_strings):
+                    self.error(
+                        f"log {fname}:{lineno} contains one of {_bad_strings=}",
+                        error_code=status_constants.EDA_SIM_LOG_HAS_BAD_STRING
+                    )
+
+        if any(x is None for x in hit_must_string_dict.values()):
+            self.error(
+                f"Didn't get all passing patterns in log {fname}: {_must_strings=}",
+                f" {hit_must_string_dict=}",
+                error_code=status_constants.EDA_SIM_LOG_MISSING_MUST_STRING
+            )
 
     # Methods that derived classes must override:
 

opencos/deps/deps_file.py

@@ -10,15 +10,20 @@ from pathlib import Path
 
 import toml
 
+from opencos import util
 from opencos.deps.defaults import DEPS_FILE_EXTS, ROOT_TABLE_KEYS_NOT_TARGETS
 from opencos.util import debug, error
-from opencos.utils.markup_helpers import yaml_safe_load, toml_load_only_root_line_numbers
+from opencos.utils.markup_helpers import yaml_safe_load, toml_load_only_root_line_numbers, \
+    markup_writer, markup_dumper
 from opencos.utils.str_helpers import fnmatch_or_re, dep_str2list
 from opencos.utils.subprocess_helpers import subprocess_run_background
+from opencos.utils.status_constants import EDA_DEPS_FILE_NOT_FOUND, EDA_DEPS_TARGET_NOT_FOUND
 
 
 def deps_data_get_all_targets(data: dict) -> list:
     '''Given extracted DEPS data (dict) get all the root level keys that aren't defaults'''
+    if data is None:
+        return []
     return [x for x in data.keys() if x not in ROOT_TABLE_KEYS_NOT_TARGETS]
 
 
@@ -166,32 +171,43 @@ def deps_target_get_deps_list(
     ret = []
     for dep in deps:
         if isinstance(dep, str):
-            if dep.startswith('#') or dep == '':
+            if not dep or dep.startswith('#'):
                 continue
         ret.append(dep)
     return ret
 
 
 def deps_list_target_sanitize(
-        entry, default_key: str = 'deps', target_node: str = '', deps_file: str = ''
+        entry, default_key: str = 'deps', target_node: str = '', deps_file: str = '',
+        entry_fix_deps_key: bool = True
 ) -> dict:
     '''Returns a sanitized DEPS markup table entry (dict --> dict)
 
     Since we support target entries that can be dict, list, or str(), sanitize
     them so they are a dict, with a key named 'deps' that has a list of deps.
     '''
+    ret = None
     if isinstance(entry, dict):
-        return entry
+        ret = entry
 
     if isinstance(entry, str):
         mylist = dep_str2list(entry) # convert str to list
-        return {default_key: mylist}
+        ret = {default_key: mylist}
 
     if isinstance(entry, list):
         # it's already a list
-        return {default_key: entry}
+        ret = {default_key: entry}
+
+    if ret is not None:
+        if entry_fix_deps_key and 'deps' in ret:
+            ret['deps'] = deps_target_get_deps_list(
+                entry=ret, default_key='deps', deps_file=deps_file,
+                entry_must_have_default_key=True
+            )
+    else:
+        assert False, f"Can't convert to list {entry=} {default_key=} {target_node=} {deps_file=}"
 
-    assert False, f"Can't convert to list {entry=} {default_key=} {target_node=} {deps_file=}"
+    return ret
 
 
 class DepsFile:
@@ -230,7 +246,10 @@ class DepsFile:
             if deps_path and os.path.exists(deps_path):
                 self.rel_deps_file = os.path.join(os.path.relpath(deps_path), deps_leaf)
 
-        self.error = command_design_ref.error # method.
+        self.error = getattr(command_design_ref, 'error', None)
+        if not self.error:
+            self.error = util.error
+
 
     def found(self) -> bool:
         '''Returns true if this DEPS file exists and extracted non-empty data'''
@@ -270,15 +289,18 @@ class DepsFile:
                 if '.' in target_node:
                     # Likely a filename (target_node does not include path)
                     self.error(f'Trying to resolve command-line target={t_full} (file?):',
-                               f'File={t_node} not found in directory={t_path}')
+                               f'File={t_node} not found in directory={t_path}',
+                               error_code=EDA_DEPS_FILE_NOT_FOUND)
                 elif not self.rel_deps_file:
                     # target, but there's no DEPS file
                     self.error(f'Trying to resolve command-line target={t_full}:',
-                               f'but path {t_path} has no DEPS markup file (DEPS.yml)')
+                               f'but path {t_path} has no DEPS markup file (DEPS.yml)',
+                               error_code=EDA_DEPS_FILE_NOT_FOUND)
                 else:
                     self.error(f'Trying to resolve command-line target={t_full}:',
                                f'was not found in deps_file={self.rel_deps_file},',
-                               f'possible targets in deps file = {list(self.data.keys())}')
+                               f'possible targets in deps file = {list(self.data.keys())}',
+                               error_code=EDA_DEPS_TARGET_NOT_FOUND)
             else:
                 # If we have caller_info, then this was a recursive call from another
                 # DEPS file. It should already have the useful error messaging:
@@ -287,16 +309,19 @@ class DepsFile:
                     # Likely a filename (target_node does not include path)
                     self.error(f'Trying to resolve target={t_full} (file?):',
                                f'called from {caller_info},',
-                               f'File={t_node} not found in directory={t_path}')
+                               f'File={t_node} not found in directory={t_path}',
+                               error_code=EDA_DEPS_FILE_NOT_FOUND)
                 elif not self.rel_deps_file:
                     # target, but there's no DEPS file
                     self.error(f'Trying to resolve target={t_full}:',
                                f'called from {caller_info},',
-                               f'but {t_path} has no DEPS markup file (DEPS.yml)')
+                               f'but {t_path} has no DEPS markup file (DEPS.yml)',
+                               error_code=EDA_DEPS_FILE_NOT_FOUND)
                 else:
                     self.error(f'Trying to resolve target={t_full}:',
                                f'called from {caller_info},',
-                               f'Target not found in deps_file={self.rel_deps_file}')
+                               f'Target not found in deps_file={self.rel_deps_file}',
+                               error_code=EDA_DEPS_TARGET_NOT_FOUND)
         else:
             debug(f'Found {target_node=} in deps_file={self.rel_deps_file}')
             found_target = True
@@ -324,3 +349,31 @@ class DepsFile:
         entry.update(entry_sanitized)
 
         return entry
+
+    def get_all_targets(self) -> list:
+        '''Returns list of all targets in this obj, skipping keys like DEFAULTS and METADATA'''
+        return deps_data_get_all_targets(self.data)
+
+    def get_sanitized_data(self) -> dict:
+        '''Returns a sanitized dict of self.data, resolves DEFAULTS, METADATA, and implicit
+
+        space-separated-str, lists for 'deps' in a target entry
+        '''
+        new_data = {}
+        targets = self.get_all_targets()
+        for target in targets:
+            new_data[target] = self.get_entry(target)
+        return new_data
+
+    def write_sanitized_markup(self, filepath: str) -> None:
+        '''Writes the sanitized dict of self.data as JSON/YAML (filepath extension)'''
+        markup_writer(data=self.get_sanitized_data(), filepath=filepath)
+
+    def str_sanitized_markup(self, as_yaml: bool = False) -> str:
+        '''Returns str sanitized YAML or JSON str of self.data'''
+        return markup_dumper(self.get_sanitized_data(), as_yaml=as_yaml)
+
+
+    def print_sanitized_markup(self, as_yaml: bool = False) -> None:
+        '''Prints sanitized JSON str of self.data to STDOUT'''
+        print(self.str_sanitized_markup(as_yaml=as_yaml))

opencos/eda.py

@@ -16,9 +16,12 @@ import argparse
 import shlex
 import importlib.util
 
+from pathlib import Path
+
 import opencos
 from opencos import util, eda_config, eda_base
 from opencos.eda_base import Tool, which_tool
+from opencos.utils import vsim_helper
 
 # Configure util:
 util.progname = "EDA"
@@ -151,6 +154,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
     )
@@ -192,16 +196,23 @@ def auto_tool_setup( # pylint: disable=too-many-locals,too-many-branches,too-man
         has_all_exe = True
         has_all_in_exe_path = True
         for exe in exe_list:
-            assert exe != '', f'{tool=} {value=} value missing "exe" {exe=}'
+            assert exe != '', f'{name=} {value=} value missing "exe" {exe=}'
             p = shutil.which(exe)
             if not p:
                 has_all_exe = False
                 util.debug(f"... No, missing exe {exe}")
             for req in value.get('requires_in_exe_path', []):
-                if p and req and str(req).lower() not in str(p).lower():
+                if p and req and str(Path(req)) not in str(Path(p)):
                     has_all_in_exe_path = False
                     util.debug(f"... No, missing path requirement {req}")
 
+        has_vsim_helper = True
+        if value.get('requires_vsim_helper', False):
+            # This tool name must be in opencos.utils.vsim_helper.TOOL_IS[name].
+            # Special case for vsim being used by a lot of tools.
+            vsim_helper.init() # only runs checks once internally
+            has_vsim_helper = vsim_helper.TOOL_IS.get(name, False)
+
         if has_all_exe:
             requires_cmd_list = value.get('requires_cmd', [])
             for cmd in requires_cmd_list:
@@ -219,7 +230,8 @@ def auto_tool_setup( # pylint: disable=too-many-locals,too-many-branches,too-man
                     util.debug(f"... No, exception {e} running {cmd_list}")
 
 
-        if all([has_all_py, has_all_env, has_all_exe, has_all_in_exe_path]):
+        if all([has_all_py, has_all_env, has_all_exe, has_all_in_exe_path,
+                has_vsim_helper]):
             exe = exe_list[0]
             p = shutil.which(exe)
             config['auto_tools_found'][name] = exe # populate key-value pairs w/ first exe in list

opencos/eda_base.py

@@ -28,6 +28,7 @@ from opencos.util import Colors
 from opencos.utils.str_helpers import sprint_time, strip_outer_quotes, string_or_space, \
     indent_wrap_long_text
 from opencos.utils.subprocess_helpers import subprocess_run_background
+from opencos.utils import status_constants
 
 from opencos.deps.deps_file import DepsFile, deps_data_get_all_targets
 from opencos.deps.deps_processor import DepsProcessor
@@ -274,7 +275,7 @@ class Command:
                     file=self.errors_log_f
                 )
 
-        self.status = util.error(*args, **kwargs)
+        self.status = util.error(*args, **kwargs) # error_code passed and returned via kwargs
 
     def status_any_error(self, report=True) -> bool:
         '''Used by derived classes process_tokens() to know an error was reached
@@ -416,10 +417,16 @@ class Command:
             shell=shell
         )
 
-        if return_code:
-            self.status += return_code
+        if return_code > 0:
+            if return_code == 1:
+                self.status = status_constants.EDA_EXEC_NONZERO_RETURN_CODE1
+            if return_code == 255:
+                self.status = status_constants.EDA_EXEC_NONZERO_RETURN_CODE255
+            else:
+                self.status = status_constants.EDA_EXEC_NONZERO_RETURN_CODE2
             if stop_on_error:
-                self.error(f"exec: returned with error (return code: {return_code})")
+                self.error(f"exec: returned with error (return code: {return_code})",
+                           error_code=self.status)
             else:
                 util.debug(f"exec: returned with error (return code: {return_code})")
         else:
@@ -437,7 +444,8 @@ class Command:
         # Do some minimal type handling, preserving the type(self.args[key])
         if key not in self.args:
             self.error(f'set_arg, {key=} not in self.args {value=}',
-                       f'({self.command_name=}, {self.__class__.__name__=})')
+                       f'({self.command_name=}, {self.__class__.__name__=})',
+                       error_code=status_constants.EDA_COMMAND_OR_ARGS_ERROR)
 
         cur_value = self.args[key]
 
@@ -568,7 +576,8 @@ class Command:
             parsed, unparsed = parser.parse_known_args(tokens + [''])
             unparsed = list(filter(None, unparsed))
         except argparse.ArgumentError:
-            self.error(f'problem {self.command_name=} attempting to parse_known_args for {tokens=}')
+            self.error(f'problem {self.command_name=} attempting to parse_known_args for {tokens=}',
+                       error_code=status_constants.EDA_COMMAND_OR_ARGS_ERROR)
 
         parsed_as_dict = vars(parsed)
 
@@ -630,7 +639,8 @@ class Command:
         _, unparsed = self.run_argparser_on_list(tokens)
         if process_all and len(unparsed) > 0:
             self.error(f"Didn't understand argument: '{unparsed=}' in",
-                       f" {self.command_name=} context, {pwd=}")
+                       f" {self.command_name=} context, {pwd=}",
+                       error_code=status_constants.EDA_COMMAND_OR_ARGS_ERROR)
 
         return unparsed
 
@@ -650,7 +660,8 @@ class Command:
 
         if not ret and error_if_no_command:
             self.error(f"Looking for a valid eda {self.command_name} <command>",
-                       f"but didn't find one in {tokens=}")
+                       f"but didn't find one in {tokens=}",
+                       error_code=status_constants.EDA_COMMAND_OR_ARGS_ERROR)
         return ret
 
 
@@ -692,7 +703,8 @@ class Command:
         process_tokens(..) is the starting entrypoint from eda.py'''
         self.write_eda_config_and_args()
         self.error(f"No tool bound to command '{self.command_name}', you",
-                   " probably need to setup tool, or use '--tool <name>'")
+                   " probably need to setup tool, or use '--tool <name>'",
+                   error_code=status_constants.EDA_CONFIG_ERROR)
 
     def command_safe_set_tool_defines(self) -> None:
         '''Safe wrapper for calling self.set_tool_defines() in case a Tool parent class is
@@ -1006,7 +1018,8 @@ class CommandDesign(Command): # pylint: disable=too-many-instance-attributes
                 self.defines[k] = v
                 util.debug(f"Defined {k}={v}")
                 return None
-            self.error(f"Didn't understand +define+: '{plusarg}'")
+            self.error(f"Didn't understand +define+: '{plusarg}'",
+                       error_code=status_constants.EDA_COMMAND_OR_ARGS_ERROR)
             return None
 
         if plusarg.startswith('+incdir+'):
@@ -1018,7 +1031,8 @@ class CommandDesign(Command): # pylint: disable=too-many-instance-attributes
                     self.incdirs.append(os.path.abspath(incdir))
                     util.debug(f"Added include dir '{os.path.abspath(incdir)}'")
                 return None
-            self.error(f"Didn't understand +incdir+: '{plusarg}'")
+            self.error(f"Didn't understand +incdir+: '{plusarg}'",
+                       error_code=status_constants.EDA_COMMAND_OR_ARGS_ERROR)
             return None
 
         # remaining plusargs as stored in self.args['unprocessed-plusargs'] (list)
@@ -1032,7 +1046,8 @@ class CommandDesign(Command): # pylint: disable=too-many-instance-attributes
                 # derived classes have the option to handle it
                 return plusarg
 
-        self.error(f"Didn't understand +plusarg: '{plusarg}'")
+        self.error(f"Didn't understand +plusarg: '{plusarg}'",
+                   error_code=status_constants.EDA_COMMAND_OR_ARGS_ERROR)
         return None
 
 
@@ -1224,7 +1239,8 @@ class CommandDesign(Command): # pylint: disable=too-many-instance-attributes
                     found_target = True
                     break # move on to the next target
             if not found_target: # if STILL not found_this_target...
-                self.error(f"Unable to resolve {target=}")
+                self.error(f"Unable to resolve {target=}",
+                           error_code=status_constants.EDA_DEPS_TARGET_NOT_FOUND)
 
         # if we've found any target since being called, it means we found the one we were called for
         return found_target
@@ -1354,7 +1370,8 @@ class CommandDesign(Command): # pylint: disable=too-many-instance-attributes
             if len(unparsed) == 0:
                 # If unparsed is still empty, then error.
                 self.error(f"For command '{self.command_name}' no files or targets were",
-                           f"presented at the command line: {orig_tokens}")
+                           f"presented at the command line: {orig_tokens}",
+                           error_code=status_constants.EDA_COMMAND_OR_ARGS_ERROR)
 
         # by this point hopefully this is a target ... is it a simple filename?
         remove_list = []
@@ -1408,7 +1425,8 @@ class CommandDesign(Command): # pylint: disable=too-many-instance-attributes
 
         # we were unable to figure out what this command line token is for...
         if process_all and len(unparsed) > 0:
-            self.error(f"Didn't understand command remaining tokens {unparsed=} in CommandDesign")
+            self.error(f"Didn't understand command remaining tokens {unparsed=} in CommandDesign",
+                       error_code=status_constants.EDA_COMMAND_OR_ARGS_ERROR)
 
         # handle a missing self.args['top'] with last filepath or last target:
         if not self.args.get('top', ''):
@@ -1441,7 +1459,8 @@ class CommandDesign(Command): # pylint: disable=too-many-instance-attributes
 
         if self.error_on_missing_top and not self.args.get('top', ''):
             self.error("Did not get a --top or DEPS top, required to run command",
-                       f"'{self.command_name}' for tool={self.args.get('tool', None)}")
+                       f"'{self.command_name}' for tool={self.args.get('tool', None)}",
+                       error_code=status_constants.EDA_COMMAND_MISSING_TOP)
 
         return unparsed
 
@@ -1943,7 +1962,8 @@ class CommandParallel(Command):
         bad_remaining_args = [x for x in single_cmd_unparsed if x.startswith('-')]
         if bad_remaining_args:
             self.error(f'for {self.command_name} {command=} the following args are unknown',
-                       f'{bad_remaining_args}')
+                       f'{bad_remaining_args}',
+                       error_code=status_constants.EDA_COMMAND_OR_ARGS_ERROR)
 
         # Remove unparsed args starting with '+', since those are commonly sent downstream to
         # single job (example, CommandSim plusargs).
@@ -1985,7 +2005,8 @@ class CommandParallel(Command):
 
             key = get_job_arg(job_dict, arg_name='job-name')
             if not key:
-                self.error(f'{job_dict=} needs to have a --job-name= arg attached')
+                self.error(f'{job_dict=} needs to have a --job-name= arg attached',
+                           error_code=status_constants.EDA_COMMAND_OR_ARGS_ERROR)
             if key not in job_names_count_dict:
                 job_names_count_dict[key] = 1
             else:

opencos/eda_config.py

@@ -46,6 +46,7 @@ class Defaults:
     supported_config_auto_tools_order_keys = set([
         'exe', 'handlers',
         'requires_env', 'requires_py', 'requires_cmd', 'requires_in_exe_path',
+        'requires_vsim_helper',
         'disable-tools-multi',
     ])
     supported_config_tool_keys = set([

opencos/eda_config_defaults.yml

@@ -398,9 +398,7 @@ auto_tools_order:
 
     questa:
       exe: qrun
-      requires_cmd:
-        - qrun -version
-        - vsim -version
+      requires_vsim_helper: True
       handlers:
         elab: opencos.tools.queta.CommandElabQuesta
         sim: opencos.tools.queta.CommandSimQuesta
@@ -408,30 +406,22 @@ auto_tools_order:
     riviera:
       exe: vsim
       requires_cmd:
-        - vsim -version
         - which riviera  # Do not run it, make sure it's in PATH
-      requires_in_exe_path:
-        - riviera
+      requires_vsim_helper: True
       handlers:
         elab: opencos.tools.riviera.CommandElabRiviera
         sim:  opencos.tools.riviera.CommandSimRiviera
 
     modelsim_ase:
       exe: vsim
-      requires_cmd:
-        - vsim -version
-      requires_in_exe_path:
-        - modelsim
+      requires_vsim_helper: True
       handlers:
         elab: opencos.tools.modelsim_ase.CommandElabModelsimAse
         sim:  opencos.tools.modelsim_ase.CommandSimModelsimAse
 
     questa_fse:  # free student edition, works similar to modelsim_ase
       exe: vsim
-      requires_cmd:
-        - vsim -version
-      requires_in_exe_path:
-        - questa_fse
+      requires_vsim_helper: True
       handlers:
         elab: opencos.tools.questa_fse.CommandElabQuestaFse
         sim:  opencos.tools.questa_fse.CommandSimQuestaFse

opencos/eda_deps_sanitize.py

@@ -0,0 +1,73 @@
+#!/usr/bin/env python3
+
+'''opencos.eda_deps_sanitize is an executable script
+
+Usage:
+    eda_deps_sanitize --dir=<path>
+
+Will print santized JSON data for the DEPS file found in --dir=<path>
+'''
+
+import argparse
+import os
+import sys
+
+from pathlib import Path
+
+from opencos import util
+from opencos.deps import deps_file
+from opencos.utils import status_constants
+
+
+def run(*args) -> (int, str):
+    '''Runs the DEPS sanitizer, prints results to stdout'''
+
+
+    bool_kwargs = util.get_argparse_bool_action_kwargs()
+
+    parser = argparse.ArgumentParser(
+        prog='opencos eda_deps_sanitize', add_help=True, allow_abbrev=False
+    )
+
+    parser.add_argument('--yaml', **bool_kwargs,
+                        help='Print output as YAML text, otherwise default is JSON text')
+    parser.add_argument('dir', type=str, default=str(Path('.')),
+                        help='Directory to look for DEPS.[markup] file')
+
+    try:
+        parsed, unparsed = parser.parse_known_args(list(args) + [''])
+        unparsed = list(filter(None, unparsed))
+    except argparse.ArgumentError:
+        return 1, f'problem attempting to parse_known_args for {args=}'
+
+    deps_path = parsed.dir
+    if os.path.isfile(deps_path):
+        deps_path, _ = os.path.split(deps_path)
+
+    try:
+        my_depsfile_obj = deps_file.DepsFile(None, deps_path, {})
+        if not my_depsfile_obj.deps_file:
+            return status_constants.EDA_DEPS_FILE_NOT_FOUND, f'No DEPS markup file at {parsed.dir}'
+
+        ret_str = my_depsfile_obj.str_sanitized_markup(as_yaml=parsed.yaml)
+        rc = util.get_return_code()
+        return rc, ret_str
+    except Exception as e:
+        rc = 1, str(e)
+
+    return 0, ''
+
+
+def main() -> None:
+    '''calls sys.exit(), main entrypoint'''
+    args = []
+    if len(sys.argv) > 1 and not args:
+        args = sys.argv[1:]
+
+    rc, deps_str = run(*args)
+    print(deps_str)
+    sys.exit(rc)
+
+
+if __name__ == '__main__':
+    main()

opencos/tools/questa_fse.py

@@ -1,6 +1,8 @@
 ''' opencos.tools.questa_fse - Used by opencos.eda for sim/elab commands w/ --tool=questa_fse.
 
 Contains classes for CommandSimQuestaFse, CommandElabQuestaFse.
+For: Questa Intel Starter FPGA Edition-64 vsim 20XX.X Simulator
+
 '''
 
 # pylint: disable=R0801 # (duplicate code in derived classes, such as if-condition return.)

opencos/tools/yosys.py

@@ -117,6 +117,7 @@ class CommonSynthYosys(CommandSynth, ToolYosys):
             'yosys-blackbox': [],                # list of modules that yosys will blackbox.
             'yosys-scriptfile': [],
             'sta-scriptfile': [],
+            'rename-module': ''
         })
         self.args_help.update({
             'sta': (
@@ -150,12 +151,14 @@ class CommonSynthYosys(CommandSynth, ToolYosys):
                 ' via: sta -no_init -exit <this-arg>.  You can set multiple args for multiple'
                 ' scriptfile (appends)'
             ),
+            'rename-module': 'Renames the output .v and module name',
         })
 
         self.yosys_out_dir = ''
         self.yosys_v_path = ''
         self.full_work_dir = ''
         self.blackbox_list = []
+        self.top_module = ''
 
     def do_it(self) -> None:
         self.set_tool_defines()
@@ -333,6 +336,13 @@ class CommonSynthYosys(CommandSynth, ToolYosys):
             ]
         lines += [
             'opt_clean',
+        ]
+        if self.args['rename-module']:
+            lines += [f'rename {self.args["top"]} {self.args["rename-module"]}']
+            self.top_module = self.args['rename-module']
+        else:
+            self.top_module = self.args["top"]
+        lines += [
             f'write_verilog {self.yosys_v_path}',
             f'write_json {self.yosys_v_path}.json',
         ]
@@ -388,7 +398,7 @@ class CommonSynthYosys(CommandSynth, ToolYosys):
             lines = [
                 'read_liberty ' + self.args['liberty-file'],
                 'read_verilog ' + self.yosys_v_path,
-                'link_design ' + self.args['top'],
+                'link_design ' + self.top_module,
             ]
             for _file in self.files_sdc:
                 lines.append('read_sdc ' + _file)
@@ -505,12 +515,13 @@ class CommandLecYosys(CommandLec, ToolYosys):
         })
 
         self.synth_work_dirs = [
-            os.path.join('eda.work', 'lec.design1.synth'),
-            os.path.join('eda.work', 'lec.design2.synth')
+            os.path.join('eda.work', 'lec.Design1.synth'),
+            os.path.join('eda.work', 'lec.Design2.synth')
         ]
 
         self.synth_designs_tops = [None, None]
         self.synth_designs_fpaths = [None, None]
+        self.synth_design_top_module_names = [None, None]
 
     def get_synth_result_fpath(self, target: str) -> str:
         '''Overridden from CommandLec'''
@@ -534,9 +545,12 @@ class CommandLecYosys(CommandLec, ToolYosys):
 
         synth_cmd_list += [
             '--work-dir=' + self.synth_work_dirs[design_num],
-            self.args['designs'][design_num]
+            self.args['designs'][design_num],
+            f'--rename-module=Design{design_num + 1}'
         ]
 
+        self.synth_design_top_module_names[design_num] = f'Design{design_num + 1}'
+
         return synth_cmd_list
 
 
@@ -663,10 +677,12 @@ class CommandLecYosys(CommandLec, ToolYosys):
                 else:
                     self.error(f' --pre-read-verilog file {x} does not exist')
         lec_cmd_f_list += [
+            '# Design1 (module):',
             f'read_verilog -sv -icells {self.synth_designs_fpaths[0]}',
+            '# Design2 (module):',
             f'read_verilog -sv -icells {self.synth_designs_fpaths[1]}',
             'clk2fflogic;',
-            f'miter -equiv -flatten {" ".join(self.synth_designs_tops)} miter',
+            f'miter -equiv -flatten {" ".join(self.synth_design_top_module_names)} miter',
             ('sat -seq 50 -verify -prove trigger 0 -show-all -show-inputs -show-outputs'
              ' -set-init-zero miter'),
         ]

opencos/util.py

@@ -16,6 +16,8 @@ from enum import Enum
 from pathlib import Path
 from importlib import import_module
 
+from opencos.utils import status_constants
+
 global_exit_allowed = False # pylint: disable=invalid-name
 progname = "UNKNOWN"        # pylint: disable=invalid-name
 progname_in_message = True  # pylint: disable=invalid-name
@@ -32,6 +34,8 @@ args = {                    # pylint: disable=invalid-name
     'artifacts-json': True,
 }
 
+max_error_code = 0  # pylint: disable=invalid-name
+
 class Colors:
     '''Namespace class for color printing help'''
     red = "\x1B[31m"
@@ -191,17 +195,20 @@ class Artifacts:
             return # do nothing if we have no artifacts
 
         # Update all file sizes:
+        remove_keys = set()
         for key, entry in self.data.items():
             if os.path.isfile(entry['name']):
                 entry['size'] = os.path.getsize(entry['name'])
             else:
                 # file doesn't exist, remove it from artifacts.
                 warning(f'Removing {key} ({entry["name"]}) from artifacts (file does not exist)')
-                del self.data[key]
+                remove_keys.add(key)
+        for key in remove_keys:
+            del self.data[key]
 
         with open(self.artifacts_json_filepath, 'w', encoding='utf-8') as f:
             json.dump(self.data, f, indent=4)
-            info(f'Wrote artifacts JSON: {self.artifacts_json_filepath}')
+        info(f'Wrote artifacts JSON: {self.artifacts_json_filepath}')
 
 
 artifacts = Artifacts()
@@ -217,6 +224,7 @@ class UtilLogger:
     # util's argparser: --no-default-log, --logfile=<name>, or --force-logfile=<name>
     default_log_enabled = False
     default_log_filepath = os.path.join('eda.work', 'eda.log')
+    enable = True
 
     def clear(self) -> None:
         '''Resets internals'''
@@ -234,6 +242,9 @@ class UtilLogger:
 
     def start(self, filename: str, force: bool = False) -> None:
         '''Starts (opens) log'''
+        if not self.enable:
+            self.file = None
+            return
         if not filename:
             error('Trying to start a logfile, but filename is missing')
             return
@@ -420,14 +431,12 @@ def process_tokens(tokens:list) -> (argparse.Namespace, list):
         # avoid this if someone has --help arg not yet parsed.
         start_log(global_log.default_log_filepath, force=True)
 
-
     parsed_as_dict = vars(parsed)
     for key,value in parsed_as_dict.items():
         key = key.replace('_', '-')
         if value is not None:
             args[key] = value # only update with non-None values to our global 'args' dict
 
-
     return parsed, unparsed
 
 # ********************
@@ -616,7 +625,9 @@ def warning(*text, start: object = None, end: str = '\n') -> None:
 
 
 def error(
-        *text, error_code: int = 255, do_exit: bool = True, start: object = None, end: str = '\n'
+        *text,
+        error_code: int = status_constants.EDA_DEFAULT_ERROR,
+        do_exit: bool = True, start: object = None, end: str = '\n'
 ) -> int:
     '''Print error messaging (in red if possible).
 
@@ -629,9 +640,12 @@ def error(
 
     Note these messages append to global logging. Increments global args['errors'] int.
     '''
+    global max_error_code # pylint: disable=global-statement
+
     if start is None:
         start = "ERROR: " + (f"[{progname}] " if progname_in_message else "")
     args['errors'] += 1
+    max_error_code = max(max_error_code, error_code)
     print_red(f"{start}{' '.join(list(text))}", end=end)
     if do_exit:
         if args['debug']:
@@ -644,6 +658,15 @@ def error(
     return abs(int(error_code))
 
 
+def get_return_code() -> int:
+    '''Checks global max_error_code and args['errors']'''
+    if args['errors']:
+        if max_error_code == 0:
+            return 255
+        return max_error_code
+    return 0
+
+
 def exit( # pylint: disable=redefined-builtin
         error_code: int = 0, quiet: bool = False
 ) -> int:

opencos/utils/markup_helpers.py

@@ -1,5 +1,7 @@
 ''' opencos.utils.markup_helpers - function helpers for YAML, TOML reading and writing'''
 
+import json
+import os
 import re
 import shutil
 import subprocess
@@ -89,10 +91,37 @@ def yaml_safe_load(filepath: str, only_root_line_numbers:bool = False) -> dict:
 
 
 def yaml_safe_writer(data: dict, filepath: str) -> None:
-    '''Warpper for yaml.dump, enforces file extension otherwise warning'''
-    if filepath.endswith('.yml') or filepath.endswith('.yaml'):
+    '''Wrapper for yaml.dump, enforces file extension otherwise warning'''
+    _, ext = os.path.splitext(filepath)
+    if ext.lower() in ('.yml', '.yaml'):
         with open(filepath, 'w', encoding='utf-8') as f:
             yaml.dump(data, f, allow_unicode=True,
                       default_flow_style=False, sort_keys=False, encoding='utf-8')
     else:
         warning(f'{filepath=} to be written for this extension not implemented.')
+
+def json_writer(data: dict, filepath: str) -> None:
+    '''Wrapper for json.dump'''
+    with open(filepath, 'w', encoding='utf-8') as f:
+        json.dump(data, f, indent=4)
+
+
+def markup_writer(data: dict, filepath: str) -> None:
+    '''Wrapper for yaml_safe_writer or json_writer'''
+    _, ext = os.path.splitext(filepath)
+    if ext.lower in ('.yml', '.yaml'):
+        yaml_safe_writer(data, filepath)
+    else:
+        json_writer(data, filepath)
+
+
+def markup_dumper(data: dict, as_yaml: bool = False) -> str:
+    '''Returns JSON str; if as_yaml=True returns YAML str, from data'''
+    if as_yaml:
+        return yaml.dump(
+            data=data, allow_unicode=True,
+            default_flow_style=False, sort_keys=False
+        )
+
+    # else return JSON:
+    return str(json.dumps(data, indent=4))

opencos/utils/status_constants.py

@@ -0,0 +1,27 @@
+'''opencos.utils.status_constants is a module containing known Error return codes
+
+(0 pass, > 0 fail) from eda or other opencos executables.
+'''
+
+NO_ERROR = 0
+
+PYTHON_EXCEPTION = 1
+
+EDA_DEPS_FILE_NOT_FOUND = 10
+EDA_DEPS_TARGET_NOT_FOUND = 11
+
+EDA_COMMAND_OR_ARGS_ERROR = 20
+EDA_CONFIG_ERROR = 21
+EDA_COMMAND_MISSING_TOP = 22
+
+EDA_SIM_LOG_HAS_BAD_STRING = 30
+EDA_SIM_LOG_MISSING_MUST_STRING = 31
+
+EDA_SHELL_LOG_HAS_BAD_STRING = 38
+EDA_SHELL_LOG_MISSING_MUST_STRING = 39
+
+EDA_EXEC_NONZERO_RETURN_CODE1 = 41
+EDA_EXEC_NONZERO_RETURN_CODE2 = 42
+EDA_EXEC_NONZERO_RETURN_CODE255 = 255
+
+EDA_DEFAULT_ERROR = 255

opencos/utils/vsim_helper.py

@@ -0,0 +1,55 @@
+'''Because so many tools use the exe vsim, I don't want to run `vsim -version` N times for N
+tools each to figure out if it's full-Questa, Modelsim, QuestaFSE, or Riviera.
+
+Instead, eda.py can call this once, and then query if this tool exists when running
+opencos.eda.auto_tool_setup(..)
+'''
+
+import shutil
+import subprocess
+
+from opencos.util import debug
+
+vsim_path = shutil.which('vsim')
+
+INIT_HAS_RUN = False
+TOOL_IS = {
+    'riviera': False,
+    'modelsim_ase': False,
+    'questa' : False,
+    'questa_fse': False
+}
+
+
+def init() -> None:
+    '''Sets INIT_HAS_RUN=True (only runs once) and one of TOOL_IS[tool] = True'''
+    global INIT_HAS_RUN # pylint: disable=global-statement
+
+    if INIT_HAS_RUN:
+        return
+
+    INIT_HAS_RUN = True
+
+    if not vsim_path:
+        return
+
+    proc = None
+    try:
+        proc = subprocess.run([vsim_path, '-version'], capture_output=True, check=False)
+    except Exception as e:
+        debug(f'vsim -version: exception {e}')
+
+    if proc is None or proc.returncode != 0:
+        return
+
+
+    stdout_str_lower = proc.stdout.decode('utf-8', errors='replace').lower()
+
+    if all(x in stdout_str_lower for x in ('starter', 'modelsim', 'fpga')):
+        TOOL_IS['modelsim_ase'] = True
+    elif all(x in stdout_str_lower for x in ('starter', 'questa', 'fpga')):
+        TOOL_IS['questa_fse'] = True
+    elif all(x in stdout_str_lower for x in ('riviera', 'aldec')):
+        TOOL_IS['riviera'] = True
+    elif 'questa' in stdout_str_lower:
+        TOOL_IS['questa'] = True

{opencos_eda-0.2.50.dist-info → opencos_eda-0.2.51.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: opencos-eda
-Version: 0.2.50
+Version: 0.2.51
 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.2.50.dist-info → opencos_eda-0.2.51.dist-info}/RECORD

@@ -2,13 +2,14 @@ opencos/__init__.py,sha256=RwJA9oc1uUlvNX7v5zoqwjnSRNq2NZwRlHqtS-ICJkI,122
 opencos/_version.py,sha256=XiHFZjCofkkZvI9befTFKsRt5zLouUo1CIwhW4srWU0,582
 opencos/_waves_pkg.sv,sha256=1lbhQOVGc3t_R8czYjP40hssP0I3FlZOpHTkI7yKFbI,1251
 opencos/deps_schema.py,sha256=pdJpKmfXxCYZsfXTxsnACw-s6Mzk55QH06ZSA5uqPV0,15454
-opencos/eda.py,sha256=y53bScMokPfpbZfqzpSg9Q08U6GVF_BjW2P0bPiEBE0,20424
-opencos/eda_base.py,sha256=h3aeSp0TY5b90r-Hd5dBiRlm2KAhtIsf0aWLJIZ1XfQ,94199
-opencos/eda_config.py,sha256=Rnf3PbvlDytg9klQrRcksUizryYwn2pWARYN1KJPj14,11321
-opencos/eda_config_defaults.yml,sha256=5EpzyFkEjL7lg3Xrx2M8lvoomkS1lVV18mbhBuym6w8,12607
+opencos/eda.py,sha256=rYBt4Qu2y45zdwD4jDx_p3l2u5LMS1nsaGQCP2ZYdwY,20883
+opencos/eda_base.py,sha256=q0uKEzAMzLmqb4jMBcGv7rTpdKnfrhnMZo7MyB8YN8Y,95706
+opencos/eda_config.py,sha256=Xma8w7kBLCNPCSrCKpceieU7GUBv4i54XZlHjnZ95X4,11353
+opencos/eda_config_defaults.yml,sha256=PdR3xHWQIdGeIyCTr2c3W9Vfq9RC1E9HbqiSydyDYZE,12417
 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=dvBjc2qFBJkwlW6Fm-66Y_vlr0VZL1QwfIosMR_bgbY,4814
 opencos/eda_tool_helper.py,sha256=_YgobDLEWW6Fzdr976LxaCDZ4DKRyuMs5CrYQHaTPrU,2558
 opencos/export_helper.py,sha256=ArsM8qxBc08gj9S-UholGU417POfBYb_cHkBQZEfqfI,22046
@@ -17,18 +18,18 @@ opencos/files.py,sha256=aoq0O2KfISzZb-Vi_q_0TTGBER9xJc--FkVZf0ga7pA,1549
 opencos/names.py,sha256=iC37PV7Pz0PicTDg09vbQ9NXAj-5m6RKrWHkkcHB8As,1145
 opencos/peakrdl_cleanup.py,sha256=vHNGtalTrIVP335PhRjPt9RhoccgpK1HJAi-E4M8Kc8,736
 opencos/seed.py,sha256=IL9Yg-r9SLSRseMVWaEHmuw2_DNi_eyut11EafoNTsU,942
-opencos/util.py,sha256=yGjyhQoy06A7d-UocMvRKqYkbyZ-FOoTR7F83XBHBR8,33325
+opencos/util.py,sha256=hnE66Mu7Uu-OGdAE5gkJ8nsKc_zUNMptXcuBFkm30wU,33975
 opencos/commands/__init__.py,sha256=DtOA56oWJu68l-_1_7Gdv0N-gtXVB3-p9IhGzAYex8U,1014
 opencos/commands/build.py,sha256=jI5ul53qfwn6X-yfSdSQIcLBhGtzZUk7r_wKBBmKJI0,1425
 opencos/commands/elab.py,sha256=m6Gk03wSzX8UkcmReooK7turF7LpqO0IcdOZwJ8XiyI,1596
 opencos/commands/export.py,sha256=juzxJL5-RpEnU5DmwF0fiG5pUrB2BbUbvCp2OasEd88,3494
 opencos/commands/flist.py,sha256=OUu_ewTDLkZqdW4547iRrwOhT4ghm8oMYHsA63yChvo,8551
-opencos/commands/lec.py,sha256=gN6nQ4GURhPC8nu8Zuj08s1fmNzuiuaS9vJgtNZyX28,3647
+opencos/commands/lec.py,sha256=mIrMKFEZrFYIzvBdffcIyVULx04Cu4-480FB4Y1EiTA,3863
 opencos/commands/multi.py,sha256=dCo4rMIkGT3BtlBhUIAd7r31w8qxeJvybpl4H7DR77o,27225
 opencos/commands/open.py,sha256=unrpGckzg0FE5W3oARq8x0jX7hhV_uM9Oh5FgISHFAg,724
 opencos/commands/proj.py,sha256=MdHTOtQYG93_gT97dWuSyAgUxX2vi9FRhL0dtc-rM98,1096
-opencos/commands/shell.py,sha256=senuqSGOc5nVGU5voZNJO4_hzVAK0ELtu0wmRZgwv3k,7463
-opencos/commands/sim.py,sha256=6_WiHnh6_xaEi4T-wlOyWxjCPdVcL-bWppPXy3-sIRw,14291
+opencos/commands/shell.py,sha256=0SNxiNRPD1BO6dK0yxU_iV-8S9UyF4GOWGLL1A_KeVs,7583
+opencos/commands/sim.py,sha256=WPkn_lZqgMPSQTxxT4Qa0qHKMmdHAkt1GXCDw4iD6kI,14723
 opencos/commands/sweep.py,sha256=ni4XFgnFF8HLXtwPhETyLWfvc2kgtm4bcxFcKzUhkf0,9343
 opencos/commands/synth.py,sha256=quB-HWS4LKYTiFBHiYarQi4pMnRmt12wQTZpi14VvlE,4355
 opencos/commands/targets.py,sha256=_jRNhm2Fqj0fmMvTw6Ba39DCsRHf_r_uZCy_R064kpA,1472
@@ -37,7 +38,7 @@ opencos/commands/waves.py,sha256=dsWwtjpDgH-YsiIjJgqTvteY3OZ48UnEAWc3blV2Fog,705
 opencos/deps/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 opencos/deps/defaults.py,sha256=4VgTRXf0hSJrj4tMk0t-mmvgEaaQQFDIYrxWrcKfYWk,1241
 opencos/deps/deps_commands.py,sha256=OlqueYFK8U83loasok3xJGzUDpNcj2DPk37332DfmRo,17039
-opencos/deps/deps_file.py,sha256=QvJ1fMyoQOXNbvHjWevkYF2kx0zvbRgFZ3GAPWw8jqk,12997
+opencos/deps/deps_file.py,sha256=29UkOT-UYw5XYYRK7DySmZkgdTj4wnxVQ5SgZVnrrds,15199
 opencos/deps/deps_processor.py,sha256=NYGBrBAmk7ltrvxsEhv76Kpp76GBRJqeNNY_ckWf5mE,33028
 opencos/hw/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 opencos/hw/oc_cli.py,sha256=QBmf05VooB9kQFzgliak7PEvqVLTSEI3v6deV1OZQEs,132252
@@ -67,7 +68,7 @@ opencos/tools/invio_yosys.py,sha256=asSjbdPjBXB76KxNZIhoDRn2DoXKsZEQ1YDX_WBzKiA,
 opencos/tools/iverilog.py,sha256=KQV5tiRdM0ZuJOO0q3ZeUmhRyEc-oJggOc6RKIjoH84,6482
 opencos/tools/modelsim_ase.py,sha256=rW5YrzLIhZKdbIT2UM60DGmDEHDK3XMlndpBz906cmA,14229
 opencos/tools/questa.py,sha256=bXH_ajMUBBHNUeWTBNWDp2gGyza2vf8xIC6vz5EWiz8,7619
-opencos/tools/questa_fse.py,sha256=vgrimIwJ1REFkQuKadWaS-UKcEB3wnumX-xN-91gqiE,1790
+opencos/tools/questa_fse.py,sha256=WLNvkD57ggI7lQgxYr6h_xmXenh50J_m8o8amhECmpk,1855
 opencos/tools/riviera.py,sha256=0FKAUvgyUHvJ5z0LOjHV9p3dGF8LI5kj5WLOZXgCDas,10695
 opencos/tools/slang.py,sha256=mFw58vhnCTRR9yaQ2zHPlNB5HKSf3Y078XcaVnpLaAc,7798
 opencos/tools/slang_yosys.py,sha256=3fyLRRdTXhSppNtUhhUl00oG-cT9TyyPTH6JvasS9ZE,9804
@@ -75,15 +76,17 @@ opencos/tools/surelog.py,sha256=dtj3ApAKoQasnGdg42n9DPgeqoJ5nCuurIkIO3G5ZCY,5011
 opencos/tools/tabbycad_yosys.py,sha256=2LePPgYXBVdsy7YcffPIWN-I0B7queLQ_f_pme2SCGw,7803
 opencos/tools/verilator.py,sha256=h5VScZyJYxk2cXDRrTTD47C_yAVHuyXv9_p7UL1o5mk,19486
 opencos/tools/vivado.py,sha256=roM0MxrHoNIT_DsUiql1vQFlez2ql4qhwAfB-rGH4Qg,40485
-opencos/tools/yosys.py,sha256=5zn9CeJc6UUuBI1Gk7HD8Y_l4GPa4KcLB7NNYxIQBjY,25648
+opencos/tools/yosys.py,sha256=UKWzvc2rSi3J9U2TROqRbmePdBmjskap664giumeRBk,26323
 opencos/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-opencos/utils/markup_helpers.py,sha256=tDaDtV4INEg04Diks1ZXlfOwzyCOGnWqc5aeHnwLoOk,3727
+opencos/utils/markup_helpers.py,sha256=A8Ev5UJ4EVKjdcF2g85SQbjdPZR4jGpNqCLaBy_4v7Q,4569
+opencos/utils/status_constants.py,sha256=aQui30ohPCEaWNDh2iujJQ_KQa3plry_rk7uDzS3vWk,603
 opencos/utils/str_helpers.py,sha256=DOkwfKJR6aENM3U2BkJ41ELDU5Uj_zyhEfxuaQEcpEY,3352
 opencos/utils/subprocess_helpers.py,sha256=xemAGPey6M0sWY_FElvr-Z0phCfdjaC-znP8FKihPaE,3535
-opencos_eda-0.2.50.dist-info/licenses/LICENSE,sha256=HyVuytGSiAUQ6ErWBHTqt1iSGHhLmlC8fO7jTCuR8dU,16725
-opencos_eda-0.2.50.dist-info/licenses/LICENSE.spdx,sha256=8gn1610RMP6eFgT3Hm6q9VKXt0RvdTItL_oxMo72jII,189
-opencos_eda-0.2.50.dist-info/METADATA,sha256=a7ZzQPyvJ1e5ZYWhIs1Gt39wvoa9PWPi27rJxKiMMd8,604
-opencos_eda-0.2.50.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-opencos_eda-0.2.50.dist-info/entry_points.txt,sha256=hi6SZHiGGgLrI3KnBCOXDpYOGXYpw-zWBWe5Di39OCw,167
-opencos_eda-0.2.50.dist-info/top_level.txt,sha256=J4JDP-LpRyJqPNeh9bSjx6yrLz2Mk0h6un6YLmtqql4,8
-opencos_eda-0.2.50.dist-info/RECORD,,
+opencos/utils/vsim_helper.py,sha256=2voGRZI2iAQ2Pv2ZI5g2why6xpgig-To8im-LVXtuDU,1517
+opencos_eda-0.2.51.dist-info/licenses/LICENSE,sha256=HyVuytGSiAUQ6ErWBHTqt1iSGHhLmlC8fO7jTCuR8dU,16725
+opencos_eda-0.2.51.dist-info/licenses/LICENSE.spdx,sha256=8gn1610RMP6eFgT3Hm6q9VKXt0RvdTItL_oxMo72jII,189
+opencos_eda-0.2.51.dist-info/METADATA,sha256=XAX9j35DEWh0nLU7Gt8unosqGzK9dGeqHtGcj8IgK-8,604
+opencos_eda-0.2.51.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+opencos_eda-0.2.51.dist-info/entry_points.txt,sha256=6n1T5NwVYDhN5l1h5zmyT197G4pE0SySDreB0QJzJR0,218
+opencos_eda-0.2.51.dist-info/top_level.txt,sha256=J4JDP-LpRyJqPNeh9bSjx6yrLz2Mk0h6un6YLmtqql4,8
+opencos_eda-0.2.51.dist-info/RECORD,,

{opencos_eda-0.2.50.dist-info → opencos_eda-0.2.51.dist-info}/entry_points.txt

@@ -1,5 +1,6 @@
 [console_scripts]
 eda = opencos.eda:main_cli
+eda_deps_sanitize = opencos.eda_deps_sanitize:main
 eda_deps_schema = opencos.deps_schema:main
 eda_targets = opencos.eda_extract_targets:main
 oc_cli = opencos.hw.oc_cli:main