Split the file extension checking and filelist building for yosys slang in synthesis.tcl to another .tcl (slang_filelist.tcl) to make synthesis.tcl more readable

Author: loglav03

vtr_flow/misc/yosys/slang_filelist.tcl

@@ -0,0 +1,24 @@
+#Parameters:
+#
+#	circuit_list - list of circuits passed into the flow
+#	file_list - text file being written to that will contain
+#	     		the names of circuits from circuit list.
+#
+#Function:
+#
+#	Validates file extensions of input files and writes the names
+#	of input files to the file list to be read by yosys-slang.
+ 
+proc build_filelist { circuit_list file_list } {
+	set fh [open $file_list "w"]
+	foreach f $circuit_list {
+		set ext [string tolower [file extension $f]]
+		if {$ext == ".sv" || $ext == ".svh" || $ext == ".v" || $ext == ".vh"} {
+			puts $fh $f
+		} else {
+			close $fh
+			error "Unsupported file type. Yosys-Slang accepts .sv .svh .v .vh. File {$f}"
+		}
+	}
+	close $fh
+}

vtr_flow/misc/yosys/synthesis.tcl

@@ -36,17 +36,10 @@ parmys_arch -a QQQ
 if {$env(PARSER) == "slang" } {
 	# Create a file list containing the name(s) of file(s) \
 	# to read together with read_slang
+	source [file join [pwd] "slang_filelist.tcl"]
 	set readfile [file join [pwd] "filelist.txt"]
-	set fh [open $readfile "w"]
-	foreach f {XXX} {
-		set ext [string tolower [file extension $f]]
-		if {$ext == ".sv" || $ext == ".svh" || $ext == ".v" || $ext == ".vh"} {
-			puts $fh $f
-		} else {
-			error "Unsupported file type. Yosys-Slang accepts .sv .svh .v .vh"
-		}
-	}
-	close $fh
+	#Writing names of circuit files to file list
+	build_filelist {XXX} $readfile
 	puts "Using Yosys read_slang command"
 	read_slang -C $readfile
 } elseif {$env(PARSER) == "default" } {

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

@@ -191,8 +191,14 @@ def run(
     if yosys_exec is None:
         yosys_exec = str(vtr.paths.yosys_exe_path)
 
+    yosys_helper_base_script = None
     if yosys_script is None:
         yosys_base_script = str(vtr.paths.yosys_script_path)
+        try:
+            yosys_slang_exec = str(vtr.paths.yosys_slang_path)
+            yosys_helper_base_script = str(vtr.paths.yosys_helper_script_path)
+        except KeyError:
+            yosys_helper_base_script = None
     else:
         yosys_base_script = str(Path(yosys_script).resolve())
 
@@ -201,6 +207,12 @@ def run(
     yosys_script_full_path = str(temp_dir / yosys_script)
     shutil.copyfile(yosys_base_script, yosys_script_full_path)
 
+    if yosys_helper_base_script is not None:
+        # Copy the yosys-slang helper script file
+        yosys_helper_script = "slang_filelist.tcl"
+        yosys_helper_script_full_path = str(temp_dir / yosys_helper_script)
+        shutil.copyfile(yosys_helper_base_script, yosys_helper_script_full_path)
+
     # Copy the VTR memory blocks file
 
     architecture_file_path = str(vtr.paths.scripts_path / architecture_file)

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_helper_script_path = yosys_tcl_path / "slang_filelist.tcl"
 yosys_slang_path = root_path / "build" / "share" / "yosys" / "plugins" / "slang.so"
 
 # Synlig paths