[test-suite] r286199 - cmake: Use if(XXX) instead of if(DEFINED XXX)

Matthias Braun via llvm-commits llvm-commits at lists.llvm.org
Mon Nov 7 18:17:58 PST 2016


Author: matze
Date: Mon Nov  7 20:17:57 2016
New Revision: 286199

URL: http://llvm.org/viewvc/llvm-project?rev=286199&view=rev
Log:
cmake: Use if(XXX) instead of if(DEFINED XXX)

The former works as well for us and is more in line with usual cmake
style.

Modified:
    test-suite/trunk/External/HMMER/CMakeLists.txt
    test-suite/trunk/MultiSource/Applications/JM/lencod/CMakeLists.txt
    test-suite/trunk/MultiSource/Applications/SIBsim4/CMakeLists.txt
    test-suite/trunk/MultiSource/Applications/SPASS/CMakeLists.txt
    test-suite/trunk/MultiSource/Applications/minisat/CMakeLists.txt
    test-suite/trunk/MultiSource/Applications/obsequi/CMakeLists.txt
    test-suite/trunk/MultiSource/Applications/sgefa/CMakeLists.txt
    test-suite/trunk/MultiSource/Applications/sqlite3/CMakeLists.txt
    test-suite/trunk/MultiSource/Benchmarks/ASCI_Purple/SMG2000/CMakeLists.txt
    test-suite/trunk/MultiSource/Benchmarks/Fhourstones-3.1/CMakeLists.txt
    test-suite/trunk/MultiSource/Benchmarks/FreeBench/analyzer/CMakeLists.txt
    test-suite/trunk/MultiSource/Benchmarks/FreeBench/distray/CMakeLists.txt
    test-suite/trunk/MultiSource/Benchmarks/FreeBench/fourinarow/CMakeLists.txt
    test-suite/trunk/MultiSource/Benchmarks/FreeBench/mason/CMakeLists.txt
    test-suite/trunk/MultiSource/Benchmarks/FreeBench/neural/CMakeLists.txt
    test-suite/trunk/MultiSource/Benchmarks/FreeBench/pcompress2/CMakeLists.txt
    test-suite/trunk/MultiSource/Benchmarks/FreeBench/pifft/CMakeLists.txt
    test-suite/trunk/MultiSource/Benchmarks/MallocBench/cfrac/CMakeLists.txt
    test-suite/trunk/MultiSource/Benchmarks/NPB-serial/dc/CMakeLists.txt
    test-suite/trunk/MultiSource/Benchmarks/NPB-serial/is/CMakeLists.txt
    test-suite/trunk/MultiSource/Benchmarks/Olden/bh/CMakeLists.txt
    test-suite/trunk/MultiSource/Benchmarks/Olden/bisort/CMakeLists.txt
    test-suite/trunk/MultiSource/Benchmarks/Olden/em3d/CMakeLists.txt
    test-suite/trunk/MultiSource/Benchmarks/Olden/health/CMakeLists.txt
    test-suite/trunk/MultiSource/Benchmarks/Olden/mst/CMakeLists.txt
    test-suite/trunk/MultiSource/Benchmarks/Olden/perimeter/CMakeLists.txt
    test-suite/trunk/MultiSource/Benchmarks/Olden/treeadd/CMakeLists.txt
    test-suite/trunk/MultiSource/Benchmarks/Olden/tsp/CMakeLists.txt
    test-suite/trunk/MultiSource/Benchmarks/Olden/voronoi/CMakeLists.txt
    test-suite/trunk/MultiSource/Benchmarks/PAQ8p/CMakeLists.txt
    test-suite/trunk/MultiSource/Benchmarks/Ptrdist/ft/CMakeLists.txt
    test-suite/trunk/MultiSource/Benchmarks/SciMark2-C/CMakeLists.txt
    test-suite/trunk/MultiSource/Benchmarks/Trimaran/enc-3des/CMakeLists.txt
    test-suite/trunk/MultiSource/Benchmarks/Trimaran/enc-md5/CMakeLists.txt
    test-suite/trunk/MultiSource/Benchmarks/Trimaran/enc-pc1/CMakeLists.txt
    test-suite/trunk/MultiSource/Benchmarks/Trimaran/enc-rc4/CMakeLists.txt
    test-suite/trunk/MultiSource/Benchmarks/Trimaran/netbench-crc/CMakeLists.txt
    test-suite/trunk/MultiSource/Benchmarks/Trimaran/netbench-url/CMakeLists.txt
    test-suite/trunk/MultiSource/Benchmarks/VersaBench/8b10b/CMakeLists.txt
    test-suite/trunk/MultiSource/Benchmarks/VersaBench/beamformer/CMakeLists.txt
    test-suite/trunk/MultiSource/Benchmarks/VersaBench/bmm/CMakeLists.txt
    test-suite/trunk/MultiSource/Benchmarks/VersaBench/dbms/CMakeLists.txt
    test-suite/trunk/MultiSource/Benchmarks/VersaBench/ecbdes/CMakeLists.txt
    test-suite/trunk/MultiSource/Benchmarks/llubenchmark/CMakeLists.txt
    test-suite/trunk/MultiSource/Benchmarks/tramp3d-v4/CMakeLists.txt
    test-suite/trunk/SingleSource/Benchmarks/Polybench/datamining/correlation/CMakeLists.txt
    test-suite/trunk/SingleSource/Benchmarks/Polybench/datamining/covariance/CMakeLists.txt
    test-suite/trunk/SingleSource/Benchmarks/Polybench/linear-algebra/kernels/2mm/CMakeLists.txt
    test-suite/trunk/SingleSource/Benchmarks/Polybench/linear-algebra/kernels/3mm/CMakeLists.txt
    test-suite/trunk/SingleSource/Benchmarks/Polybench/linear-algebra/kernels/cholesky/CMakeLists.txt
    test-suite/trunk/SingleSource/Benchmarks/Polybench/linear-algebra/kernels/doitgen/CMakeLists.txt
    test-suite/trunk/SingleSource/Benchmarks/Polybench/linear-algebra/kernels/gemm/CMakeLists.txt
    test-suite/trunk/SingleSource/Benchmarks/Polybench/linear-algebra/kernels/gesummv/CMakeLists.txt
    test-suite/trunk/SingleSource/Benchmarks/Polybench/linear-algebra/kernels/symm/CMakeLists.txt
    test-suite/trunk/SingleSource/Benchmarks/Polybench/linear-algebra/kernels/syr2k/CMakeLists.txt
    test-suite/trunk/SingleSource/Benchmarks/Polybench/linear-algebra/kernels/syrk/CMakeLists.txt
    test-suite/trunk/SingleSource/Benchmarks/Polybench/linear-algebra/kernels/trmm/CMakeLists.txt
    test-suite/trunk/SingleSource/Benchmarks/Polybench/linear-algebra/solvers/gramschmidt/CMakeLists.txt
    test-suite/trunk/SingleSource/Benchmarks/Polybench/medley/floyd-warshall/CMakeLists.txt
    test-suite/trunk/SingleSource/Benchmarks/Polybench/stencils/adi/CMakeLists.txt
    test-suite/trunk/SingleSource/Benchmarks/Polybench/stencils/fdtd-2d/CMakeLists.txt
    test-suite/trunk/SingleSource/Benchmarks/Polybench/stencils/fdtd-apml/CMakeLists.txt
    test-suite/trunk/SingleSource/Benchmarks/Polybench/stencils/jacobi-2d-imper/CMakeLists.txt
    test-suite/trunk/SingleSource/Benchmarks/Polybench/stencils/seidel-2d/CMakeLists.txt
    test-suite/trunk/SingleSource/Regression/C/CMakeLists.txt
    test-suite/trunk/SingleSource/UnitTests/SignlessTypes/Large/CMakeLists.txt
    test-suite/trunk/cmake/modules/SingleMultiSource.cmake

Modified: test-suite/trunk/External/HMMER/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/External/HMMER/CMakeLists.txt?rev=286199&r1=286198&r2=286199&view=diff
==============================================================================
--- test-suite/trunk/External/HMMER/CMakeLists.txt (original)
+++ test-suite/trunk/External/HMMER/CMakeLists.txt Mon Nov  7 20:17:57 2016
@@ -13,7 +13,7 @@ if(TEST_SUITE_HMMER_ROOT)
     add_definitions(-DSSE2)
   endif()
 
-  if(DEFINED LARGE_PROBLEM_SIZE)
+  if(LARGE_PROBLEM_SIZE)
     llvm_test_run(--fixed 400 --cpu 1 --num 200000 --seed 1158818515 ${TEST_SUITE_HMMER_ROOT}/globin.hmm)
   else()
     llvm_test_run(--fixed 400 --cpu 1 --num 80000 --seed 1158818515 ${TEST_SUITE_HMMER_ROOT}/globin.hmm)

Modified: test-suite/trunk/MultiSource/Applications/JM/lencod/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/Applications/JM/lencod/CMakeLists.txt?rev=286199&r1=286198&r2=286199&view=diff
==============================================================================
--- test-suite/trunk/MultiSource/Applications/JM/lencod/CMakeLists.txt (original)
+++ test-suite/trunk/MultiSource/Applications/JM/lencod/CMakeLists.txt Mon Nov  7 20:17:57 2016
@@ -2,7 +2,7 @@ set(PROG lencod)
 list(APPEND CPPFLAGS -D__USE_LARGEFILE64 -D_FILE_OFFSET_BITS=64)
 list(APPEND LDFLAGS -lm)
 set(FP_TOLERANCE 0.025)
-if(DEFINED SMALL_PROBLEM_SIZE)
+if(SMALL_PROBLEM_SIZE)
   set(RUN_OPTIONS -d ${CMAKE_CURRENT_SOURCE_DIR}/data/encoder_small.cfg -p InputFile=${CMAKE_CURRENT_SOURCE_DIR}/data/foreman_part_qcif_444.yuv -p LeakyBucketRateFile=${CMAKE_CURRENT_SOURCE_DIR}/data/leakybucketrate.cfg -p QmatrixFile=${CMAKE_CURRENT_SOURCE_DIR}/data/q_matrix.cfg)
 else()
   set(RUN_OPTIONS -d ${CMAKE_CURRENT_SOURCE_DIR}/data/encoder.cfg -p InputFile=${CMAKE_CURRENT_SOURCE_DIR}/data/foreman_part_qcif_444.yuv -p LeakyBucketRateFile=${CMAKE_CURRENT_SOURCE_DIR}/data/leakybucketrate.cfg -p QmatrixFile=${CMAKE_CURRENT_SOURCE_DIR}/data/q_matrix.cfg)

