[VP] ADD_memory_NInja_counter_rtlog

add ninja counter rt log
intel · Sep 22, 2023 · 8491d1f · 8491d1f
1 parent 45c3ce0
commit 8491d1f
Show file tree

Hide file tree

Showing 3 changed files with 31 additions and 14 deletions.
diff --git a/media_common/agnostic/common/os/mos_os_trace_event.h b/media_common/agnostic/common/os/mos_os_trace_event.h
@@ -552,6 +552,7 @@ typedef enum _MT_LOG_ID
     MT_ERR_CRITICAL_MESSAGE,
     MT_MOS_ALLOCATE_MEMORY,
     MT_MOS_DESTROY_MEMORY,
+    MT_MOS_MEMORY_NINJA_COUNTER,
     MT_LOG_ID_CP_BASE = 0x01000000,
     MT_CP_HAL_NOT_INITIALIZED,
     MT_CP_HAL_FAIL,
@@ -874,6 +875,9 @@ typedef enum _MT_PARAM_ID
     MT_MEMORY_PTR,
     MT_MEMORY_SIZE,
     MT_MEMORY_INDEX,
+    MT_MEMORY_NINJA_START_COUNTER,
+    MT_MEMORY_NINJA_END_COUNTER,
+    MT_MEMORY_NINJA_IS_START,
     MT_PARAM_ID_MOS_BASE = 0x00001000,
     MT_MOS_STATUS,
     MT_MOS_GPU_NODE,

diff --git a/media_softlet/agnostic/common/vp/hal/bufferMgr/vp_allocator.cpp b/media_softlet/agnostic/common/vp/hal/bufferMgr/vp_allocator.cpp
@@ -490,14 +490,14 @@ MOS_STATUS VpAllocator::DestroyVpSurface(VP_SURFACE* &surface, bool deferredDest
         MT_VP_HAL_SURF_ALLOC_PARAM_SIZE, static_cast<int64_t>(surface->osSurface->OsResource.pGmmResInfo ? surface->osSurface->OsResource.pGmmResInfo->GetSizeAllocation() : 0));
     VP_PUBLIC_NORMALMESSAGE(
         "VP_HAL_DESTROY_SURF. "
-        "VP_HAL_Surface: 0x%x, "
-        "VP_HAL_OsSurface: 0x%x, "
+        "VP_HAL_Surface: %p, "
+        "VP_HAL_OsSurface: %p, "
         "VP_HAL_isResourceOwner: %d, "
-        "VP_HAL_Surface_Handle: 0x%x, "
-        "VP_HAL_Surface_Size: %d",
+        "VP_HAL_Surface_Handle: 0x%llx, "
+        "VP_HAL_Surface_Size: 0x%llx",
         surface,
         surface->osSurface,
-        surface->isResourceOwner,
+        surface->isResourceOwner ? 1 : 0,
         surface->GetAllocationHandle(m_osInterface),
         surface->osSurface->OsResource.pGmmResInfo ? surface->osSurface->OsResource.pGmmResInfo->GetSizeAllocation() : 0);
 
@@ -919,18 +919,18 @@ MOS_STATUS VpAllocator::ReAllocateSurface(
         MT_VP_HAL_SURF_ALLOC_PARAM_NAME, surfaceName ? *((int64_t *)surfaceName) : 0);
     VP_PUBLIC_NORMALMESSAGE(
         "VP_HAL_REALLOC_SURF. "
-        "VP_HAL_Surface: 0x%x, "
-        "VP_HAL_OsSurface: 0x%x, "
+        "VP_HAL_Surface: %p, "
+        "VP_HAL_OsSurface: %p, "
         "VP_HAL_isResourceOwner: %d, "
-        "VP_HAL_Surface_Handle: 0x%x, "
-        "VP_HAL_Surface_Size: %d, "
-        "VP_HAL_Surface_Name: %s ",
+        "VP_HAL_Surface_Handle: 0x%llx, "
+        "VP_HAL_Surface_Size: 0x%llx, "
+        "VP_HAL_Surface_Name: %s",
         surface,
         surface->osSurface,
-        surface->isResourceOwner,
+        surface->isResourceOwner ? 1 : 0,
         surface->GetAllocationHandle(m_osInterface),
         surface->osSurface->OsResource.pGmmResInfo ? surface->osSurface->OsResource.pGmmResInfo->GetSizeAllocation() : 0,
-        surfaceName);
+        surfaceName ? surfaceName : "");
     int64_t currentSize  = static_cast<int64_t>(surface->osSurface->OsResource.pGmmResInfo ? surface->osSurface->OsResource.pGmmResInfo->GetSizeAllocation() : 0);
     m_totalSize          = m_totalSize + currentSize;
     m_peakSize           = m_peakSize > m_totalSize ? m_peakSize : m_totalSize;

diff --git a/media_softlet/agnostic/common/vp/hal/pipeline/vp_pipeline.cpp b/media_softlet/agnostic/common/vp/hal/pipeline/vp_pipeline.cpp
@@ -140,13 +140,26 @@ MOS_STATUS VpPipeline::ReportIFNCC(bool bStart)
     //INTER_FRAME_MEMORY_NINJA_START_COUNTER will be reported in Prepare function
     //INTER_FRAME_MEMORY_NINJA_END_COUNTER will be reported in UserFeatureReport() function which runs in Execute()
     VP_FUNC_CALL();
+    int32_t memninjaCounter = 0;
+    memninjaCounter         = *MosUtilities::m_mosMemAllocCounter + *MosUtilities::m_mosMemAllocCounterGfx - *MosUtilities::m_mosMemAllocFakeCounter;
+    if (MOS_IS_MEMORY_FOOT_PRINT_ENABLED())
+    {
+        if (bStart)
+        {
+            MT_LOG2(MT_MOS_MEMORY_NINJA_COUNTER, MT_NORMAL, MT_MEMORY_NINJA_IS_START, bStart, MT_MEMORY_NINJA_START_COUNTER, memninjaCounter);
+            VP_PUBLIC_NORMALMESSAGE("MT_MOS_MEMORY_NINJA_COUNTER, MT_MEMORY_NINJA_IS_START :%d, MT_MEMORY_NINJA_START_COUNTER: %d", bStart, memninjaCounter);
+        }
+        else
+        {
+            MT_LOG2(MT_MOS_MEMORY_NINJA_COUNTER, MT_NORMAL, MT_MEMORY_NINJA_IS_START, bStart, MT_MEMORY_NINJA_END_COUNTER, memninjaCounter);
+            VP_PUBLIC_NORMALMESSAGE("MT_MOS_MEMORY_NINJA_COUNTER, MT_MEMORY_NINJA_IS_START :%d, MT_MEMORY_NINJA_END_COUNTER: %d", bStart, memninjaCounter);
+        }
+    }
     if (m_userFeatureControl->EnableIFNCC() &&
         MosUtilities::m_mosMemAllocCounter &&
         MosUtilities::m_mosMemAllocCounterGfx &&
         MosUtilities::m_mosMemAllocFakeCounter)
     {
-        int32_t memninjaCounter = 0;
-        memninjaCounter         = *MosUtilities::m_mosMemAllocCounter + *MosUtilities::m_mosMemAllocCounterGfx - *MosUtilities::m_mosMemAllocFakeCounter;
         ReportUserSettingForDebug(
             m_userSettingPtr,
             bStart ? __MEDIA_USER_FEATURE_VALUE_INTER_FRAME_MEMORY_NINJA_START_COUNTER : __MEDIA_USER_FEATURE_VALUE_INTER_FRAME_MEMORY_NINJA_END_COUNTER,