opencos-eda 0.2.53__tar.gz → 0.2.55__tar.gz

{opencos_eda-0.2.53/opencos_eda.egg-info → opencos_eda-0.2.55}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: opencos-eda
-Version: 0.2.53
+Version: 0.2.55
 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
@@ -15,5 +15,5 @@ Requires-Dist: schema>=0.7.7
 Requires-Dist: toml>=0.10.2
 Requires-Dist: yamllint>=1.35.1
 Requires-Dist: PySerial>=3.5
-Requires-Dist: cocotb>=2.0.0b1
+Requires-Dist: cocotb>=2.0
 Dynamic: license-file

{opencos_eda-0.2.53 → opencos_eda-0.2.55}/opencos/commands/__init__.py

@@ -10,6 +10,7 @@ from .elab import CommandElab
 from .export import CommandExport
 from .flist import CommandFList
 from .multi import CommandMulti, CommandToolsMulti
+from .lint import CommandLint
 from .open import CommandOpen
 from .proj import CommandProj
 from .sim import CommandSim
@@ -28,6 +29,7 @@ __all__ = [
     'CommandExport',
     'CommandFList',
     'CommandMulti',
+    'CommandLint',
     'CommandOpen',
     'CommandProj',
     'CommandSim',

{opencos_eda-0.2.53 → opencos_eda-0.2.55}/opencos/commands/flist.py

@@ -214,6 +214,6 @@ class CommandFList(CommandDesign):
             print() # don't need to close fo (None)
         else:
             fo.close()
-            util.info(f"Created {self.args['out']}")
+            util.info(f"Created file: {self.args['out']}")
 
         self.write_eda_config_and_args()

opencos_eda-0.2.55/opencos/commands/lint.py

@@ -0,0 +1,51 @@
+'''opencos.commands.lint - Base class command handler for: eda lint ...
+
+Intended to be overriden by Tool based classes (such as CommandLintVivado, etc)
+
+Note that many 'lint' command handlers that also can perform simulations, such
+as VerilatorLint, will instead inherit from VerilatorSim and simply perform a
+shortened sim as the lint, instead of inheriting CommandLint.
+
+Tools that don't support a 'sim' command will generally use CommandLint, such
+as CommandLintSlang.'''
+
+from opencos.commands.sim import CommandSim
+
+class CommandLint(CommandSim):
+    '''Base class command handler for: eda lint ...'''
+
+    command_name = 'lint'
+
+    def __init__(self, config: dict):
+        CommandSim.__init__(self, config=config)
+        # add args specific to this simulator
+        self.args['stop-after-compile'] = True
+        self.args['lint'] = True
+        self.args['verilate-args'] = []
+
+
+
+    def compile(self) -> None:
+        raise NotImplementedError
+
+    def elaborate(self) -> None:
+        raise NotImplementedError
+
+    def get_compile_command_lists(self, **kwargs) -> list:
+        ''' Returns a list of lists (list of command lists).'''
+        raise NotImplementedError
+
+    def get_elaborate_command_lists(self, **kwargs) -> list:
+        ''' Returns a list of lists (list of command lists).'''
+        raise NotImplementedError
+
+    # CommandSim methods that elab does not use:
+
+    def simulate(self):
+        pass
+
+    def get_simulate_command_lists(self, **kwargs) -> list:
+        return []
+
+    def get_post_simulate_command_lists(self, **kwargs) -> list:
+        return []

{opencos_eda-0.2.53 → opencos_eda-0.2.55}/opencos/commands/sim.py

@@ -355,6 +355,50 @@ class CommandSim(CommandDesign):
                 error_code=status_constants.EDA_SIM_LOG_MISSING_MUST_STRING
             )
 