Modified: test-suite/trunk/MultiSource/Applications/SIBsim4/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/Applications/SIBsim4/CMakeLists.txt?rev=286199&r1=286198&r2=286199&view=diff
==============================================================================
--- test-suite/trunk/MultiSource/Applications/SIBsim4/CMakeLists.txt (original)
+++ test-suite/trunk/MultiSource/Applications/SIBsim4/CMakeLists.txt Mon Nov  7 20:17:57 2016
@@ -1,5 +1,5 @@
 set(PROG SIBsim4)
-if(DEFINED SMALL_PROBLEM_SIZE)
+if(SMALL_PROBLEM_SIZE)
   set(RUN_OPTIONS -A4 ${CMAKE_CURRENT_SOURCE_DIR}/x-small.fa ${CMAKE_CURRENT_SOURCE_DIR}/y-small.fa)
 else()
   set(RUN_OPTIONS -A4 ${CMAKE_CURRENT_SOURCE_DIR}/x.fa ${CMAKE_CURRENT_SOURCE_DIR}/y.fa)

Modified: test-suite/trunk/MultiSource/Applications/SPASS/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/Applications/SPASS/CMakeLists.txt?rev=286199&r1=286198&r2=286199&view=diff
==============================================================================
--- test-suite/trunk/MultiSource/Applications/SPASS/CMakeLists.txt (original)
+++ test-suite/trunk/MultiSource/Applications/SPASS/CMakeLists.txt Mon Nov  7 20:17:57 2016
@@ -2,7 +2,7 @@ set(PROG SPASS)
 list(APPEND CPPFLAGS -DCLOCK_NO_TIMING)
 list(APPEND CFLAGS -fno-strict-aliasing)
 list(APPEND LDFLAGS -lm)
-if(DEFINED SMALL_PROBLEM_SIZE)
+if(SMALL_PROBLEM_SIZE)
   set(RUN_OPTIONS "${CMAKE_CURRENT_SOURCE_DIR}/small_problem.dfg")
 else()
   set(RUN_OPTIONS "${CMAKE_CURRENT_SOURCE_DIR}/problem.dfg")

Modified: test-suite/trunk/MultiSource/Applications/minisat/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/Applications/minisat/CMakeLists.txt?rev=286199&r1=286198&r2=286199&view=diff
==============================================================================
--- test-suite/trunk/MultiSource/Applications/minisat/CMakeLists.txt (original)
+++ test-suite/trunk/MultiSource/Applications/minisat/CMakeLists.txt Mon Nov  7 20:17:57 2016
@@ -1,9 +1,9 @@
 set(PROG minisat)
 list(APPEND LDFLAGS -lstdc++ -lm)
-if(DEFINED SMALL_PROBLEM_SIZE)
+if(SMALL_PROBLEM_SIZE)
   set(RUN_OPTIONS -verbosity=0 ${CMAKE_CURRENT_SOURCE_DIR}/small.cnf)
 else()
-  if(DEFINED LARGE_PROBLEM_SIZE)
+  if(LARGE_PROBLEM_SIZE)
     set(RUN_OPTIONS -verbosity=0 ${CMAKE_CURRENT_SOURCE_DIR}/long.cnf)
     if(ARCH STREQUAL "XCore")
       set(XCORE_TARGET_NEEDS_MEMORY 64)

Modified: test-suite/trunk/MultiSource/Applications/obsequi/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/Applications/obsequi/CMakeLists.txt?rev=286199&r1=286198&r2=286199&view=diff
==============================================================================
--- test-suite/trunk/MultiSource/Applications/obsequi/CMakeLists.txt (original)
+++ test-suite/trunk/MultiSource/Applications/obsequi/CMakeLists.txt Mon Nov  7 20:17:57 2016
@@ -1,7 +1,7 @@
 set(PROG Obsequi)
 list(APPEND CPPFLAGS -DCOUNTBITS16 -DLASTBIT16 -DCOUNTMOVES_TABLE)
 list(APPEND CPPFLAGS -DTWO_STAGE_GENERATION)
-if(DEFINED SMALL_PROBLEM_SIZE)
+if(SMALL_PROBLEM_SIZE)
   list(APPEND CPPFLAGS -DHASHCODEBITS=15)
 else()
   list(APPEND CPPFLAGS -DHASHCODEBITS=23)

Modified: test-suite/trunk/MultiSource/Applications/sgefa/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/Applications/sgefa/CMakeLists.txt?rev=286199&r1=286198&r2=286199&view=diff
==============================================================================
--- test-suite/trunk/MultiSource/Applications/sgefa/CMakeLists.txt (original)
+++ test-suite/trunk/MultiSource/Applications/sgefa/CMakeLists.txt Mon Nov  7 20:17:57 2016
@@ -1,7 +1,7 @@
 set(PROG sgefa)
 list(APPEND LDFLAGS -lm)
 set(FP_TOLERANCE 0.0001)
-if(DEFINED LARGE_PROBLEM_SIZE)
+if(LARGE_PROBLEM_SIZE)
   list(APPEND CPPFLAGS -DSCALE=50)
 else()
   list(APPEND CPPFLAGS -DSCALE=40)

