mirror of
https://github.com/KhronosGroup/OpenCL-CTS.git
synced 2026-03-25 00:09:02 +00:00
cl20: Use single array for function list (#146)
Signed-off-by: Radek Szymanski <radek.szymanski@arm.com>
This commit is contained in:
committed by
Kévin Petit
parent
a223b8a9a2
commit
a344529c9b
@@ -23,86 +23,45 @@
|
||||
#include <unistd.h>
|
||||
#endif
|
||||
|
||||
basefn basefn_list[] = {
|
||||
test_event_get_execute_status,
|
||||
test_event_get_write_array_status,
|
||||
test_event_get_read_array_status,
|
||||
test_event_get_info,
|
||||
test_event_wait_for_execute,
|
||||
test_event_wait_for_array,
|
||||
test_event_flush,
|
||||
test_event_finish_execute,
|
||||
test_event_finish_array,
|
||||
test_event_release_before_done,
|
||||
test_event_enqueue_marker,
|
||||
#ifdef CL_VERSION_1_2
|
||||
test_event_enqueue_marker_with_list,
|
||||
test_event_enqueue_barrier_with_list,
|
||||
#endif
|
||||
|
||||
|
||||
test_event_waitlist_single_queue,
|
||||
test_event_waitlist_multi_queue,
|
||||
test_event_waitlist_multi_queue_multi_device,
|
||||
test_event_enqueue_wait_for_events_single_queue,
|
||||
test_event_enqueue_wait_for_events_multi_queue,
|
||||
test_event_enqueue_wait_for_events_multi_queue_multi_device,
|
||||
test_event_enqueue_marker_single_queue,
|
||||
test_event_enqueue_marker_multi_queue,
|
||||
test_event_enqueue_marker_multi_queue_multi_device,
|
||||
test_event_enqueue_barrier_single_queue,
|
||||
|
||||
test_waitlists,
|
||||
test_userevents,
|
||||
test_callbacks,
|
||||
test_callbacks_simultaneous,
|
||||
test_userevents_multithreaded,
|
||||
};
|
||||
|
||||
const char *basefn_names[] = {
|
||||
"event_get_execute_status",
|
||||
"event_get_write_array_status",
|
||||
"event_get_read_array_status",
|
||||
"event_get_info",
|
||||
"event_wait_for_execute",
|
||||
"event_wait_for_array",
|
||||
"event_flush",
|
||||
"event_finish_execute",
|
||||
"event_finish_array",
|
||||
"event_release_before_done",
|
||||
"event_enqueue_marker",
|
||||
test_definition test_list[] = {
|
||||
ADD_TEST( event_get_execute_status ),
|
||||
ADD_TEST( event_get_write_array_status ),
|
||||
ADD_TEST( event_get_read_array_status ),
|
||||
ADD_TEST( event_get_info ),
|
||||
ADD_TEST( event_wait_for_execute ),
|
||||
ADD_TEST( event_wait_for_array ),
|
||||
ADD_TEST( event_flush ),
|
||||
ADD_TEST( event_finish_execute ),
|
||||
ADD_TEST( event_finish_array ),
|
||||
ADD_TEST( event_release_before_done ),
|
||||
ADD_TEST( event_enqueue_marker ),
|
||||
#ifdef CL_VERSION_1_2
|
||||
"event_enqueue_marker_with_event_list",
|
||||
"event_enqueue_barrier_with_event_list",
|
||||
ADD_TEST( event_enqueue_marker_with_event_list ),
|
||||
ADD_TEST( event_enqueue_barrier_with_event_list ),
|
||||
#endif
|
||||
|
||||
"out_of_order_event_waitlist_single_queue",
|
||||
"out_of_order_event_waitlist_multi_queue",
|
||||
"out_of_order_event_waitlist_multi_queue_multi_device",
|
||||
"out_of_order_event_enqueue_wait_for_events_single_queue",
|
||||
"out_of_order_event_enqueue_wait_for_events_multi_queue",
|
||||
"out_of_order_event_enqueue_wait_for_events_multi_queue_multi_device",
|
||||
"out_of_order_event_enqueue_marker_single_queue",
|
||||
"out_of_order_event_enqueue_marker_multi_queue",
|
||||
"out_of_order_event_enqueue_marker_multi_queue_multi_device",
|
||||
"out_of_order_event_enqueue_barrier_single_queue",
|
||||
ADD_TEST( out_of_order_event_waitlist_single_queue ),
|
||||
ADD_TEST( out_of_order_event_waitlist_multi_queue ),
|
||||
ADD_TEST( out_of_order_event_waitlist_multi_queue_multi_device ),
|
||||
ADD_TEST( out_of_order_event_enqueue_wait_for_events_single_queue ),
|
||||
ADD_TEST( out_of_order_event_enqueue_wait_for_events_multi_queue ),
|
||||
ADD_TEST( out_of_order_event_enqueue_wait_for_events_multi_queue_multi_device ),
|
||||
ADD_TEST( out_of_order_event_enqueue_marker_single_queue ),
|
||||
ADD_TEST( out_of_order_event_enqueue_marker_multi_queue ),
|
||||
ADD_TEST( out_of_order_event_enqueue_marker_multi_queue_multi_device ),
|
||||
ADD_TEST( out_of_order_event_enqueue_barrier_single_queue ),
|
||||
|
||||
"waitlists",
|
||||
"test_userevents",
|
||||
|
||||
"callbacks",
|
||||
"callbacks_simultaneous",
|
||||
|
||||
"userevents_multithreaded",
|
||||
ADD_TEST( waitlists ),
|
||||
ADD_TEST( userevents ),
|
||||
ADD_TEST( callbacks ),
|
||||
ADD_TEST( callbacks_simultaneous ),
|
||||
ADD_TEST( userevents_multithreaded ),
|
||||
};
|
||||
|
||||
ct_assert((sizeof(basefn_names) / sizeof(basefn_names[0])) == (sizeof(basefn_list) / sizeof(basefn_list[0])));
|
||||
|
||||
int num_fns = sizeof(basefn_names) / sizeof(char *);
|
||||
const int test_num = ARRAY_SIZE( test_list );
|
||||
|
||||
int main(int argc, const char *argv[])
|
||||
{
|
||||
return runTestHarness( argc, argv, num_fns, basefn_list, basefn_names, false, false, 0 );
|
||||
return runTestHarness( argc, argv, test_num, test_list, false, false, 0 );
|
||||
}
|
||||
|
||||
|
||||
|
||||
@@ -34,23 +34,23 @@ extern int test_event_finish_array(cl_device_id deviceID, cl_context cont
|
||||
extern int test_event_release_before_done(cl_device_id deviceID, cl_context context, cl_command_queue queue, int num_elements);
|
||||
extern int test_event_enqueue_marker(cl_device_id deviceID, cl_context context, cl_command_queue queue, int num_elements);
|
||||
#ifdef CL_VERSION_1_2
|
||||
extern int test_event_enqueue_marker_with_list(cl_device_id deviceID, cl_context context, cl_command_queue queue, int num_elements);
|
||||
extern int test_event_enqueue_barrier_with_list(cl_device_id deviceID, cl_context context, cl_command_queue queue, int num_elements);
|
||||
extern int test_event_enqueue_marker_with_event_list(cl_device_id deviceID, cl_context context, cl_command_queue queue, int num_elements);
|
||||
extern int test_event_enqueue_barrier_with_event_list(cl_device_id deviceID, cl_context context, cl_command_queue queue, int num_elements);
|
||||
#endif
|
||||
|
||||
extern int test_event_waitlist_single_queue(cl_device_id deviceID, cl_context context, cl_command_queue queue, int num_elements);
|
||||
extern int test_event_waitlist_multi_queue( cl_device_id deviceID, cl_context context, cl_command_queue queue, int num_elements);
|
||||
extern int test_event_waitlist_multi_queue_multi_device(cl_device_id deviceID, cl_context context, cl_command_queue queue, int num_elements);
|
||||
extern int test_out_of_order_event_waitlist_single_queue(cl_device_id deviceID, cl_context context, cl_command_queue queue, int num_elements);
|
||||
extern int test_out_of_order_event_waitlist_multi_queue( cl_device_id deviceID, cl_context context, cl_command_queue queue, int num_elements);
|
||||
extern int test_out_of_order_event_waitlist_multi_queue_multi_device(cl_device_id deviceID, cl_context context, cl_command_queue queue, int num_elements);
|
||||
|
||||
extern int test_event_enqueue_wait_for_events_single_queue(cl_device_id deviceID, cl_context context, cl_command_queue queue, int num_elements);
|
||||
extern int test_event_enqueue_wait_for_events_multi_queue( cl_device_id deviceID, cl_context context, cl_command_queue queue, int num_elements);
|
||||
extern int test_event_enqueue_wait_for_events_multi_queue_multi_device(cl_device_id deviceID, cl_context context, cl_command_queue queue, int num_elements);
|
||||
extern int test_out_of_order_event_enqueue_wait_for_events_single_queue(cl_device_id deviceID, cl_context context, cl_command_queue queue, int num_elements);
|
||||
extern int test_out_of_order_event_enqueue_wait_for_events_multi_queue( cl_device_id deviceID, cl_context context, cl_command_queue queue, int num_elements);
|
||||
extern int test_out_of_order_event_enqueue_wait_for_events_multi_queue_multi_device(cl_device_id deviceID, cl_context context, cl_command_queue queue, int num_elements);
|
||||
|
||||
extern int test_event_enqueue_barrier_single_queue(cl_device_id deviceID, cl_context context, cl_command_queue queue, int num_elements);
|
||||
extern int test_out_of_order_event_enqueue_barrier_single_queue(cl_device_id deviceID, cl_context context, cl_command_queue queue, int num_elements);
|
||||
|
||||
extern int test_event_enqueue_marker_single_queue(cl_device_id deviceID, cl_context context, cl_command_queue queue, int num_elements);
|
||||
extern int test_event_enqueue_marker_multi_queue( cl_device_id deviceID, cl_context context, cl_command_queue queue, int num_elements);
|
||||
extern int test_event_enqueue_marker_multi_queue_multi_device(cl_device_id deviceID, cl_context context, cl_command_queue queue, int num_elements);
|
||||
extern int test_out_of_order_event_enqueue_marker_single_queue(cl_device_id deviceID, cl_context context, cl_command_queue queue, int num_elements);
|
||||
extern int test_out_of_order_event_enqueue_marker_multi_queue( cl_device_id deviceID, cl_context context, cl_command_queue queue, int num_elements);
|
||||
extern int test_out_of_order_event_enqueue_marker_multi_queue_multi_device(cl_device_id deviceID, cl_context context, cl_command_queue queue, int num_elements);
|
||||
|
||||
extern int test_waitlists( cl_device_id deviceID, cl_context context, cl_command_queue queue, int num_elements );
|
||||
extern int test_userevents( cl_device_id deviceID, cl_context context, cl_command_queue queue, int num_elements );
|
||||
|
||||
@@ -389,7 +389,7 @@ int test( cl_device_id deviceID, cl_context context, cl_command_queue queue, int
|
||||
}
|
||||
|
||||
|
||||
int test_event_waitlist_single_queue( cl_device_id deviceID, cl_context context, cl_command_queue queue, int num_elements)
|
||||
int test_out_of_order_event_waitlist_single_queue( cl_device_id deviceID, cl_context context, cl_command_queue queue, int num_elements)
|
||||
{
|
||||
int two_queues = 0;
|
||||
int two_devices = 0;
|
||||
@@ -400,7 +400,7 @@ int test_event_waitlist_single_queue( cl_device_id deviceID, cl_context context,
|
||||
return test(deviceID, context, queue, num_elements, two_queues, two_devices, test_enqueue_wait_for_events, test_barrier, use_waitlists, use_marker);
|
||||
}
|
||||
|
||||
int test_event_waitlist_multi_queue( cl_device_id deviceID, cl_context context, cl_command_queue queue, int num_elements)
|
||||
int test_out_of_order_event_waitlist_multi_queue( cl_device_id deviceID, cl_context context, cl_command_queue queue, int num_elements)
|
||||
{
|
||||
int two_queues = 1;
|
||||
int two_devices = 0;
|
||||
@@ -411,7 +411,7 @@ int test_event_waitlist_multi_queue( cl_device_id deviceID, cl_context context,
|
||||
return test(deviceID, context, queue, num_elements, two_queues, two_devices, test_enqueue_wait_for_events, test_barrier, use_waitlists, use_marker);
|
||||
}
|
||||
|
||||
int test_event_waitlist_multi_queue_multi_device( cl_device_id deviceID, cl_context context, cl_command_queue queue, int num_elements)
|
||||
int test_out_of_order_event_waitlist_multi_queue_multi_device( cl_device_id deviceID, cl_context context, cl_command_queue queue, int num_elements)
|
||||
{
|
||||
int two_queues = 1;
|
||||
int two_devices = 1;
|
||||
@@ -423,7 +423,7 @@ int test_event_waitlist_multi_queue_multi_device( cl_device_id deviceID, cl_cont
|
||||
}
|
||||
|
||||
|
||||
int test_event_enqueue_wait_for_events_single_queue( cl_device_id deviceID, cl_context context, cl_command_queue queue, int num_elements)
|
||||
int test_out_of_order_event_enqueue_wait_for_events_single_queue( cl_device_id deviceID, cl_context context, cl_command_queue queue, int num_elements)
|
||||
{
|
||||
int two_queues = 0;
|
||||
int two_devices = 0;
|
||||
@@ -434,7 +434,7 @@ int test_event_enqueue_wait_for_events_single_queue( cl_device_id deviceID, cl_c
|
||||
return test(deviceID, context, queue, num_elements, two_queues, two_devices, test_enqueue_wait_for_events, test_barrier, use_waitlists, use_marker);
|
||||
}
|
||||
|
||||
int test_event_enqueue_wait_for_events_multi_queue( cl_device_id deviceID, cl_context context, cl_command_queue queue, int num_elements)
|
||||
int test_out_of_order_event_enqueue_wait_for_events_multi_queue( cl_device_id deviceID, cl_context context, cl_command_queue queue, int num_elements)
|
||||
{
|
||||
int two_queues = 1;
|
||||
int two_devices = 0;
|
||||
@@ -446,7 +446,7 @@ int test_event_enqueue_wait_for_events_multi_queue( cl_device_id deviceID, cl_co
|
||||
}
|
||||
|
||||
|
||||
int test_event_enqueue_wait_for_events_multi_queue_multi_device( cl_device_id deviceID, cl_context context, cl_command_queue queue, int num_elements)
|
||||
int test_out_of_order_event_enqueue_wait_for_events_multi_queue_multi_device( cl_device_id deviceID, cl_context context, cl_command_queue queue, int num_elements)
|
||||
{
|
||||
int two_queues = 1;
|
||||
int two_devices = 1;
|
||||
@@ -460,7 +460,7 @@ int test_event_enqueue_wait_for_events_multi_queue_multi_device( cl_device_id de
|
||||
|
||||
|
||||
|
||||
int test_event_enqueue_barrier_single_queue( cl_device_id deviceID, cl_context context, cl_command_queue queue, int num_elements)
|
||||
int test_out_of_order_event_enqueue_barrier_single_queue( cl_device_id deviceID, cl_context context, cl_command_queue queue, int num_elements)
|
||||
{
|
||||
int two_queues = 0;
|
||||
int two_devices = 0;
|
||||
@@ -472,7 +472,7 @@ int test_event_enqueue_barrier_single_queue( cl_device_id deviceID, cl_context c
|
||||
}
|
||||
|
||||
|
||||
int test_event_enqueue_marker_single_queue( cl_device_id deviceID, cl_context context, cl_command_queue queue, int num_elements)
|
||||
int test_out_of_order_event_enqueue_marker_single_queue( cl_device_id deviceID, cl_context context, cl_command_queue queue, int num_elements)
|
||||
{
|
||||
int two_queues = 0;
|
||||
int two_devices = 0;
|
||||
@@ -483,7 +483,7 @@ int test_event_enqueue_marker_single_queue( cl_device_id deviceID, cl_context co
|
||||
return test(deviceID, context, queue, num_elements, two_queues, two_devices, test_enqueue_wait_for_events, test_barrier, use_waitlists, use_marker);
|
||||
}
|
||||
|
||||
int test_event_enqueue_marker_multi_queue( cl_device_id deviceID, cl_context context, cl_command_queue queue, int num_elements)
|
||||
int test_out_of_order_event_enqueue_marker_multi_queue( cl_device_id deviceID, cl_context context, cl_command_queue queue, int num_elements)
|
||||
{
|
||||
int two_queues = 1;
|
||||
int two_devices = 0;
|
||||
@@ -495,7 +495,7 @@ int test_event_enqueue_marker_multi_queue( cl_device_id deviceID, cl_context con
|
||||
}
|
||||
|
||||
|
||||
int test_event_enqueue_marker_multi_queue_multi_device( cl_device_id deviceID, cl_context context, cl_command_queue queue, int num_elements)
|
||||
int test_out_of_order_event_enqueue_marker_multi_queue_multi_device( cl_device_id deviceID, cl_context context, cl_command_queue queue, int num_elements)
|
||||
{
|
||||
int two_queues = 1;
|
||||
int two_devices = 1;
|
||||
|
||||
@@ -590,7 +590,7 @@ int test_event_enqueue_marker( cl_device_id deviceID, cl_context context, cl_com
|
||||
}
|
||||
|
||||
#ifdef CL_VERSION_1_2
|
||||
int test_event_enqueue_marker_with_list( cl_device_id deviceID, cl_context context, cl_command_queue queue, int num_elements)
|
||||
int test_event_enqueue_marker_with_event_list( cl_device_id deviceID, cl_context context, cl_command_queue queue, int num_elements)
|
||||
{
|
||||
|
||||
cl_int status;
|
||||
@@ -634,10 +634,8 @@ int test_event_enqueue_marker_with_list( cl_device_id deviceID, cl_context conte
|
||||
FINISH_EVENT(queue);
|
||||
return 0;
|
||||
}
|
||||
#endif
|
||||
|
||||
#ifdef CL_VERSION_1_2
|
||||
int test_event_enqueue_barrier_with_list( cl_device_id deviceID, cl_context context, cl_command_queue queue, int num_elements)
|
||||
int test_event_enqueue_barrier_with_event_list( cl_device_id deviceID, cl_context context, cl_command_queue queue, int num_elements)
|
||||
{
|
||||
|
||||
cl_int status;
|
||||
|
||||
Reference in New Issue
Block a user