From fa75077d2ff638d34fb1995b666fc8494bada321 Mon Sep 17 00:00:00 2001
From: David Harris <David_Harris@hmc.edu>
Date: Mon, 15 Jul 2024 15:34:44 -0700
Subject: [PATCH] More attempts at functional coverage

---
 sim/Makefile        |  4 ++--
 sim/questa/wally.do | 22 +++++++++++-----------
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/sim/Makefile b/sim/Makefile
index 9ce1b5c49..5635431ff 100644
--- a/sim/Makefile
+++ b/sim/Makefile
@@ -89,14 +89,14 @@ combine_functcov:
 	mkdir -p ${SIM}/questa/fcov
 	mkdir -p ${SIM}/questa/fcov_logs
 	cd ${SIM}/questa/fcov && rm -rf *
+	cd ${SIM}/questa/fcov_ucdb && rm -rf *
 	wsim rv64gc ${WALLY}/tests/functcov/rv64/I/WALLY-COV-add.elf --fcov > ${SIM}/questa/fcov_logs/add.log 2>&1
 
 	#run-elf-cov.bash --seed ${SIM}/questa/seed0.txt --verbose --coverdb ${SIM}/questa/fcov/add.ucdb --elf ${WALLY}/tests/functcov/rv64/I/WALLY-COV-add.elf								>> ${SIM}/questa/fcov_logs/add.log 2>&1
 	#run-elf-cov.bash --seed ${SIM}/questa/seed0.txt --verbose --coverdb ${SIM}/questa/fcov/and.ucdb --elf ${WALLY}/tests/functcov/rv64/I/WALLY-COV-and.elf								>> ${SIM}/questa/fcov_logs/add.log 2>&1
 	#run-elf-cov.bash --seed ${SIM}/questa/seed0.txt --verbose --coverdb ${SIM}/questa/fcov/ori.ucdb --elf ${WALLY}/tests/functcov/rv64/I/WALLY-COV-ori.elf								>> ${SIM}/questa/fcov_logs/add.log 2>&1
 
-	vcover merge ${SIM}/questa/fcov_ucdb/fcov.ucdb ${SIM}/questa/fcov_ucdb/*.ucdb ${SIM}/questa/fcov_ucdb/* -suppress 6854 -64
-	# vcover merge ${SIM}/questa/fcov/fcov.ucdb ${SIM}/questa/fcov_ucdbs/* -suppress 6854 -64
+	vcover merge ${SIM}/questa/fcov_ucdb/fcov.ucdb ${SIM}/questa/fcov_ucdb/*.ucdb -suppress 6854 -64
 	vcover report -details -html ${SIM}/questa/fcov_ucdb/fcov.ucdb
 	vcover report ${SIM}/questa/fcov_ucdb/fcov.ucdb -details -cvg > ${SIM}/questa/fcov/fcov.log
 	vcover report ${SIM}/questa/fcov_ucdb/fcov.ucdb -testdetails -cvg > ${SIM}/questa/fcov/fcov.testdetails.log
diff --git a/sim/questa/wally.do b/sim/questa/wally.do
index 54d6a1124..156431bef 100644
--- a/sim/questa/wally.do
+++ b/sim/questa/wally.do
@@ -130,7 +130,7 @@ if {$FunctCoverageIndex >= 0} {
     set FCdefineCOVER_RV64ZICSR "+define+COVER_RV64ZICSR"
     set FCdefineCOVER_RV64C "+define+COVER_RV64C"
     set FCdefineIDV_INCLUDE_TRACE2COV "+define+IDV_INCLUDE_TRACE2COV"
-    set FCTRACE2COV "+TRACE2COV_ENABLE=1 +VERBOSE=1"
+    set FCTRACE2COV "+TRACE2COV_ENABLE=1"
 
     set lst [lreplace $lst $FunctCoverageIndex $FunctCoverageIndex]
 }\
@@ -218,24 +218,24 @@ if { ${GUI} } {
     }
 }
 
-if {$ccov} {
-    set UCDB ${WALLY}/sim/questa/ucdb/${CFG}_${TESTSUITE}.ucdb
-    echo "Saving coverage to ${UCDB}"
-    coverage save -instance /testbench/dut/core ${UCDB}
-}
-
 if {$FunctCoverage} {
     set UCDB ${WALLY}/sim/questa/fcov_ucdb/${CFG}_${TESTSUITE}.ucdb
     coverage save -onexit ${UCDB}
 }
 
 run -all
+
+if {$ccov} {
+    set UCDB ${WALLY}/sim/questa/ucdb/${CFG}_${TESTSUITE}.ucdb
+    echo "Saving coverage to ${UCDB}"
+    do coverage-exclusions-rv64gc.do  # beware: this assumes testing the rv64gc configuration
+    coverage save -instance /testbench/dut/core ${UCDB}
+}
+
+
 # power off -r /dut/core/*
 
-# Code coverage exclusions
-if {$ccov} {
-    do coverage-exclusions-rv64gc.do  # beware: this assumes testing the rv64gc configuration
-}
+
 
 # These aren't doing anything helpful
 #profile report -calltree -file wally-calltree.rpt -cutoff 2