From cd654d10c14d8b94b999467731e2f147e3da83a5 Mon Sep 17 00:00:00 2001
From: Rose Thompson <ross1728@gmail.com>
Date: Sun, 4 Feb 2024 14:13:14 -0600
Subject: [PATCH] Finally have regression-wally -nightly producing branch
 predictor results.

---
 sim/regression-wally | 84 ++++++++++++++++++++++----------------------
 sim/wally-batch.do   |  6 ++--
 2 files changed, 45 insertions(+), 45 deletions(-)

diff --git a/sim/regression-wally b/sim/regression-wally
index f4f23a940..c0e84a8a1 100755
--- a/sim/regression-wally
+++ b/sim/regression-wally
@@ -220,48 +220,48 @@ if (nightly):
 
         ### branch predictor simulation
 
-        ["bpred_TWOBIT_6_16_10_0_rv32gc", ["embench"], "configOptions", "+define+PrintHPMCounters=1"],
-        ["bpred_TWOBIT_8_16_10_0_rv32gc", ["embench"], "configOptions", "+define+PrintHPMCounters=1"],
-        ["bpred_TWOBIT_10_16_10_0_rv32gc", ["embench"], "configOptions", "+define+PrintHPMCounters=1"],        
-        ["bpred_TWOBIT_12_16_10_0_rv32gc", ["embench"], "configOptions", "+define+PrintHPMCounters=1"],
-        ["bpred_TWOBIT_14_16_10_0_rv32gc", ["embench"], "configOptions", "+define+PrintHPMCounters=1"],        
-        ["bpred_TWOBIT_16_16_10_0_rv32gc", ["embench"], "configOptions", "+define+PrintHPMCounters=1"],
-        ["bpred_TWOBIT_6_16_10_1_rv32gc", ["embench"], "configOptions", "+define+PrintHPMCounters=1"],
-        ["bpred_TWOBIT_8_16_10_1_rv32gc", ["embench"], "configOptions", "+define+PrintHPMCounters=1"],
-        ["bpred_TWOBIT_10_16_10_1_rv32gc", ["embench"], "configOptions", "+define+PrintHPMCounters=1"],        
-        ["bpred_TWOBIT_12_16_10_1_rv32gc", ["embench"], "configOptions", "+define+PrintHPMCounters=1"],
-        ["bpred_TWOBIT_14_16_10_1_rv32gc", ["embench"], "configOptions", "+define+PrintHPMCounters=1"],        
-        ["bpred_TWOBIT_16_16_10_1_rv32gc", ["embench"], "configOptions", "+define+PrintHPMCounters=1"],
-        ["bpred_GSHARE_10_16_10_0_rv32gc", ["embench"], "configOptions", "+define+PrintHPMCounters=1"],
-        ["bpred_GSHARE_10_16_10_1_rv32gc", ["embench"], "configOptions", "+define+PrintHPMCounters=1"],
-        ["bpred_GSHARE_10_2_10_0_rv32gc", ["embench"], "configOptions", "+define+PrintHPMCounters=1"],
-        ["bpred_GSHARE_10_2_10_1_rv32gc", ["embench"], "configOptions", "+define+PrintHPMCounters=1"],
-        ["bpred_GSHARE_10_2_12_0_rv32gc", ["embench"], "configOptions", "+define+PrintHPMCounters=1"],
-        ["bpred_GSHARE_10_2_12_1_rv32gc", ["embench"], "configOptions", "+define+PrintHPMCounters=1"],
-        ["bpred_GSHARE_10_2_14_0_rv32gc", ["embench"], "configOptions", "+define+PrintHPMCounters=1"],
-        ["bpred_GSHARE_10_2_14_1_rv32gc", ["embench"], "configOptions", "+define+PrintHPMCounters=1"],
-        ["bpred_GSHARE_10_2_16_0_rv32gc", ["embench"], "configOptions", "+define+PrintHPMCounters=1"],
-        ["bpred_GSHARE_10_2_16_1_rv32gc", ["embench"], "configOptions", "+define+PrintHPMCounters=1"],
-        ["bpred_GSHARE_10_2_6_0_rv32gc", ["embench"], "configOptions", "+define+PrintHPMCounters=1"],
-        ["bpred_GSHARE_10_2_6_1_rv32gc", ["embench"], "configOptions", "+define+PrintHPMCounters=1"],
-        ["bpred_GSHARE_10_2_8_0_rv32gc", ["embench"], "configOptions", "+define+PrintHPMCounters=1"],
-        ["bpred_GSHARE_10_2_8_1_rv32gc", ["embench"], "configOptions", "+define+PrintHPMCounters=1"],
-        ["bpred_GSHARE_10_3_10_0_rv32gc", ["embench"], "configOptions", "+define+PrintHPMCounters=1"],
-        ["bpred_GSHARE_10_3_10_1_rv32gc", ["embench"], "configOptions", "+define+PrintHPMCounters=1"],
-        ["bpred_GSHARE_10_4_10_0_rv32gc", ["embench"], "configOptions", "+define+PrintHPMCounters=1"],
-        ["bpred_GSHARE_10_4_10_1_rv32gc", ["embench"], "configOptions", "+define+PrintHPMCounters=1"],
-        ["bpred_GSHARE_10_6_10_0_rv32gc", ["embench"], "configOptions", "+define+PrintHPMCounters=1"],
-        ["bpred_GSHARE_10_6_10_1_rv32gc", ["embench"], "configOptions", "+define+PrintHPMCounters=1"],
-        ["bpred_GSHARE_12_16_10_0_rv32gc", ["embench"], "configOptions", "+define+PrintHPMCounters=1"],
-        ["bpred_GSHARE_12_16_10_1_rv32gc", ["embench"], "configOptions", "+define+PrintHPMCounters=1"],
-        ["bpred_GSHARE_14_16_10_0_rv32gc", ["embench"], "configOptions", "+define+PrintHPMCounters=1"],
-        ["bpred_GSHARE_14_16_10_1_rv32gc", ["embench"], "configOptions", "+define+PrintHPMCounters=1"],
-        ["bpred_GSHARE_16_16_10_0_rv32gc", ["embench"], "configOptions", "+define+PrintHPMCounters=1"],
-        ["bpred_GSHARE_16_16_10_1_rv32gc", ["embench"], "configOptions", "+define+PrintHPMCounters=1"],
-        ["bpred_GSHARE_6_16_10_0_rv32gc", ["embench"], "configOptions", "+define+PrintHPMCounters=1"],
-        ["bpred_GSHARE_6_16_10_1_rv32gc", ["embench"], "configOptions", "+define+PrintHPMCounters=1"],
-        ["bpred_GSHARE_8_16_10_0_rv32gc", ["embench"], "configOptions", "+define+PrintHPMCounters=1"],
-        ["bpred_GSHARE_8_16_10_1_rv32gc", ["embench"], "configOptions", "+define+PrintHPMCounters=1"],
+        ["bpred_TWOBIT_6_16_10_0_rv32gc", ["embench"], "configOptions", "-GPrintHPMCounters=1"],
+        ["bpred_TWOBIT_8_16_10_0_rv32gc", ["embench"], "configOptions", "-GPrintHPMCounters=1"],
+        ["bpred_TWOBIT_10_16_10_0_rv32gc", ["embench"], "configOptions", "-GPrintHPMCounters=1"],        
+        ["bpred_TWOBIT_12_16_10_0_rv32gc", ["embench"], "configOptions", "-GPrintHPMCounters=1"],
+        ["bpred_TWOBIT_14_16_10_0_rv32gc", ["embench"], "configOptions", "-GPrintHPMCounters=1"],        
+        ["bpred_TWOBIT_16_16_10_0_rv32gc", ["embench"], "configOptions", "-GPrintHPMCounters=1"],
+        ["bpred_TWOBIT_6_16_10_1_rv32gc", ["embench"], "configOptions", "-GPrintHPMCounters=1"],
+        ["bpred_TWOBIT_8_16_10_1_rv32gc", ["embench"], "configOptions", "-GPrintHPMCounters=1"],
+        ["bpred_TWOBIT_10_16_10_1_rv32gc", ["embench"], "configOptions", "-GPrintHPMCounters=1"],        
+        ["bpred_TWOBIT_12_16_10_1_rv32gc", ["embench"], "configOptions", "-GPrintHPMCounters=1"],
+        ["bpred_TWOBIT_14_16_10_1_rv32gc", ["embench"], "configOptions", "-GPrintHPMCounters=1"],        
+        ["bpred_TWOBIT_16_16_10_1_rv32gc", ["embench"], "configOptions", "-GPrintHPMCounters=1"],
+        ["bpred_GSHARE_10_16_10_0_rv32gc", ["embench"], "configOptions", "-GPrintHPMCounters=1"],
+        ["bpred_GSHARE_10_16_10_1_rv32gc", ["embench"], "configOptions", "-GPrintHPMCounters=1"],
+        ["bpred_GSHARE_10_2_10_0_rv32gc", ["embench"], "configOptions", "-GPrintHPMCounters=1"],
+        ["bpred_GSHARE_10_2_10_1_rv32gc", ["embench"], "configOptions", "-GPrintHPMCounters=1"],
+        ["bpred_GSHARE_10_2_12_0_rv32gc", ["embench"], "configOptions", "-GPrintHPMCounters=1"],
+        ["bpred_GSHARE_10_2_12_1_rv32gc", ["embench"], "configOptions", "-GPrintHPMCounters=1"],
+        ["bpred_GSHARE_10_2_14_0_rv32gc", ["embench"], "configOptions", "-GPrintHPMCounters=1"],
+        ["bpred_GSHARE_10_2_14_1_rv32gc", ["embench"], "configOptions", "-GPrintHPMCounters=1"],
+        ["bpred_GSHARE_10_2_16_0_rv32gc", ["embench"], "configOptions", "-GPrintHPMCounters=1"],
+        ["bpred_GSHARE_10_2_16_1_rv32gc", ["embench"], "configOptions", "-GPrintHPMCounters=1"],
+        ["bpred_GSHARE_10_2_6_0_rv32gc", ["embench"], "configOptions", "-GPrintHPMCounters=1"],
+        ["bpred_GSHARE_10_2_6_1_rv32gc", ["embench"], "configOptions", "-GPrintHPMCounters=1"],
+        ["bpred_GSHARE_10_2_8_0_rv32gc", ["embench"], "configOptions", "-GPrintHPMCounters=1"],
+        ["bpred_GSHARE_10_2_8_1_rv32gc", ["embench"], "configOptions", "-GPrintHPMCounters=1"],
+        ["bpred_GSHARE_10_3_10_0_rv32gc", ["embench"], "configOptions", "-GPrintHPMCounters=1"],
+        ["bpred_GSHARE_10_3_10_1_rv32gc", ["embench"], "configOptions", "-GPrintHPMCounters=1"],
+        ["bpred_GSHARE_10_4_10_0_rv32gc", ["embench"], "configOptions", "-GPrintHPMCounters=1"],
+        ["bpred_GSHARE_10_4_10_1_rv32gc", ["embench"], "configOptions", "-GPrintHPMCounters=1"],
+        ["bpred_GSHARE_10_6_10_0_rv32gc", ["embench"], "configOptions", "-GPrintHPMCounters=1"],
+        ["bpred_GSHARE_10_6_10_1_rv32gc", ["embench"], "configOptions", "-GPrintHPMCounters=1"],
+        ["bpred_GSHARE_12_16_10_0_rv32gc", ["embench"], "configOptions", "-GPrintHPMCounters=1"],
+        ["bpred_GSHARE_12_16_10_1_rv32gc", ["embench"], "configOptions", "-GPrintHPMCounters=1"],
+        ["bpred_GSHARE_14_16_10_0_rv32gc", ["embench"], "configOptions", "-GPrintHPMCounters=1"],
+        ["bpred_GSHARE_14_16_10_1_rv32gc", ["embench"], "configOptions", "-GPrintHPMCounters=1"],
+        ["bpred_GSHARE_16_16_10_0_rv32gc", ["embench"], "configOptions", "-GPrintHPMCounters=1"],
+        ["bpred_GSHARE_16_16_10_1_rv32gc", ["embench"], "configOptions", "-GPrintHPMCounters=1"],
+        ["bpred_GSHARE_6_16_10_0_rv32gc", ["embench"], "configOptions", "-GPrintHPMCounters=1"],
+        ["bpred_GSHARE_6_16_10_1_rv32gc", ["embench"], "configOptions", "-GPrintHPMCounters=1"],
+        ["bpred_GSHARE_8_16_10_0_rv32gc", ["embench"], "configOptions", "-GPrintHPMCounters=1"],
+        ["bpred_GSHARE_8_16_10_1_rv32gc", ["embench"], "configOptions", "-GPrintHPMCounters=1"],
 
 #  enable floating-point tests when lint is fixed
 #        ["f_rv32gc", ["arch32f", "arch32f_divsqrt", "arch32f_fma"]],
