Skip to content

[Offload] Allow building liboffload without libomptarget #159775

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

[Offload] Allow building liboffload without libomptarget #159775

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion llvm/runtimes/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -209,7 +209,7 @@ foreach(entry ${runtimes})
string(REPLACE "-" "_" canon_name ${name})
string(TOUPPER ${canon_name} canon_name)
list(APPEND prefixes ${canon_name})
if (${canon_name} STREQUAL "OPENMP")
if (${canon_name} STREQUAL "OPENMP" OR ${canon_name} STREQUAL "OFFLOAD")
list(APPEND prefixes "LIBOMP" "LIBOMPTARGET")
endif()
# Many compiler-rt options start with SANITIZER_ and DARWIN_ rather than
Expand Down
11 changes: 11 additions & 0 deletions offload/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,15 @@ elseif(NOT CMAKE_SIZEOF_VOID_P EQUAL 8)
return()
endif()

set(OPENMP_ENABLED OFF)
if("openmp" IN_LIST LLVM_ENABLE_RUNTIMES)
set(OPENMP_ENABLED ON)
endif()
set(LIBOFFLOAD_ENABLED OFF)
if("offload" IN_LIST LLVM_ENABLE_RUNTIMES)
set(OFFLOAD_ENABLED ON)
endif()

set(OFFLOAD_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR})

if(OPENMP_STANDALONE_BUILD)
Expand Down Expand Up @@ -376,7 +385,9 @@ add_subdirectory(tools)
add_subdirectory(docs)

# Build target agnostic offloading library.
if(OPENMP_ENABLED)
add_subdirectory(libomptarget)
endif()

add_subdirectory(liboffload)

Expand Down
2 changes: 2 additions & 0 deletions offload/test/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ if(TARGET omp)
set(OMP_DEPEND omp)
endif()

if(OPENMP_ENABLED)
string(REGEX MATCHALL "([^\ ]+\ |[^\ ]+$)" SYSTEM_TARGETS "${LIBOMPTARGET_SYSTEM_TARGETS}")
foreach(CURRENT_TARGET IN LISTS SYSTEM_TARGETS)
string(STRIP "${CURRENT_TARGET}" CURRENT_TARGET)
Expand Down Expand Up @@ -63,6 +64,7 @@ add_offload_testsuite(check-offload
EXCLUDE_FROM_CHECK_ALL
DEPENDS llvm-offload-device-info omptarget ${OMP_DEPEND} ${LIBOMPTARGET_TESTED_PLUGINS}
ARGS ${LIBOMPTARGET_LIT_ARG_LIST})
endif()

# Add liboffload unit tests - the test binary will run on all available devices
configure_lit_site_cfg(
Expand Down
3 changes: 3 additions & 0 deletions offload/tools/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,7 @@ macro(add_openmp_tool_symlink name)
endmacro()

add_subdirectory(deviceinfo)

if(OPENMP_ENABLED)
add_subdirectory(kernelreplay)
endif()