[test-suite] r257681 - CMakeLists: Manually cleanup remaining llvm_add_subdirectories() usage, NFC

Matthias Braun via llvm-commits llvm-commits at lists.llvm.org
Wed Jan 13 13:53:56 PST 2016


Author: matze
Date: Wed Jan 13 15:53:54 2016
New Revision: 257681

URL: http://llvm.org/viewvc/llvm-project?rev=257681&view=rev
Log:
CMakeLists: Manually cleanup remaining llvm_add_subdirectories() usage, NFC

Modified:
    test-suite/trunk/MultiSource/Applications/ALAC/CMakeLists.txt
    test-suite/trunk/MultiSource/Applications/CMakeLists.txt
    test-suite/trunk/MultiSource/Applications/JM/CMakeLists.txt
    test-suite/trunk/MultiSource/Benchmarks/ASCI_Purple/CMakeLists.txt
    test-suite/trunk/MultiSource/Benchmarks/ASC_Sequoia/CMakeLists.txt
    test-suite/trunk/MultiSource/Benchmarks/BitBench/CMakeLists.txt
    test-suite/trunk/MultiSource/Benchmarks/CMakeLists.txt
    test-suite/trunk/MultiSource/Benchmarks/FreeBench/CMakeLists.txt
    test-suite/trunk/MultiSource/Benchmarks/MallocBench/CMakeLists.txt
    test-suite/trunk/MultiSource/Benchmarks/McCat/CMakeLists.txt
    test-suite/trunk/MultiSource/Benchmarks/MiBench/CMakeLists.txt
    test-suite/trunk/MultiSource/Benchmarks/NPB-serial/CMakeLists.txt
    test-suite/trunk/MultiSource/Benchmarks/Olden/CMakeLists.txt
    test-suite/trunk/MultiSource/Benchmarks/Prolangs-C++/CMakeLists.txt
    test-suite/trunk/MultiSource/Benchmarks/Prolangs-C/CMakeLists.txt
    test-suite/trunk/MultiSource/Benchmarks/Ptrdist/CMakeLists.txt
    test-suite/trunk/MultiSource/Benchmarks/TSVC/CMakeLists.txt
    test-suite/trunk/MultiSource/Benchmarks/Trimaran/CMakeLists.txt
    test-suite/trunk/MultiSource/Benchmarks/VersaBench/CMakeLists.txt
    test-suite/trunk/MultiSource/Benchmarks/mediabench/CMakeLists.txt
    test-suite/trunk/MultiSource/Benchmarks/mediabench/adpcm/CMakeLists.txt
    test-suite/trunk/MultiSource/Benchmarks/mediabench/g721/CMakeLists.txt
    test-suite/trunk/MultiSource/Benchmarks/mediabench/gsm/CMakeLists.txt
    test-suite/trunk/MultiSource/Benchmarks/mediabench/jpeg/CMakeLists.txt
    test-suite/trunk/MultiSource/Benchmarks/mediabench/mpeg2/CMakeLists.txt
    test-suite/trunk/MultiSource/CMakeLists.txt
    test-suite/trunk/MultiSource/Examples/CMakeLists.txt
    test-suite/trunk/MultiSource/UnitTests/C++11/CMakeLists.txt
    test-suite/trunk/MultiSource/UnitTests/CMakeLists.txt
    test-suite/trunk/MultiSource/UnitTests/Mips/CMakeLists.txt
    test-suite/trunk/MultiSource/UnitTests/Mips/Mips16/CMakeLists.txt
    test-suite/trunk/SingleSource/Benchmarks/BenchmarkGame/CMakeLists.txt
    test-suite/trunk/SingleSource/Benchmarks/CMakeLists.txt
    test-suite/trunk/SingleSource/Benchmarks/Misc-C++/CMakeLists.txt
    test-suite/trunk/SingleSource/Benchmarks/Polybench/CMakeLists.txt
    test-suite/trunk/SingleSource/Benchmarks/Polybench/datamining/CMakeLists.txt
    test-suite/trunk/SingleSource/Benchmarks/Polybench/linear-algebra/CMakeLists.txt
    test-suite/trunk/SingleSource/Benchmarks/Polybench/linear-algebra/kernels/CMakeLists.txt
    test-suite/trunk/SingleSource/Benchmarks/Polybench/linear-algebra/solvers/CMakeLists.txt
    test-suite/trunk/SingleSource/Benchmarks/Polybench/medley/CMakeLists.txt
    test-suite/trunk/SingleSource/Benchmarks/Polybench/stencils/CMakeLists.txt
    test-suite/trunk/SingleSource/Benchmarks/Shootout-C++/CMakeLists.txt
    test-suite/trunk/SingleSource/CMakeLists.txt
    test-suite/trunk/SingleSource/Regression/C++/CMakeLists.txt
    test-suite/trunk/SingleSource/Regression/CMakeLists.txt
    test-suite/trunk/SingleSource/UnitTests/CMakeLists.txt
    test-suite/trunk/SingleSource/UnitTests/Mips/CMakeLists.txt
    test-suite/trunk/SingleSource/UnitTests/SetjmpLongjmp/CMakeLists.txt
    test-suite/trunk/SingleSource/UnitTests/SignlessTypes/CMakeLists.txt
    test-suite/trunk/SingleSource/UnitTests/Vector/CMakeLists.txt

Modified: test-suite/trunk/MultiSource/Applications/ALAC/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/Applications/ALAC/CMakeLists.txt?rev=257681&r1=257680&r2=257681&view=diff
==============================================================================
--- test-suite/trunk/MultiSource/Applications/ALAC/CMakeLists.txt (original)
+++ test-suite/trunk/MultiSource/Applications/ALAC/CMakeLists.txt Wed Jan 13 15:53:54 2016
@@ -1,5 +1 @@
-set(PARALLEL_DIRS)
-
-set(PARALLEL_DIRS encode decode)
-
-llvm_add_subdirectories(${PARALLEL_DIRS})
+llvm_add_subdirectories(encode decode)

Modified: test-suite/trunk/MultiSource/Applications/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/Applications/CMakeLists.txt?rev=257681&r1=257680&r2=257681&view=diff
==============================================================================
--- test-suite/trunk/MultiSource/Applications/CMakeLists.txt (original)
+++ test-suite/trunk/MultiSource/Applications/CMakeLists.txt Wed Jan 13 15:53:54 2016
@@ -1,47 +1,30 @@
-set(PARALLEL_DIRS)
-
-set(PARALLEL_DIRS Burg aha sgefa siod d spiff treecc SPASS oggenc JM viterbi SIBsim4 ClamAV sqlite3 lemon)
+llvm_add_subdirectories(aha sgefa d spiff oggenc JM viterbi SIBsim4)
 if(NOT DEFINED DISABLE_CXX)
-  list(APPEND PARALLEL_DIRS lambda-0.1.3 hbd hexxagon minisat ALAC)
+  llvm_add_subdirectories(lambda-0.1.3 hbd minisat ALAC)
+  if(NOT "${TARGET_OS}" STREQUAL "SunOS")
+    llvm_add_subdirectories(hexxagon)
+  endif()
 endif()
 if(NOT DEFINED SMALL_PROBLEM_SIZE)
-  list(APPEND PARALLEL_DIRS lua)
+  llvm_add_subdirectories(lua)
 endif()
-if("${TARGET_OS}" STREQUAL "Linux")
-  list(APPEND PARALLEL_DIRS obsequi)
+if("${TARGET_OS}" STREQUAL "Linux" AND (NOT "${ARCH}" STREQUAL "XCore"))
+  llvm_add_subdirectories(obsequi)
 endif()
 if(NOT "${TARGET_OS}" STREQUAL "SunOS")
   if(NOT DEFINED DISABLE_CXX)
-    list(APPEND PARALLEL_DIRS kimwitu++)
+    llvm_add_subdirectories(kimwitu++)
   endif()
 endif()
