From 97f1ba066dc052b17e3005468c403944d2439a0c Mon Sep 17 00:00:00 2001
From: David Harris <David_Harris@hmc.edu>
Date: Thu, 19 Sep 2024 07:48:24 -0700
Subject: [PATCH] Updated regression --fcov to run the combined ALL files (much
 fewer jobs, faster)

---
 bin/regression-wally       | 13 +++++++------
 config/rv64gc/coverage.svh |  2 +-
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/bin/regression-wally b/bin/regression-wally
index b1f73719d..6321b6b6c 100755
--- a/bin/regression-wally
+++ b/bin/regression-wally
@@ -290,7 +290,7 @@ def addTests(tests, sim):
             configs.append(tc)
 
 
-def addLockstepTestsByDir(dir, config, sim):
+def addLockstepTestsByDir(dir, config, sim, fcovMode):
     sim_logdir = WALLY+ "/sim/" + sim + "/logs/"
     if (coverStr != ""): # use --fcov in place of --lockstep
         cmdPrefix="wsim --sim " + sim + " " + coverStr + " " + config
@@ -299,7 +299,8 @@ def addLockstepTestsByDir(dir, config, sim):
     if (os.path.isdir(dir)): 
         for dirpath, dirnames, filenames in os.walk(os.path.abspath(dir)):
             for file in filenames:
-                if file.endswith(".elf"):
+                # fcov lockstep only runs on WALLY-COV-ALL.elf files; other lockstep runs on all files
+                if (file.endswith(".elf") and fcovMode == 0 or file.endswith("ALL.elf") and fcovMode == 1):
                     fullfile = os.path.join(dirpath, file)
                     fields = fullfile.rsplit('/', 3)
                     if (fields[2] == "ref"):
@@ -411,8 +412,8 @@ if (args.ccov):  # only run RV64GC tests on Questa in code coverage mode
     if (args.fp):
         addTests(tests64gc_fp, coveragesim)
 elif (args.fcov):  # only run RV64GC tests on Questa in lockstep in functional coverage mode
-    addLockstepTestsByDir(WALLY+"/addins/cvw-arch-verif/tests/rv32/", "rv32gc", coveragesim)
-#    addLockstepTestsByDir(WALLY+"/addins/cvw-arch-verif/tests/rv64/I", "rv64gc", coveragesim)
+    addLockstepTestsByDir(WALLY+"/addins/cvw-arch-verif/tests/rv32/", "rv32gc", coveragesim, 1)
+    addLockstepTestsByDir(WALLY+"/addins/cvw-arch-verif/tests/rv64/", "rv64gc", coveragesim, 1)
 elif (args.fcovrvvi):  # only run RV64GC tests on Questa in rvvi coverage mode
     addTests(tests64gc_nofp, coveragesim)
     if (args.fp):
@@ -427,8 +428,8 @@ else:
 
 # run derivative configurations and lockstep tests in nightly regression
 if (args.nightly):
-    addLockstepTestsByDir(WALLY+"/tests/coverage", "rv64gc", "questa")
-    addLockstepTestsByDir(WALLY+"/tests/riscof/work/wally-riscv-arch-test/rv64i_m", "rv64gc", "questa")
+    addLockstepTestsByDir(WALLY+"/tests/coverage", "rv64gc", "questa", 0)
+    addLockstepTestsByDir(WALLY+"/tests/riscof/work/wally-riscv-arch-test/rv64i_m", "rv64gc", "questa", 0)
     addTests(derivconfigtests, defaultsim)
 
 # testfloat tests
diff --git a/config/rv64gc/coverage.svh b/config/rv64gc/coverage.svh
index 316ef81af..855c1f6a9 100644
--- a/config/rv64gc/coverage.svh
+++ b/config/rv64gc/coverage.svh
@@ -7,5 +7,5 @@
 
 `include "RV64I_coverage.svh"
 `include "RV64M_coverage.svh"
-`include "RV64F_coverage.svh"
+//`include "RV64F_coverage.svh"
 `include "RV64Zicond_coverage.svh"