From 7aa5b1f7db0fcf0b77f46c94ff2a352ddea8d3ec Mon Sep 17 00:00:00 2001
From: David Harris <David_Harris@hmc.edu>
Date: Wed, 8 Jan 2025 20:50:14 -0800
Subject: [PATCH] cvw cleanup

---
 bin/regression-wally       | 4 ++--
 config/rv64gc/coverage.svh | 1 -
 sim/Makefile               | 6 +++---
 3 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/bin/regression-wally b/bin/regression-wally
index f1abbd477..85cfc9d43 100755
--- a/bin/regression-wally
+++ b/bin/regression-wally
@@ -33,7 +33,7 @@ tests = [
                     "arch32i", "arch32priv", "arch32c",  "arch32m", "arch32a_amo", "arch32zifencei", "arch32zicond", 
                     "arch32zba", "arch32zbb", "arch32zbc", "arch32zbs", "arch32zfh", "arch32zfh_fma", 
                     "arch32zfh_divsqrt", "arch32zfaf", "arch32zfad", "wally32a_lrsc", "wally32priv", "wally32periph", "arch32zcb",
-                    "arch32zbkb", "arch32zbkc", "arch32zbkx", "arch32zknd", "arch32zkne", "arch32zknh", "arch32vm_sv32"]], # Add when working: arch32pmp
+                    "arch32zbkb", "arch32zbkc", "arch32zbkx", "arch32zknd", "arch32zkne", "arch32zknh", "arch32vm_sv32", "arch32pmp"]], 
         ["rv64i", ["arch64i"]]
         ]
 
@@ -60,7 +60,7 @@ tests64gc_nofp = [
         ["rv64gc", ["coverage64gc", "arch64i", "arch64priv", "arch64c",  "arch64m", "arch64zcb",
                     "arch64zifencei", "arch64zicond", "arch64a_amo", "wally64a_lrsc", "wally64periph", "wally64priv", 
                     "arch64zbkb", "arch64zbkc", "arch64zbkx", "arch64zknd", "arch64zkne", "arch64zknh",
-                    "arch64zba",  "arch64zbb",  "arch64zbc", "arch64zbs"]] # add when working: "arch64zicboz", "arch64pmp"
+                    "arch64zba",  "arch64zbb",  "arch64zbc", "arch64zbs", "arch64pmp"]] # add when working: "arch64zicboz"
     ]
 
 tests64gc_fp = [
diff --git a/config/rv64gc/coverage.svh b/config/rv64gc/coverage.svh
index aa4e071fb..fd8f11b04 100644
--- a/config/rv64gc/coverage.svh
+++ b/config/rv64gc/coverage.svh
@@ -60,4 +60,3 @@
 // `include "RV64VM_PMP_coverage.svh"
 // `include "RV64CBO_VM_coverage.svh"
 // `include "RV64CBO_PMP_coverage.svh"
-// `include "RV64Zicbom_coverage.svh"
diff --git a/sim/Makefile b/sim/Makefile
index 5feb25ae4..d4a94112e 100644
--- a/sim/Makefile
+++ b/sim/Makefile
@@ -55,9 +55,9 @@ collect_functcov: remove_functcov_artifacts riscvdv_functcov combine_functcov
 
 riscvdv_functcov:
 	mkdir -p ${SIM}/questa/fcov_logs
-	mkdir -p ${SIM}/questa/fcov_ucdbs
+	mkdir -p ${SIM}/questa/fcov_ucdb
 	rm -rf ${SIM}/questa/fcov_logs/*
-	rm -rf ${SIM}/questa/fcov_ucdbs/*
+	rm -rf ${SIM}/questa/fcov_ucdb/*
 	$(MAKE) riscvdv test_name=riscv_arithmetic_basic_test				    >> ${SIM}/questa/fcov.log 2>&1
 	$(MAKE) riscvdv test_name=riscv_amo_test						          	>> ${SIM}/questa/fcov.log 2>&1
 	$(MAKE) riscvdv test_name=riscv_ebreak_debug_mode_test			    >> ${SIM}/questa/fcov.log 2>&1
@@ -109,7 +109,7 @@ combine_functcov:
 	grep "Total Coverage By Instance" ${SIM}/questa/fcov/fcov.log
 
 remove_functcov_artifacts:
-	rm -rf ${SIM}/questa/riscv.ucdb ${SIM}/questa/fcov.log ${SIM}/questa/covhtmlreport/ ${SIM}/questa/fcov_logs/ ${SIM}/questa/fcov_ucdbs/ ${SIM}/questa/fcov/
+	rm -rf ${SIM}/questa/riscv.ucdb ${SIM}/questa/fcov.log ${SIM}/questa/covhtmlreport/ ${SIM}/questa/fcov_logs/ ${SIM}/questa/fcov_ucdb/ ${SIM}/questa/fcov/
 
 benchmarks:
 	$(MAKE) -C ${WALLY}benchmarks/embench build