From 482e665b2a470bc110aab9854271eecd2308a152 Mon Sep 17 00:00:00 2001
From: Evgeny <evgeny.shcherbakov@amd.com>
Date: Tue, 24 Sep 2019 20:35:58 -0500
Subject: [PATCH] roctacer mark fix

[ROCm/roctracer commit: 389496265e1b765634d881ad5c266784d7bbfd65]
---
 projects/roctracer/src/core/roctracer.cpp        |  2 +-
 projects/roctracer/test/MatrixTranspose/Makefile | 13 ++++++++-----
 .../test/MatrixTranspose/MatrixTranspose.cpp     |  3 +++
 .../roctracer/test/MatrixTranspose_test/Makefile | 16 ++++++++--------
 projects/roctracer/test/tool/tracer_tool.cpp     |  2 +-
 5 files changed, 21 insertions(+), 15 deletions(-)

diff --git a/projects/roctracer/src/core/roctracer.cpp b/projects/roctracer/src/core/roctracer.cpp
index 8fd429448b..5250dd8622 100644
--- a/projects/roctracer/src/core/roctracer.cpp
+++ b/projects/roctracer/src/core/roctracer.cpp
@@ -1003,7 +1003,7 @@ PUBLIC_API roctracer_status_t roctracer_activity_pop_external_correlation_id(act
 // Mark API
 PUBLIC_API void roctracer_mark(const char* str) {
     if (mark_api_callback_ptr) {
-        mark_api_callback_ptr(ACTIVITY_DOMAIN_NUMBER, ACTIVITY_EXT_OP_MARK, str, NULL);
+        mark_api_callback_ptr(ACTIVITY_DOMAIN_EXT_API, ACTIVITY_EXT_OP_MARK, str, NULL);
         roctracer::GlobalCounter::Increment(); // account for user-defined markers when tracking correlation id
     }
 }
diff --git a/projects/roctracer/test/MatrixTranspose/Makefile b/projects/roctracer/test/MatrixTranspose/Makefile
index d9fa1af8a8..daa48b2561 100644
--- a/projects/roctracer/test/MatrixTranspose/Makefile
+++ b/projects/roctracer/test/MatrixTranspose/Makefile
@@ -1,3 +1,8 @@
+ROOT_PATH = ../..
+LIB_PATH  = $(ROOT_PATH)/build
+ROC_LIBS  = -L$(LIB_PATH) -lroctracer64
+export LD_LIBRARY_PATH=$(LIB_PATH)
+
 HIP_PATH?= $(wildcard /opt/rocm/hip)
 ifeq (,$(HIP_PATH))
 	HIP_PATH=../../..
@@ -15,15 +20,13 @@ EXECUTABLE=./MatrixTranspose
 .PHONY: test
 
 
-all: clean $(EXECUTABLE) test
+all: clean $(EXECUTABLE)
 
-CXXFLAGS =-g
+CXXFLAGS =-g -I$(ROOT_PATH) -I$(ROOT_PATH)/inc -DLOCAL_BUILD=1
 CXX=$(HIPCC)
 
-
 $(EXECUTABLE): $(OBJECTS)
-	$(HIPCC) $(OBJECTS) -o $@
-
+	$(HIPCC) $(OBJECTS) -o $@ $(ROC_LIBS)
 
 test: $(EXECUTABLE)
 	$(EXECUTABLE)
diff --git a/projects/roctracer/test/MatrixTranspose/MatrixTranspose.cpp b/projects/roctracer/test/MatrixTranspose/MatrixTranspose.cpp
index 79fd72bcf9..240723cfe4 100644
--- a/projects/roctracer/test/MatrixTranspose/MatrixTranspose.cpp
+++ b/projects/roctracer/test/MatrixTranspose/MatrixTranspose.cpp
@@ -24,6 +24,7 @@ THE SOFTWARE.
 
 // hip header file
 #include "hip/hip_runtime.h"
+#include "roctracer_ext.h"
 
 
 #define WIDTH 1024
@@ -84,10 +85,12 @@ int main() {
     // Memory transfer from host to device
     hipMemcpy(gpuMatrix, Matrix, NUM * sizeof(float), hipMemcpyHostToDevice);
 
+    roctracer_mark("before HIP LaunchKernel");
     // Lauching kernel from host
     hipLaunchKernelGGL(matrixTranspose, dim3(WIDTH / THREADS_PER_BLOCK_X, WIDTH / THREADS_PER_BLOCK_Y),
                     dim3(THREADS_PER_BLOCK_X, THREADS_PER_BLOCK_Y), 0, 0, gpuTransposeMatrix,
                     gpuMatrix, WIDTH);
+    roctracer_mark("after HIP LaunchKernel");
 
     // Memory transfer from device to host
     hipMemcpy(TransposeMatrix, gpuTransposeMatrix, NUM * sizeof(float), hipMemcpyDeviceToHost);
diff --git a/projects/roctracer/test/MatrixTranspose_test/Makefile b/projects/roctracer/test/MatrixTranspose_test/Makefile
index 5a780799c6..e74d66b0d1 100644
--- a/projects/roctracer/test/MatrixTranspose_test/Makefile
+++ b/projects/roctracer/test/MatrixTranspose_test/Makefile
@@ -1,15 +1,15 @@
 ROOT_PATH = ../..
 LIB_PATH  = $(ROOT_PATH)/build
 ROC_LIBS  = -L$(LIB_PATH) -lroctracer64 -lroctx64
-
+export LD_LIBRARY_PATH=$(LIB_PATH)
 ITERATIONS ?= 100
 
-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
-CXX       = $(HIPCC)
-CXXFLAGS  = -g -I$(ROOT_PATH) -I$(ROOT_PATH)/inc -DLOCAL_BUILD=1 -DITERATIONS=$(ITERATIONS)
 
 TARGET=hcc
 
@@ -18,13 +18,13 @@ OBJECTS = $(SOURCES:.cpp=.o)
 
 EXECUTABLE=./MatrixTranspose
 
-export LD_LIBRARY_PATH=$(LIB_PATH)
-
 .PHONY: test
 
 
-all: $(EXECUTABLE) test
+all: clean $(EXECUTABLE)
 
+CXXFLAGS =-g -I$(ROOT_PATH) -I$(ROOT_PATH)/inc -DLOCAL_BUILD=1 -DITERATIONS=$(ITERATIONS)
+CXX=$(HIPCC)
 
 $(EXECUTABLE): $(OBJECTS)
 	$(HIPCC) $(OBJECTS) -o $@ $(ROC_LIBS)
diff --git a/projects/roctracer/test/tool/tracer_tool.cpp b/projects/roctracer/test/tool/tracer_tool.cpp
index 0851e98130..095397aa77 100644
--- a/projects/roctracer/test/tool/tracer_tool.cpp
+++ b/projects/roctracer/test/tool/tracer_tool.cpp
@@ -277,7 +277,7 @@ void hip_api_flush_cb(hip_api_trace_entry_t* entry) {
         fprintf(hip_api_file_handle, "%s()\n", oss.str().c_str());
     }
   } else {
-    fprintf(hip_api_file_handle, "%s(name(%s))\n", oss.str().c_str(), entry->name);
+    fprintf(hip_api_file_handle, "%s(%s)\n", oss.str().c_str(), entry->name);
   }
 
   fflush(hip_api_file_handle);