opencos-eda 0.3.9__py3-none-any.whl → 0.3.11__py3-none-any.whl

opencos/eda_base.py

@@ -30,6 +30,7 @@ from opencos.utils.str_helpers import sprint_time, strip_outer_quotes, string_or
 from opencos.utils.subprocess_helpers import subprocess_run_background
 from opencos.utils import status_constants
 
+from opencos.files import safe_shutil_which
 from opencos.deps.deps_file import DepsFile, deps_data_get_all_targets
 from opencos.deps.deps_processor import DepsProcessor
 
@@ -45,6 +46,9 @@ def print_base_help() -> None:
 def print_eda_usage_line(no_targets: bool = False, command_name='COMMAND') -> None:
     '''Prints line for eda [options] COMMAND [options] FILES|TARGETS,...'''
     print(f'{safe_emoji("🔦 ")}Usage:')
+    print(f'    {Colors.bold}{Colors.yellow}eda_targets PATTERN')
+    print(f'    {Colors.bold}{Colors.yellow}eda_show_autocomplete{Colors.normal}')
+    print()
     if no_targets:
         print(
             (f'    {Colors.bold}{Colors.yellow}eda {Colors.cyan}[options]'
@@ -111,7 +115,7 @@ def get_eda_exec(command: str = '') -> str:
     #    packages cannot be run standalone, they need to be called as: python3 -m opencos.eda,
     #    and do not work with relative paths. This only works if env OC_ROOT is set or can be found.
     # 3. If you ran 'source bin/addpath' then you are always using the local (opencos repo)/bin/eda
-    eda_path = shutil.which('eda')
+    eda_path = safe_shutil_which('eda')
     if not eda_path:
         # Can we run from OC_ROOT/bin/eda?
         oc_root = util.get_oc_root()
@@ -208,11 +212,12 @@ class Tool:
     def set_exe(self, config: dict) -> None:
         '''Sets self._EXE based on config'''
         if self._TOOL and self._TOOL in config.get('auto_tools_order', [{}])[0]:
-            exe = config.get('auto_tools_order', [{}])[0][self._TOOL].get('exe', '')
-            if exe and isinstance(exe, list):
-                exe = exe[0] # pick first
+            # config['auto_tools_found'] has the first exe full path:
+            exe = config.get('auto_tools_found', {}).get(self._TOOL)
             if exe and exe != self._EXE:
-                util.info(f'Override for {self._TOOL} using exe {exe}')
+                # Note that safe_shutil_which() on the exe leaf may not match, this does NOT
+                # modify os.environ['PATH'].
+                util.debug(f'{self._TOOL} using exe: {exe}')
                 self._EXE = exe
 
     def get_tool_name(self) -> str:
@@ -236,14 +241,18 @@ class Tool:
             return
 
         info_color = Colors.green
+        error_color = Colors.bgreen
         start = ''
-        if self.tool_error_count or self.tool_warning_count:
-            start = safe_emoji('🔶 ')
+        if self.tool_warning_count:
             info_color = Colors.yellow
+        if self.tool_error_count:
+            info_color = Colors.yellow
+            error_color = Colors.byellow
+            start = safe_emoji('🔶 ')
         util.info(
-            f"{start}Tool - {tool_name}, total counts:",
+            f"{start}Tool - {Colors.bold}{tool_name}{Colors.normal}{info_color}, total counts:",
             f"{Colors.bold}{self.tool_warning_count} tool warnings{Colors.normal}{info_color},",
-            f"{Colors.bold}{self.tool_error_count} tool errors",
+            f"{error_color}{self.tool_error_count} tool errors",
             color=info_color
         )
 
@@ -268,6 +277,8 @@ class Command: # pylint: disable=too-many-public-methods,too-many-instance-attri
             self.args_help = {}
         if getattr(self, 'args_kwargs', None) is None:
             self.args_kwargs = {}
+        if getattr(self, 'args_args', None) is None:
+            self.args_args = {} # support for multiple named --arg that map to same self.args key.
         self.args.update({
             "keep" : False,
             "force" : False,
@@ -354,6 +365,7 @@ class Command: # pylint: disable=too-many-public-methods,too-many-instance-attri
         self.errors_log_f = None
         self.auto_tool_applied = False
         self.tool_changed_respawn = {}
+        self.top_details = {}
 
 
     def get_info_job_name(self) -> str:
@@ -554,8 +566,23 @@ class Command: # pylint: disable=too-many-public-methods,too-many-instance-attri
         # Set the util.artifacts path with our work-dir:
         util.artifacts.set_artifacts_json_dir(self.args['work-dir'])
 
+        # Since work-dir has now safely been created (or error flagged) we can override the
+        # inferred 'top' if top was not specified (aka, we guessed based on target name or
+        # file/module name)
+        self.update_top_if_inferred()
+
         return self.args['work-dir']
 
+
+    def update_top_if_inferred(self) -> None:
+        '''Child classes can override (CommandDesign does)
+
+        Idea is to overwrite self.args['top'] if it was inferred, but Command.args
+        does not initially set self.args['top'], so this method takes no action.
+        '''
+        return
+
+
     def artifacts_add(self, name: str, typ: str, description: str) -> None:
         '''Adds a file to util.artifacts, derived classes may override'''
         util.artifacts.add(name=name, typ=typ, description=description)
@@ -706,6 +733,9 @@ class Command: # pylint: disable=too-many-public-methods,too-many-instance-attri
             arguments = [] # list supplied to parser.add_argument(..) so one liner supports both.
             for this_key in keys:
                 arguments.append(f'--{this_key}')
+            for arg in self.args_args.get(this_key, []):
+                if arg not in arguments:
+                    arguments.append(f'--{arg}')
 
             if self.args_help.get(key, ''):
                 help_kwargs = {'help': self.args_help[key] + f' (default={value})'}
@@ -834,6 +864,9 @@ class Command: # pylint: disable=too-many-public-methods,too-many-instance-attri
         '''
 
         _, unparsed = self.run_argparser_on_list(tokens)
+
+        self._apply_deps_file_defaults_if_present()
+
         if process_all and unparsed:
             self.warning_show_known_args()
             self.error_ifarg(
@@ -979,37 +1012,39 @@ class Command: # pylint: disable=too-many-public-methods,too-many-instance-attri
             color.disable() # strip our color object if < 3.14
 
 
+        # Include -G, +incdir+, +define+ help if this is a CommanDesign class:
         lines.append('')
-        lines.append(
-            f"  {color.cyan}-G{color.byellow}<parameterName>{color.normal}=" \
-            + f"{color.yellow}<value>{color.normal}"
-        )
-        lines.append(indent_me((
-            " Add parameter to top level, support bit/int/string types only."
-            " Example: -GDEPTH=8 (DEPTH treated as SV int/integer)."
-            " -GENABLE=1 (ENABLED treated as SV bit/int/integer)."
-            " -GName=eda (Name treated as SV string \"eda\")."
-        )))
-
-        lines.append(f"  {color.cyan}+define+{color.byellow}<defineName>{color.normal}")
-        lines.append(indent_me((
-            " Add define w/out value to tool ahead of SV sources"
-            " Example: +define+SIM_SPEEDUP"
-        )))
-        lines.append(
-            f"  {color.cyan}+define+{color.byellow}<defineName>{color.normal}=" \
-            + f"{color.yellow}<value>{color.normal}")
-        lines.append(indent_me((
-            " Add define w/ value to tool ahead of SV sources"
-            " Example: +define+TECH_LIB=2 +define+FULL_NAME=\"E D A\""
-        )))
-        lines.append(f"  {color.cyan}+incdir+{color.byellow}PATH{color.normal}")
-        lines.append(indent_me((
-            " Add path (absolute or relative) for include directories"
-            " for SystemVerilog `include \"<some-file>.svh\""
-            " Example: +incdir+../lib"
-        )))
-        lines.append('')
+        if isinstance(self, CommandDesign):
+            lines.append(
+                f"  {color.cyan}-G{color.byellow}<parameterName>{color.normal}=" \
+                + f"{color.yellow}<value>{color.normal}"
+            )
+            lines.append(indent_me((
+                " Add parameter to top level, support bit/int/string types only."
+                " Example: -GDEPTH=8 (DEPTH treated as SV int/integer)."
+                " -GENABLE=1 (ENABLED treated as SV bit/int/integer)."
+                " -GName=eda (Name treated as SV string \"eda\")."
+            )))
+
+            lines.append(f"  {color.cyan}+define+{color.byellow}<defineName>{color.normal}")
+            lines.append(indent_me((
+                " Add define w/out value to tool ahead of SV sources"
+                " Example: +define+SIM_SPEEDUP"
+            )))
+            lines.append(
+                f"  {color.cyan}+define+{color.byellow}<defineName>{color.normal}=" \
+                + f"{color.yellow}<value>{color.normal}")
+            lines.append(indent_me((
+                " Add define w/ value to tool ahead of SV sources"
+                " Example: +define+TECH_LIB=2 +define+FULL_NAME=\"E D A\""
+            )))
+            lines.append(f"  {color.cyan}+incdir+{color.byellow}PATH{color.normal}")
+            lines.append(indent_me((
+                " Add path (absolute or relative) for include directories"
+                " for SystemVerilog `include \"<some-file>.svh\""
+                " Example: +incdir+../lib"
+            )))
+            lines.append('')
 
         for line in lines:
             print(line)
@@ -1078,6 +1113,13 @@ class Command: # pylint: disable=too-many-public-methods,too-many-instance-attri
         else:
             util.warning(*msg)
 
+    @staticmethod
+    def get_top_name(name: str) -> str:
+        '''Attempt to get the 'top' module name from a file, such as path/to/mine.sv will
+
+        return "mine"'''
+        return os.path.splitext(os.path.basename(name))[0]
+
 
     def update_tool_warn_err_counts_from_log_lines(
             self, log_lines: list, bad_strings: list, warning_strings: list
@@ -1099,6 +1141,48 @@ class Command: # pylint: disable=too-many-public-methods,too-many-instance-attri
                 setattr(self, 'tool_warning_count', getattr(self, 'tool_warning_count', 0) + 1)
 
 
+    def _apply_deps_file_defaults_if_present(self) -> None:
+        '''Only runs if this is not a CommandDesign class.
+
+        Looks at DEPS file in current directory, and will attempt to apply 'DEFAULTS' if present
+        '''
+
+        if isinstance(self, CommandDesign):
+            return
+
+        # Try to fish out DEFAULTS from ./DEPS if present, so we can apply args to self.
+        _cache_none = {}
+        data = None
+        if self.config['deps_markup_supported']:
+            deps = DepsFile(
+                command_design_ref=self, target_path=str(Path('.')), cache=_cache_none
+            )
+            data = deps.data
+
+        entry = None
+        if data is not None and 'DEFAULTS' in data:
+            entry = deps.get_entry(target_node=str(Path('./DEFAULTS')))
+        if not entry:
+            return
+
+        target = str(Path('./DEFAULTS'))
+        _, target_node = os.path.split(target)
+        caller_info = deps.gen_caller_info(target)
+
+        deps_processor = DepsProcessor(
+            command_design_ref=self,
+            deps_entry=entry,
+            target=target,
+            target_path=str(Path('.')),
+            target_node=target_node,
+            deps_file = deps.deps_file,
+            caller_info = caller_info
+        )
+        _ = deps_processor.process_deps_entry()
+
+
+
+
 class CommandDesign(Command): # pylint: disable=too-many-instance-attributes
     '''CommandDesign is the eda base class for command handlers that need to track files.
 
@@ -1157,11 +1241,22 @@ class CommandDesign(Command): # pylint: disable=too-many-instance-attributes
         # keys 'data' and 'line_numbers'
         self.cached_deps = {}
         self.targets_dict = {} # key = targets that we've already processed in DEPS files
-        self.last_added_source_file_inferred_top = ''
 
         self.has_pre_compile_dep_shell_commands = False
         self.has_post_tool_dep_shell_commands = False
 
+        self.top_details = {
+            # used by CommandDesign to track last file added.
+            'last_added_source_file':               '',
+            # implies top was not set, we inferred from the final command line
+            # DEPS target name
+            'inferred_from_target_name':      False,
+            # implies top was not set, we inferred from the final source file added,
+            # based on a 'module' name we parsed.
+            # also implies self.target was set from inferred top:
+            'inferred_from_last_added_source_file': False,
+        }
+
 
     def run_dep_commands(self) -> None:
         '''Run shell/peakrdl style commands from DEPS files, this is peformed before
@@ -1342,13 +1437,43 @@ class CommandDesign(Command): # pylint: disable=too-many-instance-attributes
                 else:
                     os.symlink(src=fname, dst=destfile)
 
-    @staticmethod
-    def get_top_name(name: str) -> str:
-        '''Attempt to get the 'top' module name from a file, such as path/to/mine.sv will
 
-        return "mine"'''
-        # TODO(drew): Use the helper method in util for this instead to peek in file contents?
-        return os.path.splitext(os.path.basename(name))[0]
+    def update_top_if_inferred(self) -> None:
+        '''Overridden from Command, uses self.top_details - attempts to overwrite
+
+        self.args['top'] if it was previously set based on the first DEPS target name,
+        so it more accurately reflects the top-module-name. You should only do this if the
+        self.args['work-dir'] has already been determined.
+        '''
+
+        if not self.args['top']:
+            return
+
+        if not (self.top_details and \
+                self.top_details['inferred_from_target_name'] and \
+                self.top_details['last_added_source_file']):
+            return
+
+        # since work-dir should be set, we will change self.args['top'] if there
+        # was a last-added source file.
+        best_top_fname = self.top_details['last_added_source_file']
+
+        if not best_top_fname:
+            return
+
+        best_top_name = self.get_top_name(best_top_fname)
+        best_top = util.get_inferred_top_module_name(
+            module_guess=best_top_name,
+            module_fpath=best_top_fname
+        )
+        if not best_top:
+            return
+
+        util.info("--top was previously inferred from target name",
+                  f"({self.top_details['inferred_from_target_name']}), overriding with:",
+                  f"{best_top} (from file: {best_top_fname})")
+        self.args['top'] = best_top
+
 
     def set_parameter(
             self, name: str, value, caller_info: str = '(CLI)',
@@ -1723,7 +1848,7 @@ class CommandDesign(Command): # pylint: disable=too-many-instance-attributes
 
         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
+            self.top_details['last_added_source_file'] = file_abspath
 
         if add_to_non_sources:
             self.files_non_source.append(file_abspath)
@@ -1928,9 +2053,10 @@ class CommandDesign(Command): # pylint: disable=too-many-instance-attributes
                 self.args['top'], top_path = last_potential_top_target
                 util.info("--top not specified, inferred from target:",
                           f"{self.args['top']} ({top_path})")
+                self.top_details['inferred_from_target_name'] = top_path
 
             else:
-                best_top_fname = self.last_added_source_file_inferred_top
+                best_top_fname = self.top_details['last_added_source_file']
                 if best_top_fname:
                     last_potential_top_file = (self.get_top_name(best_top_fname), best_top_fname)
 
@@ -1940,7 +2066,7 @@ class CommandDesign(Command): # pylint: disable=too-many-instance-attributes
                 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]
+                    module_fpath=top_path
                 )
                 if self.args['top']:
                     util.info("--top not specified, inferred from final source file:",
@@ -1949,6 +2075,7 @@ class CommandDesign(Command): # pylint: disable=too-many-instance-attributes
                     # (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']
+                    self.top_details['inferred_from_last_added_source_file'] = top_path
 
 
         util.info(f'{self.command_name}: top-most target name: {self.target}')
@@ -2170,7 +2297,10 @@ class CommandParallel(Command):
             if w.proc:
                 util.info(f"need to KILL WORKER_{w.n}, probably needs manual cleanup, check 'ps'")
                 if w.pid:
-                    os.kill(w.pid, signal.SIGKILL)
+                    # Windows compatible: signal.SIGKILL is not available, so we could use
+                    # os.kill(PID, 9) but we'll be nice and do another SIGTERM
+                    # os.kill(PID, 9)
+                    os.kill(w.pid, getattr(signal, 'SIGKILL', signal.SIGTERM))
         util.stop_log()
         subprocess.Popen(['stty', 'sane']).wait() # pylint: disable=consider-using-with
 

opencos/eda_config.py

@@ -10,11 +10,11 @@ Order of precedence for default value of eda arg: --config-yaml:
 import copy
 import os
 import argparse
-import shutil
 
 import mergedeep
 
 from opencos import util
+from opencos.files import safe_shutil_which
 from opencos.util import safe_emoji
 from opencos.utils.markup_helpers import yaml_safe_load, yaml_safe_writer
 
@@ -24,12 +24,11 @@ class Defaults:
     Defaults.config_yml is set depending on search order for default eda_config[_defaults].yml
     '''
 
-    environ_override_config_yml = os.environ.get('EDA_CONFIG_YML', '')
-    home_override_config_yml = os.path.join(
-        os.environ.get('HOME', ''), '.opencos-eda', 'EDA_CONFIG.yml'
-    )
+    environ_override_config_yml = ''
+    home_override_config_yml = ''
     opencos_config_yml = 'eda_config_defaults.yml'
     config_yml = ''
+    config_yml_set_from = ''
 
     supported_config_keys = set([
         'DEFAULT_HANDLERS', 'DEFAULT_HANDLERS_HELP',
@@ -39,11 +38,13 @@ class Defaults:
         'deps_markup_supported',
         'deps_subprocess_shell',
         'bare_plusarg_supported',
+        'deps_expandvars_enable',
         'dep_sub',
         'vars',
         'file_extensions',
         'command_determines_tool',
         'command_tool_is_optional',
+        'command_has_subcommands',
         'tools',
         'auto_tools_order',
     ])
@@ -74,12 +75,36 @@ class Defaults:
 
 EDA_OUTPUT_CONFIG_FNAME = 'eda_output_config.yml'
 
-if os.path.isfile(Defaults.environ_override_config_yml):
-    Defaults.config_yml = Defaults.environ_override_config_yml
-elif os.path.isfile(Defaults.home_override_config_yml):
-    Defaults.config_yml = Defaults.home_override_config_yml
-else:
+def set_defaults() -> None:
+    '''Updates Defaults *config_yml members, sets Defaults.config_yml'''
+
+    Defaults.environ_override_config_yml = os.environ.get(
+        'EDA_CONFIG_YML', os.environ.get('EDA_CONFIG_YAML', '')
+    )
+    if Defaults.environ_override_config_yml and \
+       os.path.isfile(Defaults.environ_override_config_yml):
+        Defaults.config_yml = Defaults.environ_override_config_yml
+        Defaults.config_yml_set_from = 'env EDA_CONFIG_YML'
+        return
+
+    home = os.environ.get('HOME', os.environ.get('HOMEPATH', ''))
+    if home and os.path.isdir(os.path.join(home, '.opencos-eda')):
+        Defaults.home_override_config_yml = [
+            os.path.join(home, '.opencos-eda', 'EDA_CONFIG.yml'),
+            os.path.join(home, '.opencos-eda', 'EDA_CONFIG.yaml')
+        ]
+        for x in Defaults.home_override_config_yml:
+            if os.path.isfile(x):
+                Defaults.config_yml = x
+                Defaults.config_yml_set_from = 'file [$HOME|$HOMEPATH]/.opencos-eda'
+                return
+
+    # else default:
     Defaults.config_yml = Defaults.opencos_config_yml
+    Defaults.config_yml_set_from = ''
+
+
+set_defaults()
 
 
 def find_eda_config_yml_fpath(
@@ -232,12 +257,21 @@ def get_config_merged_with_defaults(config:dict) -> dict:
 
 def get_argparser() -> argparse.ArgumentParser:
     '''Returns an ArgumentParser, handles --config-yml=<filename> arg'''
+
+    # re-run set_defaults() in case a --env-file overwrote Defaults.config_yml
+    set_defaults()
+
     parser = argparse.ArgumentParser(
         prog=f'{safe_emoji("🔎 ")}opencos eda config options', add_help=False, allow_abbrev=False
     )
-    parser.add_argument('--config-yml', type=str, default=Defaults.config_yml,
-                        help=('YAML filename to use for configuration (default'
-                              f' {Defaults.config_yml})'))
+    parser.add_argument(
+        '--config-yml', type=str, default=Defaults.config_yml,
+        help=(
+            f'YAML filename to use for configuration (default {Defaults.config_yml}).'
+            ' Can be overriden using environmnet var EDA_CONFIG_YML=FILE, or from file'
+            ' [$HOME|$HOMEPATH]/.opencos-eda/EDA_CONFIG.yml'
+        )
+    )
     return parser
 
 
@@ -255,7 +289,6 @@ def get_eda_config(args:list, quiet=False) -> (dict, list):
 
     This will merge the result with the default config (if overriden)
     '''
-
     parser = get_argparser()
     try:
         parsed, unparsed = parser.parse_known_args(args + [''])
@@ -267,7 +300,13 @@ def get_eda_config(args:list, quiet=False) -> (dict, list):
 
     if parsed.config_yml:
         if not quiet:
-            util.info(f'eda_config: --config-yml={parsed.config_yml} observed')
+            if parsed.config_yml != Defaults.config_yml:
+                # It was set on CLI:
+                util.info(f'eda_config: --config-yml={parsed.config_yml} observed')
+            elif Defaults.config_yml_set_from:
+                # It was picked up via env or HOME/.opencos-eda/ override:
+                util.info(f'eda_config: --config-yml={parsed.config_yml} observed, from',
+                          f'{Defaults.config_yml_set_from}')
         fullpath = find_eda_config_yml_fpath(parsed.config_yml)
         config = get_config(fullpath)
         if not quiet:
@@ -390,11 +429,18 @@ def tool_try_add_to_path( # pylint: disable=too-many-branches
         util.error(f'--tool setting for {tool}: {user_exe} is not an executable')
         return name
 
-    user_exe = shutil.which(exe)
+    user_exe = safe_shutil_which(user_exe)
 
     if update_config:
         if isinstance(config_exe, list):
             config['auto_tools_order'][0][name]['exe'][0] = user_exe
+            for index,value in enumerate(config_exe[1:]):
+                # update all entries, if we can, if the value is also in 'path'
+                # from our set --tool=Name=path/exe
+                new_value = os.path.join(path, os.path.split(value)[1])
+                if os.path.exists(new_value) and safe_shutil_which(new_value) and \
+                   os.access(new_value, os.X_OK):
+                    config['auto_tools_order'][0][name]['exe'][index] = new_value
         else:
             config['auto_tools_order'][0][name]['exe'] = user_exe
         util.debug(f'For {tool=}, auto_tools_order config updated')

opencos/eda_config_defaults.yml

@@ -12,7 +12,6 @@ DEFAULT_HANDLERS:
   synth       : opencos.commands.CommandSynth
   proj        : opencos.commands.CommandProj
   build       : opencos.commands.CommandBuild
-  upload      : opencos.commands.CommandUpload
   open        : opencos.commands.CommandOpen
   lec         : opencos.commands.CommandLec
   # These commands don't necessarily require a tool
@@ -22,6 +21,7 @@ DEFAULT_HANDLERS:
   flist       : opencos.commands.CommandFList
   # These commands (waves, export, targets) do not require a tool, or
   # will self determine the tool. See command_tool_is_optional in this config file.
+  upload      : opencos.commands.CommandUpload
   waves       : opencos.commands.CommandWaves
   export      : opencos.commands.CommandExport
   shell       : opencos.commands.CommandShell
@@ -73,6 +73,7 @@ dep_tags_enables:
 deps_markup_supported: true  # Support DEPS.yml files (also .yaml, .toml, .json)
 deps_subprocess_shell: true  # Support subprocess commands using shell=True
 bare_plusarg_supported: true # Support for CLI, DEPS args or deps: +<string> that isn't +define or +incdirs
+deps_expandvars_enable : true # Support env $VAR replacement on targets or files in DEPS.yml
 
 dep_sub: [ ] # Legacy, no longer supported.
 vars: { }    # Legacy, no longer supported.
@@ -110,6 +111,7 @@ file_extensions:
 command_determines_tool:
   # eda commands that will self-determine the tool to use
   - waves
+  - upload
 
 command_tool_is_optional:
   # eda commands that may not need to use a tool at all, will skip auto_tools_order if --tool=None (default)
@@ -118,6 +120,12 @@ command_tool_is_optional:
   - targets
   - deps-help
 
+command_has_subcommands:
+  - multi
+  - tools-multi
+  - sweep
+
+
 
 tools:
 
@@ -440,17 +448,20 @@ auto_tools_order:
       exe: code
       requires_vscode_extension:
         - lramseyer.vaporview
-      handlers: { }
+      handlers:
+        waves: opencos.commands.waves.CommandWaves
 
     surfer:
       exe: code
       requires_vscode_extension:
         - surfer-project.surfer
-      handlers: { }
+      handlers:
+        waves: opencos.commands.waves.CommandWaves
 
     gtkwave:
       exe: gtkwave
-      handlers: { }
+      handlers:
+        waves: opencos.commands.waves.CommandWaves
 
     quartus:
       exe: quartus_sh
@@ -474,6 +485,7 @@ auto_tools_order:
         open:   opencos.tools.vivado.CommandOpenVivado
         flist:  opencos.tools.vivado.CommandFListVivado
         build:  opencos.tools.vivado.CommandBuildVivado
+        waves:  opencos.commands.waves.CommandWaves
 
     slang_yosys:
       exe: yosys
@@ -517,6 +529,7 @@ auto_tools_order:
         elab: opencos.tools.questa.CommandElabQuesta
         sim: opencos.tools.questa.CommandSimQuesta
         flist: opencos.tools.questa.CommandFListQuesta
+        waves:  opencos.commands.waves.CommandWaves
 
     riviera:
       exe: vsim
@@ -527,6 +540,7 @@ auto_tools_order:
         lint: opencos.tools.riviera.CommandLintRiviera
         elab: opencos.tools.riviera.CommandElabRiviera
         sim:  opencos.tools.riviera.CommandSimRiviera
+        waves:  opencos.commands.waves.CommandWaves
 
     questa_fe:
       exe: vsim
@@ -536,6 +550,7 @@ auto_tools_order:
         elab: opencos.tools.questa_fe.CommandElabQuestaFe
         sim: opencos.tools.questa_fe.CommandSimQuestaFe
         flist: opencos.tools.questa_fe.CommandFListQuestaFe
+        waves:  opencos.commands.waves.CommandWaves
 
     questa_fse:  # free student edition, works similar to modelsim_ase
       exe: vsim
@@ -545,6 +560,7 @@ auto_tools_order:
         elab: opencos.tools.questa_fse.CommandElabQuestaFse
         sim:  opencos.tools.questa_fse.CommandSimQuestaFse
         flist: opencos.tools.questa_fse.CommandFListQuestaFse
+        waves:  opencos.commands.waves.CommandWaves
 
     modelsim_ase:
       exe: vsim
@@ -553,6 +569,7 @@ auto_tools_order:
         lint: opencos.tools.modelsim_ase.CommandLintModelsimAse
         elab: opencos.tools.modelsim_ase.CommandElabModelsimAse
         sim:  opencos.tools.modelsim_ase.CommandSimModelsimAse
+        waves:  opencos.commands.waves.CommandWaves
 
     iverilog:
       exe: iverilog