From a59a5f2f4c2bfb02e7309250c511fd8c524a4e6f Mon Sep 17 00:00:00 2001
From: David Harris <David_Harris@hmc.edu>
Date: Thu, 8 Aug 2024 21:03:59 -0700
Subject: [PATCH] Updated regression to avoid iter-elf

---
 Makefile             |  5 ++++-
 bin/regression-wally | 29 +++--------------------------
 2 files changed, 7 insertions(+), 27 deletions(-)

diff --git a/Makefile b/Makefile
index b0f01c49c..06538bd5c 100644
--- a/Makefile
+++ b/Makefile
@@ -8,7 +8,7 @@ all:
 	make riscof	
 	make testfloat
 #	make verify
-#	make coverage
+	make coverage
 #	make benchmarks
 
 # riscof builds the riscv-arch-test and wally-riscv-arch-test suites
@@ -35,6 +35,9 @@ coremark:
 embench:
 	cd ${WALLY}/benchmarks/embench; make; make run
 
+coverage:
+	make -C tests/coverage
+
 
 clean:
 	make clean -C sim
diff --git a/bin/regression-wally b/bin/regression-wally
index 95c3a7c99..5cd8bf76c 100755
--- a/bin/regression-wally
+++ b/bin/regression-wally
@@ -284,7 +284,7 @@ def addTests(tests, sim):
 
 def addLockstepTestsByDir(dir, config, sim):
     sim_logdir = WALLY+ "/sim/" + sim + "/logs/"
-    cmdPrefix="wsim --sim " + sim + " " + coverStr + " " + config
+    cmdPrefix="wsim --lockstep --sim " + sim + " " + coverStr + " " + config
     for file in os.listdir(dir):
         if file.endswith(".elf"):
             fullfile = os.path.join(dir, file)
@@ -387,14 +387,6 @@ if (args.ccov):  # only run RV64GC tests on Questa in code coverage mode
         addTests(tests64gc_fp, coveragesim)
 elif (args.fcov):  # only run RV64GC tests on Questa in lockstep in functional coverage mode
     addLockstepTestsByDir(WALLY+"/tests/functcov/rv64/I", "rv64gc", coveragesim)
-    #sim_log = WALLY + "/sim/questa/logs/fcov.log" 
-    #tc = TestCase(
-    #        name="lockstep_functcov",
-    #        variant="rv64gc",
-    #        cmd="iterelf " + WALLY + "/tests/functcov/rv64/I > " + sim_log,
-    #        grepstr="SUCCESS! All tests ran without failures",
-    #        grepfile = sim_log)
-    #configs.append(tc)
 elif (args.fcovrvvi):  # only run RV64GC tests on Questa in rvvi coverage mode
     addTests(tests64gc_nofp, coveragesim)
     if (args.fp):
@@ -409,23 +401,8 @@ else:
 
 # run derivative configurations and lockstep tests in nightly regression
 if (args.nightly):
-    sim_log = WALLY + "/sim/questa/logs/lockstep_coverage.log" 
-    tc = TestCase(
-            name="lockstep_coverage",
-            variant="rv64gc",
-            cmd="iterelf " + WALLY + "/tests/coverage > " + sim_log,
-            grepstr="SUCCESS! All tests ran without failures",
-            grepfile = sim_log)
-    configs.append(tc)
-
-    sim_log = WALLY + "/sim/questa/logs/lockstep_wally-riscv-arch-test.log" 
-    tc = TestCase(
-            name="lockstep_wally-riscv-arch-test",
-            variant="rv64gc",
-            cmd="iterelf " + WALLY + "/tests/riscof/work/wally-riscv-arch-test/rv64i_m > " + sim_log,
-            grepstr="SUCCESS! All tests ran without failures",
-            grepfile = sim_log)
-    configs.append(tc)
+    addLockstepTestsByDir(WALLY+"/tests/coverage", "rv64gc", "questa")
+    addLockstepTestsByDir(WALLY+"/tests/riscof/work/wally-riscv-arch-test/rv64i_m", "rv64gc", "questa")
     addTests(derivconfigtests, defaultsim)
 
 # testfloat tests