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

opencos/peakrdl_cleanup.py

@@ -1,20 +1,26 @@
 #!/usr/bin/env python3
 
+''' peakrdl_cleanup is intended as CLI or callable via run(file-in, file-out)
+
+to apply verilator comment waivers to a SystemVerilog file
+'''
+
 import sys
-import os
 
-def run(file_in, file_out):
-    with open(file_in) as f:
+
+def run(file_in: str, file_out: str) -> None:
+    '''Returns None, writes file_out (filepath) with updates given file_in (filepath)'''
+
+    with open(file_in, encoding='utf-8') as f:
         lines = f.readlines()
 
-    with open(file_out, 'w') as f:
+    with open(file_out, 'w', encoding='utf-8') as f:
         f.write('// verilator lint_off MULTIDRIVEN\n')
         for line in lines:
             f.write(line)
         f.write('// verilator lint_on  MULTIDRIVEN\n')
 
+
 if __name__ == '__main__':
     assert len(sys.argv) == 3, f'{sys.argv=}'
-    file_in = sys.argv[1]
-    file_out = sys.argv[2]
-    run(file_in, file_out)
+    run(file_in=sys.argv[1], file_out=sys.argv[2])

opencos/seed.py

@@ -1,28 +1,36 @@
+''' opencos.seed handles getting a 'seed' int, and keeping a list of seeds.
+
+Used by opencos.command.sim and opencos.tools, because some tools prefer 32-bit uint,
+31-bit > 0, or want to avoid a seed=0
+'''
+
 import random
+import time
 
-seeds = list()
+seeds = []
 
+def get_seed(style: str = "", limit_31bit: bool = True, avoid_zero: bool = True) -> int:
+    '''Returns a random int, using python random or time.time, with constraints.
 
-def get_seed(style : str = "", limit_31bit=True, avoid_zero=True):
-    '''Returns a random int
+    Appends returned value to global list seeds.
 
     style (str)
-      -- "", default: uses python random.randint
-      -- "time"     : uses python int(time.time())
+      -- "", default: uses python random.randint 32-bit
+      -- "time"     : uses python time.time_ns() 32-bit LSBs
     '''
 
-    global seeds
     seed = 1
 
     if style.lower() == "time":
-        seed = int(time.time())
+        # use the float value fractional portion
+        seed = time.time_ns() & 0xFFFF_FFFF
     else:
-        seed = random.randint(0, 0xFFFFFFFF)
+        seed = random.randint(0, 0xFFFF_FFFF)
 
-    if limit_31bit and seed >> 31:
-        seed >>= 1
+    if limit_31bit:
+        seed &= 0x7FFF_FFFF
     if avoid_zero and seed == 0:
-        seed += 1
+        seed = 1
 
     seeds.append(seed)
     return seed

opencos/tests/helpers.py

@@ -9,8 +9,9 @@ from pathlib import Path
 
 from contextlib import redirect_stdout, redirect_stderr
 
-from opencos import eda, util
+from opencos import eda
 from opencos import deps_schema
+from opencos.utils.markup_helpers import yaml_safe_load
 
 def can_run_eda_command(*commands, config: dict) -> bool:
     '''Returns True if we have any installed tool that can run: eda <command>'''
@@ -74,7 +75,7 @@ def assert_gen_deps_yml_good(filepath:str, want_target:str='') -> dict:
 
     so we also confirm they pass the deps_schema.FILE_SIMPLIFIED'''
     assert os.path.exists(filepath), f'{filepath=} does not exist'
-    data = util.yaml_safe_load(filepath)
+    data = yaml_safe_load(filepath)
     assert len(data.keys()) > 0
     if want_target:
         assert want_target, f'{want_target=} not in {filepath=} {data=}'

opencos/tests/test_deps_helpers.py

@@ -1,7 +1,7 @@
-'''pytests for opencos.deps_helpers'''
+'''pytests for opencos.deps modules'''
 
