opencos-eda 0.2.41__py3-none-any.whl → 0.2.43__py3-none-any.whl

opencos/eda_base.py

@@ -667,13 +667,15 @@ class CommandDesign(Command):
         self.args.update({
             'seed': seed.get_seed(style="urandom"),
             'top': '',
-            'all-sv': False,
+            'all-sv': True,
             'unprocessed-plusargs': [],
         })
         self.args_help.update({
             'seed':   'design seed, default is 31-bit non-zero urandom',
             'top':    'TOP level verilog/SV module or VHDL entity for this target',
-            'all-sv': 'Maintain .sv and .v in single file list. (if False: .sv flist separate from .v flist)',
+            'all-sv': ('Maintain .sv and .v in single file list.'
+                       ' False: .sv flist separate from .v flist and separate compile(s)'
+                       ' True: .sv and .v files compiled together if possible'),
             'unprocessed-plusargs': 'Args that began with +, but were not +define+ or +incdir+, +<name>, ' \
             + ' or +<name>=<value>. These become tool dependent, for example "sim" commands will treat as sim-plusargs',
         })
@@ -694,6 +696,7 @@ class CommandDesign(Command):
 
         self.cached_deps = {} # key = abspath of DEPS markup file, has sub-dicts for 'data' and 'line_numbers'.
         self.targets_dict = {} # key = targets that we've already processed in DEPS files
+        self.last_added_source_file_inferred_top = ''
 
     def run_dep_commands(self):
         # Run any shell@ commands from DEPS files
@@ -1034,6 +1037,11 @@ class CommandDesign(Command):
             file_ext = known_file_ext_dict.get(forced_extension, [''])[0]
             util.debug(f"{forced_extension=} for {filename=} as type '{file_ext}'")
 
+
+        if not add_to_non_sources and \
+           file_ext in known_file_ext_dict.get('inferred_top', []):
+            self.last_added_source_file_inferred_top = file_abspath
+
         if add_to_non_sources:
             self.files_non_source.append(file_abspath)
             util.debug("Added non-source file file %s as %s" % (filename, file_abspath))
@@ -1112,8 +1120,8 @@ class CommandDesign(Command):
 
         # by this point hopefully this is a target ... is it a simple filename?
         remove_list = []
-        last_potential_top = None # used for 'top' if top not specified.
-        last_potential_top_path = None
+        last_potential_top_file = ('', '')   # (top, fpath)
+        last_potential_top_target = ('', '') # (top, path/to/full-target-name)
         last_potential_top_isfile = False
         caller_info = ''
         for token in unparsed:
@@ -1129,21 +1137,13 @@ class CommandDesign(Command):
                 else:
                     self.add_file(filename=fpath, caller_info=caller_info,
                                   forced_extension=forced_extension)
-
-                    known_file_ext_dict = self.config.get('file_extensions', {})
-                    if forced_extension:
-                        # If forced_extension='systemverilog', then use the first known extension for
-                        # it ('.sv', from eda_config_defaults.yml):
-                        file_ext = known_file_ext_dict.get(forced_extension, [''])[0]
-
-                    if not self.args['top'] and \
-                       file_ext and \
-                       file_ext in known_file_ext_dict.get('inferred_top', []):
-                        # if we haven't yet been given a top, or inferred one, we take the last one we get
-                        # from a raw list of RTL file names (from args or command line tokens)
-                        last_potential_top_path = file_abspath
-                        last_potential_top = self.get_top_name(file_abspath)
-                        last_potential_top_isfile = True
+                    if not self.args['top']:
+                        known_file_ext_dict = self.config.get('file_extensions', {})
+                        if forced_extension:
+                            file_ext = known_file_ext_dict.get(forced_extension, [''])[0]
+                        if file_ext in known_file_ext_dict.get('inferred_top', []):
+                            # last cmd line arg was a filename that could have inferred top.
+                            last_potential_top_isfile = True
 
                     remove_list.append(token)
                     continue # done with token, consume it, we added the file.
@@ -1156,12 +1156,9 @@ class CommandDesign(Command):
 
             util.debug(f'Calling self.resolve_target on {target_name=}')
             if self.resolve_target(target_name, caller_info=caller_info):
-                if self.args['top'] == '':
-                    # if we haven't yet been given a top, or inferred one, we take the last named target
-                    # from args or command line tokens
-                    # from a target name
-                    last_potential_top = self.get_top_name(target_name)
-                    last_potential_top_path = target_name
+                if not self.args['top']:
+                    # last cmd line arg was a target that we'll likely use for inferred top.
+                    last_potential_top_target = (self.get_top_name(target_name), target_name)
                     last_potential_top_isfile = False
 
                 remove_list.append(token)
