SWDEV-425678 - Fix build failure in HIP samples

- Due to file reorg path changes cmake fails at find_package(hip) unless CMAKE_PREFIX_PATH is set explicitly
- Update CMakeLists.txt to set CMAKE_PREFIX_PATH
- Update Readme

Change-Id: Ibdb4419efcdd6583b059a728e48dfdb8f927a48b

samples/0_Intro/bit_extract/CMakeLists.txt

@@ -30,6 +30,14 @@ if(${__HIP_ENABLE_PCH})
   add_definitions(-D__HIP_ENABLE_PCH)
 endif()
 
+if(UNIX)
+  if(NOT DEFINED ROCM_PATH)
+    set(ROCM_PATH "/opt/rocm" CACHE STRING "Default ROCM installation directory.")
+  endif()
+  # Search for rocm in common locations
+  list(APPEND CMAKE_PREFIX_PATH ${ROCM_PATH})
+endif()
+
 # Find hip
 find_package(hip)
 

samples/0_Intro/module_api/CMakeLists.txt

@@ -23,6 +23,15 @@ project(module_api)
 cmake_minimum_required(VERSION 3.10)
 
 include_directories(../../common)
+
+if(UNIX)
+  if(NOT DEFINED ROCM_PATH)
+    set(ROCM_PATH "/opt/rocm" CACHE STRING "Default ROCM installation directory.")
+  endif()
+  # Search for rocm in common locations
+  list(APPEND CMAKE_PREFIX_PATH ${ROCM_PATH})
+endif()
+
 # Find hip
 find_package(hip)
 

samples/0_Intro/module_api_global/CMakeLists.txt

@@ -22,6 +22,14 @@ project(module_api_global)
 
 cmake_minimum_required(VERSION 3.10)
 
+if(UNIX)
+  if(NOT DEFINED ROCM_PATH)
+    set(ROCM_PATH "/opt/rocm" CACHE STRING "Default ROCM installation directory.")
+  endif()
+  # Search for rocm in common locations
+  list(APPEND CMAKE_PREFIX_PATH ${ROCM_PATH})
+endif()
+
 # Find hip
 find_package(hip)
 

samples/0_Intro/square/CMakeLists.txt

@@ -24,6 +24,14 @@ project(square)
 
 cmake_minimum_required(VERSION 3.10)
 
+if(UNIX)
+  if(NOT DEFINED ROCM_PATH)
+    set(ROCM_PATH "/opt/rocm" CACHE STRING "Default ROCM installation directory.")
+  endif()
+  # Search for rocm in common locations
+  list(APPEND CMAKE_PREFIX_PATH ${ROCM_PATH})
+endif()
+
 # create square.cpp
 execute_process(COMMAND sh -c "${CMAKE_PREFIX_PATH}/bin/hipify-perl ../square.cu > ../square.cpp")
 

samples/0_Intro/square/README.md

@@ -20,7 +20,7 @@ $ export HIP_PATH=[MYHIP]
 $ cd ~/hip/samples/0_Intro/square
   mkdir -p build && cd build
 
-  cmake -DCMAKE_PREFIX_PATH=<path/to/rocm> -DHIP_CXX_COMPILER=<path/to/clang> ..
+  cmake ..
   make
 
 $ Building without cmake

samples/1_Utils/hipDispatchLatency/CMakeLists.txt

@@ -23,6 +23,15 @@ project(hipDispatchLatency)
 cmake_minimum_required(VERSION 3.10)
 
 include_directories(../../common)
+
+if(UNIX)
+  if(NOT DEFINED ROCM_PATH)
+    set(ROCM_PATH "/opt/rocm" CACHE STRING "Default ROCM installation directory.")
+  endif()
+  # Search for rocm in common locations
+  list(APPEND CMAKE_PREFIX_PATH ${ROCM_PATH})
+endif()
+
 # Find hip
 find_package(hip)
 

samples/1_Utils/hipInfo/CMakeLists.txt

@@ -26,6 +26,13 @@ set(CMAKE_CXX_COMPILER_WORKS 1)
 project(hipInfo)
 
 cmake_minimum_required(VERSION 3.10)
+if(UNIX)
+  if(NOT DEFINED ROCM_PATH)
+    set(ROCM_PATH "/opt/rocm" CACHE STRING "Default ROCM installation directory.")
+  endif()
+  # Search for rocm in common locations
+  list(APPEND CMAKE_PREFIX_PATH ${ROCM_PATH})
+endif()
 
 # flag is set to ON in compute build for windows
 option(HIPINFO_INTERNAL_BUILD "Enable building hipInfo from compute" OFF)

samples/2_Cookbook/0_MatrixTranspose/CMakeLists.txt

@@ -22,6 +22,14 @@ project(MatrixTranspose)
 
 cmake_minimum_required(VERSION 3.10)
 
+if(UNIX)
+  if(NOT DEFINED ROCM_PATH)
+    set(ROCM_PATH "/opt/rocm" CACHE STRING "Default ROCM installation directory.")
+  endif()
+  # Search for rocm in common locations
+  list(APPEND CMAKE_PREFIX_PATH ${ROCM_PATH})
+endif()
+
 # Find hip
 find_package(hip)
 

samples/2_Cookbook/10_inline_asm/CMakeLists.txt

@@ -22,6 +22,14 @@ project(inline_asm)
 
 cmake_minimum_required(VERSION 3.10)
 
+if(UNIX)
+  if(NOT DEFINED ROCM_PATH)
+    set(ROCM_PATH "/opt/rocm" CACHE STRING "Default ROCM installation directory.")
+  endif()
+  # Search for rocm in common locations
+  list(APPEND CMAKE_PREFIX_PATH ${ROCM_PATH})
+endif()
+
 # Find hip
 find_package(hip)
 

samples/2_Cookbook/11_texture_driver/CMakeLists.txt

@@ -22,6 +22,14 @@ project(texture2dDrv)
 
 cmake_minimum_required(VERSION 3.10)
 
+if(UNIX)
+  if(NOT DEFINED ROCM_PATH)
+    set(ROCM_PATH "/opt/rocm" CACHE STRING "Default ROCM installation directory.")
+  endif()
+  # Search for rocm in common locations
+  list(APPEND CMAKE_PREFIX_PATH ${ROCM_PATH})
+endif()
+
 # Find hip
 find_package(hip)
 

samples/2_Cookbook/12_cmake_hip_add_executable/CMakeLists.txt

@@ -19,9 +19,11 @@
 # THE SOFTWARE.
 
 cmake_minimum_required(VERSION 3.10)
-if (NOT DEFINED ROCM_PATH )
-     set ( ROCM_PATH "/opt/rocm"  CACHE STRING "Default ROCM installation directory." )
-endif ()
+if(UNIX)
+  if(NOT DEFINED ROCM_PATH)
+    set(ROCM_PATH "/opt/rocm"  CACHE STRING "Default ROCM installation directory.")
+  endif()
+endif()
 
 if(NOT DEFINED HIP_PATH)
     if(NOT DEFINED ENV{HIP_PATH})
@@ -30,6 +32,9 @@ if(NOT DEFINED HIP_PATH)
         set(HIP_PATH $ENV{HIP_PATH} CACHE PATH "Path to which HIP has been installed")
     endif()
 endif()
+# Search for rocm in common locations
+list(APPEND CMAKE_PREFIX_PATH ${ROCM_PATH})
+
 set(CMAKE_MODULE_PATH "${HIP_PATH}/lib/cmake/hip/" ${CMAKE_MODULE_PATH})
 set(CMAKE_HIP_ARCHITECTURES OFF)
 project(12_cmake)

samples/2_Cookbook/13_occupancy/CMakeLists.txt

@@ -22,6 +22,14 @@ project(occupancy)
 
 cmake_minimum_required(VERSION 3.10)
 
+if(UNIX)
+  if(NOT DEFINED ROCM_PATH)
+    set(ROCM_PATH "/opt/rocm" CACHE STRING "Default ROCM installation directory.")
+  endif()
+  # Search for rocm in common locations
+  list(APPEND CMAKE_PREFIX_PATH ${ROCM_PATH})
+endif()
+
 # Find hip
 find_package(hip)
 

samples/2_Cookbook/14_gpu_arch/CMakeLists.txt

@@ -22,6 +22,14 @@ project(gpuarch)
 
 cmake_minimum_required(VERSION 3.10)
 
+if(UNIX)
+  if(NOT DEFINED ROCM_PATH)
+    set(ROCM_PATH "/opt/rocm" CACHE STRING "Default ROCM installation directory.")
+  endif()
+  # Search for rocm in common locations
+  list(APPEND CMAKE_PREFIX_PATH ${ROCM_PATH})
+endif()
+
 # Find hip
 find_package(hip)
 

samples/2_Cookbook/15_static_library/device_functions/CMakeLists.txt

@@ -2,6 +2,14 @@ project(static_lib)
 
 cmake_minimum_required(VERSION 3.10)
 
+if(UNIX)
+  if(NOT DEFINED ROCM_PATH)
+    set(ROCM_PATH "/opt/rocm" CACHE STRING "Default ROCM installation directory.")
+  endif()
+  # Search for rocm in common locations
+  list(APPEND CMAKE_PREFIX_PATH ${ROCM_PATH})
+endif()
+
 # Find hip
 find_package(hip REQUIRED)
 

