SWDEV-425967, SWDEV-425968 - Revert "SWDEV-415029 - [ABI Break] Remove hcc symbols"

This reverts commit 22a0da6747.

Reason for revert: This causes build failure in hipBLASLt & hipSPARSELt

Change-Id: If4932a630391ddce5cdff247163fbadb9b9d31ef


[ROCm/hip commit: 0bf6186614]
This commit is contained in:
Rakesh Roy
2023-10-09 06:26:10 -04:00
parent ac18623e05
commit ddad1eeec2
20 changed files with 113 additions and 37 deletions
+14
View File
@@ -382,19 +382,31 @@ macro(HIP_GET_SOURCES_AND_OPTIONS _sources _cmake_options _hipcc_options _clang_
set(${_clang_options})
set(${_nvcc_options})
set(_hipcc_found_options FALSE)
set(_hcc_found_options FALSE)
set(_clang_found_options FALSE)
set(_nvcc_found_options FALSE)
foreach(arg ${ARGN})
if("x${arg}" STREQUAL "xHIPCC_OPTIONS")
set(_hipcc_found_options TRUE)
set(_hcc_found_options FALSE)
set(_clang_found_options FALSE)
set(_nvcc_found_options FALSE)
elseif("x${arg}" STREQUAL "xHCC_OPTIONS")
# To be removed after HCC_OPTIONS is removed from hip_add_executable()
# via upstream updation
message(WARNING, "Please remove obsolete HCC_OPTIONS from hip_add_executable()")
set(_hipcc_found_options FALSE)
set(_hcc_found_options TRUE)
set(_clang_found_options FALSE)
set(_nvcc_found_options FALSE)
elseif("x${arg}" STREQUAL "xCLANG_OPTIONS")
set(_hipcc_found_options FALSE)
set(_hcc_found_options FALSE)
set(_clang_found_options TRUE)
set(_nvcc_found_options FALSE)
elseif("x${arg}" STREQUAL "xNVCC_OPTIONS")
set(_hipcc_found_options FALSE)
set(_hcc_found_options FALSE)
set(_clang_found_options FALSE)
set(_nvcc_found_options TRUE)
elseif(
@@ -407,6 +419,8 @@ macro(HIP_GET_SOURCES_AND_OPTIONS _sources _cmake_options _hipcc_options _clang_
else()
if(_hipcc_found_options)
list(APPEND ${_hipcc_options} ${arg})
elseif(_hcc_found_options)
message(WARNING, "Please remove obsolete HCC_OPTIONS ${arg} from hip_add_executable()")
elseif(_clang_found_options)
list(APPEND ${_clang_options} ${arg})
elseif(_nvcc_found_options)