Merge branch 'master' into fix-power-strap-top-layer-error

e2e/configs-env/inst-env.yml

@@ -10,7 +10,7 @@ synopsys.SNPSLMD_LICENSE_FILE: "[email protected]"
 synopsys.MGLS_LICENSE_FILE: "[email protected]:[email protected]"
 
 # Commercial tool versions
-synthesis.genus.version: "191"
-par.innovus.version: "191"
-synthesis.genus.genus_bin: "/home/ff/eecs151/hammer-tools/cadence/GENUS/GENUS191/bin/genus"  # must point to binaries bc Hammer assumes DDI path now
-par.innovus.innovus_bin: "/home/ff/eecs151/hammer-tools/cadence/INNOVUS/INNOVUS191/bin/innovus"
+synthesis.genus.version: "221"
+par.innovus.version: "221"
+synthesis.genus.genus_bin: "/share/instsww/cadence/DDI221/GENUS221/bin/genus"  
+par.innovus.innovus_bin: "/share/instsww/cadence/DDI221/INNOVUS221/bin/innovus"

hammer/synthesis/yosys/__init__.py

@@ -249,7 +249,7 @@ def init_environment(self) -> bool:
 
     def syn_generic(self) -> bool:
         # TODO: is there a better way to do this? like self.get_setting()
-        if self._database.has_setting("synthesis.yosys.latch_map_file"):
+        if self._database.has_setting("synthesis.yosys.latch_map_file") and self.get_setting('synthesis.yosys.latch_map_file') is not None:
             latch_map = f"techmap -map {self.get_setting('synthesis.yosys.latch_map_file')}"
         else:  # TODO: make the else case better
             latch_map = ""