samples/2_Cookbook/15_static_library/host_functions/CMakeLists.txt

@@ -2,6 +2,14 @@ project(static_lib)
 
 cmake_minimum_required(VERSION 3.10)
 
+if(UNIX)
+  if(NOT DEFINED ROCM_PATH)
+    set(ROCM_PATH "/opt/rocm" CACHE STRING "Default ROCM installation directory.")
+  endif()
+  # Search for rocm in common locations
+  list(APPEND CMAKE_PREFIX_PATH ${ROCM_PATH})
+endif()
+
 # Find hip
 find_package(hip REQUIRED)
 

samples/2_Cookbook/18_cmake_hip_device/CMakeLists.txt

@@ -24,6 +24,14 @@ cmake_minimum_required(VERSION 3.10.2)
 
 include_directories(../../common)
 
+if(UNIX)
+  if(NOT DEFINED ROCM_PATH)
+    set(ROCM_PATH "/opt/rocm" CACHE STRING "Default ROCM installation directory.")
+  endif()
+  # Search for rocm in common locations
+  list(APPEND CMAKE_PREFIX_PATH ${ROCM_PATH})
+endif()
+
 # Find hip
 find_package(hip REQUIRED)
 

samples/2_Cookbook/19_cmake_lang/CMakeLists.txt

@@ -4,6 +4,14 @@ cmake_minimum_required(VERSION 3.18.0)
 
 project(cmake_lang_test CXX Fortran)
 
+if(UNIX)
+  if(NOT DEFINED ROCM_PATH)
+    set(ROCM_PATH "/opt/rocm" CACHE STRING "Default ROCM installation directory.")
+  endif()
+  # Search for rocm in common locations
+  list(APPEND CMAKE_PREFIX_PATH ${ROCM_PATH})
+endif()
+
 find_package(hip REQUIRED)
 
 add_executable(test_fortran TestFortran.F90)

samples/2_Cookbook/1_hipEvent/CMakeLists.txt

@@ -22,6 +22,14 @@ project(hipEvent)
 
 cmake_minimum_required(VERSION 3.10)
 
+if(UNIX)
+  if(NOT DEFINED ROCM_PATH)
+    set(ROCM_PATH "/opt/rocm" CACHE STRING "Default ROCM installation directory.")
+  endif()
+  # Search for rocm in common locations
+  list(APPEND CMAKE_PREFIX_PATH ${ROCM_PATH})
+endif()
+
 # Find hip
 find_package(hip)
 

samples/2_Cookbook/20_hip_vulkan/CMakeLists.txt

@@ -29,6 +29,14 @@ project(hipVulkan)
 cmake_minimum_required(VERSION 3.10)
 set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}/cmake;${CMAKE_MODULE_PATH}")
 
+if(UNIX)
+  if(NOT DEFINED ROCM_PATH)
+    set(ROCM_PATH "/opt/rocm" CACHE STRING "Default ROCM installation directory.")
+  endif()
+  # Search for rocm in common locations
+  list(APPEND CMAKE_PREFIX_PATH ${ROCM_PATH})
+endif()
+
 # need to set rocm_path for windows
 # since clang and hip are two different folders during build/install step
 if (WIN32 AND HIPINFO_INTERNAL_BUILD)

samples/2_Cookbook/20_hip_vulkan/buildcmd.txt

@@ -25,6 +25,6 @@ Linux
 
 Build with CMake:
 •       mkdir build; cd build
-•       cmake -DCMAKE_PREFIX_PATH=path\to\rocm -DHIP_CXX_COMPILER=path\to\clang
+•       cmake ..
 •       make
 •       run hipVulkan executable

samples/2_Cookbook/21_cmake_hip_cxx_clang/CMakeLists.txt

@@ -24,6 +24,14 @@ project(cmake_cxx_amdclang++_test
         DESCRIPTION "Verifies CXX Language Support with amdclang++"
         LANGUAGES CXX)
 
+if(UNIX)
+  if(NOT DEFINED ROCM_PATH)
+    set(ROCM_PATH "/opt/rocm" CACHE STRING "Default ROCM installation directory.")
+  endif()
+  # Search for rocm in common locations
+  list(APPEND CMAKE_PREFIX_PATH ${ROCM_PATH})
+endif()
+
 # Find HIP
 find_package(hip REQUIRED)
 

samples/2_Cookbook/23_cmake_hiprtc/CMakeLists.txt

@@ -22,6 +22,14 @@ project(cmake_hiprtc_test)
 
 cmake_minimum_required(VERSION 3.10.2)
 
