diff --git a/script/gen_ostream_ops.py b/script/gen_ostream_ops.py
index aa7d566e89..c59d2a2117 100755
--- a/script/gen_ostream_ops.py
+++ b/script/gen_ostream_ops.py
@@ -85,7 +85,11 @@ header = \
 
 header_hip = \
 'template <typename T>\n' + \
-'  std::ostream& operator<<(std::ostream& out, const T& v) { using std::operator<<; out << v; return out; }\n' + \
+'  std::ostream& operator<<(std::ostream& out, const T& v) {\n' + \
+'     using std::operator<<;\n' + \
+'     static bool recursion = false;\n' + \
+'     if (recursion == false) { recursion = true; out << v; recursion = false; }\n' + \
+'     return out; }\n' + \
 'std::ostream& operator<<(std::ostream& out, void* v) { using std::operator<<; out << std::hex << v; return out; }\n' + \
 'std::ostream& operator<<(std::ostream& out, const void* v) { using std::operator<<; out << std::hex << v; return out; }\n' + \
 'std::ostream& operator<<(std::ostream& out, bool v) { using std::operator<<; out << std::hex << "<bool " << "0x" << v << std::dec << ">"; return out; }\n' + \
diff --git a/test/tool/tracer_tool.cpp b/test/tool/tracer_tool.cpp
index b14c9dd154..c5ed7a840d 100644
--- a/test/tool/tracer_tool.cpp
+++ b/test/tool/tracer_tool.cpp
@@ -346,7 +346,7 @@ roctracer::TraceBuffer<hip_api_trace_entry_t> hip_api_trace_buffer("HIP", 0x2000
 
 static inline bool is_hip_kernel_launch_api(const uint32_t& cid) {
   bool ret =
-#if HIP_VDI
+#if 0 // HIP_VDI
     (cid == HIP_API_ID_hipLaunchKernel) ||
     (cid == HIP_API_ID_hipExtLaunchMultiKernelMultiDevice) ||
     (cid == HIP_API_ID_hipLaunchCooperativeKernel) ||