+    def write_sh_scripts_to_work_dir(
+            self, compile_lists: list, elaborate_lists: list, simulate_lists: list,
+            compile_line_breaks: bool = True,
+            elaborate_line_breaks: bool = False,
+            simulate_line_breaks: bool = False,
+            simulate_sh_fname: str = 'simulate.sh'
+    ) -> None:
+        '''Writes compile.sh, elaborate.sh, simulate.sh (if present), all.sh to work-dir
+
+        Will include the pre_compile_dep_shell_commands.sh if those are present.
+        compile_line_breaks defaults to True (one word per line w/ line breaks added)
+        '''
+
+        all_lists = [] # list - of - (command-list)
+        if self.has_dep_shell_commands:
+            all_lists = [
+                ['./pre_compile_dep_shell_commands.sh']
+            ]
+
+        if compile_lists:
+            util.write_shell_command_file(dirpath=self.args['work-dir'], filename='compile.sh',
+                                          command_lists=compile_lists,
+                                          line_breaks=compile_line_breaks)
+            all_lists.append(['./compile.sh'])
+
+        if elaborate_lists:
+            util.write_shell_command_file(dirpath=self.args['work-dir'], filename='elaborate.sh',
+                                          command_lists=elaborate_lists,
+                                          line_breaks=elaborate_line_breaks)
+            all_lists.append(['./elaborate.sh'])
+
+        if simulate_lists:
+            util.write_shell_command_file(dirpath=self.args['work-dir'], filename=simulate_sh_fname,
+                                          command_lists=simulate_lists,
+                                          line_breaks=simulate_line_breaks)
+            all_lists.append(['./' + simulate_sh_fname])
+
+        util.write_shell_command_file(dirpath=self.args['work-dir'], filename='all.sh',
+                                      command_lists=all_lists)
+
+        self.write_eda_config_and_args()
+
+
+
     # Methods that derived classes must override:
 
     def compile(self) -> None:

{opencos_eda-0.2.53 → opencos_eda-0.2.55}/opencos/deps/deps_file.py

@@ -306,7 +306,9 @@ class DepsFile:
                 return False
 
             if not is_valid_target_name(target_node):
-                util.warning(f"In file {self.rel_deps_file}, {target_node} {VALID_TARGET_INFO_STR}")
+                util.warning(
+                    f"In file {self.rel_deps_file}, {target_node} {VALID_TARGET_INFO_STR}"
+                )
 
             if not caller_info:
                 # If we don't have caller_info, likely came from command line (or DEPS JSON data):

{opencos_eda-0.2.53 → opencos_eda-0.2.55}/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
+from opencos.utils import status_constants, str_helpers
 
 # Configure util:
 util.progname = "EDA"
@@ -78,7 +78,7 @@ def get_all_commands_help_str(config: dict) -> str:
     return '\n'.join(all_commands_help)
 
 
