SWDEV-241977 [ROCm QA] Random Soft hang observed while running TF and Caffe2 benchmarks

Change-Id: I42016c11db15411b86e7b8130d6ba557bc22dbb7

rocclr/platform/commandqueue.cpp

@@ -50,14 +50,10 @@ bool HostQueue::terminate() {
     Command* marker = nullptr;
 
     // Send a finish if the queue is still accepting commands.
-    {
-      ScopedLock sl(queueLock_);
-      if (thread_.acceptingCommands_) {
-        marker = new Marker(*this, false);
-        if (marker != nullptr) {
-          append(*marker);
-          queueLock_.notify();
-        }
+    if (thread_.acceptingCommands_) {
+      marker = new Marker(*this, false);
+      if (marker != nullptr) {
+        append(*marker);
       }
     }
     if (marker != nullptr) {
@@ -186,8 +182,10 @@ void HostQueue::append(Command& command) {
   command.retain();
   command.setStatus(CL_QUEUED);
   ScopedLock l(lastCmdLock_);
+  ScopedLock l2(queueLock_);
   queue_.enqueue(&command);
   if (!IS_HIP) {
+    queueLock_.notify();
     return;
   }
   // Set last submitted command
@@ -196,6 +194,7 @@ void HostQueue::append(Command& command) {
   }
   lastEnqueueCommand_ = &command;
   lastEnqueueCommand_->retain();
+  queueLock_.notify();
 }
 
 bool HostQueue::isEmpty() {