Got the directory mode wsim working!

bin/wsim

@@ -14,57 +14,12 @@
 import argparse
 import os
 
-# Parse arguments
+def LaunchSim(ElfFile):
-parser = argparse.ArgumentParser()
+    # Launch selected simulator
-parser.add_argument("config", help="Configuration file")
+    cd = "cd $WALLY/sim/" +args.sim
-parser.add_argument("testsuite", help="Test suite or ELF file")
+    # ugh.  can't have more than 9 arguments passed to vsim. why? I'll have to remove --lockstep when running
-parser.add_argument("--sim", "-s", help="Simulator", choices=["questa", "verilator", "vcs"], default="questa")
+    # functional coverage and imply it.
-parser.add_argument("--tb", "-t", help="Testbench", choices=["testbench", "testbench_fp"], default="testbench")
+    if (args.sim == "questa"):
-parser.add_argument("--gui", "-g", help="Simulate with GUI", action="store_true")
-parser.add_argument("--coverage", "-c", help="Code & Functional Coverage", action="store_true")
-parser.add_argument("--fcov", "-f", help="Code & Functional Coverage", action="store_true")
-parser.add_argument("--args", "-a", help="Optional arguments passed to simulator via $value$plusargs", default="")
-parser.add_argument("--vcd", "-v", help="Generate testbench.vcd", action="store_true")
-parser.add_argument("--lockstep", "-l", help="Run ImperasDV lock, step, and compare.", action="store_true")
-parser.add_argument("--locksteplog", "-b", help="Retired instruction number to be begin logging.", default=0)
-parser.add_argument("--covlog", "-d", help="Log coverage after n instructions.", default=0)
-args = parser.parse_args()
-print("Config=" + args.config + " tests=" + args.testsuite + " sim=" + args.sim + " gui=" + str(args.gui) + " args='" + args.args + "'")
-ElfFile=""
-
-if(os.path.isfile(args.testsuite)):
-    ElfFile = "+ElfFile=" + args.testsuite
-    args.testsuite = "none"
-
-# Validate arguments
-if (args.gui):
-    if args.sim not in ["questa", "vcs"]:
-        print("GUI option only supported for Questa and VCS")
-        exit(1)
-
-if (args.coverage):
-    if args.sim not in ["questa", "vcs"]:
-        print("Coverage option only available for Questa and VCS")
-        exit(1)
-
-if (args.vcd):
-    args.args += " -DMAKEVCD=1"
-
-#  create the output sub-directories.
-WALLY = os.environ.get('WALLY')
-regressionDir = WALLY + '/sim/'
-for d in ["logs", "wkdir", "cov"]:
-    try:
-        os.mkdir(regressionDir+args.sim+"/"+d)
-    except:
-        pass
-        
-
-# Launch selected simulator
-cd = "cd $WALLY/sim/" +args.sim
-# ugh.  can't have more than 9 arguments passed to vsim. why? I'll have to remove --lockstep when running
-# functional coverage and imply it.
-if (args.sim == "questa"):
         if (args.lockstep):
             prefix = "IMPERAS_TOOLS=" + WALLY + "/sim/imperas.ic"
             if(int(args.locksteplog) >= 1): EnableLog = 1
@@ -100,7 +55,7 @@ if (args.sim == "questa"):
             cmd = cd + "; " + prefix + " vsim -c -do \"" + cmd + "\""
         print("Running Questa with command: " + cmd)
         os.system(cmd)
-elif (args.sim == "verilator"):
+    elif (args.sim == "verilator"):
         # PWD=${WALLY}/sim CONFIG=rv64gc TESTSUITE=arch64i
         print(f"Running Verilator on {args.config} {args.testsuite}")
         if (args.coverage):
@@ -110,7 +65,7 @@ elif (args.sim == "verilator"):
             print("GUI option not available for Verilator")
             exit(1)
         os.system(f"/usr/bin/make -C {regressionDir}/verilator WALLYCONF={args.config} TEST={args.testsuite} TESTBENCH={args.tb} EXTRA_ARGS='{args.args}'")
-elif (args.sim == "vcs"):
+    elif (args.sim == "vcs"):
         print(f"Running VCS on " + args.config + " " + args.testsuite)
         if (args.gui):  
             args.args += "gui"
@@ -119,3 +74,68 @@ elif (args.sim == "vcs"):
         cmd = cd + "; ./run_vcs " + args.config + " " + args.testsuite + " " + args.args
         print(cmd)
         os.system(cmd)
+
+
+# Parse arguments
+parser = argparse.ArgumentParser()
+parser.add_argument("config", help="Configuration file")
+parser.add_argument("testsuite", help="Test suite or ELF file")
+parser.add_argument("--sim", "-s", help="Simulator", choices=["questa", "verilator", "vcs"], default="questa")
+parser.add_argument("--tb", "-t", help="Testbench", choices=["testbench", "testbench_fp"], default="testbench")
+parser.add_argument("--gui", "-g", help="Simulate with GUI", action="store_true")
+parser.add_argument("--coverage", "-c", help="Code & Functional Coverage", action="store_true")
+parser.add_argument("--fcov", "-f", help="Code & Functional Coverage", action="store_true")
+parser.add_argument("--args", "-a", help="Optional arguments passed to simulator via $value$plusargs", default="")
+parser.add_argument("--vcd", "-v", help="Generate testbench.vcd", action="store_true")
+parser.add_argument("--lockstep", "-l", help="Run ImperasDV lock, step, and compare.", action="store_true")
+parser.add_argument("--locksteplog", "-b", help="Retired instruction number to be begin logging.", default=0)
+parser.add_argument("--covlog", "-d", help="Log coverage after n instructions.", default=0)
+parser.add_argument("--elfext", "-e", help="When searching for elf files only includes ones which end in this extension", default=".elf")
+args = parser.parse_args()
+print("Config=" + args.config + " tests=" + args.testsuite + " sim=" + args.sim + " gui=" + str(args.gui) + " args='" + args.args + "'")
+ElfFile=""
+DirectorMode = 0
+ElfList = []
+
+if(os.path.isfile(args.testsuite)):
+    ElfFile = "+ElfFile=" + args.testsuite
+    args.testsuite = "none"
+    ElfList.append("+ElfFile=" + args.testsuite)
+elif(os.path.isdir(args.testsuite)):
+    DirectorMode = 1
+    for dirpath, dirnames, filenames in os.walk(args.testsuite):
+        for file in filenames:
+            if file.endswith(args.elfext):
+                ElfList.append("+ElfFile=" + os.path.join(dirpath, file))
+    args.testsuite = "none"
+print(ElfList)
+
+# Validate arguments
+if (args.gui):
+    if args.sim not in ["questa", "vcs"]:
+        print("GUI option only supported for Questa and VCS")
+        exit(1)
+
+if (args.coverage):
+    if args.sim not in ["questa", "vcs"]:
+        print("Coverage option only available for Questa and VCS")
+        exit(1)
+
+if (args.vcd):
+    args.args += " -DMAKEVCD=1"
+
+#  create the output sub-directories.
+WALLY = os.environ.get('WALLY')
+regressionDir = WALLY + '/sim/'
+for d in ["logs", "wkdir", "cov"]:
+    try:
+        os.mkdir(regressionDir+args.sim+"/"+d)
+    except:
+        pass
+        
+if(DirectorMode):
+    for ElfFile in ElfList:
+        LaunchSim(ElfFile)
+
+else:
+    LaunchSim(ElfFile)