Merge "concurrent: enable/fix the related settings" into amd-staging

[ROCm/rocprofiler commit: 8263eceef9]

projects/rocprofiler/bin/rpl_run.sh

@@ -443,6 +443,7 @@ while [ 1 ] ; do
   elif [ "$1" = "--parallel-kernels" ] ; then
     ARG_VAL=0
     export ROCP_K_CONCURRENT=1
+    export AQLPROFILE_READ_API=1
   elif [ "$1" = "--verbose" ] ; then
     ARG_VAL=0
     export ROCP_VERBOSE_MODE=1

projects/rocprofiler/src/core/rocprofiler.cpp

@@ -219,6 +219,7 @@ uint32_t LoadTool() {
     if (settings.k_concurrent) {
       Context::k_concurrent_ = settings.k_concurrent;
       InterceptQueue::k_concurrent_ = settings.k_concurrent;
+      InterceptQueue::TrackerOn(true);
     }
     if (settings.opt_mode) InterceptQueue::opt_mode_ = true;
   }

projects/rocprofiler/test/tool/tool.cpp

@@ -1478,9 +1478,9 @@ extern "C" PUBLIC_API void OnLoadToolProp(rocprofiler_settings_t* settings)
   } else {
     // Adding dispatch observer
     rocprofiler_queue_callbacks_t callbacks_ptrs{0};
-    if (settings->k_concurrent != 0) {
+    if (settings->k_concurrent == 2) {      // concurrent trace
       callbacks_ptrs.dispatch = dispatch_callback_con;
-    } else {
+    } else {                                // pmc
       callbacks_ptrs.dispatch = dispatch_callback;
     }
     callbacks_ptrs.destroy = destroy_callback;