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

@@ -19,46 +19,25 @@
#include <string.h>
#include "procs.h"
basefn basefn_list[] = {
test_quick_thread_dimensions_1d_explicit_local,
test_quick_thread_dimensions_2d_explicit_local,
test_quick_thread_dimensions_3d_explicit_local,
test_quick_thread_dimensions_1d_implicit_local,
test_quick_thread_dimensions_2d_implicit_local,
test_quick_thread_dimensions_3d_implicit_local,
test_full_thread_dimensions_1d_explicit_local,
test_full_thread_dimensions_2d_explicit_local,
test_full_thread_dimensions_3d_explicit_local,
test_full_thread_dimensions_1d_implicit_local,
test_full_thread_dimensions_2d_implicit_local,
test_full_thread_dimensions_3d_implicit_local,
test_definition test_list[] = {
ADD_TEST( quick_1d_explicit_local ),
ADD_TEST( quick_2d_explicit_local ),
ADD_TEST( quick_3d_explicit_local ),
ADD_TEST( quick_1d_implicit_local ),
ADD_TEST( quick_2d_implicit_local ),
ADD_TEST( quick_3d_implicit_local ),
ADD_TEST( full_1d_explicit_local ),
ADD_TEST( full_2d_explicit_local ),
ADD_TEST( full_3d_explicit_local ),
ADD_TEST( full_1d_implicit_local ),
ADD_TEST( full_2d_implicit_local ),
ADD_TEST( full_3d_implicit_local ),
};
const char *commonfn_names[] = {
"quick_1d_explicit_local",
"quick_2d_explicit_local",
"quick_3d_explicit_local",
"quick_1d_implicit_local",
"quick_2d_implicit_local",
"quick_3d_implicit_local",
"full_1d_explicit_local",
"full_2d_explicit_local",
"full_3d_explicit_local",
"full_1d_implicit_local",
"full_2d_implicit_local",
"full_3d_implicit_local",
};
const int test_num = ARRAY_SIZE( test_list );
ct_assert((sizeof(commonfn_names) / sizeof(commonfn_names[0])) == (sizeof(basefn_list) / sizeof(basefn_list[0])));
int num_commonfns = sizeof(commonfn_names) / sizeof(char *);
int
main(int argc, const char *argv[])
int main(int argc, const char *argv[])
{
return runTestHarness( argc, argv, num_commonfns, basefn_list, commonfn_names, false, false, 0 );
return runTestHarness( argc, argv, test_num, test_list, false, false, 0 );
}

View File

@@ -21,17 +21,17 @@
extern const int kVectorSizeCount;
extern int test_quick_thread_dimensions_1d_explicit_local(cl_device_id deviceID, cl_context context, cl_command_queue queue, int num_elements);
extern int test_quick_thread_dimensions_2d_explicit_local(cl_device_id deviceID, cl_context context, cl_command_queue queue, int num_elements);
extern int test_quick_thread_dimensions_3d_explicit_local(cl_device_id deviceID, cl_context context, cl_command_queue queue, int num_elements);
extern int test_quick_thread_dimensions_1d_implicit_local(cl_device_id deviceID, cl_context context, cl_command_queue queue, int num_elements);
extern int test_quick_thread_dimensions_2d_implicit_local(cl_device_id deviceID, cl_context context, cl_command_queue queue, int num_elements);
extern int test_quick_thread_dimensions_3d_implicit_local(cl_device_id deviceID, cl_context context, cl_command_queue queue, int num_elements);
extern int test_quick_1d_explicit_local(cl_device_id deviceID, cl_context context, cl_command_queue queue, int num_elements);
extern int test_quick_2d_explicit_local(cl_device_id deviceID, cl_context context, cl_command_queue queue, int num_elements);
extern int test_quick_3d_explicit_local(cl_device_id deviceID, cl_context context, cl_command_queue queue, int num_elements);
extern int test_quick_1d_implicit_local(cl_device_id deviceID, cl_context context, cl_command_queue queue, int num_elements);
extern int test_quick_2d_implicit_local(cl_device_id deviceID, cl_context context, cl_command_queue queue, int num_elements);
extern int test_quick_3d_implicit_local(cl_device_id deviceID, cl_context context, cl_command_queue queue, int num_elements);
extern int test_full_thread_dimensions_1d_explicit_local(cl_device_id deviceID, cl_context context, cl_command_queue queue, int num_elements);
extern int test_full_thread_dimensions_2d_explicit_local(cl_device_id deviceID, cl_context context, cl_command_queue queue, int num_elements);
extern int test_full_thread_dimensions_3d_explicit_local(cl_device_id deviceID, cl_context context, cl_command_queue queue, int num_elements);
extern int test_full_thread_dimensions_1d_implicit_local(cl_device_id deviceID, cl_context context, cl_command_queue queue, int num_elements);
extern int test_full_thread_dimensions_2d_implicit_local(cl_device_id deviceID, cl_context context, cl_command_queue queue, int num_elements);
extern int test_full_thread_dimensions_3d_implicit_local(cl_device_id deviceID, cl_context context, cl_command_queue queue, int num_elements);
extern int test_full_1d_explicit_local(cl_device_id deviceID, cl_context context, cl_command_queue queue, int num_elements);
extern int test_full_2d_explicit_local(cl_device_id deviceID, cl_context context, cl_command_queue queue, int num_elements);
extern int test_full_3d_explicit_local(cl_device_id deviceID, cl_context context, cl_command_queue queue, int num_elements);
extern int test_full_1d_implicit_local(cl_device_id deviceID, cl_context context, cl_command_queue queue, int num_elements);
extern int test_full_2d_implicit_local(cl_device_id deviceID, cl_context context, cl_command_queue queue, int num_elements);
extern int test_full_3d_implicit_local(cl_device_id deviceID, cl_context context, cl_command_queue queue, int num_elements);

View File

@@ -907,85 +907,66 @@ test_thread_dimensions(cl_device_id device, cl_context context, cl_command_queue
#define QUICK 1
#define FULL 0
int
test_quick_thread_dimensions_1d_explicit_local(cl_device_id deviceID, cl_context context, cl_command_queue queue, int num_elements) {
return test_thread_dimensions(deviceID, context, queue,
1, 1, 65536*512, QUICK, 4, 1);
int test_quick_1d_explicit_local(cl_device_id deviceID, cl_context context, cl_command_queue queue, int num_elements)
{
return test_thread_dimensions(deviceID, context, queue, 1, 1, 65536*512, QUICK, 4, 1);
}
int test_quick_2d_explicit_local(cl_device_id deviceID, cl_context context, cl_command_queue queue, int num_elements)
{
return test_thread_dimensions(deviceID, context, queue, 2, 1, 65536/4, QUICK, 16, 1);
}
int test_quick_3d_explicit_local(cl_device_id deviceID, cl_context context, cl_command_queue queue, int num_elements)
{
return test_thread_dimensions(deviceID, context, queue, 3, 1, 1024, QUICK, 32, 1);
}
int
test_quick_thread_dimensions_2d_explicit_local(cl_device_id deviceID, cl_context context, cl_command_queue queue, int num_elements) {
return test_thread_dimensions(deviceID, context, queue,
2, 1, 65536/4, QUICK, 16, 1);
int test_quick_1d_implicit_local(cl_device_id deviceID, cl_context context, cl_command_queue queue, int num_elements)
{
return test_thread_dimensions(deviceID, context, queue, 1, 1, 65536*256, QUICK, 4, 0);
}
int
test_quick_thread_dimensions_3d_explicit_local(cl_device_id deviceID, cl_context context, cl_command_queue queue, int num_elements) {
return test_thread_dimensions(deviceID, context, queue,
3, 1, 1024, QUICK, 32, 1);
int test_quick_2d_implicit_local(cl_device_id deviceID, cl_context context, cl_command_queue queue, int num_elements)
{
return test_thread_dimensions(deviceID, context, queue, 2, 1, 65536/4, QUICK, 16, 0);
}
int test_quick_3d_implicit_local(cl_device_id deviceID, cl_context context, cl_command_queue queue, int num_elements)
{
return test_thread_dimensions(deviceID, context, queue, 3, 1, 1024, QUICK, 32, 0);
}
int
test_quick_thread_dimensions_1d_implicit_local(cl_device_id deviceID, cl_context context, cl_command_queue queue, int num_elements) {
return test_thread_dimensions(deviceID, context, queue,
1, 1, 65536*256, QUICK, 4, 0);
int test_full_1d_explicit_local(cl_device_id deviceID, cl_context context, cl_command_queue queue, int num_elements)
{
return test_thread_dimensions(deviceID, context, queue, 1, 1, 65536*512, FULL, 4, 1);
}
int test_full_2d_explicit_local(cl_device_id deviceID, cl_context context, cl_command_queue queue, int num_elements)
{
return test_thread_dimensions(deviceID, context, queue, 2, 1, 65536/4, FULL, 16, 1);
}
int test_full_3d_explicit_local(cl_device_id deviceID, cl_context context, cl_command_queue queue, int num_elements)
{
return test_thread_dimensions(deviceID, context, queue, 3, 1, 1024, FULL, 32, 1);
}
int
test_quick_thread_dimensions_2d_implicit_local(cl_device_id deviceID, cl_context context, cl_command_queue queue, int num_elements) {
return test_thread_dimensions(deviceID, context, queue,
2, 1, 65536/4, QUICK, 16, 0);
int test_full_1d_implicit_local(cl_device_id deviceID, cl_context context, cl_command_queue queue, int num_elements)
{
return test_thread_dimensions(deviceID, context, queue, 1, 1, 65536*256, FULL, 4, 0);
}
int
test_quick_thread_dimensions_3d_implicit_local(cl_device_id deviceID, cl_context context, cl_command_queue queue, int num_elements) {
return test_thread_dimensions(deviceID, context, queue,
3, 1, 1024, QUICK, 32, 0);
int test_full_2d_implicit_local(cl_device_id deviceID, cl_context context, cl_command_queue queue, int num_elements)
{
return test_thread_dimensions(deviceID, context, queue, 2, 1, 65536/4, FULL, 16, 0);
}
int
test_full_thread_dimensions_1d_explicit_local(cl_device_id deviceID, cl_context context, cl_command_queue queue, int num_elements) {
return test_thread_dimensions(deviceID, context, queue,
1, 1, 65536*512, FULL, 4, 1);
}
int
test_full_thread_dimensions_2d_explicit_local(cl_device_id deviceID, cl_context context, cl_command_queue queue, int num_elements) {
return test_thread_dimensions(deviceID, context, queue,
2, 1, 65536/4, FULL, 16, 1);
}
int
test_full_thread_dimensions_3d_explicit_local(cl_device_id deviceID, cl_context context, cl_command_queue queue, int num_elements) {
return test_thread_dimensions(deviceID, context, queue,
3, 1, 1024, FULL, 32, 1);
}
int
test_full_thread_dimensions_1d_implicit_local(cl_device_id deviceID, cl_context context, cl_command_queue queue, int num_elements) {
return test_thread_dimensions(deviceID, context, queue,
1, 1, 65536*256, FULL, 4, 0);
}
int
test_full_thread_dimensions_2d_implicit_local(cl_device_id deviceID, cl_context context, cl_command_queue queue, int num_elements) {
return test_thread_dimensions(deviceID, context, queue,
2, 1, 65536/4, FULL, 16, 0);
}
int
test_full_thread_dimensions_3d_implicit_local(cl_device_id deviceID, cl_context context, cl_command_queue queue, int num_elements) {
return test_thread_dimensions(deviceID, context, queue,
3, 1, 1024, FULL, 32, 0);
int test_full_3d_implicit_local(cl_device_id deviceID, cl_context context, cl_command_queue queue, int num_elements)
{
return test_thread_dimensions(deviceID, context, queue, 3, 1, 1024, FULL, 32, 0);
}