Skip to content

Commit cb0bb9b

Browse files
MatzeBMatzeB
committed
cmake: Remove custom llvm_add_subdirectories() usage; NFC
- People familiar with cmake already know add_subdirectory() so they do not need lookup whether llvm_add_subdirectories() has additional semantics. - Replacing one-line lists with list over multiple lines sorted in alphabetical order is merge friendly. llvm-svn: 286143
1 parent e653040 commit cb0bb9b

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

59 files changed

+376
-202
lines changed

‎Bitcode/CMakeLists.txt

+3-3
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,11 @@ endif()
88

99
set(TEST_SUITE_ENABLE_BITCODE_TESTS ${ENABLE_BITCODE_DEFAULT} CACHE BOOL "Enable bitcode tests")
1010
if(TEST_SUITE_ENABLE_BITCODE_TESTS)
11-
llvm_add_subdirectories(Benchmarks)
11+
add_subdirectory(Benchmarks)
1212
if(NOT TEST_SUITE_BENCHMARKING_ONLY)
13-
llvm_add_subdirectories(Regression)
13+
add_subdirectory(Regression)
1414
if(ARCH STREQUAL "x86" OR ARCH STREQUAL "AArch64" OR ARCH STREQUAL "ARM")
15-
llvm_add_subdirectories(simd_ops)
15+
add_subdirectory(simd_ops)
1616
endif()
1717
endif()
1818
endif()

‎CMakeLists.txt

-1
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,6 @@ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${TEST_SUITE_DIAGNOSE_FLAGS}")
118118
set(CMAKE_EXE_LINKER_FLAGS
119119
"${CMAKE_EXE_LINKER_FLAGS} ${TEST_SUITE_DIAGNOSE_LINKER_FLAGS}")
120120

121-
include(MakefileFunctions)
122121
include(SingleMultiSource)
123122
find_package(TCL)
124123

‎External/CMakeLists.txt

+6-8
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,9 @@ macro(llvm_externals_find PATHVAR NAME DESCRIPTION)
2222
endif()
2323
endmacro()
2424

25-
llvm_add_subdirectories(
26-
CUDA
27-
HMMER
28-
Nurbs
29-
Povray
30-
SPEC
31-
skidmarks10
32-
)
25+
add_subdirectory(CUDA)
26+
add_subdirectory(HMMER)
27+
add_subdirectory(Nurbs)
28+
add_subdirectory(Povray)
29+
add_subdirectory(SPEC)
30+
add_subdirectory(skidmarks10)

‎External/SPEC/CFP2000/CMakeLists.txt

+9-13
Original file line numberDiff line numberDiff line change
@@ -4,18 +4,14 @@ if(CMAKE_SIZEOF_VOID_P EQUAL 8)
44
list(APPEND CPPFLAGS -DSPEC_CPU2000_LP64)
55
endif()
66

