From 4bdb8407f8a66baa84c1e4e59128b67f9da5e3ea Mon Sep 17 00:00:00 2001
From: Evgeny <evgeny.shcherbakov@amd.com>
Date: Tue, 6 Nov 2018 00:53:09 -0600
Subject: [PATCH] tracker handlers ordering

Change-Id: I998ff13380eaa3d920a0037951acef596d850dfd
---
 src/core/tracker.h | 55 +++++++++++++++++++++++++++++++++++-----------
 test/run.sh        |  1 -
 2 files changed, 42 insertions(+), 14 deletions(-)

diff --git a/src/core/tracker.h b/src/core/tracker.h
index acbf5cf613..ab7f3b5dc5 100644
--- a/src/core/tracker.h
+++ b/src/core/tracker.h
@@ -49,6 +49,7 @@ class Tracker {
   typedef sig_list_t::iterator sig_list_it_t;
 
   struct entry_t {
+    std::atomic<bool> valid;
     Tracker* tracker;
     sig_list_t::iterator it;
     hsa_agent_t agent;
@@ -100,7 +101,7 @@ class Tracker {
 
     // Adding antry to the list
     mutex_.lock();
-    entry->it = sig_list_.insert(sig_list_.begin(), entry);
+    entry->it = sig_list_.insert(sig_list_.end(), entry);
     mutex_.unlock();
 
     return entry;
@@ -142,7 +143,7 @@ class Tracker {
   void Erase(const sig_list_it_t& it) { Delete(*it); }
 
   // Entry completion
-  void Complete(entry_t* entry) {
+  inline void Complete(entry_t* entry) {
     record_t* record = entry->record;
 
     // Debug trace
@@ -160,6 +161,7 @@ class Tracker {
     record->begin = hsa_rsrc_->SysclockToNs(dispatch_time.start);
     record->end = hsa_rsrc_->SysclockToNs(dispatch_time.end);
     record->complete = hsa_rsrc_->TimestampNs();
+    entry->valid.store(true, std::memory_order_release);
 
     // Original intercepted signal completion
     hsa_signal_t orig = entry->orig;
@@ -174,16 +176,7 @@ class Tracker {
     }
   }
 
-  // Handler for packet completion
-  static bool Handler(hsa_signal_value_t, void* arg) {
-    // Acquire entry
-    entry_t* entry = reinterpret_cast<entry_t*>(arg);
-    volatile std::atomic<void*>* ptr = &entry->handler;
-    while (ptr->load(std::memory_order_acquire) == NULL) sched_yield();
-
-    // Complete entry
-    entry->tracker->Complete(entry);
-
+  inline static void HandleEntry(entry_t* entry) {
     // Call entry handler
     void* handler = static_cast<void*>(entry->handler);
     if (entry->context_active) {
@@ -192,9 +185,42 @@ class Tracker {
       rocprofiler_group_t group{};
       reinterpret_cast<rocprofiler_handler_t>(handler)(group, entry->arg);
     }
-
     // Delete tracker entry
     entry->tracker->Delete(entry);
+  }
+
+  // Handler for packet completion
+  static bool Handler(hsa_signal_value_t, void* arg) {
+    // Acquire entry
+    entry_t* entry = reinterpret_cast<entry_t*>(arg);
+    volatile std::atomic<void*>* ptr = &entry->handler;
+    while (ptr->load(std::memory_order_acquire) == NULL) sched_yield();
+
+    // Complete entry
+    Tracker* tracker = entry->tracker;
+    tracker->Complete(entry);
+
+    if (ordering_enabled_ == false) {
+      HandleEntry(entry);
+    } else {
+      // Acquire last entry
+      entry_t* back = tracker->sig_list_.back();
+      volatile std::atomic<void*>* ptr = &back->handler;
+      while (ptr->load(std::memory_order_acquire) == NULL) sched_yield();
+
+      tracker->handler_mutex_.lock();
+      sig_list_it_t it = tracker->sig_list_.begin();
+      sig_list_it_t end = back->it;
+      while (it != end) {
+        entry = *(it++);
+        if (entry->valid.load(std::memory_order_acquire)) {
+          HandleEntry(entry);
+        } else {
+          break;
+        }
+      }
+      tracker->handler_mutex_.unlock();
+    }
 
     return false;
   }
@@ -203,10 +229,13 @@ class Tracker {
   sig_list_t sig_list_;
   // Inter-thread synchronization
   mutex_t mutex_;
+  mutex_t handler_mutex_;
   // Outstanding dispatches
   std::atomic<uint64_t> outstanding_;
   // HSA resources factory
   util::HsaRsrcFactory* hsa_rsrc_;
+  // Handling ordering enabled
+  static const bool ordering_enabled_ = true;
   // Enable tracing
   static const bool trace_on_ = false;
 };
diff --git a/test/run.sh b/test/run.sh
index 528d5f5ab9..0a0a2f727b 100755
--- a/test/run.sh
+++ b/test/run.sh
@@ -42,7 +42,6 @@ export ROCP_TOOL_LIB=./test/libintercept_test.so
 unset ROCP_TOOL_LIB
 eval ./test/standalone_test
 
-
 # tool library loaded by ROC profiler
 export ROCP_TOOL_LIB=libtool.so
 # ROC profiler kernels timing