diff --git a/sim/wally-batch.do b/sim/wally-batch.do
index acb40c452..83a4da90c 100644
--- a/sim/wally-batch.do
+++ b/sim/wally-batch.do
@@ -89,11 +89,11 @@ if {$2 eq "buildroot"} {
     # **** fix this so we can pass any number of +defines.
     # only allows 3 right now
 
-    vlog -lint -work wkdir/work_${1}_${3}_${4} +incdir+../config/$1 +incdir+../config/deriv/$1 +incdir+../config/shared ../src/cvw.sv ../testbench/testbench.sv ../testbench/common/*.sv   ../src/*/*.sv ../src/*/*/*.sv -suppress 2583 -suppress 7063,2596,13286 +define+PrintHPMCounters=1
+    vlog -lint -work wkdir/work_${1}_${3}_${4} +incdir+../config/$1 +incdir+../config/deriv/$1 +incdir+../config/shared ../src/cvw.sv ../testbench/testbench.sv ../testbench/common/*.sv   ../src/*/*.sv ../src/*/*/*.sv -suppress 2583 -suppress 7063,2596,13286 
     # start and run simulation
     # remove +acc flag for faster sim during regressions if there is no need to access internal signals
-    vopt wkdir/work_${1}_${3}_${4}.testbench -work wkdir/work_${1}_${3}_${4} -G TEST=$3 -o testbenchopt +define+PrintHPMCounters=1
-    vsim -lib wkdir/work_${1}_${3}_${4} testbenchopt  -fatal 7 -suppress 3829 +define+PrintHPMCounters=1
+    vopt wkdir/work_${1}_${3}_${4}.testbench -work wkdir/work_${1}_${3}_${4} -G TEST=$3 ${4} -o testbenchopt 
+    vsim -lib wkdir/work_${1}_${3}_${4} testbenchopt  -fatal 7 -suppress 3829
     # Adding coverage increases runtime from 2:00 to 4:29.  Can't run it all the time
     #vopt work_$2.testbench -work work_$2 -o workopt_$2 +cover=sbectf
     #vsim -coverage -lib work_$2 workopt_$2