aboutsummaryrefslogtreecommitdiff
path: root/src/api
diff options
context:
space:
mode:
Diffstat (limited to 'src/api')
-rw-r--r--src/api/api_enqueue.cpp68
-rw-r--r--src/api/api_event.cpp38
-rw-r--r--src/api/api_profiling.cpp4
3 files changed, 65 insertions, 45 deletions
diff --git a/src/api/api_enqueue.cpp b/src/api/api_enqueue.cpp
index 4ad1850..daa24cc 100644
--- a/src/api/api_enqueue.cpp
+++ b/src/api/api_enqueue.cpp
@@ -40,17 +40,20 @@
#include <cstdlib>
#include <stdio.h>
+using namespace Coal;
+
static inline cl_int queueEvent(Coal::CommandQueue *queue,
Coal::Event *command,
cl_event *event,
cl_bool blocking)
{
cl_int rs;
- Coal::Event *old_event = NULL;
if (event)
{
#if 0
+ Coal::Event *old_event = NULL;
+
/*---------------------------------------------------------------------
* It is up to the user to release events for reuse. If they do not
* they will have a memory leak for old events. This can impact
@@ -61,9 +64,9 @@ static inline cl_int queueEvent(Coal::CommandQueue *queue,
* We should also reduce the reference count of the old event, because
* user_app_event is now interested in a different event.
*--------------------------------------------------------------------*/
- old_event = *event;
+ old_event = pobj(*event);
if (old_event != NULL && old_event->isA(Coal::Object::T_Event))
- clReleaseEvent((cl_event)old_event);
+ clReleaseEvent(desc(old_event));
#endif
/*---------------------------------------------------------------------
@@ -73,7 +76,7 @@ static inline cl_int queueEvent(Coal::CommandQueue *queue,
* before we get here, command would have been cleaned from queue and
* deleted!!! Thus we will be left with a dangling pointer.
*--------------------------------------------------------------------*/
- *event = (cl_event)command;
+ *event = desc((Coal::Event *)command);
command->reference();
}
@@ -92,7 +95,8 @@ static inline cl_int queueEvent(Coal::CommandQueue *queue,
if (blocking)
{
- rs = clWaitForEvents(1, (cl_event *)&command);
+ cl_event d_event = desc((Event *)command);
+ rs = clWaitForEvents(1, &d_event);
if (rs != CL_SUCCESS)
{
@@ -127,7 +131,7 @@ clEnqueueReadBuffer(cl_command_queue d_command_queue,
command_queue,
(Coal::MemObject *)buffer,
offset, cb, ptr,
- num_events_in_wait_list, (const Coal::Event **)event_wait_list, &rs
+ num_events_in_wait_list, event_wait_list, &rs
);
if (rs != CL_SUCCESS)
@@ -160,7 +164,7 @@ clEnqueueWriteBuffer(cl_command_queue d_command_queue,
command_queue,
(Coal::MemObject *)buffer,
offset, cb, (void *)ptr,
- num_events_in_wait_list, (const Coal::Event **)event_wait_list, &rs
+ num_events_in_wait_list, event_wait_list, &rs
);
if (rs != CL_SUCCESS)
@@ -199,7 +203,7 @@ clEnqueueReadBufferRect(cl_command_queue d_command_queue,
(Coal::MemObject *)buffer,
buffer_origin, host_origin, region, buffer_row_pitch, buffer_slice_pitch,
host_row_pitch, host_slice_pitch, ptr,
- num_events_in_wait_list, (const Coal::Event **)event_wait_list, &rs
+ num_events_in_wait_list, event_wait_list, &rs
);
if (rs != CL_SUCCESS)
@@ -238,7 +242,7 @@ clEnqueueWriteBufferRect(cl_command_queue d_command_queue,
(Coal::MemObject *)buffer,
buffer_origin, host_origin, region, buffer_row_pitch, buffer_slice_pitch,
host_row_pitch, host_slice_pitch, (void *)ptr,
- num_events_in_wait_list, (const Coal::Event **)event_wait_list, &rs
+ num_events_in_wait_list, event_wait_list, &rs
);
if (rs != CL_SUCCESS)
@@ -277,7 +281,7 @@ clEnqueueCopyBufferRect(cl_command_queue d_command_queue,
(Coal::MemObject *)dst_buffer,
src_origin, dst_origin, region, src_row_pitch, src_slice_pitch,
dst_row_pitch, dst_slice_pitch, 1,
- num_events_in_wait_list, (const Coal::Event **)event_wait_list, &rs
+ num_events_in_wait_list, event_wait_list, &rs
);
if (rs != CL_SUCCESS)
@@ -311,7 +315,7 @@ clEnqueueCopyBuffer(cl_command_queue d_command_queue,
(Coal::MemObject *)src_buffer,
(Coal::MemObject *)dst_buffer,
src_offset, dst_offset, cb,
- num_events_in_wait_list, (const Coal::Event **)event_wait_list, &rs
+ num_events_in_wait_list, event_wait_list, &rs
);
if (rs != CL_SUCCESS)
@@ -344,7 +348,7 @@ clEnqueueFillBuffer(cl_command_queue d_command_queue,
command_queue,
(Coal::MemObject *)buffer,
pattern, pattern_size, offset, size,
- num_events_in_wait_list, (const Coal::Event **)event_wait_list, &rs);
+ num_events_in_wait_list, event_wait_list, &rs);
if (rs != CL_SUCCESS)
{
@@ -382,7 +386,7 @@ clEnqueueReadImage(cl_command_queue d_command_queue,
command_queue,
(Coal::Image2D *)image,
origin, region, row_pitch, slice_pitch, (void *)ptr,
- num_events_in_wait_list, (const Coal::Event **)event_wait_list, &rs
+ num_events_in_wait_list, event_wait_list, &rs
);
if (rs != CL_SUCCESS)
@@ -417,7 +421,7 @@ clEnqueueWriteImage(cl_command_queue d_command_queue,
command_queue,
(Coal::Image2D *)image,
origin, region, row_pitch, slice_pitch, (void *)ptr,
- num_events_in_wait_list, (const Coal::Event **)event_wait_list, &rs
+ num_events_in_wait_list, event_wait_list, &rs
);
if (rs != CL_SUCCESS)
@@ -450,7 +454,7 @@ clEnqueueCopyImage(cl_command_queue d_command_queue,
command_queue,
(Coal::Image2D *)src_image, (Coal::Image2D *)dst_image,
src_origin, dst_origin, region,
- num_events_in_wait_list, (const Coal::Event **)event_wait_list, &rs
+ num_events_in_wait_list, event_wait_list, &rs
);
if (rs != CL_SUCCESS)
@@ -483,7 +487,7 @@ clEnqueueCopyImageToBuffer(cl_command_queue d_command_queue,
command_queue,
(Coal::Image2D *)src_image, (Coal::MemObject *)dst_buffer,
src_origin, region, dst_offset,
- num_events_in_wait_list, (const Coal::Event **)event_wait_list, &rs
+ num_events_in_wait_list, event_wait_list, &rs
);
if (rs != CL_SUCCESS)
@@ -516,7 +520,7 @@ clEnqueueCopyBufferToImage(cl_command_queue d_command_queue,
command_queue,
(Coal::MemObject *)src_buffer, (Coal::Image2D *)dst_image,
src_offset, dst_origin, region,
- num_events_in_wait_list, (const Coal::Event **)event_wait_list, &rs
+ num_events_in_wait_list, event_wait_list, &rs
);
if (rs != CL_SUCCESS)
@@ -558,7 +562,7 @@ clEnqueueMapBuffer(cl_command_queue d_command_queue,
command_queue,
(Coal::MemObject *)buffer,
offset, cb, map_flags,
- num_events_in_wait_list, (const Coal::Event **)event_wait_list, errcode_ret
+ num_events_in_wait_list, event_wait_list, errcode_ret
);
if (*errcode_ret != CL_SUCCESS)
@@ -584,7 +588,7 @@ clEnqueueMapBuffer(cl_command_queue d_command_queue,
{
void *rs = command->ptr();
- clReleaseEvent((cl_event)command);
+ clReleaseEvent(desc((Event *)command));
return rs;
}
@@ -622,7 +626,7 @@ clEnqueueMapImage(cl_command_queue d_command_queue,
command_queue,
(Coal::Image2D *)image,
map_flags, origin, region,
- num_events_in_wait_list, (const Coal::Event **)event_wait_list, errcode_ret
+ num_events_in_wait_list, event_wait_list, errcode_ret
);
if (*errcode_ret != CL_SUCCESS)
@@ -656,7 +660,7 @@ clEnqueueMapImage(cl_command_queue d_command_queue,
void *rs = command->ptr();
- clReleaseEvent((cl_event)command);
+ clReleaseEvent(desc((Event *)command));
return rs;
}
@@ -682,7 +686,7 @@ clEnqueueUnmapMemObject(cl_command_queue d_command_queue,
command_queue,
(Coal::MemObject *)memobj,
mapped_ptr,
- num_events_in_wait_list, (const Coal::Event **)event_wait_list, &rs
+ num_events_in_wait_list, event_wait_list, &rs
);
if (rs != CL_SUCCESS)
@@ -718,7 +722,7 @@ clEnqueueNDRangeKernel(cl_command_queue d_command_queue,
command_queue,
kernel,
work_dim, global_work_offset, global_work_size, local_work_size,
- num_events_in_wait_list, (const Coal::Event **)event_wait_list, &rs
+ num_events_in_wait_list, event_wait_list, &rs
);
if (rs != CL_SUCCESS)
@@ -749,7 +753,7 @@ clEnqueueTask(cl_command_queue d_command_queue,
Coal::TaskEvent *command = new Coal::TaskEvent(
command_queue,
kernel,
- num_events_in_wait_list, (const Coal::Event **)event_wait_list, &rs
+ num_events_in_wait_list, event_wait_list, &rs
);
if (rs != CL_SUCCESS)
@@ -783,7 +787,7 @@ clEnqueueNativeKernel(cl_command_queue d_command_queue,
command_queue,
user_func, args, cb_args, num_mem_objects,
(const Coal::MemObject **)mem_list, args_mem_loc,
- num_events_in_wait_list, (const Coal::Event **)event_wait_list, &rs
+ num_events_in_wait_list, event_wait_list, &rs
);
if (rs != CL_SUCCESS)
@@ -823,7 +827,7 @@ clEnqueueWaitForEvents(cl_command_queue d_command_queue,
Coal::WaitForEventsEvent *command = new Coal::WaitForEventsEvent(
command_queue,
- num_events, (const Coal::Event **)event_list, &rs);
+ num_events, event_list, &rs);
if (rs != CL_SUCCESS)
{
@@ -856,6 +860,7 @@ clEnqueueMarkerWithWaitList(cl_command_queue d_command_queue,
unsigned int count;
Coal::Event **events;
auto command_queue = pobj(d_command_queue);
+ cl_event * e_wait_list = NULL;
if (!command_queue->isA(Coal::Object::T_CommandQueue))
return CL_INVALID_COMMAND_QUEUE;
@@ -868,15 +873,17 @@ clEnqueueMarkerWithWaitList(cl_command_queue d_command_queue,
if (event_wait_list) {
count = num_events_in_wait_list;
- events = (Coal::Event **)event_wait_list;
+ e_wait_list = (cl_event *)event_wait_list;
}
else {
// Get the events in command_queue
events = command_queue->events(count, false);
+ e_wait_list = (cl_event *)std::malloc(count * sizeof(cl_event));
+ desc_list(e_wait_list, events, count);
}
Coal::MarkerEvent *command = new Coal::MarkerEvent(
- command_queue, count, (const Coal::Event **)events, &rs);
+ command_queue, count, e_wait_list, &rs);
if (rs != CL_SUCCESS)
{
@@ -891,6 +898,7 @@ clEnqueueMarkerWithWaitList(cl_command_queue d_command_queue,
events[i]->dereference();
}
if (events != NULL) std::free(events);
+ if (e_wait_list != NULL) std::free(e_wait_list);
}
return queueEvent(command_queue, command, event, false);
@@ -913,7 +921,7 @@ clEnqueueBarrierWithWaitList(cl_command_queue d_command_queue,
Coal::BarrierEvent *command = new Coal::BarrierEvent(
command_queue, num_events_in_wait_list,
- (const Coal::Event **)event_wait_list, &rs);
+ event_wait_list, &rs);
if (rs != CL_SUCCESS)
{
@@ -942,7 +950,7 @@ clEnqueueMigrateMemObjects(cl_command_queue d_command_queue,
Coal::MigrateMemObjectsEvent *command = new Coal::MigrateMemObjectsEvent(
command_queue,
num_mem_objects, (const Coal::MemObject **)mem_objects, flags,
- num_events_in_wait_list, (const Coal::Event **)event_wait_list, &rs);
+ num_events_in_wait_list, event_wait_list, &rs);
if (rs != CL_SUCCESS)
{
diff --git a/src/api/api_event.cpp b/src/api/api_event.cpp
index 94c6ce4..9f94011 100644
--- a/src/api/api_event.cpp
+++ b/src/api/api_event.cpp
@@ -52,22 +52,23 @@ clWaitForEvents(cl_uint num_events,
for (cl_uint i=0; i<num_events; ++i)
{
- if (!event_list[i]->isA(Coal::Object::T_Event))
+ auto event = pobj(event_list[i]);
+ if (!event->isA(Coal::Object::T_Event))
return CL_INVALID_EVENT;
- if (event_list[i]->status() < 0)
+ if (event->status() < 0)
return CL_EXEC_STATUS_ERROR_FOR_EVENTS_IN_WAIT_LIST;
Context * evt_ctx;
- if (event_list[i]->type() == Coal::Event::User) {
- evt_ctx = ((Coal::UserEvent *)event_list[i])->context();
+ if (event->type() == Coal::Event::User) {
+ evt_ctx = ((Coal::UserEvent *)event)->context();
}
else {
- evt_ctx = (Context *)(event_list[i]->parent()->parent());
+ evt_ctx = (Context *)(event->parent()->parent());
}
#if 0 // YUAN: no need to wait for queue to be flushed
- Coal::CommandQueue * evt_queue = (Coal::CommandQueue *)event_list[i]->parent();
+ Coal::CommandQueue * evt_queue = (Coal::CommandQueue *)event->parent();
// Flush the queue
evt_queue->flush();
#endif
@@ -81,19 +82,22 @@ clWaitForEvents(cl_uint num_events,
// Wait for the events
for (cl_uint i=0; i<num_events; ++i)
{
- event_list[i]->waitForStatus(CL_COMPLETE);
+ auto event = pobj(event_list[i]);
+ event->waitForStatus(CL_COMPLETE);
}
return CL_SUCCESS;
}
cl_int
-clGetEventInfo(cl_event event,
+clGetEventInfo(cl_event d_event,
cl_event_info param_name,
size_t param_value_size,
void * param_value,
size_t * param_value_size_ret)
{
+ auto event = pobj(d_event);
+
if (!event->isA(Coal::Object::T_Event))
return CL_INVALID_EVENT;
@@ -102,13 +106,15 @@ clGetEventInfo(cl_event event,
}
cl_int
-clSetEventCallback(cl_event event,
+clSetEventCallback(cl_event d_event,
cl_int command_exec_callback_type,
void (CL_CALLBACK *pfn_event_notify)(cl_event event,
cl_int exec_status,
void *user_data),
void *user_data)
{
+ auto event = pobj(d_event);
+
if (!event->isA(Coal::Object::T_Event))
return CL_INVALID_EVENT;
@@ -124,8 +130,10 @@ clSetEventCallback(cl_event event,
}
cl_int
-clRetainEvent(cl_event event)
+clRetainEvent(cl_event d_event)
{
+ auto event = pobj(d_event);
+
if (!event->isA(Coal::Object::T_Event))
return CL_INVALID_EVENT;
@@ -135,8 +143,10 @@ clRetainEvent(cl_event event)
}
cl_int
-clReleaseEvent(cl_event event)
+clReleaseEvent(cl_event d_event)
{
+ auto event = pobj(d_event);
+
if (!event->isA(Coal::Object::T_Event))
return CL_INVALID_EVENT;
@@ -175,14 +185,14 @@ clCreateUserEvent(cl_context d_context,
return 0;
}
- return (cl_event)command;
+ return desc(command);
}
cl_int
-clSetUserEventStatus(cl_event event,
+clSetUserEventStatus(cl_event d_event,
cl_int execution_status)
{
- Coal::Event *command = (Coal::Event *)event;
+ auto command = pobj(d_event);
if (!command->isA(Coal::Object::T_Event) ||
command->type() != Coal::Event::User)
diff --git a/src/api/api_profiling.cpp b/src/api/api_profiling.cpp
index 0abec66..994faff 100644
--- a/src/api/api_profiling.cpp
+++ b/src/api/api_profiling.cpp
@@ -35,12 +35,14 @@
// Profiling APIs
cl_int
-clGetEventProfilingInfo(cl_event event,
+clGetEventProfilingInfo(cl_event d_event,
cl_profiling_info param_name,
size_t param_value_size,
void * param_value,
size_t * param_value_size_ret)
{
+ auto event = pobj(d_event);
+
if (!event->isA(Coal::Object::T_Event))
return CL_INVALID_EVENT;
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-27 14:04:05 +0000