From: Yan Wang <[email protected]> It will fail to copy data from TILE_Y large image to buffer by memcpy. Use clEnqueueCopyImageToBuffer to do this.
Signed-off-by: Yan Wang <[email protected]> --- src/cl_api_mem.c | 88 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 88 insertions(+) diff --git a/src/cl_api_mem.c b/src/cl_api_mem.c index 0d19bf8..7c6699d 100644 --- a/src/cl_api_mem.c +++ b/src/cl_api_mem.c @@ -341,6 +341,26 @@ clEnqueueMapBuffer(cl_command_queue command_queue, return mem_ptr; } +static cl_int +clEnqueueUnmapMemObjectForKernel(cl_command_queue command_queue, + cl_mem memobj, + void *mapped_ptr, + cl_uint num_events_in_wait_list, + const cl_event *event_wait_list, + cl_event *event) +{ + if (!memobj->tmp_ker_buf) + return CL_INVALID_MEM_OBJECT; + + cl_int err = clEnqueueUnmapMemObject(command_queue, memobj->tmp_ker_buf, mapped_ptr, + num_events_in_wait_list, event_wait_list, event); + + clReleaseMemObject(memobj->tmp_ker_buf); + memobj->tmp_ker_buf = NULL; + + return err; +} + cl_int clEnqueueUnmapMemObject(cl_command_queue command_queue, cl_mem memobj, @@ -370,6 +390,11 @@ clEnqueueUnmapMemObject(cl_command_queue command_queue, break; } + if (memobj->is_ker_copy) { + return clEnqueueUnmapMemObjectForKernel(command_queue, memobj, mapped_ptr, + num_events_in_wait_list, event_wait_list, event); + } + err = cl_event_check_waitlist(num_events_in_wait_list, event_wait_list, event, command_queue->ctx); if (err != CL_SUCCESS) { @@ -1457,6 +1482,63 @@ check_image_origin(struct _cl_mem_image *image, const size_t *porigin, size_t *o return CL_SUCCESS; } +static void * +clEnqueueMapImageByKernel(cl_command_queue command_queue, + cl_mem mem, + cl_bool blocking_map, + cl_map_flags map_flags, + const size_t *porigin, + const size_t *pregion, + size_t *image_row_pitch, + size_t *image_slice_pitch, + cl_uint num_events_in_wait_list, + const cl_event *event_wait_list, + cl_event *event, + cl_int *errcode_ret) +{ + cl_int err = CL_SUCCESS; + struct _cl_mem_image *image = NULL; + size_t region[3]; + size_t origin[3]; + + image = cl_mem_image(mem); + + err = check_image_region(image, pregion, region); + if (err != CL_SUCCESS) { + *errcode_ret = err; + return NULL; + } + + err = check_image_origin(image, porigin, origin); + if (err != CL_SUCCESS) { + *errcode_ret = err; + return NULL; + } + + if (mem->tmp_ker_buf) + clReleaseMemObject(mem->tmp_ker_buf); + + mem->tmp_ker_buf = + clCreateBuffer(command_queue->ctx, CL_MEM_ALLOC_HOST_PTR, mem->size, NULL, &err); + if (mem->tmp_ker_buf == NULL || err != CL_SUCCESS) { + mem->tmp_ker_buf = NULL; + *errcode_ret = err; + return NULL; + } + + err = clEnqueueCopyImageToBuffer(command_queue, mem, mem->tmp_ker_buf, origin, region, + 0, 0, NULL, NULL); + if (err != CL_SUCCESS) { + clReleaseMemObject(mem->tmp_ker_buf); + mem->tmp_ker_buf = NULL; + *errcode_ret = err; + return NULL; + } + + return clEnqueueMapBuffer(command_queue, mem->tmp_ker_buf, blocking_map, map_flags, 0, mem->size, + num_events_in_wait_list, event_wait_list, event, errcode_ret); +} + void * clEnqueueMapImage(cl_command_queue command_queue, cl_mem mem, @@ -1530,6 +1612,12 @@ clEnqueueMapImage(cl_command_queue command_queue, break; } + if (mem->is_ker_copy) { + return clEnqueueMapImageByKernel(command_queue, mem, map_flags, blocking_map, origin, region, + image_row_pitch, image_slice_pitch, num_events_in_wait_list, event_wait_list, + event, errcode_ret); + } + err = cl_event_check_waitlist(num_events_in_wait_list, event_wait_list, event, command_queue->ctx); if (err != CL_SUCCESS) { -- 2.7.4 _______________________________________________ Beignet mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/beignet
