Skip to content

Commit 867c101

Browse files
committed
[Offload] Remove standalone build in favor of 'runtimes'
Summary: We have supported standalone builds in the past, but these should likely all go through the LLVM runtimes handling instead. This simplifies a lot of leftover code and opens the way for future cleanups. Offload directly depends on LLVM so this makes even more sense, but already several runtimes projects don't allow these sorts of standalone buildds (libc, libcxx).
1 parent 67b789b commit 867c101

File tree

5 files changed

+90
-247
lines changed

5 files changed

+90
-247
lines changed

offload/CMakeLists.txt

Lines changed: 33 additions & 135 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,13 @@
44
cmake_minimum_required(VERSION 3.20.0)
55
set(LLVM_SUBPROJECT_TITLE "liboffload")
66

7-
# Permit redefining OPENMP_STANDALONE_BUILD when doing a runtimes build.
8-
if (OPENMP_STANDALONE_BUILD OR "${CMAKE_SOURCE_DIR}" STREQUAL "${CMAKE_CURRENT_SOURCE_DIR}")
9-
set(OPENMP_STANDALONE_BUILD TRUE)
10-
project(offload C CXX ASM)
11-
else()
12-
set(OPENMP_STANDALONE_BUILD FALSE)
7+
# Default to C++17.
8+
set(CMAKE_CXX_STANDARD 17)
9+
10+
if(CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR)
11+
message(FATAL_ERROR "Builds rooted in the offload directory are not supported. "
12+
"Builds should be rooted in the runtimes directory instead. "
13+
"Please see the documentation at https://openmp.llvm.org/SupportAndFAQ.html for more info.")
1314
endif()
1415

1516
# Check that the library can actually be built.
@@ -26,20 +27,13 @@ endif()
2627

2728
set(OFFLOAD_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR})
2829

29-
if(OPENMP_STANDALONE_BUILD)
30-
set(OFFLOAD_LIBDIR_SUFFIX "" CACHE STRING
31-
"Suffix of lib installation directory, e.g. 64 => lib64")
32-
set(OFFLOAD_INSTALL_LIBDIR "lib${OFFLOAD_LIBDIR_SUFFIX}" CACHE STRING
33-
"Path where built offload libraries should be installed.")
30+
# When building in tree we install the runtime according to the LLVM settings.
31+
if(LLVM_ENABLE_PER_TARGET_RUNTIME_DIR AND NOT APPLE)
32+
set(OFFLOAD_INSTALL_LIBDIR lib${LLVM_LIBDIR_SUFFIX}/${LLVM_DEFAULT_TARGET_TRIPLE} CACHE STRING
33+
"Path where built offload libraries should be installed.")
3434
else()
35-
# When building in tree we install the runtime according to the LLVM settings.
36-
if(LLVM_ENABLE_PER_TARGET_RUNTIME_DIR AND NOT APPLE)
37-
set(OFFLOAD_INSTALL_LIBDIR lib${LLVM_LIBDIR_SUFFIX}/${LLVM_DEFAULT_TARGET_TRIPLE} CACHE STRING
38-
"Path where built offload libraries should be installed.")
39-
else()
40-
set(OFFLOAD_INSTALL_LIBDIR "lib${LLVM_LIBDIR_SUFFIX}" CACHE STRING
41-
"Path where built offload libraries should be installed.")
42-
endif()
35+
set(OFFLOAD_INSTALL_LIBDIR "lib${LLVM_LIBDIR_SUFFIX}" CACHE STRING
36+
"Path where built offload libraries should be installed.")
4337
endif()
4438

4539
set(LLVM_COMMON_CMAKE_UTILS ${CMAKE_CURRENT_SOURCE_DIR}/../cmake)
@@ -55,67 +49,30 @@ list(INSERT CMAKE_MODULE_PATH 0
5549
"${LLVM_COMMON_CMAKE_UTILS}/Modules"
5650
)
5751

58-
if (OPENMP_STANDALONE_BUILD)
59-
# CMAKE_BUILD_TYPE was not set, default to Release.
60-
if (NOT CMAKE_BUILD_TYPE)
61-
set(CMAKE_BUILD_TYPE Release)
62-
endif()
52+
set(OPENMP_ENABLE_WERROR ${LLVM_ENABLE_WERROR})
53+
# If building in tree, we honor the same install suffix LLVM uses.
54+
set(OPENMP_INSTALL_LIBDIR "lib${LLVM_LIBDIR_SUFFIX}")
6355