-if("${TARGET_OS}" STREQUAL "SunOS")
-  llvm_filter_out(TMP1 SPASS  ${PARALLEL_DIRS})
-  set(PARALLEL_DIRS ${TMP1})
-  llvm_filter_out(TMP2 hexxagon  ${PARALLEL_DIRS})
-  set(PARALLEL_DIRS ${TMP2})
-endif()
-if("${ARCH}" STREQUAL "XCore")
-  llvm_filter_out(TMP3 siod  ${PARALLEL_DIRS})
-  set(PARALLEL_DIRS ${TMP3})
-  llvm_filter_out(TMP4 ClamAV  ${PARALLEL_DIRS})
-  set(PARALLEL_DIRS ${TMP4})
-  llvm_filter_out(TMP5 sqlite3  ${PARALLEL_DIRS})
-  set(PARALLEL_DIRS ${TMP5})
-  llvm_filter_out(TMP6 obsequi  ${PARALLEL_DIRS})
-  set(PARALLEL_DIRS ${TMP6})
-  llvm_filter_out(TMP7 lemon  ${PARALLEL_DIRS})
-  set(PARALLEL_DIRS ${TMP7})
-endif()
-if("${ARCH}" STREQUAL "PowerPC")
-  llvm_filter_out(TMP8 sqlite3  ${PARALLEL_DIRS})
-  set(PARALLEL_DIRS ${TMP8})
-endif()
-if(DEFINED BENCHMARKING_ONLY)
-  llvm_filter_out(TMP9 Burg  ${PARALLEL_DIRS})
-  set(PARALLEL_DIRS ${TMP9})
-  llvm_filter_out(TMP10 treecc  ${PARALLEL_DIRS})
-  set(PARALLEL_DIRS ${TMP10})
+if(NOT "${TARGET_OS}" STREQUAL "SunOS")
+  llvm_add_subdirectories(SPASS)
+endif()
+if(NOT "${ARCH}" STREQUAL "XCore")
+  llvm_add_subdirectories(siod ClamAV lemon)
+endif()
+if((NOT "${ARCH}" STREQUAL "PowerPC") AND (NOT "${ARCH}" STREQUAL "XCore"))
+  llvm_add_subdirectories(sqlite3)
+endif()
+if(NOT DEFINED BENCHMARKING_ONLY)
+  llvm_add_subdirectories(Burg treecc)
 endif()
-
-llvm_add_subdirectories(${PARALLEL_DIRS})

Modified: test-suite/trunk/MultiSource/Applications/JM/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/Applications/JM/CMakeLists.txt?rev=257681&r1=257680&r2=257681&view=diff
==============================================================================
--- test-suite/trunk/MultiSource/Applications/JM/CMakeLists.txt (original)
+++ test-suite/trunk/MultiSource/Applications/JM/CMakeLists.txt Wed Jan 13 15:53:54 2016
@@ -1,5 +1 @@
-set(PARALLEL_DIRS)
-
-set(PARALLEL_DIRS ldecod lencod)
-
-llvm_add_subdirectories(${PARALLEL_DIRS})
+llvm_add_subdirectories(ldecod lencod)

Modified: test-suite/trunk/MultiSource/Benchmarks/ASCI_Purple/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/Benchmarks/ASCI_Purple/CMakeLists.txt?rev=257681&r1=257680&r2=257681&view=diff
==============================================================================
--- test-suite/trunk/MultiSource/Benchmarks/ASCI_Purple/CMakeLists.txt (original)
+++ test-suite/trunk/MultiSource/Benchmarks/ASCI_Purple/CMakeLists.txt Wed Jan 13 15:53:54 2016
@@ -1,5 +1 @@
-set(PARALLEL_DIRS)
-
-set(PARALLEL_DIRS SMG2000 )
-
-llvm_add_subdirectories(${PARALLEL_DIRS})
+llvm_add_subdirectories(SMG2000)

Modified: test-suite/trunk/MultiSource/Benchmarks/ASC_Sequoia/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/Benchmarks/ASC_Sequoia/CMakeLists.txt?rev=257681&r1=257680&r2=257681&view=diff
==============================================================================
--- test-suite/trunk/MultiSource/Benchmarks/ASC_Sequoia/CMakeLists.txt (original)
+++ test-suite/trunk/MultiSource/Benchmarks/ASC_Sequoia/CMakeLists.txt Wed Jan 13 15:53:54 2016
@@ -1,5 +1 @@
-set(PARALLEL_DIRS)
-
-set(PARALLEL_DIRS IRSmk AMGmk CrystalMk )
-
-llvm_add_subdirectories(${PARALLEL_DIRS})
+llvm_add_subdirectories(IRSmk AMGmk CrystalMk)

Modified: test-suite/trunk/MultiSource/Benchmarks/BitBench/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/Benchmarks/BitBench/CMakeLists.txt?rev=257681&r1=257680&r2=257681&view=diff
==============================================================================
--- test-suite/trunk/MultiSource/Benchmarks/BitBench/CMakeLists.txt (original)
+++ test-suite/trunk/MultiSource/Benchmarks/BitBench/CMakeLists.txt Wed Jan 13 15:53:54 2016
@@ -1,5 +1 @@
-set(PARALLEL_DIRS)
-
-set(PARALLEL_DIRS five11 drop3 uudecode uuencode)
-
-llvm_add_subdirectories(${PARALLEL_DIRS})
+llvm_add_subdirectories(five11 drop3 uudecode uuencode)

Modified: test-suite/trunk/MultiSource/Benchmarks/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/Benchmarks/CMakeLists.txt?rev=257681&r1=257680&r2=257681&view=diff
==============================================================================
--- test-suite/trunk/MultiSource/Benchmarks/CMakeLists.txt (original)
+++ test-suite/trunk/MultiSource/Benchmarks/CMakeLists.txt Wed Jan 13 15:53:54 2016
@@ -1,27 +1,16 @@
-set(PARALLEL_DIRS)
-
-set(PARALLEL_DIRS Fhourstones Fhourstones-3.1 McCat Olden Ptrdist llubenchmark sim FreeBench MallocBench Prolangs-C SciMark2-C mediabench nbench ASCI_Purple MiBench Trimaran VersaBench NPB-serial BitBench ASC_Sequoia TSVC)
-if("${TARGET_OS}" STREQUAL "Darwin")
-  if("${ARCH}" STREQUAL "ARM")
-    llvm_filter_out(TMP1 TSVC ${PARALLEL_DIRS})
-    set(PARALLEL_DIRS ${TMP1})
-  endif()
+llvm_add_subdirectories(Fhourstones Fhourstones-3.1 McCat Olden Ptrdist llubenchmark sim FreeBench MallocBench Prolangs-C SciMark2-C mediabench nbench ASCI_Purple MiBench Trimaran VersaBench NPB-serial BitBench ASC_Sequoia)
+if((NOT "${TARGET_OS}" STREQUAL "Darwin") OR (NOT "${ARCH}" STREQUAL "ARM"))
+  llvm_add_subdirectories(TSVC)
 endif()
 if(NOT DEFINED DISABLE_CXX)
-  list(APPEND PARALLEL_DIRS Prolangs-C++ PAQ8p tramp3d-v4 Bullet 7zip)
-endif()
-if("${ARCH}" STREQUAL "PowerPC")
-  llvm_filter_out(TMP2 tramp3d-v4  ${PARALLEL_DIRS})
-  set(PARALLEL_DIRS ${TMP2})
+  llvm_add_subdirectories(Prolangs-C++ Bullet)
+  if(NOT "${ARCH}" STREQUAL "XCore")
+    llvm_add_subdirectories(7zip PAQ8p)
+  endif()
+  if(NOT "${ARCH}" STREQUAL "PowerPC")
+    llvm_add_subdirectories(tramp3d-v4)
+  endif()
 endif()
 if(NOT DEFINED SMALL_PROBLEM_SIZE)
