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

opencos/tools/slang.py

@@ -6,12 +6,12 @@ Contains classes for ToolSlang, CommandElabSlang
 # pylint: disable=R0801 # (calling functions with same arguments)
 
 import os
-import shutil
 import subprocess
 
 from opencos import util
-from opencos.eda_base import Tool
 from opencos.commands import CommandElab
+from opencos.eda_base import Tool
+from opencos.files import safe_shutil_which
 from opencos.utils.str_helpers import sanitize_defines_for_sh
 
 
@@ -30,14 +30,18 @@ class ToolSlang(Tool):
     def get_versions(self) -> str:
         if self._VERSION:
             return self._VERSION
-        path = shutil.which(self._EXE)
+        path = safe_shutil_which(self._EXE)
         if not path:
             self.error(f'"{self._EXE}" not in path, need to get it ({self._URL}')
         else:
             self.slang_exe = path
             self.slang_base_path, _ = os.path.split(path)
-            self.slang_tidy_exe = os.path.join(self.slang_base_path, 'slang-tidy')
-            self.slang_hier_exe = os.path.join(self.slang_base_path, 'slang-hier')
+            self.slang_tidy_exe = safe_shutil_which(
+                os.path.join(self.slang_base_path, 'slang-tidy')
+            )
+            self.slang_hier_exe = safe_shutil_which(
+                os.path.join(self.slang_base_path, 'slang-hier')
+            )
 
         version_ret = subprocess.run(
             [self.slang_exe, '--version'],
@@ -204,7 +208,7 @@ class CommandElabSlang(CommandElab, ToolSlang):
         command_list = [self.slang_exe]
 
         if self.args['tidy']:
-            if not shutil.which(self.slang_tidy_exe):
+            if not safe_shutil_which(self.slang_tidy_exe):
                 util.warning("Running tool slang with --tidy, but 'slang-tidy'",
                              "not in PATH, using 'slang' instead")
             else:
@@ -213,7 +217,7 @@ class CommandElabSlang(CommandElab, ToolSlang):
         if self.args['hier']:
             if self.args['tidy']:
                 util.warning('Running with --tidy and --heir, will attempt to use slang-hier')
-            elif not shutil.which(self.slang_hier_exe):
+            elif not safe_shutil_which(self.slang_hier_exe):
                 util.warning("Running tool slang with --hier, but 'slang-hier'",
                              "not in PATH, using 'slang' instead")
             else:

opencos/tools/slang_yosys.py

@@ -119,6 +119,7 @@ class CommandSynthSlangYosys(CommonSynthYosys, ToolSlangYosys):
         )
 
         # In case --top was not set:
+        # TODO(drew): Can we skip this if it was an inferred top???
         if not any(x.startswith('--top') for x in read_slang_cmd):
             read_slang_cmd.append(f'--top {self.args["top"]}')
 

opencos/tools/surelog.py

@@ -3,12 +3,13 @@
 Contains classes for ToolSurelog, CommandElabSurelog
 '''
 
-import shutil
+
 import subprocess
 
 from opencos import util
-from opencos.eda_base import Tool
 from opencos.commands import CommandElab
+from opencos.eda_base import Tool
+from opencos.files import safe_shutil_which
 from opencos.utils.str_helpers import sanitize_defines_for_sh
 
 
@@ -24,7 +25,7 @@ class ToolSurelog(Tool):
     def get_versions(self) -> str:
         if self._VERSION:
             return self._VERSION
-        path = shutil.which(self._EXE)
+        path = safe_shutil_which(self._EXE)
         if not path:
             self.error(f'"{self._EXE}" not in path, need to get it ({self._URL})')
         else:

opencos/tools/verilator.py

@@ -7,13 +7,13 @@ Contains classes for ToolVerilator and VerilatorSim, VerilatorElab.
 
 import multiprocessing
 import os
-import shutil
 import subprocess
 
 
 from opencos import util
-from opencos.eda_base import Tool
 from opencos.commands import CommandSim
+from opencos.eda_base import Tool
+from opencos.files import safe_shutil_which
 from opencos.utils.str_helpers import sanitize_defines_for_sh
 
 class ToolVerilator(Tool):
@@ -30,7 +30,8 @@ class ToolVerilator(Tool):
     def get_versions(self) -> str:
         if self._VERSION:
             return self._VERSION
-        path = shutil.which(self._EXE)
+        # __init__ would have set self.EXE to full path.
+        path = safe_shutil_which(self._EXE)
         if not path:
             self.error(f'"{self._EXE}" not in path or not installed, see {self._URL})')
         else:
@@ -39,7 +40,7 @@ class ToolVerilator(Tool):
 
         # Let's get the verilator_coverage path from the same place as verilator.
         if path:
-            self.verilator_coverage_exe = shutil.which(
+            self.verilator_coverage_exe = safe_shutil_which(
                 os.path.join(self.verilator_base_path, 'verilator_coverage')
             )
         if not self.verilator_coverage_exe: