From 5c8455261b27d98ad924c2135a5d232fb5bf9ce1 Mon Sep 17 00:00:00 2001
From: David Harris <David_Harris@hmc.edu>
Date: Wed, 11 Dec 2024 17:50:43 -0800
Subject: [PATCH 1/2] Point to new merged RV32/RV64 unprivileged coverpoints

---
 sim/questa/wally.do | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sim/questa/wally.do b/sim/questa/wally.do
index f42bf4930..8b41e9502 100644
--- a/sim/questa/wally.do
+++ b/sim/questa/wally.do
@@ -160,7 +160,7 @@ if {$DEBUG > 0} {
 # suppress spurious warnngs about
 # "Extra checking for conflicts with always_comb done at vopt time"
 # because vsim will run vopt
-set INC_DIRS "+incdir+${CONFIG}/${CFG} +incdir+${CONFIG}/deriv/${CFG} +incdir+${CONFIG}/shared +incdir+${FCRVVI} +incdir+${FCRVVI}/rv32 +incdir+${FCRVVI}/rv64 +incdir+${FCRVVI}/rv64_priv +incdir+${FCRVVI}/priv +incdir+${FCRVVI}/rv32_priv +incdir+${FCRVVI}/common +incdir+${FCRVVI}"
+set INC_DIRS "+incdir+${CONFIG}/${CFG} +incdir+${CONFIG}/deriv/${CFG} +incdir+${CONFIG}/shared +incdir+${FCRVVI} +incdir+${FCRVVI}/unpriv +incdir+${FCRVVI}/rv64_priv +incdir+${FCRVVI}/priv +incdir+${FCRVVI}/rv32_priv +incdir+${FCRVVI}/common +incdir+${FCRVVI}"
 set SOURCES "${SRC}/cvw.sv ${TB}/${TESTBENCH}.sv ${TB}/common/*.sv ${SRC}/*/*.sv ${SRC}/*/*/*.sv ${WALLY}/addins/verilog-ethernet/*/*.sv ${WALLY}/addins/verilog-ethernet/*/*/*/*.sv"
 vlog -permissive -lint -work ${WKDIR} {*}${INC_DIRS} {*}${FCvlog} {*}${FCdefineCOVER_EXTS} {*}${lockstepvlog} {*}${SOURCES} -suppress 2282,2583,7053,7063,2596,13286
 

From 78e6c43f6af6ec5565c2b7867ba0b1728964565f Mon Sep 17 00:00:00 2001
From: David Harris <David_Harris@hmc.edu>
Date: Wed, 11 Dec 2024 18:37:01 -0800
Subject: [PATCH 2/2] Enabled coverage for all extensions

---
 config/rv32gc/coverage.svh | 50 ++++++++++++++++++++++----------------
 config/rv64gc/coverage.svh | 50 ++++++++++++++++++++++----------------
 2 files changed, 58 insertions(+), 42 deletions(-)

diff --git a/config/rv32gc/coverage.svh b/config/rv32gc/coverage.svh
index 90593e0f5..ccc194a27 100644
--- a/config/rv32gc/coverage.svh
+++ b/config/rv32gc/coverage.svh
@@ -13,27 +13,35 @@
 `define CLINT_BASE 64'h02000000
 
 // Unprivileged extensions
-`include "RV32I_coverage.svh"
-`include "RV32M_coverage.svh"
-`include "RV32F_coverage.svh"
-`include "RV32D_coverage.svh"
-`include "RV32Zba_coverage.svh"
-`include "RV32Zbb_coverage.svh"
-`include "RV32Zbc_coverage.svh"
-`include "RV32Zbs_coverage.svh"
-`include "RV32ZfaF_coverage.svh"
-`include "RV32ZfaD_coverage.svh"
-`include "RV32ZfaZfh_coverage.svh"
-`include "RV32ZfhD_coverage.svh"
-`include "RV32Zfh_coverage.svh"
-`include "RV32Zicond_coverage.svh"
-`include "RV32Zca_coverage.svh"
-`include "RV32Zcb_coverage.svh"
-`include "RV32ZcbM_coverage.svh"
-`include "RV32ZcbZbb_coverage.svh"
-`include "RV32Zcf_coverage.svh"
-`include "RV32Zcd_coverage.svh"
-`include "RV32Zicsr_coverage.svh"
+`include "I_coverage.svh"
+`include "M_coverage.svh"
+`include "F_coverage.svh"
+`include "D_coverage.svh"
+`include "Zba_coverage.svh"
+`include "Zbb_coverage.svh"
+`include "Zbc_coverage.svh"
+`include "Zbs_coverage.svh"
+`include "ZfaF_coverage.svh"
+`include "ZfaD_coverage.svh"
+`include "ZfaZfh_coverage.svh"
+`include "Zfh_coverage.svh"
+`include "ZfhD_coverage.svh"
+`include "Zicond_coverage.svh"
+`include "Zca_coverage.svh"
+`include "Zcb_coverage.svh"
+`include "ZcbM_coverage.svh"
+`include "ZcbZbb_coverage.svh"
+`include "Zcf_coverage.svh"
+`include "Zcd_coverage.svh"
+`include "Zicsr_coverage.svh"
+`include "Zbkb_coverage.svh"
+`include "Zbkc_coverage.svh"
+`include "Zbkx_coverage.svh"
+`include "Zknd_coverage.svh"
+`include "Zkne_coverage.svh"
+`include "Zknh_coverage.svh"
+`include "Zaamo_coverage.svh"
+`include "Zalrsc_coverage.svh"
 
 // Privileged extensions
 `include "ZicsrM_coverage.svh"
diff --git a/config/rv64gc/coverage.svh b/config/rv64gc/coverage.svh
index 6aba1ac9a..d0ec96fb8 100644
--- a/config/rv64gc/coverage.svh
+++ b/config/rv64gc/coverage.svh
@@ -13,27 +13,35 @@
 `define CLINT_BASE 64'h02000000
 
 // Unprivileged extensions
-`include "RV64I_coverage.svh"
-`include "RV64M_coverage.svh"
-`include "RV64F_coverage.svh"
-`include "RV64D_coverage.svh"
-`include "RV64Zba_coverage.svh"
-`include "RV64Zbb_coverage.svh"
-`include "RV64Zbc_coverage.svh"
-`include "RV64Zbs_coverage.svh"
-`include "RV64ZfaF_coverage.svh"
-`include "RV64ZfaD_coverage.svh"
-`include "RV64ZfaZfh_coverage.svh"
-`include "RV64ZfhD_coverage.svh"
-`include "RV64Zfh_coverage.svh"
-`include "RV64Zicond_coverage.svh"
-`include "RV64Zca_coverage.svh"
-`include "RV64Zcb_coverage.svh"
-`include "RV64ZcbM_coverage.svh"
-`include "RV64ZcbZbb_coverage.svh"
-`include "RV64ZcbZba_coverage.svh"
-`include "RV64Zcd_coverage.svh"
-`include "RV64Zicsr_coverage.svh"
+`include "I_coverage.svh"
+`include "M_coverage.svh"
+`include "F_coverage.svh"
+`include "D_coverage.svh"
+`include "Zba_coverage.svh"
+`include "Zbb_coverage.svh"
+`include "Zbc_coverage.svh"
+`include "Zbs_coverage.svh"
+`include "ZfaF_coverage.svh"
+`include "ZfaD_coverage.svh"
+`include "ZfaZfh_coverage.svh"
+`include "ZfhD_coverage.svh"
+`include "Zfh_coverage.svh"
+`include "Zicond_coverage.svh"
+`include "Zca_coverage.svh"
+`include "Zcb_coverage.svh"
+`include "ZcbM_coverage.svh"
+`include "ZcbZbb_coverage.svh"
+`include "ZcbZba_coverage.svh"
+`include "Zcd_coverage.svh"
+`include "Zicsr_coverage.svh"
+`include "Zbkb_coverage.svh"
+`include "Zbkc_coverage.svh"
+`include "Zbkx_coverage.svh"
+`include "Zknd_coverage.svh"
+`include "Zkne_coverage.svh"
+`include "Zknh_coverage.svh"
+`include "Zaamo_coverage.svh"
+`include "Zalrsc_coverage.svh"
 
 // Privileged extensions
 `include "RV64VM_coverage.svh"