-  list(APPEND PARALLEL_DIRS mafft)
-endif()
-if("${ARCH}" STREQUAL "XCore")
-  llvm_filter_out(TMP3 7zip  ${PARALLEL_DIRS})
-  set(PARALLEL_DIRS ${TMP3})
-  llvm_filter_out(TMP4 PAQ8p  ${PARALLEL_DIRS})
-  set(PARALLEL_DIRS ${TMP4})
+  llvm_add_subdirectories(mafft)
 endif()
-
-llvm_add_subdirectories(${PARALLEL_DIRS})

Modified: test-suite/trunk/MultiSource/Benchmarks/FreeBench/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/Benchmarks/FreeBench/CMakeLists.txt?rev=257681&r1=257680&r2=257681&view=diff
==============================================================================
--- test-suite/trunk/MultiSource/Benchmarks/FreeBench/CMakeLists.txt (original)
+++ test-suite/trunk/MultiSource/Benchmarks/FreeBench/CMakeLists.txt Wed Jan 13 15:53:54 2016
@@ -1,9 +1,4 @@
-set(PARALLEL_DIRS)
-
-set(PARALLEL_DIRS distray mason pcompress2 analyzer fourinarow neural pifft)
-if("${ARCH}" STREQUAL "Sparc")
-  llvm_filter_out(TMP1 analyzer  ${PARALLEL_DIRS})
-  set(PARALLEL_DIRS ${TMP1})
+llvm_add_subdirectories(distray mason pcompress2 fourinarow neural pifft)
+if(NOT "${ARCH}" STREQUAL "Sparc")
+  llvm_add_subdirectories(analyzer)
 endif()
-
-llvm_add_subdirectories(${PARALLEL_DIRS})

Modified: test-suite/trunk/MultiSource/Benchmarks/MallocBench/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/Benchmarks/MallocBench/CMakeLists.txt?rev=257681&r1=257680&r2=257681&view=diff
==============================================================================
--- test-suite/trunk/MultiSource/Benchmarks/MallocBench/CMakeLists.txt (original)
+++ test-suite/trunk/MultiSource/Benchmarks/MallocBench/CMakeLists.txt Wed Jan 13 15:53:54 2016
@@ -1,9 +1,4 @@
-set(PARALLEL_DIRS)
-
-set(PARALLEL_DIRS cfrac espresso gs)
-if("${ARCH}" STREQUAL "Alpha")
-  llvm_filter_out(TMP1 cfrac  ${PARALLEL_DIRS})
-  set(PARALLEL_DIRS ${TMP1})
+llvm_add_subdirectories(espresso gs)
+if(NOT "${ARCH}" STREQUAL "Alpha")
+  llvm_add_subdirectories(cfrac)
 endif()
-
-llvm_add_subdirectories(${PARALLEL_DIRS})

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=257681&r1=257680&r2=257681&view=diff
==============================================================================
--- test-suite/trunk/MultiSource/Benchmarks/McCat/CMakeLists.txt (original)
+++ test-suite/trunk/MultiSource/Benchmarks/McCat/CMakeLists.txt Wed Jan 13 15:53:54 2016
@@ -1,9 +1,4 @@
-set(PARALLEL_DIRS)
-
-set(PARALLEL_DIRS 01-qbsort 04-bisect 08-main 12-IOtest 17-bintr 03-testtrie 05-eks 09-vor 15-trie 18-imp)
-if(DEFINED BENCHMARKING_ONLY)
-  llvm_filter_out(TMP1 15-trie  ${PARALLEL_DIRS})
-  set(PARALLEL_DIRS ${TMP1})
+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)
+  llvm_add_subdirectories(15-trie)
 endif()
-
-llvm_add_subdirectories(${PARALLEL_DIRS})

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=257681&r1=257680&r2=257681&view=diff
==============================================================================
--- test-suite/trunk/MultiSource/Benchmarks/MiBench/CMakeLists.txt (original)
+++ test-suite/trunk/MultiSource/Benchmarks/MiBench/CMakeLists.txt Wed Jan 13 15:53:54 2016
@@ -1,25 +1,10 @@
-set(PARALLEL_DIRS)
-
-set(PARALLEL_DIRS automotive-basicmath automotive-bitcount automotive-susan consumer-jpeg consumer-lame consumer-typeset network-dijkstra network-patricia office-ispell office-stringsearch security-blowfish security-rijndael security-sha telecomm-CRC32 telecomm-FFT telecomm-adpcm telecomm-gsm)
-if("${ARCH}" STREQUAL "ARM")
-  llvm_filter_out(TMP1 office-ispell  ${PARALLEL_DIRS})
-  set(PARALLEL_DIRS ${TMP1})
+llvm_add_subdirectories(automotive-basicmath automotive-bitcount automotive-susan consumer-jpeg consumer-typeset network-dijkstra network-patricia security-rijndael security-sha telecomm-CRC32 telecomm-FFT telecomm-gsm)
+if(NOT "${ARCH}" STREQUAL "XCore")
+  llvm_add_subdirectories(consumer-lame)
 endif()
-if("${ARCH}" STREQUAL "XCore")
-  llvm_filter_out(TMP2 consumer-lame  ${PARALLEL_DIRS})
-  set(PARALLEL_DIRS ${TMP2})
-  llvm_filter_out(TMP3 office-ispell  ${PARALLEL_DIRS})
-  set(PARALLEL_DIRS ${TMP3})
+if(NOT DEFINED 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)
+  endif()
 endif()
-if(DEFINED BENCHMARKING_ONLY)
-  llvm_filter_out(TMP4 office-stringsearch  ${PARALLEL_DIRS})
-  set(PARALLEL_DIRS ${TMP4})
-  llvm_filter_out(TMP5 office-ispell  ${PARALLEL_DIRS})
-  set(PARALLEL_DIRS ${TMP5})
-  llvm_filter_out(TMP6 security-blowfish  ${PARALLEL_DIRS})
-  set(PARALLEL_DIRS ${TMP6})
-  llvm_filter_out(TMP7 telecom-adpcm  ${PARALLEL_DIRS})
-  set(PARALLEL_DIRS ${TMP7})
-endif()
-
-llvm_add_subdirectories(${PARALLEL_DIRS})

Modified: test-suite/trunk/MultiSource/Benchmarks/NPB-serial/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/Benchmarks/NPB-serial/CMakeLists.txt?rev=257681&r1=257680&r2=257681&view=diff
==============================================================================
--- test-suite/trunk/MultiSource/Benchmarks/NPB-serial/CMakeLists.txt (original)
+++ test-suite/trunk/MultiSource/Benchmarks/NPB-serial/CMakeLists.txt Wed Jan 13 15:53:54 2016
@@ -1,5 +1 @@
-set(PARALLEL_DIRS)
-
-set(PARALLEL_DIRS is )
-
-llvm_add_subdirectories(${PARALLEL_DIRS})
+llvm_add_subdirectories(is)

Modified: test-suite/trunk/MultiSource/Benchmarks/Olden/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/Benchmarks/Olden/CMakeLists.txt?rev=257681&r1=257680&r2=257681&view=diff
==============================================================================
--- test-suite/trunk/MultiSource/Benchmarks/Olden/CMakeLists.txt (original)
+++ test-suite/trunk/MultiSource/Benchmarks/Olden/CMakeLists.txt Wed Jan 13 15:53:54 2016
@@ -1,5 +1 @@
-set(PARALLEL_DIRS)
-
-set(PARALLEL_DIRS bh em3d mst power tsp bisort health perimeter treeadd voronoi)
-
-llvm_add_subdirectories(${PARALLEL_DIRS})
+llvm_add_subdirectories(bh em3d mst power tsp bisort health perimeter treeadd voronoi)

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=257681&r1=257680&r2=257681&view=diff
==============================================================================
--- test-suite/trunk/MultiSource/Benchmarks/Prolangs-C++/CMakeLists.txt (original)
+++ test-suite/trunk/MultiSource/Benchmarks/Prolangs-C++/CMakeLists.txt Wed Jan 13 15:53:54 2016
@@ -1,29 +1,4 @@
-set(PARALLEL_DIRS)
-
-set(PARALLEL_DIRS NP city deriv1 deriv2 employ family fsm garage life objects ocean office primes shapes simul trees vcirc)
+llvm_add_subdirectories(city employ life ocean primes simul)
 if(DEFINED BENCHMARKING_ONLY)
