[test-suite] r263163 - cmake: Simplify BENCHMARKING_ONLY handling.
Matthias Braun via llvm-commits
llvm-commits at lists.llvm.org
Thu Mar 10 13:03:42 PST 2016
Author: matze
Date: Thu Mar 10 15:03:42 2016
New Revision: 263163
URL: http://llvm.org/viewvc/llvm-project?rev=263163&view=rev
Log:
cmake: Simplify BENCHMARKING_ONLY handling.
No need to an internal variable BENCHMARKING_ONLY that is just set
depending on TEST_SUITE_BENCHMARKING_ONLY, just use the latter.
This also fixes wrong BENCHMARKING_ONLY condition in Prolangs-C++
Modified:
test-suite/trunk/CMakeLists.txt
test-suite/trunk/MultiSource/Applications/CMakeLists.txt
test-suite/trunk/MultiSource/Benchmarks/McCat/CMakeLists.txt
test-suite/trunk/MultiSource/Benchmarks/MiBench/CMakeLists.txt
test-suite/trunk/MultiSource/Benchmarks/Prolangs-C++/CMakeLists.txt
test-suite/trunk/MultiSource/Benchmarks/Prolangs-C/CMakeLists.txt
test-suite/trunk/MultiSource/CMakeLists.txt
test-suite/trunk/SingleSource/Benchmarks/McGill/CMakeLists.txt
test-suite/trunk/SingleSource/Benchmarks/Polybench/linear-algebra/kernels/CMakeLists.txt
test-suite/trunk/SingleSource/Benchmarks/Shootout-C++/CMakeLists.txt
test-suite/trunk/SingleSource/Benchmarks/Shootout/CMakeLists.txt
test-suite/trunk/SingleSource/Benchmarks/Stanford/CMakeLists.txt
test-suite/trunk/SingleSource/CMakeLists.txt
test-suite/trunk/SingleSource/Regression/C++/CMakeLists.txt
test-suite/trunk/SingleSource/Regression/C++/EH/CMakeLists.txt
test-suite/trunk/SingleSource/Regression/C/CMakeLists.txt
test-suite/trunk/SingleSource/UnitTests/C++11/CMakeLists.txt
test-suite/trunk/SingleSource/UnitTests/Vector/AArch64/CMakeLists.txt
test-suite/trunk/SingleSource/UnitTests/Vector/NEON/CMakeLists.txt
Modified: test-suite/trunk/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/CMakeLists.txt?rev=263163&r1=263162&r2=263163&view=diff
==============================================================================
--- test-suite/trunk/CMakeLists.txt (original)
+++ test-suite/trunk/CMakeLists.txt Thu Mar 10 15:03:42 2016
@@ -130,11 +130,6 @@ set(CMAKE_CXX_COMPILE_OBJECT "${CMAKE_BI
set(TEST_SUITE_BENCHMARKING_ONLY "OFF" CACHE BOOL
"Only run the benchmarking only subset")
-if(TEST_SUITE_BENCHMARKING_ONLY)
- set(BENCHMARKING_ONLY "ON")
-else()
- set(BENCHMARKING_ONLY)
-endif()
add_subdirectory(SingleSource)
add_subdirectory(MultiSource)
Modified: test-suite/trunk/MultiSource/Applications/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/Applications/CMakeLists.txt?rev=263163&r1=263162&r2=263163&view=diff
==============================================================================
--- test-suite/trunk/MultiSource/Applications/CMakeLists.txt (original)
+++ test-suite/trunk/MultiSource/Applications/CMakeLists.txt Thu Mar 10 15:03:42 2016
@@ -25,6 +25,6 @@ endif()
if((NOT "${ARCH}" STREQUAL "PowerPC") AND (NOT "${ARCH}" STREQUAL "XCore"))
llvm_add_subdirectories(sqlite3)
endif()
-if(NOT DEFINED BENCHMARKING_ONLY)
+if(NOT TEST_SUITE_BENCHMARKING_ONLY)
llvm_add_subdirectories(Burg treecc)
endif()
Modified: test-suite/trunk/MultiSource/Benchmarks/McCat/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/Benchmarks/McCat/CMakeLists.txt?rev=263163&r1=263162&r2=263163&view=diff
==============================================================================
--- test-suite/trunk/MultiSource/Benchmarks/McCat/CMakeLists.txt (original)
+++ test-suite/trunk/MultiSource/Benchmarks/McCat/CMakeLists.txt Thu Mar 10 15:03:42 2016
@@ -1,4 +1,4 @@
llvm_add_subdirectories(01-qbsort 04-bisect 08-main 12-IOtest 17-bintr 03-testtrie 05-eks 09-vor 18-imp)
-if(NOT DEFINED BENCHMARKING_ONLY)
+if(NOT TEST_SUITE_BENCHMARKING_ONLY)
llvm_add_subdirectories(15-trie)
endif()
Modified: test-suite/trunk/MultiSource/Benchmarks/MiBench/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/Benchmarks/MiBench/CMakeLists.txt?rev=263163&r1=263162&r2=263163&view=diff
==============================================================================
--- test-suite/trunk/MultiSource/Benchmarks/MiBench/CMakeLists.txt (original)
+++ test-suite/trunk/MultiSource/Benchmarks/MiBench/CMakeLists.txt Thu Mar 10 15:03:42 2016
@@ -2,7 +2,7 @@ llvm_add_subdirectories(automotive-basic
if(NOT "${ARCH}" STREQUAL "XCore")
llvm_add_subdirectories(consumer-lame)
endif()
-if(NOT DEFINED BENCHMARKING_ONLY)
+if(NOT TEST_SUITE_BENCHMARKING_ONLY)
llvm_add_subdirectories(office-stringsearch security-blowfish telecomm-adpcm)
if((NOT "${ARCH}" STREQUAL "XCore") AND (NOT "${ARCH}" STREQUAL "ARM"))
llvm_add_subdirectories(office-ispell)
Modified: test-suite/trunk/MultiSource/Benchmarks/Prolangs-C++/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/Benchmarks/Prolangs-C%2B%2B/CMakeLists.txt?rev=263163&r1=263162&r2=263163&view=diff
==============================================================================
--- test-suite/trunk/MultiSource/Benchmarks/Prolangs-C++/CMakeLists.txt (original)
+++ test-suite/trunk/MultiSource/Benchmarks/Prolangs-C++/CMakeLists.txt Thu Mar 10 15:03:42 2016
@@ -1,4 +1,4 @@
llvm_add_subdirectories(city employ life ocean primes simul)
-if(DEFINED BENCHMARKING_ONLY)
+if(NOT TEST_SUITE_BENCHMARKING_ONLY)
llvm_add_subdirectories(deriv1 deriv2 family fsm garage NP objects office shapes trees vcirc)
endif()
Modified: test-suite/trunk/MultiSource/Benchmarks/Prolangs-C/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/Benchmarks/Prolangs-C/CMakeLists.txt?rev=263163&r1=263162&r2=263163&view=diff
==============================================================================
--- test-suite/trunk/MultiSource/Benchmarks/Prolangs-C/CMakeLists.txt (original)
+++ test-suite/trunk/MultiSource/Benchmarks/Prolangs-C/CMakeLists.txt Thu Mar 10 15:03:42 2016
@@ -2,7 +2,7 @@ llvm_add_subdirectories(agrep gnugo)
if((NOT "${ARCH}" STREQUAL "Sparc") AND (NOT "${ARCH}" STREQUAL "Alpha"))
llvm_add_subdirectories(bison)
endif()
-if(NOT DEFINED BENCHMARKING_ONLY)
+if(NOT TEST_SUITE_BENCHMARKING_ONLY)
llvm_add_subdirectories(allroots assembler cdecl compiler loader fixoutput football plot2fig simulator TimberWolfMC unix-tbl)
if(NOT "${ARCH}" STREQUAL "XCore")
llvm_add_subdirectories(archie-client unix-smail)
Modified: test-suite/trunk/MultiSource/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/CMakeLists.txt?rev=263163&r1=263162&r2=263163&view=diff
==============================================================================
--- test-suite/trunk/MultiSource/CMakeLists.txt (original)
+++ test-suite/trunk/MultiSource/CMakeLists.txt Thu Mar 10 15:03:42 2016
@@ -1,4 +1,4 @@
llvm_add_subdirectories(Applications Benchmarks)
-if(NOT DEFINED BENCHMARKING_ONLY)
+if(NOT TEST_SUITE_BENCHMARKING_ONLY)
llvm_add_subdirectories(UnitTests)
endif()
Modified: test-suite/trunk/SingleSource/Benchmarks/McGill/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/SingleSource/Benchmarks/McGill/CMakeLists.txt?rev=263163&r1=263162&r2=263163&view=diff
==============================================================================
--- test-suite/trunk/SingleSource/Benchmarks/McGill/CMakeLists.txt (original)
+++ test-suite/trunk/SingleSource/Benchmarks/McGill/CMakeLists.txt Thu Mar 10 15:03:42 2016
@@ -1,6 +1,6 @@
list(APPEND LDFLAGS -lm )
set(FP_TOLERANCE 0.001)
-if(DEFINED BENCHMARKING_ONLY)
+if(TEST_SUITE_BENCHMARKING_ONLY)
list(APPEND PROGRAMS_TO_SKIP exptree)
endif()
llvm_singlesource()
Modified: test-suite/trunk/SingleSource/Benchmarks/Polybench/linear-algebra/kernels/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/SingleSource/Benchmarks/Polybench/linear-algebra/kernels/CMakeLists.txt?rev=263163&r1=263162&r2=263163&view=diff
==============================================================================
--- test-suite/trunk/SingleSource/Benchmarks/Polybench/linear-algebra/kernels/CMakeLists.txt (original)
+++ test-suite/trunk/SingleSource/Benchmarks/Polybench/linear-algebra/kernels/CMakeLists.txt Thu Mar 10 15:03:42 2016
@@ -1,4 +1,4 @@
-if(NOT DEFINED BENCHMARKING_ONLY)
+if(NOT TEST_SUITE_BENCHMARKING_ONLY)
llvm_add_subdirectories(2mm 3mm gemm)
endif()
llvm_add_subdirectories(atax bicg cholesky doitgen gemver gesummv mvt symm syr2k syrk trisolv trmm)
Modified: test-suite/trunk/SingleSource/Benchmarks/Shootout-C++/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/SingleSource/Benchmarks/Shootout-C%2B%2B/CMakeLists.txt?rev=263163&r1=263162&r2=263163&view=diff
==============================================================================
--- test-suite/trunk/SingleSource/Benchmarks/Shootout-C++/CMakeLists.txt (original)
+++ test-suite/trunk/SingleSource/Benchmarks/Shootout-C++/CMakeLists.txt Thu Mar 10 15:03:42 2016
@@ -7,7 +7,7 @@ if("${ARCH}" STREQUAL "XCore")
set(RUNTIMELIMIT 10800)
endif()
endif()
-if(DEFINED BENCHMARKING_ONLY)
+if(TEST_SUITE_BENCHMARKING_ONLY)
list(APPEND PROGRAMS_TO_SKIP hello reversefile spellcheck sumcol wc wordfreq)
endif()
list(APPEND LDFLAGS -lstdc++)
Modified: test-suite/trunk/SingleSource/Benchmarks/Shootout/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/SingleSource/Benchmarks/Shootout/CMakeLists.txt?rev=263163&r1=263162&r2=263163&view=diff
==============================================================================
--- test-suite/trunk/SingleSource/Benchmarks/Shootout/CMakeLists.txt (original)
+++ test-suite/trunk/SingleSource/Benchmarks/Shootout/CMakeLists.txt Thu Mar 10 15:03:42 2016
@@ -2,7 +2,7 @@ list(APPEND LDFLAGS -lm)
if("${ARCH}" STREQUAL "XCore")
set(XCORE_TARGET_NEEDS_MEMORY 256)
endif()
-if(DEFINED BENCHMARKING_ONLY)
+if(TEST_SUITE_BENCHMARKING_ONLY)
list(APPEND PROGRAMS_TO_SKIP hello)
endif()
llvm_singlesource()
Modified: test-suite/trunk/SingleSource/Benchmarks/Stanford/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/SingleSource/Benchmarks/Stanford/CMakeLists.txt?rev=263163&r1=263162&r2=263163&view=diff
==============================================================================
--- test-suite/trunk/SingleSource/Benchmarks/Stanford/CMakeLists.txt (original)
+++ test-suite/trunk/SingleSource/Benchmarks/Stanford/CMakeLists.txt Thu Mar 10 15:03:42 2016
@@ -1,6 +1,6 @@
list(APPEND LDFLAGS -lm)
set(FP_TOLERANCE 0.001)
-if(DEFINED BENCHMARKING_ONLY)
+if(TEST_SUITE_BENCHMARKING_ONLY)
list(APPEND PROGRAMS_TO_SKIP IntMM)
endif()
llvm_singlesource()
Modified: test-suite/trunk/SingleSource/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/SingleSource/CMakeLists.txt?rev=263163&r1=263162&r2=263163&view=diff
==============================================================================
--- test-suite/trunk/SingleSource/CMakeLists.txt (original)
+++ test-suite/trunk/SingleSource/CMakeLists.txt Thu Mar 10 15:03:42 2016
@@ -1,5 +1,5 @@
llvm_add_subdirectories(Regression Benchmarks)
-if(NOT DEFINED BENCHMARKING_ONLY)
+if(NOT TEST_SUITE_BENCHMARKING_ONLY)
llvm_add_subdirectories(UnitTests)
endif()
Modified: test-suite/trunk/SingleSource/Regression/C++/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/SingleSource/Regression/C%2B%2B/CMakeLists.txt?rev=263163&r1=263162&r2=263163&view=diff
==============================================================================
--- test-suite/trunk/SingleSource/Regression/C++/CMakeLists.txt (original)
+++ test-suite/trunk/SingleSource/Regression/C++/CMakeLists.txt Thu Mar 10 15:03:42 2016
@@ -1,4 +1,4 @@
-if(DEFINED BENCHMARKING_ONLY)
+if(TEST_SUITE_BENCHMARKING_ONLY)
list(APPEND PROGRAMS_TO_SKIP 2003-05-14-array-init 2003-05-14-expr_stmt 2003-06-08-BaseType 2003-06-08-VirtualFunctions 2003-06-13-Crasher 2003-08-20-EnumSizeProblem 2003-09-29-NonPODsByValue 2008-01-29-ParamAliasesReturn 2011-03-28-Bitfield BuiltinTypeInfo fixups global_ctor global_type ofstream_ctor pointer_member pointer_method pointer_method2 short_circuit_dtor)
endif()
list(APPEND LDFLAGS -lstdc++)
Modified: test-suite/trunk/SingleSource/Regression/C++/EH/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/SingleSource/Regression/C%2B%2B/EH/CMakeLists.txt?rev=263163&r1=263162&r2=263163&view=diff
==============================================================================
--- test-suite/trunk/SingleSource/Regression/C++/EH/CMakeLists.txt (original)
+++ test-suite/trunk/SingleSource/Regression/C++/EH/CMakeLists.txt Thu Mar 10 15:03:42 2016
@@ -1,5 +1,5 @@
set(REQUIRES_EH_SUPPORT 1)
-if(DEFINED BENCHMARKING_ONLY)
+if(TEST_SUITE_BENCHMARKING_ONLY)
list(APPEND PROGRAMS_TO_SKIP class_hierarchy ConditionalExpr ctor_dtor_count ctor_dtor_count-2 dead_try_block exception_spec_test function_try_block inlined_cleanup recursive-throw simple_rethrow simple_throw throw_rethrow_test)
endif()
list(APPEND LDFLAGS -lstdc++)
Modified: test-suite/trunk/SingleSource/Regression/C/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/SingleSource/Regression/C/CMakeLists.txt?rev=263163&r1=263162&r2=263163&view=diff
==============================================================================
--- test-suite/trunk/SingleSource/Regression/C/CMakeLists.txt (original)
+++ test-suite/trunk/SingleSource/Regression/C/CMakeLists.txt Thu Mar 10 15:03:42 2016
@@ -3,7 +3,7 @@ if("${ARCH}" STREQUAL "x86")
set(EXEC_XFAILS casts)
endif()
endif()
-if(DEFINED BENCHMARKING_ONLY)
+if(TEST_SUITE_BENCHMARKING_ONLY)
list(APPEND PROGRAMS_TO_SKIP 2003-05-14-initialize-string 2003-05-21-BitfieldHandling 2003-05-21-UnionBitfields 2003-05-21-UnionTest 2003-05-22-LocalTypeTest 2003-05-22-VarSizeArray 2003-05-23-TransparentUnion 2003-06-16-InvalidInitializer 2003-06-16-VolatileError 2003-10-12-GlobalVarInitializers 2004-02-03-AggregateCopy 2004-03-15-IndirectGoto 2005-05-06-LongLongSignedShift 2008-01-07-LongDouble badidx bigstack callargs casts compare ConstructorDestructorAttributes DuffsDevice globalrefs matrixTranspose pointer_arithmetic PR10189 PR1386 PR491 PR640 sumarray sumarray2d sumarraymalloc test_indvars testtrace)
endif()
list(APPEND LDFLAGS -lm)
Modified: test-suite/trunk/SingleSource/UnitTests/C++11/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/SingleSource/UnitTests/C%2B%2B11/CMakeLists.txt?rev=263163&r1=263162&r2=263163&view=diff
==============================================================================
--- test-suite/trunk/SingleSource/UnitTests/C++11/CMakeLists.txt (original)
+++ test-suite/trunk/SingleSource/UnitTests/C++11/CMakeLists.txt Thu Mar 10 15:03:42 2016
@@ -1,5 +1,5 @@
list(APPEND CPPFLAGS -std=c++11 -pthread)
-if(DEFINED BENCHMARKING_ONLY)
+if(TEST_SUITE_BENCHMARKING_ONLY)
list(APPEND PROGRAMS_TO_SKIP stdthreadbug)
endif()
list(APPEND LDFLAGS -lstdc++ -pthread)
Modified: test-suite/trunk/SingleSource/UnitTests/Vector/AArch64/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/SingleSource/UnitTests/Vector/AArch64/CMakeLists.txt?rev=263163&r1=263162&r2=263163&view=diff
==============================================================================
--- test-suite/trunk/SingleSource/UnitTests/Vector/AArch64/CMakeLists.txt (original)
+++ test-suite/trunk/SingleSource/UnitTests/Vector/AArch64/CMakeLists.txt Thu Mar 10 15:03:42 2016
@@ -1,4 +1,4 @@
-if(DEFINED BENCHMARKING_ONLY)
+if(TEST_SUITE_BENCHMARKING_ONLY)
list(APPEND PROGRAMS_TO_SKIP aarch64_neon_intrinsics)
endif()
list(APPEND CFLAGS -std=c99)
Modified: test-suite/trunk/SingleSource/UnitTests/Vector/NEON/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/SingleSource/UnitTests/Vector/NEON/CMakeLists.txt?rev=263163&r1=263162&r2=263163&view=diff
==============================================================================
--- test-suite/trunk/SingleSource/UnitTests/Vector/NEON/CMakeLists.txt (original)
+++ test-suite/trunk/SingleSource/UnitTests/Vector/NEON/CMakeLists.txt Thu Mar 10 15:03:42 2016
@@ -1,4 +1,4 @@
-if(DEFINED BENCHMARKING_ONLY)
+if(TEST_SUITE_BENCHMARKING_ONLY)
list(APPEND PROGRAMS_TO_SKIP simple)
endif()
list(APPEND CFLAGS -std=c99)
More information about the llvm-commits
mailing list