cl22: Use single array for function list (#148)

Signed-off-by: Radek Szymanski <radek.szymanski@arm.com>
This commit is contained in:
Radek Szymanski
2019-04-10 12:30:38 +01:00
committed by Kévin Petit
parent 394dece0d7
commit 07196c351a
139 changed files with 2380 additions and 4142 deletions

View File

@@ -25,38 +25,22 @@
#include <unistd.h>
#endif
basefn basefn_list[] = {
test_multiple_contexts_same_device,
test_two_contexts_same_device,
test_three_contexts_same_device,
test_four_contexts_same_device,
test_definition test_list[] = {
ADD_TEST( context_multiple_contexts_same_device ),
ADD_TEST( context_two_contexts_same_device ),
ADD_TEST( context_three_contexts_same_device ),
ADD_TEST( context_four_contexts_same_device ),
test_two_devices,
test_max_devices,
ADD_TEST( two_devices ),
ADD_TEST( max_devices ),
test_hundred_queues
ADD_TEST( hundred_queues ),
};
const char *basefn_names[] = {
"context_multiple_contexts_same_device",
"context_two_contexts_same_device",
"context_three_contexts_same_device",
"context_four_contexts_same_device",
"two_devices",
"max_devices",
"hundred_queues",
};
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, true, 0 );
return runTestHarness( argc, argv, test_num, test_list, false, true, 0 );
}

View File

@@ -18,10 +18,10 @@
#include "../../test_common/harness/typeWrappers.h"
#include "../../test_common/harness/mt19937.h"
extern int test_multiple_contexts_same_device(cl_device_id deviceID, cl_context context, cl_command_queue queue, int num_elements);
extern int test_two_contexts_same_device(cl_device_id deviceID, cl_context context, cl_command_queue queue, int num_elements);
extern int test_three_contexts_same_device(cl_device_id deviceID, cl_context context, cl_command_queue queue, int num_elements);
extern int test_four_contexts_same_device(cl_device_id deviceID, cl_context context, cl_command_queue queue, int num_elements);
extern int test_context_multiple_contexts_same_device(cl_device_id deviceID, cl_context context, cl_command_queue queue, int num_elements);
extern int test_context_two_contexts_same_device(cl_device_id deviceID, cl_context context, cl_command_queue queue, int num_elements);
extern int test_context_three_contexts_same_device(cl_device_id deviceID, cl_context context, cl_command_queue queue, int num_elements);
extern int test_context_four_contexts_same_device(cl_device_id deviceID, cl_context context, cl_command_queue queue, int num_elements);
extern int test_two_devices(cl_device_id deviceID, cl_context context, cl_command_queue queue, int num_elements);
extern int test_max_devices(cl_device_id deviceID, cl_context context, cl_command_queue queue, int num_elements);

View File

@@ -398,7 +398,7 @@ cl_int UseTestItem( const TestItem *item, cl_int *err )
int test_multiple_contexts_same_device(cl_device_id deviceID, size_t maxCount, size_t minCount )
int test_context_multiple_contexts_same_device(cl_device_id deviceID, size_t maxCount, size_t minCount )
{
size_t i, j;
cl_int err = CL_SUCCESS;
@@ -507,23 +507,23 @@ exit:
// sane limit, currently 200), attempting to use each along the way. We keep track of how many we could make before
// a failure occurred. We then free everything and attempt to go do it again a few times. If you are able to make
// that many contexts 5 times over, then you pass.
int test_multiple_contexts_same_device(cl_device_id deviceID, cl_context context, cl_command_queue queue, int num_elements)
int test_context_multiple_contexts_same_device(cl_device_id deviceID, cl_context context, cl_command_queue queue, int num_elements)
{
return test_multiple_contexts_same_device( deviceID, 200, 1 );
return test_context_multiple_contexts_same_device( deviceID, 200, 1 );
}
int test_two_contexts_same_device(cl_device_id deviceID, cl_context context, cl_command_queue queue, int num_elements)
int test_context_two_contexts_same_device(cl_device_id deviceID, cl_context context, cl_command_queue queue, int num_elements)
{
return test_multiple_contexts_same_device( deviceID, 2, 2 );
return test_context_multiple_contexts_same_device( deviceID, 2, 2 );
}
int test_three_contexts_same_device(cl_device_id deviceID, cl_context context, cl_command_queue queue, int num_elements)
int test_context_three_contexts_same_device(cl_device_id deviceID, cl_context context, cl_command_queue queue, int num_elements)
{
return test_multiple_contexts_same_device( deviceID, 3, 3 );
return test_context_multiple_contexts_same_device( deviceID, 3, 3 );
}
int test_four_contexts_same_device(cl_device_id deviceID, cl_context context, cl_command_queue queue, int num_elements)
int test_context_four_contexts_same_device(cl_device_id deviceID, cl_context context, cl_command_queue queue, int num_elements)
{
return test_multiple_contexts_same_device( deviceID, 4, 4 );
return test_context_multiple_contexts_same_device( deviceID, 4, 4 );
}