-  llvm_filter_out(TMP1 deriv1  ${PARALLEL_DIRS})
-  set(PARALLEL_DIRS ${TMP1})
-  llvm_filter_out(TMP2 deriv2  ${PARALLEL_DIRS})
-  set(PARALLEL_DIRS ${TMP2})
-  llvm_filter_out(TMP3 family  ${PARALLEL_DIRS})
-  set(PARALLEL_DIRS ${TMP3})
-  llvm_filter_out(TMP4 fsm  ${PARALLEL_DIRS})
-  set(PARALLEL_DIRS ${TMP4})
-  llvm_filter_out(TMP5 garage  ${PARALLEL_DIRS})
-  set(PARALLEL_DIRS ${TMP5})
-  llvm_filter_out(TMP6 NP  ${PARALLEL_DIRS})
-  set(PARALLEL_DIRS ${TMP6})
-  llvm_filter_out(TMP7 objects  ${PARALLEL_DIRS})
-  set(PARALLEL_DIRS ${TMP7})
-  llvm_filter_out(TMP8 office  ${PARALLEL_DIRS})
-  set(PARALLEL_DIRS ${TMP8})
-  llvm_filter_out(TMP9 shapes  ${PARALLEL_DIRS})
-  set(PARALLEL_DIRS ${TMP9})
-  llvm_filter_out(TMP10 trees  ${PARALLEL_DIRS})
-  set(PARALLEL_DIRS ${TMP10})
-  llvm_filter_out(TMP11 vcirc  ${PARALLEL_DIRS})
-  set(PARALLEL_DIRS ${TMP11})
+  llvm_add_subdirectories(deriv1 deriv2 family fsm garage NP objects office shapes trees vcirc)
 endif()
-
-llvm_add_subdirectories(${PARALLEL_DIRS})

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=257681&r1=257680&r2=257681&view=diff
==============================================================================
--- test-suite/trunk/MultiSource/Benchmarks/Prolangs-C/CMakeLists.txt (original)
+++ test-suite/trunk/MultiSource/Benchmarks/Prolangs-C/CMakeLists.txt Wed Jan 13 15:53:54 2016
@@ -1,47 +1,10 @@
-set(PARALLEL_DIRS)
-
-set(PARALLEL_DIRS TimberWolfMC agrep allroots archie-client assembler bison cdecl compiler fixoutput football gnugo loader plot2fig simulator unix-smail unix-tbl)
-if("${ARCH}" STREQUAL "Sparc")
-  llvm_filter_out(TMP1 bison  ${PARALLEL_DIRS})
-  set(PARALLEL_DIRS ${TMP1})
+llvm_add_subdirectories(agrep gnugo)
+if((NOT "${ARCH}" STREQUAL "Sparc") AND (NOT "${ARCH}" STREQUAL "Alpha"))
+  llvm_add_subdirectories(bison)
 endif()
-if("${ARCH}" STREQUAL "Alpha")
-  llvm_filter_out(TMP2 bison  ${PARALLEL_DIRS})
-  set(PARALLEL_DIRS ${TMP2})
+if(NOT DEFINED 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)
+  endif()
 endif()
-if("${ARCH}" STREQUAL "XCore")
-  llvm_filter_out(TMP3 archie-client  ${PARALLEL_DIRS})
-  set(PARALLEL_DIRS ${TMP3})
-  llvm_filter_out(TMP4 unix-smail  ${PARALLEL_DIRS})
-  set(PARALLEL_DIRS ${TMP4})
-endif()
-if(DEFINED BENCHMARKING_ONLY)
-  llvm_filter_out(TMP5 allroots  ${PARALLEL_DIRS})
-  set(PARALLEL_DIRS ${TMP5})
-  llvm_filter_out(TMP6 archie-client  ${PARALLEL_DIRS})
-  set(PARALLEL_DIRS ${TMP6})
-  llvm_filter_out(TMP7 assembler  ${PARALLEL_DIRS})
-  set(PARALLEL_DIRS ${TMP7})
-  llvm_filter_out(TMP8 cdecl  ${PARALLEL_DIRS})
-  set(PARALLEL_DIRS ${TMP8})
-  llvm_filter_out(TMP9 compiler  ${PARALLEL_DIRS})
-  set(PARALLEL_DIRS ${TMP9})
-  llvm_filter_out(TMP10 loader  ${PARALLEL_DIRS})
-  set(PARALLEL_DIRS ${TMP10})
-  llvm_filter_out(TMP11 fixoutput  ${PARALLEL_DIRS})
-  set(PARALLEL_DIRS ${TMP11})
-  llvm_filter_out(TMP12 football  ${PARALLEL_DIRS})
-  set(PARALLEL_DIRS ${TMP12})
-  llvm_filter_out(TMP13 plot2fig  ${PARALLEL_DIRS})
-  set(PARALLEL_DIRS ${TMP13})
-  llvm_filter_out(TMP14 simulator  ${PARALLEL_DIRS})
-  set(PARALLEL_DIRS ${TMP14})
-  llvm_filter_out(TMP15 TimberWolfMC  ${PARALLEL_DIRS})
-  set(PARALLEL_DIRS ${TMP15})
-  llvm_filter_out(TMP16 unix-smail  ${PARALLEL_DIRS})
-  set(PARALLEL_DIRS ${TMP16})
-  llvm_filter_out(TMP17 unix-tbl  ${PARALLEL_DIRS})
-  set(PARALLEL_DIRS ${TMP17})
-endif()
-
-llvm_add_subdirectories(${PARALLEL_DIRS})

Modified: test-suite/trunk/MultiSource/Benchmarks/Ptrdist/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/Benchmarks/Ptrdist/CMakeLists.txt?rev=257681&r1=257680&r2=257681&view=diff
==============================================================================
--- test-suite/trunk/MultiSource/Benchmarks/Ptrdist/CMakeLists.txt (original)
+++ test-suite/trunk/MultiSource/Benchmarks/Ptrdist/CMakeLists.txt Wed Jan 13 15:53:54 2016
@@ -1,5 +1 @@
-set(PARALLEL_DIRS)
-
-set(PARALLEL_DIRS anagram bc ft ks yacr2)
-
-llvm_add_subdirectories(${PARALLEL_DIRS})
+llvm_add_subdirectories(anagram bc ft ks yacr2)

Modified: test-suite/trunk/MultiSource/Benchmarks/TSVC/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/Benchmarks/TSVC/CMakeLists.txt?rev=257681&r1=257680&r2=257681&view=diff
==============================================================================
--- test-suite/trunk/MultiSource/Benchmarks/TSVC/CMakeLists.txt (original)
+++ test-suite/trunk/MultiSource/Benchmarks/TSVC/CMakeLists.txt Wed Jan 13 15:53:54 2016
@@ -1,5 +1 @@
-set(PARALLEL_DIRS)
-
-set(PARALLEL_DIRS LinearDependence-flt InductionVariable-flt GlobalDataFlow-flt ControlFlow-flt Symbolics-flt StatementReordering-flt LoopRestructuring-flt NodeSplitting-flt Expansion-flt CrossingThresholds-flt Reductions-flt Recurrences-flt Searching-flt Packing-flt LoopRerolling-flt Equivalencing-flt IndirectAddressing-flt ControlLoops-flt LinearDependence-dbl InductionVariable-dbl GlobalDataFlow-dbl ControlFlow-dbl Symbolics-dbl StatementReordering-dbl LoopRestructuring-dbl NodeSplitting-dbl Expansion-dbl CrossingThresholds-dbl Reductions-dbl Recurrences-dbl Searching-dbl Packing-dbl LoopRerolling-dbl Equivalencing-dbl IndirectAddressing-dbl ControlLoops-dbl)
-
-llvm_add_subdirectories(${PARALLEL_DIRS})
+llvm_add_subdirectories(LinearDependence-flt InductionVariable-flt GlobalDataFlow-flt ControlFlow-flt Symbolics-flt StatementReordering-flt LoopRestructuring-flt NodeSplitting-flt Expansion-flt CrossingThresholds-flt Reductions-flt Recurrences-flt Searching-flt Packing-flt LoopRerolling-flt Equivalencing-flt IndirectAddressing-flt ControlLoops-flt LinearDependence-dbl InductionVariable-dbl GlobalDataFlow-dbl ControlFlow-dbl Symbolics-dbl StatementReordering-dbl LoopRestructuring-dbl NodeSplitting-dbl Expansion-dbl CrossingThresholds-dbl Reductions-dbl Recurrences-dbl Searching-dbl Packing-dbl LoopRerolling-dbl Equivalencing-dbl IndirectAddressing-dbl ControlLoops-dbl)

Modified: test-suite/trunk/MultiSource/Benchmarks/Trimaran/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/Benchmarks/Trimaran/CMakeLists.txt?rev=257681&r1=257680&r2=257681&view=diff
==============================================================================
--- test-suite/trunk/MultiSource/Benchmarks/Trimaran/CMakeLists.txt (original)
+++ test-suite/trunk/MultiSource/Benchmarks/Trimaran/CMakeLists.txt Wed Jan 13 15:53:54 2016
@@ -1,5 +1 @@
-set(PARALLEL_DIRS)
-
-set(PARALLEL_DIRS enc-3des enc-md5 enc-pc1 enc-rc4 netbench-crc netbench-url)
-
-llvm_add_subdirectories(${PARALLEL_DIRS})
+llvm_add_subdirectories(enc-3des enc-md5 enc-pc1 enc-rc4 netbench-crc netbench-url)

Modified: test-suite/trunk/MultiSource/Benchmarks/VersaBench/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/Benchmarks/VersaBench/CMakeLists.txt?rev=257681&r1=257680&r2=257681&view=diff
==============================================================================
--- test-suite/trunk/MultiSource/Benchmarks/VersaBench/CMakeLists.txt (original)
+++ test-suite/trunk/MultiSource/Benchmarks/VersaBench/CMakeLists.txt Wed Jan 13 15:53:54 2016
@@ -1,9 +1,4 @@
-set(PARALLEL_DIRS)
-
-if("${ENDIAN}" STREQUAL "big")
-  set(PARALLEL_DIRS beamformer bmm dbms ecbdes)
-else()
-  set(PARALLEL_DIRS 8b10b beamformer bmm dbms ecbdes)
+llvm_add_subdirectories(beamformer bmm dbms ecbdes)
+if(NOT "${ENDIAN}" STREQUAL "big")
+  llvm_add_subdirectories(8b10b)
 endif()
-
-llvm_add_subdirectories(${PARALLEL_DIRS})

Modified: test-suite/trunk/MultiSource/Benchmarks/mediabench/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/Benchmarks/mediabench/CMakeLists.txt?rev=257681&r1=257680&r2=257681&view=diff
==============================================================================
--- test-suite/trunk/MultiSource/Benchmarks/mediabench/CMakeLists.txt (original)
+++ test-suite/trunk/MultiSource/Benchmarks/mediabench/CMakeLists.txt Wed Jan 13 15:53:54 2016
@@ -1,5 +1 @@
-set(PARALLEL_DIRS)
-
-set(PARALLEL_DIRS adpcm g721 gsm jpeg mpeg2)
-
-llvm_add_subdirectories(${PARALLEL_DIRS})
+llvm_add_subdirectories(adpcm g721 gsm jpeg mpeg2)

Modified: test-suite/trunk/MultiSource/Benchmarks/mediabench/adpcm/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/Benchmarks/mediabench/adpcm/CMakeLists.txt?rev=257681&r1=257680&r2=257681&view=diff
==============================================================================
--- test-suite/trunk/MultiSource/Benchmarks/mediabench/adpcm/CMakeLists.txt (original)
+++ test-suite/trunk/MultiSource/Benchmarks/mediabench/adpcm/CMakeLists.txt Wed Jan 13 15:53:54 2016
@@ -1,5 +1 @@
-set(PARALLEL_DIRS)
-
-set(PARALLEL_DIRS rawcaudio rawdaudio)
-
-llvm_add_subdirectories(${PARALLEL_DIRS})
+llvm_add_subdirectories(rawcaudio rawdaudio)

Modified: test-suite/trunk/MultiSource/Benchmarks/mediabench/g721/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/Benchmarks/mediabench/g721/CMakeLists.txt?rev=257681&r1=257680&r2=257681&view=diff
==============================================================================
--- test-suite/trunk/MultiSource/Benchmarks/mediabench/g721/CMakeLists.txt (original)
+++ test-suite/trunk/MultiSource/Benchmarks/mediabench/g721/CMakeLists.txt Wed Jan 13 15:53:54 2016
@@ -1,5 +1 @@
-set(PARALLEL_DIRS)
-
-set(PARALLEL_DIRS g721encode )
-
-llvm_add_subdirectories(${PARALLEL_DIRS})
+llvm_add_subdirectories(g721encode)

Modified: test-suite/trunk/MultiSource/Benchmarks/mediabench/gsm/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/Benchmarks/mediabench/gsm/CMakeLists.txt?rev=257681&r1=257680&r2=257681&view=diff
==============================================================================
--- test-suite/trunk/MultiSource/Benchmarks/mediabench/gsm/CMakeLists.txt (original)
+++ test-suite/trunk/MultiSource/Benchmarks/mediabench/gsm/CMakeLists.txt Wed Jan 13 15:53:54 2016
@@ -1,5 +1 @@
-set(PARALLEL_DIRS)
-
-set(PARALLEL_DIRS toast )
-
-llvm_add_subdirectories(${PARALLEL_DIRS})
+llvm_add_subdirectories(toast)

Modified: test-suite/trunk/MultiSource/Benchmarks/mediabench/jpeg/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/Benchmarks/mediabench/jpeg/CMakeLists.txt?rev=257681&r1=257680&r2=257681&view=diff
==============================================================================
--- test-suite/trunk/MultiSource/Benchmarks/mediabench/jpeg/CMakeLists.txt (original)
+++ test-suite/trunk/MultiSource/Benchmarks/mediabench/jpeg/CMakeLists.txt Wed Jan 13 15:53:54 2016
@@ -1,5 +1 @@
-set(PARALLEL_DIRS)
-
-set(PARALLEL_DIRS jpeg-6a )
-
-llvm_add_subdirectories(${PARALLEL_DIRS})
+llvm_add_subdirectories(jpeg-6a)

Modified: test-suite/trunk/MultiSource/Benchmarks/mediabench/mpeg2/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/Benchmarks/mediabench/mpeg2/CMakeLists.txt?rev=257681&r1=257680&r2=257681&view=diff
==============================================================================
--- test-suite/trunk/MultiSource/Benchmarks/mediabench/mpeg2/CMakeLists.txt (original)
+++ test-suite/trunk/MultiSource/Benchmarks/mediabench/mpeg2/CMakeLists.txt Wed Jan 13 15:53:54 2016
@@ -1,5 +1 @@
-set(PARALLEL_DIRS)
-
-set(PARALLEL_DIRS mpeg2dec)
-
-llvm_add_subdirectories(${PARALLEL_DIRS})
+llvm_add_subdirectories(mpeg2dec)

Modified: test-suite/trunk/MultiSource/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/CMakeLists.txt?rev=257681&r1=257680&r2=257681&view=diff
==============================================================================
--- test-suite/trunk/MultiSource/CMakeLists.txt (original)
+++ test-suite/trunk/MultiSource/CMakeLists.txt Wed Jan 13 15:53:54 2016
@@ -1,8 +1,4 @@
-set(PARALLEL_DIRS)
-
-set(PARALLEL_DIRS Applications Benchmarks)
+llvm_add_subdirectories(Applications Benchmarks)
 if(NOT DEFINED BENCHMARKING_ONLY)
-  list(APPEND PARALLEL_DIRS UnitTests)
+  llvm_add_subdirectories(UnitTests)
 endif()
-
-llvm_add_subdirectories(${PARALLEL_DIRS})

Modified: test-suite/trunk/MultiSource/Examples/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/Examples/CMakeLists.txt?rev=257681&r1=257680&r2=257681&view=diff
==============================================================================
--- test-suite/trunk/MultiSource/Examples/CMakeLists.txt (original)
+++ test-suite/trunk/MultiSource/Examples/CMakeLists.txt Wed Jan 13 15:53:54 2016
@@ -1,5 +1 @@
-set(PARALLEL_DIRS)
-
-set(PARALLEL_DIRS MultipleResults)
-
-llvm_add_subdirectories(${PARALLEL_DIRS})
+llvm_add_subdirectories(MultipleResults)

Modified: test-suite/trunk/MultiSource/UnitTests/C++11/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/UnitTests/C%2B%2B11/CMakeLists.txt?rev=257681&r1=257680&r2=257681&view=diff
==============================================================================
--- test-suite/trunk/MultiSource/UnitTests/C++11/CMakeLists.txt (original)
+++ test-suite/trunk/MultiSource/UnitTests/C++11/CMakeLists.txt Wed Jan 13 15:53:54 2016
@@ -1,11 +1,5 @@
-set(PARALLEL_DIRS)
-
-set(PARALLEL_DIRS frame_layout)
 list(APPEND CPPFLAGS -std=c++11)
 string(FIND "${MIPSARCH}" "mips16" TMP1)
-if(NOT "" STREQUAL "${TMP1}")
-  llvm_filter_out(TMP2 frame_layout  ${PARALLEL_DIRS})
-  set(PARALLEL_DIRS ${TMP2})
+if("" STREQUAL "${TMP1}")
+  llvm_add_subdirectories(frame_layout)
 endif()
-
-llvm_add_subdirectories(${PARALLEL_DIRS})

Modified: test-suite/trunk/MultiSource/UnitTests/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/UnitTests/CMakeLists.txt?rev=257681&r1=257680&r2=257681&view=diff
==============================================================================
--- test-suite/trunk/MultiSource/UnitTests/CMakeLists.txt (original)
+++ test-suite/trunk/MultiSource/UnitTests/CMakeLists.txt Wed Jan 13 15:53:54 2016
@@ -1,8 +1,4 @@
-set(PARALLEL_DIRS)
-
-set(PARALLEL_DIRS C++11)
+llvm_add_subdirectories(C++11)
 if("${ARCH}" STREQUAL "Mips")
-  list(APPEND PARALLEL_DIRS Mips)
+  llvm_add_subdirectories(Mips)
 endif()
-
-llvm_add_subdirectories(${PARALLEL_DIRS})

Modified: test-suite/trunk/MultiSource/UnitTests/Mips/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/UnitTests/Mips/CMakeLists.txt?rev=257681&r1=257680&r2=257681&view=diff
==============================================================================
--- test-suite/trunk/MultiSource/UnitTests/Mips/CMakeLists.txt (original)
+++ test-suite/trunk/MultiSource/UnitTests/Mips/CMakeLists.txt Wed Jan 13 15:53:54 2016
@@ -1,9 +1,4 @@
-set(PARALLEL_DIRS)
-
-set(PARALLEL_DIRS )
 string(FIND "${MIPSARCH}" "mips16" TMP1)
-if(NOT "" STREQUAL "${TMP1}")
-  list(APPEND PARALLEL_DIRS Mips16)
+if("" STREQUAL "${TMP1}")
+  llvm_add_subdirectories(Mips16)
 endif()
-
-llvm_add_subdirectories(${PARALLEL_DIRS})

Modified: test-suite/trunk/MultiSource/UnitTests/Mips/Mips16/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/UnitTests/Mips/Mips16/CMakeLists.txt?rev=257681&r1=257680&r2=257681&view=diff
==============================================================================
--- test-suite/trunk/MultiSource/UnitTests/Mips/Mips16/CMakeLists.txt (original)
+++ test-suite/trunk/MultiSource/UnitTests/Mips/Mips16/CMakeLists.txt Wed Jan 13 15:53:54 2016
@@ -1,5 +1 @@
-set(PARALLEL_DIRS)
-
-list(APPEND PARALLEL_DIRS multitest fp16_32_1)
-
-llvm_add_subdirectories(${PARALLEL_DIRS})
+llvm_add_subdirectories(multitest fp16_32_1)

Modified: test-suite/trunk/SingleSource/Benchmarks/BenchmarkGame/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/SingleSource/Benchmarks/BenchmarkGame/CMakeLists.txt?rev=257681&r1=257680&r2=257681&view=diff
==============================================================================
--- test-suite/trunk/SingleSource/Benchmarks/BenchmarkGame/CMakeLists.txt (original)
+++ test-suite/trunk/SingleSource/Benchmarks/BenchmarkGame/CMakeLists.txt Wed Jan 13 15:53:54 2016
@@ -1,7 +1,4 @@
-set(DIRS)
-
-set(DIRS Large)
 list(APPEND LDFLAGS -lm)
 llvm_singlesource()
 
-llvm_add_subdirectories(${DIRS})
+llvm_add_subdirectories(Large)

Modified: test-suite/trunk/SingleSource/Benchmarks/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/SingleSource/Benchmarks/CMakeLists.txt?rev=257681&r1=257680&r2=257681&view=diff
==============================================================================
--- test-suite/trunk/SingleSource/Benchmarks/CMakeLists.txt (original)
+++ test-suite/trunk/SingleSource/Benchmarks/CMakeLists.txt Wed Jan 13 15:53:54 2016
@@ -1,6 +1,3 @@
-set(PARALLEL_DIRS)
-
-set(PARALLEL_DIRS Dhrystone CoyoteBench Shootout Shootout-C++ Stanford McGill Misc Misc-C++ Misc-C++-EH BenchmarkGame Adobe-C++ Polybench Linpack SmallPT)
 list(APPEND LDFLAGS -lm)
 
-llvm_add_subdirectories(${PARALLEL_DIRS})
+llvm_add_subdirectories(Dhrystone CoyoteBench Shootout Shootout-C++ Stanford McGill Misc Misc-C++ Misc-C++-EH BenchmarkGame Adobe-C++ Polybench Linpack SmallPT)

Modified: test-suite/trunk/SingleSource/Benchmarks/Misc-C++/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/SingleSource/Benchmarks/Misc-C%2B%2B/CMakeLists.txt?rev=257681&r1=257680&r2=257681&view=diff
==============================================================================
--- test-suite/trunk/SingleSource/Benchmarks/Misc-C++/CMakeLists.txt (original)
+++ test-suite/trunk/SingleSource/Benchmarks/Misc-C++/CMakeLists.txt Wed Jan 13 15:53:54 2016
@@ -1,6 +1,3 @@
-set(DIRS)
-
-set(DIRS Large)
 list(APPEND LDFLAGS -lm -lstdc++)
 set(LIBS -lstdc++)
 set(FP_ABSTOLERANCE 0.01)
