From d66a613074f609962cc56506fd0ccfdd5c6bcdeb Mon Sep 17 00:00:00 2001
From: Huda-10xe <huda.sajjad@10xengineers.ai>
Date: Mon, 28 Oct 2024 00:32:07 -0700
Subject: [PATCH 1/5] Renaming VM Coverage

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

diff --git a/config/rv32gc/coverage.svh b/config/rv32gc/coverage.svh
index 3a04643ad..415722efc 100644
--- a/config/rv32gc/coverage.svh
+++ b/config/rv32gc/coverage.svh
@@ -13,4 +13,5 @@
 `include "RV32Zca_coverage.svh"
 `include "RV32Zcb_coverage.svh"
 `include "RV32ZcbM_coverage.svh"
-`include "RV32ZcbZbb_coverage.svh"
\ No newline at end of file
+`include "RV32ZcbZbb_coverage.svh"
+`include "VM_coverage.svh"
\ No newline at end of file
diff --git a/config/rv64gc/coverage.svh b/config/rv64gc/coverage.svh
index 5b11b5a22..ed337a4ac 100644
--- a/config/rv64gc/coverage.svh
+++ b/config/rv64gc/coverage.svh
@@ -9,7 +9,7 @@
 `include "RV64M_coverage.svh"
 `include "RV64F_coverage.svh"
 `include "RV64Zfh_coverage.svh"
-`include "RV64VM_coverage.svh"
+`include "VM_coverage.svh"
 `include "RV64VM_PMP_coverage.svh"
 `include "RV64CBO_VM_coverage.svh"
 `include "RV64CBO_PMP_coverage.svh"

From 3f94fc3ca245604e71d0f8537127749cfc1bf8e9 Mon Sep 17 00:00:00 2001
From: Huda-10xe <huda.sajjad@10xengineers.ai>
Date: Tue, 29 Oct 2024 03:13:53 -0700
Subject: [PATCH 2/5] Changing VM covergae name to incorporate sv32 coverpoints

---
 config/rv64gc/coverage.svh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config/rv64gc/coverage.svh b/config/rv64gc/coverage.svh
index 20d5108d6..4e863b288 100644
--- a/config/rv64gc/coverage.svh
+++ b/config/rv64gc/coverage.svh
@@ -21,7 +21,7 @@
 `include "RV64Zcd_coverage.svh"
 
 // Privileged extensions
-`include "RVVM_coverage.svh"
+`include "VM_coverage.svh"
 `include "ZicsrM_coverage.svh"
 // `include "RV64VM_PMP_coverage.svh"
 // `include "RV64CBO_VM_coverage.svh"

From 8515c20c158c02e5202a753e565a38b690703e10 Mon Sep 17 00:00:00 2001
From: Huda-10xe <huda.sajjad@10xengineers.ai>
Date: Tue, 29 Oct 2024 04:25:02 -0700
Subject: [PATCH 3/5] Removing VM_Covergae from this till its complete

---
 config/rv32gc/coverage.svh | 1 -
 1 file changed, 1 deletion(-)

diff --git a/config/rv32gc/coverage.svh b/config/rv32gc/coverage.svh
index 96362fdf3..217e8788a 100644
--- a/config/rv32gc/coverage.svh
+++ b/config/rv32gc/coverage.svh
@@ -22,4 +22,3 @@
 
 // Privileged extensions
 `include "ZicsrM_coverage.svh"
-`include "VM_coverage.svh"

From af74635216eeca9dca33d49c25b7a9206f23a71c Mon Sep 17 00:00:00 2001
From: Huda-10xe <huda.sajjad@10xengineers.ai>
Date: Tue, 29 Oct 2024 09:44:18 -0700
Subject: [PATCH 4/5] reverting VM to RV64VM

---
 config/rv64gc/coverage.svh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config/rv64gc/coverage.svh b/config/rv64gc/coverage.svh
index 4e863b288..0491b4ab3 100644
--- a/config/rv64gc/coverage.svh
+++ b/config/rv64gc/coverage.svh
@@ -21,7 +21,7 @@
 `include "RV64Zcd_coverage.svh"
 
 // Privileged extensions
-`include "VM_coverage.svh"
+`include "RV64VM_coverage.svh"
 `include "ZicsrM_coverage.svh"
 // `include "RV64VM_PMP_coverage.svh"
 // `include "RV64CBO_VM_coverage.svh"

From f258384596fd2975f14d3e6f0f86ebc4fb44ba52 Mon Sep 17 00:00:00 2001
From: Huda-10xe <huda.sajjad@10xengineers.ai>
Date: Fri, 1 Nov 2024 06:07:49 -0700
Subject: [PATCH 5/5] Adding sv32 coverpoins

---
 config/rv32gc/coverage.svh | 2 ++
 sim/questa/wally.do        | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/config/rv32gc/coverage.svh b/config/rv32gc/coverage.svh
index 2eb52541f..97496a8b9 100644
--- a/config/rv32gc/coverage.svh
+++ b/config/rv32gc/coverage.svh
@@ -25,3 +25,5 @@
 
 // Privileged extensions
 `include "ZicsrM_coverage.svh"
+`include "RV32VM_coverage.svh"
+`include "RV32VM_PMP_coverage.svh"
diff --git a/sim/questa/wally.do b/sim/questa/wally.do
index a53a0e3c7..c692b06e1 100644
--- a/sim/questa/wally.do
+++ b/sim/questa/wally.do
@@ -181,7 +181,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}/common +incdir+${FCRVVI}"
+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 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