64-
# Group common settings.
65-
set(OPENMP_ENABLE_WERROR FALSE CACHE BOOL
66-
"Enable -Werror flags to turn warnings into errors for supporting compilers.")
67-
set(OPENMP_LIBDIR_SUFFIX "" CACHE STRING
68-
"Suffix of lib installation directory, e.g. 64 => lib64")
69-
# Do not use OPENMP_LIBDIR_SUFFIX directly, use OPENMP_INSTALL_LIBDIR.
70-
set(OPENMP_INSTALL_LIBDIR "lib${OPENMP_LIBDIR_SUFFIX}")
71-
72-
# Used by llvm_add_tool() and tests.
73-
set(LLVM_RUNTIME_OUTPUT_INTDIR ${CMAKE_CURRENT_BINARY_DIR})
74-
75-
# Group test settings.
76-
set(OPENMP_TEST_C_COMPILER ${CMAKE_C_COMPILER} CACHE STRING
77-
"C compiler to use for testing OpenMP runtime libraries.")
78-
set(OPENMP_TEST_CXX_COMPILER ${CMAKE_CXX_COMPILER} CACHE STRING
79-
"C++ compiler to use for testing OpenMP runtime libraries.")
80-
set(OPENMP_TEST_Fortran_COMPILER ${CMAKE_Fortran_COMPILER} CACHE STRING
81-
"FORTRAN compiler to use for testing OpenMP runtime libraries.")
82-
set(OPENMP_LLVM_TOOLS_DIR "" CACHE PATH "Path to LLVM tools for testing.")
83-
84-
set(CMAKE_CXX_STANDARD 17 CACHE STRING "C++ standard to conform to")
85-
set(CMAKE_CXX_STANDARD_REQUIRED NO)
86-
set(CMAKE_CXX_EXTENSIONS NO)
56+
if (NOT MSVC)
57+
set(OPENMP_TEST_C_COMPILER ${LLVM_RUNTIME_OUTPUT_INTDIR}/clang)
58+
set(OPENMP_TEST_CXX_COMPILER ${LLVM_RUNTIME_OUTPUT_INTDIR}/clang++)
8759
else()
88-
set(OPENMP_ENABLE_WERROR ${LLVM_ENABLE_WERROR})
89-
# If building in tree, we honor the same install suffix LLVM uses.
90-
set(OPENMP_INSTALL_LIBDIR "lib${LLVM_LIBDIR_SUFFIX}")
91-
92-
if (NOT MSVC)
93-
set(OPENMP_TEST_C_COMPILER ${LLVM_RUNTIME_OUTPUT_INTDIR}/clang)
94-
set(OPENMP_TEST_CXX_COMPILER ${LLVM_RUNTIME_OUTPUT_INTDIR}/clang++)
95-
else()
96-
set(OPENMP_TEST_C_COMPILER ${LLVM_RUNTIME_OUTPUT_INTDIR}/clang.exe)
97-
set(OPENMP_TEST_CXX_COMPILER ${LLVM_RUNTIME_OUTPUT_INTDIR}/clang++.exe)
98-
endif()
99-
100-
# Check for flang
101-
if (NOT MSVC)
102-
set(OPENMP_TEST_Fortran_COMPILER ${LLVM_RUNTIME_OUTPUT_INTDIR}/flang)
103-
else()
104-
set(OPENMP_TEST_Fortran_COMPILER ${LLVM_RUNTIME_OUTPUT_INTDIR}/flang.exe)
105-
endif()
60+
set(OPENMP_TEST_C_COMPILER ${LLVM_RUNTIME_OUTPUT_INTDIR}/clang.exe)
61+
set(OPENMP_TEST_CXX_COMPILER ${LLVM_RUNTIME_OUTPUT_INTDIR}/clang++.exe)
62+
endif()
10663

