From cbe8c08bdadfa902f9ca09d4cc23dd71d08a2069 Mon Sep 17 00:00:00 2001
From: Evgeny <evgeny.shcherbakov@amd.com>
Date: Tue, 14 Apr 2020 13:12:52 -0500
Subject: [PATCH] adding HIP_PROF_HIP_API_STRING macro

[ROCm/roctracer commit: 0cd31f82957de1246c95b110df61bb52acdad056]
---
 projects/roctracer/cmake_modules/env.cmake   |  5 +++++
 projects/roctracer/inc/roctracer_hip.h       | 11 -----------
 projects/roctracer/test/tool/tracer_tool.cpp |  5 +++++
 3 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/projects/roctracer/cmake_modules/env.cmake b/projects/roctracer/cmake_modules/env.cmake
index 5d3cde0064..ec548ffc30 100644
--- a/projects/roctracer/cmake_modules/env.cmake
+++ b/projects/roctracer/cmake_modules/env.cmake
@@ -43,6 +43,11 @@ if ( DEFINED ENV{CMAKE_DEBUG_TRACE} )
   add_definitions ( -DDEBUG_TRACE=1 )
 endif()
 
+## HIP APIString() routine enableing
+if ( DEFINED HIP_PROF_HIP_API_STRING )
+  add_definitions ( -DHIP_PROF_HIP_API_STRING=1 )
+endif()
+
 ## Enable HIP_VDI mode
 if ( DEFINED HIP_VDI )
   add_definitions ( -DHIP_VDI=${HIP_VDI} )
diff --git a/projects/roctracer/inc/roctracer_hip.h b/projects/roctracer/inc/roctracer_hip.h
index eb2cac0453..28e4868d59 100644
--- a/projects/roctracer/inc/roctracer_hip.h
+++ b/projects/roctracer/inc/roctracer_hip.h
@@ -24,17 +24,6 @@ THE SOFTWARE.
 #define INC_ROCTRACER_HIP_H_
 
 #include <hip/hip_runtime.h>
-
-#if ROCP_WITH_HIP_API_STRING
-namespace hip_hidden_namespace {
-#include <hip/hcc_detail/hip_prof_str.h>
-};  // namespace hip_hidden_namespace
-#if HIP_PROF_VER >= 1
-#define HIP_PROF_HIP_API_STRING 1
-#endif
-#undef HIP_PROF_VER
-#undef _HIP_PROF_STR_H
-#endif  // ROCP_WITH_HIP_API_STRING
 #include <hip/hcc_detail/hip_prof_str.h>
 
 #include "roctracer.h"
diff --git a/projects/roctracer/test/tool/tracer_tool.cpp b/projects/roctracer/test/tool/tracer_tool.cpp
index b1114ecd75..766a11d57e 100644
--- a/projects/roctracer/test/tool/tracer_tool.cpp
+++ b/projects/roctracer/test/tool/tracer_tool.cpp
@@ -405,6 +405,10 @@ void hip_api_flush_cb(hip_api_trace_entry_t* entry) {
     begin_timestamp << ":" << end_timestamp << " " << entry->pid << ":" << entry->tid << " " << str;
 
   if (domain == ACTIVITY_DOMAIN_HIP_API) {
+#if HIP_PROF_HIP_API_STRING
+    const char* str = hipApiString(cid, data);
+    fprintf(hip_api_file_handle, "%s\n", str);
+#else  // !HIP_PROF_HIP_API_STRING
     switch (cid) {
       case HIP_API_ID_hipMemcpy:
         fprintf(hip_api_file_handle, "%s(dst(%p) src(%p) size(0x%x) kind(%u))\n",
@@ -438,6 +442,7 @@ void hip_api_flush_cb(hip_api_trace_entry_t* entry) {
       default:
         fprintf(hip_api_file_handle, "%s()\n", oss.str().c_str());
     }
+#endif  // !HIP_PROF_HIP_API_STRING
   } else {
     fprintf(hip_api_file_handle, "%s(name(%s))\n", oss.str().c_str(), entry->name);
   }