Merge pull request #37 from satyanveshd/satyanveshd/HIP_PATH

SWDEV-385161 - Remove env vars such as HIP_PATH, HSA_PATH etc.
ROCm · Jul 7, 2023 · ff81239 · ff81239
2 parents 1144662 + 38d5365
commit ff81239
Show file tree

Hide file tree

Showing 22 changed files with 31 additions and 150 deletions.
diff --git a/HIP-Examples-Applications/BinomialOption/Makefile b/HIP-Examples-Applications/BinomialOption/Makefile
@@ -1,12 +1,6 @@
-HIP_PATH?= $(wildcard /opt/rocm/hip)
-ifeq (,$(HIP_PATH))
-	HIP_PATH=../../..
-endif
-
+HIP_PATH?= $(wildcard /opt/rocm)
 HIPCC=$(HIP_PATH)/bin/hipcc
 
-TARGET=hcc
-
 SOURCES = BinomialOption.cpp
 OBJECTS = $(SOURCES:.cpp=.o)
 
@@ -33,4 +27,3 @@ 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,12 +1,6 @@
-HIP_PATH?= $(wildcard /opt/rocm/hip)
-ifeq (,$(HIP_PATH))
-	HIP_PATH=../../..
-endif
-
+HIP_PATH?= $(wildcard /opt/rocm)
 HIPCC=$(HIP_PATH)/bin/hipcc
 
-TARGET=hcc
-
 SOURCES = BitonicSort.cpp
 OBJECTS = $(SOURCES:.cpp=.o)
 
@@ -33,4 +27,3 @@ 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,12 +1,6 @@
-HIP_PATH?= $(wildcard /opt/rocm/hip)
-ifeq (,$(HIP_PATH))
-	HIP_PATH=../../..
-endif
-
+HIP_PATH?= $(wildcard /opt/rocm)
 HIPCC=$(HIP_PATH)/bin/hipcc
 
-TARGET=hcc
-
 SOURCES = FastWalshTransform.cpp
 OBJECTS = $(SOURCES:.cpp=.o)
 
@@ -33,4 +27,3 @@ 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,12 +1,6 @@
-HIP_PATH?= $(wildcard /opt/rocm/hip)
-ifeq (,$(HIP_PATH))
-	HIP_PATH=../../..
-endif
-
+HIP_PATH?= $(wildcard /opt/rocm)
 HIPCC=$(HIP_PATH)/bin/hipcc
 
-TARGET=hcc
-
 SOURCES = FloydWarshall.cpp
 OBJECTS = $(SOURCES:.cpp=.o)
 
@@ -33,4 +27,3 @@ 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,12 +1,6 @@
-HIP_PATH?= $(wildcard /opt/rocm/hip)
-ifeq (,$(HIP_PATH))
-	HIP_PATH=../../..
-endif
-
+HIP_PATH?= $(wildcard /opt/rocm)
 HIPCC=$(HIP_PATH)/bin/hipcc
 
-TARGET=hcc
-
 SOURCES = HelloWorld.cpp
 OBJECTS = $(SOURCES:.cpp=.o)
 
@@ -33,4 +27,3 @@ 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,12 +1,6 @@
-HIP_PATH?= $(wildcard /opt/rocm/hip)
-ifeq (,$(HIP_PATH))
-	HIP_PATH=../../..
-endif
-
+HIP_PATH?= $(wildcard /opt/rocm)
 HIPCC=$(HIP_PATH)/bin/hipcc
 
-TARGET=hcc
-
 SOURCES = Histogram.cpp
 OBJECTS = $(SOURCES:.cpp=.o)
 
@@ -32,5 +26,4 @@ test: $(EXECUTABLE)
 clean:
 	rm -f $(EXECUTABLE)
 	rm -f $(OBJECTS)
