Skip to content

Commit

Permalink
added som nowait_xxx operations, to be used when event is not needed
Browse files Browse the repository at this point in the history
  • Loading branch information
@tonyrog
tonyrog committed Jun 1, 2011
1 parent 48a0993 commit db6e02d
Show file tree
Hide file tree
Showing 2 changed files with 121 additions and 36 deletions.
90 changes: 59 additions & 31 deletions c_src/cl_nif.c
View file
Expand Up @@ -437,15 +437,15 @@ ErlNifFunc ecl_funcs[] =
{ "get_kernel_workgroup_info", 3, ecl_get_kernel_workgroup_info }, { "get_kernel_workgroup_info", 3, ecl_get_kernel_workgroup_info },


// Events // Events
{ "enqueue_task", 3, ecl_enqueue_task }, { "enqueue_task", 4, ecl_enqueue_task },
{ "enqueue_nd_range_kernel", 5, ecl_enqueue_nd_range_kernel }, { "enqueue_nd_range_kernel", 6, ecl_enqueue_nd_range_kernel },
{ "enqueue_marker", 1, ecl_enqueue_marker }, { "enqueue_marker", 1, ecl_enqueue_marker },
{ "enqueue_barrier", 1, ecl_enqueue_barrier }, { "enqueue_barrier", 1, ecl_enqueue_barrier },
{ "enqueue_wait_for_events", 2, ecl_enqueue_wait_for_events }, { "enqueue_wait_for_events", 2, ecl_enqueue_wait_for_events },
{ "enqueue_read_buffer", 5, ecl_enqueue_read_buffer }, { "enqueue_read_buffer", 5, ecl_enqueue_read_buffer },
{ "enqueue_write_buffer", 6, ecl_enqueue_write_buffer }, { "enqueue_write_buffer", 7, ecl_enqueue_write_buffer },
{ "enqueue_read_image", 7, ecl_enqueue_read_image }, { "enqueue_read_image", 7, ecl_enqueue_read_image },
{ "enqueue_write_image", 8, ecl_enqueue_write_image }, { "enqueue_write_image", 9, ecl_enqueue_write_image },
{ "enqueue_copy_image", 6, ecl_enqueue_copy_image }, { "enqueue_copy_image", 6, ecl_enqueue_copy_image },
{ "enqueue_copy_image_to_buffer", 7, ecl_enqueue_copy_image_to_buffer }, { "enqueue_copy_image_to_buffer", 7, ecl_enqueue_copy_image_to_buffer },
{ "enqueue_copy_buffer_to_image", 7, ecl_enqueue_copy_buffer_to_image }, { "enqueue_copy_buffer_to_image", 7, ecl_enqueue_copy_buffer_to_image },
Expand Down Expand Up @@ -3717,8 +3717,8 @@ static ERL_NIF_TERM ecl_get_kernel_workgroup_info(ErlNifEnv* env, int argc,


// //
// cl:enqueue_task(Queue::cl_queue(), Kernel::cl_kernel(), // cl:enqueue_task(Queue::cl_queue(), Kernel::cl_kernel(),
// WaitList::[cl_event()]) -> // WaitList::[cl_event()], WantEvent::boolean()) ->
// {'ok', cl_event()} | {'error', cl_error()} // 'ok' | {'ok', cl_event()} | {'error', cl_error()}
// //
static ERL_NIF_TERM ecl_enqueue_task(ErlNifEnv* env, int argc, static ERL_NIF_TERM ecl_enqueue_task(ErlNifEnv* env, int argc,
const ERL_NIF_TERM argv[]) const ERL_NIF_TERM argv[])
Expand All @@ -3729,6 +3729,7 @@ static ERL_NIF_TERM ecl_enqueue_task(ErlNifEnv* env, int argc,
size_t num_events = MAX_WAIT_LIST; size_t num_events = MAX_WAIT_LIST;
cl_event event; cl_event event;
cl_int err; cl_int err;
cl_bool want_event;
UNUSED(argc); UNUSED(argc);


if (!get_ecl_object(env, argv[0], &command_queue_r, false, &o_queue)) if (!get_ecl_object(env, argv[0], &command_queue_r, false, &o_queue))
Expand All @@ -3738,24 +3739,30 @@ static ERL_NIF_TERM ecl_enqueue_task(ErlNifEnv* env, int argc,
if (!get_object_list(env, argv[2], &event_r, false, if (!get_object_list(env, argv[2], &event_r, false,
(void**) wait_list, &num_events)) (void**) wait_list, &num_events))
return enif_make_badarg(env); return enif_make_badarg(env);
if (!get_bool(env, argv[3], &want_event))
return enif_make_badarg(env);

err = clEnqueueTask(o_queue->queue, err = clEnqueueTask(o_queue->queue,
kernel, kernel,
num_events, num_events,
num_events ? wait_list : 0, num_events ? wait_list : NULL,
&event); want_event ? &event : NULL);
if (!err) { if (!err) {
ERL_NIF_TERM t; if (want_event) {
t = ecl_make_event(env, event, false, false, 0, 0, o_queue); ERL_NIF_TERM t;
return enif_make_tuple2(env, ATOM(ok), t); t = ecl_make_event(env, event, false, false, 0, 0, o_queue);
return enif_make_tuple2(env, ATOM(ok), t);
}
return ATOM(ok);
} }
return ecl_make_error(env, err); return ecl_make_error(env, err);
} }
// //
// cl:enqueue_nd_range_kernel(Queue::cl_queue(), Kernel::cl_kernel(), // cl:enqueue_nd_range_kernel(Queue::cl_queue(), Kernel::cl_kernel(),
// Global::[non_neg_integer()], // Global::[non_neg_integer()],
// Local::[non_neg_integer()], // Local::[non_neg_integer()],
// WaitList::[cl_event()]) -> // WaitList::[cl_event()], WantEvent::boolean()) ->
// {'ok', cl_event()} | {'error', cl_error()} // 'ok' | {'ok', cl_event()} | {'error', cl_error()}
// //
static ERL_NIF_TERM ecl_enqueue_nd_range_kernel(ErlNifEnv* env, int argc, static ERL_NIF_TERM ecl_enqueue_nd_range_kernel(ErlNifEnv* env, int argc,
const ERL_NIF_TERM argv[]) const ERL_NIF_TERM argv[])
Expand All @@ -3770,6 +3777,7 @@ static ERL_NIF_TERM ecl_enqueue_nd_range_kernel(ErlNifEnv* env, int argc,
size_t temp_dim = MAX_WORK_SIZE; size_t temp_dim = MAX_WORK_SIZE;
cl_event event; cl_event event;
cl_int err; cl_int err;
cl_bool want_event;
UNUSED(argc); UNUSED(argc);


if (!get_ecl_object(env, argv[0], &command_queue_r, false, &o_queue)) if (!get_ecl_object(env, argv[0], &command_queue_r, false, &o_queue))
Expand All @@ -3783,6 +3791,9 @@ static ERL_NIF_TERM ecl_enqueue_nd_range_kernel(ErlNifEnv* env, int argc,
if (!get_object_list(env, argv[4], &event_r, false, if (!get_object_list(env, argv[4], &event_r, false,
(void**) wait_list, &num_events)) (void**) wait_list, &num_events))
return enif_make_badarg(env); return enif_make_badarg(env);
if (!get_bool(env, argv[5], &want_event))
return enif_make_badarg(env);

if ((work_dim != temp_dim) || (work_dim == 0)) if ((work_dim != temp_dim) || (work_dim == 0))
return enif_make_badarg(env); return enif_make_badarg(env);


Expand All @@ -3792,12 +3803,15 @@ static ERL_NIF_TERM ecl_enqueue_nd_range_kernel(ErlNifEnv* env, int argc,
global_work_size, global_work_size,
local_work_size, local_work_size,
num_events, num_events,
num_events ? wait_list : 0, num_events ? wait_list : NULL,
&event); want_event ? &event : NULL);
if (!err) { if (!err) {
ERL_NIF_TERM t; if (want_event) {
t = ecl_make_event(env, event, false, false, 0, 0, o_queue); ERL_NIF_TERM t;
return enif_make_tuple2(env, ATOM(ok), t); t = ecl_make_event(env, event, false, false, 0, 0, o_queue);
return enif_make_tuple2(env, ATOM(ok), t);
}
return ATOM(ok);
} }
return ecl_make_error(env, err); return ecl_make_error(env, err);
} }
Expand Down Expand Up @@ -3907,7 +3921,9 @@ static ERL_NIF_TERM ecl_enqueue_read_buffer(ErlNifEnv* env, int argc,
// Offset::non_neg_integer(), // Offset::non_neg_integer(),
// Size::non_neg_integer(), // Size::non_neg_integer(),
// Data::binary(), // Data::binary(),
// WaitList::[cl_event()]) -> // WaitList::[cl_event()],
// WantEvent::boolean()
// ) ->
// {'ok', cl_event()} | {'error', cl_error()} // {'ok', cl_event()} | {'error', cl_error()}
// //
static ERL_NIF_TERM ecl_enqueue_write_buffer(ErlNifEnv* env, int argc, static ERL_NIF_TERM ecl_enqueue_write_buffer(ErlNifEnv* env, int argc,
Expand All @@ -3923,6 +3939,7 @@ static ERL_NIF_TERM ecl_enqueue_write_buffer(ErlNifEnv* env, int argc,
ErlNifBinary bin; ErlNifBinary bin;
ErlNifEnv* bin_env; ErlNifEnv* bin_env;
cl_int err; cl_int err;
cl_bool want_event;
UNUSED(argc); UNUSED(argc);


if (!get_ecl_object(env, argv[0], &command_queue_r, false, &o_queue)) if (!get_ecl_object(env, argv[0], &command_queue_r, false, &o_queue))
Expand All @@ -3938,6 +3955,8 @@ static ERL_NIF_TERM ecl_enqueue_write_buffer(ErlNifEnv* env, int argc,
if (!get_object_list(env, argv[5], &event_r, false, if (!get_object_list(env, argv[5], &event_r, false,
(void**) wait_list, &num_events)) (void**) wait_list, &num_events))
return enif_make_badarg(env); return enif_make_badarg(env);
if (!get_bool(env, argv[6], &want_event))
return enif_make_badarg(env);


// handle binary and iolist as binary // handle binary and iolist as binary
if (bin.size < size) { // FIXME: handle offset! if (bin.size < size) { // FIXME: handle offset!
Expand All @@ -3957,12 +3976,15 @@ static ERL_NIF_TERM ecl_enqueue_write_buffer(ErlNifEnv* env, int argc,
size, size,
bin.data, bin.data,
num_events, num_events,
num_events ? wait_list : 0, num_events ? wait_list : NULL,
&event); want_event ? &event : NULL);
if (!err) { if (!err) {
ERL_NIF_TERM t; if (want_event) {
t = ecl_make_event(env, event, false, true, bin_env, NULL, o_queue); ERL_NIF_TERM t;
return enif_make_tuple2(env, ATOM(ok), t); t = ecl_make_event(env, event, false, true, bin_env, NULL, o_queue);
return enif_make_tuple2(env, ATOM(ok), t);
}
return ATOM(ok);
} }
else { else {
enif_free_env(bin_env); enif_free_env(bin_env);
Expand Down Expand Up @@ -4044,7 +4066,7 @@ static ERL_NIF_TERM ecl_enqueue_read_image(ErlNifEnv* env, int argc,


// //
// enqueue_write_image(_Queue, _Image, _Origin, _Region, _RowPitch, _SlicePitch, // enqueue_write_image(_Queue, _Image, _Origin, _Region, _RowPitch, _SlicePitch,
// _Data, _WaitList) -> // _Data, _WaitList, _WantEvent, WantEvent) ->
// //
static ERL_NIF_TERM ecl_enqueue_write_image(ErlNifEnv* env, int argc, static ERL_NIF_TERM ecl_enqueue_write_image(ErlNifEnv* env, int argc,
const ERL_NIF_TERM argv[]) const ERL_NIF_TERM argv[])
Expand All @@ -4065,6 +4087,7 @@ static ERL_NIF_TERM ecl_enqueue_write_image(ErlNifEnv* env, int argc,
ErlNifBinary bin; ErlNifBinary bin;
ErlNifEnv* bin_env; ErlNifEnv* bin_env;
cl_int err; cl_int err;
cl_bool want_event;
UNUSED(argc); UNUSED(argc);


if (!get_ecl_object(env, argv[0], &command_queue_r, false, &o_queue)) if (!get_ecl_object(env, argv[0], &command_queue_r, false, &o_queue))
Expand All @@ -4086,7 +4109,9 @@ static ERL_NIF_TERM ecl_enqueue_write_image(ErlNifEnv* env, int argc,
if (!get_object_list(env, argv[7], &event_r, false, if (!get_object_list(env, argv[7], &event_r, false,
(void**) wait_list, &num_events)) (void**) wait_list, &num_events))
return enif_make_badarg(env); return enif_make_badarg(env);

if (!get_bool(env, argv[8], &want_event))
return enif_make_badarg(env);



// calculate the read size of the image FIXME: check error return // calculate the read size of the image FIXME: check error return
clGetImageInfo(buffer, CL_IMAGE_ELEMENT_SIZE, sizeof(psize), &psize, 0); clGetImageInfo(buffer, CL_IMAGE_ELEMENT_SIZE, sizeof(psize), &psize, 0);
Expand All @@ -4107,12 +4132,15 @@ static ERL_NIF_TERM ecl_enqueue_write_image(ErlNifEnv* env, int argc,
slice_pitch, slice_pitch,
bin.data, bin.data,
num_events, num_events,
num_events ? wait_list : 0, num_events ? wait_list : NULL,
&event); want_event ? &event : NULL );
if (!err) { if (!err) {
ERL_NIF_TERM t; if (want_event) {
t = ecl_make_event(env, event, false, true, bin_env, NULL, o_queue); ERL_NIF_TERM t;
return enif_make_tuple2(env, ATOM(ok), t); t = ecl_make_event(env, event, false, true, bin_env, NULL, o_queue);
return enif_make_tuple2(env, ATOM(ok), t);
}
return ATOM(ok);
} }
else { else {
enif_free_env(bin_env); enif_free_env(bin_env);
Expand Down
67 changes: 62 additions & 5 deletions src/cl.erl
View file
Expand Up @@ -119,15 +119,22 @@
-export([kernel_workgroup_info/0]). -export([kernel_workgroup_info/0]).
-export([get_kernel_workgroup_info/2,get_kernel_workgroup_info/3]). -export([get_kernel_workgroup_info/2,get_kernel_workgroup_info/3]).
%% Events %% Events
-export([enqueue_task/3]). -export([enqueue_task/3, enqueue_task/4]).
-export([nowait_enqueue_task/3]).
-export([enqueue_nd_range_kernel/5]). -export([enqueue_nd_range_kernel/5]).
-export([enqueue_nd_range_kernel/6]).
-export([nowait_enqueue_nd_range_kernel/5]).
-export([enqueue_marker/1]). -export([enqueue_marker/1]).
-export([enqueue_barrier/1]). -export([enqueue_barrier/1]).
-export([enqueue_wait_for_events/2]). -export([enqueue_wait_for_events/2]).
-export([enqueue_read_buffer/5]). -export([enqueue_read_buffer/5]).
-export([enqueue_write_buffer/6]). -export([enqueue_write_buffer/6]).
-export([enqueue_write_buffer/7]).
-export([nowait_enqueue_write_buffer/6]).
-export([enqueue_read_image/7]). -export([enqueue_read_image/7]).
-export([enqueue_write_image/8]). -export([enqueue_write_image/8]).
-export([enqueue_write_image/9]).
-export([nowait_enqueue_write_image/8]).
-export([enqueue_copy_image/6]). -export([enqueue_copy_image/6]).
-export([enqueue_copy_image_to_buffer/7]). -export([enqueue_copy_image_to_buffer/7]).
-export([enqueue_copy_buffer_to_image/7]). -export([enqueue_copy_buffer_to_image/7]).
Expand Down Expand Up @@ -1648,7 +1655,17 @@ get_kernel_workgroup_info(Kernel, Device) ->
WaitList::[cl_event()]) -> WaitList::[cl_event()]) ->
{'ok', cl_event()} | {'error', cl_error()}. {'ok', cl_event()} | {'error', cl_error()}.


enqueue_task(_Queue, _Kernel, _WaitList) -> enqueue_task(Queue, Kernel, WaitList) ->
enqueue_task(Queue, Kernel, WaitList, true).

-spec nowait_enqueue_task(Queue::cl_queue(), Kernel::cl_kernel(),
WaitList::[cl_event()]) ->
'ok' | {'error', cl_error()}.

nowait_enqueue_task(Queue, Kernel, WaitList) ->
enqueue_task(Queue, Kernel, WaitList, false).

enqueue_task(_Queue, _Kernel, _WaitList, _WantEvent) ->
erlang:error(nif_not_loaded). erlang:error(nif_not_loaded).


%% %%
Expand Down Expand Up @@ -1678,7 +1695,21 @@ enqueue_task(_Queue, _Kernel, _WaitList) ->
{'ok', cl_event()} | {'error', cl_error()}. {'ok', cl_event()} | {'error', cl_error()}.




enqueue_nd_range_kernel(_Queue, _Kernel, _Global, _Local, _WaitList) -> enqueue_nd_range_kernel(Queue, Kernel, Global, Local, WaitList) ->
enqueue_nd_range_kernel(Queue, Kernel, Global, Local, WaitList, true).


-spec nowait_enqueue_nd_range_kernel(Queue::cl_queue(), Kernel::cl_kernel(),
Global::[non_neg_integer()],
Local::[non_neg_integer()],
WaitList::[cl_event()]) ->
'ok' | {'error', cl_error()}.

nowait_enqueue_nd_range_kernel(Queue, Kernel, Global, Local, WaitList) ->
enqueue_nd_range_kernel(Queue, Kernel, Global, Local, WaitList, false).

enqueue_nd_range_kernel(_Queue, _Kernel, _Global, _Local, _WaitList,
_WantEvent) ->
erlang:error(nif_not_loaded). erlang:error(nif_not_loaded).


%% @spec enqueue_marker(Queue::cl_queue()) -> %% @spec enqueue_marker(Queue::cl_queue()) ->
Expand Down Expand Up @@ -1776,7 +1807,21 @@ enqueue_read_buffer(_Queue, _Buffer, _Offset, _Size, _WaitList) ->
{'ok', cl_event()} | {'error', cl_error()}. {'ok', cl_event()} | {'error', cl_error()}.




enqueue_write_buffer(_Queue, _Buffer, _Offset, _Size, _Data, _WaitList) -> enqueue_write_buffer(Queue, Buffer, Offset, Size, Data, WaitList) ->
enqueue_write_buffer(Queue, Buffer, Offset, Size, Data, WaitList, true).

-spec nowait_enqueue_write_buffer(Queue::cl_queue(), Buffer::cl_mem(),
Offset::non_neg_integer(),
Size::non_neg_integer(),
Data::binary(),
WaitList::[cl_event()]) ->
'ok' | {'error', cl_error()}.

nowait_enqueue_write_buffer(Queue, Buffer, Offset, Size, Data, WaitList) ->
enqueue_write_buffer(Queue, Buffer, Offset, Size, Data, WaitList, false).

enqueue_write_buffer(_Queue, _Buffer, _Offset, _Size, _Data, _WaitList,
_WantEvent) ->
erlang:error(nif_not_loaded). erlang:error(nif_not_loaded).


%% %%
Expand All @@ -1799,10 +1844,22 @@ enqueue_read_image(_Queue, _Image, _Origin, _Region, _RowPitch, _SlicePitch,
_WaitList) -> _WaitList) ->
erlang:error(nif_not_loaded). erlang:error(nif_not_loaded).


enqueue_write_image(Queue, Image, Origin, Region, RowPitch, SlicePitch,
Data, WaitList) ->
enqueue_write_image(Queue, Image, Origin, Region, RowPitch, SlicePitch,
Data, WaitList, true).


nowait_enqueue_write_image(Queue, Image, Origin, Region, RowPitch, SlicePitch,
Data, WaitList) ->
enqueue_write_image(Queue, Image, Origin, Region, RowPitch, SlicePitch,
Data, WaitList, false).

enqueue_write_image(_Queue, _Image, _Origin, _Region, _RowPitch, _SlicePitch, enqueue_write_image(_Queue, _Image, _Origin, _Region, _RowPitch, _SlicePitch,
_Data, _WaitList) -> _Data, _WaitList, _WantEvent) ->
erlang:error(nif_not_loaded). erlang:error(nif_not_loaded).



enqueue_copy_image(_QUeue, _SrcImage, _DstImage, _Origin, _Region, _WaitList) -> enqueue_copy_image(_QUeue, _SrcImage, _DstImage, _Origin, _Region, _WaitList) ->
erlang:error(nif_not_loaded). erlang:error(nif_not_loaded).


Expand Down

0 comments on commit db6e02d

Please sign in to comment.