-# TODO(drew): these need to be refactored if we cleanup deps_helpers.py, this still
-# uses the old DEPS (non-markup) command format, such as 'shell@some bash command'
+# TODO(drew): these need to be refactored if we cleanup opencos.deps commands;
+# this uses the old DEPS (non-markup) command format, such as 'shell@some bash command'
 
 # TODO(drew): for now, ignore long lines and docstrings
 # pylint: disable=line-too-long,missing-function-docstring
@@ -10,7 +10,9 @@ from pathlib import Path
 import os
 import pytest
 
-from opencos import eda_tool_helper, deps_helpers
+from opencos import eda_tool_helper
+
+from opencos.deps import deps_file, deps_commands
 
 THISPATH = os.path.dirname(__file__)
 
@@ -19,9 +21,9 @@ config, tools_loaded = eda_tool_helper.get_config_and_tools_loaded()
 
 
 def test_get_all_targets():
-    '''Makes sure that deps_helpers.get_all_targets(filter_str:str) works'''
+    '''Makes sure that deps_file.get_all_targets(filter_str:str) works'''
 
-    targets = deps_helpers.get_all_targets(
+    targets = deps_file.get_all_targets(
         dirs=[
             str(Path('../../lib/tests')),
             str(Path('../../lib/rams/tests')),
@@ -42,9 +44,9 @@ def test_get_all_targets():
     reason="requires vivado or verilator"
 )
 def test_get_all_targets_eda_multi():
-    '''Makes sure that deps_helpers.get_all_targets(filter_using_mult:str) works'''
+    '''Makes sure that deps_file.get_all_targets(filter_using_mult:str) works'''
 
-    targets = deps_helpers.get_all_targets(
+    targets = deps_file.get_all_targets(
         base_path=THISPATH,
         filter_using_multi='sim ../../lib/tests/*test ../../lib/rams/tests/*test',
     )
@@ -57,26 +59,26 @@ def test_get_all_targets_eda_multi():
 
 def test_parse_deps_shell_str__no_parse():
     line = 'some_file.sv'
-    d = deps_helpers.parse_deps_shell_str(line, '', '')
+    d = deps_commands.parse_deps_shell_str(line, '', '')
     assert not d, f'{d=}'
 
     line = 'some_target:'
-    d = deps_helpers.parse_deps_shell_str(line, '', '')
+    d = deps_commands.parse_deps_shell_str(line, '', '')
     assert not d, f'{d=}'
 
     line = '   csr@some_file.sv'
-    d = deps_helpers.parse_deps_shell_str(line, '', '')
+    d = deps_commands.parse_deps_shell_str(line, '', '')
     assert not d, f'{d=}'
 
 def test_parse_deps_shell_str__cp():
     line = '    shell@ cp ./oclib_fifo_test.sv oclib_fifo_test_COPY.sv ;'
-    d = deps_helpers.parse_deps_shell_str(line, '', '')
+    d = deps_commands.parse_deps_shell_str(line, '', '')
     assert d, f'{d=}'
     assert d['exec_list'] == ['cp', './oclib_fifo_test.sv', 'oclib_fifo_test_COPY.sv', ';'], f'{d=}'
 
 def test_parse_deps_shell_str__echo():
     line = '    shell@echo "hello world"'
-    d = deps_helpers.parse_deps_shell_str(line, '', '')
+    d = deps_commands.parse_deps_shell_str(line, '', '')
     assert d, f'{d=}'
     assert d['exec_list'] == ['echo', '"hello', 'world"'], f'{d=}'
 
@@ -85,10 +87,11 @@ def test_parse_deps_shell_str__enable_filepath_replacement():
     # Default is enabled.
     module_dir = os.path.dirname(os.path.abspath(__file__))
     os.chdir(module_dir)
-    line = 'shell@cp ../deps_helpers.py foo.py'
-    d = deps_helpers.parse_deps_shell_str(line, target_path='./', target_node='foo_target')
+    line = 'shell@cp ../deps/deps_commands.py .pytest.copied.py'
+    d = deps_commands.parse_deps_shell_str(line, target_path='./', target_node='foo_target')
     assert d, f'{d=}'
-    assert d['exec_list'] == ['cp', os.path.abspath('../deps_helpers.py'), 'foo.py'], f'{d=}'
+    spath = os.path.abspath(os.path.join('..', 'deps', 'deps_commands.py'))
+    assert d['exec_list'] == ['cp', spath, '.pytest.copied.py'], f'{d=}'
     assert d['target_node'] == 'foo_target'
     assert d['target_path'] == os.path.abspath('./')
 
@@ -96,11 +99,11 @@ def test_parse_deps_shell_str__disable_filepath_replacement():
     # Dealing w/ relative paths, change the current working directory to the module directory
     module_dir = os.path.dirname(os.path.abspath(__file__))
     os.chdir(module_dir)
-    line = 'shell@cp ../deps_helpers.py foo.py'
-    d = deps_helpers.parse_deps_shell_str(line, target_path='./', target_node='foo_target',
+    line = 'shell@cp ../deps/deps_commands.py .pytest.copied.py'
+    d = deps_commands.parse_deps_shell_str(line, target_path='./', target_node='foo_target',
                                           enable_filepath_subst_target_dir=False)
     assert d, f'{d=}'
-    assert d['exec_list'] == ['cp', '../deps_helpers.py', 'foo.py'], f'{d=}'
+    assert d['exec_list'] == ['cp', '../deps/deps_commands.py', '.pytest.copied.py'], f'{d=}'
     assert d['target_node'] == 'foo_target'
     assert d['target_path'] == os.path.abspath('./')
 
@@ -109,7 +112,7 @@ def test_parse_deps_shell_str__enable_dirpath_replacement():
     module_dir = os.path.dirname(os.path.abspath(__file__))
     os.chdir(module_dir)
     line = 'shell@ls -ltr ./'
-    d = deps_helpers.parse_deps_shell_str(line, target_path='./', target_node='foo_target',
+    d = deps_commands.parse_deps_shell_str(line, target_path='./', target_node='foo_target',
                                           enable_dirpath_subst_target_dir=True)
     assert d, f'{d=}'
     assert d['exec_list'] == ['ls', '-ltr', os.path.abspath('./')], f'{d=}'
@@ -122,7 +125,7 @@ def test_parse_deps_shell_str__disable_dirpath_replacement():
     module_dir = os.path.dirname(os.path.abspath(__file__))
     os.chdir(module_dir)
     line = 'shell@ls -ltr ./'
-    d = deps_helpers.parse_deps_shell_str(line, target_path='./', target_node='foo_target')
+    d = deps_commands.parse_deps_shell_str(line, target_path='./', target_node='foo_target')
     assert d, f'{d=}'
     assert d['exec_list'] == ['ls', '-ltr', './'], f'{d=}'
     assert d['target_node'] == 'foo_target'
@@ -131,26 +134,26 @@ def test_parse_deps_shell_str__disable_dirpath_replacement():
 
 def test_parse_deps_work_dir_add_srcs__no_parse():
     line = 'some_file.sv'
-    d = deps_helpers.parse_deps_work_dir_add_srcs(line, '', '')
+    d = deps_commands.parse_deps_work_dir_add_srcs(line, '', '')
     assert not d, f'{d=}'
 
     line = 'some_target:'
-    d = deps_helpers.parse_deps_work_dir_add_srcs(line, '', '')
+    d = deps_commands.parse_deps_work_dir_add_srcs(line, '', '')
     assert not d, f'{d=}'
 
     line = '   csr@some_file.sv'
-    d = deps_helpers.parse_deps_work_dir_add_srcs(line, '', '')
+    d = deps_commands.parse_deps_work_dir_add_srcs(line, '', '')
     assert not d, f'{d=}'
 
 def test_parse_deps_work_dir_add_srcs__single_file():
     line = '    work_dir_add_srcs@ single_file.txt'
-    d = deps_helpers.parse_deps_work_dir_add_srcs(line, '', '')
+    d = deps_commands.parse_deps_work_dir_add_srcs(line, '', '')
     assert d, f'{d=}'
     assert d['file_list'] == ['single_file.txt']
 
 def test_parse_deps_work_dir_add_srcs__several_file():
     line = '    work_dir_add_srcs@ single_file.txt another.sv  gen-verilog/mine.v ./gen-vhdl/wordy.vhdl'
-    d = deps_helpers.parse_deps_work_dir_add_srcs(line, '', '')
+    d = deps_commands.parse_deps_work_dir_add_srcs(line, '', '')
     assert d, f'{d=}'
     assert d['file_list'] == [
         'single_file.txt', 'another.sv', 'gen-verilog/mine.v', './gen-vhdl/wordy.vhdl'
@@ -159,34 +162,34 @@ def test_parse_deps_work_dir_add_srcs__several_file():
 
 def test_parse_deps_peakrdl__no_parse():
     line = 'some_file.sv'
-    d = deps_helpers.parse_deps_peakrdl(line, '', '')
+    d = deps_commands.parse_deps_peakrdl(line, '', '')
     assert not d, f'{d=}'
 
     line = 'some_target:'
-    d = deps_helpers.parse_deps_peakrdl(line, '', '')
+    d = deps_commands.parse_deps_peakrdl(line, '', '')
     assert not d, f'{d=}'
 
     line = '   csr@some_file.sv'
-    d = deps_helpers.parse_deps_peakrdl(line, '', '')
+    d = deps_commands.parse_deps_peakrdl(line, '', '')
     assert not d, f'{d=}'
 
 def test_parse_deps_peakrdl__with_top():
     line = '    peakrdl@ --cpuif axi4-lite-flat --top   my_fancy_csrs ./my_csrs.rdl'
-    d = deps_helpers.parse_deps_peakrdl(line, '', '')
+    d = deps_commands.parse_deps_peakrdl(line, '', '')
     assert d, f'{d=}'
     assert len(d['shell_commands_list']) > 0
     assert d['work_dir_add_srcs']['file_list'] == ['peakrdl/my_fancy_csrs_pkg.sv', 'peakrdl/my_fancy_csrs.sv']
 
 def test_parse_deps_peakrdl__with_top2():
     line = '    peakrdl@ --cpuif axi4-lite-flat --top=my_fancy_csrs ./my_csrs.rdl'
-    d = deps_helpers.parse_deps_peakrdl(line, '', '')
+    d = deps_commands.parse_deps_peakrdl(line, '', '')
     assert d, f'{d=}'
     assert len(d['shell_commands_list']) > 0
     assert d['work_dir_add_srcs']['file_list'] == ['peakrdl/my_fancy_csrs_pkg.sv', 'peakrdl/my_fancy_csrs.sv']
 
 def test_parse_deps_peakrdl__infer_top():
     line = '    peakrdl@ --cpuif axi4-lite-flat ./my_csrs.rdl'
-    d = deps_helpers.parse_deps_peakrdl(line, '', '')
+    d = deps_commands.parse_deps_peakrdl(line, '', '')
     assert d, f'{d=}'
     assert len(d['shell_commands_list']) > 0
     assert d['work_dir_add_srcs']['file_list'] == ['peakrdl/my_csrs_pkg.sv', 'peakrdl/my_csrs.sv']

opencos/tests/test_eda.py

@@ -7,6 +7,12 @@ If you want to run this, consider running from the root of opencos repo:
     > python3 -m pytest --verbose opencos/*/*.py
     > python3 -m pytest -rx opencos/*/*.py
  which avoids using any pip installed opencos.eda
+
+Throughout this file, if you see:
+   assert rc > 1
+It is not a typo. We would prefer all expected errors to be caught and reported by
+eda.py. Python errors tend to return with rc=1, and those are problematic for us
+and should be more gracefully handled.
 '''
 
 # pylint: disable=R0801 # (similar lines in 2+ files)
@@ -18,7 +24,8 @@ from contextlib import redirect_stdout, redirect_stderr
 
 import pytest
 
-from opencos import eda, util, eda_tool_helper
+from opencos import eda, eda_tool_helper
+from opencos.utils.markup_helpers import yaml_safe_load
 from opencos.tests import helpers
 from opencos.tests.helpers import eda_wrap, eda_sim_wrap, eda_elab_wrap, \
     Helpers
@@ -89,7 +96,7 @@ class TestsRequiresVerilator( # pylint: disable=too-many-public-methods
         chdir_remove_work_dir('../../lib')
         rc = eda_wrap('synth', '--tool', 'verilator', 'oclib_fifo')
         print(f'{rc=}')
-        assert rc != 0
+        assert rc > 1
 
 
     def test_args_sim(self):
@@ -228,7 +235,7 @@ class TestsRequiresVerilator( # pylint: disable=too-many-public-methods
         # want to use the xfail pytest decorator.
         rc = eda_sim_wrap('--xilinx', '--tool', 'verilator', 'oclib_fifo_test')
         print(f'{rc=}')
-        assert rc != 0
+        assert rc > 1
 
     def test_more_plusargs_sim(self):
         '''Test that unprocessed plusargs become sim-plusargs on CLI'''
@@ -266,7 +273,7 @@ class TestsRequiresVerilator( # pylint: disable=too-many-public-methods
         rc = eda.main('multi', 'sim', '--fail-if-no-targets', '--seed=1', '--xilinx', '--tool',
                       'verilator', 'oclib_fifo_test')
         print(f'{rc=}')
-        assert rc != 0
+        assert rc > 1
 
     def test_args_multi_sim_no_targets_should_fail(self):
         '''Checks that: eda multi --fail-if-no-targets; will fail if no targets expanded'''
@@ -275,7 +282,7 @@ class TestsRequiresVerilator( # pylint: disable=too-many-public-methods
         rc = eda.main('multi', 'sim', '--fail-if-no-targets', '--seed=1', '--tool', 'verilator',
                       'no_targets*')
         print(f'{rc=}')
-        assert rc != 0
+        assert rc > 1
 
     def test_elab_verilator_no_deps_files_involved(self):
         '''Test that inferring the --top from last file in provides files works.'''
@@ -295,7 +302,7 @@ class TestsRequiresVerilator( # pylint: disable=too-many-public-methods
         eda_config_yml_path = os.path.join(
             os.getcwd(), 'eda.work', 'oclib_fifo.elab', 'eda_output_config.yml'
         )
-        data = util.yaml_safe_load(eda_config_yml_path)
+        data = yaml_safe_load(eda_config_yml_path)
         assert 'args' in data
         assert data['args'].get('top', '') == 'oclib_fifo'
         assert 'config' in data
@@ -315,7 +322,7 @@ class TestsRequiresVerilator( # pylint: disable=too-many-public-methods
         eda_config_yml_path = os.path.join(
             os.getcwd(), 'eda.work', 'oclib_fifo.elab', 'eda_output_config.yml'
         )
-        data = util.yaml_safe_load(eda_config_yml_path)
+        data = yaml_safe_load(eda_config_yml_path)
         assert 'args' in data
         assert data['args'].get('top', '') == 'oclib_fifo'
         assert 'config' in data
@@ -333,7 +340,7 @@ class TestsRequiresVerilator( # pylint: disable=too-many-public-methods
         cmd_list +=' oclib_assert_pkg.sv oclib_pkg.sv oclib_fifo.sv'.split()
         rc = eda.main(*cmd_list)
         print(f'{rc=}')
-        assert rc != 0
+        assert rc > 1
 
     def test_config_reduced_yml(self):
         '''Test using provided EDA --config-yml=eda_config_reduced.yml, confirm installed w/ pip'''
@@ -360,7 +367,7 @@ class TestsRequiresVerilator( # pylint: disable=too-many-public-methods
         assert rc == 0
         eda_config_yml_path = os.path.join(os.getcwd(), 'eda.work', 'oclib_fifo_test.sim',
                                            'eda_output_config.yml')
-        data = util.yaml_safe_load(eda_config_yml_path)
+        data = yaml_safe_load(eda_config_yml_path)
         # make sure this config was actually used. We no longer re-add it to args
         # (it won't show up in 'original_args') it will will show up in the config though:
         used_yml_fname = data['config']['config-yml']
@@ -427,10 +434,10 @@ class TestMissingDepsFileErrorMessages(Helpers):
         '''Looks for target_bad0, but there is no DEPS file in .'''
         self.chdir()
         rc = self.log_it(command_str='export target_bad0')
-        assert rc != 0
+        assert rc > 1
         assert self.is_in_log(
-            'Trying to resolve command-line target=./target_bad0: was not found',
-            'in deps_file=None, possible targets in deps file = []',
+            'Trying to resolve command-line target=./target_bad0:'
+            ' but path ./ has no DEPS markup file',
             windows_path_support=True
         )
 
@@ -478,7 +485,7 @@ class TestDepsResolveErrorMessages(Helpers):
         '''Tests missing file in DEPS target using implicit deps str style'''
         self.chdir()
         rc = self.log_it(command_str='export target_bad0')
-        assert rc != 0
+        assert rc > 1
         assert self.is_in_log(
             "target=./missing0.sv (file?): called from ./DEPS.yml::target_bad0::line=20,",
             "File=missing0.sv not found in directory=.",
@@ -489,7 +496,7 @@ class TestDepsResolveErrorMessages(Helpers):
         '''Tests missing file in DEPS target using implicit deps list style'''
         self.chdir()
         rc = self.log_it(command_str='export target_bad1')
-        assert rc != 0
+        assert rc > 1
         assert self.is_in_log(
             "target=./missing1.sv (file?): called from ./DEPS.yml::target_bad1::line=24,",
             "File=missing1.sv not found in directory=.",
@@ -500,7 +507,7 @@ class TestDepsResolveErrorMessages(Helpers):
         '''Tests missing file in DEPS target using deps as str style'''
         self.chdir()
         rc = self.log_it(command_str='export target_bad2')
-        assert rc != 0
+        assert rc > 1
         assert self.is_in_log(
             "target=./missing2.sv (file?): called from ./DEPS.yml::target_bad2::line=28,",
             "File=missing2.sv not found in directory=.",
@@ -511,7 +518,7 @@ class TestDepsResolveErrorMessages(Helpers):
         '''Tests missing file in DEPS target using deps as list style'''
         self.chdir()
         rc = self.log_it(command_str='export target_bad3')
-        assert rc != 0
+        assert rc > 1
         assert self.is_in_log(
             "target=./missing3.sv (file?): called from ./DEPS.yml::target_bad3::line=33,",
             "File=missing3.sv not found in directory=.",
@@ -522,7 +529,7 @@ class TestDepsResolveErrorMessages(Helpers):
         '''EDA on a bad target (bad target within deps of 'target_bad4'), explicit deps str'''
         self.chdir()
         rc = self.log_it(command_str='export target_bad4')
-        assert rc != 0
+        assert rc > 1
         assert self.is_in_log(
             "target=./missing_target4: called from ./DEPS.yml::target_bad4::line=39,",
             "Target not found in deps_file=./DEPS.yml",
@@ -533,7 +540,7 @@ class TestDepsResolveErrorMessages(Helpers):
         '''EDA on a bad target (bad target within deps of 'target_bad4'), explicit deps list'''
         self.chdir()
         rc = self.log_it(command_str='export target_bad5')
-        assert rc != 0
+        assert rc > 1
         assert self.is_in_log(
             "target=./missing_target5: called from ./DEPS.yml::target_bad5::line=43,",
             "Target not found in deps_file=./DEPS.yml",
@@ -544,7 +551,7 @@ class TestDepsResolveErrorMessages(Helpers):
         '''EDA on a bad target (bad target within deps of 'target_bad4'), deps str'''
         self.chdir()
         rc = self.log_it(command_str='export target_bad6')
-        assert rc != 0
+        assert rc > 1
         assert self.is_in_log(
             "target=./missing_target6: called from ./DEPS.yml::target_bad6::line=47,",
             "Target not found in deps_file=./DEPS.yml",
@@ -556,7 +563,7 @@ class TestDepsResolveErrorMessages(Helpers):
         '''EDA on a bad target (bad target within deps of 'target_bad4'), deps list'''
         self.chdir()
         rc = self.log_it(command_str='export target_bad7')
-        assert rc != 0
+        assert rc > 1
         assert self.is_in_log(
             "target=./missing_target7: called from ./DEPS.yml::target_bad7::line=52,",
             "Target not found in deps_file=./DEPS.yml",
@@ -579,7 +586,7 @@ class TestDepsResolveErrorMessages(Helpers):
         '''EDA calling a non-existent target in DEPS file'''
         self.chdir()
         rc = self.log_it(command_str='export nope_target0')
-        assert rc != 0
+        assert rc > 1
         assert self.is_in_log(
             "Trying to resolve command-line target=./nope_target0: was not",
             "found in deps_file=./DEPS.yml, possible targets in deps file = ['foo'",
@@ -590,7 +597,7 @@ class TestDepsResolveErrorMessages(Helpers):
         '''EDA calling a non-existent target in DEPS file, with file that exists.'''
         self.chdir()
         rc = self.log_it(command_str='export foo.sv nope_target1')
-        assert rc != 0
+        assert rc > 1
         assert self.is_in_log(
             "Trying to resolve command-line target=./nope_target1: was not",
             "found in deps_file=./DEPS.yml, possible targets in deps file = ['foo'",
@@ -601,7 +608,7 @@ class TestDepsResolveErrorMessages(Helpers):
         '''EDA calling a non-existent file w/out DEPS'''
         self.chdir()
         rc = self.log_it(command_str='export nope_file0.sv')
-        assert rc != 0
+        assert rc > 1
         assert self.is_in_log(
             "Trying to resolve command-line target=./nope_file0.sv",
             "(file?): File=nope_file0.sv not found in directory=.",
@@ -612,7 +619,7 @@ class TestDepsResolveErrorMessages(Helpers):
         '''EDA calling a non-existent file w/out DEPS, and a file that does exist.'''
         self.chdir()
         rc = self.log_it(command_str='export foo2.sv nope_file1.sv')
-        assert rc != 0
+        assert rc > 1
         assert self.is_in_log(
             "Trying to resolve command-line target=./nope_file1.sv",
             "(file?): File=nope_file1.sv not found in directory=.",
@@ -680,14 +687,14 @@ class TestDepsReqs:
         chdir_remove_work_dir('deps_files/non_sv_reqs')
         cmd_list = 'sim should_fail_foo_test5'.split()
         rc = eda.main(*cmd_list)
-        assert rc != 0
+        assert rc > 1
 
     def test_deps_reqs6(self):
         '''Test that should fail due bad file in deps section (none in reqs)'''
         chdir_remove_work_dir('deps_files/non_sv_reqs')
         cmd_list = 'sim should_fail_foo_test6'.split()
         rc = eda.main(*cmd_list)
-        assert rc != 0
+        assert rc > 1
 
 
 @pytest.mark.parametrize("command", ['sim', 'shell'])
@@ -815,19 +822,19 @@ class TestDepsNoFilesTargets(Helpers):
         # Using this b/c DEPS.toml has single target.
         chdir_remove_work_dir('./deps_files/test_deps_toml')
         rc = eda_wrap('sim', '--tool', 'verilator', 'target_whoops')
-        assert rc == 1
+        assert rc > 1
 
     def test_eda_sim__no_files_or_targets_shouldfail(self):
         '''This test should fail, there is DEPS.yml (empty, no implicit target), or missing file'''
         chdir_remove_work_dir('./deps_files/no_deps_here')
         rc = eda_wrap('sim', '--tool', 'verilator')
-        assert rc == 1
+        assert rc > 1
 
     def test_eda_sim__no_files_or_targets_with_top_shouldfail(self):
         '''This test should fail, there is DEPS.yml (empty, no implicit target), or missing file'''
         chdir_remove_work_dir('./deps_files/no_deps_here')
         rc = eda_wrap('sim', '--tool', 'verilator', '--top', 'empty_file')
-        assert rc == 1
+        assert rc > 1
 
 
 class TestDepsTags(Helpers):

opencos/tests/test_eda_elab.py

@@ -22,7 +22,8 @@ list_of_elab_tools = [
     'slang',
     'verilator',
     'vivado',
-    'modelsim_ase',
+    'modelsim_ase'
+    'questa_fse',
     'invio',
     'surelog',
     'invio_yosys',
@@ -80,7 +81,9 @@ def test_elab_tool_cant_run_sim(tool):
     rc = 0
     try:
         rc = eda_wrap('sim', '--tool', tool, 'oclib_fifo')
+        print(f'{rc=}')
+        assert rc > 1
     except NotImplementedError:
-        rc = 1
-    print(f'{rc=}')
-    assert rc != 0
+        rc = 3
+        print(f'{rc=} (forced to 3 for NotImplementedError)')
+    assert rc > 1

opencos/tests/test_eda_synth.py

@@ -53,7 +53,7 @@ class Tests:
                    ' target_doesnt_exist*').split()
         rc = eda.main(*cmdlist)
         print(f'{rc=}')
-        assert rc != 0
+        assert rc > 1
 
     def test_args_multi_synth_oclib_fifos(self, tool, command):
         '''This should be 4 jobs and takes ~15 seconds for synth.'''

opencos/tests/test_oc_cli.py

@@ -6,7 +6,7 @@ If you want to run this, consider running from the root of opencos repo:
 which avoids using any pip installed opencos.eda
 '''
 
-from opencos import oc_cli
+from opencos.hw import oc_cli
 
 def test_args_help():
     '''simple test for: oc_cli --help'''

opencos/tests/test_tools.py

@@ -6,12 +6,13 @@ import os
 import sys
 import pytest
 
-from opencos import eda, util, eda_tool_helper, eda_base
+from opencos import eda, eda_tool_helper, eda_base
 
 from opencos.tools.verilator import ToolVerilator
 from opencos.tools.vivado import ToolVivado
 from opencos.tests import helpers
 from opencos.tests.helpers import eda_wrap
+from opencos.utils.markup_helpers import yaml_safe_load
 
 
 thispath = os.path.dirname(__file__)
@@ -72,6 +73,7 @@ list_of_tools = [
     'verilator',
     'vivado',
     'modelsim_ase',
+    'questa_fse',
 ]
 
 list_of_deps_targets = [
@@ -129,7 +131,7 @@ def test_vivado_tool_defines():
         os.getcwd(), 'eda.work', 'oclib_fifo.elab', 'eda_output_config.yml'
     )
 
-    data = util.yaml_safe_load(eda_config_yml_path)
+    data = yaml_safe_load(eda_config_yml_path)
     assert 'args' in data
     assert data['args'].get('top', '') == 'oclib_fifo'
     assert 'config' in data

opencos/tools/iverilog.py

@@ -7,9 +7,9 @@ import shutil
 import subprocess
 
 from opencos import util
-from opencos.util import sanitize_defines_for_sh
 from opencos.eda_base import Tool
 from opencos.commands import CommandSim
+from opencos.utils.str_helpers import sanitize_defines_for_sh
 
 
 class ToolIverilog(Tool):
@@ -108,7 +108,7 @@ class CommandSimIverilog(CommandSim, ToolIverilog):
             ]
         )
 
-        util.write_eda_config_and_args(dirpath=self.args['work-dir'], command_obj_ref=self)
+        self.write_eda_config_and_args()
 
     def compile(self):
         if self.args['stop-before-compile']: