SWDEV-391589: Addressing changes requested by Omniperf:

Adding Versioning to rocprof main script
Adding Versioning to file plugins to support legacy v1 output and new v2 output
Fixing headers for v2 output

Change-Id: I352e8c8ed03871466269a792d1bfa572da58bd8a

tests-v2/featuretests/utils/test_utils.cpp

@@ -91,8 +91,6 @@ void tokenize_profiler_output(std::string line, profiler_kernel_info_t& kinfo) {
   std::getline(tokenStream, token, ',');
   kinfo.queue_id = token;
   std::getline(tokenStream, token, ',');
-  kinfo.queue_index = token;
-  std::getline(tokenStream, token, ',');
   kinfo.process_id = token;
   std::getline(tokenStream, token, ',');
   kinfo.thread_id = token;
@@ -101,9 +99,9 @@ void tokenize_profiler_output(std::string line, profiler_kernel_info_t& kinfo) {
   std::getline(tokenStream, token, ',');
   kinfo.workgroup_size = token;
   std::getline(tokenStream, token, ',');
-  kinfo.lds = token;
+  kinfo.lds_per_workgroup = token;
   std::getline(tokenStream, token, ',');
-  kinfo.scratch_size = token;
+  kinfo.scratch_per_workitem = token;
   std::getline(tokenStream, token, ',');
   kinfo.arch_vgpr = token;
   std::getline(tokenStream, token, ',');
@@ -119,6 +117,8 @@ void tokenize_profiler_output(std::string line, profiler_kernel_info_t& kinfo) {
   std::getline(tokenStream, token, ',');
   kinfo.end_time = token;
   std::getline(tokenStream, token, ',');
+  kinfo.correlation_id = token;
+  std::getline(tokenStream, token, ',');
   kinfo.counter = token;
 }
 

tests-v2/featuretests/utils/test_utils.h

@@ -43,13 +43,12 @@ typedef struct {
   std::string dispatch_id;
   std::string gpu_id;
   std::string queue_id;
-  std::string queue_index;
   std::string process_id;
   std::string thread_id;
   std::string grid_size;
   std::string workgroup_size;
-  std::string lds;
-  std::string scratch_size;
+  std::string lds_per_workgroup;
+  std::string scratch_per_workitem;
   std::string arch_vgpr;
   std::string accum_vgpr;
   std::string sgpr;
@@ -57,6 +56,7 @@ typedef struct {
   std::string kernel_name;
   std::string begin_time;
   std::string end_time;
+  std::string correlation_id;
   std::string counter;
 } profiler_kernel_info_t;