-	rm -f $(HIP_PATH)/src/*.o
-
+	rm -f $(HIP_PATH)src/*.o
diff --git a/HIP-Examples-Applications/MatrixMultiplication/Makefile b/HIP-Examples-Applications/MatrixMultiplication/Makefile
@@ -1,12 +1,6 @@
-HIP_PATH?= $(wildcard /opt/rocm/hip)
-ifeq (,$(HIP_PATH))
-	HIP_PATH=../../..
-endif
-
+HIP_PATH?= $(wildcard /opt/rocm)
 HIPCC=$(HIP_PATH)/bin/hipcc
 
-TARGET=hcc
-
 SOURCES = MatrixMultiplication.cpp
 OBJECTS = $(SOURCES:.cpp=.o)
 
@@ -33,4 +27,3 @@ 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,12 +1,6 @@
-HIP_PATH?= $(wildcard /opt/rocm/hip)
-ifeq (,$(HIP_PATH))
-	HIP_PATH=../../..
-endif
-
+HIP_PATH?= $(wildcard /opt/rocm)
 HIPCC=$(HIP_PATH)/bin/hipcc
 
-TARGET=hcc
-
 SOURCES = PrefixSum.cpp
 OBJECTS = $(SOURCES:.cpp=.o)
 
@@ -33,4 +27,3 @@ 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,12 +1,6 @@
-HIP_PATH?= $(wildcard /opt/rocm/hip)
-ifeq (,$(HIP_PATH))
-	HIP_PATH=../../..
-endif
-
+HIP_PATH?= $(wildcard /opt/rocm)
 HIPCC=$(HIP_PATH)/bin/hipcc
 
-TARGET=hcc
-
 SOURCES = RecursiveGaussian.cpp
 OBJECTS = $(SOURCES:.cpp=.o)
 
@@ -33,4 +27,3 @@ 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,12 +1,6 @@
-HIP_PATH?= $(wildcard /opt/rocm/hip)
-ifeq (,$(HIP_PATH))
-	HIP_PATH=../../..
-endif
-
+HIP_PATH?= $(wildcard /opt/rocm)
 HIPCC=$(HIP_PATH)/bin/hipcc
 
-TARGET=hcc
-
 SOURCES = SimpleConvolution.cpp
 OBJECTS = $(SOURCES:.cpp=.o)
 
@@ -33,4 +27,3 @@ clean:
 	rm -f $(EXECUTABLE)
 	rm -f $(OBJECTS)
 	rm -f $(HIP_PATH)/src/*.o
-
diff --git a/HIP-Examples-Applications/dct/Makefile b/HIP-Examples-Applications/dct/Makefile
@@ -1,11 +1,4 @@
-HIP_PATH?= $(wildcard /opt/rocm/hip)
-ifeq (,$(HIP_PATH))
-	HIP_PATH=../../..
-endif
-
-HIPCC=$(HIP_PATH)/bin/hipcc
-
-TARGET=hcc
+HIPCC=/opt/rocm/bin/hipcc
 
 SOURCES = dct.cpp
 OBJECTS = $(SOURCES:.cpp=.o)
@@ -32,5 +25,3 @@ test: $(EXECUTABLE)
 clean:
 	rm -f $(EXECUTABLE)
 	rm -f $(OBJECTS)
-	rm -f $(HIP_PATH)/src/*.o
-
diff --git a/HIP-Examples-Applications/dwtHaar1D/Makefile b/HIP-Examples-Applications/dwtHaar1D/Makefile
@@ -1,11 +1,4 @@
-HIP_PATH?= $(wildcard /opt/rocm/hip)
-ifeq (,$(HIP_PATH))
-	HIP_PATH=../../..
-endif
-
-HIPCC=$(HIP_PATH)/bin/hipcc
-
-TARGET=hcc
+HIPCC=/opt/rocm/bin/hipcc
 
 SOURCES = dwtHaar1D.cpp
 OBJECTS = $(SOURCES:.cpp=.o)
@@ -32,5 +25,3 @@ test: $(EXECUTABLE)
 clean:
 	rm -f $(EXECUTABLE)
 	rm -f $(OBJECTS)
-	rm -f $(HIP_PATH)/src/*.o
-
diff --git a/add4/Makefile b/add4/Makefile
@@ -4,10 +4,8 @@ all:  gpu-stream-hip
 
 common.o: common.cpp common.h Makefile
 
-HIP_PATH?= $(wildcard /opt/rocm/hip)
-ifeq (,$(HIP_PATH))
-	HIP_PATH=/opt/rocm
-endif
+HIP_PATH?= $(wildcard /opt/rocm)
+
 HIPCC=$(HIP_PATH)/bin/hipcc
 
 hip-stream.o : hip-stream.cpp

diff --git a/common/hip.prologue.make b/common/hip.prologue.make
@@ -1,6 +1,6 @@
 # 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 
+# 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.
 #
@@ -61,7 +61,7 @@ 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_SOURCES = $(HIP_PATH)/src/hip_hcc.cpp
 #HIP_DEPS = $(HIP_SOURCES:.cpp=.o)
 #$(HIP_DEPS): HIPCC_FLAGS += -I$(HSA_PATH)/include
 %.o:: %.cpp
@@ -85,7 +85,7 @@ endif
 #	$(HIPIFY)  $< > $@
 
 
-KCFLAGS += $(OPT) -I$(HSA_PATH)/include  -I$(HIP_PATH)/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,7 +1,5 @@
-HIP_PATH?= $(wildcard /opt/rocm/hip)
-ifeq (,$(HIP_PATH))
-	HIP_PATH=/opt/rocm
-endif
+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,14 +1,12 @@
-HIP_PATH?= $(wildcard /opt/rocm/hip)
-ifeq (,$(HIP_PATH))
-        HIP_PATH=/opt/rocm
-endif
-
+HIP_PATH?= $(wildcard /opt/rocm)
 
 HIP_PLATFORM = $(shell $(HIP_PATH)/bin/hipconfig --platform)
+
 HIP_INCLUDE = -I${HIP_PATH}/../include
+
 BUILD_DIR ?= build
 
-HIPCC = ${HIP_PATH}/bin/hipcc
+HIPCC = $(HIP_PATH)/bin/hipcc
 CPPFLAGS = -O3
 LDFLAGS = -lm -lpthread
 

diff --git a/openmp-helloworld/Makefile b/openmp-helloworld/Makefile
@@ -1,9 +1,6 @@
-HIP_PATH?= $(wildcard /opt/rocm/hip)
-ifeq (,$(HIP_PATH))
-	HIP_PATH=/opt/rocm
-endif
-
+HIP_PATH?= $(wildcard /opt/rocm)
 HIPCC=$(HIP_PATH)/bin/hipcc
+
 CXX=$(HIPCC)
 CXXFLAGS =-fopenmp
 

diff --git a/reduction/Makefile b/reduction/Makefile
@@ -1,7 +1,4 @@
-HIP_PATH?= $(wildcard /opt/rocm/hip)
-ifeq (,$(HIP_PATH))
-	HIP_PATH=/opt/rocm
-endif
+HIP_PATH?= $(wildcard /opt/rocm)
 HIPCC=$(HIP_PATH)/bin/hipcc
 
 CXXFLAGS += -std=c++11 -O3
@@ -17,4 +14,3 @@ endif
 
 clean:
 	rm -f reduction *.o
-
diff --git a/rtm8/Makefile b/rtm8/Makefile
@@ -1,7 +1,4 @@
-HIP_PATH?= $(wildcard /opt/rocm/hip)
-ifeq (,$(HIP_PATH))
-	HIP_PATH=/opt/rocm
-endif
+HIP_PATH?= $(wildcard /opt/rocm)
 HIPCC=$(HIP_PATH)/bin/hipcc
 
 CXXFLAGS += -std=c++11 -O3
@@ -17,4 +14,3 @@ endif
 
 clean:
 	rm -f rtm8 *.o
-
diff --git a/rtm8/build_hip.sh b/rtm8/build_hip.sh
@@ -10,9 +10,7 @@ else
     HIP_PATH=/opt/rocm
 fi
 
-fi 
-
-echo "Using HIP_PATH=$HIP_PATH"
+fi
 
 if [ -f "rtm8_hip" ]
 then

diff --git a/strided-access/Makefile b/strided-access/Makefile
@@ -1,7 +1,4 @@
-HIP_PATH?= $(wildcard /opt/rocm/hip)
-ifeq (,$(HIP_PATH))
-	HIP_PATH=/opt/rocm
-endif
+HIP_PATH?= $(wildcard /opt/rocm)
 HIPCC=$(HIP_PATH)/bin/hipcc
 
 CXXFLAGS += -std=c++11 -O3
@@ -17,4 +14,3 @@ endif
 
 clean:
 	rm -f strided-access *.o
-
diff --git a/vectorAdd/Makefile b/vectorAdd/Makefile
@@ -1,12 +1,6 @@
-HIP_PATH?= $(wildcard /opt/rocm/hip)
-ifeq (,$(HIP_PATH))
-	HIP_PATH=/opt/rocm
-endif
-
+HIP_PATH?= $(wildcard /opt/rocm)
 HIPCC=$(HIP_PATH)/bin/hipcc
 
-TARGET=hcc
-
 SOURCES = vectoradd_hip.cpp 
 OBJECTS = $(SOURCES:.cpp=.o)
 
@@ -34,5 +28,3 @@ clean:
 	rm -f $(EXECUTABLE)
 	rm -f $(OBJECTS)
 	rm -f $(HIP_PATH)/src/*.o
-
-