SWDEV-273235 - Restore 2ec524b

Change-Id: Id2d3e54dc4f35974c12ecbec661a005cac90e5b1


[ROCm/clr commit: d013aa2639]
Tento commit je obsažen v:
Vladislav Sytchenko
2021-05-27 16:21:15 -04:00
odevzdal Aaron En Ye Shi
rodič 9a599494f6
revize 019425fb9a
+8 -11
Zobrazit soubor
@@ -148,12 +148,11 @@ endif()
if(__HIP_ENABLE_PCH)
find_package(LLVM REQUIRED CONFIG
PATHS
/opt/rocm/llvm
PATH_SUFFIXES
lib/cmake/llvm)
set(LLVM_ROOT "${LLVM_DIR}/../../..")
/opt/rocm/llvm)
# find_package(LLVM) returns the lib/cmake/llvm location. We require the root.
set(HIP_LLVM_ROOT "${LLVM_DIR}/../../..")
execute_process(COMMAND sh -c "${CMAKE_CURRENT_SOURCE_DIR}/../bin/hip_embed_pch.sh ${PROJECT_BINARY_DIR}/include ${PROJECT_SOURCE_DIR}/include ${LLVM_ROOT}" 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}" COMMAND_ECHO STDERR RESULT_VARIABLE EMBED_PCH_RC)
if (EMBED_PCH_RC AND NOT EMBED_PCH_RC EQUAL 0)
message(FATAL_ERROR "Failed to embed PCH")
endif()
@@ -166,11 +165,9 @@ endif()
if(__HIP_ENABLE_RTC)
find_package(LLVM REQUIRED CONFIG
PATHS
/opt/rocm/llvm
PATH_SUFFIXES
lib/cmake/llvm)
message(STATUS "llvm found at ${LLVM_DIR}.")
set(LLVM_ROOT "${LLVM_DIR}/../../..")
/opt/rocm/llvm)
# find_package(LLVM) returns the lib/cmake/llvm location. We require the root.
set(HIP_LLVM_ROOT "${LLVM_DIR}/../../..")
if(WIN32)
set(HIPRTC_LIB_NAME "hiprtc-builtins64_${HIP_LIB_VERSION_MAJOR}${HIP_LIB_VERSION_MINOR}.dll")
@@ -178,7 +175,7 @@ if(__HIP_ENABLE_RTC)
set(HIPRTC_LIB_NAME "libhiprtc-builtins.so.${HIP_LIB_VERSION_MAJOR}.${HIP_LIB_VERSION_MINOR}")
endif()
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} -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} -r ${PROJECT_BINARY_DIR}/lib/${HIPRTC_LIB_NAME}"
COMMAND_ECHO STDERR
RESULT_VARIABLE EMBED_RTC_RC
)