diff --git a/bin/regression-wally b/bin/regression-wally index 8819518e6..58a8384c9 100755 --- a/bin/regression-wally +++ b/bin/regression-wally @@ -29,9 +29,7 @@ tests = [ "arch32zba", "arch32zbb", "arch32zbc", "arch32zbs", "arch32zfh", "arch32zfh_fma", "arch32zfh_divsqrt", "arch32zfaf", "wally32a", "wally32priv", "wally32periph", "arch32zbkb", "arch32zbkc", "arch32zbkx", "arch32zknd", "arch32zkne", "arch32zknh"]], # "arch32zcb", "arch32zfad", - ["rv64e", ["arch64e"]], ["rv64i", ["arch64i"]], - ["rv64imc", ["arch64i", "arch64c", "arch64m", "wally64periph"]], ] # Separate out floating-point tests for RV64 to speed up coverage @@ -214,15 +212,15 @@ def getBuildrootTC(boot): def addTests(tests, sim): for test in tests: config = test[0]; - tests = test[1]; + suites = test[1]; if(len(test) >= 4 and test[2] == "configOptions"): configOptions = test[3] cmdPrefix = "vsim > {} -c < {} -c < " + logname print(cmd) diff --git a/bin/wsim b/bin/wsim index 4fc1355f0..ffd2e7ca3 100755 --- a/bin/wsim +++ b/bin/wsim @@ -22,8 +22,9 @@ parser.add_argument("--sim", "-s", help="Simulator", choices=["questa", "verilat parser.add_argument("--tb", "-t", help="Testbench", choices=["testbench", "testbench_fp"], default="testbench") parser.add_argument("--gui", "-g", help="Simulate with GUI", action="store_true") parser.add_argument("--coverage", "-c", help="Code & Functional Coverage", action="store_true") +parser.add_argument("--arg", "-a", help="Optional arguments passed to simulator via $value$plusargs", default="") args = parser.parse_args() -print("Config: " + args.config + " tests " + args.testsuite + " sim " + args.sim + " gui " + str(args.gui)) +print("Config=" + args.config + " tests=" + args.testsuite + " sim=" + args.sim + " gui=" + str(args.gui) + " arg='" + args.arg + "'") # Validate arguments if (args.gui): @@ -39,7 +40,7 @@ if (args.coverage): # Launch selected simulator cd = "cd $WALLY/sim/" +args.sim if (args.sim == "questa"): - cmd = "do wally-batch.do " + args.config + " " + args.testsuite + " " + args.tb + cmd = "do wally-batch.do " + args.config + " " + args.testsuite + " " + args.tb + " " + args.arg if (args.coverage): cmd += " -coverage" os.system(cd + "; vsim -c -do \"" + cmd + "\"") diff --git a/sim/questa/wally-batch.do b/sim/questa/wally-batch.do index 98ca5cba6..1c580919d 100644 --- a/sim/questa/wally-batch.do +++ b/sim/questa/wally-batch.do @@ -77,7 +77,7 @@ vlog -lint -work ${WKDIR} +incdir+${CONFIG}/$1 +incdir+${CONFIG}/deriv/$1 +incdi # start and run simulation # remove +acc flag for faster sim during regressions if there is no need to access internal signals vopt wkdir/${CFG}_${TESTSUITE}.${TESTBENCH} -work ${WKDIR} -G TEST=$2 ${configOptions} -o testbenchopt ${CoverageVoptArg} -vsim -lib ${WKDIR} testbenchopt -fatal 7 -suppress 3829 ${CoverageVsimArg} +vsim -lib ${WKDIR} testbenchopt -fatal 7 -suppress 3829 ${CoverageVsimArg} # vsim -lib wkdir/work_${1}_${2} testbenchopt -fatal 7 -suppress 3829 # power add generates the logging necessary for said generation. diff --git a/testbench/testbench_fp.sv b/testbench/testbench_fp.sv index 21772cc48..dac8055b7 100644 --- a/testbench/testbench_fp.sv +++ b/testbench/testbench_fp.sv @@ -32,7 +32,7 @@ module testbench_fp; // to run specific precisions (e.g., quad or all) // parameter string TEST="none"; // parameter string TEST_SIZE="none"; - parameter string TEST="add"; + parameter string TEST="none"; parameter string TEST_SIZE="all"; `include "parameter-defs.vh" @@ -156,7 +156,7 @@ module testbench_fp; // $display("This simulation for TEST is %s", TEST); // $display("This simulation for TEST is of the operand size of %s", TEST_SIZE); - if (P.Q_SUPPORTED & (TEST_SIZE == "QP" | TEST_SIZE == "all")) begin // if Quad percision is supported + if (P.Q_SUPPORTED & (TEST_SIZE == "QP" | TEST_SIZE == "all")) begin // if Quad percision is supported if (TEST === "cvtint" | TEST === "all") begin // if testing integer conversion // add the 128-bit cvtint tests to the to-be-tested list Tests = {Tests, f128rv32cvtint};