From 0a9956d0f965d31b4e41c3a34b0dd253d7e870e9 Mon Sep 17 00:00:00 2001
From: Ammar ELWazir <Ammar.Elwazir@amd.com>
Date: Fri, 16 Jul 2021 16:35:22 -0600
Subject: [PATCH] SWDEV-294319 & SWDEV-294321:

Reverting the last commit


[ROCm/rocprofiler commit: b1f286b96794b0a93d653293331f81d173160df3]
---
 projects/rocprofiler/bin/mem_manager.py | 15 +--------------
 projects/rocprofiler/bin/tblextr.py     |  4 ----
 2 files changed, 1 insertion(+), 18 deletions(-)

diff --git a/projects/rocprofiler/bin/mem_manager.py b/projects/rocprofiler/bin/mem_manager.py
index 8b644a0014..d466c37549 100755
--- a/projects/rocprofiler/bin/mem_manager.py
+++ b/projects/rocprofiler/bin/mem_manager.py
@@ -24,7 +24,7 @@ import sys, os, re
 from sqlitedb import SQLiteDB
 
 pinned = ['hipMallocHost', 'hipHostMalloc', 'hipHostAlloc']
-ondevice = ['hipMalloc', 'hipMallocPitch', 'hipMallocArray', 'hipMalloc3DArray', 'hsa_amd_memory_pool_allocate']
+ondevice = ['hipMalloc', 'hipMallocPitch', 'hipMallocArray', 'hipMalloc3DArray']
 
 mm_table_descr = [
   ['BeginNs', 'EndNs', 'pid', 'tid', 'Name', 'Direction', 'SrcType', 'DstType', 'Size', 'BW', 'Async'],
@@ -239,9 +239,6 @@ class MemManager:
     # hipMemcpyToArray(hipArray* dst, size_t wOffset, size_t hOffset, const void* src,
     #                        size_t count, hipMemcpyKind kind);
     hip_memcpy_ptrn3 = re.compile(r'\(\s*dst\((.*)\) .* src\((.*)\) count\((\d+)\).*\)')
-    # hipMemcpyToSymbol(const void* symbolName, const void* src, size_t sizeBytes,
-    #    size_t offset = 0, hipMemcpyKind kind)
-    hip_memcpy_ptrn4 = re.compile(r'\(\s*symbol\((.*)\) src\((.*)\) sizeBytes\((\d+)\).*\)')
     # memcopy with kind argument
     hip_memcpy_ptrn_kind = re.compile(r'.* kind\((\d+)\)\s*.*')
     #hsa_amd_memory_async_copy(void* dst, hsa_agent_t dst_agent, const void* src,
@@ -260,7 +257,6 @@ class MemManager:
     # aysnc memcopy
     async_event_ptrn = re.compile(r'Async|async')
     m_basic_hip = hip_memcpy_ptrn.match(args)
-    m_basic_hsa3 = hip_memcpy_ptrn4.match(args)
     m_basic_hsa_prev = hsa_memcpy_ptrn_prev.match(args)
     m_basic_hsa = hsa_memcpy_ptrn.match(args)
     m_basic_hsa2 = hsa_memcpy_ptrn2.match(args)
@@ -303,7 +299,6 @@ class MemManager:
       srcptr_type = self.get_ptr_type(src_agent_ptr)
       size = int(m_basic_hsa_prev.group(5))
       condition_matched = True
-
     if m_basic_hsa:
       dstptr = m_basic_hsa.group(1)
       dst_agent_ptr = m_basic_hsa.group(2)
@@ -327,14 +322,6 @@ class MemManager:
       size = x*y*z
       condition_matched = True
 
-    if m_basic_hsa3:
-      dstptr = m_basic_hsa3.group(1)
-      dstptr_type = self.get_ptr_type(dstptr)
-      srcptr = m_basic_hsa3.group(2)
-      srcptr_type = self.get_ptr_type(srcptr)
-      size = int(m_basic_hsa3.group(3))
-      condition_matched = True
-
     if m_array:
       dstptr = m_array.group(1)
       dstptr_type = self.get_ptr_type(dstptr)
diff --git a/projects/rocprofiler/bin/tblextr.py b/projects/rocprofiler/bin/tblextr.py
index 2e52169003..deafb1999f 100755
--- a/projects/rocprofiler/bin/tblextr.py
+++ b/projects/rocprofiler/bin/tblextr.py
@@ -354,7 +354,6 @@ def fill_api_db(table_name, db, indir, api_name, api_pid, dep_pid, dep_list, dep
   copy_index = 0
 
   ptrn_val = re.compile(r'(\d+):(\d+) (\d+):(\d+) ([^\(]+)(\(.*)$')
-  hip_launch_kernel_ptrn = re.compile(r'hipExtLaunchKernel|hipLaunchKernel')
   hip_mcopy_ptrn = re.compile(r'hipMemcpy|hipMemset')
   hip_wait_event_ptrn =  re.compile(r'WaitEvent')
   hip_sync_event_ptrn = re.compile(r'hipStreamSynchronize')
@@ -489,9 +488,6 @@ def fill_api_db(table_name, db, indir, api_name, api_pid, dep_pid, dep_list, dep
           mcopy_found = 1
           op_found = 1
 
-        if hip_launch_kernel_ptrn.match(record_name):
-          op_found = 1
-
         # HIP WaitEvent API
         if wait_event_ptrn.search(record_name):
           op_found = 1