Skip to content

Commit 841582e

Browse files
committed
benchmarks: Fix sample_symbol_list.txt generation again
This wasn't triggering on a basic build. The various target checks seem to not work as I expect with AND, so split this into separate if TARGET checks.
1 parent 917d815 commit 841582e

File tree

1 file changed

+17
-15
lines changed

1 file changed

+17
-15
lines changed

llvm/benchmarks/CMakeLists.txt

Lines changed: 17 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -22,23 +22,25 @@ if(NOT LLVM_TOOL_LLVM_DRIVER_BUILD)
2222
get_host_tool_path(llvm-nm LLVM_NM llvm_nm_exe llvm_nm_target)
2323
get_host_tool_path(llc LLC llc_exe llc_target)
2424

25-
if(${llc_exe} AND ${llvm_nm_exe})
26-
# Extract the list of symbols in a random utility as sample data.
27-
set(SYMBOL_TEST_DATA_FILE "sample_symbol_list.txt")
28-
set(SYMBOL_TEST_DATA_SOURCE_BINARY ${llc_exe})
25+
if(TARGET ${llc_target})
26+
if(TARGET ${llvm_nm_target})
27+
# Extract the list of symbols in a random utility as sample data.
28+
set(SYMBOL_TEST_DATA_FILE "sample_symbol_list.txt")
29+
set(SYMBOL_TEST_DATA_SOURCE_BINARY ${llc_exe})
2930

30-
add_custom_command(OUTPUT ${SYMBOL_TEST_DATA_FILE}
31-
COMMAND ${llvm_nm_exe} --no-demangle --no-sort
32-
--format=just-symbols
33-
${SYMBOL_TEST_DATA_SOURCE_BINARY} > ${SYMBOL_TEST_DATA_FILE}
34-
DEPENDS ${llvm_nm_target} ${llc_target})
31+
add_custom_command(OUTPUT ${SYMBOL_TEST_DATA_FILE}
32+
COMMAND ${llvm_nm_exe} --no-demangle --no-sort
33+
--format=just-symbols
34+
${SYMBOL_TEST_DATA_SOURCE_BINARY} > ${SYMBOL_TEST_DATA_FILE}
35+
DEPENDS ${llvm_nm_target} ${llc_target})
3536

36-
add_custom_target(generate-runtime-libcalls-sample-symbol-list
37-
DEPENDS ${SYMBOL_TEST_DATA_FILE})
37+
add_custom_target(generate-runtime-libcalls-sample-symbol-list
38+
DEPENDS ${SYMBOL_TEST_DATA_FILE})
3839

39-
add_dependencies(RuntimeLibcallsBench
40-
generate-runtime-libcalls-sample-symbol-list)
41-
target_compile_definitions(RuntimeLibcallsBench PRIVATE
42-
-DSYMBOL_TEST_DATA_FILE="${CMAKE_CURRENT_BINARY_DIR}/${SYMBOL_TEST_DATA_FILE}")
40+
add_dependencies(RuntimeLibcallsBench
41+
generate-runtime-libcalls-sample-symbol-list)
42+
target_compile_definitions(RuntimeLibcallsBench PRIVATE
43+
-DSYMBOL_TEST_DATA_FILE="${CMAKE_CURRENT_BINARY_DIR}/${SYMBOL_TEST_DATA_FILE}")
44+
endif()
4345
endif()
4446
endif()

0 commit comments

Comments
 (0)