fix the bug.

Signed-off-by: rbegam <[email protected]>

Author: rbegam

sycl/plugins/level_zero/pi_level_zero.cpp

@@ -4824,9 +4824,7 @@ pi_result piEnqueueMemBufferMap(pi_queue Queue, pi_mem Buffer,
       {
         // Lock automatically releases when this goes out of scope.
         std::lock_guard<std::mutex> lock(Queue->PiQueueMutex);
-        if (Queue->LastCommandEvent != nullptr) {
-          TmpLastCommandEvent = Queue->LastCommandEvent;
-        }
+        TmpLastCommandEvent = Queue->LastCommandEvent;
       }
 
       if (TmpLastCommandEvent != nullptr) {
@@ -4842,12 +4840,6 @@ pi_result piEnqueueMemBufferMap(pi_queue Queue, pi_mem Buffer,
       *RetMap = pi_cast<char *>(Buffer->getZeHandle()) + Offset;
     }
 
-    {
-      // Lock automatically releases when this goes out of scope.
-      std::lock_guard<std::mutex> lock(Queue->PiQueueMutex);
-      Queue->LastCommandEvent = *Event;
-    }
-
     // Signal this event
     ZE_CALL(zeEventHostSignal, (ZeEvent));
 
@@ -4950,30 +4942,24 @@ pi_result piEnqueueMemUnmap(pi_queue Queue, pi_mem MemObj, void *MappedPtr,
     // Wait on incoming events before doing the copy
     PI_CALL(piEventsWait(NumEventsInWaitList, EventWaitList));
 
-      if (Queue->isInOrderQueue()) {
-        pi_event TmpLastCommandEvent = nullptr;
-        {
-          // Lock automatically releases when this goes out of scope.
-          std::lock_guard<std::mutex> lock(Queue->PiQueueMutex);
-          if (Queue->LastCommandEvent != nullptr) {
-            TmpLastCommandEvent = Queue->LastCommandEvent;
-          }
-        }
-        if (TmpLastCommandEvent != nullptr) {
+    if (Queue->isInOrderQueue()) {
+      pi_event TmpLastCommandEvent = nullptr;
+
+      {
+        // Lock automatically releases when this goes out of scope.
+        std::lock_guard<std::mutex> lock(Queue->PiQueueMutex);
+        TmpLastCommandEvent = Queue->LastCommandEvent;
+      }
+
+      if (TmpLastCommandEvent != nullptr) {
           PI_CALL(piEventsWait(1, &TmpLastCommandEvent));
-        }
       }
+    }
 
     if (MemObj->MapHostPtr)
       memcpy(pi_cast<char *>(MemObj->getZeHandle()) + MapInfo.Offset, MappedPtr,
              MapInfo.Size);
 
-    {
-      // Lock automatically releases when this goes out of scope.
-      std::lock_guard<std::mutex> lock(Queue->PiQueueMutex);
-      Queue->LastCommandEvent = *Event;
-    }
-
     // Signal this event
     ZE_CALL(zeEventHostSignal, (ZeEvent));