Modified: test-suite/trunk/MultiSource/Applications/sqlite3/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/Applications/sqlite3/CMakeLists.txt?rev=286199&r1=286198&r2=286199&view=diff
==============================================================================
--- test-suite/trunk/MultiSource/Applications/sqlite3/CMakeLists.txt (original)
+++ test-suite/trunk/MultiSource/Applications/sqlite3/CMakeLists.txt Mon Nov  7 20:17:57 2016
@@ -6,9 +6,6 @@ set(RUN_OPTIONS -init ${CMAKE_CURRENT_SO
 set(WORKDIR ${CMAKE_CURRENT_BINARY_DIR})
 set(FP_TOLERANCE 1.0e-9)
 set(GeneratedTestInputs ${CMAKE_CURRENT_BINARY_DIR}/test15.sql)
-if(DEFINED SMALL_PROBLEM_SIZE)
-else()
-endif()
 
 if(SMALL_PROBLEM_SIZE)
   set(SQLITE_INPUTNAME smalltest)

Modified: test-suite/trunk/MultiSource/Benchmarks/ASCI_Purple/SMG2000/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/Benchmarks/ASCI_Purple/SMG2000/CMakeLists.txt?rev=286199&r1=286198&r2=286199&view=diff
==============================================================================
--- test-suite/trunk/MultiSource/Benchmarks/ASCI_Purple/SMG2000/CMakeLists.txt (original)
+++ test-suite/trunk/MultiSource/Benchmarks/ASCI_Purple/SMG2000/CMakeLists.txt Mon Nov  7 20:17:57 2016
@@ -2,7 +2,7 @@ set(PROG smg2000)
 list(APPEND CPPFLAGS -D_POSIX_SOURCE -DHYPRE_TIMING -DHYPRE_SEQUENTIAL )
 list(APPEND CPPFLAGS -I. )
 list(APPEND LDFLAGS -lm)
-if(DEFINED SMALL_PROBLEM_SIZE)
+if(SMALL_PROBLEM_SIZE)
   set(RUN_OPTIONS "-n 30 15 30 -c 0.1 1.0 10.0")
 else()
   set(RUN_OPTIONS "-n 100 40 100 -c 0.1 1.0 10.0")

Modified: test-suite/trunk/MultiSource/Benchmarks/Fhourstones-3.1/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/Benchmarks/Fhourstones-3.1/CMakeLists.txt?rev=286199&r1=286198&r2=286199&view=diff
==============================================================================
--- test-suite/trunk/MultiSource/Benchmarks/Fhourstones-3.1/CMakeLists.txt (original)
+++ test-suite/trunk/MultiSource/Benchmarks/Fhourstones-3.1/CMakeLists.txt Mon Nov  7 20:17:57 2016
@@ -1,5 +1,5 @@
 set(PROG fhourstones3.1)
-if(DEFINED LARGE_PROBLEM_SIZE)
+if(LARGE_PROBLEM_SIZE)
   set(STDIN_FILENAME ${CMAKE_CURRENT_SOURCE_DIR}/inputs_large)
 else()
   set(STDIN_FILENAME ${CMAKE_CURRENT_SOURCE_DIR}/inputs)

Modified: test-suite/trunk/MultiSource/Benchmarks/FreeBench/analyzer/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/Benchmarks/FreeBench/analyzer/CMakeLists.txt?rev=286199&r1=286198&r2=286199&view=diff
==============================================================================
--- test-suite/trunk/MultiSource/Benchmarks/FreeBench/analyzer/CMakeLists.txt (original)
+++ test-suite/trunk/MultiSource/Benchmarks/FreeBench/analyzer/CMakeLists.txt Mon Nov  7 20:17:57 2016
@@ -1,6 +1,6 @@
 set(PROG analyzer)
 list(APPEND CPPFLAGS -DVERSION="1.00" -DCOMPDATE="today" -DCFLAGS="" -DHOSTNAME="thishost")
-if(DEFINED LARGE_PROBLEM_SIZE)
+if(LARGE_PROBLEM_SIZE)
   set(RUN_OPTIONS ${CMAKE_CURRENT_SOURCE_DIR}/ref.in)
 else()
   set(RUN_OPTIONS ${CMAKE_CURRENT_SOURCE_DIR}/test.in)

Modified: test-suite/trunk/MultiSource/Benchmarks/FreeBench/distray/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/Benchmarks/FreeBench/distray/CMakeLists.txt?rev=286199&r1=286198&r2=286199&view=diff
==============================================================================
--- test-suite/trunk/MultiSource/Benchmarks/FreeBench/distray/CMakeLists.txt (original)
+++ test-suite/trunk/MultiSource/Benchmarks/FreeBench/distray/CMakeLists.txt Mon Nov  7 20:17:57 2016
@@ -1,7 +1,7 @@
 set(PROG distray)
 list(APPEND CPPFLAGS -DVERSION="1.00" -DCOMPDATE="today" -DCFLAGS="" -DHOSTNAME="thishost")
 list(APPEND LDFLAGS -lm)
-if(DEFINED LARGE_PROBLEM_SIZE)
+if(LARGE_PROBLEM_SIZE)
   set(RUN_OPTIONS ${CMAKE_CURRENT_SOURCE_DIR}/ref.in)
 else()
   set(RUN_OPTIONS ${CMAKE_CURRENT_SOURCE_DIR}/test.in)

Modified: test-suite/trunk/MultiSource/Benchmarks/FreeBench/fourinarow/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/Benchmarks/FreeBench/fourinarow/CMakeLists.txt?rev=286199&r1=286198&r2=286199&view=diff
==============================================================================
--- test-suite/trunk/MultiSource/Benchmarks/FreeBench/fourinarow/CMakeLists.txt (original)
+++ test-suite/trunk/MultiSource/Benchmarks/FreeBench/fourinarow/CMakeLists.txt Mon Nov  7 20:17:57 2016
@@ -1,6 +1,6 @@
 set(PROG fourinarow)
 list(APPEND CPPFLAGS -DVERSION="1.00" -DCOMPDATE="today" -DCFLAGS="" -DHOSTNAME="thishost")
-if(DEFINED LARGE_PROBLEM_SIZE)
+if(LARGE_PROBLEM_SIZE)
   set(RUN_OPTIONS ${CMAKE_CURRENT_SOURCE_DIR}/ref.in)
 else()
   set(RUN_OPTIONS ${CMAKE_CURRENT_SOURCE_DIR}/test.in)

Modified: test-suite/trunk/MultiSource/Benchmarks/FreeBench/mason/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/Benchmarks/FreeBench/mason/CMakeLists.txt?rev=286199&r1=286198&r2=286199&view=diff
==============================================================================
--- test-suite/trunk/MultiSource/Benchmarks/FreeBench/mason/CMakeLists.txt (original)
+++ test-suite/trunk/MultiSource/Benchmarks/FreeBench/mason/CMakeLists.txt Mon Nov  7 20:17:57 2016
@@ -1,6 +1,6 @@
 set(PROG mason)
 list(APPEND CPPFLAGS -DVERSION="1.00" -DCOMPDATE="today" -DCFLAGS="" -DHOSTNAME="thishost")
-if(DEFINED LARGE_PROBLEM_SIZE)
+if(LARGE_PROBLEM_SIZE)
   set(RUN_OPTIONS ${CMAKE_CURRENT_SOURCE_DIR}/ref.in)
 else()
   set(RUN_OPTIONS ${CMAKE_CURRENT_SOURCE_DIR}/test.in)

Modified: test-suite/trunk/MultiSource/Benchmarks/FreeBench/neural/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/Benchmarks/FreeBench/neural/CMakeLists.txt?rev=286199&r1=286198&r2=286199&view=diff
==============================================================================
--- test-suite/trunk/MultiSource/Benchmarks/FreeBench/neural/CMakeLists.txt (original)
+++ test-suite/trunk/MultiSource/Benchmarks/FreeBench/neural/CMakeLists.txt Mon Nov  7 20:17:57 2016
@@ -1,7 +1,7 @@
 set(PROG neural)
 list(APPEND CPPFLAGS -DVERSION="1.00" -DCOMPDATE="today" -DCFLAGS="" -DHOSTNAME="thishost")
 list(APPEND LDFLAGS -lm)
-if(DEFINED LARGE_PROBLEM_SIZE)
+if(LARGE_PROBLEM_SIZE)
   set(RUN_OPTIONS ${CMAKE_CURRENT_SOURCE_DIR}/ref.in)
 else()
   set(RUN_OPTIONS ${CMAKE_CURRENT_SOURCE_DIR}/test.in)

Modified: test-suite/trunk/MultiSource/Benchmarks/FreeBench/pcompress2/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/Benchmarks/FreeBench/pcompress2/CMakeLists.txt?rev=286199&r1=286198&r2=286199&view=diff
==============================================================================
--- test-suite/trunk/MultiSource/Benchmarks/FreeBench/pcompress2/CMakeLists.txt (original)
+++ test-suite/trunk/MultiSource/Benchmarks/FreeBench/pcompress2/CMakeLists.txt Mon Nov  7 20:17:57 2016
@@ -1,6 +1,6 @@
 set(PROG pcompress2)
 list(APPEND CPPFLAGS -DVERSION="1.00" -DCOMPDATE="today" -DCFLAGS="" -DHOSTNAME="thishost")
-if(DEFINED LARGE_PROBLEM_SIZE)
+if(LARGE_PROBLEM_SIZE)
   set(INPUT_FILE ref.in)
 else()
   set(INPUT_FILE test.in)

Modified: test-suite/trunk/MultiSource/Benchmarks/FreeBench/pifft/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/Benchmarks/FreeBench/pifft/CMakeLists.txt?rev=286199&r1=286198&r2=286199&view=diff
==============================================================================
--- test-suite/trunk/MultiSource/Benchmarks/FreeBench/pifft/CMakeLists.txt (original)
+++ test-suite/trunk/MultiSource/Benchmarks/FreeBench/pifft/CMakeLists.txt Mon Nov  7 20:17:57 2016
@@ -1,7 +1,7 @@
 set(PROG pifft)
 list(APPEND CPPFLAGS -DVERSION="1.00" -DCOMPDATE="today" -DCFLAGS="" -DHOSTNAME="thishost")
 list(APPEND LDFLAGS -lm)
-if(DEFINED LARGE_PROBLEM_SIZE)
+if(LARGE_PROBLEM_SIZE)
   set(RUN_OPTIONS ${CMAKE_CURRENT_SOURCE_DIR}/ref.in)
 else()
   set(RUN_OPTIONS ${CMAKE_CURRENT_SOURCE_DIR}/test.in)

Modified: test-suite/trunk/MultiSource/Benchmarks/MallocBench/cfrac/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/Benchmarks/MallocBench/cfrac/CMakeLists.txt?rev=286199&r1=286198&r2=286199&view=diff
==============================================================================
--- test-suite/trunk/MultiSource/Benchmarks/MallocBench/cfrac/CMakeLists.txt (original)
+++ test-suite/trunk/MultiSource/Benchmarks/MallocBench/cfrac/CMakeLists.txt Mon Nov  7 20:17:57 2016
@@ -2,7 +2,7 @@ set(PROG cfrac)
 list(APPEND CPPFLAGS -DNOMEMOPT)
 list(APPEND LDFLAGS -lm)
 set(Source cfrac.c pops.c pconst.c pio.c pabs.c pneg.c pcmp.c podd.c phalf.c padd.c psub.c pmul.c pdivmod.c psqrt.c ppowmod.c atop.c ptoa.c itop.c utop.c ptou.c errorp.c pfloat.c pidiv.c pimod.c picmp.c primes.c pcfrac.c pgcd.c)
-if(DEFINED LARGE_PROBLEM_SIZE)
+if(LARGE_PROBLEM_SIZE)
   set(RUN_OPTIONS 376529507064485971626234556089714053987)
 else()
   set(RUN_OPTIONS 41757646344123832613190542166099121)

Modified: test-suite/trunk/MultiSource/Benchmarks/NPB-serial/dc/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/Benchmarks/NPB-serial/dc/CMakeLists.txt?rev=286199&r1=286198&r2=286199&view=diff
==============================================================================
--- test-suite/trunk/MultiSource/Benchmarks/NPB-serial/dc/CMakeLists.txt (original)
+++ test-suite/trunk/MultiSource/Benchmarks/NPB-serial/dc/CMakeLists.txt Mon Nov  7 20:17:57 2016
@@ -1,7 +1,7 @@
 set(PROG dc)
 set(Source adc.c dc.c jobcntl.c c_print_results.c extbuild.c rbt.c)
 set(RUN_OPTIONS 10000000 ADC.par)
-if(DEFINED SMALL_PROBLEM_SIZE)
+if(SMALL_PROBLEM_SIZE)
   list(APPEND CPPFLAGS -DSMALL_PROBLEM_SIZE)
 endif()
 llvm_multisource()

Modified: test-suite/trunk/MultiSource/Benchmarks/NPB-serial/is/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/Benchmarks/NPB-serial/is/CMakeLists.txt?rev=286199&r1=286198&r2=286199&view=diff
==============================================================================
--- test-suite/trunk/MultiSource/Benchmarks/NPB-serial/is/CMakeLists.txt (original)
+++ test-suite/trunk/MultiSource/Benchmarks/NPB-serial/is/CMakeLists.txt Mon Nov  7 20:17:57 2016
@@ -1,5 +1,5 @@
 set(PROG is)
-if(DEFINED SMALL_PROBLEM_SIZE)
+if(SMALL_PROBLEM_SIZE)
   list(APPEND CPPFLAGS -DSMALL_PROBLEM_SIZE)
 else()
   if(ARCH STREQUAL "XCore")

Modified: test-suite/trunk/MultiSource/Benchmarks/Olden/bh/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/Benchmarks/Olden/bh/CMakeLists.txt?rev=286199&r1=286198&r2=286199&view=diff
==============================================================================
--- test-suite/trunk/MultiSource/Benchmarks/Olden/bh/CMakeLists.txt (original)
+++ test-suite/trunk/MultiSource/Benchmarks/Olden/bh/CMakeLists.txt Mon Nov  7 20:17:57 2016
@@ -1,10 +1,10 @@
 set(PROG bh)
 list(APPEND CPPFLAGS -DTORONTO)
 list(APPEND LDFLAGS -lm)
-if(DEFINED LARGE_PROBLEM_SIZE)
+if(LARGE_PROBLEM_SIZE)
   set(RUN_OPTIONS 40000 30)
 else()
-  if(DEFINED SMALL_PROBLEM_SIZE)
+  if(SMALL_PROBLEM_SIZE)
     set(RUN_OPTIONS 2000 5)
   else()
     set(RUN_OPTIONS 20000 20)

Modified: test-suite/trunk/MultiSource/Benchmarks/Olden/bisort/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/Benchmarks/Olden/bisort/CMakeLists.txt?rev=286199&r1=286198&r2=286199&view=diff
==============================================================================
--- test-suite/trunk/MultiSource/Benchmarks/Olden/bisort/CMakeLists.txt (original)
+++ test-suite/trunk/MultiSource/Benchmarks/Olden/bisort/CMakeLists.txt Mon Nov  7 20:17:57 2016
@@ -1,7 +1,7 @@
 set(PROG bisort)
 list(APPEND CPPFLAGS -DTORONTO)
 list(APPEND LDFLAGS -lm)
-if(DEFINED LARGE_PROBLEM_SIZE)
+if(LARGE_PROBLEM_SIZE)
   set(RUN_OPTIONS 3000000)
 else()
   set(RUN_OPTIONS 700000)

Modified: test-suite/trunk/MultiSource/Benchmarks/Olden/em3d/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/Benchmarks/Olden/em3d/CMakeLists.txt?rev=286199&r1=286198&r2=286199&view=diff
==============================================================================
--- test-suite/trunk/MultiSource/Benchmarks/Olden/em3d/CMakeLists.txt (original)
+++ test-suite/trunk/MultiSource/Benchmarks/Olden/em3d/CMakeLists.txt Mon Nov  7 20:17:57 2016
@@ -1,6 +1,6 @@
 set(PROG em3d)
 list(APPEND CPPFLAGS -DTORONTO)
-if(DEFINED SMALL_PROBLEM_SIZE)
+if(SMALL_PROBLEM_SIZE)
   set(RUN_OPTIONS 256 250 35)
 else()
   set(RUN_OPTIONS 1024 1000 125)

Modified: test-suite/trunk/MultiSource/Benchmarks/Olden/health/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/Benchmarks/Olden/health/CMakeLists.txt?rev=286199&r1=286198&r2=286199&view=diff
==============================================================================
--- test-suite/trunk/MultiSource/Benchmarks/Olden/health/CMakeLists.txt (original)
+++ test-suite/trunk/MultiSource/Benchmarks/Olden/health/CMakeLists.txt Mon Nov  7 20:17:57 2016
@@ -2,10 +2,10 @@ set(PROG health)
 list(APPEND CPPFLAGS -DTORONTO)
 list(APPEND LDFLAGS -lm)
 set(FP_TOLERANCE 0.001)
-if(DEFINED LARGE_PROBLEM_SIZE)
+if(LARGE_PROBLEM_SIZE)
   set(RUN_OPTIONS 10 40 1)
 else()
-  if(DEFINED SMALL_PROBLEM_SIZE)
+  if(SMALL_PROBLEM_SIZE)
     set(RUN_OPTIONS 8 15 1)
   else()
     set(RUN_OPTIONS 9 20 1)

Modified: test-suite/trunk/MultiSource/Benchmarks/Olden/mst/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/Benchmarks/Olden/mst/CMakeLists.txt?rev=286199&r1=286198&r2=286199&view=diff
==============================================================================
--- test-suite/trunk/MultiSource/Benchmarks/Olden/mst/CMakeLists.txt (original)
+++ test-suite/trunk/MultiSource/Benchmarks/Olden/mst/CMakeLists.txt Mon Nov  7 20:17:57 2016
@@ -1,6 +1,6 @@
 set(PROG mst)
 list(APPEND CPPFLAGS -DTORONTO)
-if(DEFINED LARGE_PROBLEM_SIZE)
+if(LARGE_PROBLEM_SIZE)
   set(RUN_OPTIONS 4000)
 else()
   set(RUN_OPTIONS 1000)

Modified: test-suite/trunk/MultiSource/Benchmarks/Olden/perimeter/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/Benchmarks/Olden/perimeter/CMakeLists.txt?rev=286199&r1=286198&r2=286199&view=diff
==============================================================================
--- test-suite/trunk/MultiSource/Benchmarks/Olden/perimeter/CMakeLists.txt (original)
+++ test-suite/trunk/MultiSource/Benchmarks/Olden/perimeter/CMakeLists.txt Mon Nov  7 20:17:57 2016
@@ -1,9 +1,9 @@
 set(PROG perimeter)
 list(APPEND CPPFLAGS -DTORONTO)
-if(DEFINED LARGE_PROBLEM_SIZE)
+if(LARGE_PROBLEM_SIZE)
   set(RUN_OPTIONS 11)
 else()
-  if(DEFINED SMALL_PROBLEM_SIZE)
+  if(SMALL_PROBLEM_SIZE)
     set(RUN_OPTIONS 9)
   else()
     set(RUN_OPTIONS 10)

Modified: test-suite/trunk/MultiSource/Benchmarks/Olden/treeadd/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/Benchmarks/Olden/treeadd/CMakeLists.txt?rev=286199&r1=286198&r2=286199&view=diff
==============================================================================
--- test-suite/trunk/MultiSource/Benchmarks/Olden/treeadd/CMakeLists.txt (original)
+++ test-suite/trunk/MultiSource/Benchmarks/Olden/treeadd/CMakeLists.txt Mon Nov  7 20:17:57 2016
@@ -1,6 +1,6 @@
 set(PROG treeadd)
 list(APPEND CPPFLAGS -DTORONTO)
-if(DEFINED SMALL_PROBLEM_SIZE)
+if(SMALL_PROBLEM_SIZE)
   set(RUN_OPTIONS 20)
 else()
   set(RUN_OPTIONS 22)

Modified: test-suite/trunk/MultiSource/Benchmarks/Olden/tsp/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/Benchmarks/Olden/tsp/CMakeLists.txt?rev=286199&r1=286198&r2=286199&view=diff
==============================================================================
--- test-suite/trunk/MultiSource/Benchmarks/Olden/tsp/CMakeLists.txt (original)
+++ test-suite/trunk/MultiSource/Benchmarks/Olden/tsp/CMakeLists.txt Mon Nov  7 20:17:57 2016
@@ -1,10 +1,10 @@
 set(PROG tsp)
 list(APPEND CPPFLAGS -DTORONTO)
 list(APPEND LDFLAGS -lm)
-if(DEFINED LARGE_PROBLEM_SIZE)
+if(LARGE_PROBLEM_SIZE)
   set(RUN_OPTIONS 2048000)
 else()
-  if(DEFINED SMALL_PROBLEM_SIZE)
+  if(SMALL_PROBLEM_SIZE)
     set(RUN_OPTIONS 102400)
   else()
     set(RUN_OPTIONS 1024000)

Modified: test-suite/trunk/MultiSource/Benchmarks/Olden/voronoi/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/Benchmarks/Olden/voronoi/CMakeLists.txt?rev=286199&r1=286198&r2=286199&view=diff
==============================================================================
--- test-suite/trunk/MultiSource/Benchmarks/Olden/voronoi/CMakeLists.txt (original)
+++ test-suite/trunk/MultiSource/Benchmarks/Olden/voronoi/CMakeLists.txt Mon Nov  7 20:17:57 2016
@@ -2,10 +2,10 @@ set(PROG voronoi)
 set(INCLUDES defines.h)
 list(APPEND CPPFLAGS -DTORONTO)
 list(APPEND LDFLAGS -lm)
-if(DEFINED LARGE_PROBLEM_SIZE)
+if(LARGE_PROBLEM_SIZE)
   set(RUN_OPTIONS 1000000 20 32 7)
 else()
-  if(DEFINED SMALL_PROBLEM_SIZE)
+  if(SMALL_PROBLEM_SIZE)
     set(RUN_OPTIONS 10000 20 32 7)
   else()
     set(RUN_OPTIONS 100000 20 32 7)

Modified: test-suite/trunk/MultiSource/Benchmarks/PAQ8p/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/Benchmarks/PAQ8p/CMakeLists.txt?rev=286199&r1=286198&r2=286199&view=diff
==============================================================================
--- test-suite/trunk/MultiSource/Benchmarks/PAQ8p/CMakeLists.txt (original)
+++ test-suite/trunk/MultiSource/Benchmarks/PAQ8p/CMakeLists.txt Mon Nov  7 20:17:57 2016
@@ -1,7 +1,7 @@
 set(PROG paq8p)
 list(APPEND CPPFLAGS -DNOASM -DLLVM)
 list(APPEND LDFLAGS -lstdc++ -lm)
-if(DEFINED SMALL_PROBLEM_SIZE)
+if(SMALL_PROBLEM_SIZE)
   set(RUN_OPTIONS -1 ${CMAKE_CURRENT_SOURCE_DIR}/small.in)
 else()
   set(RUN_OPTIONS -4 ${CMAKE_CURRENT_SOURCE_DIR}/file1.in)

Modified: test-suite/trunk/MultiSource/Benchmarks/Ptrdist/ft/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/Benchmarks/Ptrdist/ft/CMakeLists.txt?rev=286199&r1=286198&r2=286199&view=diff
==============================================================================
--- test-suite/trunk/MultiSource/Benchmarks/Ptrdist/ft/CMakeLists.txt (original)
+++ test-suite/trunk/MultiSource/Benchmarks/Ptrdist/ft/CMakeLists.txt Mon Nov  7 20:17:57 2016
@@ -1,5 +1,5 @@
 set(PROG ft)
-if(DEFINED LARGE_PROBLEM_SIZE)
+if(LARGE_PROBLEM_SIZE)
   list(APPEND RUN_OPTIONS 6000 100000)
 else()
   list(APPEND RUN_OPTIONS 1500 100000)

Modified: test-suite/trunk/MultiSource/Benchmarks/SciMark2-C/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/Benchmarks/SciMark2-C/CMakeLists.txt?rev=286199&r1=286198&r2=286199&view=diff
==============================================================================
--- test-suite/trunk/MultiSource/Benchmarks/SciMark2-C/CMakeLists.txt (original)
+++ test-suite/trunk/MultiSource/Benchmarks/SciMark2-C/CMakeLists.txt Mon Nov  7 20:17:57 2016
@@ -1,6 +1,6 @@
 set(PROG scimark2)
 list(APPEND LDFLAGS -lm)
-if(DEFINED LARGE_PROBLEM_SIZE)
+if(LARGE_PROBLEM_SIZE)
   set(RUN_OPTIONS -large)
 endif()
 llvm_multisource()

Modified: test-suite/trunk/MultiSource/Benchmarks/Trimaran/enc-3des/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/Benchmarks/Trimaran/enc-3des/CMakeLists.txt?rev=286199&r1=286198&r2=286199&view=diff
==============================================================================
--- test-suite/trunk/MultiSource/Benchmarks/Trimaran/enc-3des/CMakeLists.txt (original)
+++ test-suite/trunk/MultiSource/Benchmarks/Trimaran/enc-3des/CMakeLists.txt Mon Nov  7 20:17:57 2016
@@ -1,8 +1,8 @@
 set(PROG enc-3des)
-if(DEFINED LARGE_PROBLEM_SIZE)
+if(LARGE_PROBLEM_SIZE)
   set(RUN_OPTIONS 200)
 else()
-  if(DEFINED SMALL_PROBLEM_SIZE)
+  if(SMALL_PROBLEM_SIZE)
     set(RUN_OPTIONS 10)
   else()
     set(RUN_OPTIONS 100)

Modified: test-suite/trunk/MultiSource/Benchmarks/Trimaran/enc-md5/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/Benchmarks/Trimaran/enc-md5/CMakeLists.txt?rev=286199&r1=286198&r2=286199&view=diff
==============================================================================
--- test-suite/trunk/MultiSource/Benchmarks/Trimaran/enc-md5/CMakeLists.txt (original)
+++ test-suite/trunk/MultiSource/Benchmarks/Trimaran/enc-md5/CMakeLists.txt Mon Nov  7 20:17:57 2016
@@ -1,8 +1,8 @@
 set(PROG enc-md5)
-if(DEFINED LARGE_PROBLEM_SIZE)
+if(LARGE_PROBLEM_SIZE)
   set(RUN_OPTIONS 50)
 else()
-  if(DEFINED SMALL_PROBLEM_SIZE)
+  if(SMALL_PROBLEM_SIZE)
     set(RUN_OPTIONS 1)
   else()
     set(RUN_OPTIONS 10)

Modified: test-suite/trunk/MultiSource/Benchmarks/Trimaran/enc-pc1/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/Benchmarks/Trimaran/enc-pc1/CMakeLists.txt?rev=286199&r1=286198&r2=286199&view=diff
==============================================================================
--- test-suite/trunk/MultiSource/Benchmarks/Trimaran/enc-pc1/CMakeLists.txt (original)
+++ test-suite/trunk/MultiSource/Benchmarks/Trimaran/enc-pc1/CMakeLists.txt Mon Nov  7 20:17:57 2016
@@ -1,8 +1,8 @@
 set(PROG enc-pc1)
-if(DEFINED LARGE_PROBLEM_SIZE)
+if(LARGE_PROBLEM_SIZE)
   set(RUN_OPTIONS 20000000)
 else()
-  if(DEFINED SMALL_PROBLEM_SIZE)
+  if(SMALL_PROBLEM_SIZE)
     set(RUN_OPTIONS 1000000)
   else()
     set(RUN_OPTIONS 5000000)

Modified: test-suite/trunk/MultiSource/Benchmarks/Trimaran/enc-rc4/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/Benchmarks/Trimaran/enc-rc4/CMakeLists.txt?rev=286199&r1=286198&r2=286199&view=diff
==============================================================================
--- test-suite/trunk/MultiSource/Benchmarks/Trimaran/enc-rc4/CMakeLists.txt (original)
+++ test-suite/trunk/MultiSource/Benchmarks/Trimaran/enc-rc4/CMakeLists.txt Mon Nov  7 20:17:57 2016
@@ -1,8 +1,8 @@
 set(PROG enc-rc4)
-if(DEFINED LARGE_PROBLEM_SIZE)
+if(LARGE_PROBLEM_SIZE)
   set(RUN_OPTIONS 1000000)
 else()
-  if(DEFINED SMALL_PROBLEM_SIZE)
+  if(SMALL_PROBLEM_SIZE)
     set(RUN_OPTIONS 2000)
   else()
     set(RUN_OPTIONS 200000)

Modified: test-suite/trunk/MultiSource/Benchmarks/Trimaran/netbench-crc/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/Benchmarks/Trimaran/netbench-crc/CMakeLists.txt?rev=286199&r1=286198&r2=286199&view=diff
==============================================================================
--- test-suite/trunk/MultiSource/Benchmarks/Trimaran/netbench-crc/CMakeLists.txt (original)
+++ test-suite/trunk/MultiSource/Benchmarks/Trimaran/netbench-crc/CMakeLists.txt Mon Nov  7 20:17:57 2016
@@ -1,8 +1,8 @@
 set(PROG netbench-crc)
-if(DEFINED LARGE_PROBLEM_SIZE)
+if(LARGE_PROBLEM_SIZE)
   set(RUN_OPTIONS 40000)
 else()
-  if(DEFINED SMALL_PROBLEM_SIZE)
+  if(SMALL_PROBLEM_SIZE)
     set(RUN_OPTIONS 1000)
   else()
     set(RUN_OPTIONS 12000)

Modified: test-suite/trunk/MultiSource/Benchmarks/Trimaran/netbench-url/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/Benchmarks/Trimaran/netbench-url/CMakeLists.txt?rev=286199&r1=286198&r2=286199&view=diff
==============================================================================
--- test-suite/trunk/MultiSource/Benchmarks/Trimaran/netbench-url/CMakeLists.txt (original)
+++ test-suite/trunk/MultiSource/Benchmarks/Trimaran/netbench-url/CMakeLists.txt Mon Nov  7 20:17:57 2016
@@ -1,8 +1,8 @@
 set(PROG netbench-url)
-if(DEFINED LARGE_PROBLEM_SIZE)
+if(LARGE_PROBLEM_SIZE)
   set(RUN_OPTIONS ${CMAKE_CURRENT_SOURCE_DIR}/medium_inputs 1400)
 else()
-  if(DEFINED SMALL_PROBLEM_SIZE)
+  if(SMALL_PROBLEM_SIZE)
     set(RUN_OPTIONS ${CMAKE_CURRENT_SOURCE_DIR}/medium_inputs 100)
   else()
     set(RUN_OPTIONS ${CMAKE_CURRENT_SOURCE_DIR}/medium_inputs 900)

Modified: test-suite/trunk/MultiSource/Benchmarks/VersaBench/8b10b/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/Benchmarks/VersaBench/8b10b/CMakeLists.txt?rev=286199&r1=286198&r2=286199&view=diff
==============================================================================
--- test-suite/trunk/MultiSource/Benchmarks/VersaBench/8b10b/CMakeLists.txt (original)
+++ test-suite/trunk/MultiSource/Benchmarks/VersaBench/8b10b/CMakeLists.txt Mon Nov  7 20:17:57 2016
@@ -1,5 +1,5 @@
 set(PROG 8b10b)
-if(DEFINED SMALL_PROBLEM_SIZE)
+if(SMALL_PROBLEM_SIZE)
   set(RUN_OPTIONS ${CMAKE_CURRENT_SOURCE_DIR}/input.txt 2000)
 else()
   set(RUN_OPTIONS ${CMAKE_CURRENT_SOURCE_DIR}/input.txt 20000)

Modified: test-suite/trunk/MultiSource/Benchmarks/VersaBench/beamformer/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/Benchmarks/VersaBench/beamformer/CMakeLists.txt?rev=286199&r1=286198&r2=286199&view=diff
==============================================================================
--- test-suite/trunk/MultiSource/Benchmarks/VersaBench/beamformer/CMakeLists.txt (original)
+++ test-suite/trunk/MultiSource/Benchmarks/VersaBench/beamformer/CMakeLists.txt Mon Nov  7 20:17:57 2016
@@ -1,9 +1,9 @@
 list(APPEND LDFLAGS -lm)
 set(PROG beamformer)
-if(DEFINED LARGE_PROBLEM_SIZE)
+if(LARGE_PROBLEM_SIZE)
   set(RUN_OPTIONS -i 400)
 else()
-  if(DEFINED SMALL_PROBLEM_SIZE)
+  if(SMALL_PROBLEM_SIZE)
     set(RUN_OPTIONS -i 25)
   else()
     set(RUN_OPTIONS -i 140)

Modified: test-suite/trunk/MultiSource/Benchmarks/VersaBench/bmm/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/Benchmarks/VersaBench/bmm/CMakeLists.txt?rev=286199&r1=286198&r2=286199&view=diff
==============================================================================
--- test-suite/trunk/MultiSource/Benchmarks/VersaBench/bmm/CMakeLists.txt (original)
+++ test-suite/trunk/MultiSource/Benchmarks/VersaBench/bmm/CMakeLists.txt Mon Nov  7 20:17:57 2016
@@ -1,8 +1,8 @@
 set(PROG bmm)
-if(DEFINED LARGE_PROBLEM_SIZE)
+if(LARGE_PROBLEM_SIZE)
   set(RUN_OPTIONS 1024 1024)
 else()
-  if(DEFINED SMALL_PROBLEM_SIZE)
+  if(SMALL_PROBLEM_SIZE)
     set(RUN_OPTIONS 128 32)
   else()
     set(RUN_OPTIONS 1024 64)

Modified: test-suite/trunk/MultiSource/Benchmarks/VersaBench/dbms/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/Benchmarks/VersaBench/dbms/CMakeLists.txt?rev=286199&r1=286198&r2=286199&view=diff
==============================================================================
--- test-suite/trunk/MultiSource/Benchmarks/VersaBench/dbms/CMakeLists.txt (original)
+++ test-suite/trunk/MultiSource/Benchmarks/VersaBench/dbms/CMakeLists.txt Mon Nov  7 20:17:57 2016
@@ -1,6 +1,6 @@
 set(PROG dbms)
 list(APPEND LDFLAGS -lm)
-if(DEFINED SMALL_PROBLEM_SIZE)
+if(SMALL_PROBLEM_SIZE)
   set(RUN_OPTIONS -i ${CMAKE_CURRENT_SOURCE_DIR}/dbms.train.in)
 else()
   set(RUN_OPTIONS -i ${CMAKE_CURRENT_SOURCE_DIR}/dbms.ref.in)

Modified: test-suite/trunk/MultiSource/Benchmarks/VersaBench/ecbdes/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/Benchmarks/VersaBench/ecbdes/CMakeLists.txt?rev=286199&r1=286198&r2=286199&view=diff
==============================================================================
--- test-suite/trunk/MultiSource/Benchmarks/VersaBench/ecbdes/CMakeLists.txt (original)
+++ test-suite/trunk/MultiSource/Benchmarks/VersaBench/ecbdes/CMakeLists.txt Mon Nov  7 20:17:57 2016
@@ -1,8 +1,8 @@
 set(PROG ecbdes)
-if(DEFINED LARGE_PROBLEM_SIZE)
+if(LARGE_PROBLEM_SIZE)
   set(RUN_OPTIONS 34)
 else()
-  if(DEFINED SMALL_PROBLEM_SIZE)
+  if(SMALL_PROBLEM_SIZE)
     set(RUN_OPTIONS 4)
   else()
     set(RUN_OPTIONS 16)

Modified: test-suite/trunk/MultiSource/Benchmarks/llubenchmark/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/Benchmarks/llubenchmark/CMakeLists.txt?rev=286199&r1=286198&r2=286199&view=diff
==============================================================================
--- test-suite/trunk/MultiSource/Benchmarks/llubenchmark/CMakeLists.txt (original)
+++ test-suite/trunk/MultiSource/Benchmarks/llubenchmark/CMakeLists.txt Mon Nov  7 20:17:57 2016
@@ -1,5 +1,5 @@
 set(PROG llu)
-if(DEFINED LARGE_PROBLEM_SIZE)
+if(LARGE_PROBLEM_SIZE)
   set(RUN_OPTIONS -i 6000)
 else()
   set(RUN_OPTIONS -i 3000)

Modified: test-suite/trunk/MultiSource/Benchmarks/tramp3d-v4/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/Benchmarks/tramp3d-v4/CMakeLists.txt?rev=286199&r1=286198&r2=286199&view=diff
==============================================================================
--- test-suite/trunk/MultiSource/Benchmarks/tramp3d-v4/CMakeLists.txt (original)
+++ test-suite/trunk/MultiSource/Benchmarks/tramp3d-v4/CMakeLists.txt Mon Nov  7 20:17:57 2016
@@ -1,7 +1,7 @@
 set(PROG tramp3d-v4)
 list(APPEND CXXFLAGS -fno-exceptions)
 list(APPEND LDFLAGS -lstdc++)
-if(DEFINED SMALL_PROBLEM_SIZE)
+if(SMALL_PROBLEM_SIZE)
   set(RUN_OPTIONS --cartvis 1.0 0.0 --rhomin 1e-8 -n 4 --domain 32 32 32)
 else()
   set(RUN_OPTIONS --cartvis 1.0 0.0 --rhomin 1e-8 -n 10 --domain 32 32 32)

Modified: test-suite/trunk/SingleSource/Benchmarks/Polybench/datamining/correlation/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/SingleSource/Benchmarks/Polybench/datamining/correlation/CMakeLists.txt?rev=286199&r1=286198&r2=286199&view=diff
==============================================================================
--- test-suite/trunk/SingleSource/Benchmarks/Polybench/datamining/correlation/CMakeLists.txt (original)
+++ test-suite/trunk/SingleSource/Benchmarks/Polybench/datamining/correlation/CMakeLists.txt Mon Nov  7 20:17:57 2016
@@ -1,7 +1,7 @@
 set(POLYBENCH_UTILS SingleSource/Benchmarks/Polybench/utilities )
 set(PROG correlation)
 list(APPEND CFLAGS -I ${CMAKE_SOURCE_DIR}/${POLYBENCH_UTILS} -DPOLYBENCH_DUMP_ARRAYS)
-if(DEFINED SMALL_PROBLEM_SIZE)
+if(SMALL_PROBLEM_SIZE)
   list(APPEND CFLAGS -DSMALL_DATASET)
 endif()
 set(HASH_PROGRAM_OUTPUT 1)

Modified: test-suite/trunk/SingleSource/Benchmarks/Polybench/datamining/covariance/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/SingleSource/Benchmarks/Polybench/datamining/covariance/CMakeLists.txt?rev=286199&r1=286198&r2=286199&view=diff
==============================================================================
--- test-suite/trunk/SingleSource/Benchmarks/Polybench/datamining/covariance/CMakeLists.txt (original)
+++ test-suite/trunk/SingleSource/Benchmarks/Polybench/datamining/covariance/CMakeLists.txt Mon Nov  7 20:17:57 2016
@@ -1,7 +1,7 @@
 set(POLYBENCH_UTILS SingleSource/Benchmarks/Polybench/utilities )
 set(PROG covariance)
 list(APPEND CFLAGS -I ${CMAKE_SOURCE_DIR}/${POLYBENCH_UTILS} -DPOLYBENCH_DUMP_ARRAYS)
-if(DEFINED SMALL_PROBLEM_SIZE)
+if(SMALL_PROBLEM_SIZE)
   list(APPEND CFLAGS -DSMALL_DATASET)
 endif()
 set(HASH_PROGRAM_OUTPUT 1)

Modified: test-suite/trunk/SingleSource/Benchmarks/Polybench/linear-algebra/kernels/2mm/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/SingleSource/Benchmarks/Polybench/linear-algebra/kernels/2mm/CMakeLists.txt?rev=286199&r1=286198&r2=286199&view=diff
==============================================================================
--- test-suite/trunk/SingleSource/Benchmarks/Polybench/linear-algebra/kernels/2mm/CMakeLists.txt (original)
+++ test-suite/trunk/SingleSource/Benchmarks/Polybench/linear-algebra/kernels/2mm/CMakeLists.txt Mon Nov  7 20:17:57 2016
@@ -1,7 +1,7 @@
 set(POLYBENCH_UTILS SingleSource/Benchmarks/Polybench/utilities )
 set(PROG 2mm)
 list(APPEND CFLAGS -I ${CMAKE_SOURCE_DIR}/${POLYBENCH_UTILS} -DPOLYBENCH_DUMP_ARRAYS)
-if(DEFINED SMALL_PROBLEM_SIZE)
+if(SMALL_PROBLEM_SIZE)
   list(APPEND CFLAGS -DSMALL_DATASET)
 else()
   if(ARCH STREQUAL "XCore")

Modified: test-suite/trunk/SingleSource/Benchmarks/Polybench/linear-algebra/kernels/3mm/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/SingleSource/Benchmarks/Polybench/linear-algebra/kernels/3mm/CMakeLists.txt?rev=286199&r1=286198&r2=286199&view=diff
==============================================================================
--- test-suite/trunk/SingleSource/Benchmarks/Polybench/linear-algebra/kernels/3mm/CMakeLists.txt (original)
+++ test-suite/trunk/SingleSource/Benchmarks/Polybench/linear-algebra/kernels/3mm/CMakeLists.txt Mon Nov  7 20:17:57 2016
@@ -1,7 +1,7 @@
 set(POLYBENCH_UTILS SingleSource/Benchmarks/Polybench/utilities )
 set(PROG 3mm)
 list(APPEND CFLAGS -I ${CMAKE_SOURCE_DIR}/${POLYBENCH_UTILS} -DPOLYBENCH_DUMP_ARRAYS)
-if(DEFINED SMALL_PROBLEM_SIZE)
+if(SMALL_PROBLEM_SIZE)
   list(APPEND CFLAGS -DSMALL_DATASET)
 else()
   if(ARCH STREQUAL "XCore")

Modified: test-suite/trunk/SingleSource/Benchmarks/Polybench/linear-algebra/kernels/cholesky/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/SingleSource/Benchmarks/Polybench/linear-algebra/kernels/cholesky/CMakeLists.txt?rev=286199&r1=286198&r2=286199&view=diff
==============================================================================
--- test-suite/trunk/SingleSource/Benchmarks/Polybench/linear-algebra/kernels/cholesky/CMakeLists.txt (original)
+++ test-suite/trunk/SingleSource/Benchmarks/Polybench/linear-algebra/kernels/cholesky/CMakeLists.txt Mon Nov  7 20:17:57 2016
@@ -1,7 +1,7 @@
 set(POLYBENCH_UTILS SingleSource/Benchmarks/Polybench/utilities )
 set(PROG cholesky)
 list(APPEND CFLAGS -I ${CMAKE_SOURCE_DIR}/${POLYBENCH_UTILS} -DPOLYBENCH_DUMP_ARRAYS)
-if(DEFINED SMALL_PROBLEM_SIZE)
+if(SMALL_PROBLEM_SIZE)
   list(APPEND CFLAGS -DSMALL_DATASET)
 endif()
 set(HASH_PROGRAM_OUTPUT 1)

Modified: test-suite/trunk/SingleSource/Benchmarks/Polybench/linear-algebra/kernels/doitgen/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/SingleSource/Benchmarks/Polybench/linear-algebra/kernels/doitgen/CMakeLists.txt?rev=286199&r1=286198&r2=286199&view=diff
==============================================================================
--- test-suite/trunk/SingleSource/Benchmarks/Polybench/linear-algebra/kernels/doitgen/CMakeLists.txt (original)
+++ test-suite/trunk/SingleSource/Benchmarks/Polybench/linear-algebra/kernels/doitgen/CMakeLists.txt Mon Nov  7 20:17:57 2016
@@ -1,7 +1,7 @@
 set(POLYBENCH_UTILS SingleSource/Benchmarks/Polybench/utilities )
 set(PROG doitgen)
 list(APPEND CFLAGS -I ${CMAKE_SOURCE_DIR}/${POLYBENCH_UTILS} -DPOLYBENCH_DUMP_ARRAYS)
-if(DEFINED SMALL_PROBLEM_SIZE)
+if(SMALL_PROBLEM_SIZE)
   list(APPEND CFLAGS -DSMALL_DATASET)
 else()
   if(ARCH STREQUAL "XCore")

Modified: test-suite/trunk/SingleSource/Benchmarks/Polybench/linear-algebra/kernels/gemm/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/SingleSource/Benchmarks/Polybench/linear-algebra/kernels/gemm/CMakeLists.txt?rev=286199&r1=286198&r2=286199&view=diff
==============================================================================
--- test-suite/trunk/SingleSource/Benchmarks/Polybench/linear-algebra/kernels/gemm/CMakeLists.txt (original)
+++ test-suite/trunk/SingleSource/Benchmarks/Polybench/linear-algebra/kernels/gemm/CMakeLists.txt Mon Nov  7 20:17:57 2016
@@ -1,7 +1,7 @@
 set(POLYBENCH_UTILS SingleSource/Benchmarks/Polybench/utilities )
 set(PROG gemm)
 list(APPEND CFLAGS -I ${CMAKE_SOURCE_DIR}/${POLYBENCH_UTILS} -DPOLYBENCH_DUMP_ARRAYS)
-if(DEFINED SMALL_PROBLEM_SIZE)
+if(SMALL_PROBLEM_SIZE)
   list(APPEND CFLAGS -DSMALL_DATASET)
 endif()
 set(HASH_PROGRAM_OUTPUT 1)

Modified: test-suite/trunk/SingleSource/Benchmarks/Polybench/linear-algebra/kernels/gesummv/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/SingleSource/Benchmarks/Polybench/linear-algebra/kernels/gesummv/CMakeLists.txt?rev=286199&r1=286198&r2=286199&view=diff
==============================================================================
--- test-suite/trunk/SingleSource/Benchmarks/Polybench/linear-algebra/kernels/gesummv/CMakeLists.txt (original)
+++ test-suite/trunk/SingleSource/Benchmarks/Polybench/linear-algebra/kernels/gesummv/CMakeLists.txt Mon Nov  7 20:17:57 2016
@@ -1,7 +1,7 @@
 set(POLYBENCH_UTILS SingleSource/Benchmarks/Polybench/utilities )
 set(PROG gesummv)
 list(APPEND CFLAGS -I ${CMAKE_SOURCE_DIR}/${POLYBENCH_UTILS} -DPOLYBENCH_DUMP_ARRAYS)
-if(DEFINED SMALL_PROBLEM_SIZE)
+if(SMALL_PROBLEM_SIZE)
   list(APPEND CFLAGS -DSMALL_DATASET)
 else()
   if(ARCH STREQUAL "XCore")

Modified: test-suite/trunk/SingleSource/Benchmarks/Polybench/linear-algebra/kernels/symm/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/SingleSource/Benchmarks/Polybench/linear-algebra/kernels/symm/CMakeLists.txt?rev=286199&r1=286198&r2=286199&view=diff
==============================================================================
--- test-suite/trunk/SingleSource/Benchmarks/Polybench/linear-algebra/kernels/symm/CMakeLists.txt (original)
+++ test-suite/trunk/SingleSource/Benchmarks/Polybench/linear-algebra/kernels/symm/CMakeLists.txt Mon Nov  7 20:17:57 2016
@@ -1,7 +1,7 @@
 set(POLYBENCH_UTILS SingleSource/Benchmarks/Polybench/utilities )
 set(PROG symm)
 list(APPEND CFLAGS -I ${CMAKE_SOURCE_DIR}/${POLYBENCH_UTILS} -DPOLYBENCH_DUMP_ARRAYS)
-if(DEFINED SMALL_PROBLEM_SIZE)
+if(SMALL_PROBLEM_SIZE)
   list(APPEND CFLAGS -DSMALL_DATASET)
 endif()
 set(HASH_PROGRAM_OUTPUT 1)

Modified: test-suite/trunk/SingleSource/Benchmarks/Polybench/linear-algebra/kernels/syr2k/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/SingleSource/Benchmarks/Polybench/linear-algebra/kernels/syr2k/CMakeLists.txt?rev=286199&r1=286198&r2=286199&view=diff
==============================================================================
--- test-suite/trunk/SingleSource/Benchmarks/Polybench/linear-algebra/kernels/syr2k/CMakeLists.txt (original)
+++ test-suite/trunk/SingleSource/Benchmarks/Polybench/linear-algebra/kernels/syr2k/CMakeLists.txt Mon Nov  7 20:17:57 2016
@@ -1,7 +1,7 @@
 set(POLYBENCH_UTILS SingleSource/Benchmarks/Polybench/utilities )
 set(PROG syr2k)
 list(APPEND CFLAGS -I ${CMAKE_SOURCE_DIR}/${POLYBENCH_UTILS} -DPOLYBENCH_DUMP_ARRAYS)
-if(DEFINED SMALL_PROBLEM_SIZE)
+if(SMALL_PROBLEM_SIZE)
   list(APPEND CFLAGS -DSMALL_DATASET)
 endif()
 set(HASH_PROGRAM_OUTPUT 1)

Modified: test-suite/trunk/SingleSource/Benchmarks/Polybench/linear-algebra/kernels/syrk/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/SingleSource/Benchmarks/Polybench/linear-algebra/kernels/syrk/CMakeLists.txt?rev=286199&r1=286198&r2=286199&view=diff
==============================================================================
--- test-suite/trunk/SingleSource/Benchmarks/Polybench/linear-algebra/kernels/syrk/CMakeLists.txt (original)
+++ test-suite/trunk/SingleSource/Benchmarks/Polybench/linear-algebra/kernels/syrk/CMakeLists.txt Mon Nov  7 20:17:57 2016
@@ -1,7 +1,7 @@
 set(POLYBENCH_UTILS SingleSource/Benchmarks/Polybench/utilities )
 set(PROG syrk)
 list(APPEND CFLAGS -I ${CMAKE_SOURCE_DIR}/${POLYBENCH_UTILS} -DPOLYBENCH_DUMP_ARRAYS)
-if(DEFINED SMALL_PROBLEM_SIZE)
+if(SMALL_PROBLEM_SIZE)
   list(APPEND CFLAGS -DSMALL_DATASET)
 endif()
 set(HASH_PROGRAM_OUTPUT 1)

Modified: test-suite/trunk/SingleSource/Benchmarks/Polybench/linear-algebra/kernels/trmm/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/SingleSource/Benchmarks/Polybench/linear-algebra/kernels/trmm/CMakeLists.txt?rev=286199&r1=286198&r2=286199&view=diff
==============================================================================
--- test-suite/trunk/SingleSource/Benchmarks/Polybench/linear-algebra/kernels/trmm/CMakeLists.txt (original)
+++ test-suite/trunk/SingleSource/Benchmarks/Polybench/linear-algebra/kernels/trmm/CMakeLists.txt Mon Nov  7 20:17:57 2016
@@ -1,7 +1,7 @@
 set(POLYBENCH_UTILS SingleSource/Benchmarks/Polybench/utilities )
 set(PROG trmm)
 list(APPEND CFLAGS -I ${CMAKE_SOURCE_DIR}/${POLYBENCH_UTILS} -DPOLYBENCH_DUMP_ARRAYS)
-if(DEFINED SMALL_PROBLEM_SIZE)
+if(SMALL_PROBLEM_SIZE)
   list(APPEND CFLAGS -DSMALL_DATASET)
 endif()
 set(HASH_PROGRAM_OUTPUT 1)

Modified: test-suite/trunk/SingleSource/Benchmarks/Polybench/linear-algebra/solvers/gramschmidt/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/SingleSource/Benchmarks/Polybench/linear-algebra/solvers/gramschmidt/CMakeLists.txt?rev=286199&r1=286198&r2=286199&view=diff
==============================================================================
--- test-suite/trunk/SingleSource/Benchmarks/Polybench/linear-algebra/solvers/gramschmidt/CMakeLists.txt (original)
+++ test-suite/trunk/SingleSource/Benchmarks/Polybench/linear-algebra/solvers/gramschmidt/CMakeLists.txt Mon Nov  7 20:17:57 2016
@@ -1,7 +1,7 @@
 set(POLYBENCH_UTILS SingleSource/Benchmarks/Polybench/utilities )
 set(PROG gramschmidt)
 list(APPEND CFLAGS -I ${CMAKE_SOURCE_DIR}/${POLYBENCH_UTILS} -DPOLYBENCH_DUMP_ARRAYS)
-if(DEFINED SMALL_PROBLEM_SIZE)
+if(SMALL_PROBLEM_SIZE)
   list(APPEND CFLAGS -DSMALL_DATASET)
 endif()
 set(HASH_PROGRAM_OUTPUT 1)

Modified: test-suite/trunk/SingleSource/Benchmarks/Polybench/medley/floyd-warshall/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/SingleSource/Benchmarks/Polybench/medley/floyd-warshall/CMakeLists.txt?rev=286199&r1=286198&r2=286199&view=diff
==============================================================================
--- test-suite/trunk/SingleSource/Benchmarks/Polybench/medley/floyd-warshall/CMakeLists.txt (original)
+++ test-suite/trunk/SingleSource/Benchmarks/Polybench/medley/floyd-warshall/CMakeLists.txt Mon Nov  7 20:17:57 2016
@@ -1,7 +1,7 @@
 set(POLYBENCH_UTILS SingleSource/Benchmarks/Polybench/utilities )
 set(PROG floyd-warshall)
 list(APPEND CFLAGS -I ${CMAKE_SOURCE_DIR}/${POLYBENCH_UTILS} -DPOLYBENCH_DUMP_ARRAYS)
-if(DEFINED SMALL_PROBLEM_SIZE)
+if(SMALL_PROBLEM_SIZE)
   list(APPEND CFLAGS -DSMALL_DATASET)
 endif()
 set(HASH_PROGRAM_OUTPUT 1)

Modified: test-suite/trunk/SingleSource/Benchmarks/Polybench/stencils/adi/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/SingleSource/Benchmarks/Polybench/stencils/adi/CMakeLists.txt?rev=286199&r1=286198&r2=286199&view=diff
==============================================================================
--- test-suite/trunk/SingleSource/Benchmarks/Polybench/stencils/adi/CMakeLists.txt (original)
+++ test-suite/trunk/SingleSource/Benchmarks/Polybench/stencils/adi/CMakeLists.txt Mon Nov  7 20:17:57 2016
@@ -1,7 +1,7 @@
 set(POLYBENCH_UTILS SingleSource/Benchmarks/Polybench/utilities )
 set(PROG adi)
 list(APPEND CFLAGS -I ${CMAKE_SOURCE_DIR}/${POLYBENCH_UTILS} -DPOLYBENCH_DUMP_ARRAYS)
-if(DEFINED SMALL_PROBLEM_SIZE)
+if(SMALL_PROBLEM_SIZE)
   list(APPEND CFLAGS -DSMALL_DATASET)
 endif()
 set(HASH_PROGRAM_OUTPUT 1)

Modified: test-suite/trunk/SingleSource/Benchmarks/Polybench/stencils/fdtd-2d/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/SingleSource/Benchmarks/Polybench/stencils/fdtd-2d/CMakeLists.txt?rev=286199&r1=286198&r2=286199&view=diff
==============================================================================
--- test-suite/trunk/SingleSource/Benchmarks/Polybench/stencils/fdtd-2d/CMakeLists.txt (original)
+++ test-suite/trunk/SingleSource/Benchmarks/Polybench/stencils/fdtd-2d/CMakeLists.txt Mon Nov  7 20:17:57 2016
@@ -1,7 +1,7 @@
 set(POLYBENCH_UTILS SingleSource/Benchmarks/Polybench/utilities )
 set(PROG fdtd-2d)
 list(APPEND CFLAGS -I ${CMAKE_SOURCE_DIR}/${POLYBENCH_UTILS} -DPOLYBENCH_DUMP_ARRAYS)
-if(DEFINED SMALL_PROBLEM_SIZE)
+if(SMALL_PROBLEM_SIZE)
   list(APPEND CFLAGS -DSMALL_DATASET)
 endif()
 set(HASH_PROGRAM_OUTPUT 1)

Modified: test-suite/trunk/SingleSource/Benchmarks/Polybench/stencils/fdtd-apml/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/SingleSource/Benchmarks/Polybench/stencils/fdtd-apml/CMakeLists.txt?rev=286199&r1=286198&r2=286199&view=diff
==============================================================================
--- test-suite/trunk/SingleSource/Benchmarks/Polybench/stencils/fdtd-apml/CMakeLists.txt (original)
+++ test-suite/trunk/SingleSource/Benchmarks/Polybench/stencils/fdtd-apml/CMakeLists.txt Mon Nov  7 20:17:57 2016
@@ -1,7 +1,7 @@
 set(POLYBENCH_UTILS SingleSource/Benchmarks/Polybench/utilities )
 set(PROG fdtd-apml)
 list(APPEND CFLAGS -I ${CMAKE_SOURCE_DIR}/${POLYBENCH_UTILS} -DPOLYBENCH_DUMP_ARRAYS)
-if(DEFINED SMALL_PROBLEM_SIZE)
+if(SMALL_PROBLEM_SIZE)
   list(APPEND CFLAGS -DSMALL_DATASET)
 endif()
 set(HASH_PROGRAM_OUTPUT 1)

Modified: test-suite/trunk/SingleSource/Benchmarks/Polybench/stencils/jacobi-2d-imper/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/SingleSource/Benchmarks/Polybench/stencils/jacobi-2d-imper/CMakeLists.txt?rev=286199&r1=286198&r2=286199&view=diff
==============================================================================
--- test-suite/trunk/SingleSource/Benchmarks/Polybench/stencils/jacobi-2d-imper/CMakeLists.txt (original)
+++ test-suite/trunk/SingleSource/Benchmarks/Polybench/stencils/jacobi-2d-imper/CMakeLists.txt Mon Nov  7 20:17:57 2016
@@ -1,7 +1,7 @@
 set(POLYBENCH_UTILS SingleSource/Benchmarks/Polybench/utilities )
 set(PROG jacobi-2d-imper)
 list(APPEND CFLAGS -I ${CMAKE_SOURCE_DIR}/${POLYBENCH_UTILS} -DPOLYBENCH_DUMP_ARRAYS)
-if(DEFINED SMALL_PROBLEM_SIZE)
+if(SMALL_PROBLEM_SIZE)
   list(APPEND CFLAGS -DSMALL_DATASET)
 endif()
 set(HASH_PROGRAM_OUTPUT 1)

Modified: test-suite/trunk/SingleSource/Benchmarks/Polybench/stencils/seidel-2d/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/SingleSource/Benchmarks/Polybench/stencils/seidel-2d/CMakeLists.txt?rev=286199&r1=286198&r2=286199&view=diff
==============================================================================
--- test-suite/trunk/SingleSource/Benchmarks/Polybench/stencils/seidel-2d/CMakeLists.txt (original)
+++ test-suite/trunk/SingleSource/Benchmarks/Polybench/stencils/seidel-2d/CMakeLists.txt Mon Nov  7 20:17:57 2016
@@ -1,7 +1,7 @@
 set(POLYBENCH_UTILS SingleSource/Benchmarks/Polybench/utilities )
 set(PROG seidel-2d)
 list(APPEND CFLAGS -I ${CMAKE_SOURCE_DIR}/${POLYBENCH_UTILS} -DPOLYBENCH_DUMP_ARRAYS)
-if(DEFINED SMALL_PROBLEM_SIZE)
+if(SMALL_PROBLEM_SIZE)
   list(APPEND CFLAGS -DSMALL_DATASET)
 endif()
 set(HASH_PROGRAM_OUTPUT 1)

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=286199&r1=286198&r2=286199&view=diff
==============================================================================
--- test-suite/trunk/SingleSource/Regression/C/CMakeLists.txt (original)
+++ test-suite/trunk/SingleSource/Regression/C/CMakeLists.txt Mon Nov  7 20:17:57 2016
@@ -1,5 +1,5 @@
 if(ARCH STREQUAL "x86")
-  if(DEFINED USE_REFERENCE_OUTPUT)
+  if(USE_REFERENCE_OUTPUT)
     set(EXEC_XFAILS casts)
   endif()
 endif()

Modified: test-suite/trunk/SingleSource/UnitTests/SignlessTypes/Large/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/SingleSource/UnitTests/SignlessTypes/Large/CMakeLists.txt?rev=286199&r1=286198&r2=286199&view=diff
==============================================================================
--- test-suite/trunk/SingleSource/UnitTests/SignlessTypes/Large/CMakeLists.txt (original)
+++ test-suite/trunk/SingleSource/UnitTests/SignlessTypes/Large/CMakeLists.txt Mon Nov  7 20:17:57 2016
@@ -2,7 +2,7 @@ set(RUN_OPTIONS 31415926)
 list(APPEND LDFLAGS -lstdc++)
 set(HASH_PROGRAM_OUTPUT 1)
 if(ARCH STREQUAL "x86")
-  if(DEFINED USE_REFERENCE_OUTPUT)
+  if(USE_REFERENCE_OUTPUT)
     set(EXEC_XFAILS cast)
   endif()
 endif()

Modified: test-suite/trunk/cmake/modules/SingleMultiSource.cmake
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/cmake/modules/SingleMultiSource.cmake?rev=286199&r1=286198&r2=286199&view=diff
==============================================================================
--- test-suite/trunk/cmake/modules/SingleMultiSource.cmake (original)
+++ test-suite/trunk/cmake/modules/SingleMultiSource.cmake Mon Nov  7 20:17:57 2016
@@ -73,7 +73,7 @@ endmacro()
 # SMALL_PROBLEM_SIZE, HASH_PROGRAM_OUTPUT, etc.
 # Create llvm_test_run() and llvm_test_verify() invocation for that.
 function(llvm_test_traditional testfile executable name)
-  if(DEFINED STDIN_FILENAME)
+  if(STDIN_FILENAME)
     list(APPEND RUN_OPTIONS "< ${STDIN_FILENAME}")
   endif()
   if(WORKDIR)
@@ -86,7 +86,7 @@ function(llvm_test_traditional testfile
     llvm_test_verify("${CMAKE_SOURCE_DIR}/HashProgramOutput.sh %o")
   endif()
 
-  if(NOT DEFINED PROGRAM_IS_NONDETERMINISTIC)
+  if(NOT PROGRAM_IS_NONDETERMINISTIC)
     # Find the reference output file key name.
     if(SMALL_PROBLEM_SIZE)
       set(KEY small)
@@ -97,7 +97,7 @@ function(llvm_test_traditional testfile
     endif()
 
     # Pick the best reference output based on "programname.reference_output".
-    if(NOT DEFINED NO_REFERENCE_OUTPUT)
+    if(NOT NO_REFERENCE_OUTPUT)
       if(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/${name}.reference_output.${ENDIAN}-endian.${KEY})
         set(REFERENCE_OUTPUT ${CMAKE_CURRENT_SOURCE_DIR}/${name}.reference_output.${ENDIAN}-endian.${KEY})
       elseif(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/${name}.reference_output.${KEY})
@@ -112,10 +112,10 @@ function(llvm_test_traditional testfile
     endif()
 
     set(DIFFPROG ${CMAKE_BINARY_DIR}/tools/fpcmp)
-    if(DEFINED FP_TOLERANCE)
+    if(FP_TOLERANCE)
       set(DIFFPROG "${DIFFPROG} -r ${FP_TOLERANCE}")
     endif()
-    if(DEFINED FP_ABSTOLERANCE)
+    if(FP_ABSTOLERANCE)
       set(DIFFPROG "${DIFFPROG} -a ${FP_ABSTOLERANCE}")
     endif()
     if(REFERENCE_OUTPUT)
@@ -203,7 +203,7 @@ macro(llvm_multisource)
   endif()
   list(LENGTH sources sources_len)
 
-  if(sources_len GREATER 0 AND DEFINED PROG)
+  if(sources_len GREATER 0 AND PROG)
     set(executable ${PROG})
     llvm_test_executable(${executable} ${sources}
       PREFIX ${_LMARG_PREFIX}




More information about the llvm-commits mailing list