Added check trace with config.

Change-Id: I1c71793c4c6f512288e92f70105f428c3f8671c4

test/MatrixTranspose_test/MatrixTranspose.cpp

@@ -259,24 +259,24 @@ void api_callback(
 
   if (domain == ACTIVITY_DOMAIN_ROCTX) {
     const roctx_api_data_t* data = (const roctx_api_data_t*)(callback_data);
-    fprintf(stdout, "<rocTX \"%s\">\n", data->args.message);
+    fprintf(stdout, "<%s pid(%d) tid(%d)>\n", data->args.message, GetPid(), GetTid());
     return;
   }
   if (domain == ACTIVITY_DOMAIN_KFD_API) {
     const kfd_api_data_t* data = (const kfd_api_data_t*)(callback_data);
-    fprintf(stdout, "<%s id(%u)\tcorrelation_id(%lu) %s>\n",
+    fprintf(stdout, "<%s id(%u)\tcorrelation_id(%lu) %s pid(%d) tid(%d)>\n",
         roctracer_op_string(ACTIVITY_DOMAIN_KFD_API, cid, 0),
         cid,
         data->correlation_id,
-        (data->phase == ACTIVITY_API_PHASE_ENTER) ? "on-enter" : "on-exit");
+        (data->phase == ACTIVITY_API_PHASE_ENTER) ? "on-enter" : "on-exit", GetPid(), GetTid());
     return;
   }
   const hip_api_data_t* data = (const hip_api_data_t*)(callback_data);
-  SPRINT("<%s id(%u)\tcorrelation_id(%lu) %s> ",
+  SPRINT("<%s id(%u)\tcorrelation_id(%lu) %s pid(%d) tid(%d)> ",
     roctracer_op_string(ACTIVITY_DOMAIN_HIP_API, cid, 0),
     cid,
     data->correlation_id,
-    (data->phase == ACTIVITY_API_PHASE_ENTER) ? "on-enter" : "on-exit");
+    (data->phase == ACTIVITY_API_PHASE_ENTER) ? "on-enter" : "on-exit", GetPid(), GetTid());
   if (data->phase == ACTIVITY_API_PHASE_ENTER) {
     switch (cid) {
       case HIP_API_ID_hipMemcpy:
@@ -408,3 +408,5 @@ void start_tracing() {}
 void stop_tracing() {}
 #endif
 ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+
+

test/golden_traces/tests_trace_cmp_levels.txt

@@ -1,11 +1,11 @@
-MatrixTranspose_ctest_trace 3
-MatrixTranspose_test_trace 1
-MatrixTranspose_hipaact_test_trace 1
-MatrixTranspose_mgpu_trace 1
-MatrixTranspose_kfd_trace 0
-MatrixTranspose_sys_trace 0
-MatrixTranspose_sys_hsa_trace 0
-MatrixTranspose_hip_period_trace 0
-MatrixTranspose_hip_flush_trace 0
-ctrl_hsa_trace 1
-ctrl_hsa_input_trace 2
+# dummy
+MatrixTranspose_ctest_trace --check-diff
+MatrixTranspose_test_trace --check-count .* --ignore-count hsaKmt.*
+MatrixTranspose_mgpu_trace --check-count .* --ignore-count hsaKmt.*
+MatrixTranspose_sys_trace --check-count .* --ignore-count hsa_.*
+MatrixTranspose_sys_hsa_trace --check-count .* --ignore-count hsa_.*
+MatrixTranspose_hip_period_trace --check-events .* --ignore-event hipMalloc|hipFree
+MatrixTranspose_hip_flush_trace --check-order .*
+MatrixTranspose_kfd_trace --check-events .*
+ctrl_hsa_trace --check-count .*
+ctrl_hsa_input_trace --check-count .*