Revert "Revert "Merge branch 'amd-master-next' into amd-npi-next""

This reverts commit 374ead1d19.

Reason for revert: <INSERT REASONING HERE>

Change-Id: I92ceb171e31026ed1864704cef2fc1497b883ef9

samples/2_Cookbook/0_MatrixTranspose/CMakeLists.txt

@@ -0,0 +1,20 @@
+project(MatrixTranspose)
+
+cmake_minimum_required(VERSION 3.10)
+
+# Search for rocm in common locations
+list(APPEND CMAKE_PREFIX_PATH /opt/rocm/hip /opt/rocm)
+
+# Find hip
+find_package(hip)
+
+# Set compiler and linker
+set(CMAKE_CXX_COMPILER ${HIP_HIPCC_EXECUTABLE})
+set(CMAKE_CXX_LINKER   ${HIP_HIPCC_EXECUTABLE})
+set(CMAKE_BUILD_TYPE Release)
+
+# Create the excutable
+add_executable(MatrixTranspose MatrixTranspose.cpp)
+
+# Link with HIP
+target_link_libraries(MatrixTranspose hip::host)

samples/2_Cookbook/10_inline_asm/CMakeLists.txt

@@ -0,0 +1,20 @@
+project(inline_asm)
+
+cmake_minimum_required(VERSION 3.10)
+
+# Search for rocm in common locations
+list(APPEND CMAKE_PREFIX_PATH /opt/rocm/hip /opt/rocm)
+
+# Find hip
+find_package(hip)
+
+# Set compiler and linker
+set(CMAKE_CXX_COMPILER ${HIP_HIPCC_EXECUTABLE})
+set(CMAKE_CXX_LINKER   ${HIP_HIPCC_EXECUTABLE})
+set(CMAKE_BUILD_TYPE Release)
+
+# Create the excutable
+add_executable(inline_asm inline_asm.cpp)
+
+# Link with HIP
+target_link_libraries(inline_asm hip::host)

samples/2_Cookbook/11_texture_driver/CMakeLists.txt

@@ -0,0 +1,30 @@
+project(texture2dDrv)
+
+cmake_minimum_required(VERSION 3.10)
+
+# Search for rocm in common locations
+list(APPEND CMAKE_PREFIX_PATH /opt/rocm/hip /opt/rocm)
+
+# Find hip
+find_package(hip)
+
+# Set compiler and linker
+set(CMAKE_CXX_COMPILER ${HIP_HIPCC_EXECUTABLE})
+set(CMAKE_CXX_LINKER   ${HIP_HIPCC_EXECUTABLE})
+set(CMAKE_BUILD_TYPE Release)
+
+# Create the excutable
+add_executable(texture2dDrv texture2dDrv.cpp)
+
+# Generate code object
+add_custom_target(
+  codeobj
+  ALL
+  COMMAND  ${HIP_HIPCC_EXECUTABLE} --genco  ../tex2dKernel.cpp -o tex2dKernel.code
+  COMMENT "codeobj generated"
+)
+
+add_dependencies(texture2dDrv codeobj)
+
+# Link with HIP
+target_link_libraries(texture2dDrv hip::host)

samples/2_Cookbook/13_occupancy/CMakeLists.txt

@@ -0,0 +1,20 @@
+project(occupancy)
+
+cmake_minimum_required(VERSION 3.10)
+
+# Search for rocm in common locations
+list(APPEND CMAKE_PREFIX_PATH /opt/rocm/hip /opt/rocm)
+
+# Find hip
+find_package(hip)
+
+# Set compiler and linker
+set(CMAKE_CXX_COMPILER ${HIP_HIPCC_EXECUTABLE})
+set(CMAKE_CXX_LINKER   ${HIP_HIPCC_EXECUTABLE})
+set(CMAKE_BUILD_TYPE Release)
+
+# Create the excutable
+add_executable(occupancy occupancy.cpp)
+
+# Link with HIP
+target_link_libraries(occupancy hip::host)

samples/2_Cookbook/1_hipEvent/CMakeLists.txt

@@ -0,0 +1,20 @@
+project(hipEvent)
+
+cmake_minimum_required(VERSION 3.10)
+
+# Search for rocm in common locations
+list(APPEND CMAKE_PREFIX_PATH /opt/rocm/hip /opt/rocm)
+
+# Find hip
+find_package(hip)
+
+# Set compiler and linker
+set(CMAKE_CXX_COMPILER ${HIP_HIPCC_EXECUTABLE})
+set(CMAKE_CXX_LINKER   ${HIP_HIPCC_EXECUTABLE})
+set(CMAKE_BUILD_TYPE Release)
+
+# Create the excutable
+add_executable(hipEvent hipEvent.cpp)
+
+# Link with HIP
+target_link_libraries(hipEvent hip::host)

samples/2_Cookbook/3_shared_memory/CMakeLists.txt