107-
# Set fortran test compiler if flang is found
108-
if (EXISTS "${OPENMP_TEST_Fortran_COMPILER}")
109-
message("Using local flang build at ${OPENMP_TEST_Fortran_COMPILER}")
110-
else()
111-
unset(OPENMP_TEST_Fortran_COMPILER)
112-
endif()
64+
# Check for flang
65+
if (NOT MSVC)
66+
set(OPENMP_TEST_Fortran_COMPILER ${LLVM_RUNTIME_OUTPUT_INTDIR}/flang)
67+
else()
68+
set(OPENMP_TEST_Fortran_COMPILER ${LLVM_RUNTIME_OUTPUT_INTDIR}/flang.exe)
69+
endif()
11370

114-
# If not standalone, set CMAKE_CXX_STANDARD but don't set the global cache value,
115-
# only set it locally for OpenMP.
116-
set(CMAKE_CXX_STANDARD 17)
117-
set(CMAKE_CXX_STANDARD_REQUIRED NO)
118-
set(CMAKE_CXX_EXTENSIONS NO)
71+
# Set fortran test compiler if flang is found
72+
if (EXISTS "${OPENMP_TEST_Fortran_COMPILER}")
73+
message("Using local flang build at ${OPENMP_TEST_Fortran_COMPILER}")
74+
else()
75+
unset(OPENMP_TEST_Fortran_COMPILER)
11976
endif()
12077

12178
# Set the path of all resulting libraries to a unified location so that it can
@@ -260,65 +217,6 @@ if (LIBOMPTARGET_USE_LTO)
260217
list(APPEND offload_link_flags ${CMAKE_CXX_COMPILE_OPTIONS_IPO})
261218
endif()
262219

