SWDEV-385161 - Deprecate/Remove env vars such as HIP_PATH, HSA_PATH etc.

ROCm · Mar 9, 2023 · 8aa123c · 8aa123c
1 parent 11372c9
commit 8aa123c
Show file tree

Hide file tree

Showing 24 changed files with 124 additions and 38 deletions.
diff --git a/HIP-Examples-Applications/BinomialOption/Makefile b/HIP-Examples-Applications/BinomialOption/Makefile
@@ -1,4 +1,5 @@
-HIPCC=/opt/rocm/bin/hipcc
+HIP_PATH?= $(wildcard /opt/rocm)
+HIPCC=$(HIP_PATH)/bin/hipcc
 
 SOURCES = BinomialOption.cpp
 OBJECTS = $(SOURCES:.cpp=.o)
@@ -25,3 +26,4 @@ test: $(EXECUTABLE)
 clean:
 	rm -f $(EXECUTABLE)
 	rm -f $(OBJECTS)
+	rm -f $(HIP_PATH)/src/*.o
diff --git a/HIP-Examples-Applications/BitonicSort/Makefile b/HIP-Examples-Applications/BitonicSort/Makefile
@@ -1,4 +1,5 @@
-HIPCC=/opt/rocm/bin/hipcc
+HIP_PATH?= $(wildcard /opt/rocm)
+HIPCC=$(HIP_PATH)/bin/hipcc
 
 SOURCES = BitonicSort.cpp
 OBJECTS = $(SOURCES:.cpp=.o)
@@ -25,3 +26,4 @@ test: $(EXECUTABLE)
 clean:
 	rm -f $(EXECUTABLE)
 	rm -f $(OBJECTS)
+	rm -f $(HIP_PATH)/src/*.o
diff --git a/HIP-Examples-Applications/FastWalshTransform/Makefile b/HIP-Examples-Applications/FastWalshTransform/Makefile
@@ -1,4 +1,5 @@
-HIPCC=/opt/rocm/bin/hipcc
+HIP_PATH?= $(wildcard /opt/rocm)
+HIPCC=$(HIP_PATH)/bin/hipcc
 
 SOURCES = FastWalshTransform.cpp
 OBJECTS = $(SOURCES:.cpp=.o)
@@ -25,3 +26,4 @@ test: $(EXECUTABLE)
 clean:
 	rm -f $(EXECUTABLE)
 	rm -f $(OBJECTS)
+	rm -f $(HIP_PATH)/src/*.o
diff --git a/HIP-Examples-Applications/FloydWarshall/Makefile b/HIP-Examples-Applications/FloydWarshall/Makefile
@@ -1,4 +1,5 @@
-HIPCC=/opt/rocm/bin/hipcc
+HIP_PATH?= $(wildcard /opt/rocm)
+HIPCC=$(HIP_PATH)/bin/hipcc
 
 SOURCES = FloydWarshall.cpp
 OBJECTS = $(SOURCES:.cpp=.o)
@@ -25,3 +26,4 @@ test: $(EXECUTABLE)
 clean:
 	rm -f $(EXECUTABLE)
 	rm -f $(OBJECTS)
+	rm -f $(HIP_PATH)/src/*.o
diff --git a/HIP-Examples-Applications/HelloWorld/Makefile b/HIP-Examples-Applications/HelloWorld/Makefile
@@ -1,6 +1,5 @@
-HIPCC=/opt/rocm/bin/hipcc
-
-TARGET=hcc
+HIP_PATH?= $(wildcard /opt/rocm)
+HIPCC=$(HIP_PATH)/bin/hipcc
 
 SOURCES = HelloWorld.cpp
 OBJECTS = $(SOURCES:.cpp=.o)
@@ -27,3 +26,4 @@ test: $(EXECUTABLE)
 clean:
 	rm -f $(EXECUTABLE)
 	rm -f $(OBJECTS)
+	rm -f $(HIP_PATH)/src/*.o
diff --git a/HIP-Examples-Applications/Histogram/Makefile b/HIP-Examples-Applications/Histogram/Makefile
@@ -1,4 +1,5 @@
-HIPCC=/opt/rocm/bin/hipcc
+HIP_PATH?= $(wildcard /opt/rocm)
+HIPCC=$(HIP_PATH)/bin/hipcc
 
 SOURCES = Histogram.cpp
 OBJECTS = $(SOURCES:.cpp=.o)
@@ -25,3 +26,4 @@ test: $(EXECUTABLE)
 clean:
 	rm -f $(EXECUTABLE)
 	rm -f $(OBJECTS)
+	rm -f $(HIP_PATH)src/*.o
diff --git a/HIP-Examples-Applications/MatrixMultiplication/Makefile b/HIP-Examples-Applications/MatrixMultiplication/Makefile
@@ -1,4 +1,5 @@
-HIPCC=/opt/rocm/bin/hipcc
+HIP_PATH?= $(wildcard /opt/rocm)
+HIPCC=$(HIP_PATH)/bin/hipcc
 
 SOURCES = MatrixMultiplication.cpp
 OBJECTS = $(SOURCES:.cpp=.o)
@@ -25,3 +26,4 @@ test: $(EXECUTABLE)
 clean:
 	rm -f $(EXECUTABLE)
 	rm -f $(OBJECTS)
+	rm -f $(HIP_PATH)/src/*.o
diff --git a/HIP-Examples-Applications/PrefixSum/Makefile b/HIP-Examples-Applications/PrefixSum/Makefile
@@ -1,4 +1,5 @@
-HIPCC=/opt/rocm/bin/hipcc
+HIP_PATH?= $(wildcard /opt/rocm)
+HIPCC=$(HIP_PATH)/bin/hipcc
 
 SOURCES = PrefixSum.cpp
 OBJECTS = $(SOURCES:.cpp=.o)
@@ -25,3 +26,4 @@ test: $(EXECUTABLE)
 clean:
 	rm -f $(EXECUTABLE)
 	rm -f $(OBJECTS)
+	rm -f $(HIP_PATH)/src/*.o
diff --git a/HIP-Examples-Applications/RecursiveGaussian/Makefile b/HIP-Examples-Applications/RecursiveGaussian/Makefile
@@ -1,4 +1,5 @@
-HIPCC=/opt/rocm/bin/hipcc
+HIP_PATH?= $(wildcard /opt/rocm)
+HIPCC=$(HIP_PATH)/bin/hipcc
 
 SOURCES = RecursiveGaussian.cpp
 OBJECTS = $(SOURCES:.cpp=.o)
@@ -25,3 +26,4 @@ test: $(EXECUTABLE)
 clean:
 	rm -f $(EXECUTABLE)
 	rm -f $(OBJECTS)
+	rm -f $(HIP_PATH)/src/*.o
diff --git a/HIP-Examples-Applications/SimpleConvolution/Makefile b/HIP-Examples-Applications/SimpleConvolution/Makefile
@@ -1,4 +1,5 @@
-HIPCC=/opt/rocm/bin/hipcc
+HIP_PATH?= $(wildcard /opt/rocm)
+HIPCC=$(HIP_PATH)/bin/hipcc
 
 SOURCES = SimpleConvolution.cpp
 OBJECTS = $(SOURCES:.cpp=.o)
@@ -25,3 +26,4 @@ test: $(EXECUTABLE)
 clean:
 	rm -f $(EXECUTABLE)
 	rm -f $(OBJECTS)
+	rm -f $(HIP_PATH)/src/*.o
diff --git a/add4/Makefile b/add4/Makefile
@@ -4,7 +4,9 @@ all:  gpu-stream-hip
 
 common.o: common.cpp common.h Makefile
 
-HIPCC=/opt/rocm/bin/hipcc
+HIP_PATH?= $(wildcard /opt/rocm)
+
+HIPCC=$(HIP_PATH)/bin/hipcc
 
 hip-stream.o : hip-stream.cpp
 	$(HIPCC) $(CXXFLAGS) -c $< -o $@

diff --git a/common/hip.all.make b/common/hip.all.make
@@ -1,2 +1,2 @@
-include /opt/rocm/hip/examples/common/hip.prologue.make
-include /opt/rocm/hip/examples/common/hip.epilogue.make
+include $(HIP_PATH)/examples/common/hip.prologue.make
+include $(HIP_PATH)/examples/common/hip.epilogue.make
diff --git a/common/hip.prologue.make b/common/hip.prologue.make
@@ -1,11 +1,14 @@
-# This file is designed to be included at beginning of Makefile.
+# This file is designed to be included at beginning of Makefile, right after setting HIP_PATH.
+# Note: define $HIP_PATH before including this file.
+# HIP_PATH should be relevant to the parent makefile
 #
 # It should not include any concrete makefile steps, so "make" still runs the first step in the Makefile.
 #
 
 #------
 ##Provide default if not already set:
-HIP_PLATFORM=$(shell /opt/rocm/bin/hipconfig --compiler)
+HIP_PATH?=../..
+HIP_PLATFORM=$(shell $(HIP_PATH)/bin/hipconfig --compiler)
 
 # CUDA toolkit installation path
 CUDA_DIR?=/usr/local/cuda-7.5
@@ -22,11 +25,13 @@ endif
 # nvcc (7.5) can handle openmp though. 
 # use OMPCC and OMP_FLAGS
 
-HIPCC=/opt/rocm/bin/hipcc
-HIPLD=/opt/rocm/bin/hipcc
+HIPCC=$(HIP_PATH)/bin/hipcc
+HIPLD=$(HIP_PATH)/bin/hipcc
 
 #-- 
 # Set up automatic make of HIP cpp depenendencies
+# TODO - this can be removed when HIP has a proper make structure.
+#HIP_SOURCES = $(HIP_PATH)/src/hip_hcc.cpp
 
 HIPCC_FLAGS += -I../../common
 # 'make dbg=1' enables HIPCC debugging and no opt switch.
@@ -50,11 +55,15 @@ OMP_FLAGS = $(HIPCC_FLAGS)
 HIP_DEPS = 
 
 else ifeq ($(HIP_PLATFORM), hcc)
+#HIP_DEPS = $(HIP_SOURCES:.cpp=.o)
 OMPCC = gcc
 OMP_FLAGS += -fopenmp
 
 # Add dependencies to make hip_cc.o and other support files.
+HSA_PATH ?= /opt/hsa
+#HIP_SOURCES = $(HIP_PATH)/src/hip_hcc.cpp
 #HIP_DEPS = $(HIP_SOURCES:.cpp=.o)
+#$(HIP_DEPS): HIPCC_FLAGS += -I$(HSA_PATH)/include
 %.o:: %.cpp
 	    $(HIPCC) $(HIPCC_FLAGS) $< -c -o $@
 endif
@@ -76,7 +85,7 @@ endif
 #	$(HIPIFY)  $< > $@
 
 
-KCFLAGS += $(OPT) -I/opt/rocm/include  -I/opt/rocm/hip/include -I$(GRID_LAUNCH_PATH) -I$(AM_PATH)/include
+KCFLAGS += $(OPT) -I$(HSA_PATH)/include  -I$(HIP_PATH)/include -I$(GRID_LAUNCH_PATH) -I$(AM_PATH)/include
 
 %.o:: %.cpp
 	$(HIPCC) $(HIPCC_FLAGS) $< -c -o $@

diff --git a/cuda-stream/Makefile b/cuda-stream/Makefile
@@ -1,4 +1,6 @@
-HIPCC=/opt/rocm/bin/hipcc
+HIP_PATH?= $(wildcard /opt/rocm)
+
+HIPCC=$(HIP_PATH)/bin/hipcc
 
 CXXFLAGS += -std=c++11 -O3
 

diff --git a/gpu-burn/Makefile b/gpu-burn/Makefile
@@ -1,8 +1,10 @@
-HIP_PLATFORM = $(shell /opt/rocm/bin/hipconfig --platform)
-HIP_INCLUDE = -I/opt/rocm/include
+HIP_PATH?= $(wildcard /opt/rocm)
+
+HIP_PLATFORM = $(shell $(HIP_PATH)/bin/hipconfig --platform)
+HIP_INCLUDE = -I$(HIP_PATH)/include
 BUILD_DIR ?= build
 
-HIPCC = /opt/rocm/bin/hipcc
+HIPCC = $(HIP_PATH)/bin/hipcc
 CPPFLAGS = -O3
 LDFLAGS = -lm -lpthread
 

diff --git a/mini-nbody/hip/HIP-nbody-block.sh b/mini-nbody/hip/HIP-nbody-block.sh
@@ -10,8 +10,20 @@ then
     rm nbody-block
 fi
 
+if [ -z  "$HIP_PATH" ]
+then
+
+if [ -d /opt/rocm/hip ]
+then
+    HIP_PATH=/opt/rocm/hip
+else
+    HIP_PATH=/opt/rocm
+fi
+
+fi
+
 echo hipcc -I../ -DSHMOO nbody-block.cpp -o nbody-block
-/opt/rocm/bin/hipcc -I../ -DSHMOO nbody-block.cpp -o nbody-block
+$HIP_PATH/bin/hipcc -I../ -DSHMOO nbody-block.cpp -o nbody-block
 
 #To print our more details, remove DSHMOO flag
 #hipcc -I../  nbody-block.cpp -o nbody-block
@@ -25,3 +37,4 @@ do
     ./$EXE $K
     K=$(($K*2))
 done
+
diff --git a/mini-nbody/hip/HIP-nbody-orig.sh b/mini-nbody/hip/HIP-nbody-orig.sh
@@ -7,8 +7,20 @@ then
     rm nbody-orig
 fi
 
+if [ -z  "$HIP_PATH" ]
+then
+
+if [ -d /opt/rocm/hip ]
+then
+    HIP_PATH=/opt/rocm/hip
+else
+    HIP_PATH=/opt/rocm
+fi
+
+fi
+
 echo hipcc -I../ -DSHMOO nbody-orig.cpp -o nbody-orig
-/opt/rocm/bin/hipcc -I../ -DSHMOO nbody-orig.cpp -o nbody-orig
+$HIP_PATH/bin/hipcc -I../ -DSHMOO nbody-orig.cpp -o nbody-orig
 
 #To print our more details, remove  flag
 #hipcc -I../  nbody-orig.cpp -o nbody-orig
@@ -23,3 +35,4 @@ do
     ./$EXE $K
     K=$(($K*2))
 done
+
diff --git a/mini-nbody/hip/HIP-nbody-soa.sh b/mini-nbody/hip/HIP-nbody-soa.sh
@@ -10,8 +10,20 @@ then
     rm nbody-soa
 fi
 
+if [ -z  "$HIP_PATH" ]
+then
+
+if [ -d /opt/rocm/hip ]
+then
+    HIP_PATH=/opt/rocm/hip
+else
+    HIP_PATH=/opt/rocm
+fi
+
+fi
+
 echo hipcc -I../ -DSHMOO nbody-soa.cpp -o nbody-soa
-/opt/rocm/bin/hipcc -I../ -DSHMOO nbody-soa.cpp -o nbody-soa
+$HIP_PATH/bin/hipcc -I../ -DSHMOO nbody-soa.cpp -o nbody-soa
 
 #To print our more details, remove DSHMOO flag
 #hipcc -I../  nbody-soa.cpp -o nbody-soa
@@ -25,3 +37,4 @@ do
     ./$EXE $K
     K=$(($K*2))
 done
+
diff --git a/openmp-helloworld/Makefile b/openmp-helloworld/Makefile
@@ -1,4 +1,6 @@
-HIPCC=/opt/rocm/bin/hipcc
+HIP_PATH?= $(wildcard /opt/rocm)
+HIPCC=$(HIP_PATH)/bin/hipcc
+
 CXX=$(HIPCC)
 CXXFLAGS =-fopenmp
 

diff --git a/reduction/Makefile b/reduction/Makefile
@@ -1,4 +1,5 @@
-HIPCC=/opt/rocm/bin/hipcc
+HIP_PATH?= $(wildcard /opt/rocm)
+HIPCC=$(HIP_PATH)/bin/hipcc
 
 CXXFLAGS += -std=c++11 -O3
 
@@ -13,4 +14,3 @@ endif
 
 clean:
 	rm -f reduction *.o
-
diff --git a/rtm8/Makefile b/rtm8/Makefile
@@ -1,4 +1,5 @@
-HIPCC=/opt/rocm/bin/hipcc
+HIP_PATH?= $(wildcard /opt/rocm)
+HIPCC=$(HIP_PATH)/bin/hipcc
 
 CXXFLAGS += -std=c++11 -O3
 
@@ -13,4 +14,3 @@ endif
 
 clean:
 	rm -f rtm8 *.o
-
diff --git a/rtm8/build_hip.sh b/rtm8/build_hip.sh
@@ -1,10 +1,22 @@
 #!/bin/bash
 
+if [ -z  "$HIP_PATH" ]
+then
+
+if [ -d /opt/rocm/hip ]
+then
+    HIP_PATH=/opt/rocm/hip
+else
+    HIP_PATH=/opt/rocm
+fi
+
+fi
+
 if [ -f "rtm8_hip" ]
 then
     rm rtm8_hip
 fi
 
 echo "hipcc -std=c++11 -O3 -o rtm8_hip rtm8.cpp"
-/opt/rocm/bin/hipcc -std=c++11 -O3 -o rtm8_hip rtm8.cpp
+$HIP_PATH/bin/hipcc -std=c++11 -O3 -o rtm8_hip rtm8.cpp
 
diff --git a/strided-access/Makefile b/strided-access/Makefile
@@ -1,4 +1,5 @@
-HIPCC=/opt/rocm/bin/hipcc
+HIP_PATH?= $(wildcard /opt/rocm)
+HIPCC=$(HIP_PATH)/bin/hipcc
 
 CXXFLAGS += -std=c++11 -O3
 
@@ -13,4 +14,3 @@ endif
 
 clean:
 	rm -f strided-access *.o
-
diff --git a/vectorAdd/Makefile b/vectorAdd/Makefile
@@ -1,6 +1,5 @@
-HIPCC=/opt/rocm/bin/hipcc
-
-TARGET=hcc
+HIP_PATH?= $(wildcard /opt/rocm)
+HIPCC=$(HIP_PATH)/bin/hipcc
 
 SOURCES = vectoradd_hip.cpp 
 OBJECTS = $(SOURCES:.cpp=.o)
@@ -28,3 +27,4 @@ test: $(EXECUTABLE)
 clean:
 	rm -f $(EXECUTABLE)
 	rm -f $(OBJECTS)
+	rm -f $(HIP_PATH)/src/*.o