opencos-eda 0.2.45__py3-none-any.whl → 0.2.47__py3-none-any.whl

opencos/deps_helpers.py

@@ -68,6 +68,9 @@ class Defaults:
         'shell',
         'work-dir-add-srcs', 'work-dir-add-sources',
         'peakrdl',
+        'run-from-work-dir',     # default True
+        'filepath-subst-target-dir', # default True
+        'dirpath-subst-target-dir',  # default False
         'var-subst-args',
         'var-subst-os-env',
         'tee',
@@ -383,24 +386,38 @@ def deps_list_target_sanitize(entry, default_key:str='deps', target_node:str='',
     assert False, f"Can't convert to list {entry=} {default_key=} {target_node=} {deps_file=}"
 
 
-def path_substitutions_relative_to_work_dir(exec_list : list, info_str : str, target_path : str):
+def path_substitutions_relative_to_work_dir(
+        exec_list: list, info_str: str, target_path: str,
+        enable_filepath_subst: bool, enable_dirpath_subst: bool
+) -> list:
+
+    if not enable_filepath_subst and not enable_dirpath_subst:
+        return exec_list
 
     # Look for path substitutions, b/c we later "work" in self.args['work-dir'], but
     # files should be relative to our target_path.
-    for iter,word in enumerate(exec_list):
+    for i,word in enumerate(exec_list):
         m = re.search(r'(\.+\/+[^"\;\:\|\<\>\*]*)$', word)
         if m:
             # ./, ../, file=./../whatever  It might be a filepath.
             # [^"\;\:\|\<\>\*] is looking for non-path like characters, so we dont' have a trailing
             #  " : ; < > |
-            # try and see if this file exists. Note that files in the self.args['work-dir'] don't
+            # try and see if this file or dir exists. Note that files in the self.args['work-dir'] don't
             # need this, and we can't assume dir levels in the work-dir.
             try:
                 try_path = os.path.abspath(os.path.join(os.path.abspath(target_path), m.group(1)))
-                if os.path.isfile(try_path):
+                if enable_filepath_subst and  os.path.isfile(try_path):
                     # make the substitution
-                    exec_list[iter] = word.replace(m.group(1), try_path)
-                    debug(f'path substitution {info_str=} {target_path=}: replaced - {word=} is now ={exec_list[iter]}')
+                    exec_list[i] = word.replace(m.group(1), try_path)
+                    debug(f'file path substitution {info_str=} {target_path=}: replaced - {word=}'
+                          f'is now ={exec_list[i]}. This can be disabled in DEPS with:',
+                          '"filepath-subst-targetdir: false"')
+                elif enable_dirpath_subst and os.path.isdir(try_path):
+                    # make the substitution
+                    exec_list[i] = word.replace(m.group(1), try_path)
+                    debug(f'dir path substitution {info_str=} {target_path=}: replaced - {word=}'
+                          f'is now ={exec_list[i]}. This can be disabled in DEPS with:',
+                          '"dirpath-subst-targetdir: false"')
             except:
                 pass
 
@@ -1033,7 +1050,10 @@ class DepsProcessor:
 
 
 
-def parse_deps_shell_str(line : str, target_path : str, target_node : str, enable : bool = True):
+def parse_deps_shell_str(line: str, target_path: str, target_node: str,
+                         enable_filepath_subst_target_dir: bool = True,
+                         enable_dirpath_subst_target_dir: bool = False,
+                         enable: bool = True) -> dict:
     '''Returns None or a dict of a possible shell command from line (str)
 
      Examples of 'line' str:
@@ -1049,24 +1069,30 @@ def parse_deps_shell_str(line : str, target_path : str, target_node : str, enabl
     target_node (str) -- from dependency parsing, the target containing this 'line' str.
     '''
     if not enable:
-        return None
+        return {}
 
     m = re.match(r'^\s*shell\@(.*)\s*$', line)
     if not m:
-        return None
+        return {}
 
     exec_str = m.group(1)
     exec_list = exec_str.split()
 
     # Look for path substitutions, b/c we later "work" in self.args['work-dir'], but
     # files should be relative to our target_path.
-    exec_list = path_substitutions_relative_to_work_dir(exec_list=exec_list, info_str='shell@', target_path=target_path)
+    # Note this can be disable in DEPS via path-subst-target-dir=False
+    exec_list = path_substitutions_relative_to_work_dir(
+        exec_list=exec_list, info_str='shell@', target_path=target_path,
+        enable_filepath_subst=enable_filepath_subst_target_dir,
+        enable_dirpath_subst=enable_dirpath_subst_target_dir
+    )
 
-    d = {'target_path': os.path.abspath(target_path),
-         'target_node': target_node,
-         'exec_list': exec_list,
-         }
-    return d
+    return {
+        'target_path': os.path.abspath(target_path),
+        'target_node': target_node,
+        'run_from_work_dir': True, # may be overriden later.
+        'exec_list': exec_list,
+    }
 
 
 def parse_deps_work_dir_add_srcs(line : str, target_path : str, target_node : str, enable : bool = True):
@@ -1098,8 +1124,12 @@ def parse_deps_work_dir_add_srcs(line : str, target_path : str, target_node : st
     return d
 
 
-def parse_deps_peakrdl(line : str, target_path : str, target_node : str, enable : bool = True,
-                       tool : str = ''):
+def parse_deps_peakrdl(
+        line: str, target_path: str, target_node: str, enable: bool = True,
+        enable_filepath_subst_target_dir: bool = True,
+        enable_dirpath_subst_target_dir: bool = False,
+        tool: str = ''
+) -> dict:
     '''Returns None or a dict describing a PeakRDL CSR register generator dependency
 
      Examples of 'line' str:
@@ -1137,12 +1167,12 @@ def parse_deps_peakrdl(line : str, target_path : str, target_node : str, enable
 
     sv_files = list()
     top = ''
-    for iter,str_value in enumerate(args_list):
+    for i,str_value in enumerate(args_list):
         if '--top=' in str_value:
             _, top = str_value.split('=')
         elif '--top' in str_value:
-            if iter + 1 < len(args_list):
-                top = args_list[iter + 1]
+            if i + 1 < len(args_list):
+                top = args_list[i + 1]
 
     for str_item in args_list:
         if str_item[-4:] == '.rdl':
@@ -1170,10 +1200,13 @@ def parse_deps_peakrdl(line : str, target_path : str, target_node : str, enable
     # Make these look like a dep_shell_command:
     for one_cmd_as_list in shell_commands:
         ret_dict['shell_commands_list'].append(
-            parse_deps_shell_str(line = ' shell@ ' + ' '.join(one_cmd_as_list),
-                                 target_path = target_path,
-                                 target_node = target_node
-                                 )
+            parse_deps_shell_str(
+                line=(' shell@ ' + ' '.join(one_cmd_as_list)),
+                target_path=target_path,
+                target_node=target_node,
+                enable_filepath_subst_target_dir=enable_filepath_subst_target_dir,
+                enable_dirpath_subst_target_dir=enable_dirpath_subst_target_dir
+            )
         )
 
     # Make the work_dir_add_srcs dict:
@@ -1236,13 +1269,21 @@ def deps_commands_handler(config: dict, eda_args: dict,
 
         tee_fpath = command.get('tee', None)
 
-        for key,item in command.items():
+        # These are both optional bools, default True, would have to explicitly be set to False
+        # to take effect:
+        run_from_work_dir = command.get('run-from-work-dir', True)
+        filepath_subst_target_dir = command.get('filepath-subst-target-dir', True)
+        dirpath_subst_target_dir = command.get('dirpath-subst-target-dir', False)
 
-            # skip the var-subst-* keys, since these types are bools
-            if key.startswith('var-subst'):
-                continue
+        for key,item in command.items():
 
-            if key.startswith('tee'):
+            # skip the tee and var-subst-* keys, since these types are bools and not commands.
+            if key in ['tee',
+                       'var-subst-os-env',
+                       'var-subst-args',
+                       'run-from-work-dir',
+                       'filepath-subst-target-dir',
+                       'dirpath-subst-target-dir']:
                 continue
 
             # Optional variable substituion in commands
@@ -1253,15 +1294,18 @@ def deps_commands_handler(config: dict, eda_args: dict,
             if key == 'shell':
                 # For now, piggyback on parse_deps_shell_str:
                 ret_dict = parse_deps_shell_str(
-                    line = 'shell@ ' + item,
-                    target_path = target_path,
-                    target_node = target_node,
+                    line=('shell@ ' + item),
+                    target_path=target_path,
+                    target_node=target_node,
+                    enable_filepath_subst_target_dir=filepath_subst_target_dir,
+                    enable_dirpath_subst_target_dir=dirpath_subst_target_dir,
                     enable=config['dep_command_enables']['shell'],
                 )
                 # To support 'tee: <some-file>' need to append it to last
                 # list item in ret_dict['exec_list'], and make it a util.ShellCommandList.
                 if tee_fpath:
                     ret_dict['exec_list'] = ShellCommandList(ret_dict['exec_list'], tee_fpath=tee_fpath)
+                ret_dict['run_from_work_dir'] = run_from_work_dir
                 assert ret_dict, f'shell command failed in {dep=} {target_node=} in {deps_file=}'
                 shell_commands_list.append(ret_dict) # process this later, append to our to-be-returned tuple
 
@@ -1283,6 +1327,8 @@ def deps_commands_handler(config: dict, eda_args: dict,
                     line = 'peakrdl@ ' + item,
                     target_path = target_path,
                     target_node = target_node,
+                    enable_filepath_subst_target_dir=filepath_subst_target_dir,
+                    enable_dirpath_subst_target_dir=dirpath_subst_target_dir,
                     enable=config['dep_command_enables']['peakrdl'],
                     tool=eda_args.get('tool', '')
                 )

opencos/deps_schema.py

@@ -69,6 +69,14 @@ my_target_name:
       - shell:                       <---- string for shell command to be run
         var-subst-args:              <---- bool, perform var substitution using args
         var-subst-os-env:            <---- bool, perform var substitution using os.environ
+        run-from-work-dir:           <---- bool, default True, if False runs from target dir
+                                           instead of work-dir.
+        filepath-subst-target-dir:   <---- bool, default True, if False does not perform
+                                           file path substitution relative to target dir
+                                           (if substituted file exists).
+        dirpath-subst-target-dir:    <---- bool, default False, if True performs
+                                           directory path substitution relative to target dir
+                                           (if substituted directory exists).
         tee:                         <---- string, filename to write logs to
       - work-dir-add-sources:        <---- work-dir-add-sources, optional list (or string)
         - some_file_gen_from_sh.sv   <---- string filename that we created with sh command
@@ -150,6 +158,9 @@ DEPS_COMMANDS_LIST = [
         Optional('shell'): str,
         Optional('var-subst-args'): bool,
         Optional('var-subst-os-env'): bool,
+        Optional('run-from-work-dir'): bool,
+        Optional('filepath-subst-target-dir'): bool,
+        Optional('dirpath-subst-target-dir'): bool,
         Optional('tee'): Or(str, type(None)),
     },
     {

opencos/eda_base.py

@@ -716,8 +716,9 @@ class CommandDesign(Command):
 
         log_fnames_count = {} # count per target_node.
 
-        for iter, d in enumerate(self.dep_shell_commands):
+        for i, d in enumerate(self.dep_shell_commands):
             clist = util.ShellCommandList(d['exec_list'])
+            run_from_work_dir = d['run_from_work_dir'] # default True
             log = clist.tee_fpath
             target_node = d["target_node"]
             if clist.tee_fpath is None:
@@ -729,24 +730,38 @@ class CommandDesign(Command):
             all_cmds_lists += [
                 [], # blank line
                 # comment, where it came from, log to {node}__shell_{lognum}.log (or tee name from DEPS.yml)
-                [f'# command {iter}: target: {d["target_path"]} : {target_node} --> {log}'],
-                # actual command (list or util.ShellCommandList)
-                clist,
+                [f'# command {i}: target: {d["target_path"]} : {target_node} --> {log}'],
             ]
+            if not run_from_work_dir:
+                all_cmds_lists.append([f'cd {d["target_path"]}'])
+
+            # actual command (list or util.ShellCommandList)
+            all_cmds_lists.append(clist)
+
+            if not run_from_work_dir:
+                all_cmds_lists.append([f'cd {os.path.abspath(self.args["work-dir"])}'])
+
             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)
 
-        for iter,d in enumerate(self.dep_shell_commands):
-            util.info(f'run_dep_shell_commands {iter=}: {d=}')
+        for i,d in enumerate(self.dep_shell_commands):
+            util.info(f'run_dep_shell_commands {i=}: {d=}')
             clist = util.ShellCommandList(d['exec_list'])
+            tee_fpath=clist.tee_fpath
+            if d['run_from_work_dir']:
+                run_from_dir = self.args['work-dir']
+            else:
+                # Run from the target's directory (not the `eda` caller $PWD)
+                run_from_dir = d["target_path"]
+                tee_fpath = os.path.abspath(os.path.join(self.args['work-dir'], tee_fpath))
             # NOTE(drew): shell=True subprocess call, can disable with self.config
             if sys.platform.startswith('win'):
                 # for Windows, we run shell=True otherwise most built-in cmd.exe calls won't work.
-                self.exec(self.args['work-dir'], clist, tee_fpath=clist.tee_fpath, shell=True)
+                self.exec(run_from_dir, clist, tee_fpath=tee_fpath, shell=True)
             else:
-                self.exec(self.args['work-dir'], clist, tee_fpath=clist.tee_fpath,
+                self.exec(run_from_dir, clist, tee_fpath=tee_fpath,
                           shell=self.config.get('deps_subprocess_shell', False))
 
     def update_file_lists_for_work_dir(self):
@@ -766,10 +781,10 @@ class CommandDesign(Command):
         my_file_lists_list = [self.files_v, self.files_sv, self.files_vhd, self.files_cpp,
                               self.files_sdc]
         for my_file_list in my_file_lists_list:
-            for iter,value in enumerate(my_file_list):
+            for i,value in enumerate(my_file_list):
                 if value and type(value) is str and value.startswith(self._work_dir_add_srcs_path_string):
                     new_value = os.path.join(work_dir_abspath, value[_work_dir_add_srcs_path_string_len :])
-                    my_file_list[iter] = new_value
+                    my_file_list[i] = new_value
                     util.debug(f"file lists: replaced {value} with {new_value}")
 
     def update_non_source_files_in_work_dir(self):
@@ -1575,10 +1590,10 @@ class CommandParallel(Command):
         else:
             util.info(f"Parallel: <No jobs found>")
         # Make sure all jobs have a set status:
-        for iter,rc in enumerate(self.jobs_status):
+        for i,rc in enumerate(self.jobs_status):
             if rc is None or type(rc) != int:
-                self.error(f'job {iter=} {rc=} did not return a proper return code')
-                jobs_status[iter] = 1
+                self.error(f'job {i=} {rc=} did not return a proper return code')
+                jobs_status[i] = 1
 
         # if self.status > 0, then keep it non-zero, else set it if we still have running jobs.
         if self.status == 0:

opencos/eda_config_defaults.yml

@@ -62,6 +62,7 @@ file_extensions:
     - .vhdl
   cpp:
     - .cpp
+    - .cc
   synth_constraints:
     - .sdc
     - .xdc

opencos/tests/test_deps_helpers.py

@@ -14,7 +14,7 @@ from opencos import eda_tool_helper, deps_helpers
 
 THISPATH = os.path.dirname(__file__)
 
-# Figure out what tools the system has available, without calling eda.main(..)
+# Figure out what tools the system has avail, without calling eda.main(..)
 config, tools_loaded = eda_tool_helper.get_config_and_tools_loaded()
 
 
@@ -58,63 +58,100 @@ 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, '', '')
-    assert d is None, f'{d=}'
+    assert not d, f'{d=}'
 
     line = 'some_target:'
     d = deps_helpers.parse_deps_shell_str(line, '', '')
-    assert d is None, f'{d=}'
+    assert not d, f'{d=}'
 
     line = '   csr@some_file.sv'
     d = deps_helpers.parse_deps_shell_str(line, '', '')
-    assert d is None, f'{d=}'
+    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, '', '')
-    assert d is not None, f'{d=}'
+    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, '', '')
-    assert d is not None, f'{d=}'
+    assert d, f'{d=}'
     assert d['exec_list'] == ['echo', '"hello', 'world"'], f'{d=}'
 
-def test_parse_deps_shell_str__path_replacement():
+def test_parse_deps_shell_str__enable_filepath_replacement():
     # Dealing w/ relative paths, change the current working directory to the module directory
+    # 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')
-    assert d is not None, f'{d=}'
+    assert d, f'{d=}'
     assert d['exec_list'] == ['cp', os.path.abspath('../deps_helpers.py'), 'foo.py'], f'{d=}'
     assert d['target_node'] == 'foo_target'
     assert d['target_path'] == os.path.abspath('./')
 
+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',
+                                          enable_filepath_subst_target_dir=False)
+    assert d, f'{d=}'
+    assert d['exec_list'] == ['cp', '../deps_helpers.py', 'foo.py'], f'{d=}'
+    assert d['target_node'] == 'foo_target'
+    assert d['target_path'] == os.path.abspath('./')
+
+def test_parse_deps_shell_str__enable_dirpath_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@ls -ltr ./'
+    d = deps_helpers.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=}'
+    assert d['target_node'] == 'foo_target'
+    assert d['target_path'] == os.path.abspath('./')
+
+def test_parse_deps_shell_str__disable_dirpath_replacement():
+    # Dealing w/ relative paths, change the current working directory to the module directory
+    # Default is disabled.
+    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')
+    assert d, f'{d=}'
+    assert d['exec_list'] == ['ls', '-ltr', './'], f'{d=}'
+    assert d['target_node'] == 'foo_target'
+    assert d['target_path'] == os.path.abspath('./')
+
 
 def test_parse_deps_work_dir_add_srcs__no_parse():
     line = 'some_file.sv'
     d = deps_helpers.parse_deps_work_dir_add_srcs(line, '', '')
-    assert d is None, f'{d=}'
+    assert not d, f'{d=}'
 
     line = 'some_target:'
     d = deps_helpers.parse_deps_work_dir_add_srcs(line, '', '')
-    assert d is None, f'{d=}'
+    assert not d, f'{d=}'
 
     line = '   csr@some_file.sv'
     d = deps_helpers.parse_deps_work_dir_add_srcs(line, '', '')
-    assert d is None, f'{d=}'
+    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, '', '')
-    assert d is not None, f'{d=}'
+    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, '', '')
-    assert d is not None, f'{d=}'
+    assert d, f'{d=}'
     assert d['file_list'] == [
         'single_file.txt', 'another.sv', 'gen-verilog/mine.v', './gen-vhdl/wordy.vhdl'
     ]
@@ -123,33 +160,33 @@ 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, '', '')
-    assert d is None, f'{d=}'
+    assert not d, f'{d=}'
 
     line = 'some_target:'
     d = deps_helpers.parse_deps_peakrdl(line, '', '')
-    assert d is None, f'{d=}'
+    assert not d, f'{d=}'
 
     line = '   csr@some_file.sv'
     d = deps_helpers.parse_deps_peakrdl(line, '', '')
-    assert d is None, f'{d=}'
+    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, '', '')
-    assert d is not None, f'{d=}'
+    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, '', '')
-    assert d is not None, f'{d=}'
+    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, '', '')
-    assert d is not None, f'{d=}'
+    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/tools/vivado.py

@@ -136,7 +136,7 @@ class CommandSimVivado(CommandSim, ToolVivado):
     def __init__(self, config: dict):
         CommandSim.__init__(self, config)
         ToolVivado.__init__(self, config=self.config)
-        # add args specific to this simulator
+        # add args specific to this tool
         self.args.update({
             'gui':        False,
             'tcl-file':   'sim.tcl',
@@ -349,7 +349,7 @@ class CommandElabVivado(CommandSimVivado):
     '''CommandElabVivado is a command handler for: eda elab --tool=vivado, uses xvlog, xelab'''
     def __init__(self, config: dict):
         CommandSimVivado.__init__(self, config)
-        # add args specific to this simulator
+        # add args specific to this tool
         self.args['stop-after-elaborate'] = True
 
 
@@ -358,7 +358,7 @@ class CommandSynthVivado(CommandSynth, ToolVivado):
     def __init__(self, config: dict):
         CommandSynth.__init__(self, config)
         ToolVivado.__init__(self, config=self.config)
-        # add args specific to this simulator
+        # add args specific to this tool
         self.args['gui'] = False
         self.args['tcl-file'] = "synth.tcl"
         self.args['xdc'] = ""
@@ -401,9 +401,7 @@ class CommandSynthVivado(CommandSynth, ToolVivado):
         defines = ""
         for key, value in self.defines.items():
             defines += (f"-verilog_define {key}" + (" " if value is None else f"={value} "))
-        incdirs = ""
-        if self.incdirs:
-            incdirs = " -include_dirs " + ";".join(self.incdirs)
+        incdirs = ' '.join([f'-include_dirs {x}' for x in self.incdirs])
         flatten = ""
         if self.args['flatten-all']:
             flatten = "-flatten_hierarchy full"
@@ -547,7 +545,7 @@ class CommandProjVivado(CommandProj, ToolVivado):
     def __init__(self, config: dict):
         CommandProj.__init__(self, config)
         ToolVivado.__init__(self, config=self.config)
-        # add args specific to this simulator
+        # add args specific to this tool
         self.args['gui'] = True
         self.args['oc-vivado-tcl'] = True
         self.args['tcl-file'] = "proj.tcl"
@@ -630,10 +628,11 @@ class CommandBuildVivado(CommandBuild, ToolVivado):
     def __init__(self, config: dict):
         CommandBuild.__init__(self, config)
         ToolVivado.__init__(self, config=self.config)
-        # add args specific to this simulator
+        # add args specific to this tool
         self.args['gui'] = False
         self.args['fpga'] = ""
         self.args['proj'] = False
+        self.args['resynth'] = False
         self.args['reset'] = False
         self.args['all-sv'] = False
 
@@ -705,6 +704,8 @@ class CommandBuildVivado(CommandBuild, ToolVivado):
         ]
         if self.args['proj']:
             command_list += ['--proj']
+        if self.args['resynth']:
+            command_list += ['--resynth']
         if self.args['reset']:
             command_list += ['--reset']
 
@@ -732,7 +733,7 @@ class CommandUploadVivado(CommandUpload, ToolVivado):
     def __init__(self, config: dict):
         CommandUpload.__init__(self, config)
         ToolVivado.__init__(self, config=self.config)
-        # add args specific to this simulator
+        # add args specific to this tool
         self.args.update({
             'gui': False,
             'bitfile': "",
@@ -743,8 +744,10 @@ class CommandUploadVivado(CommandUpload, ToolVivado):
             'device': -1,
             'host': "localhost",
             'port': 3121,
-            'tcl-file': "upload.tcl",
             'all-sv': False,
+            'tcl-file': "eda_upload.tcl",
+            'log-file': "eda_upload.log",
+            'test-mode': False,
         })
         # TODO(drew): Add self.args_help.update({...})
 
@@ -825,7 +828,7 @@ class CommandUploadVivado(CommandUpload, ToolVivado):
 
         # ── Generate TCL script ───────────────────────────────────────────────────
         script_file = Path(self.args['tcl-file'])
-        log_file    = Path("eda_upload.log")
+        log_file    = Path(self.args['log-file'])
 
         try:
             with script_file.open("w", encoding="utf-8") as fout:
@@ -924,6 +927,9 @@ class CommandUploadVivado(CommandUpload, ToolVivado):
             command_list.append('-notrace')
         self.exec(Path(util.getcwd()), command_list)
 
+        if not self.args['keep']:
+            os.unlink(self.args['tcl-file'])
+
         util.info("Upload done")
 
 
@@ -935,7 +941,7 @@ class CommandOpenVivado(CommandOpen, ToolVivado):
     def __init__(self, config: dict):
         CommandOpen.__init__(self, config)
         ToolVivado.__init__(self, config=self.config)
-        # add args specific to this simulator
+        # add args specific to this tool
         self.args['gui'] = True
         self.args['file'] = False
         self.args['all-sv'] = False

{opencos_eda-0.2.45.dist-info → opencos_eda-0.2.47.dist-info}/METADATA

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

@@ -1,12 +1,12 @@
 opencos/__init__.py,sha256=ZQ7aOCbP0jkIMYGdVrb-mkZX3rnvaK8epBkmp506tXU,85
 opencos/_version.py,sha256=qN7iBoOv-v4tEZz-Pu9sVUJwefshJOsgdaddn8HcHio,510
 opencos/_waves_pkg.sv,sha256=1lbhQOVGc3t_R8czYjP40hssP0I3FlZOpHTkI7yKFbI,1251
-opencos/deps_helpers.py,sha256=jIMYDp9BVwEl9gYUcVie19EHqO5-DRY-d-vSqaDKi4Y,56971
-opencos/deps_schema.py,sha256=MhytzXwp071F14RwxqHt78ak8Qruoe4FeK5XSzkO2f0,14658
+opencos/deps_helpers.py,sha256=iFUMnrh8hiNflRgZWp0hid7x6BKk1P2PegUn_gJS8Z0,59452
+opencos/deps_schema.py,sha256=ECysiiagTGXAtAVp2GnW3N_Iw2ZakYEuSEg-WUWtUKo,15469
 opencos/eda.py,sha256=Ky_Uc47TU1N6lRs06eatdpAvtgoSh0iXO0BxhSfEuk0,19420
-opencos/eda_base.py,sha256=RY32yrUyUpGUaDN4y5SIv54osV57K4r9zs4lIGsYJCY,83784
+opencos/eda_base.py,sha256=utUTieQMv0RC2Mz5n8b7rtneKjSFI3YcgCiJON0T7Ws,84410
 opencos/eda_config.py,sha256=8wwX4PTZ5rmxWogrVxxqAY6adQFPxTsFkkTYbo6H4vU,8853
-opencos/eda_config_defaults.yml,sha256=7apbA6F0HS-9qC6pOiM128qDf29It0U_ZKxntYSuGUg,11525
+opencos/eda_config_defaults.yml,sha256=AteZbwRJ6wviinks47-e5TX0DoU0culJfBw6L3xYOOA,11535
 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
@@ -41,7 +41,7 @@ opencos/tests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 opencos/tests/custom_config.yml,sha256=TRoVM9ZFKPOA_8JmlpzaMhnGO1txmaD14N_8P1oqzew,257
 opencos/tests/helpers.py,sha256=r4UYMckYzHY2i2RbSWvysOjerPhty_7i7RB-Z767M-c,8294
 opencos/tests/test_build.py,sha256=FQAxOpLVQShAHD_L5rqJctPeSAoqoOCNFI0RXflLuY0,387
-opencos/tests/test_deps_helpers.py,sha256=_nJSgLN6WVlMKqu6sCr29gjQyN3Jj-dVk8Ac64ygpJs,5928
+opencos/tests/test_deps_helpers.py,sha256=_C5qH1YuScCCvG3E-Lr8aS_n6C6YKgEl-wIycJEFLRY,7697
 opencos/tests/test_deps_schema.py,sha256=T3P9KjaMyKsk8b7snNVvNSsom2hIJcg6Z9apYiXoH9Y,941
 opencos/tests/test_eda.py,sha256=tplHcx4FiEn8Jmw1mJMlD6tGjpUJ6cxdBGiVRKo7Ykw,38809
 opencos/tests/test_eda_elab.py,sha256=75bJpOaoO8rn1FXFxiE4KSu5FdjZP1IbW6SyTCjM_ao,2553
@@ -68,12 +68,12 @@ opencos/tools/slang_yosys.py,sha256=3fyLRRdTXhSppNtUhhUl00oG-cT9TyyPTH6JvasS9ZE,
 opencos/tools/surelog.py,sha256=XhxJCGt8hyligL0LNT1fCWkHF5pkt4WSp3eqVJlQ4uA,4998
 opencos/tools/tabbycad_yosys.py,sha256=2LePPgYXBVdsy7YcffPIWN-I0B7queLQ_f_pme2SCGw,7803
 opencos/tools/verilator.py,sha256=dWnoO8FUvjdMyFmuTjHvC_XYI_zwjApJApYy7iYubf0,18398
-opencos/tools/vivado.py,sha256=_GVqKNIZt9CZeiXS5yZCWTFrhD3BKjcQfzhhxR1qLQM,40017
+opencos/tools/vivado.py,sha256=D0we45_2M5dr7Dp6FBjSaXxYmRpgJWm4rq3dc23Uv1A,40219
 opencos/tools/yosys.py,sha256=FV43RcejyFir4B24WRShnzUoppJMK0sDDNkSlIX8Vew,25579
-opencos_eda-0.2.45.dist-info/licenses/LICENSE,sha256=HyVuytGSiAUQ6ErWBHTqt1iSGHhLmlC8fO7jTCuR8dU,16725
-opencos_eda-0.2.45.dist-info/licenses/LICENSE.spdx,sha256=8gn1610RMP6eFgT3Hm6q9VKXt0RvdTItL_oxMo72jII,189
-opencos_eda-0.2.45.dist-info/METADATA,sha256=MNMQxXKjmHYdAEIike4YdzaCEQeaqld1hPo4GLQk8PY,604
-opencos_eda-0.2.45.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-opencos_eda-0.2.45.dist-info/entry_points.txt,sha256=V8OE1lySAFcFQpDNJuVxVZteeSmDH-joLMhGvrxrvmg,164
-opencos_eda-0.2.45.dist-info/top_level.txt,sha256=J4JDP-LpRyJqPNeh9bSjx6yrLz2Mk0h6un6YLmtqql4,8
-opencos_eda-0.2.45.dist-info/RECORD,,
+opencos_eda-0.2.47.dist-info/licenses/LICENSE,sha256=HyVuytGSiAUQ6ErWBHTqt1iSGHhLmlC8fO7jTCuR8dU,16725
+opencos_eda-0.2.47.dist-info/licenses/LICENSE.spdx,sha256=8gn1610RMP6eFgT3Hm6q9VKXt0RvdTItL_oxMo72jII,189
+opencos_eda-0.2.47.dist-info/METADATA,sha256=VNi89oYQGS94RsyWbns7hETc1o9STz57mwYYGvXXEi4,604
+opencos_eda-0.2.47.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+opencos_eda-0.2.47.dist-info/entry_points.txt,sha256=V8OE1lySAFcFQpDNJuVxVZteeSmDH-joLMhGvrxrvmg,164
+opencos_eda-0.2.47.dist-info/top_level.txt,sha256=J4JDP-LpRyJqPNeh9bSjx6yrLz2Mk0h6un6YLmtqql4,8
+opencos_eda-0.2.47.dist-info/RECORD,,