From 6e27c48da741ca536b30f2cc611263bb3fa2c798 Mon Sep 17 00:00:00 2001
From: Jatin Chaudhary <51944368+cjatin@users.noreply.github.com>
Date: Fri, 24 Sep 2021 16:28:38 +0530
Subject: [PATCH] SWDEV-297706 - Set HIP_ARCHITECTURE Property to off. Since
 cmake 3.21 cmake has added this
 property(https://gitlab.kitware.com/cmake/cmake/-/blob/master/Help/prop_tgt/HIP_ARCHITECTURES.rst)
 (#2364)

Change-Id: I33580ac0171ac3744341fcbf25cc3421a1512166
---
 tests/catch/CMakeLists.txt | 33 +++++++++++++++++++++++++++++++
 tests/hit/HIT.cmake        | 40 +++++++++++++++++++++++++++++++++++++-
 2 files changed, 72 insertions(+), 1 deletion(-)

diff --git a/tests/catch/CMakeLists.txt b/tests/catch/CMakeLists.txt
index 434dc92b2b..4d17fc037b 100644
--- a/tests/catch/CMakeLists.txt
+++ b/tests/catch/CMakeLists.txt
@@ -54,6 +54,39 @@ if(POLICY CMP0037)
     cmake_policy(SET CMP0037 OLD)
 endif()
 
+# Turn off CMAKE_HIP_ARCHITECTURES Feature if cmake version is 3.21+
+if(CMAKE_VERSION VERSION_GREATER_EQUAL 3.21.0)
+    set(CMAKE_HIP_ARCHITECTURES OFF)
+endif()
+message(STATUS "CMAKE HIP ARCHITECTURES: ${CMAKE_HIP_ARCHITECTURES}")
+
+# Identify the GPU Targets.
+# This is done due to limitation of rocm_agent_enumerator
+# While building test parallelly, rocm_agent_enumerator can fail and give out an empty target
+# That results in hipcc building the test for gfx803 (the default target)
+if(NOT DEFINED OFFLOAD_ARCH_STR AND EXISTS "${ROCM_PATH}/bin/rocm_agent_enumerator"
+   AND HIP_PLATFORM STREQUAL "amd" AND UNIX)
+    execute_process(COMMAND ${ROCM_PATH}/bin/rocm_agent_enumerator OUTPUT_VARIABLE HIP_GPU_ARCH
+         RESULT_VARIABLE ROCM_AGENT_ENUM_RESULT)
+    # Trim out gfx000
+    string(REPLACE "gfx000\n" "" HIP_GPU_ARCH ${HIP_GPU_ARCH})
+    string(LENGTH ${HIP_GPU_ARCH} HIP_GPU_ARCH_LEN)
+
+    # If string has more gfx target except gfx000
+    if(${HIP_GPU_ARCH_LEN} GREATER_EQUAL 1)
+		string(REGEX REPLACE "\n" ";" HIP_GPU_ARCH_LIST "${HIP_GPU_ARCH}")
+		set(OFFLOAD_ARCH_STR "")
+		foreach(_hip_gpu_arch ${HIP_GPU_ARCH_LIST})
+			set(OFFLOAD_ARCH_STR " ${OFFLOAD_ARCH_STR} --offload-arch=${_hip_gpu_arch} ")
+		endforeach()
+		message(STATUS "Using offload arch string: ${OFFLOAD_ARCH_STR}")
+    endif()
+endif()
+
+if(DEFINED OFFLOAD_ARCH_STR)
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${OFFLOAD_ARCH_STR} ")
+endif()
+
 # Use clang as host compiler with nvcc
 if(HIP_COMPILER MATCHES "nvcc")
     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -ccbin clang")
diff --git a/tests/hit/HIT.cmake b/tests/hit/HIT.cmake
index f5192963ea..f831d5965f 100755
--- a/tests/hit/HIT.cmake
+++ b/tests/hit/HIT.cmake
@@ -29,12 +29,50 @@ if (NOT ${BUILD_SHARED_LIBS})
 endif()
 message(STATUS "HIP runtime lib type - ${HIP_LIB_TYPE}")
 message(STATUS "CMAKE_TESTING_TOOL: ${CMAKE_TESTING_TOOL}")
+
+# Turn off CMAKE_HIP_ARCHITECTURES Feature if cmake version is 3.21+ 
+if(CMAKE_VERSION VERSION_GREATER_EQUAL 3.21.0)
+    set(CMAKE_HIP_ARCHITECTURES OFF)
+endif()
+message(STATUS "CMAKE HIP ARCHITECTURES: ${CMAKE_HIP_ARCHITECTURES}")
+
+# Identify the GPU Targets.
+# This is done due to limitation of rocm_agent_enumerator
+# While building test parallelly, rocm_agent_enumerator can fail and give out an empty target
+# That results in hipcc building the test for gfx803 (the default target)
+if(NOT DEFINED OFFLOAD_ARCH_STR AND EXISTS "${ROCM_PATH}/bin/rocm_agent_enumerator"
+   AND HIP_PLATFORM STREQUAL "amd" AND UNIX)
+    execute_process(COMMAND ${ROCM_PATH}/bin/rocm_agent_enumerator OUTPUT_VARIABLE HIP_GPU_ARCH
+        RESULT_VARIABLE ROCM_AGENT_ENUM_RESULT)
+    message(STATUS "ROCm Agent Enumurator Result: ${ROCM_AGENT_ENUM_RESULT}")
+
+    # Trim out gfx000
+    string(REPLACE "gfx000\n" "" HIP_GPU_ARCH ${HIP_GPU_ARCH})
+    string(LENGTH ${HIP_GPU_ARCH} HIP_GPU_ARCH_LEN)
+
+    # If string has more gfx target except gfx000
+    if(${HIP_GPU_ARCH_LEN} GREATER_EQUAL 1)
+        string(REGEX REPLACE "\n" ";" HIP_GPU_ARCH_LIST "${HIP_GPU_ARCH}")
+        set(OFFLOAD_ARCH_STR "")
+        foreach(_hip_gpu_arch ${HIP_GPU_ARCH_LIST})
+            set(OFFLOAD_ARCH_STR " ${OFFLOAD_ARCH_STR} --offload-arch=${_hip_gpu_arch} ")
+        endforeach()
+        message(STATUS "Using offload arch string: ${OFFLOAD_ARCH_STR}")
+    endif()
+else()
+    message(STATUS "ROCm Agent Enumurator Not Found")
+endif()
+
 #-------------------------------------------------------------------------------
 # Helper macro to parse BUILD instructions
 macro(PARSE_BUILD_COMMAND _target _sources _hipcc_options _clang_options _nvcc_options _link_options _exclude_platforms _exclude_runtime _exclude_compiler _exclude_lib_type _depends _dir)
     set(${_target})
     set(${_sources})
-    set(${_hipcc_options})
+    if(DEFINED OFFLOAD_ARCH_STR)
+        set(${_hipcc_options} "${OFFLOAD_ARCH_STR}")
+    else()
+        set(${_hipcc_options})
+    endif()
     set(${_clang_options})
     set(${_nvcc_options})
     set(${_link_options})