+if(UNIX)
+  if(NOT DEFINED ROCM_PATH)
+    set(ROCM_PATH "/opt/rocm" CACHE STRING "Default ROCM installation directory.")
+  endif()
+  # Search for rocm in common locations
+  list(APPEND CMAKE_PREFIX_PATH ${ROCM_PATH})
+endif()
+
 # Find hiprtc
 find_package(hiprtc REQUIRED)
 # Find hip

samples/2_Cookbook/3_shared_memory/CMakeLists.txt

@@ -22,6 +22,14 @@ project(sharedMemory)
 
 cmake_minimum_required(VERSION 3.10)
 
+if(UNIX)
+  if(NOT DEFINED ROCM_PATH)
+    set(ROCM_PATH "/opt/rocm" CACHE STRING "Default ROCM installation directory.")
+  endif()
+  # Search for rocm in common locations
+  list(APPEND CMAKE_PREFIX_PATH ${ROCM_PATH})
+endif()
+
 # Find hip
 find_package(hip)
 

samples/2_Cookbook/4_shfl/CMakeLists.txt

@@ -22,6 +22,14 @@ project(shfl)
 
 cmake_minimum_required(VERSION 3.10)
 
+if(UNIX)
+  if(NOT DEFINED ROCM_PATH)
+    set(ROCM_PATH "/opt/rocm" CACHE STRING "Default ROCM installation directory.")
+  endif()
+  # Search for rocm in common locations
+  list(APPEND CMAKE_PREFIX_PATH ${ROCM_PATH})
+endif()
+
 # Find hip
 find_package(hip)
 

samples/2_Cookbook/5_2dshfl/CMakeLists.txt

@@ -22,6 +22,14 @@ project(2dshfl)
 
 cmake_minimum_required(VERSION 3.10)
 
+if(UNIX)
+  if(NOT DEFINED ROCM_PATH)
+    set(ROCM_PATH "/opt/rocm" CACHE STRING "Default ROCM installation directory.")
+  endif()
+  # Search for rocm in common locations
+  list(APPEND CMAKE_PREFIX_PATH ${ROCM_PATH})
+endif()
+
 # Find hip
 find_package(hip)
 

samples/2_Cookbook/6_dynamic_shared/CMakeLists.txt

@@ -23,6 +23,15 @@ project(dynamic_shared)
 cmake_minimum_required(VERSION 3.10)
 
 include_directories(../../common)
+
+if(UNIX)
+  if(NOT DEFINED ROCM_PATH)
+    set(ROCM_PATH "/opt/rocm" CACHE STRING "Default ROCM installation directory.")
+  endif()
+  # Search for rocm in common locations
+  list(APPEND CMAKE_PREFIX_PATH ${ROCM_PATH})
+endif()
+
 # Find hip
 find_package(hip)
 

samples/2_Cookbook/7_streams/CMakeLists.txt

@@ -22,6 +22,14 @@ project(stream)
 
 cmake_minimum_required(VERSION 3.10)
 
+if(UNIX)
+  if(NOT DEFINED ROCM_PATH)
+    set(ROCM_PATH "/opt/rocm" CACHE STRING "Default ROCM installation directory.")
+  endif()
+  # Search for rocm in common locations
+  list(APPEND CMAKE_PREFIX_PATH ${ROCM_PATH})
+endif()
+
 # Find hip
 find_package(hip)
 

samples/2_Cookbook/8_peer2peer/CMakeLists.txt

@@ -22,6 +22,13 @@ project(peer2peer)
 
 cmake_minimum_required(VERSION 3.10)
 
+if(UNIX)
+  if(NOT DEFINED ROCM_PATH)
+    set(ROCM_PATH "/opt/rocm" CACHE STRING "Default ROCM installation directory.")
+  endif()
+  # Search for rocm in common locations
+  list(APPEND CMAKE_PREFIX_PATH ${ROCM_PATH})
+endif()
 # Find hip
 find_package(hip)
 

samples/2_Cookbook/9_unroll/CMakeLists.txt

@@ -22,6 +22,14 @@ project(unroll)
 
 cmake_minimum_required(VERSION 3.10)
 
+if(UNIX)
+  if(NOT DEFINED ROCM_PATH)
+    set(ROCM_PATH "/opt/rocm" CACHE STRING "Default ROCM installation directory.")
+  endif()
+  # Search for rocm in common locations
+  list(APPEND CMAKE_PREFIX_PATH ${ROCM_PATH})
+endif()
+
 # Find hip
 find_package(hip)
 

samples/README.md

@@ -20,7 +20,7 @@ mkdir -p build && cd build
 
 rm -rf * (to clear up)
 
-cmake -DCMAKE_PREFIX_PATH=<path/to/rocm> -DHIP_CXX_COMPILER=<path/to/clang> ..
+cmake ..
 
 Then run,