Index: Bitcode/Benchmarks/CMakeLists.txt =================================================================== --- Bitcode/Benchmarks/CMakeLists.txt +++ Bitcode/Benchmarks/CMakeLists.txt @@ -1 +1 @@ -add_subdirectory(Halide) +add_bench_subdirectory(Halide) Index: Bitcode/Benchmarks/Halide/CMakeLists.txt =================================================================== --- Bitcode/Benchmarks/Halide/CMakeLists.txt +++ Bitcode/Benchmarks/Halide/CMakeLists.txt @@ -20,7 +20,7 @@ endmacro() if(ARCH STREQUAL "x86") - add_subdirectory(local_laplacian) - add_subdirectory(bilateral_grid) - add_subdirectory(blur) + add_bench_subdirectory(local_laplacian) + add_bench_subdirectory(bilateral_grid) + add_bench_subdirectory(blur) endif() Index: Bitcode/CMakeLists.txt =================================================================== --- Bitcode/CMakeLists.txt +++ Bitcode/CMakeLists.txt @@ -8,11 +8,11 @@ set(TEST_SUITE_ENABLE_BITCODE_TESTS ${ENABLE_BITCODE_DEFAULT} CACHE BOOL "Enable bitcode tests") if(TEST_SUITE_ENABLE_BITCODE_TESTS) - add_subdirectory(Benchmarks) + add_bench_subdirectory(Benchmarks) if(NOT TEST_SUITE_BENCHMARKING_ONLY) - add_subdirectory(Regression) + add_bench_subdirectory(Regression) if(ARCH STREQUAL "x86" OR ARCH STREQUAL "AArch64" OR ARCH STREQUAL "ARM") - add_subdirectory(simd_ops) + add_bench_subdirectory(simd_ops) endif() endif() file(COPY lit.local.cfg DESTINATION "${CMAKE_CURRENT_BINARY_DIR}") Index: Bitcode/Regression/CMakeLists.txt =================================================================== --- Bitcode/Regression/CMakeLists.txt +++ Bitcode/Regression/CMakeLists.txt @@ -1,12 +1,12 @@ set(NO_REFERENCE_OUTPUT true) if(ARCH STREQUAL "x86") - add_subdirectory(vector_widen) + add_bench_subdirectory(vector_widen) # We need at least clang 5.0 to process the bitcode here. if(CMAKE_C_COMPILER_ID STREQUAL "Clang" AND CMAKE_CXX_COMPILER_ID STREQUAL "Clang" AND NOT CMAKE_C_COMPILER_VERSION VERSION_LESS "5.0" AND NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS "5.0") - add_subdirectory(fft) + add_bench_subdirectory(fft) endif() endif() Index: CMakeLists.txt =================================================================== --- CMakeLists.txt +++ CMakeLists.txt @@ -4,6 +4,61 @@ project(test-suite C CXX) +# Wrapper for adding benchmark directories +macro (add_bench_subdirectory subdir) + list(LENGTH BENCH_DIRS DIRS_LENGTH) + + if (ENABLE_PART_CONF AND DIRS_LENGTH GREATER 0) + set(NEW_BENCH_DIRS "") + set(CUR_BENCH_DIRS ${BENCH_DIRS}) + set(DIRECTORY_TO_ADD "") + + # Check if directory should be included + foreach(DIR ${BENCH_DIRS}) + # Find top directory + set(CUR_DIR ${DIR}) + set(TOP_DIR ${DIR}) + while(NOT ${CUR_DIR} STREQUAL "") + set(TOP_DIR ${CUR_DIR}) + get_filename_component(CUR_DIR ${CUR_DIR} DIRECTORY) + endwhile() + + # Subdir can include full path + set(added_subdir ${subdir}) + if (IS_ABSOLUTE ${subdir}) + file(RELATIVE_PATH added_subdir ${CMAKE_CURRENT_SOURCE_DIR} ${subdir}) + endif() + + # Need to add this directory + if ("${TOP_DIR}" STREQUAL "${added_subdir}") + string(REGEX REPLACE "^${added_subdir}.?" "" DIR "${DIR}") + # Special value to save empty value in list + if ("${DIR}" STREQUAL "") + set(DIR "") + endif() + set(DIRECTORY_TO_ADD ${subdir}) + elseif("${TOP_DIR}" STREQUAL "") + # Removed top-level, need include all subdirs + set(DIRECTORY_TO_ADD ${subdir}) + endif() + + list(APPEND NEW_BENCH_DIRS "${DIR}") + endforeach() + + # Save changed list of included directories + set(BENCH_DIRS "${NEW_BENCH_DIRS}") + + if (NOT DIRECTORY_TO_ADD STREQUAL "") + add_subdirectory(${DIRECTORY_TO_ADD}) + endif() + + set(BENCH_DIRS ${CUR_BENCH_DIRS}) + else() + # Just add directory + add_subdirectory(${subdir}) + endif() +endmacro() + # The test-suite is designed to be built in release mode anyway and # falls over unless -DNDEBUG is set. if(NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES) @@ -251,7 +306,7 @@ set(subdir_name ${subdir}) endif() message(STATUS "Adding directory ${subdir}") - add_subdirectory(${subdir} ${subdir_name}) + add_bench_subdirectory(${subdir} ${subdir_name}) endforeach() option(TEST_SUITE_RUN_BENCHMARKS "Actually run the benchmarks in lit" ON) Index: CTMark/CMakeLists.txt =================================================================== --- CTMark/CMakeLists.txt +++ CTMark/CMakeLists.txt @@ -1,12 +1,12 @@ -add_subdirectory(7zip) -add_subdirectory(Bullet) -add_subdirectory(tramp3d-v4) -add_subdirectory(kimwitu++) -add_subdirectory(lencod) -add_subdirectory(SPASS) -add_subdirectory(ClamAV) -add_subdirectory(sqlite3) -add_subdirectory(consumer-typeset) -add_subdirectory(mafft) +add_bench_subdirectory(7zip) +add_bench_subdirectory(Bullet) +add_bench_subdirectory(tramp3d-v4) +add_bench_subdirectory(kimwitu++) +add_bench_subdirectory(lencod) +add_bench_subdirectory(SPASS) +add_bench_subdirectory(ClamAV) +add_bench_subdirectory(sqlite3) +add_bench_subdirectory(consumer-typeset) +add_bench_subdirectory(mafft) file(COPY lit.local.cfg DESTINATION "${CMAKE_CURRENT_BINARY_DIR}") Index: External/CMakeLists.txt =================================================================== --- External/CMakeLists.txt +++ External/CMakeLists.txt @@ -1,6 +1,6 @@ -add_subdirectory(CUDA) -add_subdirectory(HMMER) -add_subdirectory(Nurbs) -add_subdirectory(Povray) -add_subdirectory(SPEC) -add_subdirectory(skidmarks10) +add_bench_subdirectory(CUDA) +add_bench_subdirectory(HMMER) +add_bench_subdirectory(Nurbs) +add_bench_subdirectory(Povray) +add_bench_subdirectory(SPEC) +add_bench_subdirectory(skidmarks10) Index: External/SPEC/CFP2000/CMakeLists.txt =================================================================== --- External/SPEC/CFP2000/CMakeLists.txt +++ External/SPEC/CFP2000/CMakeLists.txt @@ -5,7 +5,7 @@ macro(cfp2000_subdir BENCHMARK) set(BENCHMARK_DIR ${TEST_SUITE_SPEC2000_ROOT}/benchspec/CFP2000/${BENCHMARK}) file(GLOB Source ${BENCHMARK_DIR}/src/*.c ${BENCHMARK_DIR}/src/*.cpp) - add_subdirectory(${BENCHMARK}) + add_bench_subdirectory(${BENCHMARK}) endmacro() cfp2000_subdir(177.mesa) Index: External/SPEC/CFP2017rate/CMakeLists.txt =================================================================== --- External/SPEC/CFP2017rate/CMakeLists.txt +++ External/SPEC/CFP2017rate/CMakeLists.txt @@ -1,15 +1,15 @@ -#add_subdirectory(503.bwaves_r) # Fortran -#add_subdirectory(507.cactuBSSN_r) # C++, C, Fortran -add_subdirectory(508.namd_r) # C++ -add_subdirectory(510.parest_r) # C++ -add_subdirectory(511.povray_r) # C++, C -add_subdirectory(519.lbm_r) # C -#add_subdirectory(521.wrf_r) # Fortran, C -add_subdirectory(526.blender_r) # C++, C -#add_subdirectory(527.cam4_r) # Fortran, C -add_subdirectory(538.imagick_r) # C -add_subdirectory(544.nab_r) # C -#add_subdirectory(549.fotonik3d_r) # Fortran -#add_subdirectory(554.roms_r) # Fortran +#add_bench_subdirectory(503.bwaves_r) # Fortran +#add_bench_subdirectory(507.cactuBSSN_r) # C++, C, Fortran +add_bench_subdirectory(508.namd_r) # C++ +add_bench_subdirectory(510.parest_r) # C++ +add_bench_subdirectory(511.povray_r) # C++, C +add_bench_subdirectory(519.lbm_r) # C +#add_bench_subdirectory(521.wrf_r) # Fortran, C +add_bench_subdirectory(526.blender_r) # C++, C +#add_bench_subdirectory(527.cam4_r) # Fortran, C +add_bench_subdirectory(538.imagick_r) # C +add_bench_subdirectory(544.nab_r) # C +#add_bench_subdirectory(549.fotonik3d_r) # Fortran +#add_bench_subdirectory(554.roms_r) # Fortran -add_subdirectory(997.specrand_fr) # C +add_bench_subdirectory(997.specrand_fr) # C Index: External/SPEC/CFP2017speed/CMakeLists.txt =================================================================== --- External/SPEC/CFP2017speed/CMakeLists.txt +++ External/SPEC/CFP2017speed/CMakeLists.txt @@ -1,12 +1,12 @@ -#add_subdirectory(603.bwaves_s) # Fortran -#add_subdirectory(607.cactuBSSN_s) # C++, C, Fortran -add_subdirectory(619.lbm_s) # C -#add_subdirectory(621.wrf_s) # Fortran, C -#add_subdirectory(627.cam4_s) # Fortran, C -#add_subdirectory(628.pop2_s) # Fortran, C -add_subdirectory(638.imagick_s) # C -add_subdirectory(644.nab_s) # C -#add_subdirectory(649.fotonik3d_s) # Fortran -#add_subdirectory(654.roms_s) # Fortran +#add_bench_subdirectory(603.bwaves_s) # Fortran +#add_bench_subdirectory(607.cactuBSSN_s) # C++, C, Fortran +add_bench_subdirectory(619.lbm_s) # C +#add_bench_subdirectory(621.wrf_s) # Fortran, C +#add_bench_subdirectory(627.cam4_s) # Fortran, C +#add_bench_subdirectory(628.pop2_s) # Fortran, C +add_bench_subdirectory(638.imagick_s) # C +add_bench_subdirectory(644.nab_s) # C +#add_bench_subdirectory(649.fotonik3d_s) # Fortran +#add_bench_subdirectory(654.roms_s) # Fortran -add_subdirectory(996.specrand_fs) # C +add_bench_subdirectory(996.specrand_fs) # C Index: External/SPEC/CINT2000/CMakeLists.txt =================================================================== --- External/SPEC/CINT2000/CMakeLists.txt +++ External/SPEC/CINT2000/CMakeLists.txt @@ -3,7 +3,7 @@ macro(cint2000_subdir BENCHMARK) set(BENCHMARK_DIR ${TEST_SUITE_SPEC2000_ROOT}/benchspec/CINT2000/${BENCHMARK}) file(GLOB Source ${BENCHMARK_DIR}/src/*.c ${BENCHMARK_DIR}/src/*.cpp) - add_subdirectory(${BENCHMARK}) + add_bench_subdirectory(${BENCHMARK}) endmacro() cint2000_subdir(164.gzip) Index: External/SPEC/CINT2017rate/CMakeLists.txt =================================================================== --- External/SPEC/CINT2017rate/CMakeLists.txt +++ External/SPEC/CINT2017rate/CMakeLists.txt @@ -1,12 +1,12 @@ -add_subdirectory(500.perlbench_r) # C -add_subdirectory(502.gcc_r) # C -add_subdirectory(505.mcf_r) # C -add_subdirectory(520.omnetpp_r) # C++ -add_subdirectory(523.xalancbmk_r) # C++ -add_subdirectory(525.x264_r) # C -add_subdirectory(531.deepsjeng_r) # C++ -add_subdirectory(541.leela_r) # C++ -#add_subdirectory(548.exchange2_r) # Fortran -add_subdirectory(557.xz_r) # C +add_bench_subdirectory(500.perlbench_r) # C +add_bench_subdirectory(502.gcc_r) # C +add_bench_subdirectory(505.mcf_r) # C +add_bench_subdirectory(520.omnetpp_r) # C++ +add_bench_subdirectory(523.xalancbmk_r) # C++ +add_bench_subdirectory(525.x264_r) # C +add_bench_subdirectory(531.deepsjeng_r) # C++ +add_bench_subdirectory(541.leela_r) # C++ +#add_bench_subdirectory(548.exchange2_r) # Fortran +add_bench_subdirectory(557.xz_r) # C -add_subdirectory(999.specrand_ir) # C +add_bench_subdirectory(999.specrand_ir) # C Index: External/SPEC/CINT2017speed/CMakeLists.txt =================================================================== --- External/SPEC/CINT2017speed/CMakeLists.txt +++ External/SPEC/CINT2017speed/CMakeLists.txt @@ -1,12 +1,12 @@ -add_subdirectory(600.perlbench_s) # C -add_subdirectory(602.gcc_s) # C -add_subdirectory(605.mcf_s) # C -add_subdirectory(620.omnetpp_s) # C++ -add_subdirectory(623.xalancbmk_s) # C++ -add_subdirectory(625.x264_s) # C -add_subdirectory(631.deepsjeng_s) # C++ -add_subdirectory(641.leela_s) # C++ -#add_subdirectory(648.exchange2_s) # Fortran -add_subdirectory(657.xz_s) # C +add_bench_subdirectory(600.perlbench_s) # C +add_bench_subdirectory(602.gcc_s) # C +add_bench_subdirectory(605.mcf_s) # C +add_bench_subdirectory(620.omnetpp_s) # C++ +add_bench_subdirectory(623.xalancbmk_s) # C++ +add_bench_subdirectory(625.x264_s) # C +add_bench_subdirectory(631.deepsjeng_s) # C++ +add_bench_subdirectory(641.leela_s) # C++ +#add_bench_subdirectory(648.exchange2_s) # Fortran +add_bench_subdirectory(657.xz_s) # C -add_subdirectory(998.specrand_is) # C +add_bench_subdirectory(998.specrand_is) # C Index: External/SPEC/CMakeLists.txt =================================================================== --- External/SPEC/CMakeLists.txt +++ External/SPEC/CMakeLists.txt @@ -1,9 +1,9 @@ -add_subdirectory(CINT95) -add_subdirectory(CINT2000) -add_subdirectory(CFP2000) -add_subdirectory(CINT2006) -add_subdirectory(CFP2006) -add_subdirectory(CINT2017rate) -add_subdirectory(CINT2017speed) -add_subdirectory(CFP2017rate) -add_subdirectory(CFP2017speed) +add_bench_subdirectory(CINT95) +add_bench_subdirectory(CINT2000) +add_bench_subdirectory(CFP2000) +add_bench_subdirectory(CINT2006) +add_bench_subdirectory(CFP2006) +add_bench_subdirectory(CINT2017rate) +add_bench_subdirectory(CINT2017speed) +add_bench_subdirectory(CFP2017rate) +add_bench_subdirectory(CFP2017speed) Index: External/SPEC/SpecCPU2006.cmake =================================================================== --- External/SPEC/SpecCPU2006.cmake +++ External/SPEC/SpecCPU2006.cmake @@ -52,7 +52,7 @@ macro(cpu2006_subdir BENCHMARK) set(BENCHMARK_DIR ${TEST_SUITE_SPEC2006_ROOT}/benchspec/CPU2006/${BENCHMARK}) file(GLOB Source ${BENCHMARK_DIR}/src/*.c ${BENCHMARK_DIR}/src/*.cpp ${BENCHMARK_DIR}/src/*.cc) - add_subdirectory(${BENCHMARK}) + add_bench_subdirectory(${BENCHMARK}) endmacro() function(llvm_test_data_spec target) Index: External/SPEC/SpecCPU95.cmake =================================================================== --- External/SPEC/SpecCPU95.cmake +++ External/SPEC/SpecCPU95.cmake @@ -19,7 +19,7 @@ macro(cint95_subdir BENCHMARK) set(BENCHMARK_DIR ${TEST_SUITE_SPEC95_ROOT}/benchspec/CINT95/${BENCHMARK}) file(GLOB Source ${BENCHMARK_DIR}/src/*.c ${BENCHMARK_DIR}/src/*.cpp) - add_subdirectory(${BENCHMARK}) + add_bench_subdirectory(${BENCHMARK}) endmacro() function(llvm_test_data_spec target) Index: MicroBenchmarks/CMakeLists.txt =================================================================== --- MicroBenchmarks/CMakeLists.txt +++ MicroBenchmarks/CMakeLists.txt @@ -1,8 +1,8 @@ file(COPY lit.local.cfg DESTINATION ${CMAKE_CURRENT_BINARY_DIR}) add_subdirectory(libs) -add_subdirectory(XRay) -add_subdirectory(LCALS) -add_subdirectory(harris) -add_subdirectory(ImageProcessing) +add_bench_subdirectory(XRay) +add_bench_subdirectory(LCALS) +add_bench_subdirectory(harris) +add_bench_subdirectory(ImageProcessing) Index: MicroBenchmarks/ImageProcessing/CMakeLists.txt =================================================================== --- MicroBenchmarks/ImageProcessing/CMakeLists.txt +++ MicroBenchmarks/ImageProcessing/CMakeLists.txt @@ -1,6 +1,6 @@ -add_subdirectory(Dither) -add_subdirectory(AnisotropicDiffusion) -add_subdirectory(Interpolation) -add_subdirectory(Blur) -add_subdirectory(BilateralFiltering) -add_subdirectory(Dilate) +add_bench_subdirectory(Dither) +add_bench_subdirectory(AnisotropicDiffusion) +add_bench_subdirectory(Interpolation) +add_bench_subdirectory(Blur) +add_bench_subdirectory(BilateralFiltering) +add_bench_subdirectory(Dilate) Index: MicroBenchmarks/LCALS/CMakeLists.txt =================================================================== --- MicroBenchmarks/LCALS/CMakeLists.txt +++ MicroBenchmarks/LCALS/CMakeLists.txt @@ -1,6 +1,6 @@ -add_subdirectory(SubsetARawLoops) -add_subdirectory(SubsetALambdaLoops) -add_subdirectory(SubsetBRawLoops) -add_subdirectory(SubsetBLambdaLoops) -add_subdirectory(SubsetCRawLoops) -add_subdirectory(SubsetCLambdaLoops) +add_bench_subdirectory(SubsetARawLoops) +add_bench_subdirectory(SubsetALambdaLoops) +add_bench_subdirectory(SubsetBRawLoops) +add_bench_subdirectory(SubsetBLambdaLoops) +add_bench_subdirectory(SubsetCRawLoops) +add_bench_subdirectory(SubsetCLambdaLoops) Index: MicroBenchmarks/XRay/CMakeLists.txt =================================================================== --- MicroBenchmarks/XRay/CMakeLists.txt +++ MicroBenchmarks/XRay/CMakeLists.txt @@ -1,8 +1,8 @@ -add_subdirectory(ReturnReference) +add_bench_subdirectory(ReturnReference) if(NOT TARGET_OS STREQUAL "Darwin") # FDRMode test is failing on Darwin because # `__xray_log_select_mode("xray-fdr")` returns `XRAY_MODE_NOT_FOUND`. # # Disable the test until it is fixed. rdar://problem/44578416 - add_subdirectory(FDRMode) + add_bench_subdirectory(FDRMode) endif() Index: MultiSource/Applications/ALAC/CMakeLists.txt =================================================================== --- MultiSource/Applications/ALAC/CMakeLists.txt +++ MultiSource/Applications/ALAC/CMakeLists.txt @@ -1,2 +1,2 @@ -add_subdirectory(encode) -add_subdirectory(decode) +add_bench_subdirectory(encode) +add_bench_subdirectory(decode) Index: MultiSource/Applications/CMakeLists.txt =================================================================== --- MultiSource/Applications/CMakeLists.txt +++ MultiSource/Applications/CMakeLists.txt @@ -1,44 +1,44 @@ -add_subdirectory(JM) -add_subdirectory(SIBsim4) -add_subdirectory(aha) -add_subdirectory(d) +add_bench_subdirectory(JM) +add_bench_subdirectory(SIBsim4) +add_bench_subdirectory(aha) +add_bench_subdirectory(d) if(NOT ARCH STREQUAL "PowerPC") # This test has problems running on powerpc starting with r295538 and should # be restored when the issue is corrected. - add_subdirectory(oggenc) + add_bench_subdirectory(oggenc) endif() -add_subdirectory(sgefa) -add_subdirectory(spiff) -add_subdirectory(viterbi) +add_bench_subdirectory(sgefa) +add_bench_subdirectory(spiff) +add_bench_subdirectory(viterbi) -add_subdirectory(ALAC) -add_subdirectory(hbd) -add_subdirectory(lambda-0.1.3) -add_subdirectory(minisat) +add_bench_subdirectory(ALAC) +add_bench_subdirectory(hbd) +add_bench_subdirectory(lambda-0.1.3) +add_bench_subdirectory(minisat) if(NOT TARGET_OS STREQUAL "SunOS") - add_subdirectory(hexxagon) + add_bench_subdirectory(hexxagon) endif() if(NOT DEFINED SMALL_PROBLEM_SIZE) - add_subdirectory(lua) + add_bench_subdirectory(lua) endif() if(TARGET_OS STREQUAL "Linux" AND (NOT ARCH STREQUAL "XCore")) - add_subdirectory(obsequi) + add_bench_subdirectory(obsequi) endif() if(NOT TARGET_OS STREQUAL "SunOS") - add_subdirectory(kimwitu++) + add_bench_subdirectory(kimwitu++) endif() if(NOT TARGET_OS STREQUAL "SunOS") - add_subdirectory(SPASS) + add_bench_subdirectory(SPASS) endif() if(NOT ARCH STREQUAL "XCore") - add_subdirectory(ClamAV) - add_subdirectory(lemon) - add_subdirectory(siod) + add_bench_subdirectory(ClamAV) + add_bench_subdirectory(lemon) + add_bench_subdirectory(siod) endif() if((NOT ARCH STREQUAL "PowerPC") AND (NOT ARCH STREQUAL "XCore")) - add_subdirectory(sqlite3) + add_bench_subdirectory(sqlite3) endif() if(NOT TEST_SUITE_BENCHMARKING_ONLY) - add_subdirectory(Burg) - add_subdirectory(treecc) + add_bench_subdirectory(Burg) + add_bench_subdirectory(treecc) endif() Index: MultiSource/Applications/JM/CMakeLists.txt =================================================================== --- MultiSource/Applications/JM/CMakeLists.txt +++ MultiSource/Applications/JM/CMakeLists.txt @@ -1,2 +1,2 @@ -add_subdirectory(ldecod) -add_subdirectory(lencod) +add_bench_subdirectory(ldecod) +add_bench_subdirectory(lencod) Index: MultiSource/Benchmarks/7zip/CPP/7zip/CMAKE/CMakeLists_ALL.txt =================================================================== --- MultiSource/Benchmarks/7zip/CPP/7zip/CMAKE/CMakeLists_ALL.txt +++ MultiSource/Benchmarks/7zip/CPP/7zip/CMAKE/CMakeLists_ALL.txt @@ -22,11 +22,11 @@ add_definitions(-D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -DNDEBUG -D_REENTRANT -DENV_UNIX -DBREAK_HANDLER -DUNICODE -D_UNICODE) -add_subdirectory(7za) +add_bench_subdirectory(7za) -add_subdirectory(7zG) +add_bench_subdirectory(7zG) -add_subdirectory(7zFM) +add_bench_subdirectory(7zFM) -add_subdirectory(Format7zFree bin) +add_bench_subdirectory(Format7zFree bin) Index: MultiSource/Benchmarks/ASCI_Purple/CMakeLists.txt =================================================================== --- MultiSource/Benchmarks/ASCI_Purple/CMakeLists.txt +++ MultiSource/Benchmarks/ASCI_Purple/CMakeLists.txt @@ -1 +1 @@ -add_subdirectory(SMG2000) +add_bench_subdirectory(SMG2000) Index: MultiSource/Benchmarks/ASC_Sequoia/CMakeLists.txt =================================================================== --- MultiSource/Benchmarks/ASC_Sequoia/CMakeLists.txt +++ MultiSource/Benchmarks/ASC_Sequoia/CMakeLists.txt @@ -1,3 +1,3 @@ -add_subdirectory(AMGmk) -add_subdirectory(CrystalMk) -add_subdirectory(IRSmk) +add_bench_subdirectory(AMGmk) +add_bench_subdirectory(CrystalMk) +add_bench_subdirectory(IRSmk) Index: MultiSource/Benchmarks/BitBench/CMakeLists.txt =================================================================== --- MultiSource/Benchmarks/BitBench/CMakeLists.txt +++ MultiSource/Benchmarks/BitBench/CMakeLists.txt @@ -1,4 +1,4 @@ -add_subdirectory(drop3) -add_subdirectory(five11) -add_subdirectory(uudecode) -add_subdirectory(uuencode) +add_bench_subdirectory(drop3) +add_bench_subdirectory(five11) +add_bench_subdirectory(uudecode) +add_bench_subdirectory(uuencode) Index: MultiSource/Benchmarks/CMakeLists.txt =================================================================== --- MultiSource/Benchmarks/CMakeLists.txt +++ MultiSource/Benchmarks/CMakeLists.txt @@ -1,37 +1,37 @@ -add_subdirectory(ASCI_Purple) -add_subdirectory(ASC_Sequoia) -add_subdirectory(BitBench) -add_subdirectory(Fhourstones) -add_subdirectory(Fhourstones-3.1) -add_subdirectory(FreeBench) -add_subdirectory(MallocBench) -add_subdirectory(McCat) -add_subdirectory(MiBench) -add_subdirectory(NPB-serial) -add_subdirectory(Olden) -add_subdirectory(Prolangs-C) -add_subdirectory(Ptrdist) -add_subdirectory(SciMark2-C) -add_subdirectory(Trimaran) -add_subdirectory(VersaBench) -add_subdirectory(llubenchmark) -add_subdirectory(mediabench) -add_subdirectory(nbench) -add_subdirectory(sim) -add_subdirectory(DOE-ProxyApps-C) -add_subdirectory(Rodinia) +add_bench_subdirectory(ASCI_Purple) +add_bench_subdirectory(ASC_Sequoia) +add_bench_subdirectory(BitBench) +add_bench_subdirectory(Fhourstones) +add_bench_subdirectory(Fhourstones-3.1) +add_bench_subdirectory(FreeBench) +add_bench_subdirectory(MallocBench) +add_bench_subdirectory(McCat) +add_bench_subdirectory(MiBench) +add_bench_subdirectory(NPB-serial) +add_bench_subdirectory(Olden) +add_bench_subdirectory(Prolangs-C) +add_bench_subdirectory(Ptrdist) +add_bench_subdirectory(SciMark2-C) +add_bench_subdirectory(Trimaran) +add_bench_subdirectory(VersaBench) +add_bench_subdirectory(llubenchmark) +add_bench_subdirectory(mediabench) +add_bench_subdirectory(nbench) +add_bench_subdirectory(sim) +add_bench_subdirectory(DOE-ProxyApps-C) +add_bench_subdirectory(Rodinia) if((NOT "${TARGET_OS}" STREQUAL "Darwin") OR (NOT "${ARCH}" STREQUAL "ARM")) - add_subdirectory(TSVC) + add_bench_subdirectory(TSVC) endif() -add_subdirectory(Prolangs-C++) -add_subdirectory(Bullet) -add_subdirectory(tramp3d-v4) -add_subdirectory(DOE-ProxyApps-C++) +add_bench_subdirectory(Prolangs-C++) +add_bench_subdirectory(Bullet) +add_bench_subdirectory(tramp3d-v4) +add_bench_subdirectory(DOE-ProxyApps-C++) if(NOT "${ARCH}" STREQUAL "XCore") - add_subdirectory(7zip) - add_subdirectory(PAQ8p) + add_bench_subdirectory(7zip) + add_bench_subdirectory(PAQ8p) endif() if(NOT DEFINED SMALL_PROBLEM_SIZE) - add_subdirectory(mafft) + add_bench_subdirectory(mafft) endif() Index: MultiSource/Benchmarks/DOE-ProxyApps-C++/CMakeLists.txt =================================================================== --- MultiSource/Benchmarks/DOE-ProxyApps-C++/CMakeLists.txt +++ MultiSource/Benchmarks/DOE-ProxyApps-C++/CMakeLists.txt @@ -1,5 +1,5 @@ -add_subdirectory(HPCCG) -add_subdirectory(PENNANT) -add_subdirectory(miniFE) -add_subdirectory(CLAMR) -add_subdirectory(HACCKernels) +add_bench_subdirectory(HPCCG) +add_bench_subdirectory(PENNANT) +add_bench_subdirectory(miniFE) +add_bench_subdirectory(CLAMR) +add_bench_subdirectory(HACCKernels) Index: MultiSource/Benchmarks/DOE-ProxyApps-C/CMakeLists.txt =================================================================== --- MultiSource/Benchmarks/DOE-ProxyApps-C/CMakeLists.txt +++ MultiSource/Benchmarks/DOE-ProxyApps-C/CMakeLists.txt @@ -1,6 +1,6 @@ -add_subdirectory(XSBench) -add_subdirectory(Pathfinder) -add_subdirectory(miniAMR) -add_subdirectory(miniGMG) -add_subdirectory(RSBench) -add_subdirectory(SimpleMOC) +add_bench_subdirectory(XSBench) +add_bench_subdirectory(Pathfinder) +add_bench_subdirectory(miniAMR) +add_bench_subdirectory(miniGMG) +add_bench_subdirectory(RSBench) +add_bench_subdirectory(SimpleMOC) Index: MultiSource/Benchmarks/FreeBench/CMakeLists.txt =================================================================== --- MultiSource/Benchmarks/FreeBench/CMakeLists.txt +++ MultiSource/Benchmarks/FreeBench/CMakeLists.txt @@ -1,9 +1,9 @@ -add_subdirectory(distray) -add_subdirectory(fourinarow) -add_subdirectory(mason) -add_subdirectory(neural) -add_subdirectory(pcompress2) -add_subdirectory(pifft) +add_bench_subdirectory(distray) +add_bench_subdirectory(fourinarow) +add_bench_subdirectory(mason) +add_bench_subdirectory(neural) +add_bench_subdirectory(pcompress2) +add_bench_subdirectory(pifft) if(NOT "${ARCH}" STREQUAL "Sparc") - add_subdirectory(analyzer) + add_bench_subdirectory(analyzer) endif() Index: MultiSource/Benchmarks/MallocBench/CMakeLists.txt =================================================================== --- MultiSource/Benchmarks/MallocBench/CMakeLists.txt +++ MultiSource/Benchmarks/MallocBench/CMakeLists.txt @@ -1,5 +1,5 @@ -add_subdirectory(espresso) -add_subdirectory(gs) +add_bench_subdirectory(espresso) +add_bench_subdirectory(gs) if(NOT "${ARCH}" STREQUAL "Alpha") - add_subdirectory(cfrac) + add_bench_subdirectory(cfrac) endif() Index: MultiSource/Benchmarks/McCat/CMakeLists.txt =================================================================== --- MultiSource/Benchmarks/McCat/CMakeLists.txt +++ MultiSource/Benchmarks/McCat/CMakeLists.txt @@ -1,12 +1,12 @@ -add_subdirectory(01-qbsort) -add_subdirectory(03-testtrie) -add_subdirectory(04-bisect) -add_subdirectory(05-eks) -add_subdirectory(08-main) -add_subdirectory(09-vor) -add_subdirectory(12-IOtest) -add_subdirectory(17-bintr) -add_subdirectory(18-imp) +add_bench_subdirectory(01-qbsort) +add_bench_subdirectory(03-testtrie) +add_bench_subdirectory(04-bisect) +add_bench_subdirectory(05-eks) +add_bench_subdirectory(08-main) +add_bench_subdirectory(09-vor) +add_bench_subdirectory(12-IOtest) +add_bench_subdirectory(17-bintr) +add_bench_subdirectory(18-imp) if(NOT TEST_SUITE_BENCHMARKING_ONLY) - add_subdirectory(15-trie) + add_bench_subdirectory(15-trie) endif() Index: MultiSource/Benchmarks/MiBench/CMakeLists.txt =================================================================== --- MultiSource/Benchmarks/MiBench/CMakeLists.txt +++ MultiSource/Benchmarks/MiBench/CMakeLists.txt @@ -1,23 +1,23 @@ -add_subdirectory(automotive-basicmath) -add_subdirectory(automotive-bitcount) -add_subdirectory(automotive-susan) -add_subdirectory(consumer-jpeg) -add_subdirectory(consumer-typeset) -add_subdirectory(network-dijkstra) -add_subdirectory(network-patricia) -add_subdirectory(security-rijndael) -add_subdirectory(security-sha) -add_subdirectory(telecomm-CRC32) -add_subdirectory(telecomm-FFT) -add_subdirectory(telecomm-gsm) +add_bench_subdirectory(automotive-basicmath) +add_bench_subdirectory(automotive-bitcount) +add_bench_subdirectory(automotive-susan) +add_bench_subdirectory(consumer-jpeg) +add_bench_subdirectory(consumer-typeset) +add_bench_subdirectory(network-dijkstra) +add_bench_subdirectory(network-patricia) +add_bench_subdirectory(security-rijndael) +add_bench_subdirectory(security-sha) +add_bench_subdirectory(telecomm-CRC32) +add_bench_subdirectory(telecomm-FFT) +add_bench_subdirectory(telecomm-gsm) if(NOT "${ARCH}" STREQUAL "XCore") - add_subdirectory(consumer-lame) + add_bench_subdirectory(consumer-lame) endif() if(NOT TEST_SUITE_BENCHMARKING_ONLY) - add_subdirectory(office-stringsearch) - add_subdirectory(security-blowfish) - add_subdirectory(telecomm-adpcm) + add_bench_subdirectory(office-stringsearch) + add_bench_subdirectory(security-blowfish) + add_bench_subdirectory(telecomm-adpcm) if((NOT "${ARCH}" STREQUAL "XCore") AND (NOT "${ARCH}" STREQUAL "ARM")) - add_subdirectory(office-ispell) + add_bench_subdirectory(office-ispell) endif() endif() Index: MultiSource/Benchmarks/NPB-serial/CMakeLists.txt =================================================================== --- MultiSource/Benchmarks/NPB-serial/CMakeLists.txt +++ MultiSource/Benchmarks/NPB-serial/CMakeLists.txt @@ -1 +1 @@ -add_subdirectory(is) +add_bench_subdirectory(is) Index: MultiSource/Benchmarks/Olden/CMakeLists.txt =================================================================== --- MultiSource/Benchmarks/Olden/CMakeLists.txt +++ MultiSource/Benchmarks/Olden/CMakeLists.txt @@ -1,10 +1,10 @@ -add_subdirectory(bh) -add_subdirectory(bisort) -add_subdirectory(em3d) -add_subdirectory(health) -add_subdirectory(mst) -add_subdirectory(perimeter) -add_subdirectory(power) -add_subdirectory(treeadd) -add_subdirectory(tsp) -add_subdirectory(voronoi) +add_bench_subdirectory(bh) +add_bench_subdirectory(bisort) +add_bench_subdirectory(em3d) +add_bench_subdirectory(health) +add_bench_subdirectory(mst) +add_bench_subdirectory(perimeter) +add_bench_subdirectory(power) +add_bench_subdirectory(treeadd) +add_bench_subdirectory(tsp) +add_bench_subdirectory(voronoi) Index: MultiSource/Benchmarks/Prolangs-C++/CMakeLists.txt =================================================================== --- MultiSource/Benchmarks/Prolangs-C++/CMakeLists.txt +++ MultiSource/Benchmarks/Prolangs-C++/CMakeLists.txt @@ -1,19 +1,19 @@ -add_subdirectory(city) -add_subdirectory(employ) -add_subdirectory(life) -add_subdirectory(ocean) -add_subdirectory(primes) -add_subdirectory(simul) +add_bench_subdirectory(city) +add_bench_subdirectory(employ) +add_bench_subdirectory(life) +add_bench_subdirectory(ocean) +add_bench_subdirectory(primes) +add_bench_subdirectory(simul) if(NOT TEST_SUITE_BENCHMARKING_ONLY) - add_subdirectory(NP) - add_subdirectory(deriv1) - add_subdirectory(deriv2) - add_subdirectory(family) - add_subdirectory(fsm) - add_subdirectory(garage) - add_subdirectory(objects) - add_subdirectory(office) - add_subdirectory(shapes) - add_subdirectory(trees) - add_subdirectory(vcirc) + add_bench_subdirectory(NP) + add_bench_subdirectory(deriv1) + add_bench_subdirectory(deriv2) + add_bench_subdirectory(family) + add_bench_subdirectory(fsm) + add_bench_subdirectory(garage) + add_bench_subdirectory(objects) + add_bench_subdirectory(office) + add_bench_subdirectory(shapes) + add_bench_subdirectory(trees) + add_bench_subdirectory(vcirc) endif() Index: MultiSource/Benchmarks/Prolangs-C/CMakeLists.txt =================================================================== --- MultiSource/Benchmarks/Prolangs-C/CMakeLists.txt +++ MultiSource/Benchmarks/Prolangs-C/CMakeLists.txt @@ -1,22 +1,22 @@ -add_subdirectory(agrep) -add_subdirectory(gnugo) +add_bench_subdirectory(agrep) +add_bench_subdirectory(gnugo) if((NOT "${ARCH}" STREQUAL "Sparc") AND (NOT "${ARCH}" STREQUAL "Alpha")) - add_subdirectory(bison) + add_bench_subdirectory(bison) endif() if(NOT TEST_SUITE_BENCHMARKING_ONLY) - add_subdirectory(TimberWolfMC) - add_subdirectory(allroots) - add_subdirectory(assembler) - add_subdirectory(cdecl) - add_subdirectory(compiler) - add_subdirectory(fixoutput) - add_subdirectory(football) - add_subdirectory(loader) - add_subdirectory(plot2fig) - add_subdirectory(simulator) - add_subdirectory(unix-tbl) + add_bench_subdirectory(TimberWolfMC) + add_bench_subdirectory(allroots) + add_bench_subdirectory(assembler) + add_bench_subdirectory(cdecl) + add_bench_subdirectory(compiler) + add_bench_subdirectory(fixoutput) + add_bench_subdirectory(football) + add_bench_subdirectory(loader) + add_bench_subdirectory(plot2fig) + add_bench_subdirectory(simulator) + add_bench_subdirectory(unix-tbl) if(NOT "${ARCH}" STREQUAL "XCore") - add_subdirectory(archie-client) - add_subdirectory(unix-smail) + add_bench_subdirectory(archie-client) + add_bench_subdirectory(unix-smail) endif() endif() Index: MultiSource/Benchmarks/Ptrdist/CMakeLists.txt =================================================================== --- MultiSource/Benchmarks/Ptrdist/CMakeLists.txt +++ MultiSource/Benchmarks/Ptrdist/CMakeLists.txt @@ -1,5 +1,5 @@ -add_subdirectory(anagram) -add_subdirectory(bc) -add_subdirectory(ft) -add_subdirectory(ks) -add_subdirectory(yacr2) +add_bench_subdirectory(anagram) +add_bench_subdirectory(bc) +add_bench_subdirectory(ft) +add_bench_subdirectory(ks) +add_bench_subdirectory(yacr2) Index: MultiSource/Benchmarks/Rodinia/CMakeLists.txt =================================================================== --- MultiSource/Benchmarks/Rodinia/CMakeLists.txt +++ MultiSource/Benchmarks/Rodinia/CMakeLists.txt @@ -1,4 +1,4 @@ -add_subdirectory(hotspot) -add_subdirectory(srad) -add_subdirectory(backprop) -add_subdirectory(pathfinder) +add_bench_subdirectory(hotspot) +add_bench_subdirectory(srad) +add_bench_subdirectory(backprop) +add_bench_subdirectory(pathfinder) Index: MultiSource/Benchmarks/TSVC/CMakeLists.txt =================================================================== --- MultiSource/Benchmarks/TSVC/CMakeLists.txt +++ MultiSource/Benchmarks/TSVC/CMakeLists.txt @@ -1,36 +1,36 @@ -add_subdirectory(ControlFlow-dbl) -add_subdirectory(ControlFlow-flt) -add_subdirectory(ControlLoops-dbl) -add_subdirectory(ControlLoops-flt) -add_subdirectory(CrossingThresholds-dbl) -add_subdirectory(CrossingThresholds-flt) -add_subdirectory(Equivalencing-dbl) -add_subdirectory(Equivalencing-flt) -add_subdirectory(Expansion-dbl) -add_subdirectory(Expansion-flt) -add_subdirectory(GlobalDataFlow-dbl) -add_subdirectory(GlobalDataFlow-flt) -add_subdirectory(IndirectAddressing-dbl) -add_subdirectory(IndirectAddressing-flt) -add_subdirectory(InductionVariable-dbl) -add_subdirectory(InductionVariable-flt) -add_subdirectory(LinearDependence-dbl) -add_subdirectory(LinearDependence-flt) -add_subdirectory(LoopRerolling-dbl) -add_subdirectory(LoopRerolling-flt) -add_subdirectory(LoopRestructuring-dbl) -add_subdirectory(LoopRestructuring-flt) -add_subdirectory(NodeSplitting-dbl) -add_subdirectory(NodeSplitting-flt) -add_subdirectory(Packing-dbl) -add_subdirectory(Packing-flt) -add_subdirectory(Recurrences-dbl) -add_subdirectory(Recurrences-flt) -add_subdirectory(Reductions-dbl) -add_subdirectory(Reductions-flt) -add_subdirectory(Searching-dbl) -add_subdirectory(Searching-flt) -add_subdirectory(StatementReordering-dbl) -add_subdirectory(StatementReordering-flt) -add_subdirectory(Symbolics-dbl) -add_subdirectory(Symbolics-flt) +add_bench_subdirectory(ControlFlow-dbl) +add_bench_subdirectory(ControlFlow-flt) +add_bench_subdirectory(ControlLoops-dbl) +add_bench_subdirectory(ControlLoops-flt) +add_bench_subdirectory(CrossingThresholds-dbl) +add_bench_subdirectory(CrossingThresholds-flt) +add_bench_subdirectory(Equivalencing-dbl) +add_bench_subdirectory(Equivalencing-flt) +add_bench_subdirectory(Expansion-dbl) +add_bench_subdirectory(Expansion-flt) +add_bench_subdirectory(GlobalDataFlow-dbl) +add_bench_subdirectory(GlobalDataFlow-flt) +add_bench_subdirectory(IndirectAddressing-dbl) +add_bench_subdirectory(IndirectAddressing-flt) +add_bench_subdirectory(InductionVariable-dbl) +add_bench_subdirectory(InductionVariable-flt) +add_bench_subdirectory(LinearDependence-dbl) +add_bench_subdirectory(LinearDependence-flt) +add_bench_subdirectory(LoopRerolling-dbl) +add_bench_subdirectory(LoopRerolling-flt) +add_bench_subdirectory(LoopRestructuring-dbl) +add_bench_subdirectory(LoopRestructuring-flt) +add_bench_subdirectory(NodeSplitting-dbl) +add_bench_subdirectory(NodeSplitting-flt) +add_bench_subdirectory(Packing-dbl) +add_bench_subdirectory(Packing-flt) +add_bench_subdirectory(Recurrences-dbl) +add_bench_subdirectory(Recurrences-flt) +add_bench_subdirectory(Reductions-dbl) +add_bench_subdirectory(Reductions-flt) +add_bench_subdirectory(Searching-dbl) +add_bench_subdirectory(Searching-flt) +add_bench_subdirectory(StatementReordering-dbl) +add_bench_subdirectory(StatementReordering-flt) +add_bench_subdirectory(Symbolics-dbl) +add_bench_subdirectory(Symbolics-flt) Index: MultiSource/Benchmarks/Trimaran/CMakeLists.txt =================================================================== --- MultiSource/Benchmarks/Trimaran/CMakeLists.txt +++ MultiSource/Benchmarks/Trimaran/CMakeLists.txt @@ -1,6 +1,6 @@ -add_subdirectory(enc-3des) -add_subdirectory(enc-md5) -add_subdirectory(enc-pc1) -add_subdirectory(enc-rc4) -add_subdirectory(netbench-crc) -add_subdirectory(netbench-url) +add_bench_subdirectory(enc-3des) +add_bench_subdirectory(enc-md5) +add_bench_subdirectory(enc-pc1) +add_bench_subdirectory(enc-rc4) +add_bench_subdirectory(netbench-crc) +add_bench_subdirectory(netbench-url) Index: MultiSource/Benchmarks/VersaBench/CMakeLists.txt =================================================================== --- MultiSource/Benchmarks/VersaBench/CMakeLists.txt +++ MultiSource/Benchmarks/VersaBench/CMakeLists.txt @@ -1,7 +1,7 @@ -add_subdirectory(beamformer) -add_subdirectory(bmm) -add_subdirectory(dbms) -add_subdirectory(ecbdes) +add_bench_subdirectory(beamformer) +add_bench_subdirectory(bmm) +add_bench_subdirectory(dbms) +add_bench_subdirectory(ecbdes) if(NOT "${ENDIAN}" STREQUAL "big") - add_subdirectory(8b10b) + add_bench_subdirectory(8b10b) endif() Index: MultiSource/Benchmarks/mediabench/CMakeLists.txt =================================================================== --- MultiSource/Benchmarks/mediabench/CMakeLists.txt +++ MultiSource/Benchmarks/mediabench/CMakeLists.txt @@ -1,5 +1,5 @@ -add_subdirectory(adpcm) -add_subdirectory(g721) -add_subdirectory(gsm) -add_subdirectory(jpeg) -add_subdirectory(mpeg2) +add_bench_subdirectory(adpcm) +add_bench_subdirectory(g721) +add_bench_subdirectory(gsm) +add_bench_subdirectory(jpeg) +add_bench_subdirectory(mpeg2) Index: MultiSource/Benchmarks/mediabench/adpcm/CMakeLists.txt =================================================================== --- MultiSource/Benchmarks/mediabench/adpcm/CMakeLists.txt +++ MultiSource/Benchmarks/mediabench/adpcm/CMakeLists.txt @@ -1,2 +1,2 @@ -add_subdirectory(rawcaudio) -add_subdirectory(rawdaudio) +add_bench_subdirectory(rawcaudio) +add_bench_subdirectory(rawdaudio) Index: MultiSource/Benchmarks/mediabench/g721/CMakeLists.txt =================================================================== --- MultiSource/Benchmarks/mediabench/g721/CMakeLists.txt +++ MultiSource/Benchmarks/mediabench/g721/CMakeLists.txt @@ -1 +1 @@ -add_subdirectory(g721encode) +add_bench_subdirectory(g721encode) Index: MultiSource/Benchmarks/mediabench/gsm/CMakeLists.txt =================================================================== --- MultiSource/Benchmarks/mediabench/gsm/CMakeLists.txt +++ MultiSource/Benchmarks/mediabench/gsm/CMakeLists.txt @@ -1 +1 @@ -add_subdirectory(toast) +add_bench_subdirectory(toast) Index: MultiSource/Benchmarks/mediabench/jpeg/CMakeLists.txt =================================================================== --- MultiSource/Benchmarks/mediabench/jpeg/CMakeLists.txt +++ MultiSource/Benchmarks/mediabench/jpeg/CMakeLists.txt @@ -1 +1 @@ -add_subdirectory(jpeg-6a) +add_bench_subdirectory(jpeg-6a) Index: MultiSource/Benchmarks/mediabench/mpeg2/CMakeLists.txt =================================================================== --- MultiSource/Benchmarks/mediabench/mpeg2/CMakeLists.txt +++ MultiSource/Benchmarks/mediabench/mpeg2/CMakeLists.txt @@ -1 +1 @@ -add_subdirectory(mpeg2dec) +add_bench_subdirectory(mpeg2dec) Index: MultiSource/CMakeLists.txt =================================================================== --- MultiSource/CMakeLists.txt +++ MultiSource/CMakeLists.txt @@ -1,7 +1,7 @@ -add_subdirectory(Applications) -add_subdirectory(Benchmarks) +add_bench_subdirectory(Applications) +add_bench_subdirectory(Benchmarks) if(NOT TEST_SUITE_BENCHMARKING_ONLY) - add_subdirectory(UnitTests) + add_bench_subdirectory(UnitTests) endif() file(COPY lit.local.cfg DESTINATION "${CMAKE_CURRENT_BINARY_DIR}") Index: MultiSource/UnitTests/C++11/CMakeLists.txt =================================================================== --- MultiSource/UnitTests/C++11/CMakeLists.txt +++ MultiSource/UnitTests/C++11/CMakeLists.txt @@ -1,5 +1,5 @@ list(APPEND CXXFLAGS -std=c++11) if(NOT MIPS_IS_MIPS16_ENABLED) - add_subdirectory(frame_layout) + add_bench_subdirectory(frame_layout) endif() Index: MultiSource/UnitTests/CMakeLists.txt =================================================================== --- MultiSource/UnitTests/CMakeLists.txt +++ MultiSource/UnitTests/CMakeLists.txt @@ -1,4 +1,4 @@ -add_subdirectory(C++11) +add_bench_subdirectory(C++11) if(ARCH STREQUAL "Mips") - add_subdirectory(Mips) + add_bench_subdirectory(Mips) endif() Index: MultiSource/UnitTests/Mips/CMakeLists.txt =================================================================== --- MultiSource/UnitTests/Mips/CMakeLists.txt +++ MultiSource/UnitTests/Mips/CMakeLists.txt @@ -1,3 +1,3 @@ if(MIPS_IS_MIPS16_ENABLED) - add_subdirectory(Mips16) + add_bench_subdirectory(Mips16) endif() Index: MultiSource/UnitTests/Mips/Mips16/CMakeLists.txt =================================================================== --- MultiSource/UnitTests/Mips/Mips16/CMakeLists.txt +++ MultiSource/UnitTests/Mips/Mips16/CMakeLists.txt @@ -1,2 +1,2 @@ -add_subdirectory(fp16_32_1) -add_subdirectory(multitest) +add_bench_subdirectory(fp16_32_1) +add_bench_subdirectory(multitest) Index: SingleSource/Benchmarks/BenchmarkGame/CMakeLists.txt =================================================================== --- SingleSource/Benchmarks/BenchmarkGame/CMakeLists.txt +++ SingleSource/Benchmarks/BenchmarkGame/CMakeLists.txt @@ -1,4 +1,4 @@ -add_subdirectory(Large) +add_bench_subdirectory(Large) list(APPEND LDFLAGS -lm) llvm_singlesource() Index: SingleSource/Benchmarks/CMakeLists.txt =================================================================== --- SingleSource/Benchmarks/CMakeLists.txt +++ SingleSource/Benchmarks/CMakeLists.txt @@ -1,14 +1,14 @@ -add_subdirectory(Adobe-C++) -add_subdirectory(BenchmarkGame) -add_subdirectory(CoyoteBench) -add_subdirectory(Dhrystone) -add_subdirectory(Linpack) -add_subdirectory(McGill) -add_subdirectory(Misc) -add_subdirectory(Misc-C++) -add_subdirectory(Misc-C++-EH) -add_subdirectory(Polybench) -add_subdirectory(Shootout) -add_subdirectory(Shootout-C++) -add_subdirectory(SmallPT) -add_subdirectory(Stanford) +add_bench_subdirectory(Adobe-C++) +add_bench_subdirectory(BenchmarkGame) +add_bench_subdirectory(CoyoteBench) +add_bench_subdirectory(Dhrystone) +add_bench_subdirectory(Linpack) +add_bench_subdirectory(McGill) +add_bench_subdirectory(Misc) +add_bench_subdirectory(Misc-C++) +add_bench_subdirectory(Misc-C++-EH) +add_bench_subdirectory(Polybench) +add_bench_subdirectory(Shootout) +add_bench_subdirectory(Shootout-C++) +add_bench_subdirectory(SmallPT) +add_bench_subdirectory(Stanford) Index: SingleSource/Benchmarks/Misc-C++/CMakeLists.txt =================================================================== --- SingleSource/Benchmarks/Misc-C++/CMakeLists.txt +++ SingleSource/Benchmarks/Misc-C++/CMakeLists.txt @@ -1,4 +1,4 @@ -add_subdirectory(Large) +add_bench_subdirectory(Large) list(APPEND LDFLAGS -lm -lstdc++) set(FP_ABSTOLERANCE 0.01) Index: SingleSource/Benchmarks/Polybench/CMakeLists.txt =================================================================== --- SingleSource/Benchmarks/Polybench/CMakeLists.txt +++ SingleSource/Benchmarks/Polybench/CMakeLists.txt @@ -1,5 +1,5 @@ list(APPEND LDFLAGS -lm) -add_subdirectory(datamining) -add_subdirectory(linear-algebra) -add_subdirectory(medley) -add_subdirectory(stencils) +add_bench_subdirectory(datamining) +add_bench_subdirectory(linear-algebra) +add_bench_subdirectory(medley) +add_bench_subdirectory(stencils) Index: SingleSource/Benchmarks/Polybench/datamining/CMakeLists.txt =================================================================== --- SingleSource/Benchmarks/Polybench/datamining/CMakeLists.txt +++ SingleSource/Benchmarks/Polybench/datamining/CMakeLists.txt @@ -1,2 +1,2 @@ -add_subdirectory(correlation) -add_subdirectory(covariance) +add_bench_subdirectory(correlation) +add_bench_subdirectory(covariance) Index: SingleSource/Benchmarks/Polybench/linear-algebra/CMakeLists.txt =================================================================== --- SingleSource/Benchmarks/Polybench/linear-algebra/CMakeLists.txt +++ SingleSource/Benchmarks/Polybench/linear-algebra/CMakeLists.txt @@ -1,2 +1,2 @@ -add_subdirectory(kernels) -add_subdirectory(solvers) +add_bench_subdirectory(kernels) +add_bench_subdirectory(solvers) Index: SingleSource/Benchmarks/Polybench/linear-algebra/kernels/CMakeLists.txt =================================================================== --- SingleSource/Benchmarks/Polybench/linear-algebra/kernels/CMakeLists.txt +++ SingleSource/Benchmarks/Polybench/linear-algebra/kernels/CMakeLists.txt @@ -1,17 +1,17 @@ if(NOT TEST_SUITE_BENCHMARKING_ONLY) - add_subdirectory(2mm) - add_subdirectory(3mm) - add_subdirectory(gemm) + add_bench_subdirectory(2mm) + add_bench_subdirectory(3mm) + add_bench_subdirectory(gemm) endif() -add_subdirectory(atax) -add_subdirectory(bicg) -add_subdirectory(cholesky) -add_subdirectory(doitgen) -add_subdirectory(gemver) -add_subdirectory(gesummv) -add_subdirectory(mvt) -add_subdirectory(symm) -add_subdirectory(syr2k) -add_subdirectory(syrk) -add_subdirectory(trisolv) -add_subdirectory(trmm) +add_bench_subdirectory(atax) +add_bench_subdirectory(bicg) +add_bench_subdirectory(cholesky) +add_bench_subdirectory(doitgen) +add_bench_subdirectory(gemver) +add_bench_subdirectory(gesummv) +add_bench_subdirectory(mvt) +add_bench_subdirectory(symm) +add_bench_subdirectory(syr2k) +add_bench_subdirectory(syrk) +add_bench_subdirectory(trisolv) +add_bench_subdirectory(trmm) Index: SingleSource/Benchmarks/Polybench/linear-algebra/solvers/CMakeLists.txt =================================================================== --- SingleSource/Benchmarks/Polybench/linear-algebra/solvers/CMakeLists.txt +++ SingleSource/Benchmarks/Polybench/linear-algebra/solvers/CMakeLists.txt @@ -1,4 +1,4 @@ -add_subdirectory(durbin) -add_subdirectory(dynprog) -add_subdirectory(gramschmidt) -add_subdirectory(lu) +add_bench_subdirectory(durbin) +add_bench_subdirectory(dynprog) +add_bench_subdirectory(gramschmidt) +add_bench_subdirectory(lu) Index: SingleSource/Benchmarks/Polybench/medley/CMakeLists.txt =================================================================== --- SingleSource/Benchmarks/Polybench/medley/CMakeLists.txt +++ SingleSource/Benchmarks/Polybench/medley/CMakeLists.txt @@ -1,2 +1,2 @@ -add_subdirectory(floyd-warshall) -add_subdirectory(reg_detect) +add_bench_subdirectory(floyd-warshall) +add_bench_subdirectory(reg_detect) Index: SingleSource/Benchmarks/Polybench/stencils/CMakeLists.txt =================================================================== --- SingleSource/Benchmarks/Polybench/stencils/CMakeLists.txt +++ SingleSource/Benchmarks/Polybench/stencils/CMakeLists.txt @@ -1,6 +1,6 @@ -add_subdirectory(adi) -add_subdirectory(fdtd-2d) -add_subdirectory(fdtd-apml) -add_subdirectory(jacobi-1d-imper) -add_subdirectory(jacobi-2d-imper) -add_subdirectory(seidel-2d) +add_bench_subdirectory(adi) +add_bench_subdirectory(fdtd-2d) +add_bench_subdirectory(fdtd-apml) +add_bench_subdirectory(jacobi-1d-imper) +add_bench_subdirectory(jacobi-2d-imper) +add_bench_subdirectory(seidel-2d) Index: SingleSource/Benchmarks/Shootout-C++/CMakeLists.txt =================================================================== --- SingleSource/Benchmarks/Shootout-C++/CMakeLists.txt +++ SingleSource/Benchmarks/Shootout-C++/CMakeLists.txt @@ -1,4 +1,4 @@ -add_subdirectory(EH) +add_bench_subdirectory(EH) list(APPEND CXXFLAGS -Wno-deprecated) set(FP_TOLERANCE 0.00000001) Index: SingleSource/CMakeLists.txt =================================================================== --- SingleSource/CMakeLists.txt +++ SingleSource/CMakeLists.txt @@ -1,7 +1,7 @@ -add_subdirectory(Benchmarks) +add_bench_subdirectory(Benchmarks) if(NOT TEST_SUITE_BENCHMARKING_ONLY) - add_subdirectory(UnitTests) - add_subdirectory(Regression) + add_bench_subdirectory(UnitTests) + add_bench_subdirectory(Regression) endif() file(COPY lit.local.cfg DESTINATION "${CMAKE_CURRENT_BINARY_DIR}") Index: SingleSource/Regression/C++/CMakeLists.txt =================================================================== --- SingleSource/Regression/C++/CMakeLists.txt +++ SingleSource/Regression/C++/CMakeLists.txt @@ -1,4 +1,4 @@ -add_subdirectory(EH) +add_bench_subdirectory(EH) list(APPEND LDFLAGS -lstdc++) llvm_singlesource(PREFIX "Regression-C++-") Index: SingleSource/Regression/CMakeLists.txt =================================================================== --- SingleSource/Regression/CMakeLists.txt +++ SingleSource/Regression/CMakeLists.txt @@ -1,2 +1,2 @@ -add_subdirectory(C) -add_subdirectory(C++) +add_bench_subdirectory(C) +add_bench_subdirectory(C++) Index: SingleSource/UnitTests/CMakeLists.txt =================================================================== --- SingleSource/UnitTests/CMakeLists.txt +++ SingleSource/UnitTests/CMakeLists.txt @@ -1,13 +1,13 @@ -add_subdirectory(C++11) -add_subdirectory(SignlessTypes) -add_subdirectory(Threads) -add_subdirectory(Vector) -add_subdirectory(Vectorizer) +add_bench_subdirectory(C++11) +add_bench_subdirectory(SignlessTypes) +add_bench_subdirectory(Threads) +add_bench_subdirectory(Vector) +add_bench_subdirectory(Vectorizer) # FIXME: Disable SJLJ tests for now, until EH edges are represented. -# add_subdirectory(SetjmpLongjmp) +# add_bench_subdirectory(SetjmpLongjmp) if(TARGET_OS STREQUAL "Darwin") - add_subdirectory(ObjC) - add_subdirectory(ObjC++) + add_bench_subdirectory(ObjC) + add_bench_subdirectory(ObjC++) endif() file(GLOB Source RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *.c *.cpp) @@ -21,7 +21,7 @@ list(REMOVE_ITEM Source blockstret.c) endif() if(ARCH STREQUAL "Mips") - add_subdirectory(Mips) + add_bench_subdirectory(Mips) # Only MIPS 64-bit supports 8 bytes atomic operations. if(NOT MIPS_IS_MIPS64_ENABLED) list(REMOVE_ITEM Source AtomicOps.c) Index: SingleSource/UnitTests/Mips/CMakeLists.txt =================================================================== --- SingleSource/UnitTests/Mips/CMakeLists.txt +++ SingleSource/UnitTests/Mips/CMakeLists.txt @@ -1,3 +1,3 @@ if(MIPS_IS_MIPS16_ENABLED) - add_subdirectory(Mips16) + add_bench_subdirectory(Mips16) endif() Index: SingleSource/UnitTests/SetjmpLongjmp/CMakeLists.txt =================================================================== --- SingleSource/UnitTests/SetjmpLongjmp/CMakeLists.txt +++ SingleSource/UnitTests/SetjmpLongjmp/CMakeLists.txt @@ -1,2 +1,2 @@ -add_subdirectory(C) -add_subdirectory(C++) +add_bench_subdirectory(C) +add_bench_subdirectory(C++) Index: SingleSource/UnitTests/SignlessTypes/CMakeLists.txt =================================================================== --- SingleSource/UnitTests/SignlessTypes/CMakeLists.txt +++ SingleSource/UnitTests/SignlessTypes/CMakeLists.txt @@ -1,4 +1,4 @@ -add_subdirectory(Large) +add_bench_subdirectory(Large) set(RUN_OPTIONS 31415926) list(APPEND LDFLAGS -lstdc++) Index: SingleSource/UnitTests/Vector/CMakeLists.txt =================================================================== --- SingleSource/UnitTests/Vector/CMakeLists.txt +++ SingleSource/UnitTests/Vector/CMakeLists.txt @@ -1,20 +1,20 @@ if(ARCH STREQUAL "PowerPC") - add_subdirectory(Altivec) + add_bench_subdirectory(Altivec) endif() if(ARCH STREQUAL "x86") - add_subdirectory(SSE) + add_bench_subdirectory(SSE) endif() CHECK_SYMBOL_EXISTS(__ARM_NEON "" NEON_AVAILABLE) if(NEON_AVAILABLE) - add_subdirectory(NEON) + add_bench_subdirectory(NEON) endif() if(ARCH STREQUAL "AArch64") - add_subdirectory(AArch64) + add_bench_subdirectory(AArch64) endif() if(CMAKE_C_COMPILER_ID STREQUAL "Clang") if(ARCH STREQUAL "x86" AND X86CPU_ARCH STREQUAL "skylake-avx512") - add_subdirectory(AVX512) + add_bench_subdirectory(AVX512) endif() endif() llvm_singlesource(PREFIX "Vector-") Index: tests/add_bench_subdirectory.test =================================================================== --- /dev/null +++ tests/add_bench_subdirectory.test @@ -0,0 +1,13 @@ +// RUN: rm -rf %T && mkdir -p %T +// RUN: cd %T && cmake -DTEST_SUITE_SUBDIRS=SingleSource -DENABLE_PART_CONF=1 -DBENCH_DIRS=SingleSource/Benchmarks/Misc %S/../../test-suite +// RUN: ls %T/SingleSource/Benchmarks | FileCheck %s -check-prefix=MISC + +// MISC-NOT: McGill +// MISC: Misc + +// RUN: rm -rf %T && mkdir -p %T +// RUN: cd %T && cmake -DTEST_SUITE_SUBDIRS=SingleSource -DENABLE_PART_CONF=1 -DBENCH_DIRS=SingleSource/Benchmarks %S/../../test-suite +// RUN: ls %T/SingleSource/Benchmarks | FileCheck %s -check-prefix=BENCHS + +// BENCHS: McGill +// BENCHS: Misc Index: tests/lit.cfg =================================================================== --- /dev/null +++ tests/lit.cfg @@ -0,0 +1,7 @@ +# -*- Python -*- +# Configuration file for the 'lit' test runner. +import lit.formats +config.name = 'test-suite' +config.test_format = lit.formats.ShTest(1) +config.suffixes = ['.test'] +