7-
macro(cfp2000_subdir)
8-
foreach(BENCHMARK ${ARGN})
9-
set(BENCHMARK_DIR ${TEST_SUITE_SPEC2000_ROOT}/benchspec/CFP2000/${BENCHMARK})
10-
set(PROG ${BENCHMARK})
11-
file(GLOB Source ${BENCHMARK_DIR}/src/*.c ${BENCHMARK_DIR}/src/*.cpp)
12-
llvm_add_subdirectories(${BENCHMARK})
13-
endforeach()
7+
macro(cfp2000_subdir BENCHMARK)
8+
set(BENCHMARK_DIR ${TEST_SUITE_SPEC2000_ROOT}/benchspec/CFP2000/${BENCHMARK})
9+
set(PROG ${BENCHMARK})
10+
file(GLOB Source ${BENCHMARK_DIR}/src/*.c ${BENCHMARK_DIR}/src/*.cpp)
11+
add_subdirectory(${BENCHMARK})
1412
endmacro()
1513

16-
cfp2000_subdir(
17-
177.mesa
18-
179.art
19-
183.equake
20-
188.ammp
21-
)
14+
cfp2000_subdir(177.mesa)
15+
cfp2000_subdir(179.art)
16+
cfp2000_subdir(183.equake)
17+
cfp2000_subdir(188.ammp)

‎External/SPEC/CFP2006/CMakeLists.txt

+12-16
Original file line numberDiff line numberDiff line change
@@ -26,21 +26,17 @@ if(CMAKE_SIZEOF_VOID_P EQUAL 8)
2626
list(APPEND CPPFLAGS -DSPEC_CPU_LP64)
2727
endif()
2828

29-
macro(cpu2006_subdir)
30-
foreach(BENCHMARK ${ARGN})
31-
set(BENCHMARK_DIR ${TEST_SUITE_SPEC2006_ROOT}/benchspec/CPU2006/${BENCHMARK})
32-
set(PROG ${BENCHMARK})
33-
file(GLOB Source ${BENCHMARK_DIR}/src/*.c ${BENCHMARK_DIR}/src/*.cpp ${BENCHMARK_DIR}/src/*.cc)
34-
llvm_add_subdirectories(${BENCHMARK})
35-
endforeach()
29+
macro(cpu2006_subdir BENCHMARK)
30+
set(BENCHMARK_DIR ${TEST_SUITE_SPEC2006_ROOT}/benchspec/CPU2006/${BENCHMARK})
31+
set(PROG ${BENCHMARK})
32+
file(GLOB Source ${BENCHMARK_DIR}/src/*.c ${BENCHMARK_DIR}/src/*.cpp ${BENCHMARK_DIR}/src/*.cc)
33+
add_subdirectory(${BENCHMARK})
3634
endmacro()
3735

38-
cpu2006_subdir(
39-
433.milc
40-
444.namd
41-
447.dealII
42-
450.soplex
43-
453.povray
44-
470.lbm
45-
482.sphinx3
46-
)
36+
cpu2006_subdir(433.milc)
37+
cpu2006_subdir(444.namd)
38+
cpu2006_subdir(447.dealII)
39+
cpu2006_subdir(450.soplex)
40+
cpu2006_subdir(453.povray)
41+
cpu2006_subdir(470.lbm)
42+
cpu2006_subdir(482.sphinx3)

‎External/SPEC/CINT2000/CMakeLists.txt

+17-21
Original file line numberDiff line numberDiff line change
@@ -3,26 +3,22 @@ if(CMAKE_SIZEOF_VOID_P EQUAL 8)
33
list(APPEND CPPFLAGS -DSPEC_CPU2000_LP64)
44
endif()
55

6-
macro(cint2000_subdir)
7-
foreach(BENCHMARK ${ARGN})
8-
set(BENCHMARK_DIR ${TEST_SUITE_SPEC2000_ROOT}/benchspec/CINT2000/${BENCHMARK})
9-
set(PROG ${BENCHMARK})
10-
file(GLOB Source ${BENCHMARK_DIR}/src/*.c ${BENCHMARK_DIR}/src/*.cpp)
11-
llvm_add_subdirectories(${BENCHMARK})
12-
endforeach()
6+
macro(cint2000_subdir BENCHMARK)
7+
set(BENCHMARK_DIR ${TEST_SUITE_SPEC2000_ROOT}/benchspec/CINT2000/${BENCHMARK})
8+
set(PROG ${BENCHMARK})
9+
file(GLOB Source ${BENCHMARK_DIR}/src/*.c ${BENCHMARK_DIR}/src/*.cpp)
10+
add_subdirectory(${BENCHMARK})
1311
endmacro()
1412

15-
cint2000_subdir(
16-
164.gzip
17-
175.vpr
18-
176.gcc
19-
181.mcf
20-
186.crafty
21-
197.parser
22-
252.eon
23-
253.perlbmk
24-
254.gap
25-
255.vortex
26-
256.bzip2
27-
300.twolf
28-
)
13+
cint2000_subdir(164.gzip)
14+
cint2000_subdir(175.vpr)
15+
cint2000_subdir(176.gcc)
16+
cint2000_subdir(181.mcf)
17+
cint2000_subdir(186.crafty)
18+
cint2000_subdir(197.parser)
19+
cint2000_subdir(252.eon)
20+
cint2000_subdir(253.perlbmk)
21+
cint2000_subdir(254.gap)
22+
cint2000_subdir(255.vortex)
23+
cint2000_subdir(256.bzip2)
24+
cint2000_subdir(300.twolf)

‎External/SPEC/CINT2006/CMakeLists.txt

+17-21
Original file line numberDiff line numberDiff line change
@@ -26,26 +26,22 @@ if(CMAKE_SIZEOF_VOID_P EQUAL 8)
2626
list(APPEND CPPFLAGS -DSPEC_CPU_LP64)
2727
endif()
2828

29-
macro(cpu2006_subdir)
30-
foreach(BENCHMARK ${ARGN})
31-
set(BENCHMARK_DIR ${TEST_SUITE_SPEC2006_ROOT}/benchspec/CPU2006/${BENCHMARK})
32-
set(PROG ${BENCHMARK})
33-
file(GLOB Source ${BENCHMARK_DIR}/src/*.c ${BENCHMARK_DIR}/src/*.cpp)
34-
llvm_add_subdirectories(${BENCHMARK})
35-
endforeach()
29+
macro(cpu2006_subdir BENCHMARK)
30+
set(BENCHMARK_DIR ${TEST_SUITE_SPEC2006_ROOT}/benchspec/CPU2006/${BENCHMARK})
31+
set(PROG ${BENCHMARK})
32+
file(GLOB Source ${BENCHMARK_DIR}/src/*.c ${BENCHMARK_DIR}/src/*.cpp)
33+
add_subdirectory(${BENCHMARK})
3634
endmacro()
3735

38-
cpu2006_subdir(
39-
400.perlbench
40-
401.bzip2
41-
403.gcc
42-
429.mcf
43-
445.gobmk
44-
456.hmmer
45-
458.sjeng
46-
462.libquantum
47-
464.h264ref
48-
471.omnetpp
49-
473.astar
50-
483.xalancbmk
51-
)
36+
cpu2006_subdir(400.perlbench)
37+
cpu2006_subdir(401.bzip2)
38+
cpu2006_subdir(403.gcc)
39+
cpu2006_subdir(429.mcf)
40+
cpu2006_subdir(445.gobmk)
41+
cpu2006_subdir(456.hmmer)
42+
cpu2006_subdir(458.sjeng)
43+
cpu2006_subdir(462.libquantum)
44+
cpu2006_subdir(464.h264ref)
45+
cpu2006_subdir(471.omnetpp)
46+
cpu2006_subdir(473.astar)
47+
cpu2006_subdir(483.xalancbmk)

‎External/SPEC/CINT95/CMakeLists.txt

+13-17
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,17 @@
11
list(APPEND CPPFLAGS -DSPEC_CPU95)
22

3-
macro(cint95_subdir)
4-
foreach(BENCHMARK ${ARGN})
5-
set(BENCHMARK_DIR ${TEST_SUITE_SPEC95_ROOT}/benchspec/CINT95/${BENCHMARK})
6-
set(PROG ${BENCHMARK})
7-
file(GLOB Source ${BENCHMARK_DIR}/src/*.c ${BENCHMARK_DIR}/src/*.cpp)
8-
llvm_add_subdirectories(${BENCHMARK})
9-
endforeach()
3+
macro(cint95_subdir BENCHMARK)
4+
set(BENCHMARK_DIR ${TEST_SUITE_SPEC95_ROOT}/benchspec/CINT95/${BENCHMARK})
5+
set(PROG ${BENCHMARK})
6+
file(GLOB Source ${BENCHMARK_DIR}/src/*.c ${BENCHMARK_DIR}/src/*.cpp)
7+
add_subdirectory(${BENCHMARK})
108
endmacro()
119

12-
cint95_subdir(
13-
099.go
14-
124.m88ksim
15-
# 126.gcc # uses nonstandard lvalue casts which clang doesn't support
16-
129.compress
17-
130.li
18-
132.ijpeg
19-
134.perl
20-
147.vortex
21-
)
10+
cint95_subdir(099.go)
11+
cint95_subdir(124.m88ksim)
12+
#cint95_subdir(126.gcc) # uses nonstandard lvalue casts (without clang support)
13+
cint95_subdir(129.compress)
14+
cint95_subdir(130.li)
15+
cint95_subdir(132.ijpeg)
16+
cint95_subdir(134.perl)
17+
cint95_subdir(147.vortex)

‎External/SPEC/CMakeLists.txt

+6-4
Original file line numberDiff line numberDiff line change
@@ -13,18 +13,20 @@ endif()
1313

1414
llvm_externals_find(TEST_SUITE_SPEC95_ROOT "spec95" "SPEC CPU95")
1515
if(TEST_SUITE_SPEC95_ROOT)
16-
llvm_add_subdirectories(CINT95)
17-
# Note that CFP95 tests are all fortran so not supported by cmake/lit yet
16+
add_subdirectory(CINT95)
17+
# Note that all CFP95 tests are fortran so not supported by cmake/lit yet
1818
endif()
1919

2020
llvm_externals_find(TEST_SUITE_SPEC2000_ROOT "speccpu2000" "SPEC CPU2000")
2121
if(TEST_SUITE_SPEC2000_ROOT)
22-
llvm_add_subdirectories(CFP2000 CINT2000)
22+
add_subdirectory(CFP2000)
23+
add_subdirectory(CINT2000)
2324
endif()
2425

2526
llvm_externals_find(TEST_SUITE_SPEC2006_ROOT "speccpu2006" "SPEC CPU2006")
2627
if(TEST_SUITE_SPEC2006_ROOT)
27-
llvm_add_subdirectories(CINT2006 CFP2006)
28+
add_subdirectory(CINT2006)
29+
add_subdirectory(CFP2006)
2830
endif()
2931

3032
file(COPY lit.local.cfg DESTINATION "${CMAKE_CURRENT_BINARY_DIR}")

‎MultiSource/Applications/ALAC/CMakeLists.txt

+2-1
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
1-
llvm_add_subdirectories(encode decode)
1+
add_subdirectory(encode)
2+
add_subdirectory(decode)

‎MultiSource/Applications/CMakeLists.txt

+24-10
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,44 @@
1-
llvm_add_subdirectories(aha sgefa d spiff oggenc JM viterbi SIBsim4)
1+
add_subdirectory(JM)
2+
add_subdirectory(SIBsim4)
3+
add_subdirectory(aha)
4+
add_subdirectory(d)
5+
add_subdirectory(oggenc)
6+
add_subdirectory(sgefa)
7+
add_subdirectory(spiff)
8+
add_subdirectory(viterbi)
9+
210
if(NOT DEFINED DISABLE_CXX)
3-
llvm_add_subdirectories(lambda-0.1.3 hbd minisat ALAC)
11+
add_subdirectory(ALAC)
12+
add_subdirectory(hbd)
13+
add_subdirectory(lambda-0.1.3)
14+
add_subdirectory(minisat)
415
if(NOT TARGET_OS STREQUAL "SunOS")
5-
llvm_add_subdirectories(hexxagon)
16+
add_subdirectory(hexxagon)
617
endif()
718
endif()
819
if(NOT DEFINED SMALL_PROBLEM_SIZE)
9-
llvm_add_subdirectories(lua)
20+
add_subdirectory(lua)
1021
endif()
1122
if(TARGET_OS STREQUAL "Linux" AND (NOT ARCH STREQUAL "XCore"))
12-
llvm_add_subdirectories(obsequi)
23+
add_subdirectory(obsequi)
1324
endif()
1425
if(NOT TARGET_OS STREQUAL "SunOS")
1526
if(NOT DEFINED DISABLE_CXX)
16-
llvm_add_subdirectories(kimwitu++)
27+
add_subdirectory(kimwitu++)
1728
endif()
1829
endif()
1930
if(NOT TARGET_OS STREQUAL "SunOS")
20-
llvm_add_subdirectories(SPASS)
31+
add_subdirectory(SPASS)
2132
endif()
2233
if(NOT ARCH STREQUAL "XCore")
23-
llvm_add_subdirectories(siod ClamAV lemon)
34+
add_subdirectory(ClamAV)
35+
add_subdirectory(lemon)
36+
add_subdirectory(siod)
2437
endif()
2538
if((NOT ARCH STREQUAL "PowerPC") AND (NOT ARCH STREQUAL "XCore"))
26-
llvm_add_subdirectories(sqlite3)
39+
add_subdirectory(sqlite3)
2740
endif()
2841
if(NOT TEST_SUITE_BENCHMARKING_ONLY)
29-
llvm_add_subdirectories(Burg treecc)
42+
add_subdirectory(Burg)
43+
add_subdirectory(treecc)
3044
endif()

‎MultiSource/Applications/JM/CMakeLists.txt

+2-1
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
1-
llvm_add_subdirectories(ldecod lencod)
1+
add_subdirectory(ldecod)
2+
add_subdirectory(lencod)

‎MultiSource/Benchmarks/ASCI_Purple/CMakeLists.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
llvm_add_subdirectories(SMG2000)
1+
add_subdirectory(SMG2000)

‎MultiSource/Benchmarks/ASC_Sequoia/CMakeLists.txt

+3-1
Original file line numberDiff line numberDiff line change
@@ -1 +1,3 @@
1-
llvm_add_subdirectories(IRSmk AMGmk CrystalMk)
1+
add_subdirectory(AMGmk)
2+
add_subdirectory(CrystalMk)
3+
add_subdirectory(IRSmk)

‎MultiSource/Benchmarks/BitBench/CMakeLists.txt

+4-1
Original file line numberDiff line numberDiff line change
@@ -1 +1,4 @@
1-
llvm_add_subdirectories(five11 drop3 uudecode uuencode)
1+
add_subdirectory(drop3)
2+
add_subdirectory(five11)
3+
add_subdirectory(uudecode)
4+
add_subdirectory(uuencode)

‎MultiSource/Benchmarks/CMakeLists.txt

+28-5
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,36 @@
1-
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)
1+
add_subdirectory(ASCI_Purple)
2+
add_subdirectory(ASC_Sequoia)
3+
add_subdirectory(BitBench)
4+
add_subdirectory(Fhourstones)
5+
add_subdirectory(Fhourstones-3.1)
6+
add_subdirectory(FreeBench)
7+
add_subdirectory(MallocBench)
8+
add_subdirectory(McCat)
9+
add_subdirectory(MiBench)
10+
add_subdirectory(NPB-serial)
11+
add_subdirectory(Olden)
12+
add_subdirectory(Prolangs-C)
13+
add_subdirectory(Ptrdist)
14+
add_subdirectory(SciMark2-C)
15+
add_subdirectory(Trimaran)
16+
add_subdirectory(VersaBench)
17+
add_subdirectory(llubenchmark)
18+
add_subdirectory(mediabench)
19+
add_subdirectory(nbench)
20+
add_subdirectory(sim)
21+
222
if((NOT "${TARGET_OS}" STREQUAL "Darwin") OR (NOT "${ARCH}" STREQUAL "ARM"))
3-
llvm_add_subdirectories(TSVC)
23+
add_subdirectory(TSVC)
424
endif()
525
if(NOT DEFINED DISABLE_CXX)
6-
llvm_add_subdirectories(Prolangs-C++ Bullet tramp3d-v4)
26+
add_subdirectory(Prolangs-C++)
27+
add_subdirectory(Bullet)
28+
add_subdirectory(tramp3d-v4)
729
if(NOT "${ARCH}" STREQUAL "XCore")
8-
llvm_add_subdirectories(7zip PAQ8p)
30+
add_subdirectory(7zip)
31+
add_subdirectory(PAQ8p)
932
endif()
1033
endif()
1134
if(NOT DEFINED SMALL_PROBLEM_SIZE)
12-
llvm_add_subdirectories(mafft)
35+
add_subdirectory(mafft)
1336
endif()

‎MultiSource/Benchmarks/FreeBench/CMakeLists.txt

+7-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,9 @@
1-
llvm_add_subdirectories(distray mason pcompress2 fourinarow neural pifft)
1+
add_subdirectory(distray)
2+
add_subdirectory(fourinarow)
3+
add_subdirectory(mason)
4+
add_subdirectory(neural)
5+
add_subdirectory(pcompress2)
6+
add_subdirectory(pifft)
27
if(NOT "${ARCH}" STREQUAL "Sparc")
3-
llvm_add_subdirectories(analyzer)
8+
add_subdirectory(analyzer)
49
endif()

‎MultiSource/Benchmarks/MallocBench/CMakeLists.txt

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
llvm_add_subdirectories(espresso gs)
1+
add_subdirectory(espresso)
2+
add_subdirectory(gs)
23
if(NOT "${ARCH}" STREQUAL "Alpha")
3-
llvm_add_subdirectories(cfrac)
4+
add_subdirectory(cfrac)
45
endif()

0 commit comments

Comments
 (0)