From 0c08bbf838ee476548459e246a64d03c4649b6f4 Mon Sep 17 00:00:00 2001
From: Sarbojit Sarkar <sarbojit.sarkar@amd.com>
Date: Wed, 1 Sep 2021 12:07:23 +0000
Subject: [PATCH] SWDEV-300655 - HIP trace cleanup

Change-Id: Iebc1eefe8d81d2f1f8adbab47e1351f03635868f


[ROCm/clr commit: c8983ead4993c85a256b4ac3863c40f90aaa6308]
---
 projects/clr/hipamd/src/hip_hmm.cpp         | 3 +--
 projects/clr/hipamd/src/hip_internal.hpp    | 6 +++---
 projects/clr/hipamd/src/hiprtc_internal.hpp | 4 ++--
 3 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/projects/clr/hipamd/src/hip_hmm.cpp b/projects/clr/hipamd/src/hip_hmm.cpp
index dbb3cdcb51..f79599a07a 100644
--- a/projects/clr/hipamd/src/hip_hmm.cpp
+++ b/projects/clr/hipamd/src/hip_hmm.cpp
@@ -230,7 +230,6 @@ hipError_t ihipMallocManaged(void** ptr, size_t size, unsigned int align) {
     return hipErrorMemoryAllocation;
   }
 
-  ClPrint(amd::LOG_INFO, amd::LOG_API, "%-5d: [%zx] ihipMallocManaged ptr=0x%zx",  getpid(),
-    std::this_thread::get_id(), *ptr);
+  ClPrint(amd::LOG_INFO, amd::LOG_API, "ihipMallocManaged ptr=0x%zx", *ptr);
   return hipSuccess;
 }
diff --git a/projects/clr/hipamd/src/hip_internal.hpp b/projects/clr/hipamd/src/hip_internal.hpp
index bcc6954435..437a0c9d05 100644
--- a/projects/clr/hipamd/src/hip_internal.hpp
+++ b/projects/clr/hipamd/src/hip_internal.hpp
@@ -80,11 +80,11 @@ typedef struct ihipIpcEventHandle_st {
   }
 
 #define HIP_API_PRINT(...)                                 \
-  uint64_t startTimeUs=0 ; HIPPrintDuration(amd::LOG_INFO, amd::LOG_API, &startTimeUs, "%-5d: [%zx] %s%s ( %s )%s",  getpid(), std::this_thread::get_id(), KGRN,    \
+  uint64_t startTimeUs=0 ; HIPPrintDuration(amd::LOG_INFO, amd::LOG_API, &startTimeUs, "%s%s ( %s )%s", KGRN,    \
           __func__, ToString( __VA_ARGS__ ).c_str(),KNRM);
 
 #define HIP_ERROR_PRINT(err, ...)                             \
-  ClPrint(amd::LOG_INFO, amd::LOG_API, "%-5d: [%zx] %s: Returned %s : %s", getpid(), std::this_thread::get_id(),  \
+  ClPrint(amd::LOG_INFO, amd::LOG_API, "%s: Returned %s : %s",  \
           __func__, hipGetErrorName(err), ToString( __VA_ARGS__ ).c_str());
 
 // This macro should be called at the beginning of every HIP API.
@@ -99,7 +99,7 @@ typedef struct ihipIpcEventHandle_st {
 
 #define HIP_RETURN_DURATION(ret, ...)                      \
   hip::g_lastError = ret;                         \
-  HIPPrintDuration(amd::LOG_INFO, amd::LOG_API, &startTimeUs, "%-5d: [%zx] %s: Returned %s : %s",  getpid(), std::this_thread::get_id(),  \
+  HIPPrintDuration(amd::LOG_INFO, amd::LOG_API, &startTimeUs, "%s: Returned %s : %s",  \
           __func__, hipGetErrorName(hip::g_lastError), ToString( __VA_ARGS__ ).c_str()); \
   return hip::g_lastError;
 
diff --git a/projects/clr/hipamd/src/hiprtc_internal.hpp b/projects/clr/hipamd/src/hiprtc_internal.hpp
index ae62b67785..ae1c31c2d6 100644
--- a/projects/clr/hipamd/src/hiprtc_internal.hpp
+++ b/projects/clr/hipamd/src/hiprtc_internal.hpp
@@ -48,7 +48,7 @@ extern "C" char * __cxa_demangle(const char *mangled_name, char *output_buffer,
 
 // This macro should be called at the beginning of every HIP RTC API.
 #define HIPRTC_INIT_API(...)                                 \
-  ClPrint(amd::LOG_INFO, amd::LOG_API, "[%zx] %s ( %s )", std::this_thread::get_id(), __func__, ToString( __VA_ARGS__ ).c_str()); \
+  ClPrint(amd::LOG_INFO, amd::LOG_API, "%s ( %s )", __func__, ToString( __VA_ARGS__ ).c_str()); \
   amd::Thread* thread = amd::Thread::current();              \
   if (!VDI_CHECK_THREAD(thread)) {                           \
     HIPRTC_RETURN(HIPRTC_ERROR_INTERNAL_ERROR);              \
@@ -57,7 +57,7 @@ extern "C" char * __cxa_demangle(const char *mangled_name, char *output_buffer,
 
 #define HIPRTC_RETURN(ret)             \
   hiprtc::g_lastRtcError = ret;        \
-  ClPrint(amd::LOG_INFO, amd::LOG_API, "[%zx] %s: Returned %s", std::this_thread::get_id(), __func__, \
+  ClPrint(amd::LOG_INFO, amd::LOG_API, "%s: Returned %s", __func__, \
           hiprtcGetErrorString(hiprtc::g_lastRtcError));                 \
   return hiprtc::g_lastRtcError;