From 995706ec7b877066e5fa95513e95ded536cb0a14 Mon Sep 17 00:00:00 2001
From: Saleel Kudchadker <Saleel.Kudchadker@amd.com>
Date: Wed, 2 Jun 2021 09:18:00 -0700
Subject: [PATCH] SWDEV-286092 - Guarantee flush for event record

Every event record will guarantee completion when its called.

Change-Id: I8de34714a4ca2e105f36de2818e95ec2903143ce
---
 rocclr/hip_event.cpp | 33 ++++++---------------------------
 rocclr/hip_event.hpp |  4 ++--
 2 files changed, 8 insertions(+), 29 deletions(-)

diff --git a/rocclr/hip_event.cpp b/rocclr/hip_event.cpp
index 05143bbda2..94904d576d 100755
--- a/rocclr/hip_event.cpp
+++ b/rocclr/hip_event.cpp
@@ -150,27 +150,11 @@ void Event::addMarker(amd::HostQueue* queue, amd::Command* command, bool record)
   amd::ScopedLock lock(lock_);
 
   if (command == nullptr) {
-    command = queue->getLastQueuedCommand(true);
-
-    bool cmdNullOrMarker = (command == nullptr) || (command->type() == 0);
-
-    // If lastQueuedCommand is user invisible command(command->type() == 0),
-    // Always submit a marker if queue profiling is not explicitly enabled else
-    // submit a normal marker. Disable queue flush to batch commands
-    if (!queue->properties().test(CL_QUEUE_PROFILING_ENABLE) &&
-        !(flags & hipEventDisableTiming)) {
-      if (command != nullptr) {
-        command->release();
-      }
-      command = new hip::ProfileMarker(*queue, cmdNullOrMarker, true);
-      command->enqueue();
-    } else if (cmdNullOrMarker) {
-      if (command != nullptr) {
-        command->release();
-      }
-      command = new amd::Marker(*queue, kMarkerDisableFlush);
-      command->enqueue();
-    }
+    bool recordExplicitGpuTs = !queue->properties().test(CL_QUEUE_PROFILING_ENABLE) &&
+                               !(flags & hipEventDisableTiming);
+    // Always submit a EventMarker. This would submit a NOP with a signal.
+    command = new hip::EventMarker(*queue, !kMarkerDisableFlush, recordExplicitGpuTs);
+    command->enqueue();
   }
 
   if (event_ == &command->event()) return;
@@ -180,11 +164,6 @@ void Event::addMarker(amd::HostQueue* queue, amd::Command* command, bool record)
   }
 
   event_ = &command->event();
-  // Notify queue earlier so SW status for the command can be updated faster,
-  // since marker potentially means a wait
-  if (AMD_DIRECT_DISPATCH && (flags & hipEventDisableTiming)) {
-    command->notifyCmdQueue();
-  }
   recorded_ = record;
 }
 
@@ -230,7 +209,7 @@ hipError_t ihipEventQuery(hipEvent_t event) {
     int offset = (prev_read_idx % IPC_SIGNALS_PER_EVENT);
     if (e->ipc_evt_.ipc_shmem_->read_index < prev_read_idx+IPC_SIGNALS_PER_EVENT && e->ipc_evt_.ipc_shmem_->signal[offset] != 0) {
       return hipErrorNotReady;
-    } 
+    }
     return hipSuccess;
   } else {
     return e->query();
diff --git a/rocclr/hip_event.hpp b/rocclr/hip_event.hpp
index 94b71c3fcc..c7d0ae5dc3 100644
--- a/rocclr/hip_event.hpp
+++ b/rocclr/hip_event.hpp
@@ -43,9 +43,9 @@ void CL_CALLBACK ihipStreamCallback(cl_event event, cl_int command_exec_status,
 
 namespace hip {
 
-class ProfileMarker: public amd::Marker {
+class EventMarker: public amd::Marker {
 public:
-  ProfileMarker(amd::HostQueue& queue, bool disableFlush, bool markerTs = false)
+  EventMarker(amd::HostQueue& queue, bool disableFlush, bool markerTs = false)
   : amd::Marker(queue, disableFlush) {
     profilingInfo_.enabled_ = true;
     profilingInfo_.callback_ = nullptr;