[L0 v2] fix enqueueMemBufferMap implementation

event should always be signaled (if provided by the user).

Author: igchor

source/adapters/level_zero/v2/queue_immediate_in_order.cpp

@@ -660,10 +660,11 @@ ur_result_t ur_queue_immediate_in_order_t::enqueueMemBufferMap(
     // If memory was not migrated, we need to wait on the events here.
     ZE2UR_CALL(zeCommandListAppendWaitOnEvents,
                (handler.commandList.get(), waitList.second, waitList.first));
-    if (signalEvent) {
-      ZE2UR_CALL(zeCommandListAppendSignalEvent,
-                 (handler.commandList.get(), signalEvent->getZeEvent()));
-    }
+  }
+
+  if (signalEvent) {
+    ZE2UR_CALL(zeCommandListAppendSignalEvent,
+               (handler.commandList.get(), signalEvent->getZeEvent()));
   }
 
   if (blockingMap) {

test/conformance/enqueue/urEnqueueMemBufferMap.cpp

@@ -228,6 +228,20 @@ TEST_P(urEnqueueMemBufferMapTestWithParam, SuccessMultiMaps) {
   }
 }
 
+TEST_P(urEnqueueMemBufferMapTestWithParam, MapSignalEvent) {
+  const std::vector<uint32_t> input(count, 0);
+  ASSERT_SUCCESS(urEnqueueMemBufferWrite(queue, buffer, true, 0, size,
+                                         input.data(), 0, nullptr, nullptr));
+
+  uint32_t *map = nullptr;
+  ur_event_handle_t hEvent;
+  ASSERT_SUCCESS(urEnqueueMemBufferMap(
+      queue, buffer, true, UR_MAP_FLAG_READ | UR_MAP_FLAG_WRITE, 0, size, 0,
+      nullptr, &hEvent, (void **)&map));
+
+  ASSERT_SUCCESS(urEnqueueEventsWait(queue, 1, &hEvent, nullptr));
+}
+
 TEST_P(urEnqueueMemBufferMapTestWithParam, InvalidNullHandleQueue) {
   void *map = nullptr;
   ASSERT_EQ_RESULT(UR_RESULT_ERROR_INVALID_NULL_HANDLE,