From 33815453b8ce75c03d2196d6bf782bd264c8372e Mon Sep 17 00:00:00 2001
From: kiritigowda <kiritigowda@gmail.com>
Date: Tue, 30 Apr 2024 16:16:43 -0700
Subject: [PATCH 1/2] CMakeLists - Support AMD Advanced

---
 CMakeLists.txt | 23 ++++++++++++++++-------
 1 file changed, 16 insertions(+), 7 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index fed18cbfc..3a506d1e3 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -58,7 +58,7 @@ endif(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
 
 # RPP Default Options
 set(DEFAULT_BUILD_TYPE "Release")
-option(BUILD_WITH_AMD_ADVANCE "Build RPP for advanced AMD GPU Architecture"    ON)
+option(BUILD_WITH_AMD_ADVANCE "Build RPP for advanced AMD GPU Architecture"    OFF)
 
 # Set message options
 if(NOT WIN32)
@@ -125,12 +125,6 @@ else()
     set(WINE_CMD)
 endif()
 
-message("-- ${Cyan}RPP Developer Options${ColourReset}")
-message("-- ${Cyan}     -D BUILD_WITH_AMD_ADVANCE=${BUILD_WITH_AMD_ADVANCE} [Turn ON/OFF Build for AMD advanced GPUs(default:ON)]${ColourReset}")
-message("-- ${Yellow}     NOTE: For ROCm Version less than 6.0.0+ Use -D BUILD_WITH_AMD_ADVANCE=OFF${ColourReset}")
-message("-- ${Cyan}     -D BACKEND=${BACKEND} [Select RPP Backend [options:CPU/OPENCL/HIP](default:HIP)]${ColourReset}")
-message("-- ${Cyan}     -D CMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} [Select RPP build type [options:Debug/Release](default:Release)]${ColourReset}")
-
 # CMake checks and setups
 if("${CMAKE_CURRENT_SOURCE_DIR}" STREQUAL "${CMAKE_BINARY_DIR}")
     message(FATAL_ERROR "${Red}${PROJECT_NAME} -- In-source builds are not allowed. Invoke cmake from build directory${ColourReset}")
@@ -141,6 +135,21 @@ list(APPEND CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake)
 find_package(HALF REQUIRED)
 include_directories(${HALF_INCLUDE_DIRS})
 
+# HIP Version
+find_package(HIP QUIET)
+if(HIP_FOUND)
+    message("-- ${BoldBlue}ROCm Version -- ${HIP_VERSION}${ColourReset}")
+    set(LOOM OFF)
+    if(HIP_VERSION  VERSION_GREATER 5.7.50701)
+        set(BUILD_WITH_AMD_ADVANCE ON)
+    endif()
+endif()
+
+message("-- ${Cyan}RPP Developer Options${ColourReset}")
+message("-- ${Cyan}     -D BUILD_WITH_AMD_ADVANCE=${BUILD_WITH_AMD_ADVANCE} [Turn ON/OFF Build for AMD advanced GPUs(default:OFF)]${ColourReset}")
+message("-- ${Cyan}     -D BACKEND=${BACKEND} [Select RPP Backend [options:CPU/OPENCL/HIP](default:HIP)]${ColourReset}")
+message("-- ${Cyan}     -D CMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} [Select RPP build type [options:Debug/Release](default:Release)]${ColourReset}")
+
 # OpenMP
 find_package(OpenMP REQUIRED)
 if(APPLE)

From 8cf53595e2faa710cab73a7ad191717fe3de737f Mon Sep 17 00:00:00 2001
From: kiritigowda <kiritigowda@gmail.com>
Date: Tue, 30 Apr 2024 16:19:00 -0700
Subject: [PATCH 2/2] Clean up

---
 CMakeLists.txt | 1 -
 1 file changed, 1 deletion(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3a506d1e3..f5659a8e6 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -139,7 +139,6 @@ include_directories(${HALF_INCLUDE_DIRS})
 find_package(HIP QUIET)
 if(HIP_FOUND)
     message("-- ${BoldBlue}ROCm Version -- ${HIP_VERSION}${ColourReset}")
-    set(LOOM OFF)
     if(HIP_VERSION  VERSION_GREATER 5.7.50701)
         set(BUILD_WITH_AMD_ADVANCE ON)
     endif()