From 02081cac409fec665c0ed0de29648f8dbbca4fb4 Mon Sep 17 00:00:00 2001
From: Kevin Kim <kevindkim723@gmail.com>
Date: Wed, 21 Feb 2024 20:49:38 -0800
Subject: [PATCH] softfloat jobs now run concurrently with help of
 testfloat-batch.do directing compiled designs into individual folders for
 each config/test

---
 sim/regression-wally   | 15 +++++++-----
 sim/testfloat-batch.do | 55 ++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 64 insertions(+), 6 deletions(-)
 create mode 100644 sim/testfloat-batch.do

diff --git a/sim/regression-wally b/sim/regression-wally
index 28c2e9a7a..e53ebd0d8 100755
--- a/sim/regression-wally
+++ b/sim/regression-wally
@@ -326,7 +326,7 @@ if (softfloat):
         divtest = TestCase(
             name="div",
             variant=config,
-            cmd="vsim > {} -c  <<!\ndo testfloat.do " + config + " div \n!",
+            cmd="vsim > {} -c  <<!\ndo testfloat-batch.do " + config + " div \n!",
             grepstr="All Tests completed with          0 errors"
         )
         configs.append(divtest)
@@ -335,27 +335,30 @@ if (softfloat):
         sqrttest = TestCase(
             name="sqrt",
             variant=config,
-            cmd="vsim > {} -c  <<!\ndo testfloat.do " + config + " sqrt \n!",
+            cmd="vsim > {} -c  <<!\ndo testfloat-batch.do " + config + " sqrt \n!",
             grepstr="All Tests completed with          0 errors"
         )
-        configs.append(sqrttest)
+        #configs.append(sqrttest)
+        configs.insert(0,sqrttest)
+
 
         # skip if divider variant config
-        if ("ieee" in config[0]):
+        if ("ieee" in config):
             # cvtint test case
             cvtinttest = TestCase(
                 name="cvtint",
                 variant=config,
-                cmd="vsim > {} -c  <<!\ndo testfloat.do " + config + " cvtint \n!",
+                cmd="vsim > {} -c  <<!\ndo testfloat-batch.do " + config + " cvtint \n!",
                 grepstr="All Tests completed with          0 errors"
                 )
             configs.append(cvtinttest)
 
             # cvtfp test case
+            # WILL fail on F_only (cvtfp converts from one fpsize to another. refer to spec)
             cvtfptest = TestCase(
                 name="cvtfp",
                 variant=config,
-                cmd="vsim > {} -c  <<!\ndo testfloat.do " + config + " cvtfp \n!",
+                cmd="vsim > {} -c  <<!\ndo testfloat-batch.do " + config + " cvtfp \n!",
                 grepstr="All Tests completed with          0 errors"
             )
             configs.append(cvtfptest)    
diff --git a/sim/testfloat-batch.do b/sim/testfloat-batch.do
new file mode 100644
index 000000000..f20867ddc
--- /dev/null
+++ b/sim/testfloat-batch.do
@@ -0,0 +1,55 @@
+# testfloat-batch.do 
+#
+# Modification by Oklahoma State University & Harvey Mudd College
+# Use with Testbench 
+# James Stine, 2008; David Harris 2021; Kevin Kim 2024
+# Go Cowboys!!!!!!
+#
+# Takes 1:10 to run RV64IC tests using gui
+
+# run with vsim -do "do wally.do rv64ic riscvarchtest-64m"
+
+onbreak {resume}
+
+# create library
+
+if [file exists wkdir/work_${1}_${2}] {
+    vdel -lib wkdir/work_${1}_${2} -all
+}
+vlib wkdir/work_${1}_${2}
+
+
+
+# c# compile source files
+# suppress spurious warnngs about 
+# "Extra checking for conflicts with always_comb done at vopt time"
+# because vsim will run vopt
+
+# start and run simulation
+# remove +acc flag for faster sim during regressions if there is no need to access internal signals
+# $num = the added words after the call
+
+vlog -lint -work wkdir/work_${1}_${2} +incdir+../config/$1 +incdir+../config/deriv/$1 +incdir+../config/shared ../src/cvw.sv ../testbench/testbench-fp.sv ../src/fpu/*.sv ../src/fpu/*/*.sv ../src/generic/*.sv  ../src/generic/flop/*.sv -suppress 2583,7063,8607,2697,7033 
+
+
+# Set WAV variable to avoid having any output to wave (to limit disk space)
+quietly set WAV 0;
+
+# Determine if nowave argument is provided this removes any output to
+# a wlf or wave window to reduce disk space.
+if {$WAV eq 0} {
+    puts "No wave output is selected"
+} else {
+    puts "wave output is selected"
+    view wave
+    add log -recursive /*
+    do wave-fpu.do    
+}  
+
+# Change TEST_SIZE to only test certain FP width
+# values are QP, DP, SP, HP or all for all tests
+
+vopt +acc wkdir/work_${1}_${2}.testbenchfp -work wkdir/work_${1}_${2} -G TEST=$2 -G TEST_SIZE="all" -o testbenchopt
+vsim -lib wkdir/work_${1}_${2} testbenchopt  -fatal 7 -suppress 3829
+#-- Run the Simulation 
+run -all