AI/rocm-systems
2
0
Garpu 0
Kode Masalah Tarik Permintaan Actions Packages Projects Rilis Wiki Kegiatan

Expose HIP_VERSION_* to HIP source and HIP applications

Telusuri Sumber 
Change-Id: I6fb0d6711642c4fad2cd89b98707ee4b548b7243


[ROCm/clr commit: ba9d9708f7]
This commit is contained in:
Maneesh Gupta
2016-09-22 12:27:07 +05:30
orang tua 536fbebbe6
melakukan d2cf70716b
2 mengubah file dengan 6 tambahan dan 1 penghapusan
Download Patch File Download Diff File Expand all files Collapse all files
projects/clr/hipamd/CMakeLists.txt
+4
Melihat File
@@ -162,6 +162,10 @@ if(HIP_PLATFORM STREQUAL "hcc")
set(CMAKE_CXX_COMPILER "${HCC_HOME}/bin/hcc")
set(CMAKE_C_COMPILER "${HCC_HOME}/bin/hcc")
# Add HIP_VERSION to CMAKE_<LANG>_FLAGS
set(CMAKE_CXX_FLAGS " -DHIP_VERSION_MAJOR=${HIP_VERSION_MAJOR} -DHIP_VERSION_MINOR=${HIP_VERSION_MINOR} -DHIP_VERSION_PATCH=${HIP_VERSION_MINOR} ${CMAKE_CXX_FLAGS}")
set(CMAKE_C_FLAGS " -DHIP_VERSION_MAJOR=${HIP_VERSION_MAJOR} -DHIP_VERSION_MINOR=${HIP_VERSION_MINOR} -DHIP_VERSION_PATCH=${HIP_VERSION_MINOR} ${CMAKE_C_FLAGS}")
# Set HIP_HCC so we know this is HIP compile, some files are shared with HCC (staging_buffer).
set(CMAKE_CXX_FLAGS " -fPIC -hc -I${HCC_HOME}/include -I${HSA_PATH}/include -I/opt/rocm/libhsakmt/include/libhsakmt -stdlib=libc++ -DHIP_HCC ${CMAKE_CXX_FLAGS}")
set(CMAKE_C_FLAGS " -fPIC -hc -I${HCC_HOME}/include -I${HSA_PATH}/include -I/opt/rocm/libhsakmt/include/libhsakmt -stdlib=libc++ -DHIP_HCC ${CMAKE_C_FLAGS}")
projects/clr/hipamd/bin/hipcc
+2 -1
Melihat File
@@ -60,6 +60,7 @@ parse_config_file("$HIP_PATH/lib/.buildInfo", \%hipConfig);
#HIP_PLATFORM controls whether to use NVCC or HCC for compilation:
$HIP_PLATFORM= `$HIP_PATH/bin/hipconfig --platform` // "hcc";
$HIP_VERSION= `$HIP_PATH/bin/hipconfig --version`;
($HIP_VERSION_MAJOR, $HIP_VERSION_MINOR, $HIP_VERSION_PATCH) = split(/\./, $HIP_VERSION);
if ($verbose & 0x2) {
print ("HIP_PATH=$HIP_PATH\n");
@@ -158,7 +159,7 @@ if ($HIP_PLATFORM eq "hcc") {
}
# Add paths to common HIP includes:
$HIPCXXFLAGS .= " -I$HIP_PATH/include" ;
$HIPCXXFLAGS .= " -I$HIP_PATH/include -DHIP_VERSION_MAJOR=$HIP_VERSION_MAJOR -DHIP_VERSION_MINOR=$HIP_VERSION_MINOR -DHIP_VERSION_PATCH=$HIP_VERSION_PATCH" ;
my $compileOnly = 0;
my $needCXXFLAGS = 0; # need to add CXX flags to compile step