[SPEC2017] Use inputs from RUN directory.

[fhahn]

Summary

At the moment, some benchmarks use inputs from the INPUT/SRC directory.
Those are not copied to the device, if one is specified. To ensure the
input is available on device, use it from the RUN_* directories and use
speccpu2017_prepare_rundir to copy them to the run directory. This will
automatically copy them to the specified device as well.

[fhahn]

Fix typos

[Meinersbur]

LGTM

[fhahn]

Thanks!

External/SPEC/CFP2017rate/510.parest_r/CMakeLists.txt

 # https://www.spec.org/cpu2017/Docs/benchmarks/510.parest_r.html
 include(../../SpecCPU2017.cmake)
 if (NOT TEST_SUITE_SPEC2017_ROOT)
   return ()
 endif ()
 
 speccpu2017_benchmark(RATE)
 
 speccpu2017_add_include_dirs(include .)
 
 ## test ########################################################################
 
 speccpu2017_run_test(
-  "${INPUT_test_DIR}/test.prm"
+  "${RUN_test_DIR}/test.prm"
   RUN_TYPE test
 )
 
 ## train #######################################################################
 
 speccpu2017_run_test(
-  "${INPUT_train_DIR}/train.prm"
+  "${RUN_train_DIR}/train.prm"
   RUN_TYPE train
 )
 
 ## ref #########################################################################
 
 speccpu2017_run_test(
-  "${INPUT_ref_DIR}/ref.prm"
+  "${RUN_ref_DIR}/ref.prm"
   RUN_TYPE ref
 )
 
 ################################################################################
 
 speccpu2017_verify_output(ABSOLUTE_TOLERANCE 4e-3)
 speccpu2017_add_executable(
   source/base/auto_derivative_function.cc
speccpu2017_add_executable(
   source/libparest/slave/stationary/grid_refinement.cc
   source/libparest/slave/stationary/measurements.cc
   source/libparest/slave/stationary/problem_description.cc
   source/libparest/slave/stationary/slave.cc
   source/libparest/slave/stationary/state_discretization.cc
   source/libparest/slave/stationary/synthetic_data.cc
 )
 set_property(TARGET ${PROG} PROPERTY CXX_STANDARD 98)
+speccpu2017_prepare_rundir()

External/SPEC/CFP2017rate/538.imagick_r/CMakeLists.txt

 # https://www.spec.org/cpu2017/Docs/benchmarks/538.imagick_r.html
 include(../../SpecCPU2017.cmake)
 if (NOT TEST_SUITE_SPEC2017_ROOT)
   return ()
 endif ()
 
 speccpu2017_benchmark(RATE)
 
 speccpu2017_add_include_dirs(.)
 link_libraries(-lm)
 
 ## test ########################################################################
 
 speccpu2017_run_test(
-  -limit disk 0 "${INPUT_test_DIR}/test_input.tga" -shear 25 -resize 640x480
+  -limit disk 0 "${RUN_test_DIR}/test_input.tga" -shear 25 -resize 640x480
   -negate -alpha Off test_output.tga
   RUN_TYPE test
 )
 speccpu2017_validate_image(
   test_output.tga test_expected.tga test_validate.out
   -avg -threshold 0.95 -maxthreshold 0.001
   RUN_TYPE test
 )
 
 ## train #######################################################################
 
 speccpu2017_run_test(
-  -limit disk 0 "${INPUT_train_DIR}/train_input.tga" -resize 320x240 -shear 31
+  -limit disk 0 "${RUN_train_DIR}/train_input.tga" -resize 320x240 -shear 31
   -edge 140 -negate -flop -resize 900x900 -edge 10 train_output.tga
   RUN_TYPE train
 )
 speccpu2017_validate_image(
   train_output.tga train_expected.tga train_validate.out
   -avg -threshold 0.95 -maxthreshold 0.001
   RUN_TYPE train
 )
 
 ## ref #########################################################################
 
 speccpu2017_run_test(
-  -limit disk 0 "${INPUT_ref_DIR}/refrate_input.tga" -edge 41
+  -limit disk 0 "${RUN_ref_DIR}/refrate_input.tga" -edge 41
   -resample 181% -emboss 31 -colorspace YUV -mean-shift 19x19+15%
   -resize 30% refrate_output.tga
   RUN_TYPE ref
   SUITE_TYPE rate
 )
 speccpu2017_validate_image(
   refrate_output.tga refrate_expected.tga refrate_validate.out
   -avg -threshold 0.95 -maxthreshold 0.001
speccpu2017_add_executable(
   wand/magick-wand.c
   wand/mogrify.c
   wand/pixel-wand.c
   wand/magick-property.c
   wand/pixel-iterator.c
   wand/wand.c
   magick/deprecate.c
 )
+speccpu2017_prepare_rundir()

External/SPEC/CINT2017rate/502.gcc_r/CMakeLists.txt

 # https://www.spec.org/cpu2017/Docs/benchmarks/502.gcc_r.html
 include(../../SpecCPU2017.cmake)
 if (NOT TEST_SUITE_SPEC2017_ROOT)
   return ()
 endif ()
 
 speccpu2017_benchmark(RATE)
 
 add_definitions(-DSPEC_502 -DIN_GCC -DHAVE_CONFIG_H)
 speccpu2017_add_include_dirs(. include spec_qsort)
 add_compile_options(-fgnu89-inline)
 
 ## test ########################################################################
 
 speccpu2017_run_test(
-  "${INPUT_test_DIR}/t1.c" -O3 -finline-limit=50000 -o t1.opts-O3_-finline-limit_50000.s
+  "${RUN_test_DIR}/t1.c" -O3 -finline-limit=50000 -o t1.opts-O3_-finline-limit_50000.s
   RUN_TYPE test
 )
 
 ## train #######################################################################
 
 speccpu2017_run_test(
-  "${INPUT_train_DIR}/200.c" -O3 -finline-limit=50000 -o 200.opts-O3_-finline-limit_50000.s
+  "${RUN_train_DIR}/200.c" -O3 -finline-limit=50000 -o 200.opts-O3_-finline-limit_50000.s
   RUN_TYPE train
 )
 
 speccpu2017_run_test(
-  "${INPUT_train_DIR}/scilab.c" -O3 -finline-limit=50000 -o scilab.opts-O3_-finline-limit_50000.s
+  "${RUN_train_DIR}/scilab.c" -O3 -finline-limit=50000 -o scilab.opts-O3_-finline-limit_50000.s
   RUN_TYPE train
 )
 
 speccpu2017_run_test(
-  "${INPUT_train_DIR}/train01.c" -O3 -finline-limit=50000 -o train01.opts-O3_-finline-limit_50000.s
+  "${RUN_train_DIR}/train01.c" -O3 -finline-limit=50000 -o train01.opts-O3_-finline-limit_50000.s
   RUN_TYPE train
 )
 
 ## ref #########################################################################
 
 speccpu2017_run_test(
-  "${INPUT_ref_DIR}/gcc-pp.c" -O3 -finline-limit=0 -fif-conversion -fif-conversion2 -o gcc-pp.opts-O3_-finline-limit_0_-fif-conversion_-fif-conversion2.s
+  "${RUN_ref_DIR}/gcc-pp.c" -O3 -finline-limit=0 -fif-conversion -fif-conversion2 -o gcc-pp.opts-O3_-finline-limit_0_-fif-conversion_-fif-conversion2.s
   RUN_TYPE ref
   SUITE_TYPE rate
 )
 
 speccpu2017_run_test(
-  "${INPUT_ref_DIR}/gcc-pp.c" -O2 -finline-limit=36000 -fpic -o gcc-pp.opts-O2_-finline-limit_36000_-fpic.s
+  "${RUN_ref_DIR}/gcc-pp.c" -O2 -finline-limit=36000 -fpic -o gcc-pp.opts-O2_-finline-limit_36000_-fpic.s
   RUN_TYPE ref
   SUITE_TYPE rate
 )
 
 speccpu2017_run_test(
-  "${INPUT_ref_DIR}/gcc-smaller.c" -O3 -fipa-pta -o gcc-smaller.opts-O3_-fipa-pta.s
+  "${RUN_ref_DIR}/gcc-smaller.c" -O3 -fipa-pta -o gcc-smaller.opts-O3_-fipa-pta.s
   RUN_TYPE ref
   SUITE_TYPE rate
 )
 
 speccpu2017_run_test(
-  "${INPUT_ref_DIR}/ref32.c" -O5 -o ref32.opts-O5.s
+  "${RUN_ref_DIR}/ref32.c" -O5 -o ref32.opts-O5.s
   RUN_TYPE ref
   SUITE_TYPE rate
 )
 
 speccpu2017_run_test(
-  "${INPUT_ref_DIR}/ref32.c" -O3 -fselective-scheduling -fselective-scheduling2 -o ref32.opts-O3_-fselective-scheduling_-fselective-scheduling2.s
+  "${RUN_ref_DIR}/ref32.c" -O3 -fselective-scheduling -fselective-scheduling2 -o ref32.opts-O3_-fselective-scheduling_-fselective-scheduling2.s
   RUN_TYPE ref
   SUITE_TYPE rate
 )
 
 ################################################################################
 
 speccpu2017_verify_output()
 speccpu2017_add_executable(
speccpu2017_add_executable(
   toplev.c
   vasprintf.c
   version.c
   builtins.c
   real.c
   mini-gmp.c
   spec_qsort/spec_qsort.c
 )
+
+speccpu2017_prepare_rundir()

External/SPEC/CINT2017rate/505.mcf_r/CMakeLists.txt

 # https://www.spec.org/cpu2017/Docs/benchmarks/505.mcf_r.html
 include(../../SpecCPU2017.cmake)
 if (NOT TEST_SUITE_SPEC2017_ROOT)
   return ()
 endif ()
 
 speccpu2017_benchmark(RATE)
 
 speccpu2017_add_include_dirs(spec_qsort)
 
 ## test ########################################################################
 
 speccpu2017_run_test(
-  "${INPUT_test_DIR}/inp.in"
+  "${RUN_test_DIR}/inp.in"
   STDOUT inp.out
   RUN_TYPE test
 )
 
 ## train #######################################################################
 
 speccpu2017_run_test(
-  "${INPUT_train_DIR}/inp.in"
+  "${RUN_train_DIR}/inp.in"
   STDOUT inp.out
   RUN_TYPE train
 )
 
 ## ref #########################################################################
 
 speccpu2017_run_test(
-  "${INPUT_ref_DIR}/inp.in"
+  "${RUN_ref_DIR}/inp.in"
   STDOUT inp.out
   RUN_TYPE ref
 )
 
 ################################################################################
 
 speccpu2017_verify_output()
 speccpu2017_add_executable()
+speccpu2017_prepare_rundir()

External/SPEC/CINT2017rate/531.deepsjeng_r/CMakeLists.txt

 # https://www.spec.org/cpu2017/Docs/benchmarks/531.deepsjeng_r.html
 include(../../SpecCPU2017.cmake)
 if (NOT TEST_SUITE_SPEC2017_ROOT)
   return ()
 endif ()
 
 speccpu2017_benchmark(RATE)
 
 if (RATE)
   add_definitions(-DSMALL_MEMORY)
 endif ()
 
 ## test ########################################################################
 
 speccpu2017_run_test(
-  "${INPUT_test_DIR}/test.txt"
+  "${RUN_test_DIR}/test.txt"
   STDOUT test.out
   RUN_TYPE test
 )
 
 ## train #######################################################################
 
 speccpu2017_run_test(
-  "${INPUT_train_DIR}/train.txt"
+  "${RUN_train_DIR}/train.txt"
   STDOUT train.out
   RUN_TYPE train
 )
 
 ## ref #########################################################################
 
 speccpu2017_run_test(
-  "${INPUT_ref_DIR}/ref.txt"
+  "${RUN_ref_DIR}/ref.txt"
   STDOUT ref.out
   RUN_TYPE ref
 )
 
 ################################################################################
 
 speccpu2017_verify_output()
 speccpu2017_add_executable()
+speccpu2017_prepare_rundir()

External/SPEC/CINT2017rate/541.leela_r/CMakeLists.txt

 # https://www.spec.org/cpu2017/Docs/benchmarks/541.leela_r.html
 include(../../SpecCPU2017.cmake)
 if (NOT TEST_SUITE_SPEC2017_ROOT)
   return ()
 endif ()
 
 speccpu2017_benchmark(RATE)
 
 speccpu2017_add_include_dirs(.)
 
 ## test ########################################################################
 
 speccpu2017_run_test(
-  "${INPUT_test_DIR}/test.sgf"
+  "${RUN_test_DIR}/test.sgf"
   STDOUT test.out
   RUN_TYPE test
 )
 
 ## train #######################################################################
 
 speccpu2017_run_test(
-  "${INPUT_train_DIR}/train.sgf"
+  "${RUN_train_DIR}/train.sgf"
   STDOUT train.out
   RUN_TYPE train
 )
 
 ## ref #########################################################################
 
 speccpu2017_run_test(
-  "${INPUT_ref_DIR}/ref.sgf"
+  "${RUN_ref_DIR}/ref.sgf"
   STDOUT ref.out
   RUN_TYPE ref
 )
 
 ################################################################################
 
 speccpu2017_verify_output()
 speccpu2017_add_executable()
+speccpu2017_prepare_rundir()