clover: Wait for requested operation if blocking flag is set

v2: wait in map_buffer and map_image as well
v3: use event::wait instead of wait (skips fence wait for hard_event)
v4: use wait_signalled()

Signed-off-by: Jan Vesely <jan.vesely@rutgers.edu>
Reviewed-by: Francisco Jerez <currojerez@riseup.net>
Reviewed-by: Aaron Watry <awatry@gmail.com>
This commit is contained in:
Jan Vesely 2017-08-02 17:04:24 -04:00
parent bc4000ee40
commit 3a5b69c09b
1 changed files with 28 additions and 2 deletions

View File

@ -295,6 +295,9 @@ clEnqueueReadBuffer(cl_command_queue d_q, cl_mem d_mem, cl_bool blocking,
&mem, obj_origin, obj_pitch,
region));
if (blocking)
hev().wait_signalled();
ret_object(rd_ev, hev);
return CL_SUCCESS;
@ -325,6 +328,9 @@ clEnqueueWriteBuffer(cl_command_queue d_q, cl_mem d_mem, cl_bool blocking,
ptr, {}, obj_pitch,
region));
if (blocking)
hev().wait_signalled();
ret_object(rd_ev, hev);
return CL_SUCCESS;
@ -362,6 +368,9 @@ clEnqueueReadBufferRect(cl_command_queue d_q, cl_mem d_mem, cl_bool blocking,
&mem, obj_origin, obj_pitch,
region));
if (blocking)
hev().wait_signalled();
ret_object(rd_ev, hev);
return CL_SUCCESS;
@ -399,6 +408,9 @@ clEnqueueWriteBufferRect(cl_command_queue d_q, cl_mem d_mem, cl_bool blocking,
ptr, host_origin, host_pitch,
region));
if (blocking)
hev().wait_signalled();
ret_object(rd_ev, hev);
return CL_SUCCESS;
@ -504,6 +516,9 @@ clEnqueueReadImage(cl_command_queue d_q, cl_mem d_mem, cl_bool blocking,
&img, src_origin, src_pitch,
region));
if (blocking)
hev().wait_signalled();
ret_object(rd_ev, hev);
return CL_SUCCESS;
@ -538,6 +553,9 @@ clEnqueueWriteImage(cl_command_queue d_q, cl_mem d_mem, cl_bool blocking,
ptr, {}, src_pitch,
region));
if (blocking)
hev().wait_signalled();
ret_object(rd_ev, hev);
return CL_SUCCESS;
@ -667,7 +685,11 @@ clEnqueueMapBuffer(cl_command_queue d_q, cl_mem d_mem, cl_bool blocking,
void *map = mem.resource(q).add_map(q, flags, blocking, obj_origin, region);
ret_object(rd_ev, create<hard_event>(q, CL_COMMAND_MAP_BUFFER, deps));
auto hev = create<hard_event>(q, CL_COMMAND_MAP_BUFFER, deps);
if (blocking)
hev().wait_signalled();
ret_object(rd_ev, hev);
ret_error(r_errcode, CL_SUCCESS);
return map;
@ -695,7 +717,11 @@ clEnqueueMapImage(cl_command_queue d_q, cl_mem d_mem, cl_bool blocking,
void *map = img.resource(q).add_map(q, flags, blocking, origin, region);
ret_object(rd_ev, create<hard_event>(q, CL_COMMAND_MAP_IMAGE, deps));
auto hev = create<hard_event>(q, CL_COMMAND_MAP_IMAGE, deps);
if (blocking)
hev().wait_signalled();
ret_object(rd_ev, hev);
ret_error(r_errcode, CL_SUCCESS);
return map;