Fixing regression test run failures due to yosys-slang plugin being loaded in when not enabled.

Author: loglav03

vtr_flow/misc/yosys/synthesis.tcl

@@ -6,16 +6,32 @@ setattr -mod -set keep_hierarchy 1 single_port_ram
 setattr -mod -set keep_hierarchy 1 dual_port_ram
 setattr -mod -set keep 1 dual_port_ram
 
-plugin -i slang
-yosys -import
-
 # synlig path error handling
-if {[catch {set synlig $::env(synlig_exe_path)} err]} {
-	puts "Error: $err"
-	puts "synlig_exe_path is not set"
+#if {[catch {set synlig $::env(synlig_exe_path)} err]} {
+#	puts "Error: $err"
+#	puts "synlig_exe_path is not set"
+#} else {
+#	set synlig $::env(synlig_exe_path)
+#	puts "Using parmys as partial mapper"
+#}
+
+# yosys-slang plugin error handling
+if {$env(PARSER) == "slang" } {
+	if {![info exists ::env(yosys_slang_path)]} {
+		puts "Error: $err"
+		puts "yosys_slang_path is not set"
+	} elseif {![file exists $::env(yosys_slang_path)]} {
+		error "Error: cannot find plugin at '$::env(yosys_slang_path)'. Run make with CMake param -DSLANG_SYSTEMVERILOG=ON to enable yosys-slang plugin."
+	} else {
+		plugin -i slang
+		yosys -import
+		puts "Using yosys-slang as yosys frontend"
+	}
+} elseif {$env(PARSER) == "default" } {
+	yosys -import
+	puts "Using Yosys read_verilog as yosys frontend"
 } else {
-	set synlig $::env(synlig_exe_path)
-	puts "Using parmys as partial mapper"
+	error "Invalid PARSER"
 }
 
 
@@ -50,9 +66,16 @@ if {$env(PARSER) == "slang" } {
 				lappend $sv_files $f
 				puts $fh $f
 			}
+			.svh {
+				lappend $sv_files $f
+				puts $fh $f
+			}
 			.v {
 				error "Use default parser to parse .v files."
 			}
+			.vh {
+				error "Use default parser to parse .v files."
+			}
 		}
 	}
 	close $fh

vtr_flow/scripts/python_libs/vtr/parmys/parmys.py

@@ -236,10 +236,15 @@ def run(
 
     # Set the synlig exe script path in the environment variable
     # (handle if it is not set or system-verilog OFF)
+    # try:
+    #     os.environ["synlig_exe_path"] = str(vtr.paths.synlig_exe_path)
+    # except KeyError:
+    #     os.environ["synlig_exe_path"] = "/dummy/path"
+
     try:
-        os.environ["synlig_exe_path"] = str(vtr.paths.synlig_exe_path)
+        os.environ["yosys_slang_path"] = str(vtr.paths.yosys_slang_path)
     except KeyError:
-        os.environ["synlig_exe_path"] = "/dummy/path"
+        os.environ["yosys_slang_path"] = "/dummy/path"
 
     # set the parser
     if parmys_args["parser"] in YOSYS_PARSERS:

vtr_flow/scripts/python_libs/vtr/paths.py

@@ -21,6 +21,7 @@
 yosys_exe_path = yosys_path / "yosys"
 yosys_tcl_path = vtr_flow_path / "misc" / "yosys"
 yosys_script_path = yosys_tcl_path / "synthesis.tcl"
+yosys_slang_path = root_path / "build" / "share" / "yosys" / "plugins" / "slang.so"
 
 # Synlig paths
 synlig_path = root_path / "build" / "bin" / "synlig_install"