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

This reverts commit 051c84bba3.

Reason for revert: <INSERT REASONING HERE>

Change-Id: I92ceb171e31026ed1864704cef2fc1497b883ef9

samples/0_Intro/bit_extract/CMakeLists.txt

@@ -0,0 +1,20 @@
+project(bit_extract)
+
+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(bit_extract bit_extract.cpp)
+
+# Link with HIP
+target_link_libraries(bit_extract hip::host)

samples/0_Intro/bit_extract/Makefile

@@ -9,19 +9,15 @@ HIPCC=$(HIP_PATH)/bin/hipcc
 
 # Show how to use PLATFORM to specify different options for each compiler:
 ifeq (${HIP_PLATFORM}, nvcc)
-	HIPCC_FLAGS = -gencode=arch=compute_20,code=sm_20 
+	HIPCC_FLAGS = -gencode=arch=compute_20,code=sm_20
 endif
 
 EXE=bit_extract
-EXE_STATIC=bit_extract_static
 
 $(EXE): bit_extract.cpp
 	$(HIPCC) $(HIPCC_FLAGS) $< -o $@
 
-$(EXE_STATIC): bit_extract.cpp
-	$(HIPCC) -use-staticlib  $(HIPCC_FLAGS) $< -o $@
-
-all: $(EXE) $(EXE_STATIC)
+all: $(EXE)
 
 clean:
-	rm -f *.o $(EXE) $(EXE_STATIC)
+	rm -f *.o $(EXE)