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)

samples/0_Intro/module_api/CMakeLists.txt

@@ -0,0 +1,36 @@
+project(module_api)
+
+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(runKernel.hip.out runKernel.cpp)
+add_executable(launchKernelHcc.hip.out launchKernelHcc.cpp)
+add_executable(defaultDriver.hip.out defaultDriver.cpp)
+
+# Generate code object
+add_custom_target(
+  codeobj
+  ALL
+  COMMAND  ${HIP_HIPCC_EXECUTABLE} --genco  ../vcpy_kernel.cpp -o vcpy_kernel.code
+  COMMENT "codeobj generated"
+)
+
+add_dependencies(runKernel.hip.out codeobj)
+add_dependencies(launchKernelHcc.hip.out codeobj)
+add_dependencies(defaultDriver.hip.out codeobj)
+
+# Link with HIP
+target_link_libraries(runKernel.hip.out hip::host)
+target_link_libraries(launchKernelHcc.hip.out hip::host)
+target_link_libraries(defaultDriver.hip.out hip::host)

samples/0_Intro/module_api_global/CMakeLists.txt

@@ -0,0 +1,30 @@
+project(modile_api_global)
+
+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(runKernel.hip.out runKernel.cpp)
+
+# Generate code object
+add_custom_target(
+  codeobj
+  ALL
+  COMMAND  ${HIP_HIPCC_EXECUTABLE} --genco  ../vcpy_kernel.cpp -o vcpy_kernel.code
+  COMMENT "codeobj generated"
+)
+
+add_dependencies(runKernel.hip.out codeobj)
+
+# Link with HIP
+target_link_libraries(runKernel.hip.out hip::host)

samples/0_Intro/square/CMakeLists.txt

@@ -0,0 +1,21 @@
+#Follow "README.md" to generate square.cpp if it's missing
+
+project(square)
+
+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(square square.cpp)
+
+# Link with HIP
+target_link_libraries(square hip::host)

samples/0_Intro/square/Makefile

@@ -11,7 +11,7 @@ else
 	SOURCES=square.cpp
 endif
 
-all: square.out square.out.static
+all: square.out
 
 # Step
 square.cpp: square.cu
@@ -20,8 +20,5 @@ square.cpp: square.cu
 square.out: $(SOURCES)
 	$(HIPCC) $(CXXFLAGS) $(SOURCES) -o $@
 
-square.out.static: $(SOURCES)
-	$(HIPCC) -use-staticlib $(CXXFLAGS) $(SOURCES) -o $@
-
 clean:
-	rm -f *.o *.out *.out.static square.cpp
+	rm -f *.o *.out square.cpp

samples/0_Intro/square/README.md

@@ -1,13 +1,39 @@
 # Square.md
 
-Simple test which shows how to use hipify-perl to port CUDA code to HIP.  
-See related [blog](http://gpuopen.com/hip-to-be-squared-an-introductory-hip-tutorial) that explains the example. 
+Simple test which shows how to use hipify-perl to port CUDA code to HIP.
+See related [blog](http://gpuopen.com/hip-to-be-squared-an-introductory-hip-tutorial) that explains the example.
 Now it is even simpler and requires no manual modification to the hipified source code - just hipify and compile:
 
-1. Add hip/bin path to the PATH  :
-    <code>export PATH=$PATH:[MYHIP]/bin</code>
+- Add hip/bin path to the PATH
 
-2. <code>$ make </code>
-   Make runs these steps.  This can be performed on either CUDA or AMD platform:
-   <code>hipify-perl square.cu > square.cpp </code>    # convert cuda code to hip code
-   <code>hipcc square.cpp</code>                       # compile into executable
+```
+$ export PATH=$PATH:[MYHIP]/bin
+```
+
+- Define environment variable
+
+```
+$ export HIP_PATH=[MYHIP]
+```
+
+- Build executible file
+
+```
+$ cd ~/hip/samples/0_Intro/square
+$ make
+/home/user/hip/bin/hipify-perl square.cu > square.cpp
+/home/user/hip/bin/hipcc  square.cpp -o square.out
+/home/user/hip/bin/hipcc -use-staticlib  square.cpp -o square.out.static
+```
+- Execute file
+```
+$ ./square.out
+info: running on device Navi 14 [Radeon Pro W5500]
+info: allocate host mem (  7.63 MB)
+info: allocate device mem (  7.63 MB)
+info: copy Host2Device
+info: launch 'vector_square' kernel
+info: copy Device2Host
+info: check result
+PASSED!
+```