From 6763460b808e6a7ee9822183c98b8a0c8690733c Mon Sep 17 00:00:00 2001
From: Evgeny <evgeny.shcherbakov@amd.com>
Date: Wed, 16 Jan 2019 23:27:28 -0600
Subject: [PATCH] HIP test makefile sync

---
 test/MatrixTranspose/Makefile | 21 +++++++++++++++------
 1 file changed, 15 insertions(+), 6 deletions(-)

diff --git a/test/MatrixTranspose/Makefile b/test/MatrixTranspose/Makefile
index abc56bd98a..d3630a1c19 100644
--- a/test/MatrixTranspose/Makefile
+++ b/test/MatrixTranspose/Makefile
@@ -1,22 +1,32 @@
-HCC_HOME? = /opt/rocm/hcc
-HIP_PATH? = /opt/rocm/hip
+HIP_PATH?= $(wildcard /opt/rocm/hip)
+ifeq (,$(HIP_PATH))
+	HIP_PATH=../../..
+endif
+
+HIPCC=$(HIP_PATH)/bin/hipcc
+
+TARGET=hcc
 
 SOURCES = MatrixTranspose.cpp
 OBJECTS = $(SOURCES:.cpp=.o)
+
 EXECUTABLE=./MatrixTranspose
 
-HIPCC=$(HIP_PATH)/bin/hipcc
+.PHONY: test
+
+
+all: $(EXECUTABLE) test
+
 CXXFLAGS =-g
 CXX=$(HIPCC)
 
-all: $(EXECUTABLE)
 
 $(EXECUTABLE): $(OBJECTS)
 	$(HIPCC) $(OBJECTS) -o $@
 
 
 test: $(EXECUTABLE)
-	LD_PRELOAD=$(HCC_HOME)/lib/libmcwamp_hsa.so $(EXECUTABLE)
+	$(EXECUTABLE)
 
 
 clean:
@@ -24,4 +34,3 @@ clean:
 	rm -f $(OBJECTS)
 	rm -f $(HIP_PATH)/src/*.o
 
-.PHONY: all test clean