unify scope trace among batched and in-order queues

Author: EuphoricThinking

unified-runtime/source/adapters/level_zero/v2/queue_batched.cpp

@@ -172,15 +172,19 @@ ur_result_t ur_queue_batched_t::queueFinishBatchAndPoolsUnlocked(
   enqueueCurrentBatchUnlocked(immediateList, regularList);
 
   {
+    // TRACK_SCOPE_LATENCY(
+    //     "ur_queue_batched_t::queueFinishBatchAndPoolsUnlocked_hostSynchronize");
     TRACK_SCOPE_LATENCY(
-        "ur_queue_batched_t::queueFinishBatchAndPoolsUnlocked_hostSynchronize");
+        "ur_queue_batched_t::hostSynchronize");
     // finish queue
     ZE2UR_CALL(zeCommandListHostSynchronize, (immediateList, UINT64_MAX));
   }
 
   {
+    // TRACK_SCOPE_LATENCY(
+    //     "ur_queue_batched_t::queueFinishBatchAndPoolsUnlocked_asyncPools");
     TRACK_SCOPE_LATENCY(
-        "ur_queue_batched_t::queueFinishBatchAndPoolsUnlocked_asyncPools");
+        "ur_queue_batched_t::asyncPools");
     hContext->getAsyncPool()->cleanupPoolsForQueue(this);
     hContext->forEachUsmPool([this](ur_usm_pool_handle_t hPool) {
       hPool->cleanupPoolsForQueue(this);
@@ -201,8 +205,10 @@ ur_queue_batched_t::queueFinishUnlocked(locked<batch_manager> &batchLocked) {
       batchLocked->activeBatch.getZeCommandList()));
 
   {
+    // TRACK_SCOPE_LATENCY(
+    //     "ur_queue_batched_t::queueFinishUnlocked_releaseSubmittedKernels");
     TRACK_SCOPE_LATENCY(
-        "ur_queue_batched_t::queueFinishUnlocked_releaseSubmittedKernels");
+        "ur_queue_batched_t::releaseSubmittedKernels");
     UR_CALL(batchLocked->immediateList.releaseSubmittedKernels());
   }
 

unified-runtime/source/adapters/level_zero/v2/queue_immediate_in_order.cpp

@@ -106,15 +106,19 @@ ur_result_t ur_queue_immediate_in_order_t::queueFinish() {
   auto lockedCommandListManager = commandListManager.lock();
 
   {
+    // TRACK_SCOPE_LATENCY(
+    //     "ur_queue_immediate_in_order_t::queueFinish_hostSynchronize");
     TRACK_SCOPE_LATENCY(
-        "ur_queue_immediate_in_order_t::queueFinish_hostSynchronize");
+        "ur_queue_immediate_in_order_t::hostSynchronize");
     ZE2UR_CALL(zeCommandListHostSynchronize,
                (lockedCommandListManager->getZeCommandList(), UINT64_MAX));
   }
 
   {
+    // TRACK_SCOPE_LATENCY(
+    //     "ur_queue_immediate_in_order_t::queueFinish_asyncPools");
     TRACK_SCOPE_LATENCY(
-        "ur_queue_immediate_in_order_t::queueFinish_asyncPools");
+        "ur_queue_immediate_in_order_t::asyncPools");
     hContext->getAsyncPool()->cleanupPoolsForQueue(this);
     hContext->forEachUsmPool([this](ur_usm_pool_handle_t hPool) {
       hPool->cleanupPoolsForQueue(this);
@@ -123,8 +127,10 @@ ur_result_t ur_queue_immediate_in_order_t::queueFinish() {
   }
 
   {
+    // TRACK_SCOPE_LATENCY(
+    //     "ur_queue_immediate_in_order_t::queueFinish_releaseSubmittedKernels");
     TRACK_SCOPE_LATENCY(
-        "ur_queue_immediate_in_order_t::queueFinish_releaseSubmittedKernels");
+        "ur_queue_immediate_in_order_t::releaseSubmittedKernels");
     UR_CALL(lockedCommandListManager->releaseSubmittedKernels());
   }