opencos-eda 0.3.8__tar.gz → 0.3.9__tar.gz

{opencos_eda-0.3.8/opencos_eda.egg-info → opencos_eda-0.3.9}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: opencos-eda
-Version: 0.3.8
+Version: 0.3.9
 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
@@ -20,6 +20,7 @@ Requires-Dist: supports_color>=0.2.0
 Provides-Extra: dev
 Requires-Dist: pylint>=3.0.0; extra == "dev"
 Requires-Dist: pytest>=8.3.5; extra == "dev"
+Requires-Dist: twine>=6.1.0; extra == "dev"
 Provides-Extra: cocotb
 Requires-Dist: cocotb>=2.0; extra == "cocotb"
 Requires-Dist: pytest>=8.3.5; extra == "cocotb"

{opencos_eda-0.3.8 → opencos_eda-0.3.9}/opencos/eda.py

@@ -410,7 +410,8 @@ def process_tokens( # pylint: disable=too-many-branches,too-many-statements,too-
 
     deferred_tokens = unparsed
     if not command:
-        util.error("Didn't get a command!")
+        util.error("'eda' didn't get a command, or command is invalid (run with --help to see",
+                   "valid commands)!")
         return 2
 
     sco = config['command_handler'][command](config=config) # sub command object
@@ -430,7 +431,12 @@ def process_tokens( # pylint: disable=too-many-branches,too-many-statements,too-
        command not in config.get('command_determines_tool', []) and \
        command not in config.get('command_tool_is_optional', []):
         use_tool = which_tool(command, config)
-        util.info(f"--tool not specified, using default for {command=}: {use_tool}")
+        if use_tool:
+            util.info(f"--tool not specified, using default for {command=}: {use_tool}")
+        else:
+            # Not all commands have a hard requirement on tool (such as 'multi') because we
+            # haven't examined sub-commands yet.
+            util.info(f'--tool not specified, will attempt to determine tool(s) for {command=}.')
         setattr(sco, 'auto_tool_applied', True)
 
     rc = check_command_handler_cls(command_obj=sco, command=command, parsed_args=parsed)
@@ -483,12 +489,60 @@ def check_command_handler_cls(command_obj:object, command:str, parsed_args) -> i
         if not isinstance(sco, cls):
             # If someone set --tool verilator for command=synth, then our 'sco' will have defaulted
             # to CommandSynth with no tool attached. If we don't have a tool set, error and return.
-            util.warning(f"{command=} is using handling class '{type(sco)}' (but missing",
-                         f"requirement {cls}, likely because we aren't using a derived class",
-                         "for a specific tool)")
-            parsed_tool = getattr(parsed_args, 'tool', '??')
-            return util.error(f"EDA {command=} for tool '{parsed_tool}' is not",
-                              f"supported (this tool '{parsed_tool}' cannot run {command=})")
+            parsed_tool =  getattr(parsed_args, 'tool', '')
+            auto_tool_entry = command_obj.config.get(
+                'auto_tools_order', [{}])[0].get(parsed_tool, {})
+            if parsed_tool and not auto_tool_entry:
+                util.warning(
+                    f"{command=} for tool '{parsed_tool}' is using handling class '{type(sco)}',",
+                    f"but missing requirement {cls}, likely because the tool was not loaded",
+                    "(not in PATH) or mis-configured (such as missing a Tool based class)"
+                )
+                return util.error(
+                    f"EDA {command=} for tool '{parsed_tool}' cannot be run because tool",
+                    f"'{parsed_tool}' is not known to `eda`. It does not exist in the config:",
+                    "see informational message for --config-yml, and check that file's",
+                    "auto_tools_order."
+                )
+            if parsed_tool:
+                util.warning(
+                    f"{command=} for tool '{parsed_tool}' is using handling class '{type(sco)}',",
+                    f"but missing requirement {cls}, likely because the tool was not loaded",
+                    "(not in PATH) or mis-configured (such as missing a Tool based class)"
+                )
+                for k,v in auto_tool_entry.items():
+                    if k == 'exe' or k.startswith('requires_cmd'):
+                        util.warning(
+                            f"tool '{parsed_tool}' has requirements that may not have been met --",
+                            f"{k}: {v}"
+                        )
+                    if k == 'requires_vsim_helper':
+                        if found_tool := vsim_helper.found():
+                            util.warning(
+                                f"tool '{parsed_tool}' was not found, vsim appears to be for tool",
+                                f"'{found_tool}'"
+                            )
+
+                return util.error(
+                    f"EDA {command=} for tool '{parsed_tool}' is not supported (tool",
+                    f"'{parsed_tool}' cannot run {command=}). It is likely that tool",
+                    f"'{parsed_tool}' is not in PATH, or was unable to be loaded due to missing",
+                    "requirements, or missing information when checking the exe version."
+                )
+
+            # No parsed_tool.
+            util.warning(
+                f"{command=} for default tool (--tool not set) is using handling class",
+                f"'{type(sco)}', but missing requirement {cls}, likely because the tool was not",
+                "loaded (not in PATH) or mis-configured (such as missing a Tool based class)"
+            )
+            return util.error(
+                f"EDA {command=} for default tool (--tool not set) is not supported (default",
+                f"tool cannot run {command=}). It appears that no suitable default tool to run",
+                f"{command=} was automatically found, was not in PATH, or was unable to be loaded",
+                "due to missing requirements, or missing information when checking the exe version."
+            )
+
     return 0
 
 

{opencos_eda-0.3.8 → opencos_eda-0.3.9}/opencos/eda_config_defaults.yml

@@ -510,7 +510,7 @@ auto_tools_order:
         lec:   opencos.tools.slang_yosys.CommandLecYosys
 
     questa:
-      exe: qrun
+      exe: vsim
       requires_vsim_helper: True
       handlers:
         lint: opencos.tools.questa.CommandLintQuesta
@@ -528,13 +528,14 @@ auto_tools_order:
         elab: opencos.tools.riviera.CommandElabRiviera
         sim:  opencos.tools.riviera.CommandSimRiviera
 
-    modelsim_ase:
+    questa_fe:
       exe: vsim
       requires_vsim_helper: True
       handlers:
-        lint: opencos.tools.modelsim_ase.CommandLintModelsimAse
-        elab: opencos.tools.modelsim_ase.CommandElabModelsimAse
-        sim:  opencos.tools.modelsim_ase.CommandSimModelsimAse
+        lint: opencos.tools.questa_fe.CommandLintQuestaFe
+        elab: opencos.tools.questa_fe.CommandElabQuestaFe
+        sim: opencos.tools.questa_fe.CommandSimQuestaFe
+        flist: opencos.tools.questa_fe.CommandFListQuestaFe
 
     questa_fse:  # free student edition, works similar to modelsim_ase
       exe: vsim
@@ -545,6 +546,14 @@ auto_tools_order:
         sim:  opencos.tools.questa_fse.CommandSimQuestaFse
         flist: opencos.tools.questa_fse.CommandFListQuestaFse
 
+    modelsim_ase:
+      exe: vsim
+      requires_vsim_helper: True
+      handlers:
+        lint: opencos.tools.modelsim_ase.CommandLintModelsimAse
+        elab: opencos.tools.modelsim_ase.CommandElabModelsimAse
+        sim:  opencos.tools.modelsim_ase.CommandSimModelsimAse
+
     iverilog:
       exe: iverilog
       handlers:

opencos_eda-0.3.9/opencos/tools/modelsim_ase.py

@@ -0,0 +1,82 @@
+''' opencos.tools.modelsim_ase - Used by opencos.eda for sim/elab commands w/ --tool=modelsim_ase.
+
+Contains classes for ToolModelsimAse, CommandSimModelsimAse, CommandElabModelsimAse.
+
+Note that this is for 32-bit Modelsim Student Edition. Consider using --tool=questa_fse instead.
+'''
+
+# pylint: disable=R0801 # (duplicate code in derived classes, such as if-condition return.)
+
+import os
+
+from opencos.tools.questa_common import CommonSimQuesta, CommonFListQuesta
+
+class CommandSimModelsimAse(CommonSimQuesta):
+    '''CommandSimModelsimAse is a command handler for: eda sim --tool=modelsim_ase'''
+
+    _TOOL = 'modelsim_ase'
+    _EXE = 'vsim'
+    use_vopt = False
+
+    def __init__(self, config: dict):
+        CommonSimQuesta.__init__(self, config=config)
+
+        # repairs: override self._TOOL, and run get_versions() again.
+        self._TOOL = 'modelsim_ase'
+
+        self.shell_command = os.path.join(self.sim_exe_base_path, 'vsim')
+        self.starter_edition = True
+        self.args.update({
+            'tool': self._TOOL, # override
+            'gui': False,
+        })
+
+
+        self.args_help.update({
+            'vopt': (
+                'Boolean to enable/disable use of vopt step prior to vsim step'
+                ' Note that vopt args can be controlled with --elab-args=<value1>'
+                ' --elab-args=<value2> ...'
+            )
+        })
+
+    def set_tool_defines(self):
+        # Update any defines from config.tools.modelsim_ase:
+        self.defines.update(
+            self.tool_config.get(
+                'defines',
+                # defaults, if not set:
+                {'OC_ASSERT_PROPERTY_NOT_SUPPORTED': 1,
+                 'OC_TOOL_MODELSIM_ASE': 1}
+            )
+        )
+
+
+
+class CommandElabModelsimAse(CommandSimModelsimAse):
+    '''CommandElabModelsimAse is a command handler for: eda elab --tool=modelsim_ase'''
+
+    command_name = 'elab'
+
+    def __init__(self, config:dict):
+        super().__init__(config)
+        self.args['stop-after-elaborate'] = True
+
+
+class CommandLintModelsimAse(CommandSimModelsimAse):
+    '''CommandLintModelsimAse is a command handler for: eda lint --tool=modelsim_ase'''
+
+    command_name = 'lint'
+
+    def __init__(self, config:dict):
+        super().__init__(config)
+        self.args['stop-after-compile'] = True
+        self.args['stop-after-elaborate'] = True
+
+
+class CommandFListModelsimAse(CommonFListQuesta):
+    '''CommandFListModelsimAse is a command handler for: eda flist --tool=modelsim_ase'''
+
+    def __init__(self, config: dict):
+        CommonFListQuesta.__init__(self, config=config)
+        self._TOOL = 'questa_fse'

opencos_eda-0.3.9/opencos/tools/questa.py

@@ -0,0 +1,82 @@
+''' opencos.tools.questa - Used by opencos.eda for sim/elab commands w/ --tool=questa.
+
+Contains classes for CommandSimQuesta, CommandElabQuesta.
+For: Questa Edition-64 vsim 20XX.X Simulator
+
+'''
+
+# pylint: disable=R0801 # (setting similar, but not identical, self.defines key/value pairs)
+
+# TODO(drew): fix these pylint eventually:
+# pylint: disable=too-many-branches, too-many-ancestors
+
+import os
+
+from opencos.tools.questa_common import CommonSimQuesta, CommonFListQuesta
+
+
+class CommandSimQuesta(CommonSimQuesta):
+    '''CommandSimQuesta is a command handler for: eda sim --tool=questa
+
+    Note this inherits 99% from CommonSimQuesta for command handling
+    '''
+    _TOOL = 'questa'
+    _EXE = 'vsim'
+    use_vopt = True
+
+    def __init__(self, config: dict):
+        # this will setup with self._TOOL = questa, optionally repair it later
+        CommonSimQuesta.__init__(self, config=config)
+
+        # repairs: override self._TOOL, and run get_versions() again.
+        self._TOOL = 'questa'
+
+        self.shell_command = os.path.join(self.sim_exe_base_path, 'vsim')
+        self.starter_edition = False
+        self.args.update({
+            'tool': self._TOOL, # override
+            'gui': False,
+        })
+
+
+    def set_tool_defines(self):
+        '''Override from questa.ToolQuesta'''
+        # Update any defines from config.tools.questa_fse:
+        self.defines.update(
+            self.tool_config.get(
+                'defines',
+                # defaults, if not set:
+                {
+                 'OC_TOOL_QUESTA': 1
+                }
+            )
+        )
+
+
+class CommandElabQuesta(CommandSimQuesta):
+    '''CommandElabQuesta is a command handler for: eda elab --tool=questa'''
+
+    command_name = 'elab'
+
+    def __init__(self, config:dict):
+        super().__init__(config)
+        self.args['stop-after-elaborate'] = True
+
+
+class CommandLintQuesta(CommandSimQuesta):
+    '''CommandLintQuesta is a command handler for: eda lint --tool=questa'''
+
+    command_name = 'lint'
+
+    def __init__(self, config:dict):
+        super().__init__(config)
+        self.args['stop-after-compile'] = True
+        self.args['stop-after-elaborate'] = True
+
+
+class CommandFListQuesta(CommonFListQuesta):
+    '''CommandFListQuesta is a command handler for: eda flist --tool=questa'''
+
+    def __init__(self, config: dict):
+        CommonFListQuesta.__init__(self, config=config)
+        self._TOOL = 'questa'

opencos_eda-0.3.8/opencos/tools/modelsim_ase.py → opencos_eda-0.3.9/opencos/tools/questa_common.py

@@ -1,32 +1,83 @@
-''' opencos.tools.modelsim_ase - Used by opencos.eda for sim/elab commands w/ --tool=modelsim_ase.
+''' opencos.tools.questa - Used by opencos.eda for sim/elab commands w/ --tool=questa.
 
-Contains classes for ToolModelsimAse, CommandSimModelsimAse, CommandElabModelsimAse.
+Contains classes for ToolQuesta, and CommonSimQuesta.
 
-Note that this is for 32-bit Modelsim Student Edition. Consider using --tool=questa_fse instead.
 '''
 
-# pylint: disable=R0801 # (duplicate code in derived classes, such as if-condition return.)
+# pylint: disable=R0801 # (setting similar, but not identical, self.defines key/value pairs)
+
+# TODO(drew): fix these pylint eventually:
+# pylint: disable=too-many-branches
 
 import os
+import re
+import shutil
 
 from opencos import util
-from opencos.commands import sim, CommandSim
-from opencos.tools.questa import ToolQuesta
+from opencos.commands import sim, CommandSim, CommandFList
+from opencos.eda_base import Tool
 from opencos.utils.str_helpers import sanitize_defines_for_sh
 
-class ToolModelsimAse(ToolQuesta):
-    '''ToolModelsimAse used by opencos.eda for --tool=modelsim_ase'''
+class ToolQuesta(Tool):
+    '''Base class for CommandSimQuesta, collects version information about qrun'''
 
-    _TOOL = 'modelsim_ase' # otherwise it's 'questa' from base class.
+    _TOOL = 'questa'
     _EXE = 'vsim'
-    use_vopt = False
 
-class CommandSimModelsimAse(CommandSim, ToolModelsimAse):
-    '''CommandSimModelsimAse is a command handler for: eda sim --tool=modelsim_ase'''
+    starter_edition = False
+    use_vopt = shutil.which('vopt') # vopt exists in qrun/vsim framework, and we'll use it.
+    sim_exe = '' # vsim or qrun
+    sim_exe_base_path = ''
+    questa_major = None
+    questa_minor = None
+
+    def __init__(self, config: dict):
+        super().__init__(config=config)
+        self.args['part'] = 'xcu200-fsgd2104-2-e'
+
+    def get_versions(self) -> str:
+        if self._VERSION:
+            return self._VERSION
+        path = shutil.which(self._EXE)
+        if not path:
+            self.error(f"{self._EXE} not in path, need to setup",
+                       "(i.e. source /opt/intelFPGA_pro/23.4/settings64.sh")
+            util.debug(f"{path=}")
+            if self._EXE.endswith('qrun') and \
+               any(x in path for x in ('modelsim_ase', 'questa_fse')):
+                util.warning(f"{self._EXE=} Questa path is for starter edition",
+                             "(modelsim_ase, questa_fse), consider using --tool=modelsim_ase",
+                             "or --tool=questa_fse, or similar")
+        else:
+            self.sim_exe = path
+            self.sim_exe_base_path, _ = os.path.split(path)
+
+        m = re.search(r'(\d+)\.(\d+)', path)
+        if m:
+            self.questa_major = int(m.group(1))
+            self.questa_minor = int(m.group(2))
+            self._VERSION = str(self.questa_major) + '.' + str(self.questa_minor)
+        else:
+            self.error("Questa path doesn't specificy version, expecting (d+.d+)")
+        return self._VERSION
+
+    def set_tool_defines(self):
+        # Will only be called from an object which also inherits from CommandDesign,
+        # i.e. has self.defines
+        self.defines['OC_TOOL_QUESTA'] = None
+        self.defines[f'OC_TOOL_QUESTA_{self.questa_major:d}_{self.questa_minor:d}'] = None
+
+
+
+class CommonSimQuesta(CommandSim, ToolQuesta):
+    '''CommonSimQuesta is a the base command handler for:
+
+    eda sim --tool=[modelsim_ase|questa|questa_fse]
+    '''
 
     def __init__(self, config: dict):
         CommandSim.__init__(self, config=config)
-        ToolModelsimAse.__init__(self, config=self.config)
+        ToolQuesta.__init__(self, config=self.config)
         self.shell_command = os.path.join(self.sim_exe_base_path, 'vsim')
         self.starter_edition = True
         self.args.update({
@@ -42,34 +93,15 @@ class CommandSimModelsimAse(CommandSim, ToolModelsimAse):
             )
         })
 
-    def set_tool_defines(self):
-        # Update any defines from config.tools.modelsim_ase:
-        self.defines.update(
-            self.tool_config.get(
-                'defines',
-                # defaults, if not set:
-                {'OC_ASSERT_PROPERTY_NOT_SUPPORTED': 1,
-                 'OC_TOOL_MODELSIM_ASE': 1}
-            )
-        )
 
     def run_in_batch_mode(self) -> bool:
         '''Returns bool if we should run in batch mode (-c) from command line'''
-        # TODO(drew): make CommandSimQuesta a parent and inherit this method instead.
         if self.args['test-mode']:
             return True
         if self.args['gui']:
             return False
         return True
 
-    # We do override do_it() to avoid using CommandSimQuesta.do_it()
-    def do_it(self):
-        CommandSim.do_it(self)
-        #    self.compile()   # runs if stop-before-compile is False, stop-after-compile is True
-        #    self.elaborate() # runs if stop-before-compile is False, stop-after-compile is False,
-        #                       stop-after-elaborate is True
-        #    self.simulate()  # runs if stop-* are all False (run the whole thing)
-
 
     def prepare_compile(self):
         self.set_tool_defines()
@@ -157,11 +189,11 @@ class CommandSimModelsimAse(CommandSim, ToolModelsimAse):
         '''Returns none, creates filename (str) for a vlog.f'''
         vlog_dot_f_lines = []
 
-        # Add compile args from config.tool.modelsim_ase:
+        # Add compile args from config.tool.TOOL (questa, etc):
         vlog_dot_f_lines += self.tool_config.get(
             'compile-args',
             '-sv -svinputport=net -lint').split()
-        # Add waivers from config.tool.modelsim_ase:
+        # Add waivers from config.tool.TOOL (questa, modelsim_ase, etc)
         for waiver in self.tool_config.get(
                 'compile-waivers',
                 [ #defaults:
@@ -395,7 +427,7 @@ class CommandSimModelsimAse(CommandSim, ToolModelsimAse):
 
     def _get_vsim_suppress_list_str(self) -> str:
         vsim_suppress_list = []
-        # Add waivers from config.tool.modelsim_ase:
+        # Add waivers from config.tool.TOOL:
         for waiver in self.tool_config.get(
                 'simulate-waivers', [
                     #defaults:
@@ -420,8 +452,8 @@ class CommandSimModelsimAse(CommandSim, ToolModelsimAse):
         super().artifacts_add(name=name, typ=typ, description=description)
 
 
-class CommandElabModelsimAse(CommandSimModelsimAse):
-    '''CommandElabModelsimAse is a command handler for: eda elab --tool=modelsim_ase'''
+class CommonElabQuesta(CommonSimQuesta):
+    '''CommonElabQuesta is a command handler for: eda elab --tool=(questa family)'''
 
     command_name = 'elab'
 
@@ -430,8 +462,8 @@ class CommandElabModelsimAse(CommandSimModelsimAse):
         self.args['stop-after-elaborate'] = True
 
 
-class CommandLintModelsimAse(CommandSimModelsimAse):
-    '''CommandLintModelsimAse is a command handler for: eda lint --tool=modelsim_ase'''
+class CommonLintQuesta(CommonSimQuesta):
+    '''CommonSimQuesta is a command handler for: eda lint --tool=(questa family)'''
 
     command_name = 'lint'
 
@@ -439,3 +471,11 @@ class CommandLintModelsimAse(CommandSimModelsimAse):
         super().__init__(config)
         self.args['stop-after-compile'] = True
         self.args['stop-after-elaborate'] = True
+
+
+class CommonFListQuesta(CommandFList, ToolQuesta):
+    '''CommonFListQuesta is a command handler for: eda flist --tool=(questa family)'''
+
+    def __init__(self, config: dict):
+        CommandFList.__init__(self, config=config)
+        ToolQuesta.__init__(self, config=self.config)

opencos_eda-0.3.9/opencos/tools/questa_fe.py

@@ -0,0 +1,84 @@
+''' opencos.tools.questa - Used by opencos.eda for sim/elab commands w/ --tool=questa.
+
+Contains classes for CommandSimQuesta, CommandElabQuesta.
+For: Questa Intel (FPGA) Edition-64 vsim 20XX.X Simulator
+
+Note - NOT the starter edition (see questa_fse.py)
+
+'''
+
+# pylint: disable=R0801 # (setting similar, but not identical, self.defines key/value pairs)
+
+# TODO(drew): fix these pylint eventually:
+# pylint: disable=too-many-branches, too-many-ancestors
+
+import os
+
+from opencos.tools.questa_common import CommonSimQuesta, CommonFListQuesta
+
+
+class CommandSimQuestaFe(CommonSimQuesta):
+    '''CommandSimQuestaFe is a command handler for: eda sim --tool=questa_fe
+
+    Note this inherits 99% from CommonSimQuesta for command handling
+    '''
+    _TOOL = 'questa_fe'
+    _EXE = 'vsim'
+    use_vopt = True
+
+    def __init__(self, config: dict):
+        # this will setup with self._TOOL = questa, optionally repair it later
+        CommonSimQuesta.__init__(self, config=config)
+
+        # repairs: override self._TOOL, and run get_versions() again.
+        self._TOOL = 'questa_fe'
+
+        self.shell_command = os.path.join(self.sim_exe_base_path, 'vsim')
+        self.starter_edition = False
+        self.args.update({
+            'tool': self._TOOL, # override
+            'gui': False,
+        })
+
+
+    def set_tool_defines(self):
+        '''Override from questa.ToolQuesta'''
+        # Update any defines from config.tools.questa_fse:
+        self.defines.update(
+            self.tool_config.get(
+                'defines',
+                # defaults, if not set:
+                {
+                 'OC_TOOL_QUESTA_FE': 1
+                }
+            )
+        )
+
+
+class CommandElabQuestaFe(CommandSimQuestaFe):
+    '''CommandElabQuesta is a command handler for: eda elab --tool=questa_fe'''
+
+    command_name = 'elab'
+
+    def __init__(self, config:dict):
+        super().__init__(config)
+        self.args['stop-after-elaborate'] = True
+
+
+class CommandLintQuestaFe(CommandSimQuestaFe):
+    '''CommandLintQuesta is a command handler for: eda lint --tool=questa_fe'''
+
+    command_name = 'lint'
+
+    def __init__(self, config:dict):
+        super().__init__(config)
+        self.args['stop-after-compile'] = True
+        self.args['stop-after-elaborate'] = True
+
+
+class CommandFListQuestaFe(CommonFListQuesta):
+    '''CommandFListQuesta is a command handler for: eda flist --tool=questa'''
+
+    def __init__(self, config: dict):
+        CommonFListQuesta.__init__(self, config=config)
+        self._TOOL = 'questa_fse'

{opencos_eda-0.3.8 → opencos_eda-0.3.9}/opencos/tools/questa_fse.py

@@ -10,23 +10,22 @@ For: Questa Intel Starter FPGA Edition-64 vsim 20XX.X Simulator
 
 import os
 
-from opencos.tools.modelsim_ase import CommandSimModelsimAse
-from opencos.tools.questa import CommandFListQuesta
+from opencos.tools.questa_common import CommonSimQuesta, CommonFListQuesta
 
 
-class CommandSimQuestaFse(CommandSimModelsimAse):
+class CommandSimQuestaFse(CommonSimQuesta):
     '''CommandSimQuestaFse is a command handler for: eda sim --tool=questa_fse
 
-    Note this inherits 99% from CommandSimModelSimAse for command handling
+    Note this inherits 99% from CommonSimQuesta for command handling
     '''
     _TOOL = 'questa_fse'
     _EXE = 'vsim'
     use_vopt = True
 
     def __init__(self, config: dict):
-        # this will setup with self._TOOL = modelsim_ase, which is not ideal so
+        # this will setup with self._TOOL = questa, which is not ideal so
         # we have to repait it later.
-        CommandSimModelsimAse.__init__(self, config=config)
+        CommonSimQuesta.__init__(self, config=config)
 
         # repairs: override self._TOOL, and run get_versions() again.
         self._TOOL = 'questa_fse'
@@ -74,9 +73,9 @@ class CommandLintQuestaFse(CommandSimQuestaFse):
         self.args['stop-after-elaborate'] = True
 
 
-class CommandFListQuestaFse(CommandFListQuesta):
+class CommandFListQuestaFse(CommonFListQuesta):
     '''CommandFListQuestaFse is a command handler for: eda flist --tool=questa_fse'''
 
     def __init__(self, config: dict):
-        CommandFListQuesta.__init__(self, config=config)
+        CommonFListQuesta.__init__(self, config=config)
         self._TOOL = 'questa_fse'