-def usage(tokens: list, config: dict, command="") -> int:
+def usage(tokens: list, config: dict, command: str = "", tool: str = "") -> int:
     '''Returns an int shell return code, given remaining args (tokens list) and eda command.
 
     config is the config dict. Used to check valid commands in config['command_handler']
@@ -112,6 +112,9 @@ And <files|targets, ...> is one or more source file or DEPS markup file target,
 
     if command in config['command_handler'].keys():
         sco = config['command_handler'][command](config=config) # sub command object
+        sco_tool = getattr(sco, '_TOOL', '')
+        if tool and tool != sco_tool:
+            util.warning(f'{tool=} does not support {command=}')
         sco.help(tokens=tokens)
         return util.exit(0)
 
@@ -282,9 +285,15 @@ def tool_setup(tool: str, config: dict, quiet: bool = False, auto_setup: bool =
     if tool not in config['auto_tools_order'][0]:
         tools = list(config.get('auto_tools_order', [{}])[0].keys())
         cfg_yaml_fname = config.get('config-yml', None)
+        util.warning(f'Unknown tool: {tool}')
+        if tools:
+            util.info('Known tools:')
+            pretty_tools = str_helpers.pretty_list_columns_manual(data=tools)
+            for row in pretty_tools:
+                if row:
+                    util.info(row)
         util.error(f"Don't know how to run tool_setup({tool=}), is not in",
-                   f"config['auto_tools_order'] for {tools=}",
-                   f"from {cfg_yaml_fname}")
+                   f"config['auto_tools_order'] from {cfg_yaml_fname}")
         return
 
     if tool not in config['auto_tools_found']:
@@ -394,7 +403,9 @@ def process_tokens( # pylint: disable=too-many-branches,too-many-statements,too-
             for arg in unparsed:
                 if not arg.startswith('-'):
                     command = arg
-        return usage(tokens=unparsed, config=config, command=command)
+        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)

{opencos_eda-0.2.53 → opencos_eda-0.2.55}/opencos/eda_base.py

@@ -252,7 +252,7 @@ class Command: # pylint: disable=too-many-public-methods
         })
         self.modified_args = {}
         self.config = copy.deepcopy(config) # avoid external modifications.
-        self.target = ""
+        self.target = "" # is set as the 'top' or final target short-name (no path info)
         self.target_path = ""
         self.status = 0
         self.errors_log_f = None
@@ -943,6 +943,8 @@ class CommandDesign(Command): # pylint: disable=too-many-instance-attributes
         self.targets_dict = {} # key = targets that we've already processed in DEPS files
         self.last_added_source_file_inferred_top = ''
 
+        self.has_dep_shell_commands = False
+
 
     def run_dep_commands(self) -> None:
         '''Run shell/peakrdl style commands from DEPS files
@@ -993,10 +995,12 @@ class CommandDesign(Command): # pylint: disable=too-many-instance-attributes
 
             d['exec_list'] = clist # update to tee_fpath is set.
 
-        util.write_shell_command_file(
-            dirpath=self.args['work-dir'], filename='pre_compile_dep_shell_commands.sh',
-            command_lists=all_cmds_lists
-        )
+        if all_cmds_lists:
+            util.write_shell_command_file(
+                dirpath=self.args['work-dir'], filename='pre_compile_dep_shell_commands.sh',
+                command_lists=all_cmds_lists
+            )
+            self.has_dep_shell_commands = True
 
         for i, d in enumerate(self.dep_shell_commands):
             util.info(f'run_dep_shell_commands {i=}: {d=}')
@@ -1556,11 +1560,12 @@ class CommandDesign(Command): # pylint: disable=too-many-instance-attributes
 
         # handle a missing self.args['top'] with last filepath or last target:
         if not self.args.get('top', ''):
+            top_path = ''
             if not last_potential_top_isfile and last_potential_top_target[0]:
                 # If we have a target name from DEPS, prefer to use that.
-                self.args['top'], self.args['top-path'] = last_potential_top_target
+                self.args['top'], top_path = last_potential_top_target
                 util.info("--top not specified, inferred from target:",
-                          f"{self.args['top']} ({self.args['top-path']})")
+                          f"{self.args['top']} ({top_path})")
 
             else:
                 best_top_fname = self.last_added_source_file_inferred_top
@@ -1570,26 +1575,29 @@ class CommandDesign(Command): # pylint: disable=too-many-instance-attributes
             if not self.args['top'] and last_potential_top_file[0]:
                 # If we don't have a target name, and no top name yet, then go looking for the
                 # module name in the final source file added.
-                self.args['top-path'] = last_potential_top_file[1] # from tuple: (top, fpath)
+                top_path = last_potential_top_file[1] # from tuple: (top, fpath)
                 self.args['top'] = util.get_inferred_top_module_name(
                     module_guess=last_potential_top_file[0],
                     module_fpath=last_potential_top_file[1]
                 )
                 if self.args['top']:
                     util.info("--top not specified, inferred from final source file:",
-                              f"{self.args['top']} ({self.args['top-path']})")
+                              f"{self.args['top']} ({top_path})")
                     # If top wasn't set, and we're using the final command-line 'arg' filename
                     # (not from DEPS.yml) we need to override self.target if that was set. Otherwise
                     # it won't save to the correct work-dir:
                     self.target = self.args['top']
 