@@ -1174,16 +1171,35 @@ class CommandDesign(Command):
         if process_all and len(unparsed) > 0:
             self.error(f"Didn't understand command remaining tokens {unparsed=} in CommandDesign")
 
-        # handle a missing self.args['top'] with last filepath.
-        if self.args.get('top', '') == '' and last_potential_top is not None:
-            self.args['top'] = last_potential_top
-            self.args['top-path'] = last_potential_top_path
-            util.info(f"Inferred --top {self.args['top']} {self.args['top-path']}")
-            if last_potential_top_isfile:
-                # top wasn't set, we're using the final command-line 'arg' filename (not from DEPS.yml)
-                # need to override self.target if that was set. Otherwise it won't save to the correct
-                # work-dir:
-                self.target = last_potential_top
+        # handle a missing self.args['top'] with last filepath or last target:
+        if not self.args.get('top', ''):
+            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
+                util.info("--top not specified, inferred from target:",
+                          f"{self.args['top']} ({self.args['top-path']})")
+
+            else:
+                best_top_fname = self.last_added_source_file_inferred_top
+                if best_top_fname:
+                    last_potential_top_file = (self.get_top_name(best_top_fname), best_top_fname)
+
+            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)
+                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']})")
+                    # 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']
+
         if self.error_on_missing_top and not self.args.get('top', ''):
             self.error(f"Did not get a --top or DEPS top, required to run command",
                        f"'{self.command_name}' for tool={self.args.get('tool', None)}")

opencos/tests/helpers.py

@@ -19,7 +19,7 @@ def can_run_eda_command(*commands, config: dict) -> bool:
         if not handler:
             return False
         if handler and getattr(handler, 'CHECK_REQUIRES', []):
-            if not all(isinstance(handler, x) for x in getattr(handler, 'CHECK_REQUIRES', [])):
+            if not all(issubclass(handler, x) for x in getattr(handler, 'CHECK_REQUIRES', [])):
                 return False
         runnable.append(True)
     return runnable and all(runnable)

opencos/tools/verilator.py

@@ -166,6 +166,10 @@ class VerilatorSim(CommandSim, ToolVerilator):
             # don't run this if we're stopping before/after compile/elab
             return
 
+        if not os.path.isfile(os.path.join(self.args['work-dir'], 'obj_dir', 'sim.exe')):
+            self.error('Verilated executable obj_dir/sim.exe does not exist')
+            return
+
         # Note that this is not returning a pass/fail bash return code,
         # so we will likely have to log-scrape to deterimine pass/fail.
         # Also, if we ran in cc-mode, we will not get the "R e p o r t: Verilator"

opencos/tools/vivado.py

@@ -142,6 +142,7 @@ class CommandSimVivado(CommandSim, ToolVivado):
             'tcl-file':   'sim.tcl',
             'fpga':       '',
             'add-glbl-v': False,
+            'all-sv':     False,
         })
         self.args_help.update({
             'gui':        'Run Vivado XSim in GUI mode',
@@ -362,6 +363,7 @@ class CommandSynthVivado(CommandSynth, ToolVivado):
         self.args['tcl-file'] = "synth.tcl"
         self.args['xdc'] = ""
         self.args['fpga'] = ""
+        self.args['all-sv'] = False
 
     def do_it(self) -> None:
         CommandSynth.do_it(self)
@@ -533,6 +535,7 @@ class CommandProjVivado(CommandProj, ToolVivado):
         self.args['tcl-file'] = "proj.tcl"
         self.args['xdc'] = ""
         self.args['board'] = ""
+        self.args['all-sv'] = False
 
     def do_it(self):
         # add defines for this job
@@ -614,6 +617,7 @@ class CommandBuildVivado(CommandBuild, ToolVivado):
         self.args['fpga'] = ""
         self.args['proj'] = False
         self.args['reset'] = False
+        self.args['all-sv'] = False
 
     def do_it(self):
         # add defines for this job
@@ -700,6 +704,7 @@ class CommandFListVivado(CommandFList, ToolVivado):
     def __init__(self, config: dict):
         CommandFList.__init__(self, config=config)
         ToolVivado.__init__(self, config=self.config)
+        self.args['all-sv'] = False
 
 
 class CommandUploadVivado(CommandUpload, ToolVivado):
@@ -720,6 +725,7 @@ class CommandUploadVivado(CommandUpload, ToolVivado):
             'host': "localhost",
             'port': 3121,
             'tcl-file': "upload.tcl",
+            'all-sv': False,
         })
         # TODO(drew): Add self.args_help.update({...})
 
@@ -913,6 +919,7 @@ class CommandOpenVivado(CommandOpen, ToolVivado):
         # add args specific to this simulator
         self.args['gui'] = True
         self.args['file'] = False
