diff --git a/bin/regression-wally b/bin/regression-wally index ec4650725..80a884de3 100755 --- a/bin/regression-wally +++ b/bin/regression-wally @@ -219,19 +219,27 @@ def addTests(tests, sim): for test in tests: config = test[0]; suites = test[1]; - if(len(test) >= 4 and test[2] == "configOptions"): - configOptions = test[3] - cmdPrefix = "vsim > {} -c < 2): + args = " ".join(test[2::]) + #args = str(test[2]) + print("args = ", args) + args = " --args " + args + #cmdPrefix = "wsim -s " + sim + " " + config + " --args " + args + #if(len(test) >= 4 and test[2] == "configOptions"): + # configOptions = test[3] + # cmdPrefix = "vsim > {} -c < {} -c <= 3} { - if {$3 eq "-coverage" || ($argc >= 7 && $7 eq "-coverage")} { - set coverage 1 - set CoverageVoptArg "+cover=sbecf" - set CoverageVsimArg "-coverage" - } elseif {$3 eq "configOptions"} { - set configOptions $lst - puts $configOptions - } + set configOptions $lst + puts $configOptions + #if {$3 eq "-coverage" || ($argc >= 7 && $7 eq "-coverage")} { + # set coverage 1 + # set CoverageVoptArg "+cover=sbecf" + # set CoverageVsimArg "-coverage" + #} elseif {$3 eq "configOptions"} { + # set configOptions $lst + # puts $configOptions + #} } # compile source files @@ -78,7 +80,7 @@ vlog -lint -work ${WKDIR} +incdir+${CONFIG}/$1 +incdir+${CONFIG}/deriv/$1 +incdi # 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} vopt wkdir/${CFG}_${TESTSUITE}.${TESTBENCH} -work ${WKDIR} ${configOptions} -o testbenchopt ${CoverageVoptArg} -vsim -lib ${WKDIR} testbenchopt +TEST=${TESTSUITE} -fatal 7 -suppress 3829 ${CoverageVsimArg} +vsim -lib ${WKDIR} testbenchopt +TEST=${TESTSUITE} ${configOptions} -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.sv b/testbench/testbench.sv index d87de27b2..1f0f21a6b 100644 --- a/testbench/testbench.sv +++ b/testbench/testbench.sv @@ -44,7 +44,6 @@ module testbench; parameter I_CACHE_ADDR_LOGGER=0; parameter D_CACHE_ADDR_LOGGER=0; parameter RISCV_DIR = "/opt/riscv"; -// parameter INSTR_LIMIT = 0; `ifdef USE_IMPERAS_DV import idvPkg::*; @@ -108,6 +107,7 @@ module testbench; TEST = "none"; if (!$value$plusargs("INSTR_LIMIT=%d", INSTR_LIMIT)) INSTR_LIMIT = 0; + $display("INSTR_LIMIT = ", INSTR_LIMIT); // pick tests based on modes supported