Fixing Kernel Dispatches timestamps issue

Change-Id: I4946ea13e2796b018dc3a9114c232b0fa5f483dc


[ROCm/rocprofiler commit: 941a0373e6]

projects/rocprofiler/src/core/session/att/att.cpp

@@ -31,7 +31,7 @@ AttTracer::AttTracer(rocprofiler_buffer_id_t buffer_id, rocprofiler_filter_id_t
 AttTracer::~AttTracer() {}
 
 void AttTracer::AddPendingSignals(uint32_t writer_id, uint64_t kernel_object,
-                                   const hsa_signal_t& completion_signal,
+                                   const hsa_signal_t& original_completion_signal, const hsa_signal_t& new_completion_signal,
                                    rocprofiler_session_id_t session_id,
                                    rocprofiler_buffer_id_t buffer_id,
                                    hsa_ven_amd_aqlprofile_profile_t* profile,
@@ -41,7 +41,7 @@ void AttTracer::AddPendingSignals(uint32_t writer_id, uint64_t kernel_object,
   if (sessions_pending_signals_.find(writer_id) == sessions_pending_signals_.end())
     sessions_pending_signals_.emplace(writer_id, std::vector<att_pending_signal_t>());
   sessions_pending_signals_.at(writer_id).emplace_back(
-      att_pending_signal_t{kernel_object, completion_signal, session_id_, buffer_id, profile,
+      att_pending_signal_t{kernel_object, original_completion_signal, new_completion_signal, session_id_, buffer_id, profile,
                             kernel_properties, thread_id, queue_index});
 }
 

projects/rocprofiler/src/core/session/att/att.h

@@ -34,7 +34,8 @@ namespace rocprofiler {
 
 typedef struct {
   uint64_t kernel_descriptor;
-  hsa_signal_t signal;
+  hsa_signal_t original_signal;
+  hsa_signal_t new_signal;
   rocprofiler_session_id_t session_id;
   rocprofiler_buffer_id_t buffer_id;
   hsa_ven_amd_aqlprofile_profile_t* profile;
@@ -52,7 +53,7 @@ class AttTracer {
   ~AttTracer();
 
   void AddPendingSignals(uint32_t writer_id, uint64_t kernel_object,
-                         const hsa_signal_t& completion_signal, rocprofiler_session_id_t session_id,
+                         const hsa_signal_t& original_completion_signal, const hsa_signal_t& new_completion_signal, rocprofiler_session_id_t session_id,
                          rocprofiler_buffer_id_t buffer_id, hsa_ven_amd_aqlprofile_profile_t* profile,
                          rocprofiler_kernel_properties_t kernel_properties, uint32_t thread_id,
                          uint64_t queue_index);

projects/rocprofiler/src/core/session/profiler/profiler.cpp

@@ -125,7 +125,7 @@ bool Profiler::HasActivePass() {
 }
 
 void Profiler::AddPendingSignals(
-    uint32_t writer_id, uint64_t kernel_object, const hsa_signal_t& completion_signal,
+    uint32_t writer_id, uint64_t kernel_object, const hsa_signal_t& original_completion_signal, const hsa_signal_t& new_completion_signal,
     rocprofiler_session_id_t session_id, rocprofiler_buffer_id_t buffer_id,
     rocprofiler::profiling_context_t* context, uint64_t session_data_count,
     hsa_ven_amd_aqlprofile_profile_t* profile, rocprofiler_kernel_properties_t kernel_properties,
@@ -134,7 +134,7 @@ void Profiler::AddPendingSignals(
   if (sessions_pending_signals_->find(writer_id) == sessions_pending_signals_->end())
     sessions_pending_signals_->emplace(writer_id, std::vector<pending_signal_t*>());
   sessions_pending_signals_->at(writer_id).emplace_back(new pending_signal_t{
-      kernel_object, completion_signal, session_id_, buffer_id, context, session_data_count,
+      kernel_object, original_completion_signal, new_completion_signal, session_id_, buffer_id, context, session_data_count,
       profile, kernel_properties, thread_id, queue_index, correlation_id});
 }
 

projects/rocprofiler/src/core/session/profiler/profiler.h

@@ -44,7 +44,8 @@ namespace rocprofiler {
 
 typedef struct {
   uint64_t kernel_descriptor;
-  hsa_signal_t signal;
+  hsa_signal_t original_signal;
+  hsa_signal_t new_signal;
   rocprofiler_session_id_t session_id;
   rocprofiler_buffer_id_t buffer_id;
   rocprofiler::profiling_context_t* context;
@@ -67,7 +68,7 @@ class Profiler {
   ~Profiler();
 
   void AddPendingSignals(uint32_t writer_id, uint64_t kernel_object,
-                           const hsa_signal_t& completion_signal, rocprofiler_session_id_t session_id,
+                           const hsa_signal_t& original_completion_signal, const hsa_signal_t& new_completion_signal, rocprofiler_session_id_t session_id,
                            rocprofiler_buffer_id_t buffer_id,
                            rocprofiler::profiling_context_t* context, uint64_t session_data_count,
                            hsa_ven_amd_aqlprofile_profile_t* profile,