From b315a8e338ba31cd5b894dc9ed613e93ebfcd8c5 Mon Sep 17 00:00:00 2001
From: Huda-10xe <huda.sajjad@10xengineers.ai>
Date: Wed, 21 Aug 2024 15:41:16 +0500
Subject: [PATCH] Adding regression commands to Makefile

---
 addins/cvw-arch-verif | 2 +-
 sim/Makefile          | 8 ++++++++
 tests/riscof/Makefile | 7 -------
 3 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/addins/cvw-arch-verif b/addins/cvw-arch-verif
index 2a4f56ec9..07679a317 160000
--- a/addins/cvw-arch-verif
+++ b/addins/cvw-arch-verif
@@ -1 +1 @@
-Subproject commit 2a4f56ec97db7cdd6fd13fb928122d408fefbf1e
+Subproject commit 07679a31750eb1054055afff0d42f467c5e87727
diff --git a/sim/Makefile b/sim/Makefile
index b420acab4..fe413ce15 100644
--- a/sim/Makefile
+++ b/sim/Makefile
@@ -38,6 +38,14 @@ QuestaFunctCoverage: ${SIM}/questa/fcov_ucdb/rv64gc_WALLY-COV-add.elf.ucdb
 	vcover report ${SIM}/questa/fcov_ucdb/fcov.ucdb -details -cvg | egrep "Coverpoint|Covergroup|Cross|TYPE"  > ${SIM}/questa/fcov/fcov.summary.log
 	grep "TOTAL COVERGROUP COVERAGE" ${SIM}/questa/fcov/fcov.log
 
+QuestaFunctCoverageRvvi: ${WALLY}/addins/cvw-arch-verif/work/rv64gc_arch64i.ucdb 
+	vcover merge -out ${SIM}/questa/fcovrvvi_ucdb/fcovrvvi.ucdb ${WALLY}/addins/cvw-arch-verif/work/rv64gc_arch64i.ucdb ${WALLY}/addins/cvw-arch-verif/work/rv64gc_*.ucdb -logfile ${SIM}/questa/fcovrvvi/log
+	vcover report -details -html ${SIM}/questa/fcovrvvi_ucdb/fcovrvvi.ucdb
+	vcover report ${SIM}/questa/fcovrvvi_ucdb/fcovrvvi.ucdb -details -cvg > ${SIM}/questa/fcovrvvi/fcovrvvi.log
+	vcover report ${SIM}/questa/fcovrvvi_ucdb/fcovrvvi.ucdb -testdetails -cvg > ${SIM}/questa/fcovrvvi/fcovrvvi.testdetails.log
+	vcover report ${SIM}/questa/fcovrvvi_ucdb/fcovrvvi.ucdb -details -cvg | egrep "Coverpoint|Covergroup|Cross|TYPE"  > ${SIM}/questa/fcovrvvi/fcovrvvi.summary.log
+	grep "TOTAL COVERGROUP COVERAGE" ${SIM}/questa/fcovrvvi/fcovrvvi.log
+
 imperasdv_cov:
 	touch ${SIM}/seed0.txt
 	echo "0" > ${SIM}/seed0.txt
diff --git a/tests/riscof/Makefile b/tests/riscof/Makefile
index 81c8662e0..603377677 100644
--- a/tests/riscof/Makefile
+++ b/tests/riscof/Makefile
@@ -4,8 +4,6 @@ work_dir = ./riscof_work
 work = ./work
 arch_workdir = $(work)/riscv-arch-test
 wally_workdir = $(work)/wally-riscv-arch-test
-custom_test_dir = ../../addins/cvw-arch-verif/test
-submodule_work_dir = ../../addins/cvw-arch-verif/riscof_work
 nproc = $(shell nproc --ignore=1)
 
 current_dir = $(shell pwd)
@@ -15,8 +13,6 @@ all: root arch32 wally32 arch32e arch64 wally64
 
 wally-riscv-arch-test: root wally64 wally32
 
-custom: new_test
-
 root:
 	mkdir -p $(work_dir)
 	mkdir -p $(work)
@@ -54,9 +50,6 @@ wally64:
 quad64:
 	riscof run --work-dir=$(work_dir) --config=config64.ini --suite=$(wally_dir)/riscv-test-suite/rv64i_m/Q/riscv-ctg/tests/ --env=$(wally_dir)/riscv-test-suite/env
 	
-new_test:
-	riscof run --work-dir=$(submodule_work_dir) --config=config64.ini --suite=$(custom_test_dir)/ --env=$(wally_dir)/riscv-test-suite/env --no-browser
-
 #wally32e:
 #	riscof run --work-dir=$(work_dir) --config=config32e.ini --suite=$(wally_dir)/riscv-test-suite/ --env=$(wally_dir)/riscv-test-suite/env --no-browser --no-dut-run
 #	rsync -a $(work_dir)/rv32i_m/ $(wally_workdir)/rv32i_m/ || echo "error suppressed"