--- OpenCL/OpenCL.xs 2012/04/20 08:57:09 1.33 +++ OpenCL/OpenCL.xs 2012/04/24 23:53:12 1.52 @@ -2,16 +2,42 @@ #include "perl.h" #include "XSUB.h" +#define X_STACKSIZE sizeof (void *) * 512 * 1024 // 2-4mb should be enough, really +#include "xthread.h" +#include "schmorp.h" + #ifdef I_DLFCN #include #endif +// how stupid is that, the 1.2 header files define CL_VERSION_1_1, +// but then fail to define the api functions unless you ALSO define +// this. This breaks 100% of the opencl 1.1 apps, for what reason? +// after all, the functions are deprecated, not removed. +// in addition, you cannot test for this in any future-proof way. +// each time a new opencl version comes out, you need to make a new +// release. +#define CL_USE_DEPRECATED_OPENCL_1_2_APIS /* just guessing, you stupid idiots */ + +#ifndef PREFER_1_1 + #define PREFER_1_1 1 +#endif + +#if PREFER_1_1 + #define CL_USE_DEPRECATED_OPENCL_1_1_APIS +#endif + #ifdef __APPLE__ #include #else #include #endif +#ifndef CL_VERSION_1_2 + #undef PREFER_1_1 + #define PREFER_1_1 1 +#endif + typedef cl_platform_id OpenCL__Platform; typedef cl_device_id OpenCL__Device; typedef cl_context OpenCL__Context; @@ -91,7 +117,7 @@ static void *buf [buffers]; static size_t len [buffers]; - idx = ++idx % buffers; + idx = (idx + 1) % buffers; if (len [idx] < size) { @@ -169,20 +195,6 @@ /*****************************************************************************/ -#define NEW_MORTAL_OBJ(class,ptr) sv_setref_pv (sv_newmortal (), class, ptr) -#define XPUSH_NEW_OBJ(class,ptr) XPUSHs (NEW_MORTAL_OBJ (class, ptr)) - -static void * -SvPTROBJ (const char *func, const char *svname, SV *sv, const char *pkg) -{ - if (SvROK (sv) && sv_derived_from (sv, pkg)) - return (void *)SvIV (SvRV (sv)); - - croak ("%s: %s is not of type %s", func, svname, pkg); -} - -/*****************************************************************************/ - static cl_context_properties * SvCONTEXTPROPERTIES (const char *func, const char *svname, SV *sv, cl_context_properties *extra, int extracount) { @@ -250,6 +262,306 @@ /*****************************************************************************/ +#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)) + +/* cl objects are either \$iv, or [$iv, ...] */ +/* they can be upgraded at runtime to the array form */ +static void * +SvCLOBJ (const char *func, const char *svname, SV *sv, const char *pkg) +{ + if (SvROK (sv) && sv_derived_from (sv, pkg)) + { + SV *rv = SvRV (sv); + +#if CLOBJ_PUSH + if (SvTYPE (rv) == SVt_PVAV) + rv = AvARRAY (rv)[0]; +#endif + + return (void *)SvIV (rv); + } + + croak ("%s: %s is not of type %s", func, svname, pkg); +} + +#if CLOBJ_PUSH + +static void +CLOBJ_push (SV *self, SV *data) +{ + SV *rv = SvRV (self); + + if (SvTYPE (rv) != SVt_PVAV) + { + AV *av = newAV (); + av_push (av, rv); + rv = (SV *)av; + SvRV_set (self, rv); + } + + av_push ((AV *)rv, data); +} + +static SV * +sv_struct (STRLEN size) +{ + SV *sv = newSV (size); + SvPOK_only (sv); + return sv; +} + +static void * +CLOBJ_push_struct (SV *self, STRLEN size) +{ + SV *sv = sv_struct (size); + CLOBJ_push (self, sv); + return SvPVX (sv); +} + +#endif + +/*****************************************************************************/ +/* callback stuff */ + +/* default context callback, log to stderr */ +static void CL_CALLBACK +context_default_notify (const char *msg, const void *info, size_t cb, void *data) +{ + fprintf (stderr, "OpenCL Context Notify: %s\n", msg); +} + +typedef struct +{ + int free_cb; + void (*push)(void *data1, void *data2, void *data3); +} eq_vtbl; + +typedef struct eq_item +{ + struct eq_item *next; + eq_vtbl *vtbl; + SV *cb; + void *data1, *data2, *data3; +} eq_item; + +static void (*eq_signal_func)(void *signal_arg, int value); +static void *eq_signal_arg; +static xmutex_t eq_lock = X_MUTEX_INIT; +static eq_item *eq_head, *eq_tail; + +static void +eq_enq (eq_vtbl *vtbl, SV *cb, void *data1, void *data2, void *data3) +{ + eq_item *item = malloc (sizeof (eq_item)); + + item->next = 0; + item->vtbl = vtbl; + item->cb = cb; + item->data1 = data1; + item->data2 = data2; + item->data3 = data3; + + X_LOCK (eq_lock); + + *(eq_head ? &eq_tail->next : &eq_head) = item; + eq_tail = item; + + X_UNLOCK (eq_lock); + + eq_signal_func (eq_signal_arg, 0); +} + +static eq_item * +eq_dec (void) +{ + eq_item *res; + + X_LOCK (eq_lock); + + res = eq_head; + if (res) + eq_head = res->next; + + X_UNLOCK (eq_lock); + + return res; +} + +#if 0 +static void +mem_free (pTHX_ void *p) +{ + free (p); +} +//SAVEDESTRUCTOR_X (mem_free, item); +#endif + +static void +eq_poll (void) +{ + eq_item *item; + + while ((item = eq_dec ())) + { + ENTER; + SAVETMPS; + + dSP; + PUSHMARK (SP); + EXTEND (SP, 2); + + if (item->vtbl->free_cb) + sv_2mortal (item->cb); + + PUTBACK; + item->vtbl->push (item->data1, item->data2, item->data3); + + SV *cb = item->cb; + free (item); + + call_sv (cb, G_DISCARD | G_VOID); + + FREETMPS; + LEAVE; + } +} + +static void +eq_poll_interrupt (pTHX_ void *c_arg, int value) +{ + eq_poll (); +} + +/*****************************************************************************/ +/* context notify */ + +static void +eq_context_push (void *data1, void *data2, void *data3) +{ + dSP; + PUSHs (sv_2mortal (newSVpv (data1, 0))); + PUSHs (sv_2mortal (newSVpvn (data2, (STRLEN)data3))); + PUTBACK; + + free (data1); + free (data2); +} + +static eq_vtbl eq_context_vtbl = { 0, eq_context_push }; + +static void CL_CALLBACK +eq_context_notify (const char *msg, const void *pvt, size_t cb, void *user_data) +{ + void *pvt_copy = malloc (cb); + memcpy (pvt_copy, pvt, cb); + eq_enq (&eq_context_vtbl, user_data, strdup (msg), pvt_copy, (void *)cb); +} + +#define CONTEXT_NOTIFY_CALLBACK \ + void (CL_CALLBACK *pfn_notify)(const char *, const void *, size_t, void *) = context_default_notify; \ + void *user_data = 0; \ + \ + if (SvOK (notify)) \ + { \ + pfn_notify = eq_context_notify; \ + user_data = s_get_cv (notify); \ + } + +static SV * +new_clobj_context (cl_context ctx, void *user_data) +{ + SV *sv = NEW_CLOBJ ("OpenCL::Context", ctx); + + if (user_data) + sv_magicext (SvRV (sv), user_data, PERL_MAGIC_ext, 0, 0, 0); + + return sv; +} + +#define XPUSH_CLOBJ_CONTEXT XPUSHs (new_clobj_context (ctx, user_data)); + +/*****************************************************************************/ +/* build/compile/link notify */ + +static void +eq_program_push (void *data1, void *data2, void *data3) +{ + dSP; + PUSH_CLOBJ ("OpenCL::Program", data1); + PUTBACK; +} + +static eq_vtbl eq_program_vtbl = { 1, eq_program_push }; + +static void CL_CALLBACK +eq_program_notify (cl_program program, void *user_data) +{ + eq_enq (&eq_program_vtbl, user_data, (void *)program, 0, 0); +} + +struct build_args +{ + cl_program program; + char *options; + void *user_data; + cl_uint num_devices; +}; + +X_THREAD_PROC (build_program_thread) +{ + struct build_args *arg = thr_arg; + + clBuildProgram (arg->program, arg->num_devices, arg->num_devices ? (void *)(arg + 1) : 0, arg->options, 0, 0); + + if (arg->user_data) + eq_program_notify (arg->program, arg->user_data); + else + clReleaseProgram (arg->program); + + free (arg->options); + free (arg); +} + +static void +build_program_async (cl_program program, cl_uint num_devices, const cl_device_id *device_list, const char *options, void *user_data) +{ + struct build_args *arg = malloc (sizeof (struct build_args) + sizeof (*device_list) * num_devices); + + arg->program = program; + arg->options = strdup (options); + arg->user_data = user_data; + arg->num_devices = num_devices; + memcpy (arg + 1, device_list, sizeof (*device_list) * num_devices); + + xthread_t id; + thread_create (&id, build_program_thread, arg); +} + +/*****************************************************************************/ +/* event objects */ + +static void +eq_event_push (void *data1, void *data2, void *data3) +{ + dSP; + PUSH_CLOBJ ("OpenCL::Event", data1); + PUSHs (sv_2mortal (newSViv ((IV)data2))); + PUTBACK; +} + +static eq_vtbl eq_event_vtbl = { 1, eq_event_push }; + +static void CL_CALLBACK +eq_event_notify (cl_event event, cl_int event_command_exec_status, void *user_data) +{ + clRetainEvent (event); + eq_enq (&eq_event_vtbl, user_data, (void *)event, (void *)(IV)event_command_exec_status, 0); +} + +/*****************************************************************************/ + static size_t img_row_pitch (cl_mem img) { @@ -259,22 +571,32 @@ } static cl_event * -event_list (SV **items, int count) +event_list (SV **items, cl_uint *rcount) { + cl_uint count = *rcount; + if (!count) return 0; cl_event *list = tmpbuf (sizeof (cl_event) * count); + int i = 0; + + do + { + --count; + if (SvOK (items [count])) + list [i++] = SvCLOBJ ("clEnqueue", "wait_events", items [count], "OpenCL::Event"); + } + while (count); - while (count--) - list [count] = SvPTROBJ ("clEnqueue", "wait_events", items [count], "OpenCL::Event"); + *rcount = i; - return list; + 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) + cl_event *event_list_ptr = event_list (&ST (items), &event_list_count) #define INFO(class) \ { \ @@ -292,6 +614,17 @@ PROTOTYPES: ENABLE +void +poll () + CODE: + eq_poll (); + +void +_eq_initialise (IV func, IV arg) + CODE: + eq_signal_func = (void (*)(void *, int))func; + eq_signal_arg = (void*)arg; + BOOT: { HV *stash = gv_stashpv ("OpenCL", 1); @@ -309,14 +642,19 @@ { sizeof (cl_double), "SIZEOF_DOUBLE" }, #include "constiv.h" }; + 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)); + + sv_setiv (perl_get_sv ("OpenCL::POLL_FUNC", TRUE), (IV)eq_poll_interrupt); } cl_int errno () CODE: - errno = res; + RETVAL = res; + OUTPUT: + RETVAL const char * err2str (cl_int err) @@ -337,16 +675,17 @@ EXTEND (SP, count); for (i = 0; i < count; ++i) - PUSHs (NEW_MORTAL_OBJ ("OpenCL::Platform", list [i])); + PUSH_CLOBJ ("OpenCL::Platform", list [i]); void -context_from_type (cl_context_properties *properties = 0, cl_device_type type = CL_DEVICE_TYPE_DEFAULT, FUTURE notify = 0) +context_from_type (cl_context_properties *properties = 0, cl_device_type type = CL_DEVICE_TYPE_DEFAULT, SV *notify = &PL_sv_undef) PPCODE: + CONTEXT_NOTIFY_CALLBACK; NEED_SUCCESS_ARG (cl_context ctx, CreateContextFromType, (properties, type, 0, 0, &res)); - XPUSH_NEW_OBJ ("OpenCL::Context", ctx); + XPUSH_CLOBJ_CONTEXT; void -context (cl_context_properties *properties = 0, FUTURE devices, FUTURE notify = 0) +context (FUTURE properties, FUTURE devices, FUTURE notify) PPCODE: /* der Gipfel der Kunst */ @@ -365,6 +704,13 @@ PPCODE: INFO (Platform) +void +unload_compiler (OpenCL::Platform self) + CODE: +#if CL_VERSION_1_2 + clUnloadPlatformCompiler (self); +#endif + #BEGIN:platform void @@ -402,7 +748,7 @@ PUSHs (sv_setref_pv (sv_newmortal (), "OpenCL::Device", list [i])); void -context (OpenCL::Platform self, cl_context_properties *properties = 0, SV *devices, FUTURE notify = 0) +context (OpenCL::Platform self, cl_context_properties *properties, SV *devices, SV *notify = &PL_sv_undef) PPCODE: if (!SvROK (devices) || SvTYPE (SvRV (devices)) != SVt_PVAV) croak ("OpenCL::Platform::context argument 'device' must be an arrayref with device objects, in call"); @@ -410,21 +756,24 @@ AV *av = (AV *)SvRV (devices); cl_uint num_devices = av_len (av) + 1; cl_device_id *device_list = tmpbuf (sizeof (cl_device_id) * num_devices); - int i; + int i; for (i = num_devices; i--; ) - device_list [i] = SvPTROBJ ("clCreateContext", "devices", *av_fetch (av, i, 0), "OpenCL::Device"); + device_list [i] = SvCLOBJ ("clCreateContext", "devices", *av_fetch (av, i, 0), "OpenCL::Device"); - NEED_SUCCESS_ARG (cl_context ctx, CreateContext, (properties, num_devices, device_list, 0, 0, &res)); - XPUSH_NEW_OBJ ("OpenCL::Context", ctx); + CONTEXT_NOTIFY_CALLBACK; + NEED_SUCCESS_ARG (cl_context ctx, CreateContext, (properties, num_devices, device_list, pfn_notify, user_data, &res)); + XPUSH_CLOBJ_CONTEXT; void -context_from_type (OpenCL::Platform self, SV *properties = 0, cl_device_type type = CL_DEVICE_TYPE_DEFAULT, FUTURE notify = 0) +context_from_type (OpenCL::Platform self, SV *properties = 0, cl_device_type type = CL_DEVICE_TYPE_DEFAULT, SV *notify = &PL_sv_undef) PPCODE: cl_context_properties extra[] = { CL_CONTEXT_PLATFORM, (cl_context_properties)self }; cl_context_properties *props = SvCONTEXTPROPERTIES ("OpenCL::Platform::context_from_type", "properties", properties, extra, 2); + + CONTEXT_NOTIFY_CALLBACK; NEED_SUCCESS_ARG (cl_context ctx, CreateContextFromType, (props, type, 0, 0, &res)); - XPUSH_NEW_OBJ ("OpenCL::Context", ctx); + XPUSH_CLOBJ_CONTEXT; MODULE = OpenCL PACKAGE = OpenCL::Device @@ -473,7 +822,7 @@ native_vector_width_float = CL_DEVICE_NATIVE_VECTOR_WIDTH_FLOAT native_vector_width_double = CL_DEVICE_NATIVE_VECTOR_WIDTH_DOUBLE native_vector_width_half = CL_DEVICE_NATIVE_VECTOR_WIDTH_HALF - reference_count_ext = CL_DEVICE_REFERENCE_COUNT_EXT + reference_count_ext = CL_DEVICE_REFERENCE_COUNT_EXT PPCODE: cl_uint value [1]; NEED_SUCCESS (GetDeviceInfo, (self, ix, sizeof (value), value, 0)); @@ -607,7 +956,7 @@ EXTEND (SP, 1); const int i = 0; { - PUSHs (NEW_MORTAL_OBJ ("OpenCL::Platform", value [i])); + PUSH_CLOBJ ("OpenCL::Platform", value [i]); } void @@ -636,7 +985,7 @@ EXTEND (SP, 1); const int i = 0; { - PUSHs (NEW_MORTAL_OBJ ("OpenCL::Device", value [i])); + PUSH_CLOBJ ("OpenCL::Device", value [i]); } void @@ -673,13 +1022,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_NEW_OBJ ("OpenCL::Queue", queue); + XPUSH_CLOBJ ("OpenCL::Queue", queue); void user_event (OpenCL::Context self) PPCODE: NEED_SUCCESS_ARG (cl_event ev, CreateUserEvent, (self, &res)); - XPUSH_NEW_OBJ ("OpenCL::UserEvent", ev); + XPUSH_CLOBJ ("OpenCL::UserEvent", ev); void buffer (OpenCL::Context self, cl_mem_flags flags, size_t len) @@ -688,7 +1037,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_NEW_OBJ ("OpenCL::BufferObj", mem); + XPUSH_CLOBJ ("OpenCL::BufferObj", mem); void buffer_sv (OpenCL::Context self, cl_mem_flags flags, SV *data) @@ -698,7 +1047,37 @@ 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_NEW_OBJ ("OpenCL::BufferObj", mem); + XPUSH_CLOBJ ("OpenCL::BufferObj", mem); + +#if CL_VERSION_1_2 + +void +image (OpenCL::Context self, cl_mem_flags flags, cl_channel_order channel_order, cl_channel_type channel_type, cl_mem_object_type type, size_t width, size_t height, size_t depth, size_t array_size = 0, size_t row_pitch = 0, size_t slice_pitch = 0, cl_uint num_mip_level = 0, cl_uint num_samples = 0, SV *data = &PL_sv_undef) + PPCODE: + STRLEN len; + char *ptr = SvOK (data) ? SvPVbyte (data, len) : 0; + const cl_image_format format = { channel_order, channel_type }; + const cl_image_desc desc = { + type, + width, height, depth, + array_size, row_pitch, slice_pitch, + num_mip_level, num_samples, + 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"; + 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; + } + XPUSH_CLOBJ (klass, mem); + +#endif void image2d (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 row_pitch = 0, SV *data = &PL_sv_undef) @@ -706,8 +1085,13 @@ STRLEN len; char *ptr = SvOK (data) ? SvPVbyte (data, len) : 0; const cl_image_format format = { channel_order, channel_type }; +#if PREFER_1_1 NEED_SUCCESS_ARG (cl_mem mem, CreateImage2D, (self, flags, &format, width, height, row_pitch, ptr, &res)); - XPUSH_NEW_OBJ ("OpenCL::Image2D", mem); +#else + 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); 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) @@ -715,8 +1099,13 @@ STRLEN len; char *ptr = SvOK (data) ? SvPVbyte (data, len) : 0; const cl_image_format format = { channel_order, channel_type }; +#if PREFER_1_1 NEED_SUCCESS_ARG (cl_mem mem, CreateImage3D, (self, flags, &format, width, height, depth, row_pitch, slice_pitch, ptr, &res)); - XPUSH_NEW_OBJ ("OpenCL::Image3D", mem); +#else + 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); #if cl_apple_gl_sharing || cl_khr_gl_sharing @@ -724,25 +1113,56 @@ 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_NEW_OBJ ("OpenCL::BufferObj", mem); + XPUSH_CLOBJ ("OpenCL::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); + +#if CL_VERSION_1_2 + +void +gl_texture (OpenCL::Context self, cl_mem_flags flags, cl_GLenum target, cl_GLint miplevel, cl_GLuint texture) + ALIAS: + PPCODE: + 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"; + 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; + } + XPUSH_CLOBJ (klass, mem); + +#endif void gl_texture2d (OpenCL::Context self, cl_mem_flags flags, cl_GLenum target, cl_GLint miplevel, cl_GLuint texture) PPCODE: +#if PREFER_1_1 NEED_SUCCESS_ARG (cl_mem mem, CreateFromGLTexture2D, (self, flags, target, miplevel, texture, &res)); - XPUSH_NEW_OBJ ("OpenCL::Image2D", mem); +#else + NEED_SUCCESS_ARG (cl_mem mem, CreateFromGLTexture , (self, flags, target, miplevel, texture, &res)); +#endif + XPUSH_CLOBJ ("OpenCL::Image2D", mem); void gl_texture3d (OpenCL::Context self, cl_mem_flags flags, cl_GLenum target, cl_GLint miplevel, cl_GLuint texture) PPCODE: +#if PREFER_1_1 NEED_SUCCESS_ARG (cl_mem mem, CreateFromGLTexture3D, (self, flags, target, miplevel, texture, &res)); - XPUSH_NEW_OBJ ("OpenCL::Image3D", 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_NEW_OBJ ("OpenCL::Image2D", mem); +#else + NEED_SUCCESS_ARG (cl_mem mem, CreateFromGLTexture , (self, flags, target, miplevel, texture, &res)); +#endif + XPUSH_CLOBJ ("OpenCL::Image3D", mem); #endif @@ -772,7 +1192,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_NEW_OBJ ("OpenCL::Sampler", sampler); + XPUSH_CLOBJ ("OpenCL::Sampler", sampler); void program_with_source (OpenCL::Context self, SV *program) @@ -783,7 +1203,7 @@ len2 = len; NEED_SUCCESS_ARG (cl_program prog, CreateProgramWithSource, (self, 1, &ptr, &len2, &res)); - XPUSH_NEW_OBJ ("OpenCL::Program", prog); + XPUSH_CLOBJ ("OpenCL::Program", prog); #BEGIN:context @@ -810,7 +1230,7 @@ EXTEND (SP, n); for (i = 0; i < n; ++i) { - PUSHs (NEW_MORTAL_OBJ ("OpenCL::Device", value [i])); + PUSH_CLOBJ ("OpenCL::Device", value [i]); } void @@ -847,7 +1267,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_NEW_OBJ ("OpenCL::Event", ev); + XPUSH_CLOBJ ("OpenCL::Event", ev); void enqueue_write_buffer (OpenCL::Queue self, OpenCL::Buffer mem, cl_bool blocking, size_t offset, SV *data, ...) @@ -857,10 +1277,53 @@ char *ptr = SvPVbyte (data, len); EVENT_LIST (5, items - 5); - NEED_SUCCESS (EnqueueReadBuffer, (self, mem, blocking, offset, len, ptr, event_list_count, event_list_ptr, GIMME_V != G_VOID ? &ev : 0)); + 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); + +#if CL_VERSION_1_2 + +void +enqueue_fill_buffer (OpenCL::Queue self, OpenCL::Buffer mem, SV *data, size_t offset, size_t size, ...) + PPCODE: + cl_event ev = 0; + STRLEN len; + char *ptr = SvPVbyte (data, len); + EVENT_LIST (5, items - 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); + +void +enqueue_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, ...) + PPCODE: + cl_event ev = 0; + STRLEN len; + const size_t origin [3] = { x, y, z }; + const size_t region [3] = { width, height, depth }; + EVENT_LIST (12, items - 12); + + const cl_float c_f [4] = { r, g, b, a }; + const cl_uint c_u [4] = { r, g, b, a }; + const cl_int c_s [4] = { r, g, b, a }; + const void *c_fus [3] = { &c_f, &c_u, &c_s }; + static const char fus [] = { 0, 0, 0, 0, 0, 0, 0, 2, 2, 2, 1, 1, 1, 0, 0 }; + cl_image_format format; + NEED_SUCCESS (GetImageInfo, (img, CL_IMAGE_FORMAT, sizeof (format), &format, 0)); + assert (sizeof (fus) == CL_FLOAT + 1 - CL_SNORM_INT8); + if (format.image_channel_data_type < CL_SNORM_INT8 || CL_FLOAT < format.image_channel_data_type) + croak ("enqueue_fill_image: image has unsupported channel type, only opencl 1.2 channel types supported."); + + NEED_SUCCESS (EnqueueFillImage, (self, img, c_fus [fus [format.image_channel_data_type]], + origin, region, event_list_count, event_list_ptr, GIMME_V != G_VOID ? &ev : 0)); if (ev) - XPUSH_NEW_OBJ ("OpenCL::Event", ev); + XPUSH_CLOBJ ("OpenCL::Event", ev); + +#endif void enqueue_copy_buffer (OpenCL::Queue self, OpenCL::Buffer src, OpenCL::Buffer dst, size_t src_offset, size_t dst_offset, size_t len, ...) @@ -871,7 +1334,7 @@ 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_NEW_OBJ ("OpenCL::Event", ev); + XPUSH_CLOBJ ("OpenCL::Event", ev); void enqueue_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, ...) @@ -903,7 +1366,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_NEW_OBJ ("OpenCL::Event", ev); + XPUSH_CLOBJ ("OpenCL::Event", ev); void enqueue_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, ...) @@ -933,10 +1396,10 @@ if (len < min_len) croak ("clEnqueueWriteImage: data string is shorter than what would be transferred"); - NEED_SUCCESS (EnqueueWriteBufferRect, (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)); + 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_NEW_OBJ ("OpenCL::Event", ev); + XPUSH_CLOBJ ("OpenCL::Event", ev); void enqueue_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, ...) @@ -950,7 +1413,7 @@ 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_NEW_OBJ ("OpenCL::Event", ev); + XPUSH_CLOBJ ("OpenCL::Event", ev); void enqueue_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, ...) @@ -975,7 +1438,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_NEW_OBJ ("OpenCL::Event", ev); + XPUSH_CLOBJ ("OpenCL::Event", ev); void enqueue_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, ...) @@ -998,10 +1461,10 @@ if (len < min_len) croak ("clEnqueueWriteImage: data string is shorter than what would be transferred"); - NEED_SUCCESS (EnqueueWriteImage, (self, dst, blocking, dst_origin, region, row_pitch, slice_pitch, SvPVX (data), event_list_count, event_list_ptr, GIMME_V != G_VOID ? &ev : 0)); + 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_NEW_OBJ ("OpenCL::Event", ev); + XPUSH_CLOBJ ("OpenCL::Event", ev); void enqueue_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, ...) @@ -1015,7 +1478,7 @@ 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_NEW_OBJ ("OpenCL::Event", ev); + XPUSH_CLOBJ ("OpenCL::Event", ev); void enqueue_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, ...) @@ -1028,7 +1491,7 @@ 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_NEW_OBJ ("OpenCL::Event", ev); + XPUSH_CLOBJ ("OpenCL::Event", ev); void enqueue_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, ...) @@ -1041,7 +1504,7 @@ 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_NEW_OBJ ("OpenCL::Event", ev); + XPUSH_CLOBJ ("OpenCL::Event", ev); void enqueue_task (OpenCL::Queue self, OpenCL::Kernel kernel, ...) @@ -1052,7 +1515,7 @@ NEED_SUCCESS (EnqueueTask, (self, kernel, event_list_count, event_list_ptr, GIMME_V != G_VOID ? &ev : 0)); if (ev) - XPUSH_NEW_OBJ ("OpenCL::Event", ev); + XPUSH_CLOBJ ("OpenCL::Event", ev); void enqueue_nd_range_kernel (OpenCL::Queue self, OpenCL::Kernel kernel, SV *global_work_offset, SV *global_work_size, SV *local_work_size = &PL_sv_undef, ...) @@ -1090,7 +1553,7 @@ if (SvOK (local_work_size)) { - if (SvOK (local_work_size) && !SvROK (local_work_size) || SvTYPE (SvRV (local_work_size)) != SVt_PVAV) + if ((SvOK (local_work_size) && !SvROK (local_work_size)) || SvTYPE (SvRV (local_work_size)) != SVt_PVAV) croak ("clEnqueueNDRangeKernel: global_work_size must be undef or an array reference"); if (AvFILLp (SvRV (local_work_size)) + 1 != gws_len) @@ -1104,7 +1567,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_NEW_OBJ ("OpenCL::Event", ev); + XPUSH_CLOBJ ("OpenCL::Event", ev); #if cl_apple_gl_sharing || cl_khr_gl_sharing @@ -1112,7 +1575,7 @@ enqueue_acquire_gl_objects (OpenCL::Queue self, SV *objects, ...) ALIAS: enqueue_release_gl_objects = 1 - CODE: + PPCODE: if (!SvROK (objects) || SvTYPE (SvRV (objects)) != SVt_PVAV) croak ("OpenCL::Queue::enqueue_acquire/release_gl_objects argument 'objects' must be an arrayref with memory objects, in call"); @@ -1124,7 +1587,7 @@ int i; for (i = num_objects; i--; ) - object_list [i] = SvPTROBJ ("OpenCL::Queue::enqueue_acquire/release_gl_objects", "objects", *av_fetch (av, i, 0), "OpenCL::Memory"); + object_list [i] = SvCLOBJ ("OpenCL::Queue::enqueue_acquire/release_gl_objects", "objects", *av_fetch (av, i, 0), "OpenCL::Memory"); if (ix) NEED_SUCCESS (EnqueueReleaseGLObjects, (self, num_objects, object_list, event_list_count, event_list_ptr, GIMME_V != G_VOID ? &ev : 0)); @@ -1132,27 +1595,68 @@ NEED_SUCCESS (EnqueueAcquireGLObjects, (self, num_objects, object_list, event_list_count, event_list_ptr, GIMME_V != G_VOID ? &ev : 0)); if (ev) - XPUSH_NEW_OBJ ("OpenCL::Event", ev); + XPUSH_CLOBJ ("OpenCL::Event", ev); #endif void -enqueue_marker (OpenCL::Queue self) - PPCODE: - cl_event ev; - NEED_SUCCESS (EnqueueMarker, (self, &ev)); - XPUSH_NEW_OBJ ("OpenCL::Event", ev); - -void enqueue_wait_for_events (OpenCL::Queue self, ...) CODE: EVENT_LIST (1, items - 1); +#if PREFER_1_1 NEED_SUCCESS (EnqueueWaitForEvents, (self, event_list_count, event_list_ptr)); +#else + NEED_SUCCESS (EnqueueBarrierWithWaitList, (self, event_list_count, event_list_ptr, 0)); +#endif void -enqueue_barrier (OpenCL::Queue self) - CODE: - NEED_SUCCESS (EnqueueBarrier, (self)); +enqueue_marker (OpenCL::Queue self, ...) + PPCODE: + cl_event ev = 0; + EVENT_LIST (1, items - 1); +#if PREFER_1_1 + if (!event_list_count) + NEED_SUCCESS (EnqueueMarker, (self, GIMME_V != G_VOID ? &ev : 0)); + else +#if CL_VERSION_1_2 + NEED_SUCCESS (EnqueueMarkerWithWaitList, (self, event_list_count, event_list_ptr, GIMME_V != G_VOID ? &ev : 0)); +#else + { + NEED_SUCCESS (EnqueueWaitForEvents, (self, event_list_count, event_list_ptr)); // also a barrier + NEED_SUCCESS (EnqueueMarker, (self, GIMME_V != G_VOID ? &ev : 0)); + } +#endif +#else + NEED_SUCCESS (EnqueueMarkerWithWaitList, (self, event_list_count, event_list_ptr, GIMME_V != G_VOID ? &ev : 0)); +#endif + if (ev) + XPUSH_CLOBJ ("OpenCL::Event", ev); + +void +enqueue_barrier (OpenCL::Queue self, ...) + PPCODE: + cl_event ev = 0; + EVENT_LIST (1, items - 1); +#if PREFER_1_1 + if (!event_list_count && GIMME_V == G_VOID) + NEED_SUCCESS (EnqueueBarrier, (self)); + else +#if CL_VERSION_1_2 + NEED_SUCCESS (EnqueueBarrierWithWaitList, (self, event_list_count, event_list_ptr, GIMME_V != G_VOID ? &ev : 0)); +#else + { + if (event_list_count) + NEED_SUCCESS (EnqueueWaitForEvents, (self, event_list_count, event_list_ptr)); + + if (GIMME_V != G_VOID) + NEED_SUCCESS (EnqueueMarker, (self, &ev)); + } +#endif +#else + NEED_SUCCESS (EnqueueBarrierWithWaitList, (self, event_list_count, event_list_ptr, GIMME_V != G_VOID ? &ev : 0)); +#endif + if (ev) + XPUSH_CLOBJ ("OpenCL::Event", ev); void flush (OpenCL::Queue self) @@ -1180,7 +1684,7 @@ const int i = 0; { NEED_SUCCESS (RetainContext, (value [i])); - PUSHs (NEW_MORTAL_OBJ ("OpenCL::Context", value [i])); + PUSH_CLOBJ ("OpenCL::Context", value [i]); } void @@ -1191,7 +1695,7 @@ EXTEND (SP, 1); const int i = 0; { - PUSHs (NEW_MORTAL_OBJ ("OpenCL::Device", value [i])); + PUSH_CLOBJ ("OpenCL::Device", value [i]); } void @@ -1288,7 +1792,7 @@ const int i = 0; { NEED_SUCCESS (RetainContext, (value [i])); - PUSHs (NEW_MORTAL_OBJ ("OpenCL::Context", value [i])); + PUSH_CLOBJ ("OpenCL::Context", value [i]); } void @@ -1300,7 +1804,7 @@ const int i = 0; { NEED_SUCCESS (RetainMemObject, (value [i])); - PUSHs (NEW_MORTAL_OBJ ("OpenCL::Memory", value [i])); + PUSH_CLOBJ ("OpenCL::Memory", value [i]); } #END:mem @@ -1330,7 +1834,7 @@ cl_buffer_region crdata = { origin, size }; NEED_SUCCESS_ARG (cl_mem mem, CreateSubBuffer, (self, flags, CL_BUFFER_CREATE_TYPE_REGION, &crdata, &res)); - XPUSH_NEW_OBJ ("OpenCL::Buffer", mem); + XPUSH_CLOBJ ("OpenCL::Buffer", mem); MODULE = OpenCL PACKAGE = OpenCL::Image @@ -1339,6 +1843,15 @@ PPCODE: INFO (Image) +void +format (OpenCL::Image self) + PPCODE: + cl_image_format format; + NEED_SUCCESS (GetImageInfo, (self, CL_IMAGE_FORMAT, sizeof (format), &format, 0)); + EXTEND (SP, 2); + PUSHs (sv_2mortal (newSVuv (format.image_channel_order))); + PUSHs (sv_2mortal (newSVuv (format.image_channel_data_type))); + #BEGIN:image void @@ -1417,7 +1930,7 @@ const int i = 0; { NEED_SUCCESS (RetainContext, (value [i])); - PUSHs (NEW_MORTAL_OBJ ("OpenCL::Context", value [i])); + PUSH_CLOBJ ("OpenCL::Context", value [i]); } void @@ -1457,9 +1970,43 @@ clReleaseProgram (self); void -build (OpenCL::Program self, OpenCL::Device device, SV *options = &PL_sv_undef) - CODE: - NEED_SUCCESS (BuildProgram, (self, 1, &device, SvPVbyte_nolen (options), 0, 0)); +build (OpenCL::Program self, SV *devices = &PL_sv_undef, SV *options = &PL_sv_undef, SV *notify = &PL_sv_undef) + ALIAS: + build_async = 1 + CODE: + void (CL_CALLBACK *pfn_notify)(cl_program program, void *user_data) = 0; + void *user_data = 0; + cl_uint num_devices = 0; + cl_device_id *device_list = 0; + + if (SvOK (devices)) + { + if (!SvROK (devices) || SvTYPE (SvRV (devices)) != SVt_PVAV) + croak ("clProgramBuild: devices must be undef or an array of OpenCL::Device objects."); + + AV *av = (AV *)SvRV (devices); + num_devices = av_len (av) + 1; + + if (num_devices) + { + device_list = tmpbuf (sizeof (*device_list) * num_devices); + int count; + for (count = 0; count < num_devices; ++count) + device_list [count] = SvCLOBJ ("clBuildProgram", "devices", *av_fetch (av, count, 1), "OpenCL::Device"); + } + } + + if (SvOK (notify)) + { + NEED_SUCCESS (RetainProgram, (self)); + pfn_notify = eq_program_notify; + user_data = SvREFCNT_inc (s_get_cv (notify)); + } + + if (ix) + build_program_async (self, num_devices, device_list, SvPVbyte_nolen (options), user_data); + else + NEED_SUCCESS (BuildProgram, (self, num_devices, device_list, SvPVbyte_nolen (options), pfn_notify, user_data)); void build_info (OpenCL::Program self, OpenCL::Device device, cl_program_build_info name) @@ -1504,7 +2051,20 @@ kernel (OpenCL::Program program, SV *function) PPCODE: NEED_SUCCESS_ARG (cl_kernel kernel, CreateKernel, (program, SvPVbyte_nolen (function), &res)); - XPUSH_NEW_OBJ ("OpenCL::Kernel", kernel); + XPUSH_CLOBJ ("OpenCL::Kernel", kernel); + +void +kernels_in_program (OpenCL::Program program) + PPCODE: + cl_uint num_kernels; + NEED_SUCCESS (CreateKernelsInProgram, (program, 0, 0, &num_kernels)); + cl_kernel *kernels = tmpbuf (sizeof (cl_kernel) * num_kernels); + NEED_SUCCESS (CreateKernelsInProgram, (program, num_kernels, kernels, 0)); + + int i; + EXTEND (SP, num_kernels); + for (i = 0; i < num_kernels; ++i) + PUSH_CLOBJ ("OpenCL::Kernel", kernels [i]); void info (OpenCL::Program self, cl_program_info name) @@ -1532,7 +2092,7 @@ SvUPGRADE (sv, SVt_PV); SvPOK_only (sv); SvCUR_set (sv, sizes [i]); - ptrs [i] = SvPVX (sv); + ptrs [i] = (void *)SvPVX (sv); PUSHs (sv); } @@ -1562,7 +2122,7 @@ const int i = 0; { NEED_SUCCESS (RetainContext, (value [i])); - PUSHs (NEW_MORTAL_OBJ ("OpenCL::Context", value [i])); + PUSH_CLOBJ ("OpenCL::Context", value [i]); } void @@ -1576,7 +2136,7 @@ EXTEND (SP, n); for (i = 0; i < n; ++i) { - PUSHs (NEW_MORTAL_OBJ ("OpenCL::Device", value [i])); + PUSH_CLOBJ ("OpenCL::Device", value [i]); } void @@ -1740,7 +2300,7 @@ const int i = 0; { NEED_SUCCESS (RetainContext, (value [i])); - PUSHs (NEW_MORTAL_OBJ ("OpenCL::Context", value [i])); + PUSH_CLOBJ ("OpenCL::Context", value [i]); } void @@ -1752,7 +2312,7 @@ const int i = 0; { NEED_SUCCESS (RetainProgram, (value [i])); - PUSHs (NEW_MORTAL_OBJ ("OpenCL::Program", value [i])); + PUSH_CLOBJ ("OpenCL::Program", value [i]); } #END:kernel @@ -1822,6 +2382,11 @@ clWaitForEvents (1, &self); void +cb (OpenCL::Event self, cl_int command_exec_callback_type, SV *cb) + CODE: + clSetEventCallback (self, command_exec_callback_type, eq_event_notify, SvREFCNT_inc (s_get_cv (cb))); + +void info (OpenCL::Event self, cl_event_info name) PPCODE: INFO (Event) @@ -1837,7 +2402,7 @@ const int i = 0; { NEED_SUCCESS (RetainCommandQueue, (value [i])); - PUSHs (NEW_MORTAL_OBJ ("OpenCL::Queue", value [i])); + PUSH_CLOBJ ("OpenCL::Queue", value [i]); } void @@ -1870,7 +2435,7 @@ const int i = 0; { NEED_SUCCESS (RetainContext, (value [i])); - PUSHs (NEW_MORTAL_OBJ ("OpenCL::Context", value [i])); + PUSH_CLOBJ ("OpenCL::Context", value [i]); } #END:event