5.6.0 updates
This commit is contained in:
parent
70c71e8f93
commit
032df31e6f
@ -0,0 +1,61 @@
|
|||||||
|
diff --git a/clr/hipamd/CMakeLists.txt b/clr/hipamd/CMakeLists.txt
|
||||||
|
index c14a9ad..ca49f7f 100755
|
||||||
|
--- a/clr/hipamd/CMakeLists.txt
|
||||||
|
+++ b/clr/hipamd/CMakeLists.txt
|
||||||
|
@@ -400,8 +400,10 @@ if (NOT ${HIPCC_BIN_DIR} STREQUAL "")
|
||||||
|
install(PROGRAMS ${HIPCC_BIN_DIR}/hipcc.pl DESTINATION bin)
|
||||||
|
install(PROGRAMS ${HIPCC_BIN_DIR}/hipconfig.pl DESTINATION bin)
|
||||||
|
install(PROGRAMS ${HIPCC_BIN_DIR}/hipvars.pm DESTINATION bin)
|
||||||
|
- install(PROGRAMS ${HIPCC_BIN_DIR}/hipcc.bat DESTINATION bin)
|
||||||
|
- install(PROGRAMS ${HIPCC_BIN_DIR}/hipconfig.bat DESTINATION bin)
|
||||||
|
+ if(WIN32)
|
||||||
|
+ install(PROGRAMS ${HIPCC_BIN_DIR}/hipcc.bat DESTINATION bin)
|
||||||
|
+ install(PROGRAMS ${HIPCC_BIN_DIR}/hipconfig.bat DESTINATION bin)
|
||||||
|
+ endif()
|
||||||
|
endif()
|
||||||
|
|
||||||
|
#############################
|
||||||
|
diff --git a/clr/hipamd/hip-config.cmake.in b/clr/hipamd/hip-config.cmake.in
|
||||||
|
index 537a599..7d10273 100755
|
||||||
|
--- a/clr/hipamd/hip-config.cmake.in
|
||||||
|
+++ b/clr/hipamd/hip-config.cmake.in
|
||||||
|
@@ -245,7 +245,6 @@ if(HIP_COMPILER STREQUAL "clang")
|
||||||
|
# Add support for __fp16 and _Float16, explicitly link with compiler-rt
|
||||||
|
if( "${CLANGRT_BUILTINS_FETCH_EXIT_CODE}" STREQUAL "0" )
|
||||||
|
# CLANG_RT Builtins found Successfully Set interface link libraries property
|
||||||
|
- set_property(TARGET hip::host APPEND PROPERTY INTERFACE_LINK_LIBRARIES "${CLANGRT_BUILTINS}")
|
||||||
|
set_property(TARGET hip::device APPEND PROPERTY INTERFACE_LINK_LIBRARIES "${CLANGRT_BUILTINS}")
|
||||||
|
else()
|
||||||
|
message(STATUS "clangrt builtins lib not found: ${CLANGRT_BUILTINS_FETCH_EXIT_CODE}")
|
||||||
|
diff --git a/hipcc/bin/hipcc.pl b/hipcc/bin/hipcc.pl
|
||||||
|
index 56dcda2..c7ae60b 100755
|
||||||
|
--- a/hipcc/bin/hipcc.pl
|
||||||
|
+++ b/hipcc/bin/hipcc.pl
|
||||||
|
@@ -155,11 +155,15 @@ if ($HIP_PLATFORM eq "amd") {
|
||||||
|
if($isWindows) {
|
||||||
|
$execExtension = ".exe";
|
||||||
|
}
|
||||||
|
- $HIPCC="$HIP_CLANG_PATH/clang++" . $execExtension;
|
||||||
|
+ # llvm_path is set inside the hip recipe
|
||||||
|
+ $LLVM_PATH= $ENV{'LLVM_PATH'};
|
||||||
|
+ $HIPCC="${LLVM_PATH}/bin/clang++" . $execExtension;
|
||||||
|
+
|
||||||
|
|
||||||
|
# If $HIPCC clang++ is not compiled, use clang instead
|
||||||
|
if ( ! -e $HIPCC ) {
|
||||||
|
- $HIPCC="$HIP_CLANG_PATH/clang" . $execExtension;
|
||||||
|
+ $LLVM_PATH= $ENV{'LLVM_PATH'};
|
||||||
|
+ $HIPCC="${LLVM_PATH}/bin/clang" . $execExtension;
|
||||||
|
$HIPLDFLAGS = "--driver-mode=g++";
|
||||||
|
}
|
||||||
|
# to avoid using dk linker or MSVC linker
|
||||||
|
@@ -483,7 +487,8 @@ if($HIP_PLATFORM eq "amd"){
|
||||||
|
$targetsStr = $ENV{HCC_AMDGPU_TARGET};
|
||||||
|
} elsif (not $isWindows) {
|
||||||
|
# Else try using rocm_agent_enumerator
|
||||||
|
- $ROCM_AGENT_ENUM = "${ROCM_PATH}/bin/rocm_agent_enumerator";
|
||||||
|
+ $ROCMINFO_PATH = $ENV{'ROCMINFO_PATH'} // $ROCMINFO_PATH;
|
||||||
|
+ $ROCM_AGENT_ENUM = "${ROCMINFO_PATH}/bin/rocm_agent_enumerator";
|
||||||
|
$targetsStr = `${ROCM_AGENT_ENUM} -t GPU`;
|
||||||
|
$targetsStr =~ s/\n/,/g;
|
||||||
|
}
|
@ -0,0 +1,13 @@
|
|||||||
|
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||||
|
index 80c8a3f..d2b88c0 100644
|
||||||
|
--- a/CMakeLists.txt
|
||||||
|
+++ b/CMakeLists.txt
|
||||||
|
@@ -137,7 +137,7 @@ install(
|
||||||
|
# install all folders under clang/version/ in CMAKE_INSTALL_PREFIX path
|
||||||
|
install(
|
||||||
|
DIRECTORY ${LLVM_DIR}/../../clang/${LLVM_VERSION_MAJOR}.${LLVM_VERSION_MINOR}.${LLVM_VERSION_PATCH}/
|
||||||
|
- DESTINATION .
|
||||||
|
+ DESTINATION ${CMAKE_INSTALL_PREFIX}/include
|
||||||
|
COMPONENT clang-resource-headers
|
||||||
|
FILES_MATCHING
|
||||||
|
PATTERN "*.h"
|
Loading…
Reference in New Issue
Block a user