@@ -0,0 +1,20 @@
+project(sharedMemory)
+
+cmake_minimum_required(VERSION 3.10)
+
+# Search for rocm in common locations
+list(APPEND CMAKE_PREFIX_PATH /opt/rocm/hip /opt/rocm)
+
+# Find hip
+find_package(hip)
+
+# Set compiler and linker
+set(CMAKE_CXX_COMPILER ${HIP_HIPCC_EXECUTABLE})
+set(CMAKE_CXX_LINKER   ${HIP_HIPCC_EXECUTABLE})
+set(CMAKE_BUILD_TYPE Release)
+
+# Create the excutable
+add_executable(sharedMemory sharedMemory.cpp)
+
+# Link with HIP
+target_link_libraries(sharedMemory hip::host)

samples/2_Cookbook/4_shfl/CMakeLists.txt

@@ -0,0 +1,20 @@
+project(shfl)
+
+cmake_minimum_required(VERSION 3.10)
+
+# Search for rocm in common locations
+list(APPEND CMAKE_PREFIX_PATH /opt/rocm/hip /opt/rocm)
+
+# Find hip
+find_package(hip)
+
+# Set compiler and linker
+set(CMAKE_CXX_COMPILER ${HIP_HIPCC_EXECUTABLE})
+set(CMAKE_CXX_LINKER   ${HIP_HIPCC_EXECUTABLE})
+set(CMAKE_BUILD_TYPE Release)
+
+# Create the excutable
+add_executable(shfl shfl.cpp)
+
+# Link with HIP
+target_link_libraries(shfl hip::host)

samples/2_Cookbook/5_2dshfl/CMakeLists.txt

@@ -0,0 +1,19 @@
+project(2dshfl)
+
+cmake_minimum_required(VERSION 3.10)
+
+# Search for rocm in common locations
+list(APPEND CMAKE_PREFIX_PATH /opt/rocm/hip /opt/rocm)
+
+# Find hip
+find_package(hip)
+
+# Set compiler and linker
+set(CMAKE_CXX_COMPILER ${HIP_HIPCC_EXECUTABLE})
+set(CMAKE_CXX_LINKER   ${HIP_HIPCC_EXECUTABLE})
+
+# Create the excutable
+add_executable(2dshfl 2dshfl.cpp)
+
+# Link with HIP
+target_link_libraries(2dshfl hip::host)

samples/2_Cookbook/6_dynamic_shared/CMakeLists.txt

@@ -0,0 +1,19 @@
+project(dynamic_shared)
+
+cmake_minimum_required(VERSION 3.10)
+
+# Search for rocm in common locations
+list(APPEND CMAKE_PREFIX_PATH /opt/rocm/hip /opt/rocm)
+
+# Find hip
+find_package(hip)
+
+# Set compiler and linker
+set(CMAKE_CXX_COMPILER ${HIP_HIPCC_EXECUTABLE})
+set(CMAKE_CXX_LINKER   ${HIP_HIPCC_EXECUTABLE})
+
+# Create the excutable
+add_executable(dynamic_shared dynamic_shared.cpp)
+
+# Link with HIP
+target_link_libraries(dynamic_shared hip::host)

samples/2_Cookbook/7_streams/CMakeLists.txt

@@ -0,0 +1,19 @@
+project(stream)
+
+cmake_minimum_required(VERSION 3.10)
+
+# Search for rocm in common locations
+list(APPEND CMAKE_PREFIX_PATH /opt/rocm/hip /opt/rocm)
+
+# Find hip
+find_package(hip)
+
+# Set compiler and linker
+set(CMAKE_CXX_COMPILER ${HIP_HIPCC_EXECUTABLE})
+set(CMAKE_CXX_LINKER   ${HIP_HIPCC_EXECUTABLE})
+
+# Create the excutable
+add_executable(stream stream.cpp)
+
+# Link with HIP
+target_link_libraries(stream hip::host)

samples/2_Cookbook/8_peer2peer/CMakeLists.txt

@@ -0,0 +1,19 @@
+project(peer2peer)
+
+cmake_minimum_required(VERSION 3.10)
+
+# Search for rocm in common locations
+list(APPEND CMAKE_PREFIX_PATH /opt/rocm/hip /opt/rocm)
+
+# Find hip
+find_package(hip)
+
+# Set compiler and linker
+set(CMAKE_CXX_COMPILER ${HIP_HIPCC_EXECUTABLE})
+set(CMAKE_CXX_LINKER   ${HIP_HIPCC_EXECUTABLE})
+
+# Create the excutable
+add_executable(peer2peer peer2peer.cpp)
+
+# Link with HIP
+target_link_libraries(peer2peer hip::host)

samples/2_Cookbook/9_unroll/CMakeLists.txt

@@ -0,0 +1,19 @@
+project(unroll)
+
+cmake_minimum_required(VERSION 3.10)
+
+# Search for rocm in common locations
+list(APPEND CMAKE_PREFIX_PATH /opt/rocm/hip /opt/rocm)
+
+# Find hip
+find_package(hip)
+
+# Set compiler and linker
+set(CMAKE_CXX_COMPILER ${HIP_HIPCC_EXECUTABLE})
+set(CMAKE_CXX_LINKER   ${HIP_HIPCC_EXECUTABLE})
+
+# Create the excutable
+add_executable(unroll unroll.cpp)
+
+# Link with HIP
+target_link_libraries(unroll hip::host)