@@ -11,4 +8,4 @@ if("${ARCH}" STREQUAL "XCore")
 endif()
 llvm_singlesource()
 
-llvm_add_subdirectories(${DIRS})
+llvm_add_subdirectories(Large)

Modified: test-suite/trunk/SingleSource/Benchmarks/Polybench/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/SingleSource/Benchmarks/Polybench/CMakeLists.txt?rev=257681&r1=257680&r2=257681&view=diff
==============================================================================
--- test-suite/trunk/SingleSource/Benchmarks/Polybench/CMakeLists.txt (original)
+++ test-suite/trunk/SingleSource/Benchmarks/Polybench/CMakeLists.txt Wed Jan 13 15:53:54 2016
@@ -1,5 +1 @@
-set(PARALLEL_DIRS)
-
-set(PARALLEL_DIRS datamining linear-algebra medley stencils)
-
-llvm_add_subdirectories(${PARALLEL_DIRS})
+llvm_add_subdirectories(datamining linear-algebra medley stencils)

Modified: test-suite/trunk/SingleSource/Benchmarks/Polybench/datamining/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/SingleSource/Benchmarks/Polybench/datamining/CMakeLists.txt?rev=257681&r1=257680&r2=257681&view=diff
==============================================================================
--- test-suite/trunk/SingleSource/Benchmarks/Polybench/datamining/CMakeLists.txt (original)
+++ test-suite/trunk/SingleSource/Benchmarks/Polybench/datamining/CMakeLists.txt Wed Jan 13 15:53:54 2016
@@ -1,5 +1 @@
-set(PARALLEL_DIRS)
-
-set(PARALLEL_DIRS correlation covariance )
-
-llvm_add_subdirectories(${PARALLEL_DIRS})
+llvm_add_subdirectories(correlation covariance)

Modified: test-suite/trunk/SingleSource/Benchmarks/Polybench/linear-algebra/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/SingleSource/Benchmarks/Polybench/linear-algebra/CMakeLists.txt?rev=257681&r1=257680&r2=257681&view=diff
==============================================================================
--- test-suite/trunk/SingleSource/Benchmarks/Polybench/linear-algebra/CMakeLists.txt (original)
+++ test-suite/trunk/SingleSource/Benchmarks/Polybench/linear-algebra/CMakeLists.txt Wed Jan 13 15:53:54 2016
@@ -1,5 +1 @@
-set(PARALLEL_DIRS)
-
-set(PARALLEL_DIRS kernels solvers)
-
-llvm_add_subdirectories(${PARALLEL_DIRS})
+llvm_add_subdirectories(kernels solvers)

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=257681&r1=257680&r2=257681&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 Wed Jan 13 15:53:54 2016
@@ -1,13 +1,4 @@
-set(PARALLEL_DIRS)
-
-set(PARALLEL_DIRS 2mm 3mm atax bicg cholesky doitgen gemm gemver gesummv mvt symm syr2k syrk trisolv trmm)
-if(DEFINED BENCHMARKING_ONLY)
-  llvm_filter_out(TMP1 2mm  ${PARALLEL_DIRS})
-  set(PARALLEL_DIRS ${TMP1})
-  llvm_filter_out(TMP2 3mm  ${PARALLEL_DIRS})
-  set(PARALLEL_DIRS ${TMP2})
-  llvm_filter_out(TMP3 gemm  ${PARALLEL_DIRS})
-  set(PARALLEL_DIRS ${TMP3})
+if(NOT DEFINED BENCHMARKING_ONLY)
+  llvm_add_subdirectories(2mm 3mm gemm)
 endif()
-
-llvm_add_subdirectories(${PARALLEL_DIRS})
+llvm_add_subdirectories(atax bicg cholesky doitgen gemver gesummv mvt symm syr2k syrk trisolv trmm)

Modified: test-suite/trunk/SingleSource/Benchmarks/Polybench/linear-algebra/solvers/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/SingleSource/Benchmarks/Polybench/linear-algebra/solvers/CMakeLists.txt?rev=257681&r1=257680&r2=257681&view=diff
==============================================================================
--- test-suite/trunk/SingleSource/Benchmarks/Polybench/linear-algebra/solvers/CMakeLists.txt (original)
+++ test-suite/trunk/SingleSource/Benchmarks/Polybench/linear-algebra/solvers/CMakeLists.txt Wed Jan 13 15:53:54 2016
@@ -1,5 +1 @@
-set(PARALLEL_DIRS)
-
-set(PARALLEL_DIRS durbin dynprog gramschmidt lu)
-
-llvm_add_subdirectories(${PARALLEL_DIRS})
+llvm_add_subdirectories(durbin dynprog gramschmidt lu)

Modified: test-suite/trunk/SingleSource/Benchmarks/Polybench/medley/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/SingleSource/Benchmarks/Polybench/medley/CMakeLists.txt?rev=257681&r1=257680&r2=257681&view=diff
==============================================================================
--- test-suite/trunk/SingleSource/Benchmarks/Polybench/medley/CMakeLists.txt (original)
+++ test-suite/trunk/SingleSource/Benchmarks/Polybench/medley/CMakeLists.txt Wed Jan 13 15:53:54 2016
@@ -1,5 +1 @@
-set(PARALLEL_DIRS)
-
-set(PARALLEL_DIRS floyd-warshall reg_detect)
-
-llvm_add_subdirectories(${PARALLEL_DIRS})
+llvm_add_subdirectories(floyd-warshall reg_detect)

Modified: test-suite/trunk/SingleSource/Benchmarks/Polybench/stencils/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/SingleSource/Benchmarks/Polybench/stencils/CMakeLists.txt?rev=257681&r1=257680&r2=257681&view=diff
==============================================================================
--- test-suite/trunk/SingleSource/Benchmarks/Polybench/stencils/CMakeLists.txt (original)
+++ test-suite/trunk/SingleSource/Benchmarks/Polybench/stencils/CMakeLists.txt Wed Jan 13 15:53:54 2016
@@ -1,5 +1 @@
-set(PARALLEL_DIRS)
-
-set(PARALLEL_DIRS adi fdtd-2d fdtd-apml jacobi-1d-imper jacobi-2d-imper seidel-2d)
-
-llvm_add_subdirectories(${PARALLEL_DIRS})
+llvm_add_subdirectories(adi fdtd-2d fdtd-apml jacobi-1d-imper jacobi-2d-imper seidel-2d)

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=257681&r1=257680&r2=257681&view=diff
==============================================================================
--- test-suite/trunk/SingleSource/Benchmarks/Shootout-C++/CMakeLists.txt (original)
+++ test-suite/trunk/SingleSource/Benchmarks/Shootout-C++/CMakeLists.txt Wed Jan 13 15:53:54 2016
@@ -1,9 +1,6 @@
-set(DIRS)
-
 list(APPEND CXXFLAGS -Wno-deprecated)
 list(APPEND CPPFLAGS -Wno-deprecated)
 set(FP_TOLERANCE 0.00000001)
-set(DIRS EH)
 if("${ARCH}" STREQUAL "XCore")
   if(NOT DEFINED SMALL_PROBLEM_SIZE)
     set(XCORE_TARGET_NEEDS_MEMORY 256)
@@ -16,4 +13,4 @@ endif()
 list(APPEND LDFLAGS -lstdc++)
 llvm_singlesource()
 
-llvm_add_subdirectories(${DIRS})
+llvm_add_subdirectories(EH)

Modified: test-suite/trunk/SingleSource/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/SingleSource/CMakeLists.txt?rev=257681&r1=257680&r2=257681&view=diff
==============================================================================
--- test-suite/trunk/SingleSource/CMakeLists.txt (original)
+++ test-suite/trunk/SingleSource/CMakeLists.txt Wed Jan 13 15:53:54 2016
@@ -1,8 +1,5 @@
-set(PARALLEL_DIRS)
-
-set(PARALLEL_DIRS Regression Benchmarks)
+llvm_add_subdirectories(Regression Benchmarks)
 if(NOT DEFINED BENCHMARKING_ONLY)
