SWDEV-401678: Fixing Record IDs for File/CLI Plugin

Change-Id: Icf36f716b69d3b8ee3e84d73e276dbff4dbe70ae

CHANGELOG.md

@@ -242,19 +242,21 @@ Rocprofiler for ROCm 5.7 added support for counter collection (PMC) and advanced
 - "ROCPROFILER_MAX_ATT_PROFILES" environment variable can be set. Previously fixed at 16, now the default is 1.
 - Increased ATT buffer size per collection to 1GB.
 - File plugin is splitted to File & CLI plugins, CLI plugin is responsible for showing results on the terminal screen and will be automatically the choice if no -d option given in rocprof, File plugin on the other hand is responsible for writing the output results in files if -d option is given.
-- Structure of the results is different for both CLI & File plugin; File plugin will make sure every type of result is in a separate file, starting by specifying the header; CLI plugin will have header for kernel dispatches and counter collection and another header for tracing results; Example:
+- Structure of the results is different for both CLI & File plugin; File plugin will make sure every type of result is in a separate file, starting by specifying the header; CLI plugin will have the records in the old way.
+Example for file plugin output:
   ```
-  Dispatch_ID,GPU_ID,Queue_ID,Queue_Index,PID,TID,GRD,WGR,LDS,SCR,Arch_VGPR,ACCUM_VGPR,SGPR,Wave_Size,SIG,OBJ,Kernel_Name,Start_Timestamp,End_Timestamp,Counters
+  Dispatch_ID,GPU_ID,Queue_ID,Queue_Index,PID,TID,GRD,WGR,LDS,SCR,Arch_VGPR,ACCUM_VGPR,SGPR,Wave_Size,SIG,OBJ,Kernel_Name,Start_Timestamp,End_Timestamp,Correlation_ID,GRBM_COUNT
 
-  1,4,1,1,1584730,1584730,10,10,0,0,8,0,16,64,140464978048000,1,"helloworld(char*, char*) (.kd)",0,140469300947216,GRBM_COUNT,12637.000000
+  1,4,1,1,1584730,1584730,10,10,0,0,8,0,16,64,140464978048000,1,"helloworld(char*, char*) (.kd)",0,140469300947216,33,12637.000000
   ```
   ```
-  Record_ID,Domain,Function,Operation,Kernel_Name,Start_Timestamp,End_Timestamp,Correlation_ID,ROCTX_ID,ROCTX_Message
+  Domain,Function,Kernel_Name,Start_Timestamp,End_Timestamp,Correlation_ID
 
-  2,HIP_API_DOMAIN,hipGetDeviceProperties,,,316678074094190,316678074098929,1,,
-  4,HIP_API_DOMAIN,hipMalloc,,,316678074105702,316678074130851,2,,
-  6,HIP_API_DOMAIN,hipMalloc,,,316678074131382,316678074136111,3,,
+  HIP_API_DOMAIN,hipGetDeviceProperties,,316678074094190,316678074098929,1
+  HIP_API_DOMAIN,hipMalloc,,316678074105702,316678074130851,2
+  HIP_API_DOMAIN,hipMalloc,,316678074131382,316678074136111,3
   ```
+- Removing Record IDs from tracer records in CLI plugin.
 ### Fixed
 - Samples are fixed to show the new usage of phases.
 - Plugin option validates the plugin names.

plugin/cli/cli.cpp

@@ -281,8 +281,7 @@ class file_plugin_t {
     }
 
     output_file_t* output_file = get_output_file(output_type_t::TRACER, tracer_record.domain);
-    *output_file << "Record_ID(" << tracer_record.header.id.handle << "), "
-                 << "Domain(" << GetDomainName(tracer_record.domain) << "), ";
+    *output_file << "Domain(" << GetDomainName(tracer_record.domain) << "), ";
     if (function_name.size() > 1) *output_file << "Function(" << function_name << "), ";
     if (activity_name) *output_file << "Operation_Name(" << activity_name << "), ";
     if (kernel_name.size() > 1) *output_file << "Kernel_Name(" << kernel_name.c_str() << "), ";
@@ -315,7 +314,7 @@ class file_plugin_t {
       CHECK_ROCPROFILER(rocprofiler_query_kernel_info(ROCPROFILER_KERNEL_NAME,
                                                       profiler_record->kernel_id, &kernel_name_c));
     }
-    *output_file << "Record_ID(" << std::to_string(profiler_record->header.id.handle) << "), "
+    *output_file << "Dispatch_ID(" << std::to_string(profiler_record->header.id.handle) << "), "
                  << "GPU_ID(" << std::to_string(profiler_record->gpu_id.handle) << "), "
                  << "Queue_ID(" << std::to_string(profiler_record->queue_id.handle) << "), "
                  << "Queue_Index(" << std::to_string(profiler_record->queue_idx.value) << "), "
