Github_Repos/cvw
1
0
Fork 1
mirror of https://github.com/openhwgroup/cvw synced 2025-02-11 06:05:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Ugh. This is getting frustrating. Can't seem to get embench to run correctly in new script.

Browse Source
This commit is contained in:
Rose Thompson 2024-02-02 10:45:38 -06:00
parent f5afec9bf5
commit e5e57fb54d
2 changed files with 50 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

94
sim/regression-wally
View File

@ -220,48 +220,48 @@ if (nightly):
### branch predictor simulation ### branch predictor simulation
["bpred_TWOBIT_6_16_10_0_rv32gc", ["embench"], "+define+PrintHPMCounters=1"], ["bpred_TWOBIT_6_16_10_0_rv32gc", ["embench"], "configOptions", "+define+PrintHPMCounters=1"],
["bpred_TWOBIT_8_16_10_0_rv32gc", ["embench"], "+define+PrintHPMCounters=1"], ["bpred_TWOBIT_8_16_10_0_rv32gc", ["embench"], "configOptions", "+define+PrintHPMCounters=1"],
["bpred_TWOBIT_10_16_10_0_rv32gc", ["embench"], "+define+PrintHPMCounters=1"], ["bpred_TWOBIT_10_16_10_0_rv32gc", ["embench"], "configOptions", "+define+PrintHPMCounters=1"],
["bpred_TWOBIT_12_16_10_0_rv32gc", ["embench"], "+define+PrintHPMCounters=1"], ["bpred_TWOBIT_12_16_10_0_rv32gc", ["embench"], "configOptions", "+define+PrintHPMCounters=1"],
["bpred_TWOBIT_14_16_10_0_rv32gc", ["embench"], "+define+PrintHPMCounters=1"], ["bpred_TWOBIT_14_16_10_0_rv32gc", ["embench"], "configOptions", "+define+PrintHPMCounters=1"],
["bpred_TWOBIT_16_16_10_0_rv32gc", ["embench"], "+define+PrintHPMCounters=1"], ["bpred_TWOBIT_16_16_10_0_rv32gc", ["embench"], "configOptions", "+define+PrintHPMCounters=1"],
["bpred_TWOBIT_6_16_10_1_rv32gc", ["embench"], "+define+PrintHPMCounters=1"], ["bpred_TWOBIT_6_16_10_1_rv32gc", ["embench"], "configOptions", "+define+PrintHPMCounters=1"],
["bpred_TWOBIT_8_16_10_1_rv32gc", ["embench"], "+define+PrintHPMCounters=1"], ["bpred_TWOBIT_8_16_10_1_rv32gc", ["embench"], "configOptions", "+define+PrintHPMCounters=1"],
["bpred_TWOBIT_10_16_10_1_rv32gc", ["embench"], "+define+PrintHPMCounters=1"], ["bpred_TWOBIT_10_16_10_1_rv32gc", ["embench"], "configOptions", "+define+PrintHPMCounters=1"],
["bpred_TWOBIT_12_16_10_1_rv32gc", ["embench"], "+define+PrintHPMCounters=1"], ["bpred_TWOBIT_12_16_10_1_rv32gc", ["embench"], "configOptions", "+define+PrintHPMCounters=1"],
["bpred_TWOBIT_14_16_10_1_rv32gc", ["embench"], "+define+PrintHPMCounters=1"], ["bpred_TWOBIT_14_16_10_1_rv32gc", ["embench"], "configOptions", "+define+PrintHPMCounters=1"],
["bpred_TWOBIT_16_16_10_1_rv32gc", ["embench"], "+define+PrintHPMCounters=1"], ["bpred_TWOBIT_16_16_10_1_rv32gc", ["embench"], "configOptions", "+define+PrintHPMCounters=1"],
["bpred_GSHARE_10_16_10_0_rv32gc", ["embench"], "+define+PrintHPMCounters=1"], ["bpred_GSHARE_10_16_10_0_rv32gc", ["embench"], "configOptions", "+define+PrintHPMCounters=1"],
["bpred_GSHARE_10_16_10_1_rv32gc", ["embench"], "+define+PrintHPMCounters=1"], ["bpred_GSHARE_10_16_10_1_rv32gc", ["embench"], "configOptions", "+define+PrintHPMCounters=1"],
["bpred_GSHARE_10_2_10_0_rv32gc", ["embench"], "+define+PrintHPMCounters=1"], ["bpred_GSHARE_10_2_10_0_rv32gc", ["embench"], "configOptions", "+define+PrintHPMCounters=1"],
["bpred_GSHARE_10_2_10_1_rv32gc", ["embench"], "+define+PrintHPMCounters=1"], ["bpred_GSHARE_10_2_10_1_rv32gc", ["embench"], "configOptions", "+define+PrintHPMCounters=1"],
["bpred_GSHARE_10_2_12_0_rv32gc", ["embench"], "+define+PrintHPMCounters=1"], ["bpred_GSHARE_10_2_12_0_rv32gc", ["embench"], "configOptions", "+define+PrintHPMCounters=1"],
["bpred_GSHARE_10_2_12_1_rv32gc", ["embench"], "+define+PrintHPMCounters=1"], ["bpred_GSHARE_10_2_12_1_rv32gc", ["embench"], "configOptions", "+define+PrintHPMCounters=1"],
["bpred_GSHARE_10_2_14_0_rv32gc", ["embench"], "+define+PrintHPMCounters=1"], ["bpred_GSHARE_10_2_14_0_rv32gc", ["embench"], "configOptions", "+define+PrintHPMCounters=1"],
["bpred_GSHARE_10_2_14_1_rv32gc", ["embench"], "+define+PrintHPMCounters=1"], ["bpred_GSHARE_10_2_14_1_rv32gc", ["embench"], "configOptions", "+define+PrintHPMCounters=1"],
["bpred_GSHARE_10_2_16_0_rv32gc", ["embench"], "+define+PrintHPMCounters=1"], ["bpred_GSHARE_10_2_16_0_rv32gc", ["embench"], "configOptions", "+define+PrintHPMCounters=1"],
["bpred_GSHARE_10_2_16_1_rv32gc", ["embench"], "+define+PrintHPMCounters=1"], ["bpred_GSHARE_10_2_16_1_rv32gc", ["embench"], "configOptions", "+define+PrintHPMCounters=1"],
["bpred_GSHARE_10_2_6_0_rv32gc", ["embench"], "+define+PrintHPMCounters=1"], ["bpred_GSHARE_10_2_6_0_rv32gc", ["embench"], "configOptions", "+define+PrintHPMCounters=1"],
["bpred_GSHARE_10_2_6_1_rv32gc", ["embench"], "+define+PrintHPMCounters=1"], ["bpred_GSHARE_10_2_6_1_rv32gc", ["embench"], "configOptions", "+define+PrintHPMCounters=1"],
["bpred_GSHARE_10_2_8_0_rv32gc", ["embench"], "+define+PrintHPMCounters=1"], ["bpred_GSHARE_10_2_8_0_rv32gc", ["embench"], "configOptions", "+define+PrintHPMCounters=1"],
["bpred_GSHARE_10_2_8_1_rv32gc", ["embench"], "+define+PrintHPMCounters=1"], ["bpred_GSHARE_10_2_8_1_rv32gc", ["embench"], "configOptions", "+define+PrintHPMCounters=1"],
["bpred_GSHARE_10_3_10_0_rv32gc", ["embench"], "+define+PrintHPMCounters=1"], ["bpred_GSHARE_10_3_10_0_rv32gc", ["embench"], "configOptions", "+define+PrintHPMCounters=1"],
["bpred_GSHARE_10_3_10_1_rv32gc", ["embench"], "+define+PrintHPMCounters=1"], ["bpred_GSHARE_10_3_10_1_rv32gc", ["embench"], "configOptions", "+define+PrintHPMCounters=1"],
["bpred_GSHARE_10_4_10_0_rv32gc", ["embench"], "+define+PrintHPMCounters=1"], ["bpred_GSHARE_10_4_10_0_rv32gc", ["embench"], "configOptions", "+define+PrintHPMCounters=1"],
["bpred_GSHARE_10_4_10_1_rv32gc", ["embench"], "+define+PrintHPMCounters=1"], ["bpred_GSHARE_10_4_10_1_rv32gc", ["embench"], "configOptions", "+define+PrintHPMCounters=1"],
["bpred_GSHARE_10_6_10_0_rv32gc", ["embench"], "+define+PrintHPMCounters=1"], ["bpred_GSHARE_10_6_10_0_rv32gc", ["embench"], "configOptions", "+define+PrintHPMCounters=1"],
["bpred_GSHARE_10_6_10_1_rv32gc", ["embench"], "+define+PrintHPMCounters=1"], ["bpred_GSHARE_10_6_10_1_rv32gc", ["embench"], "configOptions", "+define+PrintHPMCounters=1"],
["bpred_GSHARE_12_16_10_0_rv32gc", ["embench"], "+define+PrintHPMCounters=1"], ["bpred_GSHARE_12_16_10_0_rv32gc", ["embench"], "configOptions", "+define+PrintHPMCounters=1"],
["bpred_GSHARE_12_16_10_1_rv32gc", ["embench"], "+define+PrintHPMCounters=1"], ["bpred_GSHARE_12_16_10_1_rv32gc", ["embench"], "configOptions", "+define+PrintHPMCounters=1"],
["bpred_GSHARE_14_16_10_0_rv32gc", ["embench"], "+define+PrintHPMCounters=1"], ["bpred_GSHARE_14_16_10_0_rv32gc", ["embench"], "configOptions", "+define+PrintHPMCounters=1"],
["bpred_GSHARE_14_16_10_1_rv32gc", ["embench"], "+define+PrintHPMCounters=1"], ["bpred_GSHARE_14_16_10_1_rv32gc", ["embench"], "configOptions", "+define+PrintHPMCounters=1"],
["bpred_GSHARE_16_16_10_0_rv32gc", ["embench"], "+define+PrintHPMCounters=1"], ["bpred_GSHARE_16_16_10_0_rv32gc", ["embench"], "configOptions", "+define+PrintHPMCounters=1"],
["bpred_GSHARE_16_16_10_1_rv32gc", ["embench"], "+define+PrintHPMCounters=1"], ["bpred_GSHARE_16_16_10_1_rv32gc", ["embench"], "configOptions", "+define+PrintHPMCounters=1"],
["bpred_GSHARE_6_16_10_0_rv32gc", ["embench"], "+define+PrintHPMCounters=1"], ["bpred_GSHARE_6_16_10_0_rv32gc", ["embench"], "configOptions", "+define+PrintHPMCounters=1"],
["bpred_GSHARE_6_16_10_1_rv32gc", ["embench"], "+define+PrintHPMCounters=1"], ["bpred_GSHARE_6_16_10_1_rv32gc", ["embench"], "configOptions", "+define+PrintHPMCounters=1"],
["bpred_GSHARE_8_16_10_0_rv32gc", ["embench"], "+define+PrintHPMCounters=1"], ["bpred_GSHARE_8_16_10_0_rv32gc", ["embench"], "configOptions", "+define+PrintHPMCounters=1"],
["bpred_GSHARE_8_16_10_1_rv32gc", ["embench"], "+define+PrintHPMCounters=1"], ["bpred_GSHARE_8_16_10_1_rv32gc", ["embench"], "configOptions", "+define+PrintHPMCounters=1"],
# enable floating-point tests when lint is fixed # enable floating-point tests when lint is fixed
# ["f_rv32gc", ["arch32f", "arch32f_divsqrt", "arch32f_fma"]], # ["f_rv32gc", ["arch32f", "arch32f_divsqrt", "arch32f_fma"]],
@ -280,13 +280,17 @@ if (nightly):
for test in derivconfigtests: for test in derivconfigtests:
config = test[0]; config = test[0];
tests = test[1]; tests = test[1];
if(len(test) >= 3): defines = test[2] if(len(test) >= 4 and test[2] == "configOptions"):
else: defines = "" configOptions = test[3]
cmdPrefix = "vsim > {} -c <<!\ndo wally-batch.do "+config+" configOptions"
else:
configOptions = ""
cmdPrefix = "vsim > {} -c <<!\ndo wally-batch.do "+config
for t in tests: for t in tests:
tc = TestCase( tc = TestCase(
name=t, name=t,
variant=config, variant=config,
cmd="vsim > {} -c <<!\ndo wally-batch.do "+config+" "+t+" "+defines+"\n!", cmd=cmdPrefix+" "+t+" "+configOptions+"\n!",
grepstr="All tests ran without failures") grepstr="All tests ran without failures")
configs.append(tc) configs.append(tc)

2
sim/wally-batch.do
View File

@ -89,7 +89,7 @@ if {$2 eq "buildroot"} {
# **** fix this so we can pass any number of +defines. # **** fix this so we can pass any number of +defines.
# only allows 3 right now # 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 $5 $6 $7 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 # start and run simulation
# remove +acc flag for faster sim during regressions if there is no need to access internal signals # 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=$4 -o testbenchopt vopt wkdir/work_${1}_${3}_${4}.testbench -work wkdir/work_${1}_${3}_${4} -G TEST=$4 -o testbenchopt