SWDEV-283266 - Fix Linux Pro build for hiprtc
Linux Pro build uses the LLVM_ROOT variable to
specify where llvm is located. We must use a different
name, HIP_LLVM_ROOT for LLVM's prefix location.
Change-Id: I28baf8672217a438a5dd45829d9af04b3553f615
[ROCm/hip commit: 93b9384529]
This commit is contained in:
کامیت شده توسط
Aaron En Ye Shi
والد
62d33a3b96
کامیت
7fb914e4d6
@@ -111,12 +111,10 @@ message(STATUS "Code Object Manager found at ${amd_comgr_DIR}.")
|
|||||||
|
|
||||||
find_package(LLVM REQUIRED CONFIG
|
find_package(LLVM REQUIRED CONFIG
|
||||||
PATHS
|
PATHS
|
||||||
/opt/rocm/llvm
|
/opt/rocm/llvm)
|
||||||
PATH_SUFFIXES
|
# find_package(LLVM) returns the lib/cmake/llvm location. We require the root.
|
||||||
lib/cmake/llvm)
|
set(HIP_LLVM_ROOT "${LLVM_DIR}/../../.." CACHE PATH "LLVM Root Directory")
|
||||||
|
|
||||||
message(STATUS "llvm found at ${LLVM_DIR}.")
|
message(STATUS "llvm found at ${LLVM_DIR}.")
|
||||||
set(LLVM_ROOT "${LLVM_DIR}/../../..")
|
|
||||||
|
|
||||||
add_library(hip64 OBJECT
|
add_library(hip64 OBJECT
|
||||||
hip_context.cpp
|
hip_context.cpp
|
||||||
@@ -175,7 +173,7 @@ endif()
|
|||||||
# Short-Term solution for pre-compiled headers for online compilation
|
# Short-Term solution for pre-compiled headers for online compilation
|
||||||
# Enable pre compiled header
|
# Enable pre compiled header
|
||||||
if(__HIP_ENABLE_PCH)
|
if(__HIP_ENABLE_PCH)
|
||||||
execute_process(COMMAND sh -c "${CMAKE_CURRENT_SOURCE_DIR}/../bin/hip_embed_pch.sh ${PROJECT_BINARY_DIR}/include ${PROJECT_SOURCE_DIR}/include ${LLVM_ROOT} ${HSA_PATH}" COMMAND_ECHO STDERR RESULT_VARIABLE EMBED_PCH_RC)
|
execute_process(COMMAND sh -c "${CMAKE_CURRENT_SOURCE_DIR}/../bin/hip_embed_pch.sh ${PROJECT_BINARY_DIR}/include ${PROJECT_SOURCE_DIR}/include ${HIP_LLVM_ROOT} ${HSA_PATH}" COMMAND_ECHO STDERR RESULT_VARIABLE EMBED_PCH_RC)
|
||||||
if (EMBED_PCH_RC AND NOT EMBED_PCH_RC EQUAL 0)
|
if (EMBED_PCH_RC AND NOT EMBED_PCH_RC EQUAL 0)
|
||||||
message(FATAL_ERROR "Failed to embed PCH")
|
message(FATAL_ERROR "Failed to embed PCH")
|
||||||
endif()
|
endif()
|
||||||
@@ -190,7 +188,7 @@ if(__HIP_ENABLE_RTC)
|
|||||||
set(HIPRTC_LIB_NAME "libhiprtc-builtins.so.${HIP_LIB_VERSION_MAJOR}.${HIP_LIB_VERSION_MINOR}")
|
set(HIPRTC_LIB_NAME "libhiprtc-builtins.so.${HIP_LIB_VERSION_MAJOR}.${HIP_LIB_VERSION_MINOR}")
|
||||||
endif()
|
endif()
|
||||||
execute_process(
|
execute_process(
|
||||||
COMMAND sh -c "mkdir -p ${PROJECT_BINARY_DIR}/lib; ${CMAKE_CURRENT_SOURCE_DIR}/../bin/hip_embed_pch.sh ${PROJECT_BINARY_DIR}/include ${PROJECT_SOURCE_DIR}/include ${LLVM_ROOT} ${HSA_PATH} -r ${PROJECT_BINARY_DIR}/lib/${HIPRTC_LIB_NAME}"
|
COMMAND sh -c "mkdir -p ${PROJECT_BINARY_DIR}/lib; ${CMAKE_CURRENT_SOURCE_DIR}/../bin/hip_embed_pch.sh ${PROJECT_BINARY_DIR}/include ${PROJECT_SOURCE_DIR}/include ${HIP_LLVM_ROOT} ${HSA_PATH} -r ${PROJECT_BINARY_DIR}/lib/${HIPRTC_LIB_NAME}"
|
||||||
COMMAND_ECHO STDERR
|
COMMAND_ECHO STDERR
|
||||||
RESULT_VARIABLE EMBED_RTC_RC
|
RESULT_VARIABLE EMBED_RTC_RC
|
||||||
)
|
)
|
||||||
|
|||||||
مرجع در شماره جدید
Block a user