-  list(APPEND PARALLEL_DIRS UnitTests)
+  llvm_add_subdirectories(UnitTests)
 endif()
 
-llvm_add_subdirectories(${PARALLEL_DIRS})

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=257681&r1=257680&r2=257681&view=diff
==============================================================================
--- test-suite/trunk/SingleSource/Regression/C++/CMakeLists.txt (original)
+++ test-suite/trunk/SingleSource/Regression/C++/CMakeLists.txt Wed Jan 13 15:53:54 2016
@@ -1,10 +1,7 @@
-set(DIRS)
-
-set(DIRS EH)
 if(DEFINED 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++)
 llvm_singlesource()
 
-llvm_add_subdirectories(${DIRS})
+llvm_add_subdirectories(EH)

Modified: test-suite/trunk/SingleSource/Regression/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/SingleSource/Regression/CMakeLists.txt?rev=257681&r1=257680&r2=257681&view=diff
==============================================================================
--- test-suite/trunk/SingleSource/Regression/CMakeLists.txt (original)
+++ test-suite/trunk/SingleSource/Regression/CMakeLists.txt Wed Jan 13 15:53:54 2016
@@ -1,5 +1 @@
-set(DIRS)
-
-set(DIRS C++ C)
-
-llvm_add_subdirectories(${DIRS})
+llvm_add_subdirectories(C++ C)

Modified: test-suite/trunk/SingleSource/UnitTests/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/SingleSource/UnitTests/CMakeLists.txt?rev=257681&r1=257680&r2=257681&view=diff
==============================================================================
--- test-suite/trunk/SingleSource/UnitTests/CMakeLists.txt (original)
+++ test-suite/trunk/SingleSource/UnitTests/CMakeLists.txt Wed Jan 13 15:53:54 2016
@@ -1,12 +1,7 @@
-set(DIRS)
+llvm_add_subdirectories(SetjmpLongjmp Vector Vectorizer SignlessTypes Threads C++11)
 
-set(DIRS SetjmpLongjmp)
-set(DIRS )
-list(APPEND DIRS Vector)
-list(APPEND DIRS Vectorizer)
-list(APPEND DIRS SignlessTypes Threads C++11)
 if("${TARGET_OS}" STREQUAL "Darwin")
-  list(APPEND DIRS ObjC ObjC++)
+  llvm_add_subdirectories(ObjC ObjC++)
 endif()
 if("${TARGET_OS}" STREQUAL "Darwin")
   set(PROGRAMS_TO_SKIP 2007-04-25-weak)
@@ -22,7 +17,7 @@ if("${ARCH}" STREQUAL "AArch64")
   list(APPEND PROGRAMS_TO_SKIP blockstret)
 endif()
 if("${ARCH}" STREQUAL "Mips")
-  list(APPEND DIRS Mips)
+  llvm_add_subdirectories(Mips)
   string(FIND "${MIPSARCH}" "mips64" TMP2)
   if("" STREQUAL "${TMP2}")
     list(APPEND PROGRAMS_TO_SKIP AtomicOps)
@@ -35,5 +30,3 @@ if("${ARCH}" STREQUAL "XCore")
 endif()
 list(APPEND LDFLAGS -lstdc++)
 llvm_singlesource()
-
-llvm_add_subdirectories(${DIRS})

Modified: test-suite/trunk/SingleSource/UnitTests/Mips/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/SingleSource/UnitTests/Mips/CMakeLists.txt?rev=257681&r1=257680&r2=257681&view=diff
==============================================================================
--- test-suite/trunk/SingleSource/UnitTests/Mips/CMakeLists.txt (original)
+++ test-suite/trunk/SingleSource/UnitTests/Mips/CMakeLists.txt Wed Jan 13 15:53:54 2016
@@ -1,8 +1,4 @@
-set(PARALLEL_DIRS)
-
 string(FIND "${MIPSARCH}" "mips16" TMP1)
 if(NOT "" STREQUAL "${TMP1}")
-  list(APPEND PARALLEL_DIRS Mips16)
+  llvm_add_subdirectories(Mips16)
 endif()
-
-llvm_add_subdirectories(${PARALLEL_DIRS})

Modified: test-suite/trunk/SingleSource/UnitTests/SetjmpLongjmp/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/SingleSource/UnitTests/SetjmpLongjmp/CMakeLists.txt?rev=257681&r1=257680&r2=257681&view=diff
==============================================================================
--- test-suite/trunk/SingleSource/UnitTests/SetjmpLongjmp/CMakeLists.txt (original)
+++ test-suite/trunk/SingleSource/UnitTests/SetjmpLongjmp/CMakeLists.txt Wed Jan 13 15:53:54 2016
@@ -1,5 +1 @@
-set(DIRS)
-
-set(DIRS C C++)
-
-llvm_add_subdirectories(${DIRS})
+llvm_add_subdirectories(C C++)

Modified: test-suite/trunk/SingleSource/UnitTests/SignlessTypes/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/SingleSource/UnitTests/SignlessTypes/CMakeLists.txt?rev=257681&r1=257680&r2=257681&view=diff
==============================================================================
--- test-suite/trunk/SingleSource/UnitTests/SignlessTypes/CMakeLists.txt (original)
+++ test-suite/trunk/SingleSource/UnitTests/SignlessTypes/CMakeLists.txt Wed Jan 13 15:53:54 2016
@@ -1,10 +1,7 @@
-set(DIRS)
-
-set(DIRS Large)
 execute_process(COMMAND date +%j OUTPUT_VARIABLE TMP1)
 set(SEED TMP1)
 set(RUN_OPTIONS 31415926)
 list(APPEND LDFLAGS -lstdc++)
 llvm_singlesource()
 
-llvm_add_subdirectories(${DIRS})
+llvm_add_subdirectories(Large)

Modified: test-suite/trunk/SingleSource/UnitTests/Vector/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/SingleSource/UnitTests/Vector/CMakeLists.txt?rev=257681&r1=257680&r2=257681&view=diff
==============================================================================
--- test-suite/trunk/SingleSource/UnitTests/Vector/CMakeLists.txt (original)
+++ test-suite/trunk/SingleSource/UnitTests/Vector/CMakeLists.txt Wed Jan 13 15:53:54 2016
@@ -1,21 +1,18 @@
-set(DIRS)
-
-set(DIRS )
 if("${ARCH}" STREQUAL "PowerPC")
-  list(APPEND DIRS Altivec)
+  llvm_add_subdirectories(Altivec)
 endif()
 if("${ARCH}" STREQUAL "x86")
-  list(APPEND DIRS SSE)
+  llvm_add_subdirectories(SSE)
 endif()
 llvm_filter(TMP1 ${ARCH} x86_64 x86_64h)
 if("${ARCH}" STREQUAL "${TMP1}")
-  list(APPEND DIRS SSE)
+  llvm_add_subdirectories(SSE)
 endif()
 if(NOT "${CC_UNDER_TEST_TARGET_IS_THUMBV7}" STREQUAL "")
-  list(APPEND DIRS NEON)
+  llvm_add_subdirectories(NEON)
 endif()
 if("${ARCH}" STREQUAL "AArch64")
-  list(APPEND DIRS NEON AArch64)
+  llvm_add_subdirectories(NEON AArch64)
 endif()
 if(NOT DEFINED CC_UNDER_TEST_IS_CLANG)
   set(PROGRAMS_TO_SKIP constpool)
@@ -26,5 +23,3 @@ if("${ARCH}" STREQUAL "XCore")
   endif()
 endif()
 llvm_singlesource()
-
-llvm_add_subdirectories(${DIRS})




More information about the llvm-commits mailing list