263-
if(OPENMP_STANDALONE_BUILD)
264-
if(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
265-
execute_process(
266-
OUTPUT_STRIP_TRAILING_WHITESPACE
267-
COMMAND ${CMAKE_CXX_COMPILER} --print-resource-dir
268-
RESULT_VARIABLE COMMAND_RETURN_CODE
269-
OUTPUT_VARIABLE COMPILER_RESOURCE_DIR
270-
)
271-
endif()
272-
273-
set(LIBOMP_HAVE_OMPT_SUPPORT FALSE)
274-
set(LIBOMP_OMPT_SUPPORT FALSE)
275-
276-
find_path (
277-
LIBOMP_OMP_TOOLS_INCLUDE_DIR
278-
NAMES
279-
omp-tools.h
280-
HINTS
281-
${COMPILER_RESOURCE_DIR}/include
282-
${CMAKE_INSTALL_PREFIX}/include
283-
)
284-
285-
if(LIBOMP_OMP_TOOLS_INCLUDE_DIR)
286-
set(LIBOMP_HAVE_OMPT_SUPPORT TRUE)
287-
set(LIBOMP_OMPT_SUPPORT TRUE)
288-
endif()
289-
290-
# LLVM_LIBRARY_DIRS set by find_package(LLVM) in LibomptargetGetDependencies
291-
find_library (
292-
LIBOMP_STANDALONE
293-
NAMES
294-
omp
295-
HINTS
296-
${CMAKE_INSTALL_PREFIX}/lib
297-
${LLVM_LIBRARY_DIRS}
298-
REQUIRED
299-
)
300-
301-
find_path (
302-
LIBOMP_INCLUDE_DIR
303-
NAMES
304-
omp.h
305-
HINTS
306-
${COMPILER_RESOURCE_DIR}/include
307-
${CMAKE_INSTALL_PREFIX}/include
308-
)
309-
310-
get_filename_component(LIBOMP_LIBRARY_DIR ${LIBOMP_STANDALONE} DIRECTORY)
311-
312-
set(OPENMP_TEST_FLAGS "" CACHE STRING
313-
"Extra compiler flags to send to the test compiler.")
314-
set(OPENMP_TEST_OPENMP_FLAGS ${OPENMP_TEST_COMPILER_OPENMP_FLAGS} CACHE STRING
315-
"OpenMP compiler flag to use for testing OpenMP runtime libraries.")
316-
set(LIBOMPTARGET_OPENMP_HEADER_FOLDER "${LIBOMP_INCLUDE_DIR}" CACHE STRING
317-
"Path to folder containing omp.h")
318-
set(LIBOMPTARGET_OPENMP_HOST_RTL_FOLDER "${LIBOMP_LIBRARY_DIR}" CACHE STRING
319-
"Path to folder containing libomp.so, and libLLVMSupport.so with profiling enabled")
320-
endif()
321-
322220
macro(pythonize_bool var)
323221
if (${var})
324222
set(${var} True)

offload/cmake/Modules/LibomptargetGetDependencies.cmake

Lines changed: 3 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -10,31 +10,9 @@ include (FindPackageHandleStandardArgs)
1010
# Looking for LLVM...
1111
################################################################################
1212

13-
if (OPENMP_STANDALONE_BUILD)
14-
# Complete LLVM package is required for building libomptarget
15-
# in an out-of-tree mode.
16-
find_package(LLVM REQUIRED)
17-
message(STATUS "Found LLVM ${LLVM_PACKAGE_VERSION}")
18-
message(STATUS "Using LLVM in: ${LLVM_DIR}")
19-
list(APPEND LIBOMPTARGET_LLVM_INCLUDE_DIRS ${LLVM_INCLUDE_DIRS})
20-
list(APPEND CMAKE_MODULE_PATH ${LLVM_CMAKE_DIR})
21-
include(AddLLVM)
22-
if(TARGET omptarget)
23-
message(FATAL_ERROR "CMake target 'omptarget' already exists. "
24-
"Use an LLVM installation that doesn't expose its 'omptarget' target.")
25-
endif()
26-
else()
27-
# Note that OPENMP_STANDALONE_BUILD is FALSE, when
28-
# openmp is built with -DLLVM_ENABLE_RUNTIMES="openmp" vs
29-
# -DLLVM_ENABLE_PROJECTS="openmp", but openmp build
30-
# is actually done as a standalone project build with many
31-
# LLVM CMake variables propagated to it.
32-
list(APPEND LIBOMPTARGET_LLVM_INCLUDE_DIRS
33-
${LLVM_MAIN_INCLUDE_DIR} ${LLVM_BINARY_DIR}/include
34-
)
35-
message(STATUS
36-
"Using LLVM include directories: ${LIBOMPTARGET_LLVM_INCLUDE_DIRS}")
37-
endif()
13+
list(APPEND LIBOMPTARGET_LLVM_INCLUDE_DIRS
14+
${LLVM_MAIN_INCLUDE_DIR} ${LLVM_BINARY_DIR}/include
15+
)
3816

3917
################################################################################
4018
# Looking for libffi...

offload/cmake/OpenMPTesting.cmake

Lines changed: 39 additions & 86 deletions
Original file line numberDiff line numberDiff line change
@@ -49,29 +49,14 @@ function(find_standalone_test_dependencies)
4949
endif()
5050
endfunction()
5151

52-
if (${OPENMP_STANDALONE_BUILD})
53-
find_standalone_test_dependencies()
54-
55-
# Set lit arguments.
56-
set(DEFAULT_LIT_ARGS "-sv --show-unsupported --show-xfail")
57-
if (MSVC OR XCODE)
58-
set(DEFAULT_LIT_ARGS "${DEFAULT_LIT_ARGS} --no-progress-bar")
59-
endif()
60-
if ("${CMAKE_SYSTEM_NAME}" MATCHES "AIX")
61-
set(DEFAULT_LIT_ARGS "${DEFAULT_LIT_ARGS} --time-tests --timeout=1800")
62-
endif()
63-
set(OPENMP_LIT_ARGS "${DEFAULT_LIT_ARGS}" CACHE STRING "Options for lit.")
64-
separate_arguments(OPENMP_LIT_ARGS)
52+
if (NOT TARGET "FileCheck")
53+
message(STATUS "Cannot find 'FileCheck'.")
54+
message(WARNING "The check targets will not be available!")
55+
set(ENABLE_CHECK_TARGETS FALSE)
6556
else()
66-
if (NOT TARGET "FileCheck")
67-
message(STATUS "Cannot find 'FileCheck'.")
68-
message(WARNING "The check targets will not be available!")
69-
set(ENABLE_CHECK_TARGETS FALSE)
70-
else()
71-
set(OPENMP_FILECHECK_EXECUTABLE ${LLVM_RUNTIME_OUTPUT_INTDIR}/FileCheck)
72-
endif()
73-
set(OPENMP_NOT_EXECUTABLE ${LLVM_RUNTIME_OUTPUT_INTDIR}/not)
57+
set(OPENMP_FILECHECK_EXECUTABLE ${LLVM_RUNTIME_OUTPUT_INTDIR}/FileCheck)
7458
endif()
59+
set(OPENMP_NOT_EXECUTABLE ${LLVM_RUNTIME_OUTPUT_INTDIR}/not)
7560
set(OFFLOAD_DEVICE_INFO_EXECUTABLE ${LLVM_RUNTIME_OUTPUT_INTDIR}/llvm-offload-device-info)
7661
set(OFFLOAD_TBLGEN_EXECUTABLE ${LLVM_RUNTIME_OUTPUT_INTDIR}/offload-tblgen)
7762

@@ -120,50 +105,28 @@ function(set_test_compiler_information dir)
120105
endif()
121106
endfunction()
122107

123-
if (${OPENMP_STANDALONE_BUILD})
124-
# Detect compiler that should be used for testing.
125-
# We cannot use ExternalProject_Add() because its configuration runs when this
126-
# project is built which is too late for detecting the compiler...
127-
file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/DetectTestCompiler)
128-
execute_process(
129-
COMMAND ${CMAKE_COMMAND} -G${CMAKE_GENERATOR} ${CMAKE_CURRENT_SOURCE_DIR}/../openmp/cmake/DetectTestCompiler
130-
-DCMAKE_C_COMPILER=${OPENMP_TEST_C_COMPILER}
131-
-DCMAKE_CXX_COMPILER=${OPENMP_TEST_CXX_COMPILER}
132-
WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/DetectTestCompiler
133-
OUTPUT_VARIABLE DETECT_COMPILER_OUT
134-
ERROR_VARIABLE DETECT_COMPILER_ERR
135-
RESULT_VARIABLE DETECT_COMPILER_RESULT)
136-
if (DETECT_COMPILER_RESULT)
137-
message(STATUS "Could not detect test compilers.")
138-
message(WARNING "The check targets will not be available!")
139-
set(ENABLE_CHECK_TARGETS FALSE)
140-
else()
141-
set_test_compiler_information(${CMAKE_CURRENT_BINARY_DIR}/DetectTestCompiler)
142-
endif()
108+
# Set the information that we know.
109+
set(OPENMP_TEST_COMPILER_ID "Clang")
110+
# Cannot use CLANG_VERSION because we are not guaranteed that this is already set.
111+
set(OPENMP_TEST_COMPILER_VERSION "${LLVM_VERSION}")
112+
set(OPENMP_TEST_COMPILER_VERSION_MAJOR "${LLVM_VERSION_MAJOR}")
113+
set(OPENMP_TEST_COMPILER_VERSION_MAJOR_MINOR "${LLVM_VERSION_MAJOR}.${LLVM_VERSION_MINOR}")
114+
# Unfortunately the top-level cmake/config-ix.cmake file mangles CMake's
115+
# CMAKE_THREAD_LIBS_INIT variable from the FindThreads package, so work
116+
# around that, until it is fixed there.
117+
if("${CMAKE_THREAD_LIBS_INIT}" STREQUAL "-lpthread")
118+
set(OPENMP_TEST_COMPILER_THREAD_FLAGS "-pthread")
143119
else()
144-
# Set the information that we know.
145-
set(OPENMP_TEST_COMPILER_ID "Clang")
146-
# Cannot use CLANG_VERSION because we are not guaranteed that this is already set.
147-
set(OPENMP_TEST_COMPILER_VERSION "${LLVM_VERSION}")
148-
set(OPENMP_TEST_COMPILER_VERSION_MAJOR "${LLVM_VERSION_MAJOR}")
149-
set(OPENMP_TEST_COMPILER_VERSION_MAJOR_MINOR "${LLVM_VERSION_MAJOR}.${LLVM_VERSION_MINOR}")
150-
# Unfortunately the top-level cmake/config-ix.cmake file mangles CMake's
151-
# CMAKE_THREAD_LIBS_INIT variable from the FindThreads package, so work
152-
# around that, until it is fixed there.
153-
if("${CMAKE_THREAD_LIBS_INIT}" STREQUAL "-lpthread")
154-
set(OPENMP_TEST_COMPILER_THREAD_FLAGS "-pthread")
155-
else()
156-
set(OPENMP_TEST_COMPILER_THREAD_FLAGS "${CMAKE_THREAD_LIBS_INIT}")
157-
endif()
158-
if(TARGET tsan)
159-
set(OPENMP_TEST_COMPILER_HAS_TSAN_FLAGS 1)
160-
else()
161-
set(OPENMP_TEST_COMPILER_HAS_TSAN_FLAGS 0)
162-
endif()
163-
set(OPENMP_TEST_COMPILER_HAS_OMP_H 1)
164-
set(OPENMP_TEST_COMPILER_OPENMP_FLAGS "-fopenmp ${OPENMP_TEST_COMPILER_THREAD_FLAGS}")
165-
set(OPENMP_TEST_COMPILER_HAS_OMIT_FRAME_POINTER_FLAGS 1)
120+
set(OPENMP_TEST_COMPILER_THREAD_FLAGS "${CMAKE_THREAD_LIBS_INIT}")
166121
endif()
122+
if(TARGET tsan)
123+
set(OPENMP_TEST_COMPILER_HAS_TSAN_FLAGS 1)
124+
else()
125+
set(OPENMP_TEST_COMPILER_HAS_TSAN_FLAGS 0)
126+
endif()
127+
set(OPENMP_TEST_COMPILER_HAS_OMP_H 1)
128+
set(OPENMP_TEST_COMPILER_OPENMP_FLAGS "-fopenmp ${OPENMP_TEST_COMPILER_THREAD_FLAGS}")
129+
set(OPENMP_TEST_COMPILER_HAS_OMIT_FRAME_POINTER_FLAGS 1)
167130

