From 024d9ab09031d10c13e41fbb17df88e21d1468bc Mon Sep 17 00:00:00 2001
From: Ben Sander <ben.sander@amd.com>
Date: Thu, 27 Oct 2016 23:08:18 -0500
Subject: [PATCH] Print short hipLaunchKernel correctly.

Change-Id: I6ca03d7c707cd03d6982199830213953d5855f17
---
 bin/hipdemangleatp | 3 +++
 src/hip_hcc.cpp    | 6 +++---
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/bin/hipdemangleatp b/bin/hipdemangleatp
index b6734a9e24..d5061ed7d2 100755
--- a/bin/hipdemangleatp
+++ b/bin/hipdemangleatp
@@ -16,3 +16,6 @@ done
 #    real_sym=$(c++filt $(c++filt $mangled_sym | cut -d: -f3 | sed 's/_functor//g') | cut -d\( -f1 | cut -d" " -f2)
 #    sed -i "s/$mangled_sym/$real_sym/g" $1
 #done
+#
+#sed -e "s/^/_/g; s/_EC_/$/g" < test.txt | c++filt
+
diff --git a/src/hip_hcc.cpp b/src/hip_hcc.cpp
index 7d79f0a930..c125829739 100644
--- a/src/hip_hcc.cpp
+++ b/src/hip_hcc.cpp
@@ -63,7 +63,7 @@ int HIP_LAUNCH_BLOCKING = 0;
 int HIP_PRINT_ENV = 0;
 int HIP_TRACE_API= 0;
 std::string HIP_TRACE_API_COLOR("green");
-int HIP_PROFILE_API= 0;S
+int HIP_PROFILE_API= 0;
 
 // TODO - DB_START/STOP need more testing.
 std::string HIP_DB_START_API;
@@ -1478,11 +1478,11 @@ void ihipPrintKernelLaunch(const char *kernelName, const grid_launch_parm *lp, c
             << " " << *stream;
 
         if (HIP_PROFILE_API == 0x1) {
-            MARKER_BEGIN(os.str().c_str(), "HIP");
-        } else if (HIP_PROFILE_API == 0x2) {
             std::string shortAtpString("hipLaunchKernel:");
             shortAtpString += kernelName;
             MARKER_BEGIN(shortAtpString.c_str(), "HIP");
+        } else if (HIP_PROFILE_API == 0x2) {
+            MARKER_BEGIN(os.str().c_str(), "HIP");
         }
 
         if (COMPILE_HIP_DB && HIP_TRACE_API) {