Skip to content

Commit e16cfc0

Browse files
committed
[offload] Fix path to llvm-offload-device-info in standalone build
Fix path to `llvm-offload-device-info` tool in standalone build. This tool is built as part of offload, so rather than looking it up as a preinstalled tool, set correct `LLVM_RUNTIME_OUTPUT_INTDIR` for the `llvm_add_tool()` call, and unconditionally set `OFFLOAD_DEVICE_INFO_EXECUTABLE` using that directory.
1 parent ca7380c commit e16cfc0

File tree

2 files changed

+4
-12
lines changed

2 files changed

+4
-12
lines changed

offload/CMakeLists.txt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,9 @@ if (OPENMP_STANDALONE_BUILD)
6464
# Do not use OPENMP_LIBDIR_SUFFIX directly, use OPENMP_INSTALL_LIBDIR.
6565
set(OPENMP_INSTALL_LIBDIR "lib${OPENMP_LIBDIR_SUFFIX}")
6666

67+
# Used by llvm_add_tool() and tests.
68+
set(LLVM_RUNTIME_OUTPUT_INTDIR ${CMAKE_CURRENT_BINARY_DIR})
69+
6770
# Group test settings.
6871
set(OPENMP_TEST_C_COMPILER ${CMAKE_C_COMPILER} CACHE STRING
6972
"C compiler to use for testing OpenMP runtime libraries.")

offload/cmake/OpenMPTesting.cmake

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -37,17 +37,6 @@ function(find_standalone_test_dependencies)
3737
return()
3838
endif()
3939

40-
find_program(OFFLOAD_DEVICE_INFO_EXECUTABLE
41-
NAMES llvm-offload-device-info
42-
PATHS ${OPENMP_LLVM_TOOLS_DIR})
43-
if (NOT OFFLOAD_DEVICE_INFO_EXECUTABLE)
44-
message(STATUS "Cannot find 'llvm-offload-device-info'.")
45-
message(STATUS "Please put 'not' in your PATH, set OFFLOAD_DEVICE_INFO_EXECUTABLE to its full path, or point OPENMP_LLVM_TOOLS_DIR to its directory.")
46-
message(WARNING "The check targets will not be available!")
47-
set(ENABLE_CHECK_TARGETS FALSE PARENT_SCOPE)
48-
return()
49-
endif()
50-
5140
find_program(OPENMP_NOT_EXECUTABLE
5241
NAMES not
5342
PATHS ${OPENMP_LLVM_TOOLS_DIR})
@@ -82,8 +71,8 @@ else()
8271
set(OPENMP_FILECHECK_EXECUTABLE ${LLVM_RUNTIME_OUTPUT_INTDIR}/FileCheck)
8372
endif()
8473
set(OPENMP_NOT_EXECUTABLE ${LLVM_RUNTIME_OUTPUT_INTDIR}/not)
85-
set(OFFLOAD_DEVICE_INFO_EXECUTABLE ${LLVM_RUNTIME_OUTPUT_INTDIR}/llvm-offload-device-info)
8674
endif()
75+
set(OFFLOAD_DEVICE_INFO_EXECUTABLE ${LLVM_RUNTIME_OUTPUT_INTDIR}/llvm-offload-device-info)
8776

8877
# Macro to extract information about compiler from file. (no own scope)
8978
macro(extract_test_compiler_information lang file)

0 commit comments

Comments
 (0)