168131
# Function to set compiler features for use in lit.
169132
function(update_test_compiler_features)
@@ -211,30 +174,20 @@ function(add_offload_testsuite target comment)
211174
set_property(GLOBAL APPEND PROPERTY OPENMP_LIT_DEPENDS ${ARG_DEPENDS})
212175
endif()
213176

214-
if (${OPENMP_STANDALONE_BUILD})
215-
set(LIT_ARGS ${OPENMP_LIT_ARGS} ${ARG_ARGS})
216-
add_custom_target(${target}
217-
COMMAND ${Python3_EXECUTABLE} ${OPENMP_LLVM_LIT_EXECUTABLE} ${LIT_ARGS} ${ARG_UNPARSED_ARGUMENTS}
218-
COMMENT ${comment}
219-
DEPENDS ${ARG_DEPENDS}
220-
USES_TERMINAL
177+
if (ARG_EXCLUDE_FROM_CHECK_ALL)
178+
add_lit_testsuite(${target}
179+
${comment}
180+
${ARG_UNPARSED_ARGUMENTS}
181+
EXCLUDE_FROM_CHECK_ALL
182+
DEPENDS clang FileCheck not ${ARG_DEPENDS}
183+
ARGS ${ARG_ARGS}
221184
)
222185
else()
223-
if (ARG_EXCLUDE_FROM_CHECK_ALL)
224-
add_lit_testsuite(${target}
225-
${comment}
226-
${ARG_UNPARSED_ARGUMENTS}
227-
EXCLUDE_FROM_CHECK_ALL
228-
DEPENDS clang FileCheck not ${ARG_DEPENDS}
229-
ARGS ${ARG_ARGS}
230-
)
231-
else()
232-
add_lit_testsuite(${target}
233-
${comment}
234-
${ARG_UNPARSED_ARGUMENTS}
235-
DEPENDS clang FileCheck not ${ARG_DEPENDS}
236-
ARGS ${ARG_ARGS}
237-
)
238-
endif()
186+
add_lit_testsuite(${target}
187+
${comment}
188+
${ARG_UNPARSED_ARGUMENTS}
189+
DEPENDS clang FileCheck not ${ARG_DEPENDS}
190+
ARGS ${ARG_ARGS}
191+
)
239192
endif()
240193
endfunction()

offload/test/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ else()
1212
set(LIBOMPTARGET_DEBUG False)
1313
endif()
1414

15-
if (NOT OPENMP_STANDALONE_BUILD AND "compiler-rt" IN_LIST LLVM_ENABLE_RUNTIMES)
15+
if ("compiler-rt" IN_LIST LLVM_ENABLE_RUNTIMES)
1616
set(LIBOMPTARGET_TEST_GPU_PGO True)
1717
else()
1818
set(LIBOMPTARGET_TEST_GPU_PGO False)

0 commit comments

Comments
 (0)