+
+        util.info(f'{self.command_name}: top-most target name: {self.target}')
+
         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)}",
                        error_code=status_constants.EDA_COMMAND_MISSING_TOP)
 
         if self.tool_changed_respawn:
-            util.warning(
+            util.info(
                 'CommandDesign: need to respawn due to tool change to',
                 f'\'{self.tool_changed_respawn["tool"]}\' from',
                 f'\'{self.tool_changed_respawn["orig_tool"]}\'',
@@ -1615,7 +1623,7 @@ class CommandDesign(Command): # pylint: disable=too-many-instance-attributes
         for k,v in self.args.items():
 
             # Some args cannot be extracted and work, so omit these:
-            if k in ['top-path'] + remove_args:
+            if k in remove_args:
                 continue
             if any(k.startswith(x) for x in remove_args_startswith):
                 continue
@@ -1637,9 +1645,6 @@ class CommandDesign(Command): # pylint: disable=too-many-instance-attributes
         return ret
 
 
-#_THREADS_START = 0
-#_THREADS_DONE = 0
-
 class ThreadStats:
     '''To avoid globals for two ints, keep a class holder so CommandParallel and
     CommandParallelWorker can share values'''

{opencos_eda-0.2.53 → opencos_eda-0.2.55}/opencos/eda_config_defaults.yml

@@ -7,6 +7,7 @@ DEFAULT_HANDLERS:
   # These commands (sim, elab, etc) require a tool, but have a default handler
   # base class:
   sim         : opencos.commands.CommandSim
+  lint        : opencos.commands.CommandLint
   elab        : opencos.commands.CommandElab
   synth       : opencos.commands.CommandSynth
   proj        : opencos.commands.CommandProj
@@ -29,7 +30,8 @@ DEFAULT_HANDLERS:
 
 DEFAULT_HANDLERS_HELP:
   sim:         Simulates a DEPS target.
-  elab:        Elaborates a DEPS target (lint, tool specific).
+  lint:        Syntax check, lint a DEPS target
+  elab:        Elaborates a DEPS target (lint + elab, tool specific).
   synth:       Synthesizes a DEPS target.
   flist:       Create dependency from a DEPS target.
   proj:        Create a project from a DEPS target for GUI sim/waves/debug.
@@ -362,11 +364,13 @@ auto_tools_order:
       requires_cmd:
         - slang --version
       handlers:
+        lint: opencos.tools.slang.CommandLintSlang
         elab: opencos.tools.slang.CommandElabSlang
 
     verilator:
       exe: verilator
       handlers:
+        lint: opencos.tools.verilator.VerilatorLint
         elab: opencos.tools.verilator.VerilatorElab
         sim: opencos.tools.verilator.VerilatorSim
 
@@ -382,6 +386,7 @@ auto_tools_order:
       requires_cmd:
         - surelog --version
       handlers:
+        lint: opencos.tools.surelog.CommandLintSurelog
         elab: opencos.tools.surelog.CommandElabSurelog
 
     invio:
@@ -391,6 +396,7 @@ auto_tools_order:
       requires_py:
         - invio
       handlers:
+        lint:  opencos.tools.invio.CommandLintInvio
         elab:  opencos.tools.invio.CommandElabInvio
 
     vaporview:
@@ -422,6 +428,7 @@ auto_tools_order:
     vivado:
       exe: vivado
       handlers:
+        lint:   opencos.tools.vivado.CommandLintVivado
         elab:   opencos.tools.vivado.CommandElabVivado
         sim:    opencos.tools.vivado.CommandSimVivado
         synth:  opencos.tools.vivado.CommandSynthVivado
@@ -469,6 +476,7 @@ auto_tools_order:
       exe: qrun
       requires_vsim_helper: True
       handlers:
+        lint: opencos.tools.questa.CommandLintQuesta
         elab: opencos.tools.questa.CommandElabQuesta
         sim: opencos.tools.questa.CommandSimQuesta
         flist: opencos.tools.questa.CommandFListQuesta
@@ -479,6 +487,7 @@ auto_tools_order:
         - which riviera  # Do not run it, make sure it's in PATH
       requires_vsim_helper: True
       handlers:
+        lint: opencos.tools.riviera.CommandLintRiviera
         elab: opencos.tools.riviera.CommandElabRiviera
         sim:  opencos.tools.riviera.CommandSimRiviera
 
@@ -486,6 +495,7 @@ auto_tools_order:
       exe: vsim
       requires_vsim_helper: True
       handlers:
+        lint: opencos.tools.modelsim_ase.CommandLintModelsimAse
         elab: opencos.tools.modelsim_ase.CommandElabModelsimAse
         sim:  opencos.tools.modelsim_ase.CommandSimModelsimAse
 
@@ -493,6 +503,7 @@ auto_tools_order:
       exe: vsim
       requires_vsim_helper: True
       handlers:
+        lint: opencos.tools.questa_fse.CommandLintQuestaFse
         elab: opencos.tools.questa_fse.CommandElabQuestaFse
         sim:  opencos.tools.questa_fse.CommandSimQuestaFse
         flist: opencos.tools.questa_fse.CommandFListQuestaFse
@@ -500,6 +511,7 @@ auto_tools_order:
     iverilog:
       exe: iverilog
       handlers:
+        lint: opencos.tools.iverilog.CommandLintIverilog
         elab: opencos.tools.iverilog.CommandElabIverilog
         sim:  opencos.tools.iverilog.CommandSimIverilog
 

{opencos_eda-0.2.53 → opencos_eda-0.2.55}/opencos/tests/helpers.py

@@ -65,6 +65,11 @@ def eda_elab_wrap(*args):
     main_args = [x for x in list(args) if (x != 'elab' and '--seed' not in x)]
     return eda.main('elab', *main_args)
 
+def eda_lint_wrap(*args):
+    '''Calls eda.main for 'elab'.'''
+    main_args = [x for x in list(args) if (x != 'lint' and '--seed' not in x)]
+    return eda.main('lint', *main_args)
+
 def assert_sim_log_passes(
         filepath: str, want_str: str = 'TEST PASS',
         err_strs: list = ['Error', 'ERROR', 'TEST FAIL']

{opencos_eda-0.2.53 → opencos_eda-0.2.55}/opencos/tests/test_eda.py

@@ -170,7 +170,7 @@ class TestsRequiresVerilator( # pylint: disable=too-many-public-methods
         assert res.stderr == b''
 
         res = subprocess.run(
-            [ './simulate_only.sh' ], stdout=subprocess.PIPE, stderr=subprocess.PIPE,
+            [ './simulate.sh' ], stdout=subprocess.PIPE, stderr=subprocess.PIPE,
             check=True
         )
         rc = res.returncode

{opencos_eda-0.2.53 → opencos_eda-0.2.55}/opencos/tests/test_eda_elab.py

@@ -5,7 +5,7 @@ import pytest
 
 from opencos import eda_tool_helper
 from opencos.tests import helpers
-from opencos.tests.helpers import eda_wrap, eda_elab_wrap
+from opencos.tests.helpers import eda_wrap, eda_elab_wrap, eda_lint_wrap
 
 
 thispath = os.path.dirname(__file__)
@@ -29,6 +29,16 @@ list_of_elab_tools = [
     'invio_yosys',
 ]
 
+list_of_lint_tools = [
+    'slang',
+    'verilator',
+    'vivado',
+    'modelsim_ase'
+    'questa_fse',
+    'invio',
+    'surelog',
+]
+
 list_of_elab_tools_cant_sim = [
     'slang',
     'invio',
@@ -36,6 +46,11 @@ list_of_elab_tools_cant_sim = [
     'invio_yosys',
 ]
 
+list_of_commands = [
+    'elab',
+    'lint',
+]
+
 def skip_it(tool) -> bool:
     '''Returns True if this test should be skipped
 
@@ -44,27 +59,33 @@ def skip_it(tool) -> bool:
     '''
     return bool( tool not in tools_loaded )
 
+@pytest.mark.parametrize("command", list_of_commands)
 @pytest.mark.parametrize("tool", list_of_elab_tools)
 class Tests:
     '''Test tools from list_of_elab_tools for 'eda elab' and 'eda multi elab'.'''
 
-    def test_args_elab(self, tool):
+    def test_args_elab(self, command, tool):
         '''tests: eda elab --tool oclib_priarb'''
+        if command == 'lint' and tool not in list_of_lint_tools:
+            pytest.skip(f"lint skipped for {tool=} b/c it can't run lint")
         if skip_it(tool):
             pytest.skip(f"{tool=} skipped, {tools_loaded=}")
             return # skip/pass
         chdir_remove_work_dir('../../lib')
-        rc = eda_elab_wrap('--tool', tool, 'oclib_priarb')
+        if command == 'elab':
+            rc = eda_elab_wrap('--tool', tool, 'oclib_priarb')
+        else:
+            rc = eda_lint_wrap('--tool', tool, 'oclib_priarb')
         print(f'{rc=}')
         assert rc == 0
 
-    def test_args_multi_elab(self, tool):
+    def test_args_multi_elab(self, command, tool):
         '''tests: eda multi elab --tool oclib_*arb'''
         if skip_it(tool):
             pytest.skip(f"{tool=} skipped, {tools_loaded=}")
             return # skip/pass
         chdir_remove_work_dir('../../lib')
-        rc = eda_wrap('multi', 'elab', '--tool', tool, 'oclib_*arb')
+        rc = eda_wrap('multi', command, '--tool', tool, 'oclib_*arb')
         print(f'{rc=}')
         assert rc == 0
 

{opencos_eda-0.2.53 → opencos_eda-0.2.55}/opencos/tools/cocotb.py

@@ -122,20 +122,12 @@ class CommandSimCocotb(CommandSim, ToolCocotb):
         util.safe_mkdirs(base=self.args['work-dir'], new_dirs=paths)
 
         # Write shell scripts
-        util.write_shell_command_file(
-            dirpath=self.args['work-dir'],
-            filename='cocotb_test.sh',
-            command_lists=self.cocotb_command_lists,
-            line_breaks=True
-        )
-
-        util.write_shell_command_file(
-            dirpath=self.args['work-dir'],
-            filename='all.sh',
-            command_lists=[
-                ['./pre_compile_dep_shell_commands.sh'],
-                ['./cocotb_test.sh'],
-            ]
+        self.write_sh_scripts_to_work_dir(
+            compile_lists=[],
+            elaborate_lists=[],
+            simulate_lists=self.cocotb_command_lists,
+            simulate_line_breaks=True,
+            simulate_sh_fname='cocotb_test.sh'
         )
 
     def _find_cocotb_test_files(self):
@@ -317,7 +309,7 @@ def run_cocotb_test():
         runner = get_runner(simulator)
 
         build_args = []
-        
+
         if simulator == "verilator":
             build_args.extend({list(self.args.get('verilate-args', []))!r})
 

{opencos_eda-0.2.53 → opencos_eda-0.2.55}/opencos/tools/invio.py

@@ -38,6 +38,8 @@ class ToolInvio(Tool):
 class CommandElabInvio(CommandElab, ToolInvio):
     '''Command handler for: eda elab --tool=invio'''
 
+    command_name = 'elab'
+
     def __init__(self, config:dict):
         CommandElab.__init__(self, config)
         ToolInvio.__init__(self, config=self.config)
@@ -72,7 +74,7 @@ class CommandElabInvio(CommandElab, ToolInvio):
         '''Returns list of util.ShellCommandList, for slang we'll run this in elaborate()'''
         invio_blackbox_list = self.args.get('invio-blackbox', [])
         invio_dict = invio_helpers.get_invio_command_dict(
-            self, blackbox_list=invio_blackbox_list, sim_elab=True
+            self, blackbox_list=invio_blackbox_list,
         )
         return invio_dict['command_lists']
 
@@ -84,3 +86,8 @@ class CommandElabInvio(CommandElab, ToolInvio):
     def get_elaborate_command_lists(self, **kwargs) -> list:
         '''We only use 'compile' commands for invio elab, do not use elaborate commands'''
         return []
+
+class CommandLintInvio(CommandElabInvio):
+    '''Command handler for: eda lint --tool=invio'''
+
+    command_name = 'lint'

{opencos_eda-0.2.53 → opencos_eda-0.2.55}/opencos/tools/invio_helpers.py

@@ -34,6 +34,7 @@ def write_py_file(
         py_filename: str = 'run_invio.py',
         v_filename: str = '',
         blackbox_list: list = [],
+        sim_lint: bool = False,
         sim_elab: bool = False,
         **kwargs
 ) -> dict:
@@ -137,7 +138,15 @@ def write_py_file(
                                             tee_fpath = 'invio.log')]
     })
 
-    if sim_elab:
+    if sim_lint:
+        # lint (skip elaborate steps -- from eda.CommandLintInvio)
+        lines += [
+            'assert analyze()',
+            '',
+            'report_analyzed_files()',
+            'print_instance_hierarchy()',
+        ]
+    elif sim_elab:
         # elab (non-synthesis), runs the following (from eda.CommandElabInvio)
         lines += [
             'assert analyze()',
@@ -206,14 +215,23 @@ def write_py_file(
 
 
 
-def get_invio_command_dict(command_design_obj:object, v_filename='', py_filename='run_invio.py',
-                           blackbox_list=[], sim_elab:bool=False, **kwargs) -> dict:
+def get_invio_command_dict(
+        command_design_obj:object, v_filename='', py_filename='run_invio.py',
+        blackbox_list=[],
+        **kwargs
+) -> dict:
     '''Creates a .py file from an eda.CommandDesign. Returns a dict with
 
     information about what to run.'''
 
-    invio_dict = write_py_file( command_design_obj, v_filename=v_filename,
-                                py_filename=py_filename, blackbox_list=blackbox_list,
-                                sim_elab=sim_elab, **kwargs )
+    cmd_name = getattr(command_design_obj, 'command_name', '')
+    sim_lint = cmd_name == 'lint'
+    sim_elab = cmd_name == 'elab'
+
+    invio_dict = write_py_file(
+        command_design_obj, v_filename=v_filename,
+        py_filename=py_filename, blackbox_list=blackbox_list,
+        sim_elab=sim_elab, sim_lint=sim_lint, **kwargs
+    )
 
     return invio_dict

{opencos_eda-0.2.53 → opencos_eda-0.2.55}/opencos/tools/invio_yosys.py

@@ -59,7 +59,7 @@ class CommandSynthInvioYosys(CommonSynthYosys, ToolInvioYosys):
 
         # Generate run_invio.py:
         invio_dict = invio_helpers.get_invio_command_dict(
-            self, blackbox_list=invio_blackbox_list, sim_elab=False
+            self, blackbox_list=invio_blackbox_list,
         )
         # run run_invio.py:
         if not self.args.get('stop-before-compile', False):
@@ -146,9 +146,10 @@ class CommandSynthInvioYosys(CommonSynthYosys, ToolInvioYosys):
 class CommandElabInvioYosys(CommandSynthInvioYosys):
     '''Run invio + yosys as elab only (does not run the synthesis portion)'''
 
+    command_name = 'elab'
+
     def __init__(self, config):
         super().__init__(config)
-        self.command_name = 'elab'
         self.args.update({
             'stop-after-compile': True, # In the case of Invio/Yosys we run the Invio step
             'lint': True