aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLaurent Alfonsi <laurent.alfonsi@linaro.org>2022-05-25 18:55:24 +0200
committerLaurent Alfonsi <laurent.alfonsi@linaro.org>2022-05-25 18:56:18 +0200
commita2bf2225c80bf463c2ed4540b88d219091ff7dd4 (patch)
treed16eb8e499d49afb293ba1fc701a771ca86eba47
parentf0e825295e5ba3d54e8a97f99e36119de08cea01 (diff)
break-up-bmks.sh, run.sh: Adjust spec2017 benches
Change-Id: I2aaf141fd30fca73ce258df711bd8be8cbe62081
-rwxr-xr-xbreak-up-bmks.sh8
-rwxr-xr-xrun.sh6
2 files changed, 10 insertions, 4 deletions
diff --git a/break-up-bmks.sh b/break-up-bmks.sh
index 30aa772..9392d41 100755
--- a/break-up-bmks.sh
+++ b/break-up-bmks.sh
@@ -49,19 +49,23 @@ spec2006_all=("${spec2006_c_and_cxx[@]}" "${spec2006_fortran[@]}")
# SPEC2017
spec2017_speed=(
+ # intspeed.bset
600.perlbench_s 602.gcc_s 605.mcf_s 620.omnetpp_s 623.xalancbmk_s
625.x264_s 631.deepsjeng_s 641.leela_s 648.exchange2_s 657.xz_s 998.specrand_is
+ # fpspeed.bset
603.bwaves_s 607.cactuBSSN_s 619.lbm_s 621.wrf_s 627.cam4_s 628.pop2_s
638.imagick_s 644.nab_s 649.fotonik3d_s 654.roms_s 996.specrand_fs
)
spec2017_speed_nofortran=(
+ # intspeed_no_fortran.bset
600.perlbench_s 602.gcc_s 605.mcf_s 620.omnetpp_s 623.xalancbmk_s
- 625.x264_s 631.deepsjeng_s 641.leela_s 648.exchange2_s 657.xz_s 998.specrand_is
+ 625.x264_s 631.deepsjeng_s 641.leela_s 657.xz_s 998.specrand_is
+ # fppeed_no_fortran.bset
+ 619.lbm_s 638.imagick_s 644.nab_s 996.specrand_fs
)
-
# keywords for subset of cpu2006 tests : c_and_cxx, fortran, all, spec2006_speed, spec2006_speed_nofortran
# keywords for subset of cpu2017 tests : spec2017_speed, spec2017_speed_nofortran
diff --git a/run.sh b/run.sh
index a754999..0103f08 100755
--- a/run.sh
+++ b/run.sh
@@ -157,8 +157,10 @@ $verbose
# determine spec_version : either cpu2006 or cpu2017
for bch in ${benches}; do
case ${bch} in
- 4[0-9][0-9]\.*) bench_version=cpu2006 ;;
- 6[0-9][0-9]\.*) bench_version=cpu2017 ;;
+ 4[0-9][0-9].*|99[89].specrand)
+ bench_version=cpu2006 ;;
+ 5[0-9][0-9].*|6[0-9][0-9].*|99[6789].specrand_[fi][rs])
+ bench_version=cpu2017 ;;
*)
echo ERROR: Option --bench $bch not recognized : neither 4xx.testname nor 6xx.testname format
exit 1