maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

Revert "[Libomptarget] Make libomptarget an LLVM library" 

This reverts commit 643dfd97d5.

This patch still makes the AMDGPU buildbots unhappy. Reverting for now
until the AMD folks figure it out.
This commit is contained in:
Joseph Huber 2022-07-20 10:18:23 -04:00
parent 6b0db92bbd
commit b5b20164d2
2 changed files with 30 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
openmp/libomptarget/cmake/Modules/LibomptargetGetDependencies.cmake
View File

@ -26,7 +26,7 @@ include (FindPackageHandleStandardArgs)
if (OPENMP_STANDALONE_BUILD) if (OPENMP_STANDALONE_BUILD)
# Complete LLVM package is required for building libomptarget # Complete LLVM package is required for building libomptarget
# in an out-of-tree mode. # in an out-of-tree mode.
find_package(LLVM REQUIRED HINTS "${LLVM_CMAKE_DIR}") find_package(LLVM REQUIRED)
message(STATUS "Found LLVM ${LLVM_PACKAGE_VERSION}") message(STATUS "Found LLVM ${LLVM_PACKAGE_VERSION}")
message(STATUS "Using LLVM in: ${LLVM_DIR}") message(STATUS "Using LLVM in: ${LLVM_DIR}")
list(APPEND LIBOMPTARGET_LLVM_INCLUDE_DIRS ${LLVM_INCLUDE_DIRS}) list(APPEND LIBOMPTARGET_LLVM_INCLUDE_DIRS ${LLVM_INCLUDE_DIRS})

53
openmp/libomptarget/src/CMakeLists.txt
View File

@ -12,30 +12,35 @@
libomptarget_say("Building offloading runtime library libomptarget.") libomptarget_say("Building offloading runtime library libomptarget.")
add_llvm_library(omptarget set(LIBOMPTARGET_SRC_FILES
SHARED ${CMAKE_CURRENT_SOURCE_DIR}/api.cpp
${CMAKE_CURRENT_SOURCE_DIR}/device.cpp
api.cpp ${CMAKE_CURRENT_SOURCE_DIR}/interface.cpp
device.cpp ${CMAKE_CURRENT_SOURCE_DIR}/interop.cpp
interface.cpp ${CMAKE_CURRENT_SOURCE_DIR}/omptarget.cpp
interop.cpp ${CMAKE_CURRENT_SOURCE_DIR}/rtl.cpp
omptarget.cpp ${CMAKE_CURRENT_SOURCE_DIR}/LegacyAPI.cpp
rtl.cpp
LegacyAPI.cpp
ADDITIONAL_HEADER_DIRS
${LIBOMPTARGET_INCLUDE_DIR}
LINK_COMPONENTS
Support
Object
LINK_LIBS
${CMAKE_DL_LIBS}
"-Wl,--version-script=${CMAKE_CURRENT_SOURCE_DIR}/exports"
) )
target_include_directories(omptarget PRIVATE ${LIBOMPTARGET_INCLUDE_DIR}) set(LIBOMPTARGET_SRC_FILES ${LIBOMPTARGET_SRC_FILES} PARENT_SCOPE)
# Also install plugin under the standard lib destination folder. # Build libomptarget library with libdl dependency.
install(TARGETS omptarget LIBRARY DESTINATION "${OPENMP_INSTALL_LIBDIR}") add_library(omptarget SHARED ${LIBOMPTARGET_SRC_FILES})
set_target_properties(omptarget PROPERTIES INSTALL_RPATH "$ORIGIN" BUILD_RPATH "$ORIGIN")
if (OPENMP_ENABLE_LIBOMPTARGET_PROFILING)
# Add LLVMSupport dependency if profiling is enabled.
# Linking with LLVM component libraries also requires
# aligning the compile flags.
llvm_update_compile_flags(omptarget)
target_compile_definitions(omptarget PUBLIC OMPTARGET_PROFILE_ENABLED)
target_link_libraries(omptarget PRIVATE LLVMSupport)
endif()
target_include_directories(omptarget PRIVATE
${LIBOMPTARGET_INCLUDE_DIR})
target_link_libraries(omptarget PRIVATE
${CMAKE_DL_LIBS}
"-Wl,--version-script=${CMAKE_CURRENT_SOURCE_DIR}/exports")
# Install libomptarget under the lib destination folder.
install(TARGETS omptarget LIBRARY COMPONENT omptarget
DESTINATION "${OPENMP_INSTALL_LIBDIR}")