--- OpenCL/OpenCL.xs 2012/04/30 09:38:53 1.60 +++ OpenCL/OpenCL.xs 2012/05/01 22:25:13 1.63 @@ -59,8 +59,34 @@ typedef cl_event OpenCL__Event; typedef cl_event OpenCL__UserEvent; +typedef struct mapped * OpenCL__Mapped; + typedef SV *FUTURE; +static HV + *stash_platform, + *stash_device, + *stash_context, + *stash_queue, + *stash_program, + *stash_kernel, + *stash_sampler, + *stash_event, + *stash_userevent, + *stash_memory, + *stash_buffer, + *stash_bufferobj, + *stash_image, + *stash_image1d, + *stash_image1darray, + *stash_image1dbuffer, + *stash_image2d, + *stash_image2darray, + *stash_image3d, + *stash_mapped, + *stash_mappedbuffer, + *stash_mappedimage; + /*****************************************************************************/ // name must include a leading underscore @@ -262,9 +288,14 @@ /*****************************************************************************/ -#define NEW_CLOBJ(class,ptr) sv_setref_pv (sv_newmortal (), class, ptr) -#define PUSH_CLOBJ(class,ptr) PUSHs (NEW_CLOBJ (class, ptr)) -#define XPUSH_CLOBJ(class,ptr) XPUSHs (NEW_CLOBJ (class, ptr)) +static SV * +new_clobj (HV *stash, IV id) +{ + return sv_2mortal (sv_bless (newRV_noinc (newSViv (id)), stash)); +} + +#define PUSH_CLOBJ(stash,id) PUSHs (new_clobj ((stash), (IV)(id))) +#define XPUSH_CLOBJ(stash,id) XPUSHs (new_clobj ((stash), (IV)(id))) /* cl objects are either \$iv, or [$iv, ...] */ /* they can be upgraded at runtime to the array form */ @@ -418,7 +449,7 @@ static SV * new_clobj_context (cl_context ctx, void *user_data) { - SV *sv = NEW_CLOBJ ("OpenCL::Context", ctx); + SV *sv = new_clobj (stash_context, (IV)ctx); if (user_data) sv_magicext (SvRV (sv), user_data, PERL_MAGIC_ext, 0, 0, 0); @@ -435,7 +466,7 @@ eq_program_push (void *data1, void *data2, void *data3) { dSP; - PUSH_CLOBJ ("OpenCL::Program", data1); + PUSH_CLOBJ (stash_program, data1); PUTBACK; } @@ -492,7 +523,7 @@ eq_event_push (void *data1, void *data2, void *data3) { dSP; - PUSH_CLOBJ ("OpenCL::Event", data1); + PUSH_CLOBJ (stash_event, data1); PUSHs (sv_2mortal (newSViv ((IV)data2))); PUTBACK; } @@ -507,6 +538,7 @@ } /*****************************************************************************/ +/* utilities for XS code */ static size_t img_row_pitch (cl_mem img) @@ -517,32 +549,34 @@ } static cl_event * -event_list (SV **items, cl_uint *rcount) +event_list (SV **items, cl_uint *rcount, cl_event extra) { cl_uint count = *rcount; - if (!count) + if (count > 0x7fffffff) // yeha, it's a hack - the caller might have underflowed + count = 0; + + if (!count && !extra) return 0; - cl_event *list = tmpbuf (sizeof (cl_event) * count); + cl_event *list = tmpbuf (sizeof (cl_event) * (count + 1)); int i = 0; - do - { - --count; - if (SvOK (items [count])) - list [i++] = SvCLOBJ ("clEnqueue", "wait_events", items [count], "OpenCL::Event"); - } - while (count); + while (count--) + if (SvOK (items [count])) + list [i++] = SvCLOBJ ("clEnqueue", "wait_events", items [count], "OpenCL::Event"); + + if (extra) + list [i++] = extra; *rcount = i; return i ? list : 0; } -#define EVENT_LIST(items,count) \ - cl_uint event_list_count = (count); \ - cl_event *event_list_ptr = event_list (&ST (items), &event_list_count) +#define EVENT_LIST(skip) \ + cl_uint event_list_count = items - (skip); \ + cl_event *event_list_ptr = event_list (&ST (skip), &event_list_count, 0) #define INFO(class) \ { \ @@ -556,6 +590,99 @@ XPUSHs (sv); \ } +/*****************************************************************************/ +/* mapped_xxx */ + +static OpenCL__Mapped +SvMAPPED (SV *sv) +{ + // no typechecking atm., keep your fingers crossed + return (OpenCL__Mapped)SvMAGIC (SvRV (sv))->mg_ptr; +} + +struct mapped +{ + cl_command_queue queue; + cl_mem memobj; + void *ptr; + size_t cb; + cl_event event; + size_t row_pitch; + size_t slice_pitch; +}; + +static SV * +mapped_new (HV *stash, cl_command_queue queue, cl_mem memobj, cl_map_flags flags, void *ptr, size_t cb, cl_event ev, size_t row_pitch, size_t slice_pitch) +{ + SV *data = newSV (0); + SvUPGRADE (data, SVt_PVMG); + + OpenCL__Mapped mapped; + New (0, mapped, 1, struct mapped); + + clRetainCommandQueue (queue); + + mapped->queue = queue; + mapped->memobj = memobj; + mapped->ptr = ptr; + mapped->cb = cb; + mapped->event = ev; + mapped->row_pitch = row_pitch; + mapped->slice_pitch = slice_pitch; + + sv_magicext (data, 0, PERL_MAGIC_ext, 0, (char *)mapped, 0); + + if (SvLEN (data)) + Safefree (data); + + SvPVX (data) = (char *)ptr; + SvCUR_set (data, cb); + SvLEN_set (data, 0); + SvPOK_only (data); + + SV *obj = sv_2mortal (sv_bless (newRV_noinc (data), stash)); + + if (!(flags & CL_MAP_WRITE)) + SvREADONLY_on (data); + + return obj; +} + +static void +mapped_detach (SV *sv, OpenCL__Mapped mapped) +{ + SV *data = SvRV (sv); + + // the next check checks both before AND after detach, where SvPVX should STILL be 0 + if (SvPVX (data) != (char *)mapped->ptr) + warn ("FATAL: OpenCL memory mapped scalar changed location, detected"); + else + { + SvREADONLY_off (data); + SvCUR_set (data, 0); + SvPVX (data) = 0; + SvOK_off (data); + } + + mapped->ptr = 0; +} + +static void +mapped_unmap (SV *self, OpenCL__Mapped mapped, cl_command_queue queue, SV **wait_list, cl_uint event_list_count) +{ + cl_event *event_list_ptr = event_list (wait_list, &event_list_count, mapped->event); + cl_event ev; + + NEED_SUCCESS (EnqueueUnmapMemObject, (queue, mapped->memobj, mapped->ptr, event_list_count, event_list_ptr, &ev)); + + clReleaseEvent (mapped->event); + mapped->event = ev; + + mapped_detach (self, mapped); +} + +/*****************************************************************************/ + MODULE = OpenCL PACKAGE = OpenCL PROTOTYPES: ENABLE @@ -592,6 +719,29 @@ for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ > const_iv; civ--) newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv)); + stash_platform = gv_stashpv ("OpenCL::Platform", GV_ADD); + stash_device = gv_stashpv ("OpenCL::Device", GV_ADD); + stash_context = gv_stashpv ("OpenCL::Context", GV_ADD); + stash_queue = gv_stashpv ("OpenCL::Queue", GV_ADD); + stash_program = gv_stashpv ("OpenCL::Program", GV_ADD); + stash_kernel = gv_stashpv ("OpenCL::Kernel", GV_ADD); + stash_sampler = gv_stashpv ("OpenCL::Sampler", GV_ADD); + stash_event = gv_stashpv ("OpenCL::Event", GV_ADD); + stash_userevent = gv_stashpv ("OpenCL::UserEvent", GV_ADD); + stash_memory = gv_stashpv ("OpenCL::Memory", GV_ADD); + stash_buffer = gv_stashpv ("OpenCL::Buffer", GV_ADD); + stash_bufferobj = gv_stashpv ("OpenCL::BufferObj", GV_ADD); + stash_image = gv_stashpv ("OpenCL::Image", GV_ADD); + stash_image1d = gv_stashpv ("OpenCL::Image1D", GV_ADD); + stash_image1darray = gv_stashpv ("OpenCL::Image1DArray", GV_ADD); + stash_image1dbuffer = gv_stashpv ("OpenCL::Image1DBuffer", GV_ADD); + stash_image2d = gv_stashpv ("OpenCL::Image2D", GV_ADD); + stash_image2darray = gv_stashpv ("OpenCL::Image2DArray", GV_ADD); + stash_image3d = gv_stashpv ("OpenCL::Image3D", GV_ADD); + stash_mapped = gv_stashpv ("OpenCL::Mapped", GV_ADD); + stash_mappedbuffer = gv_stashpv ("OpenCL::MappedBuffer", GV_ADD); + stash_mappedimage = gv_stashpv ("OpenCL::MappedImage", GV_ADD); + sv_setiv (perl_get_sv ("OpenCL::POLL_FUNC", TRUE), (IV)eq_poll_interrupt); } @@ -621,7 +771,7 @@ EXTEND (SP, count); for (i = 0; i < count; ++i) - PUSH_CLOBJ ("OpenCL::Platform", list [i]); + PUSH_CLOBJ (stash_platform, (IV)list [i]); void context_from_type (cl_context_properties *properties = 0, cl_device_type type = CL_DEVICE_TYPE_DEFAULT, SV *notify = &PL_sv_undef) @@ -638,7 +788,7 @@ void wait_for_events (...) CODE: - EVENT_LIST (0, items); + EVENT_LIST (0); NEED_SUCCESS (WaitForEvents, (event_list_count, event_list_ptr)); PROTOTYPES: DISABLE @@ -691,7 +841,7 @@ EXTEND (SP, count); for (i = 0; i < count; ++i) - PUSHs (sv_setref_pv (sv_newmortal (), "OpenCL::Device", list [i])); + PUSH_CLOBJ (stash_device, list [i]); void context (OpenCL::Platform self, cl_context_properties *properties, SV *devices, SV *notify = &PL_sv_undef) @@ -737,7 +887,7 @@ NEED_SUCCESS (GetDeviceInfo, (self, CL_DEVICE_TYPE, sizeof (value), value, 0)); EXTEND (SP, 1); const int i = 0; - PUSHs (sv_2mortal (newSViv (value [i]))); + PUSHs (sv_2mortal (newSVuv (value [i]))); void vendor_id (OpenCL::Device self) @@ -892,7 +1042,7 @@ NEED_SUCCESS (GetDeviceInfo, (self, CL_DEVICE_QUEUE_PROPERTIES, sizeof (value), value, 0)); EXTEND (SP, 1); const int i = 0; - PUSHs (sv_2mortal (newSViv (value [i]))); + PUSHs (sv_2mortal (newSVuv (value [i]))); void platform (OpenCL::Device self) @@ -902,7 +1052,7 @@ EXTEND (SP, 1); const int i = 0; { - PUSH_CLOBJ ("OpenCL::Platform", value [i]); + PUSH_CLOBJ (stash_platform, value [i]); } void @@ -931,7 +1081,7 @@ EXTEND (SP, 1); const int i = 0; { - PUSH_CLOBJ ("OpenCL::Device", value [i]); + PUSH_CLOBJ (stash_device, value [i]); } void @@ -968,13 +1118,13 @@ queue (OpenCL::Context self, OpenCL::Device device, cl_command_queue_properties properties = 0) PPCODE: NEED_SUCCESS_ARG (cl_command_queue queue, CreateCommandQueue, (self, device, properties, &res)); - XPUSH_CLOBJ ("OpenCL::Queue", queue); + XPUSH_CLOBJ (stash_queue, queue); void user_event (OpenCL::Context self) PPCODE: NEED_SUCCESS_ARG (cl_event ev, CreateUserEvent, (self, &res)); - XPUSH_CLOBJ ("OpenCL::UserEvent", ev); + XPUSH_CLOBJ (stash_userevent, ev); void buffer (OpenCL::Context self, cl_mem_flags flags, size_t len) @@ -983,7 +1133,7 @@ croak ("OpenCL::Context::buffer: cannot use/copy host ptr when no data is given, use $context->buffer_sv instead?"); NEED_SUCCESS_ARG (cl_mem mem, CreateBuffer, (self, flags, len, 0, &res)); - XPUSH_CLOBJ ("OpenCL::BufferObj", mem); + XPUSH_CLOBJ (stash_bufferobj, mem); void buffer_sv (OpenCL::Context self, cl_mem_flags flags, SV *data) @@ -993,7 +1143,7 @@ if (!(flags & (CL_MEM_USE_HOST_PTR | CL_MEM_COPY_HOST_PTR))) croak ("OpenCL::Context::buffer_sv: you have to specify use or copy host ptr when buffer data is given, use $context->buffer instead?"); NEED_SUCCESS_ARG (cl_mem mem, CreateBuffer, (self, flags, len, ptr, &res)); - XPUSH_CLOBJ ("OpenCL::BufferObj", mem); + XPUSH_CLOBJ (stash_bufferobj, mem); #if CL_VERSION_1_2 @@ -1011,17 +1161,17 @@ type == CL_MEM_OBJECT_IMAGE1D_BUFFER ? (cl_mem)SvCLOBJ ("OpenCL::Context::Image", "data", data, "OpenCL::Buffer") : 0 }; NEED_SUCCESS_ARG (cl_mem mem, CreateImage, (self, flags, &format, &desc, ptr, &res)); - char *klass = "OpenCL::Image"; + HV *stash = stash_image; switch (type) { - case CL_MEM_OBJECT_IMAGE1D_BUFFER: klass = "OpenCL::Image1DBuffer"; break; - case CL_MEM_OBJECT_IMAGE1D: klass = "OpenCL::Image1D"; break; - case CL_MEM_OBJECT_IMAGE1D_ARRAY: klass = "OpenCL::Image2DArray"; break; - case CL_MEM_OBJECT_IMAGE2D: klass = "OpenCL::Image2D"; break; - case CL_MEM_OBJECT_IMAGE2D_ARRAY: klass = "OpenCL::Image2DArray"; break; - case CL_MEM_OBJECT_IMAGE3D: klass = "OpenCL::Image3D"; break; + case CL_MEM_OBJECT_IMAGE1D_BUFFER: stash = stash_image1dbuffer; break; + case CL_MEM_OBJECT_IMAGE1D: stash = stash_image1d; break; + case CL_MEM_OBJECT_IMAGE1D_ARRAY: stash = stash_image2darray; break; + case CL_MEM_OBJECT_IMAGE2D: stash = stash_image2d; break; + case CL_MEM_OBJECT_IMAGE2D_ARRAY: stash = stash_image2darray; break; + case CL_MEM_OBJECT_IMAGE3D: stash = stash_image3d; break; } - XPUSH_CLOBJ (klass, mem); + XPUSH_CLOBJ (stash, mem); #endif @@ -1037,7 +1187,7 @@ const cl_image_desc desc = { CL_MEM_OBJECT_IMAGE2D, width, height, 0, 0, row_pitch, 0, 0, 0, 0 }; NEED_SUCCESS_ARG (cl_mem mem, CreateImage, (self, flags, &format, &desc, ptr, &res)); #endif - XPUSH_CLOBJ ("OpenCL::Image2D", mem); + XPUSH_CLOBJ (stash_image2d, mem); void image3d (OpenCL::Context self, cl_mem_flags flags, cl_channel_order channel_order, cl_channel_type channel_type, size_t width, size_t height, size_t depth, size_t row_pitch = 0, size_t slice_pitch = 0, SV *data = &PL_sv_undef) @@ -1051,7 +1201,7 @@ const cl_image_desc desc = { CL_MEM_OBJECT_IMAGE3D, width, height, depth, 0, row_pitch, slice_pitch, 0, 0, 0 }; NEED_SUCCESS_ARG (cl_mem mem, CreateImage, (self, flags, &format, &desc, ptr, &res)); #endif - XPUSH_CLOBJ ("OpenCL::Image3D", mem); + XPUSH_CLOBJ (stash_image3d, mem); #if cl_apple_gl_sharing || cl_khr_gl_sharing @@ -1059,13 +1209,13 @@ gl_buffer (OpenCL::Context self, cl_mem_flags flags, cl_GLuint bufobj) PPCODE: NEED_SUCCESS_ARG (cl_mem mem, CreateFromGLBuffer, (self, flags, bufobj, &res)); - XPUSH_CLOBJ ("OpenCL::BufferObj", mem); + XPUSH_CLOBJ (stash_bufferobj, mem); void gl_renderbuffer (OpenCL::Context self, cl_mem_flags flags, cl_GLuint renderbuffer) PPCODE: NEED_SUCCESS_ARG (cl_mem mem, CreateFromGLRenderbuffer, (self, flags, renderbuffer, &res)); - XPUSH_CLOBJ ("OpenCL::Image2D", mem); + XPUSH_CLOBJ (stash_image2d, mem); #if CL_VERSION_1_2 @@ -1076,17 +1226,17 @@ NEED_SUCCESS_ARG (cl_mem mem, CreateFromGLTexture, (self, flags, target, miplevel, texture, &res)); cl_gl_object_type type; NEED_SUCCESS (GetGLObjectInfo, (mem, &type, 0)); // TODO: use target instead? - char *klass = "OpenCL::Memory"; + HV *stash = stash_memory; switch (type) { - case CL_GL_OBJECT_TEXTURE_BUFFER: klass = "OpenCL::Image1DBuffer"; break; - case CL_GL_OBJECT_TEXTURE1D: klass = "OpenCL::Image1D"; break; - case CL_GL_OBJECT_TEXTURE1D_ARRAY: klass = "OpenCL::Image2DArray"; break; - case CL_GL_OBJECT_TEXTURE2D: klass = "OpenCL::Image2D"; break; - case CL_GL_OBJECT_TEXTURE2D_ARRAY: klass = "OpenCL::Image2DArray"; break; - case CL_GL_OBJECT_TEXTURE3D: klass = "OpenCL::Image3D"; break; + case CL_GL_OBJECT_TEXTURE_BUFFER: stash = stash_image1dbuffer; break; + case CL_GL_OBJECT_TEXTURE1D: stash = stash_image1d; break; + case CL_GL_OBJECT_TEXTURE1D_ARRAY: stash = stash_image2darray; break; + case CL_GL_OBJECT_TEXTURE2D: stash = stash_image2d; break; + case CL_GL_OBJECT_TEXTURE2D_ARRAY: stash = stash_image2darray; break; + case CL_GL_OBJECT_TEXTURE3D: stash = stash_image3d; break; } - XPUSH_CLOBJ (klass, mem); + XPUSH_CLOBJ (stash, mem); #endif @@ -1098,7 +1248,7 @@ #else NEED_SUCCESS_ARG (cl_mem mem, CreateFromGLTexture , (self, flags, target, miplevel, texture, &res)); #endif - XPUSH_CLOBJ ("OpenCL::Image2D", mem); + XPUSH_CLOBJ (stash_image2d, mem); void gl_texture3d (OpenCL::Context self, cl_mem_flags flags, cl_GLenum target, cl_GLint miplevel, cl_GLuint texture) @@ -1108,7 +1258,7 @@ #else NEED_SUCCESS_ARG (cl_mem mem, CreateFromGLTexture , (self, flags, target, miplevel, texture, &res)); #endif - XPUSH_CLOBJ ("OpenCL::Image3D", mem); + XPUSH_CLOBJ (stash_image3d, mem); #endif @@ -1138,7 +1288,7 @@ sampler (OpenCL::Context self, cl_bool normalized_coords, cl_addressing_mode addressing_mode, cl_filter_mode filter_mode) PPCODE: NEED_SUCCESS_ARG (cl_sampler sampler, CreateSampler, (self, normalized_coords, addressing_mode, filter_mode, &res)); - XPUSH_CLOBJ ("OpenCL::Sampler", sampler); + XPUSH_CLOBJ (stash_sampler, sampler); void program_with_source (OpenCL::Context self, SV *program) @@ -1149,7 +1299,7 @@ len2 = len; NEED_SUCCESS_ARG (cl_program prog, CreateProgramWithSource, (self, 1, &ptr, &len2, &res)); - XPUSH_CLOBJ ("OpenCL::Program", prog); + XPUSH_CLOBJ (stash_program, prog); #BEGIN:context @@ -1176,7 +1326,7 @@ EXTEND (SP, n); for (i = 0; i < n; ++i) { - PUSH_CLOBJ ("OpenCL::Device", value [i]); + PUSH_CLOBJ (stash_device, value [i]); } void @@ -1206,7 +1356,7 @@ enqueue_read_buffer = 0 PPCODE: cl_event ev = 0; - EVENT_LIST (6, items - 6); + EVENT_LIST (6); SvUPGRADE (data, SVt_PV); SvGROW (data, len); @@ -1215,7 +1365,7 @@ NEED_SUCCESS (EnqueueReadBuffer, (self, mem, blocking, offset, len, SvPVX (data), event_list_count, event_list_ptr, GIMME_V != G_VOID ? &ev : 0)); if (ev) - XPUSH_CLOBJ ("OpenCL::Event", ev); + XPUSH_CLOBJ (stash_event, ev); void write_buffer (OpenCL::Queue self, OpenCL::Buffer mem, cl_bool blocking, size_t offset, SV *data, ...) @@ -1225,12 +1375,12 @@ cl_event ev = 0; STRLEN len; char *ptr = SvPVbyte (data, len); - EVENT_LIST (5, items - 5); + EVENT_LIST (5); NEED_SUCCESS (EnqueueWriteBuffer, (self, mem, blocking, offset, len, ptr, event_list_count, event_list_ptr, GIMME_V != G_VOID ? &ev : 0)); if (ev) - XPUSH_CLOBJ ("OpenCL::Event", ev); + XPUSH_CLOBJ (stash_event, ev); #if CL_VERSION_1_2 @@ -1242,12 +1392,12 @@ cl_event ev = 0; STRLEN len; char *ptr = SvPVbyte (data, len); - EVENT_LIST (5, items - 5); + EVENT_LIST (5); NEED_SUCCESS (EnqueueFillBuffer, (self, mem, ptr, len, offset, size, event_list_count, event_list_ptr, GIMME_V != G_VOID ? &ev : 0)); if (ev) - XPUSH_CLOBJ ("OpenCL::Event", ev); + XPUSH_CLOBJ (stash_event, ev); void fill_image (OpenCL::Queue self, OpenCL::Image img, NV r, NV g, NV b, NV a, size_t x, size_t y, size_t z, size_t width, size_t height, size_t depth, ...) @@ -1258,7 +1408,7 @@ STRLEN len; const size_t origin [3] = { x, y, z }; const size_t region [3] = { width, height, depth }; - EVENT_LIST (12, items - 12); + EVENT_LIST (12); const cl_float c_f [4] = { r, g, b, a }; const cl_uint c_u [4] = { r, g, b, a }; @@ -1275,7 +1425,7 @@ origin, region, event_list_count, event_list_ptr, GIMME_V != G_VOID ? &ev : 0)); if (ev) - XPUSH_CLOBJ ("OpenCL::Event", ev); + XPUSH_CLOBJ (stash_event, ev); #endif @@ -1285,12 +1435,12 @@ enqueue_copy_buffer = 0 PPCODE: cl_event ev = 0; - EVENT_LIST (6, items - 6); + EVENT_LIST (6); NEED_SUCCESS (EnqueueCopyBuffer, (self, src, dst, src_offset, dst_offset, len, event_list_count, event_list_ptr, GIMME_V != G_VOID ? &ev : 0)); if (ev) - XPUSH_CLOBJ ("OpenCL::Event", ev); + XPUSH_CLOBJ (stash_event, ev); void read_buffer_rect (OpenCL::Queue self, OpenCL::Memory buf, cl_bool blocking, size_t buf_x, size_t buf_y, size_t buf_z, size_t host_x, size_t host_y, size_t host_z, size_t width, size_t height, size_t depth, size_t buf_row_pitch, size_t buf_slice_pitch, size_t host_row_pitch, size_t host_slice_pitch, SV *data, ...) @@ -1301,7 +1451,7 @@ const size_t buf_origin [3] = { buf_x , buf_y , buf_z }; const size_t host_origin[3] = { host_x, host_y, host_z }; const size_t region[3] = { width, height, depth }; - EVENT_LIST (17, items - 17); + EVENT_LIST (17); if (!buf_row_pitch) buf_row_pitch = region [0]; @@ -1324,7 +1474,7 @@ NEED_SUCCESS (EnqueueReadBufferRect, (self, buf, blocking, buf_origin, host_origin, region, buf_row_pitch, buf_slice_pitch, host_row_pitch, host_slice_pitch, SvPVX (data), event_list_count, event_list_ptr, GIMME_V != G_VOID ? &ev : 0)); if (ev) - XPUSH_CLOBJ ("OpenCL::Event", ev); + XPUSH_CLOBJ (stash_event, ev); void write_buffer_rect (OpenCL::Queue self, OpenCL::Memory buf, cl_bool blocking, size_t buf_x, size_t buf_y, size_t buf_z, size_t host_x, size_t host_y, size_t host_z, size_t width, size_t height, size_t depth, size_t buf_row_pitch, size_t buf_slice_pitch, size_t host_row_pitch, size_t host_slice_pitch, SV *data, ...) @@ -1337,7 +1487,7 @@ const size_t region[3] = { width, height, depth }; STRLEN len; char *ptr = SvPVbyte (data, len); - EVENT_LIST (17, items - 17); + EVENT_LIST (17); if (!buf_row_pitch) buf_row_pitch = region [0]; @@ -1359,7 +1509,7 @@ NEED_SUCCESS (EnqueueWriteBufferRect, (self, buf, blocking, buf_origin, host_origin, region, buf_row_pitch, buf_slice_pitch, host_row_pitch, host_slice_pitch, ptr, event_list_count, event_list_ptr, GIMME_V != G_VOID ? &ev : 0)); if (ev) - XPUSH_CLOBJ ("OpenCL::Event", ev); + XPUSH_CLOBJ (stash_event, ev); void copy_buffer_rect (OpenCL::Queue self, OpenCL::Buffer src, OpenCL::Buffer dst, size_t src_x, size_t src_y, size_t src_z, size_t dst_x, size_t dst_y, size_t dst_z, size_t width, size_t height, size_t depth, size_t src_row_pitch, size_t src_slice_pitch, size_t dst_row_pitch, size_t dst_slice_pitch, ...) @@ -1370,12 +1520,12 @@ const size_t src_origin[3] = { src_x, src_y, src_z }; const size_t dst_origin[3] = { dst_x, dst_y, dst_z }; const size_t region[3] = { width, height, depth }; - EVENT_LIST (16, items - 16); + EVENT_LIST (16); NEED_SUCCESS (EnqueueCopyBufferRect, (self, src, dst, src_origin, dst_origin, region, src_row_pitch, src_slice_pitch, dst_row_pitch, dst_slice_pitch, event_list_count, event_list_ptr, GIMME_V != G_VOID ? &ev : 0)); if (ev) - XPUSH_CLOBJ ("OpenCL::Event", ev); + XPUSH_CLOBJ (stash_event, ev); void read_image (OpenCL::Queue self, OpenCL::Image src, cl_bool blocking, size_t src_x, size_t src_y, size_t src_z, size_t width, size_t height, size_t depth, size_t row_pitch, size_t slice_pitch, SV *data, ...) @@ -1385,7 +1535,7 @@ cl_event ev = 0; const size_t src_origin[3] = { src_x, src_y, src_z }; const size_t region[3] = { width, height, depth }; - EVENT_LIST (12, items - 12); + EVENT_LIST (12); if (!row_pitch) row_pitch = img_row_pitch (src); @@ -1402,7 +1552,7 @@ NEED_SUCCESS (EnqueueReadImage, (self, src, blocking, src_origin, region, row_pitch, slice_pitch, SvPVX (data), event_list_count, event_list_ptr, GIMME_V != G_VOID ? &ev : 0)); if (ev) - XPUSH_CLOBJ ("OpenCL::Event", ev); + XPUSH_CLOBJ (stash_event, ev); void write_image (OpenCL::Queue self, OpenCL::Image dst, cl_bool blocking, size_t dst_x, size_t dst_y, size_t dst_z, size_t width, size_t height, size_t depth, size_t row_pitch, size_t slice_pitch, SV *data, ...) @@ -1414,7 +1564,7 @@ const size_t region[3] = { width, height, depth }; STRLEN len; char *ptr = SvPVbyte (data, len); - EVENT_LIST (12, items - 12); + EVENT_LIST (12); if (!row_pitch) row_pitch = img_row_pitch (dst); @@ -1430,7 +1580,7 @@ NEED_SUCCESS (EnqueueWriteImage, (self, dst, blocking, dst_origin, region, row_pitch, slice_pitch, ptr, event_list_count, event_list_ptr, GIMME_V != G_VOID ? &ev : 0)); if (ev) - XPUSH_CLOBJ ("OpenCL::Event", ev); + XPUSH_CLOBJ (stash_event, ev); void copy_image (OpenCL::Queue self, OpenCL::Image src, OpenCL::Image dst, size_t src_x, size_t src_y, size_t src_z, size_t dst_x, size_t dst_y, size_t dst_z, size_t width, size_t height, size_t depth, ...) @@ -1441,12 +1591,12 @@ const size_t src_origin[3] = { src_x, src_y, src_z }; const size_t dst_origin[3] = { dst_x, dst_y, dst_z }; const size_t region[3] = { width, height, depth }; - EVENT_LIST (12, items - 12); + EVENT_LIST (12); NEED_SUCCESS (EnqueueCopyImage, (self, src, dst, src_origin, dst_origin, region, event_list_count, event_list_ptr, GIMME_V != G_VOID ? &ev : 0)); if (ev) - XPUSH_CLOBJ ("OpenCL::Event", ev); + XPUSH_CLOBJ (stash_event, ev); void copy_image_to_buffer (OpenCL::Queue self, OpenCL::Image src, OpenCL::Buffer dst, size_t src_x, size_t src_y, size_t src_z, size_t width, size_t height, size_t depth, size_t dst_offset, ...) @@ -1454,14 +1604,14 @@ enqueue_copy_image_to_buffer = 0 PPCODE: cl_event ev = 0; - const size_t src_origin[3] = { src_x, src_y, src_z }; - const size_t region[3] = { width, height, depth }; - EVENT_LIST (10, items - 10); + const size_t src_origin[3] = { src_x, src_y, src_z }; + const size_t region [3] = { width, height, depth }; + EVENT_LIST (10); NEED_SUCCESS (EnqueueCopyImageToBuffer, (self, src, dst, src_origin, region, dst_offset, event_list_count, event_list_ptr, GIMME_V != G_VOID ? &ev : 0)); if (ev) - XPUSH_CLOBJ ("OpenCL::Event", ev); + XPUSH_CLOBJ (stash_event, ev); void copy_buffer_to_image (OpenCL::Queue self, OpenCL::Buffer src, OpenCL::Image dst, size_t src_offset, size_t dst_x, size_t dst_y, size_t dst_z, size_t width, size_t height, size_t depth, ...) @@ -1469,14 +1619,54 @@ enqueue_copy_buffer_to_image = 0 PPCODE: cl_event ev = 0; - const size_t dst_origin[3] = { dst_x, dst_y, dst_z }; - const size_t region[3] = { width, height, depth }; - EVENT_LIST (10, items - 10); + const size_t dst_origin[3] = { dst_x, dst_y, dst_z }; + const size_t region [3] = { width, height, depth }; + EVENT_LIST (10); NEED_SUCCESS (EnqueueCopyBufferToImage, (self, src, dst, src_offset, dst_origin, region, event_list_count, event_list_ptr, GIMME_V != G_VOID ? &ev : 0)); if (ev) - XPUSH_CLOBJ ("OpenCL::Event", ev); + XPUSH_CLOBJ (stash_event, ev); + +void +map_buffer (OpenCL::Queue self, OpenCL::Buffer buf, cl_bool blocking = 1, cl_map_flags map_flags = CL_MAP_READ | CL_MAP_WRITE, size_t offset = 0, size_t cb = 0, ...) + ALIAS: + enqueue_map_buffer = 0 + PPCODE: + cl_event ev; + EVENT_LIST (6); + + NEED_SUCCESS_ARG (void *ptr, EnqueueMapBuffer, (self, buf, blocking, map_flags, offset, cb, event_list_count, event_list_ptr, &ev, &res)); + XPUSHs (mapped_new (stash_mappedbuffer, self, buf, map_flags, ptr, cb, ev, 0, 0)); + +void +map_image (OpenCL::Queue self, OpenCL::Image img, cl_bool blocking = 1, cl_map_flags map_flags = CL_MAP_READ | CL_MAP_WRITE, size_t x = 0, size_t y = 0, size_t z = 0, size_t width = 0, size_t height = 0, size_t depth = 0, ...) + ALIAS: + enqueue_map_image = 0 + PPCODE: + cl_event ev; + const size_t origin[3] = { x, y, z }; + const size_t region[3] = { width, height, depth }; + size_t row_pitch, slice_pitch; + EVENT_LIST (10); + + NEED_SUCCESS_ARG (void *ptr, EnqueueMapImage, (self, img, blocking, map_flags, origin, region, &row_pitch, &slice_pitch, event_list_count, event_list_ptr, &ev, &res)); + + size_t cb = slice_pitch ? slice_pitch * region [2] + : row_pitch ? row_pitch * region [1] + : region [0]; + + XPUSHs (mapped_new (stash_mappedimage, self, img, map_flags, ptr, cb, ev, row_pitch, slice_pitch)); + +void +unmap (OpenCL::Queue self, OpenCL::Mapped mapped, ...) + PPCODE: + mapped_unmap (ST (1), mapped, self, &ST (2), items - 2); + if (GIMME_V != G_VOID) + { + clRetainEvent (mapped->event); + XPUSH_CLOBJ (stash_event, mapped->event); + } void task (OpenCL::Queue self, OpenCL::Kernel kernel, ...) @@ -1484,12 +1674,12 @@ enqueue_task = 0 PPCODE: cl_event ev = 0; - EVENT_LIST (2, items - 2); + EVENT_LIST (2); NEED_SUCCESS (EnqueueTask, (self, kernel, event_list_count, event_list_ptr, GIMME_V != G_VOID ? &ev : 0)); if (ev) - XPUSH_CLOBJ ("OpenCL::Event", ev); + XPUSH_CLOBJ (stash_event, ev); void nd_range_kernel (OpenCL::Queue self, OpenCL::Kernel kernel, SV *global_work_offset, SV *global_work_size, SV *local_work_size = &PL_sv_undef, ...) @@ -1501,7 +1691,7 @@ int gws_len; size_t *lists; int i; - EVENT_LIST (5, items - 5); + EVENT_LIST (5); if (!SvROK (global_work_size) || SvTYPE (SvRV (global_work_size)) != SVt_PVAV) croak ("clEnqueueNDRangeKernel: global_work_size must be an array reference"); @@ -1553,7 +1743,7 @@ NEED_SUCCESS (EnqueueNDRangeKernel, (self, kernel, gws_len, gwo, gws, lws, event_list_count, event_list_ptr, GIMME_V != G_VOID ? &ev : 0)); if (ev) - XPUSH_CLOBJ ("OpenCL::Event", ev); + XPUSH_CLOBJ (stash_event, ev); #if cl_apple_gl_sharing || cl_khr_gl_sharing @@ -1568,7 +1758,7 @@ croak ("OpenCL::Queue::enqueue_acquire/release_gl_objects argument 'objects' must be an arrayref with memory objects, in call"); cl_event ev = 0; - EVENT_LIST (2, items - 2); + EVENT_LIST (2); AV *av = (AV *)SvRV (objects); cl_uint num_objects = av_len (av) + 1; cl_mem *object_list = tmpbuf (sizeof (cl_mem) * num_objects); @@ -1583,7 +1773,7 @@ NEED_SUCCESS (EnqueueAcquireGLObjects, (self, num_objects, object_list, event_list_count, event_list_ptr, GIMME_V != G_VOID ? &ev : 0)); if (ev) - XPUSH_CLOBJ ("OpenCL::Event", ev); + XPUSH_CLOBJ (stash_event, ev); #endif @@ -1592,7 +1782,7 @@ ALIAS: enqueue_wait_for_events = 0 CODE: - EVENT_LIST (1, items - 1); + EVENT_LIST (1); #if PREFER_1_1 NEED_SUCCESS (EnqueueWaitForEvents, (self, event_list_count, event_list_ptr)); #else @@ -1605,7 +1795,7 @@ enqueue_marker = 0 PPCODE: cl_event ev = 0; - EVENT_LIST (1, items - 1); + EVENT_LIST (1); #if PREFER_1_1 if (!event_list_count) NEED_SUCCESS (EnqueueMarker, (self, GIMME_V != G_VOID ? &ev : 0)); @@ -1622,7 +1812,7 @@ NEED_SUCCESS (EnqueueMarkerWithWaitList, (self, event_list_count, event_list_ptr, GIMME_V != G_VOID ? &ev : 0)); #endif if (ev) - XPUSH_CLOBJ ("OpenCL::Event", ev); + XPUSH_CLOBJ (stash_event, ev); void barrier (OpenCL::Queue self, ...) @@ -1630,7 +1820,7 @@ enqueue_barrier = 0 PPCODE: cl_event ev = 0; - EVENT_LIST (1, items - 1); + EVENT_LIST (1); #if PREFER_1_1 if (!event_list_count && GIMME_V == G_VOID) NEED_SUCCESS (EnqueueBarrier, (self)); @@ -1650,7 +1840,7 @@ NEED_SUCCESS (EnqueueBarrierWithWaitList, (self, event_list_count, event_list_ptr, GIMME_V != G_VOID ? &ev : 0)); #endif if (ev) - XPUSH_CLOBJ ("OpenCL::Event", ev); + XPUSH_CLOBJ (stash_event, ev); void flush (OpenCL::Queue self) @@ -1678,7 +1868,7 @@ const int i = 0; { NEED_SUCCESS (RetainContext, (value [i])); - PUSH_CLOBJ ("OpenCL::Context", value [i]); + PUSH_CLOBJ (stash_context, value [i]); } void @@ -1689,7 +1879,7 @@ EXTEND (SP, 1); const int i = 0; { - PUSH_CLOBJ ("OpenCL::Device", value [i]); + PUSH_CLOBJ (stash_device, value [i]); } void @@ -1708,7 +1898,7 @@ NEED_SUCCESS (GetCommandQueueInfo, (self, CL_QUEUE_PROPERTIES, sizeof (value), value, 0)); EXTEND (SP, 1); const int i = 0; - PUSHs (sv_2mortal (newSViv (value [i]))); + PUSHs (sv_2mortal (newSVuv (value [i]))); #END:command_queue @@ -1733,7 +1923,7 @@ NEED_SUCCESS (GetMemObjectInfo, (self, CL_MEM_TYPE, sizeof (value), value, 0)); EXTEND (SP, 1); const int i = 0; - PUSHs (sv_2mortal (newSViv (value [i]))); + PUSHs (sv_2mortal (newSVuv (value [i]))); void flags (OpenCL::Memory self) @@ -1742,7 +1932,7 @@ NEED_SUCCESS (GetMemObjectInfo, (self, CL_MEM_FLAGS, sizeof (value), value, 0)); EXTEND (SP, 1); const int i = 0; - PUSHs (sv_2mortal (newSViv (value [i]))); + PUSHs (sv_2mortal (newSVuv (value [i]))); void size (OpenCL::Memory self) @@ -1786,7 +1976,7 @@ const int i = 0; { NEED_SUCCESS (RetainContext, (value [i])); - PUSH_CLOBJ ("OpenCL::Context", value [i]); + PUSH_CLOBJ (stash_context, value [i]); } void @@ -1798,7 +1988,7 @@ const int i = 0; { NEED_SUCCESS (RetainMemObject, (value [i])); - PUSH_CLOBJ ("OpenCL::Memory", value [i]); + PUSH_CLOBJ (stash_memory, value [i]); } #END:mem @@ -1828,7 +2018,7 @@ cl_buffer_region crdata = { origin, size }; NEED_SUCCESS_ARG (cl_mem mem, CreateSubBuffer, (self, flags, CL_BUFFER_CREATE_TYPE_REGION, &crdata, &res)); - XPUSH_CLOBJ ("OpenCL::Buffer", mem); + XPUSH_CLOBJ (stash_buffer, mem); MODULE = OpenCL PACKAGE = OpenCL::Image @@ -1924,7 +2114,7 @@ const int i = 0; { NEED_SUCCESS (RetainContext, (value [i])); - PUSH_CLOBJ ("OpenCL::Context", value [i]); + PUSH_CLOBJ (stash_context, value [i]); } void @@ -1934,7 +2124,7 @@ NEED_SUCCESS (GetSamplerInfo, (self, CL_SAMPLER_NORMALIZED_COORDS, sizeof (value), value, 0)); EXTEND (SP, 1); const int i = 0; - PUSHs (sv_2mortal (newSViv (value [i]))); + PUSHs (sv_2mortal (newSVuv (value [i]))); void addressing_mode (OpenCL::Sampler self) @@ -1943,7 +2133,7 @@ NEED_SUCCESS (GetSamplerInfo, (self, CL_SAMPLER_ADDRESSING_MODE, sizeof (value), value, 0)); EXTEND (SP, 1); const int i = 0; - PUSHs (sv_2mortal (newSViv (value [i]))); + PUSHs (sv_2mortal (newSVuv (value [i]))); void filter_mode (OpenCL::Sampler self) @@ -2045,7 +2235,7 @@ kernel (OpenCL::Program program, SV *function) PPCODE: NEED_SUCCESS_ARG (cl_kernel kernel, CreateKernel, (program, SvPVbyte_nolen (function), &res)); - XPUSH_CLOBJ ("OpenCL::Kernel", kernel); + XPUSH_CLOBJ (stash_kernel, kernel); void kernels_in_program (OpenCL::Program program) @@ -2058,7 +2248,7 @@ int i; EXTEND (SP, num_kernels); for (i = 0; i < num_kernels; ++i) - PUSH_CLOBJ ("OpenCL::Kernel", kernels [i]); + PUSH_CLOBJ (stash_kernel, kernels [i]); void info (OpenCL::Program self, cl_program_info name) @@ -2116,7 +2306,7 @@ const int i = 0; { NEED_SUCCESS (RetainContext, (value [i])); - PUSH_CLOBJ ("OpenCL::Context", value [i]); + PUSH_CLOBJ (stash_context, value [i]); } void @@ -2130,7 +2320,7 @@ EXTEND (SP, n); for (i = 0; i < n; ++i) { - PUSH_CLOBJ ("OpenCL::Device", value [i]); + PUSH_CLOBJ (stash_device, value [i]); } void @@ -2357,7 +2547,7 @@ const int i = 0; { NEED_SUCCESS (RetainContext, (value [i])); - PUSH_CLOBJ ("OpenCL::Context", value [i]); + PUSH_CLOBJ (stash_context, value [i]); } void @@ -2369,7 +2559,7 @@ const int i = 0; { NEED_SUCCESS (RetainProgram, (value [i])); - PUSH_CLOBJ ("OpenCL::Program", value [i]); + PUSH_CLOBJ (stash_program, value [i]); } #END:kernel @@ -2459,7 +2649,7 @@ const int i = 0; { NEED_SUCCESS (RetainCommandQueue, (value [i])); - PUSH_CLOBJ ("OpenCL::Queue", value [i]); + PUSH_CLOBJ (stash_queue, value [i]); } void @@ -2492,7 +2682,7 @@ const int i = 0; { NEED_SUCCESS (RetainContext, (value [i])); - PUSH_CLOBJ ("OpenCL::Context", value [i]); + PUSH_CLOBJ (stash_context, value [i]); } #END:event @@ -2527,3 +2717,84 @@ CODE: clSetUserEventStatus (self, execution_status); +MODULE = OpenCL PACKAGE = OpenCL::Mapped + +void +DESTROY (SV *self) + CODE: + OpenCL__Mapped mapped = SvMAPPED (self); + + clEnqueueUnmapMemObject (mapped->queue, mapped->memobj, mapped->ptr, 1, &mapped->event, 0); + mapped_detach (self, mapped); + + clReleaseCommandQueue (mapped->queue); + clReleaseEvent (mapped->event); + Safefree (mapped); + +void +unmap (OpenCL::Mapped self, ...) + CODE: + mapped_unmap (ST (0), self, self->queue, &ST (1), items - 1); + +bool +mapped (OpenCL::Mapped self) + CODE: + RETVAL = !!self->ptr; + OUTPUT: + RETVAL + +void +wait (OpenCL::Mapped self) + PPCODE: + if (self->event) + NEED_SUCCESS (WaitForEvents, (1, &self->event)); + +void +event (OpenCL::Mapped self) + PPCODE: + if (!self->event) + XSRETURN_UNDEF; + + clRetainEvent (self->event); + XPUSH_CLOBJ (stash_event, self->event); + +size_t +size (OpenCL::Mapped self) + CODE: + RETVAL = self->cb; + OUTPUT: + RETVAL + +IV +ptr (OpenCL::Mapped self) + CODE: + RETVAL = PTR2IV (self->ptr); + OUTPUT: + RETVAL + +void +set (OpenCL::Mapped self, size_t offset, SV *data) + CODE: + STRLEN len; + const char *ptr = SvPVbyte (data, len); + + if (offset < 0 || offset + len > self->cb) + croak ("OpenCL::Mapped::set out of bound condition detected"); + + memcpy (offset + (char *)self->ptr, ptr, len); + +MODULE = OpenCL PACKAGE = OpenCL::MappedBuffer + +MODULE = OpenCL PACKAGE = OpenCL::MappedImage + +IV +row_pitch (OpenCL::Mapped self) + ALIAS: + slice_pitch = 1 + CODE: + RETVAL = ix ? self->slice_pitch : self->row_pitch; + OUTPUT: + RETVAL + + +