Skip to content

Commit 13605ab

Browse files
jurahuljurahul
authored
[LLVM] Specialize test suites for TableGen and FileCheck to use smaller set of dependencies (#155929)
Define lit testsuite for FileCheck and TableGen with smaller set of dependencies. This uses the new `SKIP` argument to `add_lit_testsuites` that was added in #157176.
1 parent 1597fad commit 13605ab

File tree

3 files changed

+113
-93
lines changed

3 files changed

+113
-93
lines changed

‎llvm/test/CMakeLists.txt‎

Lines changed: 104 additions & 93 deletions
Original file line numberDiff line numberDiff line change
@@ -59,100 +59,106 @@ configure_lit_site_cfg(
5959

6060
# Set the depends list as a variable so that it can grow conditionally.
6161
# NOTE: Sync the substitutions in test/lit.cfg when adding to this list.
62+
63+
set(LLVM_TEST_DEPENDS_COMMON
64+
FileCheck
65+
count
66+
llvm-config
67+
not
68+
prepare-check-lit
69+
)
70+
6271
set(LLVM_TEST_DEPENDS
63-
BugpointPasses
64-
FileCheck
65-
LLVMWindowsDriver
66-
UnitTests
67-
bugpoint
68-
count
69-
llc
70-
lli
71-
lli-child-target
72-
llvm-addr2line
73-
llvm-ar
74-
llvm-as
75-
llvm-bcanalyzer
76-
llvm-bitcode-strip
77-
llvm-c-test
78-
llvm-cat
79-
llvm-cfi-verify
80-
llvm-cgdata
81-
llvm-config
82-
llvm-cov
83-
llvm-ctxprof-util
84-
llvm-cvtres
85-
llvm-cxxdump
86-
llvm-cxxfilt
87-
llvm-cxxmap
88-
llvm-debuginfo-analyzer
89-
llvm-debuginfod-find
90-
llvm-diff
91-
llvm-dis
92-
llvm-dlltool
93-
dsymutil
94-
llvm-dwarfdump
95-
llvm-dwarfutil
96-
llvm-dwp
97-
llvm-exegesis
98-
llvm-extract
99-
llvm-gsymutil
100-
llvm-ir2vec
101-
llvm-isel-fuzzer
102-
llvm-ifs
103-
llvm-install-name-tool
104-
llvm-jitlink
105-
llvm-lib
106-
llvm-libtool-darwin
107-
llvm-link
108-
llvm-lipo
109-
llvm-locstats
110-
llvm-lto2
111-
llvm-mc
112-
llvm-mca
113-
llvm-ml
114-
llvm-ml64
115-
llvm-modextract
116-
llvm-nm
117-
llvm-objcopy
118-
llvm-objdump
119-
llvm-opt-fuzzer
120-
llvm-opt-report
121-
llvm-offload-wrapper
122-
llvm-otool
123-
llvm-pdbutil
124-
llvm-profdata
125-
llvm-profgen
126-
llvm-ranlib
127-
llvm-rc
128-
llvm-readobj
129-
llvm-readelf
130-
llvm-reduce
131-
llvm-remarkutil
132-
llvm-rtdyld
133-
llvm-sim
134-
llvm-size
135-
llvm-split
136-
llvm-stress
137-
llvm-strings
138-
llvm-strip
139-
llvm-symbolizer
140-
llvm-tblgen
141-
llvm-readtapi
142-
llvm-tli-checker
143-
llvm-undname
144-
llvm-windres
145-
llvm-xray
146-
not
147-
obj2yaml
148-
opt
149-
sancov
150-
sanstats
151-
split-file
152-
verify-uselistorder
153-
yaml-bench
154-
yaml2obj
155-
)
72+
${LLVM_TEST_DEPENDS_COMMON}
73+
BugpointPasses
74+
LLVMWindowsDriver
75+
UnitTests
76+
bugpoint
77+
llc
78+
lli
79+
lli-child-target
80+
llvm-addr2line
81+
llvm-ar
82+
llvm-as
83+
llvm-bcanalyzer
84+
llvm-bitcode-strip
85+
llvm-c-test
86+
llvm-cat
87+
llvm-cfi-verify
88+
llvm-cgdata
89+
llvm-cov
90+
llvm-ctxprof-util
91+
llvm-cvtres
92+
llvm-cxxdump
93+
llvm-cxxfilt
94+
llvm-cxxmap
95+
llvm-debuginfo-analyzer
96+
llvm-debuginfod-find
97+
llvm-diff
98+
llvm-dis
99+
llvm-dlltool
100+
dsymutil
101+
llvm-dwarfdump
102+
llvm-dwarfutil
103+
llvm-dwp
104+
llvm-exegesis
105+
llvm-extract
106+
llvm-gsymutil
107+
llvm-ir2vec
108+
llvm-isel-fuzzer
109+
llvm-ifs
110+
llvm-install-name-tool
111+
llvm-jitlink
112+
llvm-lib
113+
llvm-libtool-darwin
114+
llvm-link
115+
llvm-lipo
116+
llvm-locstats
117+
llvm-lto2
118+
llvm-mc
119+
llvm-mca
120+
llvm-ml
121+
llvm-ml64
122+
llvm-modextract
123+
llvm-nm
124+
llvm-objcopy
125+
llvm-objdump
126+
llvm-opt-fuzzer
127+
llvm-opt-report
128+
llvm-offload-wrapper
129+
llvm-otool
130+
llvm-pdbutil
131+
llvm-profdata
132+
llvm-profgen
133+
llvm-ranlib
134+
llvm-rc
135+
llvm-readobj
136+
llvm-readelf
137+
llvm-reduce
138+
llvm-remarkutil
139+
llvm-rtdyld
140+
llvm-sim
141+
llvm-size
142+
llvm-split
143+
llvm-stress
144+
llvm-strings
145+
llvm-strip
146+
llvm-symbolizer
147+
llvm-tblgen
148+
llvm-readtapi
149+
llvm-tli-checker
150+
llvm-undname
151+
llvm-windres
152+
llvm-xray
153+
obj2yaml
154+
opt
155+
sancov
156+
sanstats
157+
split-file
158+
verify-uselistorder
159+
yaml-bench
160+
yaml2obj
161+
)
156162

157163
if(TARGET llvm-lto)
158164
set(LLVM_TEST_DEPENDS ${LLVM_TEST_DEPENDS} llvm-lto)
@@ -259,11 +265,16 @@ add_lit_testsuite(check-llvm "Running the LLVM regression tests"
259265
)
260266
set_target_properties(check-llvm PROPERTIES FOLDER "LLVM/Tests")
261267

268+
# Note, exclude TableGen and FileCheck directories as we define them with a
269+
# reduced set of dependencies in their individual CMakeLists.txt
262270
add_lit_testsuites(LLVM ${CMAKE_CURRENT_SOURCE_DIR}
263271
${exclude_from_check_all}
264272
DEPENDS ${LLVM_TEST_DEPENDS}
265273
FOLDER "Tests/Subdirectories"
274+
SKIP "^FileCheck" "^TableGen"
266275
)
276+
add_subdirectory(FileCheck)
277+
add_subdirectory(TableGen)
267278

268279
# Setup an alias for 'check-all'.
269280
add_custom_target(check)

‎llvm/test/FileCheck/CMakeLists.txt‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
add_lit_testsuite(check-llvm-filecheck "Running lit suite for FileCheck"
2+
${CMAKE_CURRENT_BINARY_DIR}
3+
DEPENDS ${LLVM_TEST_DEPENDS_COMMON}
4+
)

‎llvm/test/TableGen/CMakeLists.txt‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
add_lit_testsuite(check-llvm-tablegen "Running lit suite for TableGen"
2+
${CMAKE_CURRENT_BINARY_DIR}
3+
DEPENDS ${LLVM_TEST_DEPENDS_COMMON}
4+
DEPENDS llvm-tblgen
5+
)

0 commit comments

Comments
 (0)