@@ -354,6 +353,8 @@ class file_plugin_t {
                  << "Begin_Timestamp(" << std::to_string(profiler_record->timestamps.begin.value)
                  << "), "
                  << "End_Timestamp(" << std::to_string(profiler_record->timestamps.end.value)
+                 << "), "
+                 << "Correlation_ID(" << std::to_string(profiler_record->correlation_id.value)
                  << ")";
 
     // For Counters

plugin/file/file.cpp

@@ -208,8 +208,7 @@ class file_plugin_t {
       case ACTIVITY_DOMAIN_HSA_API: {
         if (hsa_api_header_written_.load(std::memory_order_relaxed)) return;
         output_file = get_output_file(output_type_t::TRACER, ACTIVITY_DOMAIN_HSA_API);
-        *output_file << "Record_ID,Domain,Function,Start_Timestamp,End_Timestamp,Correlation_ID"
-                     << std::endl;
+        *output_file << "Domain,Function,Start_Timestamp,End_Timestamp,Correlation_ID" << std::endl;
         *output_file << std::endl;
         hsa_api_header_written_.exchange(true, std::memory_order_release);
         return;
@@ -217,9 +216,8 @@ class file_plugin_t {
       case ACTIVITY_DOMAIN_HIP_API: {
         if (hip_api_header_written_.load(std::memory_order_relaxed)) return;
         output_file = get_output_file(output_type_t::TRACER, ACTIVITY_DOMAIN_HIP_API);
-        *output_file
-            << "Record_ID,Domain,Function,Kernel_Name,Start_Timestamp,End_Timestamp,Correlation_ID"
-            << std::endl;
+        *output_file << "Domain,Function,Kernel_Name,Start_Timestamp,End_Timestamp,Correlation_ID"
+                     << std::endl;
         *output_file << std::endl;
         hip_api_header_written_.exchange(true, std::memory_order_release);
         return;
@@ -227,7 +225,7 @@ class file_plugin_t {
       case ACTIVITY_DOMAIN_ROCTX: {
         if (roctx_header_written_.load(std::memory_order_relaxed)) return;
         output_file = get_output_file(output_type_t::TRACER, ACTIVITY_DOMAIN_ROCTX);
-        *output_file << "Record_ID,Domain,ROCTX_ID,Message,Timestamp" << std::endl;
+        *output_file << "Domain,ROCTX_ID,Message,Timestamp" << std::endl;
         *output_file << std::endl;
         roctx_header_written_.exchange(true, std::memory_order_release);
         return;
@@ -235,7 +233,7 @@ class file_plugin_t {
       case ACTIVITY_DOMAIN_HSA_OPS: {
         if (hsa_async_copy_header_written_.load(std::memory_order_relaxed)) return;
         output_file = get_output_file(output_type_t::TRACER, ACTIVITY_DOMAIN_HSA_OPS);
-        *output_file << "Record_ID,Domain,Operation,Start_Timestamp,Stop_Timestamp,Correlation_ID"
+        *output_file << "Domain,Operation,Start_Timestamp,Stop_Timestamp,Correlation_ID"
                      << std::endl;
         *output_file << std::endl;
         hsa_async_copy_header_written_.exchange(true, std::memory_order_release);
@@ -244,7 +242,7 @@ class file_plugin_t {
       case ACTIVITY_DOMAIN_HIP_OPS: {
         if (hip_activity_header_written_.load(std::memory_order_relaxed)) return;
         output_file = get_output_file(output_type_t::TRACER, ACTIVITY_DOMAIN_HIP_OPS);
-        *output_file << "Record_ID,Domain,Operation,Kernel_Name,Start_Timestamp,Stop_Timestamp,"
+        *output_file << "Domain,Operation,Kernel_Name,Start_Timestamp,Stop_Timestamp,"
                         "Correlation_ID"
                      << std::endl;
         *output_file << std::endl;
@@ -258,7 +256,8 @@ class file_plugin_t {
 
           *output_file
               << "Dispatch_ID,GPU_ID,Queue_ID,Queue_Index,PID,TID,GRD,WGR,LDS,SCR,Arch_VGPR,"
-                 "ACCUM_VGPR,SGPR,Wave_Size,SIG,OBJ,Kernel_Name,Start_Timestamp,End_Timestamp";
+                 "ACCUM_VGPR,SGPR,Wave_Size,SIG,OBJ,Kernel_Name,Start_Timestamp,End_Timestamp,"
+                 "Correlation_ID";
           if (counter_names_.size() > 0) {
             for (uint32_t i = 0; i < counter_names_.size(); i++)
               *output_file << "," << counter_names_[i];
@@ -398,8 +397,7 @@ class file_plugin_t {
     }
     // return;
     output_file_t* output_file = get_output_file(output_type_t::TRACER, tracer_record.domain);
-    *output_file << "" << tracer_record.header.id.handle << ","
-                 << GetDomainName(tracer_record.domain);
+    *output_file << GetDomainName(tracer_record.domain);
     if (tracer_record.domain == ACTIVITY_DOMAIN_ROCTX && roctx_id >= 0)
       *output_file << "," << roctx_id;
     if (tracer_record.domain == ACTIVITY_DOMAIN_ROCTX) {
@@ -470,7 +468,8 @@ class file_plugin_t {
     }
     *output_file << "," << std::to_string(profiler_record->kernel_id.handle) << ",\"" << kernel_name
                  << "\"," << std::to_string(profiler_record->timestamps.begin.value) << ","
-                 << std::to_string(profiler_record->timestamps.end.value);
+                 << std::to_string(profiler_record->timestamps.end.value) << ","
+                 << std::to_string(profiler_record->correlation_id.value);
 
     // For Counters
     if (profiler_record->counters) {

tests-v2/featuretests/profiler/apps/goldentraces/hip_helloworld_golden_traces.txt

@@ -1,4 +1,4 @@
 ROCProfilerV2: Collecting the following counters:
 - GRBM_COUNT
 Enabling Counter Collection
-Record_ID(1), GPU_ID(4), Queue_ID(1), Queue_Index(1), Process_ID(1879616), Thread_ID(1879616), Grid_Size(10), Workgroup_Size(10), LDS(0), Scratch_Size(0), Arch_VGPR(8), Accumulative_VGPR(0), SGPR(16), Wave_Size(64), Kernel_Name("helloworld"), Begin_Timestamp(140333224562784), End_Timestamp(140337650854112), GRBM_COUNT(13845.000000)
+Dispatch_ID(1), GPU_ID(4), Queue_ID(1), Queue_Index(1), Process_ID(2185227), Thread_ID(2185227), Grid_Size(10), Workgroup_Size(10), LDS(0), Scratch_Size(0), Arch_VGPR(8), Accumulative_VGPR(0), SGPR(16), Wave_Size(64), Kernel_Name("helloworld"), Begin_Timestamp(140136998244448), End_Timestamp(140141431998688), Correlation_ID(0), GRBM_COUNT(14222.000000)

tests-v2/featuretests/profiler/apps/goldentraces/hip_vectoradd_golden_traces.txt

@@ -1,4 +1,4 @@
 ROCProfilerV2: Collecting the following counters:
 - GRBM_COUNT
 Enabling Counter Collection
-Record_ID(1), GPU_ID(4), Queue_ID(1), Queue_Index(0), Process_ID(1879580), Thread_ID(1879580), Grid_Size(1048576), Workgroup_Size(256), LDS(0), Scratch_Size(0), Arch_VGPR(8), Accumulative_VGPR(0), SGPR(16), Wave_Size(64), Kernel_Name("vectoradd_float"), Begin_Timestamp(139920974811232), End_Timestamp(139925391173856), GRBM_COUNT(40461.000000)
+Dispatch_ID(1), GPU_ID(4), Queue_ID(1), Queue_Index(0), Process_ID(2185273), Thread_ID(2185273), Grid_Size(1048576), Workgroup_Size(256), LDS(0), Scratch_Size(0), Arch_VGPR(8), Accumulative_VGPR(0), SGPR(16), Wave_Size(64), Kernel_Name("vectoradd_float"), Begin_Timestamp(140169881587808), End_Timestamp(140174279043296), Correlation_ID(0), GRBM_COUNT(40539.000000)

tests-v2/featuretests/profiler/apps/goldentraces/mpi_vectoradd_golden_traces.txt

@@ -13,5 +13,5 @@ device count and rank is8: 2
 Rank Id: 1 | Device Id : 1 | Num Devices: 8
 Max error: 0.000000
 Max error: 0.000000
-Record_ID(1), GPU_ID(4), Queue_ID(1), Queue_Index(0), Process_ID(1879535), Thread_ID(1879535), Grid_Size(1048576), Workgroup_Size(256), LDS(0), Scratch_Size(0), Arch_VGPR(12), Accumulative_VGPR(4), SGPR(32), Wave_Size(64), Kernel_Name("add"), Begin_Timestamp(140358658822704), End_Timestamp(140358853089512), GRBM_COUNT(505731.000000)
-Record_ID(1), GPU_ID(5), Queue_ID(1), Queue_Index(0), Process_ID(1879536), Thread_ID(1879536), Grid_Size(1048576), Workgroup_Size(256), LDS(0), Scratch_Size(0), Arch_VGPR(12), Accumulative_VGPR(4), SGPR(32), Wave_Size(64), Kernel_Name("add"), Begin_Timestamp(140518780572208), End_Timestamp(140518958147816), GRBM_COUNT(496299.000000)
+Dispatch_ID(1), GPU_ID(5), Queue_ID(1), Queue_Index(0), Process_ID(2185441), Thread_ID(2185441), Grid_Size(1048576), Workgroup_Size(256), LDS(0), Scratch_Size(0), Arch_VGPR(12), Accumulative_VGPR(4), SGPR(32), Wave_Size(64), Kernel_Name("add"), Begin_Timestamp(139857691152944), End_Timestamp(139857835223272), Correlation_ID(0), GRBM_COUNT(499551.000000)
+Dispatch_ID(1), GPU_ID(4), Queue_ID(1), Queue_Index(0), Process_ID(2185436), Thread_ID(2185436), Grid_Size(1048576), Workgroup_Size(256), LDS(0), Scratch_Size(0), Arch_VGPR(12), Accumulative_VGPR(4), SGPR(32), Wave_Size(64), Kernel_Name("add"), Begin_Timestamp(140429257347632), End_Timestamp(140429483317480), Correlation_ID(0), GRBM_COUNT(499406.000000)

tests-v2/featuretests/profiler/apps/goldentraces/openmp_helloworld_golden_traces.txt

@@ -1,5 +1,4 @@
-ROCProfiler: Collecting the following counters:
+ROCProfilerV2: Collecting the following counters:
 - GRBM_COUNT
-PASSED!
-dispatch[2], gpu-id(0), kernel-name("hip_helloworld"), time(7853273641921013,7853273641924568)
-  GRBM_COUNT (21840)
+Enabling Counter Collection
+Dispatch_ID(1), GPU_ID(4), Queue_ID(1), Queue_Index(1), Process_ID(2186189), Thread_ID(2186189), Grid_Size(10), Workgroup_Size(10), LDS(0), Scratch_Size(0), Arch_VGPR(8), Accumulative_VGPR(0), SGPR(16), Wave_Size(64), Kernel_Name("helloworld"), Begin_Timestamp(140284033765472), End_Timestamp(140288419293408), Correlation_ID(0), GRBM_COUNT(13839.000000)

tests-v2/featuretests/profiler/profiler_gtest.cpp

@@ -109,9 +109,9 @@ void ApplicationParser::GetKernelInfoForRunningApplication(
     std::vector<profiler_kernel_info_t>* kernel_info_output) {
   profiler_kernel_info_t kinfo;
   for (std::string line : output_lines) {
-    // Skip all the lines until  "Record_ID" is found
-    if (line.empty() || line.find("Record_ID") == std::string::npos) {
-      continue;  // Skip to the next line if "Record_ID" is found
+    // Skip all the lines until  "Dispatch_ID" is found
+    if (line.empty() || line.find("Dispatch_ID") == std::string::npos) {
+      continue;  // Skip to the next line if "Dispatch_ID" is found
     }
 
     // Parse individual values and store them in the dispatch struct
@@ -175,9 +175,9 @@ void ApplicationParser::ParseKernelInfoFields(
   std::ifstream golden_file(s);
   while (!golden_file.eof()) {
     getline(golden_file, line);
-    // Skip all the lines until  "Record_ID" is found
-    if (line.empty() || line.find("Record_ID") == std::string::npos) {
-      continue;  // Skip to the next line if "Record_ID" is found
+    // Skip all the lines until  "Dispatch_ID" is found
+    if (line.empty() || line.find("Dispatch_ID") == std::string::npos) {
+      continue;  // Skip to the next line if "Dispatch_ID" is found
     }
     // Parse individual values and store them in the dispatch struct
     tokenize_profiler_output(line, kinfo);

tests-v2/featuretests/tracer/apps/goldentraces/hip_helloworld_golden_traces.txt

@@ -1,11 +1,11 @@
 Enabling API Tracing
-Record_ID(2), Domain(HIP_API_DOMAIN), Function(hipGetDeviceProperties), Start_Timestamp(611510516147389), End_Timestamp(611510516154633), Correlation_ID(1)
-Record_ID(4), Domain(HIP_API_DOMAIN), Function(hipMalloc), Start_Timestamp(611510516160324), End_Timestamp(611510516183168), Correlation_ID(2)
-Record_ID(6), Domain(HIP_API_DOMAIN), Function(hipMalloc), Start_Timestamp(611510516183599), End_Timestamp(611510516189250), Correlation_ID(3)
-Record_ID(8), Domain(HIP_API_DOMAIN), Function(hipMemcpy), Start_Timestamp(611510516192225), End_Timestamp(611510784335292), Correlation_ID(4)
-Record_ID(10), Domain(HIP_API_DOMAIN), Function(__hipPushCallConfiguration), Start_Timestamp(611510784338909), End_Timestamp(611510784341915), Correlation_ID(5)
-Record_ID(12), Domain(HIP_API_DOMAIN), Function(__hipPopCallConfiguration), Start_Timestamp(611510784343228), End_Timestamp(611510784343538), Correlation_ID(6)
-Record_ID(14), Domain(HIP_API_DOMAIN), Function(hipLaunchKernel), Kernel_Name(helloworld(char*, char*)), Start_Timestamp(611510784351053), End_Timestamp(611510784872311), Correlation_ID(7)
-Record_ID(16), Domain(HIP_API_DOMAIN), Function(hipMemcpy), Start_Timestamp(611510784873914), End_Timestamp(611510784891167), Correlation_ID(8)
-Record_ID(18), Domain(HIP_API_DOMAIN), Function(hipFree), Start_Timestamp(611510784893482), End_Timestamp(611510784902690), Correlation_ID(9)
-Record_ID(20), Domain(HIP_API_DOMAIN), Function(hipFree), Start_Timestamp(611510784904944), End_Timestamp(611510784907128), Correlation_ID(10)
+Domain(HIP_API_DOMAIN), Function(hipGetDeviceProperties), Start_Timestamp(611510516147389), End_Timestamp(611510516154633), Correlation_ID(1)
+Domain(HIP_API_DOMAIN), Function(hipMalloc), Start_Timestamp(611510516160324), End_Timestamp(611510516183168), Correlation_ID(2)
+Domain(HIP_API_DOMAIN), Function(hipMalloc), Start_Timestamp(611510516183599), End_Timestamp(611510516189250), Correlation_ID(3)
+Domain(HIP_API_DOMAIN), Function(hipMemcpy), Start_Timestamp(611510516192225), End_Timestamp(611510784335292), Correlation_ID(4)
+Domain(HIP_API_DOMAIN), Function(__hipPushCallConfiguration), Start_Timestamp(611510784338909), End_Timestamp(611510784341915), Correlation_ID(5)
+Domain(HIP_API_DOMAIN), Function(__hipPopCallConfiguration), Start_Timestamp(611510784343228), End_Timestamp(611510784343538), Correlation_ID(6)
+Domain(HIP_API_DOMAIN), Function(hipLaunchKernel), Kernel_Name(helloworld(char*, char*)), Start_Timestamp(611510784351053), End_Timestamp(611510784872311), Correlation_ID(7)
+Domain(HIP_API_DOMAIN), Function(hipMemcpy), Start_Timestamp(611510784873914), End_Timestamp(611510784891167), Correlation_ID(8)
+Domain(HIP_API_DOMAIN), Function(hipFree), Start_Timestamp(611510784893482), End_Timestamp(611510784902690), Correlation_ID(9)
+Domain(HIP_API_DOMAIN), Function(hipFree), Start_Timestamp(611510784904944), End_Timestamp(611510784907128), Correlation_ID(10)

tests-v2/featuretests/tracer/apps/goldentraces/hsa_api_async_trace.txt

@@ -8,73 +8,73 @@ Copying 4096 bytes from system memory to gpu1 memory...
 Success!
 Copying 4096 bytes from gpu1 memory to gpu2 memory...
 Success!
-Record_ID(68), Domain(HSA_OPS_DOMAIN), Operation_Name(COPY), Start_Timestamp(611575185146090), End_Timestamp(611575185153450), Correlation_ID(33)
-Record_ID(91), Domain(HSA_OPS_DOMAIN), Operation_Name(COPY), Start_Timestamp(611575186828236), End_Timestamp(611575186834316), Correlation_ID(42)
-Record_ID(98), Domain(HSA_OPS_DOMAIN), Operation_Name(COPY), Start_Timestamp(611575186839756), End_Timestamp(611575186842796), Correlation_ID(44)
-Record_ID(101), Domain(HSA_OPS_DOMAIN), Operation_Name(COPY), Start_Timestamp(611575186845596), End_Timestamp(611575186848796), Correlation_ID(47)
-Record_ID(118), Domain(HSA_OPS_DOMAIN), Operation_Name(COPY), Start_Timestamp(611575191866832), End_Timestamp(611575192127791), Correlation_ID(54)
-Record_ID(127), Domain(HSA_OPS_DOMAIN), Operation_Name(COPY), Start_Timestamp(611575193184345), End_Timestamp(611575193190105), Correlation_ID(60)
-Record_ID(3), Domain(HSA_API_DOMAIN), Function(hsa_agent_get_info), Start_Timestamp(611575178942576), End_Timestamp(611575178943147), Correlation_ID(2)
-Record_ID(6), Domain(HSA_API_DOMAIN), Function(hsa_amd_memory_pool_get_info), Start_Timestamp(611575178951443), End_Timestamp(611575178951814), Correlation_ID(4)
-Record_ID(8), Domain(HSA_API_DOMAIN), Function(hsa_amd_memory_pool_get_info), Start_Timestamp(611575178952044), End_Timestamp(611575178952345), Correlation_ID(5)
-Record_ID(10), Domain(HSA_API_DOMAIN), Function(hsa_amd_memory_pool_get_info), Start_Timestamp(611575178952605), End_Timestamp(611575178952776), Correlation_ID(6)
-Record_ID(11), Domain(HSA_API_DOMAIN), Function(hsa_amd_agent_iterate_memory_pools), Start_Timestamp(611575178949880), End_Timestamp(611575178952996), Correlation_ID(3)
-Record_ID(12), Domain(HSA_API_DOMAIN), Function(hsa_iterate_agents), Start_Timestamp(611575178937616), End_Timestamp(611575178953207), Correlation_ID(1)
-Record_ID(15), Domain(HSA_API_DOMAIN), Function(hsa_agent_get_info), Start_Timestamp(611575178953637), End_Timestamp(611575178953808), Correlation_ID(8)
-Record_ID(17), Domain(HSA_API_DOMAIN), Function(hsa_agent_get_info), Start_Timestamp(611575178954088), End_Timestamp(611575178954239), Correlation_ID(9)
-Record_ID(19), Domain(HSA_API_DOMAIN), Function(hsa_agent_get_info), Start_Timestamp(611575178954419), End_Timestamp(611575178956403), Correlation_ID(10)
-Record_ID(21), Domain(HSA_API_DOMAIN), Function(hsa_agent_get_info), Start_Timestamp(611575178956593), End_Timestamp(611575178956733), Correlation_ID(11)
-Record_ID(23), Domain(HSA_API_DOMAIN), Function(hsa_agent_get_info), Start_Timestamp(611575178956964), End_Timestamp(611575178957204), Correlation_ID(12)
-Record_ID(26), Domain(HSA_API_DOMAIN), Function(hsa_amd_memory_pool_get_info), Start_Timestamp(611575178957695), End_Timestamp(611575178957876), Correlation_ID(14)
-Record_ID(28), Domain(HSA_API_DOMAIN), Function(hsa_amd_memory_pool_get_info), Start_Timestamp(611575178958066), End_Timestamp(611575178958216), Correlation_ID(15)
-Record_ID(30), Domain(HSA_API_DOMAIN), Function(hsa_amd_memory_pool_get_info), Start_Timestamp(611575178958427), End_Timestamp(611575178958557), Correlation_ID(16)
-Record_ID(31), Domain(HSA_API_DOMAIN), Function(hsa_amd_agent_iterate_memory_pools), Start_Timestamp(611575178957425), End_Timestamp(611575178958727), Correlation_ID(13)
-Record_ID(33), Domain(HSA_API_DOMAIN), Function(hsa_agent_get_info), Start_Timestamp(611575178958918), End_Timestamp(611575178959058), Correlation_ID(17)
-Record_ID(36), Domain(HSA_API_DOMAIN), Function(hsa_amd_memory_pool_get_info), Start_Timestamp(611575178959469), End_Timestamp(611575178959609), Correlation_ID(19)
-Record_ID(38), Domain(HSA_API_DOMAIN), Function(hsa_amd_memory_pool_get_info), Start_Timestamp(611575178960731), End_Timestamp(611575178960871), Correlation_ID(20)
-Record_ID(40), Domain(HSA_API_DOMAIN), Function(hsa_amd_agent_memory_pool_get_info), Start_Timestamp(611575178961893), End_Timestamp(611575178962164), Correlation_ID(21)
-Record_ID(42), Domain(HSA_API_DOMAIN), Function(hsa_amd_memory_pool_get_info), Start_Timestamp(611575178962354), End_Timestamp(611575178962515), Correlation_ID(22)
-Record_ID(43), Domain(HSA_API_DOMAIN), Function(hsa_amd_agent_iterate_memory_pools), Start_Timestamp(611575178959268), End_Timestamp(611575178962655), Correlation_ID(18)
-Record_ID(44), Domain(HSA_API_DOMAIN), Function(hsa_iterate_agents), Start_Timestamp(611575178953407), End_Timestamp(611575178962865), Correlation_ID(7)
-Record_ID(46), Domain(HSA_API_DOMAIN), Function(hsa_amd_memory_pool_allocate), Start_Timestamp(611575178963707), End_Timestamp(611575179001921), Correlation_ID(23)
-Record_ID(48), Domain(HSA_API_DOMAIN), Function(hsa_amd_memory_pool_allocate), Start_Timestamp(611575179002342), End_Timestamp(611575179019475), Correlation_ID(24)
-Record_ID(50), Domain(HSA_API_DOMAIN), Function(hsa_amd_memory_pool_allocate), Start_Timestamp(611575179019785), End_Timestamp(611575179038451), Correlation_ID(25)
-Record_ID(52), Domain(HSA_API_DOMAIN), Function(hsa_agent_get_info), Start_Timestamp(611575179038812), End_Timestamp(611575179039153), Correlation_ID(26)
-Record_ID(54), Domain(HSA_API_DOMAIN), Function(hsa_agent_get_info), Start_Timestamp(611575179041257), End_Timestamp(611575179043671), Correlation_ID(27)
-Record_ID(56), Domain(HSA_API_DOMAIN), Function(hsa_agent_get_info), Start_Timestamp(611575179044112), End_Timestamp(611575179044353), Correlation_ID(28)
-Record_ID(58), Domain(HSA_API_DOMAIN), Function(hsa_amd_memory_fill), Start_Timestamp(611575179045936), End_Timestamp(611575179047850), Correlation_ID(29)
-Record_ID(60), Domain(HSA_API_DOMAIN), Function(hsa_amd_memory_fill), Start_Timestamp(611575179048090), End_Timestamp(611575184162319), Correlation_ID(30)
-Record_ID(62), Domain(HSA_API_DOMAIN), Function(hsa_amd_agents_allow_access), Start_Timestamp(611575184164133), End_Timestamp(611575184170194), Correlation_ID(31)
-Record_ID(64), Domain(HSA_API_DOMAIN), Function(hsa_signal_create), Start_Timestamp(611575184172248), End_Timestamp(611575184173681), Correlation_ID(32)
-Record_ID(66), Domain(HSA_API_DOMAIN), Function(hsa_amd_memory_async_copy), Start_Timestamp(611575184174633), End_Timestamp(611575185129880), Correlation_ID(33)
-Record_ID(69), Domain(HSA_API_DOMAIN), Function(hsa_amd_memory_copy_engine_status), Start_Timestamp(611575185131774), End_Timestamp(611575186734403), Correlation_ID(34)
-Record_ID(71), Domain(HSA_API_DOMAIN), Function(hsa_amd_memory_async_copy_on_engine), Start_Timestamp(611575186736046), End_Timestamp(611575186742388), Correlation_ID(35)
-Record_ID(73), Domain(HSA_API_DOMAIN), Function(hsa_signal_wait_relaxed), Start_Timestamp(611575186743440), End_Timestamp(611575186745304), Correlation_ID(36)
-Record_ID(75), Domain(HSA_API_DOMAIN), Function(hsa_amd_memory_fill), Start_Timestamp(611575186748340), End_Timestamp(611575186792886), Correlation_ID(37)
-Record_ID(77), Domain(HSA_API_DOMAIN), Function(hsa_amd_memory_fill), Start_Timestamp(611575186793246), End_Timestamp(611575186804628), Correlation_ID(38)
-Record_ID(79), Domain(HSA_API_DOMAIN), Function(hsa_amd_memory_fill), Start_Timestamp(611575186804939), End_Timestamp(611575186815590), Correlation_ID(39)
-Record_ID(81), Domain(HSA_API_DOMAIN), Function(hsa_amd_agents_allow_access), Start_Timestamp(611575186815940), End_Timestamp(611575186818124), Correlation_ID(40)
-Record_ID(83), Domain(HSA_API_DOMAIN), Function(hsa_signal_create), Start_Timestamp(611575186818495), End_Timestamp(611575186819146), Correlation_ID(41)
-Record_ID(85), Domain(HSA_API_DOMAIN), Function(hsa_amd_memory_async_copy), Start_Timestamp(611575186819497), End_Timestamp(611575186823815), Correlation_ID(42)
-Record_ID(87), Domain(HSA_API_DOMAIN), Function(hsa_amd_memory_copy_engine_status), Start_Timestamp(611575186824166), End_Timestamp(611575186824577), Correlation_ID(43)
-Record_ID(89), Domain(HSA_API_DOMAIN), Function(hsa_amd_memory_async_copy_on_engine), Start_Timestamp(611575186824877), End_Timestamp(611575186828645), Correlation_ID(44)
-Record_ID(92), Domain(HSA_API_DOMAIN), Function(hsa_signal_wait_relaxed), Start_Timestamp(611575186828975), End_Timestamp(611575186837953), Correlation_ID(45)
-Record_ID(94), Domain(HSA_API_DOMAIN), Function(hsa_signal_store_screlease), Start_Timestamp(611575186838834), End_Timestamp(611575186839025), Correlation_ID(46)
-Record_ID(96), Domain(HSA_API_DOMAIN), Function(hsa_amd_memory_async_copy), Start_Timestamp(611575186839215), End_Timestamp(611575186842482), Correlation_ID(47)
-Record_ID(99), Domain(HSA_API_DOMAIN), Function(hsa_signal_wait_relaxed), Start_Timestamp(611575186842832), End_Timestamp(611575186844946), Correlation_ID(48)
-Record_ID(102), Domain(HSA_API_DOMAIN), Function(hsa_amd_memory_fill), Start_Timestamp(611575186846349), End_Timestamp(611575186862961), Correlation_ID(49)
-Record_ID(104), Domain(HSA_API_DOMAIN), Function(hsa_amd_memory_fill), Start_Timestamp(611575186863242), End_Timestamp(611575191831478), Correlation_ID(50)
-Record_ID(106), Domain(HSA_API_DOMAIN), Function(hsa_amd_memory_fill), Start_Timestamp(611575191832440), End_Timestamp(611575191851136), Correlation_ID(51)
-Record_ID(108), Domain(HSA_API_DOMAIN), Function(hsa_amd_agents_allow_access), Start_Timestamp(611575191851537), End_Timestamp(611575191856146), Correlation_ID(52)
-Record_ID(110), Domain(HSA_API_DOMAIN), Function(hsa_signal_create), Start_Timestamp(611575191856577), End_Timestamp(611575191857238), Correlation_ID(53)
-Record_ID(112), Domain(HSA_API_DOMAIN), Function(hsa_amd_memory_async_copy), Start_Timestamp(611575191858962), End_Timestamp(611575191862969), Correlation_ID(54)
-Record_ID(114), Domain(HSA_API_DOMAIN), Function(hsa_amd_memory_copy_engine_status), Start_Timestamp(611575191863330), End_Timestamp(611575191863961), Correlation_ID(55)
-Record_ID(116), Domain(HSA_API_DOMAIN), Function(hsa_amd_memory_async_copy_on_engine), Start_Timestamp(611575191864292), End_Timestamp(611575191866526), Correlation_ID(56)
-Record_ID(119), Domain(HSA_API_DOMAIN), Function(hsa_signal_wait_relaxed), Start_Timestamp(611575191866887), End_Timestamp(611575192213738), Correlation_ID(57)
-Record_ID(121), Domain(HSA_API_DOMAIN), Function(hsa_amd_agents_allow_access), Start_Timestamp(611575192214118), End_Timestamp(611575192227644), Correlation_ID(58)
-Record_ID(123), Domain(HSA_API_DOMAIN), Function(hsa_signal_store_screlease), Start_Timestamp(611575192228005), End_Timestamp(611575192228226), Correlation_ID(59)
-Record_ID(125), Domain(HSA_API_DOMAIN), Function(hsa_amd_memory_async_copy), Start_Timestamp(611575192228506), End_Timestamp(611575193167662), Correlation_ID(60)
-Record_ID(128), Domain(HSA_API_DOMAIN), Function(hsa_signal_wait_relaxed), Start_Timestamp(611575193168654), End_Timestamp(611575193243980), Correlation_ID(61)
-Record_ID(130), Domain(HSA_API_DOMAIN), Function(hsa_amd_memory_pool_free), Start_Timestamp(611575193246244), End_Timestamp(611575193271343), Correlation_ID(62)
-Record_ID(132), Domain(HSA_API_DOMAIN), Function(hsa_amd_memory_pool_free), Start_Timestamp(611575193272976), End_Timestamp(611575193274038), Correlation_ID(63)
-Record_ID(134), Domain(HSA_API_DOMAIN), Function(hsa_amd_memory_pool_free), Start_Timestamp(611575193274318), End_Timestamp(611575193274890), Correlation_ID(64)
+Domain(HSA_OPS_DOMAIN), Operation_Name(COPY), Start_Timestamp(911155715185019), End_Timestamp(911155715192699), Correlation_ID(33)
+Domain(HSA_OPS_DOMAIN), Operation_Name(COPY), Start_Timestamp(911155716884614), End_Timestamp(911155716890854), Correlation_ID(42)
+Domain(HSA_OPS_DOMAIN), Operation_Name(COPY), Start_Timestamp(911155716896614), End_Timestamp(911155716899654), Correlation_ID(44)
+Domain(HSA_OPS_DOMAIN), Operation_Name(COPY), Start_Timestamp(911155716901334), End_Timestamp(911155716905334), Correlation_ID(47)
+Domain(HSA_OPS_DOMAIN), Operation_Name(COPY), Start_Timestamp(911155721788162), End_Timestamp(911155722047524), Correlation_ID(54)
+Domain(HSA_OPS_DOMAIN), Operation_Name(COPY), Start_Timestamp(911155723248205), End_Timestamp(911155723254125), Correlation_ID(60)
+Domain(HSA_API_DOMAIN), Function(hsa_agent_get_info), Start_Timestamp(911155708889278), End_Timestamp(911155708889849), Correlation_ID(2)
+Domain(HSA_API_DOMAIN), Function(hsa_amd_memory_pool_get_info), Start_Timestamp(911155708893556), End_Timestamp(911155708893977), Correlation_ID(4)
+Domain(HSA_API_DOMAIN), Function(hsa_amd_memory_pool_get_info), Start_Timestamp(911155708894197), End_Timestamp(911155708894418), Correlation_ID(5)
+Domain(HSA_API_DOMAIN), Function(hsa_amd_memory_pool_get_info), Start_Timestamp(911155708894678), End_Timestamp(911155708894858), Correlation_ID(6)
+Domain(HSA_API_DOMAIN), Function(hsa_amd_agent_iterate_memory_pools), Start_Timestamp(911155708891833), End_Timestamp(911155708895039), Correlation_ID(3)
+Domain(HSA_API_DOMAIN), Function(hsa_iterate_agents), Start_Timestamp(911155708883967), End_Timestamp(911155708895219), Correlation_ID(1)
+Domain(HSA_API_DOMAIN), Function(hsa_agent_get_info), Start_Timestamp(911155708895610), End_Timestamp(911155708895770), Correlation_ID(8)
+Domain(HSA_API_DOMAIN), Function(hsa_agent_get_info), Start_Timestamp(911155708896061), End_Timestamp(911155708896221), Correlation_ID(9)
+Domain(HSA_API_DOMAIN), Function(hsa_agent_get_info), Start_Timestamp(911155708896391), End_Timestamp(911155708904237), Correlation_ID(10)
+Domain(HSA_API_DOMAIN), Function(hsa_agent_get_info), Start_Timestamp(911155708904477), End_Timestamp(911155708904617), Correlation_ID(11)
+Domain(HSA_API_DOMAIN), Function(hsa_agent_get_info), Start_Timestamp(911155708904818), End_Timestamp(911155708905048), Correlation_ID(12)
+Domain(HSA_API_DOMAIN), Function(hsa_amd_memory_pool_get_info), Start_Timestamp(911155708905529), End_Timestamp(911155708905699), Correlation_ID(14)
+Domain(HSA_API_DOMAIN), Function(hsa_amd_memory_pool_get_info), Start_Timestamp(911155708905850), End_Timestamp(911155708906000), Correlation_ID(15)
+Domain(HSA_API_DOMAIN), Function(hsa_amd_memory_pool_get_info), Start_Timestamp(911155708906170), End_Timestamp(911155708906321), Correlation_ID(16)
+Domain(HSA_API_DOMAIN), Function(hsa_amd_agent_iterate_memory_pools), Start_Timestamp(911155708905249), End_Timestamp(911155708906471), Correlation_ID(13)
+Domain(HSA_API_DOMAIN), Function(hsa_agent_get_info), Start_Timestamp(911155708906661), End_Timestamp(911155708906802), Correlation_ID(17)
+Domain(HSA_API_DOMAIN), Function(hsa_amd_memory_pool_get_info), Start_Timestamp(911155708907182), End_Timestamp(911155708907313), Correlation_ID(19)
+Domain(HSA_API_DOMAIN), Function(hsa_amd_memory_pool_get_info), Start_Timestamp(911155708909106), End_Timestamp(911155708909266), Correlation_ID(20)
+Domain(HSA_API_DOMAIN), Function(hsa_amd_agent_memory_pool_get_info), Start_Timestamp(911155708910368), End_Timestamp(911155708910679), Correlation_ID(21)
+Domain(HSA_API_DOMAIN), Function(hsa_amd_memory_pool_get_info), Start_Timestamp(911155708910859), End_Timestamp(911155708911040), Correlation_ID(22)
+Domain(HSA_API_DOMAIN), Function(hsa_amd_agent_iterate_memory_pools), Start_Timestamp(911155708906982), End_Timestamp(911155708911210), Correlation_ID(18)
+Domain(HSA_API_DOMAIN), Function(hsa_iterate_agents), Start_Timestamp(911155708895420), End_Timestamp(911155708911431), Correlation_ID(7)
+Domain(HSA_API_DOMAIN), Function(hsa_amd_memory_pool_allocate), Start_Timestamp(911155708912463), End_Timestamp(911155708989391), Correlation_ID(23)
+Domain(HSA_API_DOMAIN), Function(hsa_amd_memory_pool_allocate), Start_Timestamp(911155708989852), End_Timestamp(911155709008508), Correlation_ID(24)
+Domain(HSA_API_DOMAIN), Function(hsa_amd_memory_pool_allocate), Start_Timestamp(911155709008859), End_Timestamp(911155709029178), Correlation_ID(25)
+Domain(HSA_API_DOMAIN), Function(hsa_agent_get_info), Start_Timestamp(911155709029539), End_Timestamp(911155709029920), Correlation_ID(26)
+Domain(HSA_API_DOMAIN), Function(hsa_agent_get_info), Start_Timestamp(911155709032164), End_Timestamp(911155709034739), Correlation_ID(27)
+Domain(HSA_API_DOMAIN), Function(hsa_agent_get_info), Start_Timestamp(911155709035210), End_Timestamp(911155709035500), Correlation_ID(28)
+Domain(HSA_API_DOMAIN), Function(hsa_amd_memory_fill), Start_Timestamp(911155709037394), End_Timestamp(911155709039288), Correlation_ID(29)
+Domain(HSA_API_DOMAIN), Function(hsa_amd_memory_fill), Start_Timestamp(911155709039528), End_Timestamp(911155714027071), Correlation_ID(30)
+Domain(HSA_API_DOMAIN), Function(hsa_amd_agents_allow_access), Start_Timestamp(911155714029005), End_Timestamp(911155714035708), Correlation_ID(31)
+Domain(HSA_API_DOMAIN), Function(hsa_signal_create), Start_Timestamp(911155714038313), End_Timestamp(911155714039796), Correlation_ID(32)
+Domain(HSA_API_DOMAIN), Function(hsa_amd_memory_async_copy), Start_Timestamp(911155714040688), End_Timestamp(911155715169851), Correlation_ID(33)
+Domain(HSA_API_DOMAIN), Function(hsa_amd_memory_copy_engine_status), Start_Timestamp(911155715171454), End_Timestamp(911155716794372), Correlation_ID(34)
+Domain(HSA_API_DOMAIN), Function(hsa_amd_memory_async_copy_on_engine), Start_Timestamp(911155716795764), End_Timestamp(911155716802908), Correlation_ID(35)
+Domain(HSA_API_DOMAIN), Function(hsa_signal_wait_relaxed), Start_Timestamp(911155716804121), End_Timestamp(911155716805724), Correlation_ID(36)
+Domain(HSA_API_DOMAIN), Function(hsa_amd_memory_fill), Start_Timestamp(911155716808770), End_Timestamp(911155716852254), Correlation_ID(37)
+Domain(HSA_API_DOMAIN), Function(hsa_amd_memory_fill), Start_Timestamp(911155716852564), End_Timestamp(911155716863766), Correlation_ID(38)
+Domain(HSA_API_DOMAIN), Function(hsa_amd_memory_fill), Start_Timestamp(911155716864036), End_Timestamp(911155716874747), Correlation_ID(39)
+Domain(HSA_API_DOMAIN), Function(hsa_amd_agents_allow_access), Start_Timestamp(911155716875048), End_Timestamp(911155716876681), Correlation_ID(40)
+Domain(HSA_API_DOMAIN), Function(hsa_signal_create), Start_Timestamp(911155716876981), End_Timestamp(911155716877563), Correlation_ID(41)
+Domain(HSA_API_DOMAIN), Function(hsa_amd_memory_async_copy), Start_Timestamp(911155716877863), End_Timestamp(911155716880819), Correlation_ID(42)
+Domain(HSA_API_DOMAIN), Function(hsa_amd_memory_copy_engine_status), Start_Timestamp(911155716881119), End_Timestamp(911155716881550), Correlation_ID(43)
+Domain(HSA_API_DOMAIN), Function(hsa_amd_memory_async_copy_on_engine), Start_Timestamp(911155716881831), End_Timestamp(911155716883975), Correlation_ID(44)
+Domain(HSA_API_DOMAIN), Function(hsa_signal_wait_relaxed), Start_Timestamp(911155716884256), End_Timestamp(911155716893944), Correlation_ID(45)
+Domain(HSA_API_DOMAIN), Function(hsa_signal_store_screlease), Start_Timestamp(911155716894856), End_Timestamp(911155716895056), Correlation_ID(46)
+Domain(HSA_API_DOMAIN), Function(hsa_amd_memory_async_copy), Start_Timestamp(911155716895227), End_Timestamp(911155716898293), Correlation_ID(47)
+Domain(HSA_API_DOMAIN), Function(hsa_signal_wait_relaxed), Start_Timestamp(911155716898593), End_Timestamp(911155716901459), Correlation_ID(48)
+Domain(HSA_API_DOMAIN), Function(hsa_amd_memory_fill), Start_Timestamp(911155716902751), End_Timestamp(911155716915937), Correlation_ID(49)
+Domain(HSA_API_DOMAIN), Function(hsa_amd_memory_fill), Start_Timestamp(911155716916187), End_Timestamp(911155721747629), Correlation_ID(50)
+Domain(HSA_API_DOMAIN), Function(hsa_amd_memory_fill), Start_Timestamp(911155721748621), End_Timestamp(911155721769541), Correlation_ID(51)
+Domain(HSA_API_DOMAIN), Function(hsa_amd_agents_allow_access), Start_Timestamp(911155721769922), End_Timestamp(911155721775212), Correlation_ID(52)
+Domain(HSA_API_DOMAIN), Function(hsa_signal_create), Start_Timestamp(911155721775703), End_Timestamp(911155721776415), Correlation_ID(53)
+Domain(HSA_API_DOMAIN), Function(hsa_amd_memory_async_copy), Start_Timestamp(911155721778338), End_Timestamp(911155721783318), Correlation_ID(54)
+Domain(HSA_API_DOMAIN), Function(hsa_amd_memory_copy_engine_status), Start_Timestamp(911155721783719), End_Timestamp(911155721784390), Correlation_ID(55)
+Domain(HSA_API_DOMAIN), Function(hsa_amd_memory_async_copy_on_engine), Start_Timestamp(911155721784751), End_Timestamp(911155721787346), Correlation_ID(56)
+Domain(HSA_API_DOMAIN), Function(hsa_signal_wait_relaxed), Start_Timestamp(911155721787727), End_Timestamp(911155722145178), Correlation_ID(57)
+Domain(HSA_API_DOMAIN), Function(hsa_amd_agents_allow_access), Start_Timestamp(911155722145669), End_Timestamp(911155722160888), Correlation_ID(58)
+Domain(HSA_API_DOMAIN), Function(hsa_signal_store_screlease), Start_Timestamp(911155722161319), End_Timestamp(911155722161539), Correlation_ID(59)
+Domain(HSA_API_DOMAIN), Function(hsa_amd_memory_async_copy), Start_Timestamp(911155722161890), End_Timestamp(911155723231608), Correlation_ID(60)
+Domain(HSA_API_DOMAIN), Function(hsa_signal_wait_relaxed), Start_Timestamp(911155723232310), End_Timestamp(911155723309238), Correlation_ID(61)
+Domain(HSA_API_DOMAIN), Function(hsa_amd_memory_pool_free), Start_Timestamp(911155723311563), End_Timestamp(911155723335479), Correlation_ID(62)
+Domain(HSA_API_DOMAIN), Function(hsa_amd_memory_pool_free), Start_Timestamp(911155723337383), End_Timestamp(911155723338415), Correlation_ID(63)
+Domain(HSA_API_DOMAIN), Function(hsa_amd_memory_pool_free), Start_Timestamp(911155723338685), End_Timestamp(911155723339256), Correlation_ID(64)

tests-v2/featuretests/tracer/tracer_gtest.cpp

@@ -32,7 +32,7 @@ void ApplicationParser::SetApplicationEnv(const char* app_name, const char* trac
   std::string app_path = GetRunningPath("tests-v2/featuretests/tracer/runTracerFeatureTests");
 
   std::string profiler_api_lib_path = "";
-  if(is_installed_path()) {
+  if (is_installed_path()) {
     profiler_api_lib_path = "/lib";
   }
 
@@ -83,7 +83,7 @@ void ApplicationParser::GetKernelInfoForRunningApplication(
     // Parse individual values and store them in the dispatch struct
     tokenize_tracer_output(line, kinfo);
 
-    if (kinfo.record_id != "") {
+    if (kinfo.domain != "") {
       kernel_info_output->push_back(kinfo);
     }
   }
@@ -152,7 +152,7 @@ void ApplicationParser::ParseKernelInfoFields(
     // Parse individual values and store them in the dispatch struct
     tokenize_tracer_output(line, kinfo);
 
-    if (kinfo.record_id != "") {
+    if (kinfo.domain != "") {
       kernel_info_output->push_back(kinfo);
     }
   }
@@ -245,10 +245,10 @@ TEST_F(AsyncCopyTest, WhenRunningTracerWithAppThenAsyncCorelationCountIsCorrect)
   GetKernelInfoForRunningApplication(&current_kernel_info);
   ASSERT_TRUE(current_kernel_info.size());
 
-  std::vector<std::pair<std::string, std::string>> corelation_pair{};
+  std::vector<std::string> corelation_pair{};
   for (const auto& itr : current_kernel_info) {
     if (itr.domain.find("HSA_OPS_DOMAIN") != std::string::npos) {
-      corelation_pair.push_back({itr.record_id, itr.corelation_id});
+      corelation_pair.push_back(itr.corelation_id);
       break;  // we just want first occurance to test
     }
   }
@@ -258,12 +258,14 @@ TEST_F(AsyncCopyTest, WhenRunningTracerWithAppThenAsyncCorelationCountIsCorrect)
   // check if same corelation id appears again but as a different ops record
   for (size_t i = 0; i < corelation_pair.size(); i++) {
     for (const auto& itr : current_kernel_info) {
-      if ((itr.corelation_id == corelation_pair[i].second) &&
-          (itr.record_id != corelation_pair[i].first)) {
+      if ((itr.corelation_id == corelation_pair[i])) {
         corelation_count++;
       }
     }
   }
 
+  // To remove the current record that we are checking with
+  corelation_count--;
+
   EXPECT_EQ(corelation_count, corelation_pair.size());
 }

tests-v2/featuretests/utils/test_utils.cpp

@@ -84,7 +84,7 @@ void tokenize_profiler_output(std::string line, profiler_kernel_info_t& kinfo) {
   std::stringstream tokenStream(line);
   std::string token;
   std::getline(tokenStream, token, ',');
-  kinfo.record_id = token;
+  kinfo.dispatch_id = token;
   std::getline(tokenStream, token, ',');
   kinfo.gpu_id = token;
   std::getline(tokenStream, token, ',');
@@ -126,8 +126,6 @@ void tokenize_tracer_output(std::string line, tracer_kernel_info_t& kinfo) {
   std::stringstream tokenStream(line);
   std::string token;
   std::getline(tokenStream, token, ',');
-  kinfo.record_id = token;
-  std::getline(tokenStream, token, ',');
   kinfo.domain = token;
   std::getline(tokenStream, token, ',');
   kinfo.function = token;

tests-v2/featuretests/utils/test_utils.h

@@ -39,7 +39,7 @@ namespace tests {
 namespace utility {
 
 typedef struct {
-  std::string record_id;
+  std::string dispatch_id;
   std::string gpu_id;
   std::string queue_id;
   std::string queue_index;
@@ -60,7 +60,6 @@ typedef struct {
 } profiler_kernel_info_t;
 
 typedef struct {
-  std::string record_id;
   std::string domain;
   std::string function;
   std::string operation;