event

1 files changed, 22 insertions, 2 deletions

diff --git a/backend/src/driver/cl_gen_mem.cpp b/backend/src/driver/cl_gen_mem.cpp
index cf35f06c..473a4ed0 100644
--- a/backend/src/driver/cl_gen_mem.cpp
+++ b/backend/src/driver/cl_gen_mem.cpp
@@ -267,11 +267,12 @@ cl_int GenEnqueueMapBuffer(cl_command_queue queue, cl_mem mem, void** ret_addr,
     return CL_MEM_OBJECT_ALLOCATION_FAILURE;
   }
 
+  GenGPUCommandQueue* gpuQueue = (GenGPUCommandQueue*)getGenCommandQueuePrivate(queue);
+  GBE_ASSERT(gpuQueue);
+
   if (block) {
     /* According to spec, when in block mode, we need to ensure all the
        commands in queue are flushed. */
-    GenGPUCommandQueue* gpuQueue = (GenGPUCommandQueue*)getGenCommandQueuePrivate(queue);
-    GBE_ASSERT(gpuQueue);
     gpuQueue->waitForFlush();
 
     if (event_list) { // Need to wait for events.
@@ -296,6 +297,25 @@ cl_int GenEnqueueMapBuffer(cl_command_queue queue, cl_mem mem, void** ret_addr,
       gpuQueue->setEventStatus(event_ret, CL_COMPLETE);
     }
     return CL_SUCCESS;
+  } else if (event_list == NULL) {
+    /* We do not have any events to wait, map it in sync mode. */
+    retAddr = genDoMapBuffer(genMem, mem, flags, offset, size);
+    if (retAddr == NULL) {
+      if (event_ret) {
+        gpuQueue->setEventStatus(event_ret, -1); // Set error for that event.
+      }
+      return CL_MAP_FAILURE;
+    }
+
+    if (ret_addr)
+      *ret_addr = retAddr;
+
+    if (event_ret) {
+      gpuQueue->setEventStatus(event_ret, CL_COMPLETE);
+    }
+    return CL_SUCCESS;
+  } else {
+    GBE_ASSERT(num_events > 0);
   }
 
   // Never come to here.