+        self.args['all-sv'] = False
 
     def do_it(self):
         if not self.args['file']:

opencos/util.py

@@ -635,6 +635,38 @@ def write_eda_config_and_args(dirpath : str, filename='eda_output_config.yml', c
     yaml_safe_writer(data=data, filepath=fullpath)
 
 
+def get_inferred_top_module_name(module_guess: str, module_fpath: str) -> str:
+    '''Returns the best guess as the 'top' module name name, given a fpath where
+
+    module_fpath = /some/path/to/module_guess.[v|sv]
+
+    Use the module_guess if it exists in the file as: module <module_guess>
+    Otherwise use the last observed: module <best_guess>
+    Otherwise use blank str
+    '''
+
+    best_guess = ''
+    if not os.path.isfile(module_fpath):
+        return ''
+    with open(module_fpath, encoding='utf-8') as f:
+        for line in f.readlines():
+            line = line.strip()
+            if line.startswith('module '):
+                parts = line.split()
+                module_name = parts[1]
+                rstrip_nonword_pattern = r'\W+$'
+                module_name = re.sub(rstrip_nonword_pattern, '', module_name)
+                if bool(re.fullmatch(r'^\w+$', module_name)):
+                    if module_name == module_guess:
+                        return module_guess
+                    elif module_name:
+                        best_guess = module_name
+    if best_guess:
+        return best_guess
+    else:
+        return ''
+
+
 def subprocess_run(work_dir, command_list, fake:bool=False, shell=False) -> int:
     ''' Run command_list in the foreground, with preference to use bash if shell=True.'''
 

{opencos_eda-0.2.41.dist-info → opencos_eda-0.2.43.dist-info}/METADATA

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

@@ -4,7 +4,7 @@ opencos/_waves_pkg.sv,sha256=1lbhQOVGc3t_R8czYjP40hssP0I3FlZOpHTkI7yKFbI,1251
 opencos/deps_helpers.py,sha256=Pgo3dO_QBHzGB0lE2B0uf2vWWDy3dSDN0pvW-eA6ocs,56939
 opencos/deps_schema.py,sha256=MhytzXwp071F14RwxqHt78ak8Qruoe4FeK5XSzkO2f0,14658
 opencos/eda.py,sha256=WAmHCywd3mfgEH4oZgiCDDprXbH-EIjduYpBXlwzhE8,19133
-opencos/eda_base.py,sha256=I5BnL50SfJniU-I4_7kKvhBqNpev-MZcX9SMhSsDPrU,82373
+opencos/eda_base.py,sha256=jtBKhlOMuE9G6_BgTpy-6SfkwnmMIoRKkmr1nLMnFHA,83276
 opencos/eda_config.py,sha256=fFKe-IdZb3RpOYjefCy_G1NrVzPcuHyXtAQp917GEuQ,8850
 opencos/eda_config_defaults.yml,sha256=U3QttzoxFH0hjElzaejaNa7XStgdX8EYULeRvZGPVUM,11087
 opencos/eda_config_max_verilator_waivers.yml,sha256=lTAU4IOEbUWVlPzuer1YYhIyxpPINeA4EJqcRIT-Ymk,840
@@ -20,7 +20,7 @@ opencos/oc_cli.py,sha256=kj2OXvgxli2WPj4MQ4zTBb36eFtsP2gsqDdeNeWGL4E,132108
 opencos/pcie.py,sha256=VUJljaZJYgScAAx5yn7F6GoA8K9eTcw24otYZbkMpYs,3035
 opencos/peakrdl_cleanup.py,sha256=vLhSOVs6cEzsi_PwAP4pSXu5_ZMZjDvfK_WmHDLbDac,486
 opencos/seed.py,sha256=8TA2uXhBuT_lOaQdAKqdReYvfBWi_KuyQCFJzA2rOVM,549
-opencos/util.py,sha256=3rADW0tUzq69wdHsa2GB060N1jCAK2Dk0NLx6N6BMcc,27861
+opencos/util.py,sha256=2Lm6rTZDWxkMBM22HYyI0a4ZC24XIXmdNuUUA_hmkcE,29010
 opencos/commands/__init__.py,sha256=d-8heMkBjjm6_yeduZgUv34lPfHVpj9MWP1ifpdjJws,916
 opencos/commands/build.py,sha256=jI5ul53qfwn6X-yfSdSQIcLBhGtzZUk7r_wKBBmKJI0,1425
 opencos/commands/elab.py,sha256=m6Gk03wSzX8UkcmReooK7turF7LpqO0IcdOZwJ8XiyI,1596
@@ -37,7 +37,7 @@ opencos/commands/upload.py,sha256=nlb4nlxrDCQPcabEmH3nP19g4PFILDqFDab4LwJ95Z4,79
 opencos/commands/waves.py,sha256=SRfjfsqhuszXHylQrgqYiUT3a5CQs9doxJQzuV4Ae0w,7055
 opencos/tests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 opencos/tests/custom_config.yml,sha256=TRoVM9ZFKPOA_8JmlpzaMhnGO1txmaD14N_8P1oqzew,257
-opencos/tests/helpers.py,sha256=zzQQP8ZeNUwrvJRQVlpTnvz9yxFG0Jfuss50ZPjxa-c,8240
+opencos/tests/helpers.py,sha256=4HprNNHHgQEcFgtOC_NH8OZGb4Shn-ZNOKEjAtCZWWs,8240
 opencos/tests/test_build.py,sha256=FQAxOpLVQShAHD_L5rqJctPeSAoqoOCNFI0RXflLuY0,387
 opencos/tests/test_deps_helpers.py,sha256=_nJSgLN6WVlMKqu6sCr29gjQyN3Jj-dVk8Ac64ygpJs,5928
 opencos/tests/test_deps_schema.py,sha256=mWTWI4wriGXC8UAnaeq_MIvWJOvf08-fPUqUgELptQ4,896
@@ -65,13 +65,13 @@ opencos/tools/slang.py,sha256=74EDAAnN7mrrYxgxaPDaoRJZK7Se9B_HsW8Ioi2Nw44,7425
 opencos/tools/slang_yosys.py,sha256=mw4AfutGjKyCj7NLrHDy2j3p0XC2H7uuBf9RkVQJYoQ,9856
 opencos/tools/surelog.py,sha256=JOMs8SqnzJ_ZL5mEdyyn3Z1r1Kc8hfbV3Pnen1YzxWA,4980
 opencos/tools/tabbycad_yosys.py,sha256=h9kkAi479cZzYfb4R9WBNY_JmR6BgVFj4s3VShnGpoA,7813
-opencos/tools/verilator.py,sha256=lxR7BSmeTc6YcL0UuXzIfJk7umVm8RfbU8rtYtbKUBg,18192
-opencos/tools/vivado.py,sha256=1dbQ-5oUUaUNIeMp07HArWG15spG81OuCwJ88qRNXU0,39102
+opencos/tools/verilator.py,sha256=DszHtJdLJg-UogRaB_jhel-qXn4KEiiAgj91uqB52R8,18380
+opencos/tools/vivado.py,sha256=ZRr2b7dCbDL4YQReHdkCnF06XMcsEduRowtm_UI8WOM,39344
 opencos/tools/yosys.py,sha256=aZnRFbsODYRe4BHbfxl6vfWeEP7WJYJk50gCZcn8Fu0,8902
-opencos_eda-0.2.41.dist-info/licenses/LICENSE,sha256=HyVuytGSiAUQ6ErWBHTqt1iSGHhLmlC8fO7jTCuR8dU,16725
-opencos_eda-0.2.41.dist-info/licenses/LICENSE.spdx,sha256=8gn1610RMP6eFgT3Hm6q9VKXt0RvdTItL_oxMo72jII,189
-opencos_eda-0.2.41.dist-info/METADATA,sha256=RqZ9aufOroQoOauG7xsz2gGxPll_wY7svb6i0YsLGqw,604
-opencos_eda-0.2.41.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-opencos_eda-0.2.41.dist-info/entry_points.txt,sha256=V8OE1lySAFcFQpDNJuVxVZteeSmDH-joLMhGvrxrvmg,164
-opencos_eda-0.2.41.dist-info/top_level.txt,sha256=J4JDP-LpRyJqPNeh9bSjx6yrLz2Mk0h6un6YLmtqql4,8
-opencos_eda-0.2.41.dist-info/RECORD,,
+opencos_eda-0.2.43.dist-info/licenses/LICENSE,sha256=HyVuytGSiAUQ6ErWBHTqt1iSGHhLmlC8fO7jTCuR8dU,16725
+opencos_eda-0.2.43.dist-info/licenses/LICENSE.spdx,sha256=8gn1610RMP6eFgT3Hm6q9VKXt0RvdTItL_oxMo72jII,189
+opencos_eda-0.2.43.dist-info/METADATA,sha256=jc6AEx0fn-xauyw9Y-JQ0FckIisJl68OPQ4Td0KP2eE,604
+opencos_eda-0.2.43.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+opencos_eda-0.2.43.dist-info/entry_points.txt,sha256=V8OE1lySAFcFQpDNJuVxVZteeSmDH-joLMhGvrxrvmg,164
+opencos_eda-0.2.43.dist-info/top_level.txt,sha256=J4JDP-LpRyJqPNeh9bSjx6yrLz2Mk0h6un6YLmtqql4,8
+opencos_eda-0.2.43.dist-info/RECORD,,