From 31ae18922bcba83d1ce3952a05c7dcb1c0ecab41 Mon Sep 17 00:00:00 2001
From: Divya2030 <imlucky.divya@gmail.com>
Date: Wed, 8 May 2024 04:25:03 -0700
Subject: [PATCH 1/3] regression_wally vcs run works

---
 sim/vcs/run_vcs        | 16 +++++++++-------
 testbench/testbench.sv |  3 +++
 2 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/sim/vcs/run_vcs b/sim/vcs/run_vcs
index d19097e90..53eff4d56 100755
--- a/sim/vcs/run_vcs
+++ b/sim/vcs/run_vcs
@@ -24,6 +24,8 @@ WKDIR="wkdir/${1}_${2}"
 COV="cov/${1}_${2}"
 LOGS="logs"
 
+shift 2
+PLUSARGS="$*"
 
 clean_logs() {
     echo -e "${YELLOW}Cleaning up workspace...${NC}"
@@ -31,10 +33,11 @@ clean_logs() {
 }
 clean_simprofile() {
     echo -e "${YELLOW}Cleaning up simprofile_dir...${NC}"
-    rm -rf simprofile_dir* profileReport* 
+    rm -rf simprofile_dir* profileReport*  
 }
+
+#clean_simprofile
 #clean_logs
-clean_simprofile
 # Function to create a directory if it does not exist
 create_directory() {
     local dir=$1  # Local variable for directory name
@@ -85,15 +88,14 @@ RTL_FILES="$INCLUDE_DIRS $(find ${SRC} -name "*.sv" ! -path "${SRC}/generic/cloc
 
 # Simulation and Coverage Commands
 OUTPUT="sim_out"
-VCS_CMD="vcs +lint=all,noGCWM,noUI,noSVA-UA,noIDTS,noNS,noULCO,noCAWM-L,noWMIA-L,noSV-PIU,noSTASKW_CO,noSTASKW_CO1,noSTASKW_RMCOF +vcs+vcdpluson -simprofile -suppress +warn -sverilog +vc -Mupdate -line -full64 -kdb -lca -debug_access+all+reverse  -ntb_opts sensitive_dyn +define+SIM_VCS ${INCLUDE_PATH} $RTL_FILES"
-SIMV_CMD="./${WKDIR}/$OUTPUT +TEST=${TESTSUITE}" 
+VCS_CMD="vcs +lint=all,noGCWM,noUI,noSVA-UA,noIDTS,noNS,noULCO,noCAWM-L,noWMIA-L,noSV-PIU,noSTASKW_CO,noSTASKW_CO1,noSTASKW_RMCOF +vcs+vcdpluson -suppress +warn -sverilog +vc -Mupdate -line -full64 -kdb -lca -debug_access+all+reverse  -ntb_opts sensitive_dyn +define+SIM_VCS ${INCLUDE_PATH} $RTL_FILES"
+SIMV_CMD="./${WKDIR}/$OUTPUT +TEST=${TESTSUITE} ${PLUSARGS}" 
 COV_FILES="${TB}/coverage/test_pmp_coverage.sv"
 COV_OPTIONS="-cm line+cond+branch+fsm+tgl -cm_log ${WKDIR}/coverage.log -cm_dir ${WKDIR}/COVERAGE"
 COV_RUN="urg -dir ${WKDIR}/sim_out.vdb/"
 
 
 # Clean and run simulation with VCS
-#clean
 
 if [ "$3" = "coverage" ]; then
     echo -e "${YELLOW}#### Running VCS Simulation with Coverage ####${NC}"
@@ -105,7 +107,7 @@ if [ "$3" = "coverage" ]; then
 
 else
     echo -e "${YELLOW}#### Running VCS Simulation ####${NC}"
-    $VCS_CMD -o ${WKDIR}/$OUTPUT -work ${WKDIR} -Mlib ${WKDIR} -l "$LOGS/{CONFIG_VARIANT}_{TESTSUITE}.log"
-    $SIMV_CMD ${GUI}
+    $VCS_CMD -Mdir=${WKDIR} -o ${WKDIR}/$OUTPUT -work ${WKDIR} -Mlib ${WKDIR} -l "$LOGS/${CONFIG_VARIANT}_${TESTSUITE}.log"
+    $SIMV_CMD 
 fi
 
diff --git a/testbench/testbench.sv b/testbench/testbench.sv
index 6e0478ba8..9536f1cc9 100644
--- a/testbench/testbench.sv
+++ b/testbench/testbench.sv
@@ -54,6 +54,9 @@ module testbench;
   `ifdef VERILATOR
       import "DPI-C" function string getenvval(input string env_name);
       string       RISCV_DIR = getenvval("RISCV"); // "/opt/riscv";
+  `elsif SIM_VCS 
+      import "DPI-C" function string getenv(input string env_name);
+      string       RISCV_DIR = getenv("RISCV"); // "/opt/riscv";
   `else
       string       RISCV_DIR = "$RISCV"; // "/opt/riscv";
   `endif

From b4b88c5858131a26130d01f182abbe48e2ef6afe Mon Sep 17 00:00:00 2001
From: Divya2030 <imlucky.divya@gmail.com>
Date: Wed, 8 May 2024 04:39:42 -0700
Subject: [PATCH 2/3] VCS regression & Code Coverage

---
 sim/vcs/run_vcs | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/sim/vcs/run_vcs b/sim/vcs/run_vcs
index 53eff4d56..7f43541f0 100755
--- a/sim/vcs/run_vcs
+++ b/sim/vcs/run_vcs
@@ -24,8 +24,10 @@ WKDIR="wkdir/${1}_${2}"
 COV="cov/${1}_${2}"
 LOGS="logs"
 
-shift 2
-PLUSARGS="$*"
+if [ ${TESTSUITE} = "buildroot" ]; then
+	shift 2
+	PLUSARGS="$*"
+fi
 
 clean_logs() {
     echo -e "${YELLOW}Cleaning up workspace...${NC}"

From eff22647526e24ef657a8281648ab2b103f48aa1 Mon Sep 17 00:00:00 2001
From: Divya2030 <imlucky.divya@gmail.com>
Date: Wed, 8 May 2024 05:24:24 -0700
Subject: [PATCH 3/3] Code Coverage Text format for each test and configuration
 in IndividualCovReport

---
 sim/vcs/run_vcs | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/sim/vcs/run_vcs b/sim/vcs/run_vcs
index 7f43541f0..e7b8f1abc 100755
--- a/sim/vcs/run_vcs
+++ b/sim/vcs/run_vcs
@@ -94,7 +94,10 @@ VCS_CMD="vcs +lint=all,noGCWM,noUI,noSVA-UA,noIDTS,noNS,noULCO,noCAWM-L,noWMIA-L
 SIMV_CMD="./${WKDIR}/$OUTPUT +TEST=${TESTSUITE} ${PLUSARGS}" 
 COV_FILES="${TB}/coverage/test_pmp_coverage.sv"
 COV_OPTIONS="-cm line+cond+branch+fsm+tgl -cm_log ${WKDIR}/coverage.log -cm_dir ${WKDIR}/COVERAGE"
-COV_RUN="urg -dir ${WKDIR}/sim_out.vdb/"
+### CODE COVERAGE REPORT in IndividualCovReport in XML format
+#COV_RUN="urg -dir ${WKDIR}/COVERAGE.vdb -report IndividualCovReport/${CONFIG_VARIANT}_${TESTSUITE}" 
+### CODE COVERAGE REPORT in IndividualCovReport in text format
+COV_RUN="urg -dir ./${WKDIR}/COVERAGE.vdb -format text -report IndividualCovReport/${CONFIG_VARIANT}_${TESTSUITE}"
 
 
 # Clean and run simulation with VCS
@@ -102,10 +105,10 @@ COV_RUN="urg -dir ${WKDIR}/sim_out.vdb/"
 if [ "$3" = "coverage" ]; then
     echo -e "${YELLOW}#### Running VCS Simulation with Coverage ####${NC}"
     # Code Coverage.
-    $VCS_CMD $COV_OPTIONS -o ${WKDIR}/$OUTPUT -Mlib ${WKDIR} -work ${WKDIR} -l "$LOGS/${CONFIG_VARIANT}_${TESTSUITE}.log"
-    $SIMV_CMD
+    $VCS_CMD -Mdir=${WKDIR} $COV_OPTIONS -o ${WKDIR}/$OUTPUT -Mlib ${WKDIR} -work ${WKDIR} -l "$LOGS/${CONFIG_VARIANT}_${TESTSUITE}.log"
+    $SIMV_CMD $COV_OPTIONS
     $COV_RUN
-    cp -rf urgReport $COV
+    #cp -rf urgReport $COV
 
 else
     echo -e "${YELLOW}#### Running VCS Simulation ####${NC}"