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

@@ -377,7 +377,7 @@ static int copy_partial_size( cl_device_id device, cl_context context, cl_comman
} // end copy_partial_size()
int copy_array( cl_device_id device, cl_context context, cl_command_queue queue, int num_elements )
int test_copy_array( cl_device_id device, cl_context context, cl_command_queue queue, int num_elements )
{
int i, err = 0;
int size;
@@ -401,7 +401,7 @@ int copy_array( cl_device_id device, cl_context context, cl_command_queue queue,
} // end copy_array()
int copy_partial_array( cl_device_id device, cl_context context, cl_command_queue queue, int num_elements )
int test_copy_partial_array( cl_device_id device, cl_context context, cl_command_queue queue, int num_elements )
{
int i, err = 0;
int size;
@@ -692,7 +692,7 @@ static int copy_image_size( cl_device_id device, cl_context context,
} // end copy_image_size()
int copy_image( cl_device_id device, cl_context context, cl_command_queue queue, int num_elements )
int test_copy_image( cl_device_id device, cl_context context, cl_command_queue queue, int num_elements )
{
int err = 0;
int i;
@@ -765,7 +765,7 @@ int copy_image( cl_device_id device, cl_context context, cl_command_queue queue,
} // end copy_image()
int copy_array_to_image( cl_device_id device, cl_context context, cl_command_queue queue, int num_elements )
int test_copy_array_to_image( cl_device_id device, cl_context context, cl_command_queue queue, int num_elements )
{
cl_mem memobjs[3];
cl_image_format image_format_desc = { CL_RGBA, CL_UNORM_INT8 };

View File

@@ -379,7 +379,7 @@ static int basicFilter( int w, int h, int nChannels, uchar *inptr, uchar *outptr
} // end of basicFilter()
int execute( cl_device_id device, cl_context context, cl_command_queue queue, int num_elements )
int test_execute( cl_device_id device, cl_context context, cl_command_queue queue, int num_elements )
{
uchar *inptr;
uchar *outptr[2];

View File

@@ -26,80 +26,43 @@
cl_device_type gDeviceType = CL_DEVICE_TYPE_DEFAULT;
bool gTestRounding = false;
basefn basefn_list[] = {
read_int_array,
read_uint_array,
read_long_array,
read_ulong_array,
read_short_array,
read_ushort_array,
read_float_array,
read_char_array,
read_uchar_array,
read_struct_array,
write_int_array,
write_uint_array,
write_long_array,
write_ulong_array,
write_short_array,
write_ushort_array,
write_float_array,
write_char_array,
write_uchar_array,
write_struct_array,
read_float_image,
read_char_image,
read_uchar_image,
write_float_image,
write_char_image,
write_uchar_image,
copy_array,
copy_partial_array,
copy_image,
copy_array_to_image,
execute
test_definition test_list[] = {
ADD_TEST( read_array_int ),
ADD_TEST( read_array_uint ),
ADD_TEST( read_array_long ),
ADD_TEST( read_array_ulong ),
ADD_TEST( read_array_short ),
ADD_TEST( read_array_ushort ),
ADD_TEST( read_array_float ),
ADD_TEST( read_array_char ),
ADD_TEST( read_array_uchar ),
ADD_TEST( read_array_struct ),
ADD_TEST( write_array_int ),
ADD_TEST( write_array_uint ),
ADD_TEST( write_array_long ),
ADD_TEST( write_array_ulong ),
ADD_TEST( write_array_short ),
ADD_TEST( write_array_ushort ),
ADD_TEST( write_array_float ),
ADD_TEST( write_array_char ),
ADD_TEST( write_array_uchar ),
ADD_TEST( write_array_struct ),
ADD_TEST( read_image_float ),
ADD_TEST( read_image_char ),
ADD_TEST( read_image_uchar ),
ADD_TEST( write_image_float ),
ADD_TEST( write_image_char ),
ADD_TEST( write_image_uchar ),
ADD_TEST( copy_array ),
ADD_TEST( copy_partial_array ),
ADD_TEST( copy_image ),
ADD_TEST( copy_array_to_image ),
ADD_TEST( execute ),
};
const int test_num = ARRAY_SIZE( test_list );
const char *basefn_names[] = {
"read_array_int",
"read_array_uint",
"read_array_long",
"read_array_ulong",
"read_array_short",
"read_array_ushort",
"read_array_float",
"read_array_char",
"read_array_uchar",
"read_array_struct",
"write_array_int",
"write_array_uint",
"write_array_long",
"write_array_ulong",
"write_array_short",
"write_array_ushort",
"write_array_float",
"write_array_char",
"write_array_uchar",
"write_array_struct",
"read_image_float",
"read_image_int",
"read_image_uint",
"write_image_float",
"write_image_char",
"write_image_uchar",
"copy_array",
"copy_partial_array",
"copy_image",
"copy_array_to_image",
"execute",
};
ct_assert((sizeof(basefn_names) / sizeof(basefn_names[0])) == (sizeof(basefn_list) / sizeof(basefn_list[0])));
int num_streamfns = sizeof(basefn_names) / sizeof(char *);
// FIXME: use timer resolution rather than hardcoding 1µs per tick.
// FIXME: use timer resolution rather than hardcoding 1µs per tick.
#define QUEUE_SECONDS_LIMIT 30
#define SUBMIT_SECONDS_LIMIT 30
@@ -163,11 +126,8 @@ int check_times(cl_ulong queueStart, cl_ulong commandSubmit, cl_ulong commandSta
return err;
}
int main( int argc, const char *argv[] )
{
return runTestHarness( argc, argv, num_streamfns, basefn_list, basefn_names,
false, false, CL_QUEUE_PROFILING_ENABLE );
return runTestHarness( argc, argv, test_num, test_list, false, false, CL_QUEUE_PROFILING_ENABLE );
}

View File

@@ -24,39 +24,39 @@
extern int check_times(cl_ulong queueStart, cl_ulong submitStart, cl_ulong commandStart, cl_ulong commandEnd, cl_device_id device);
extern int read_int_array( cl_device_id device, cl_context context, cl_command_queue queue, int num_elements );
extern int read_uint_array( cl_device_id device, cl_context context, cl_command_queue queue, int num_elements );
extern int read_long_array( cl_device_id device, cl_context context, cl_command_queue queue, int num_elements );
extern int read_ulong_array( cl_device_id device, cl_context context, cl_command_queue queue, int num_elements );
extern int read_short_array( cl_device_id device, cl_context context, cl_command_queue queue, int num_elements );
extern int read_ushort_array( cl_device_id device, cl_context context, cl_command_queue queue, int num_elements );
extern int read_float_array( cl_device_id device, cl_context context, cl_command_queue queue, int num_elements );
extern int read_half_array( cl_device_id device, cl_context context, cl_command_queue queue, int num_elements );
extern int read_char_array( cl_device_id device, cl_context context, cl_command_queue queue, int num_elements );
extern int read_uchar_array( cl_device_id device, cl_context context, cl_command_queue queue, int num_elements );
extern int read_struct_array( cl_device_id device, cl_context context, cl_command_queue queue, int num_elements );
extern int write_int_array( cl_device_id device, cl_context context, cl_command_queue queue, int num_elements );
extern int write_uint_array( cl_device_id device, cl_context context, cl_command_queue queue, int num_elements );
extern int write_long_array( cl_device_id device, cl_context context, cl_command_queue queue, int num_elements );
extern int write_ulong_array( cl_device_id device, cl_context context, cl_command_queue queue, int num_elements );
extern int write_short_array( cl_device_id device, cl_context context, cl_command_queue queue, int num_elements );
extern int write_ushort_array( cl_device_id device, cl_context context, cl_command_queue queue, int num_elements );
extern int write_float_array( cl_device_id device, cl_context context, cl_command_queue queue, int num_elements );
extern int write_half_array( cl_device_id device, cl_context context, cl_command_queue queue, int num_elements );
extern int write_char_array( cl_device_id device, cl_context context, cl_command_queue queue, int num_elements );
extern int write_uchar_array( cl_device_id device, cl_context context, cl_command_queue queue, int num_elements );
extern int write_struct_array( cl_device_id device, cl_context context, cl_command_queue queue, int num_elements );
extern int read_float_image( cl_device_id device, cl_context context, cl_command_queue queue, int num_elements );
extern int read_char_image( cl_device_id device, cl_context context, cl_command_queue queue, int num_elements );
extern int read_uchar_image( cl_device_id device, cl_context context, cl_command_queue queue, int num_elements );
extern int write_float_image( cl_device_id device, cl_context context, cl_command_queue queue, int num_elements );
extern int write_char_image( cl_device_id device, cl_context context, cl_command_queue queue, int num_elements );
extern int write_uchar_image( cl_device_id device, cl_context context, cl_command_queue queue, int num_elements );
extern int copy_array( cl_device_id device, cl_context context, cl_command_queue queue, int num_elements );
extern int copy_partial_array( cl_device_id device, cl_context context, cl_command_queue queue, int num_elements );
extern int copy_image( cl_device_id device, cl_context context, cl_command_queue queue, int num_elements );
extern int copy_array_to_image( cl_device_id device, cl_context context, cl_command_queue queue, int num_elements );
extern int execute( cl_device_id device, cl_context context, cl_command_queue queue, int num_elements );
extern int test_read_array_int( cl_device_id device, cl_context context, cl_command_queue queue, int num_elements );
extern int test_read_array_uint( cl_device_id device, cl_context context, cl_command_queue queue, int num_elements );
extern int test_read_array_long( cl_device_id device, cl_context context, cl_command_queue queue, int num_elements );
extern int test_read_array_ulong( cl_device_id device, cl_context context, cl_command_queue queue, int num_elements );
extern int test_read_array_short( cl_device_id device, cl_context context, cl_command_queue queue, int num_elements );
extern int test_read_array_ushort( cl_device_id device, cl_context context, cl_command_queue queue, int num_elements );
extern int test_read_array_float( cl_device_id device, cl_context context, cl_command_queue queue, int num_elements );
extern int test_read_array_half( cl_device_id device, cl_context context, cl_command_queue queue, int num_elements );
extern int test_read_array_char( cl_device_id device, cl_context context, cl_command_queue queue, int num_elements );
extern int test_read_array_uchar( cl_device_id device, cl_context context, cl_command_queue queue, int num_elements );
extern int test_read_array_struct( cl_device_id device, cl_context context, cl_command_queue queue, int num_elements );
extern int test_write_array_int( cl_device_id device, cl_context context, cl_command_queue queue, int num_elements );
extern int test_write_array_uint( cl_device_id device, cl_context context, cl_command_queue queue, int num_elements );
extern int test_write_array_long( cl_device_id device, cl_context context, cl_command_queue queue, int num_elements );
extern int test_write_array_ulong( cl_device_id device, cl_context context, cl_command_queue queue, int num_elements );
extern int test_write_array_short( cl_device_id device, cl_context context, cl_command_queue queue, int num_elements );
extern int test_write_array_ushort( cl_device_id device, cl_context context, cl_command_queue queue, int num_elements );
extern int test_write_array_float( cl_device_id device, cl_context context, cl_command_queue queue, int num_elements );
extern int test_write_array_half( cl_device_id device, cl_context context, cl_command_queue queue, int num_elements );
extern int test_write_array_char( cl_device_id device, cl_context context, cl_command_queue queue, int num_elements );
extern int test_write_array_uchar( cl_device_id device, cl_context context, cl_command_queue queue, int num_elements );
extern int test_write_array_struct( cl_device_id device, cl_context context, cl_command_queue queue, int num_elements );
extern int test_read_image_float( cl_device_id device, cl_context context, cl_command_queue queue, int num_elements );
extern int test_read_image_char( cl_device_id device, cl_context context, cl_command_queue queue, int num_elements );
extern int test_read_image_uchar( cl_device_id device, cl_context context, cl_command_queue queue, int num_elements );
extern int test_write_image_float( cl_device_id device, cl_context context, cl_command_queue queue, int num_elements );
extern int test_write_image_char( cl_device_id device, cl_context context, cl_command_queue queue, int num_elements );
extern int test_write_image_uchar( cl_device_id device, cl_context context, cl_command_queue queue, int num_elements );
extern int test_copy_array( cl_device_id device, cl_context context, cl_command_queue queue, int num_elements );
extern int test_copy_partial_array( cl_device_id device, cl_context context, cl_command_queue queue, int num_elements );
extern int test_copy_image( cl_device_id device, cl_context context, cl_command_queue queue, int num_elements );
extern int test_copy_array_to_image( cl_device_id device, cl_context context, cl_command_queue queue, int num_elements );
extern int test_execute( cl_device_id device, cl_context context, cl_command_queue queue, int num_elements );
extern int test_parallel_kernels( cl_device_id device, cl_context context, cl_command_queue queue, int num_elements );

View File

@@ -773,7 +773,7 @@ int test_stream_read( cl_device_id device, cl_context context, cl_command_queue
} // end test_stream_read()
int read_int_array( cl_device_id device, cl_context context, cl_command_queue queue, int num_elements )
int test_read_array_int( cl_device_id device, cl_context context, cl_command_queue queue, int num_elements )
{
int (*foo)(void *,int);
foo = verify_read_int;
@@ -783,7 +783,7 @@ int read_int_array( cl_device_id device, cl_context context, cl_command_queue qu
}
int read_uint_array( cl_device_id device, cl_context context, cl_command_queue queue, int num_elements )
int test_read_array_uint( cl_device_id device, cl_context context, cl_command_queue queue, int num_elements )
{
int (*foo)(void *,int);
foo = verify_read_uint;
@@ -793,7 +793,7 @@ int read_uint_array( cl_device_id device, cl_context context, cl_command_queue q
}
int read_long_array( cl_device_id device, cl_context context, cl_command_queue queue, int num_elements )
int test_read_array_long( cl_device_id device, cl_context context, cl_command_queue queue, int num_elements )
{
int (*foo)(void *,int);
foo = verify_read_long;
@@ -809,7 +809,7 @@ int read_long_array( cl_device_id device, cl_context context, cl_command_queue q
}
int read_ulong_array( cl_device_id device, cl_context context, cl_command_queue queue, int num_elements )
int test_read_array_ulong( cl_device_id device, cl_context context, cl_command_queue queue, int num_elements )
{
int (*foo)(void *,int);
foo = verify_read_ulong;
@@ -825,7 +825,7 @@ int read_ulong_array( cl_device_id device, cl_context context, cl_command_queue
}
int read_short_array( cl_device_id device, cl_context context, cl_command_queue queue, int num_elements )
int test_read_array_short( cl_device_id device, cl_context context, cl_command_queue queue, int num_elements )
{
int (*foo)(void *,int);
foo = verify_read_short;
@@ -835,7 +835,7 @@ int read_short_array( cl_device_id device, cl_context context, cl_command_queue
}
int read_ushort_array( cl_device_id device, cl_context context, cl_command_queue queue, int num_elements )
int test_read_array_ushort( cl_device_id device, cl_context context, cl_command_queue queue, int num_elements )
{
int (*foo)(void *,int);
foo = verify_read_ushort;
@@ -845,7 +845,7 @@ int read_ushort_array( cl_device_id device, cl_context context, cl_command_queue
}
int read_float_array( cl_device_id device, cl_context context, cl_command_queue queue, int num_elements )
int test_read_array_float( cl_device_id device, cl_context context, cl_command_queue queue, int num_elements )
{
int (*foo)(void *,int);
foo = verify_read_float;
@@ -855,7 +855,7 @@ int read_float_array( cl_device_id device, cl_context context, cl_command_queue
}
int read_half_array( cl_device_id device, cl_context context, cl_command_queue queue, int num_elements )
int test_read_array_half( cl_device_id device, cl_context context, cl_command_queue queue, int num_elements )
{
int (*foo)(void *,int);
foo = verify_read_half;
@@ -865,7 +865,7 @@ int read_half_array( cl_device_id device, cl_context context, cl_command_queue q
}
int read_char_array( cl_device_id device, cl_context context, cl_command_queue queue, int num_elements )
int test_read_array_char( cl_device_id device, cl_context context, cl_command_queue queue, int num_elements )
{
int (*foo)(void *,int);
foo = verify_read_char;
@@ -875,7 +875,7 @@ int read_char_array( cl_device_id device, cl_context context, cl_command_queue q
}
int read_uchar_array( cl_device_id device, cl_context context, cl_command_queue queue, int num_elements )
int test_read_array_uchar( cl_device_id device, cl_context context, cl_command_queue queue, int num_elements )
{
int (*foo)(void *,int);
foo = verify_read_uchar;
@@ -885,7 +885,7 @@ int read_uchar_array( cl_device_id device, cl_context context, cl_command_queue
}
int read_struct_array( cl_device_id device, cl_context context, cl_command_queue queue, int num_elements )
int test_read_array_struct( cl_device_id device, cl_context context, cl_command_queue queue, int num_elements )
{
int (*foo)(void *,int);
foo = verify_read_struct;

View File

@@ -354,7 +354,7 @@ int read_image( cl_device_id device, cl_context context, cl_command_queue queue,
} // end read_image()
int read_float_image( cl_device_id device, cl_context context, cl_command_queue queue, int numElements )
int test_read_image_float( cl_device_id device, cl_context context, cl_command_queue queue, int numElements )
{
cl_image_format image_format_desc = { CL_RGBA, CL_UNORM_INT8 };
PASSIVE_REQUIRE_IMAGE_SUPPORT( device )
@@ -364,7 +364,7 @@ int read_float_image( cl_device_id device, cl_context context, cl_command_queue
}
int read_char_image( cl_device_id device, cl_context context, cl_command_queue queue, int numElements )
int test_read_image_char( cl_device_id device, cl_context context, cl_command_queue queue, int numElements )
{
cl_image_format image_format_desc = { CL_RGBA, CL_SIGNED_INT8 };
PASSIVE_REQUIRE_IMAGE_SUPPORT( device )
@@ -374,7 +374,7 @@ int read_char_image( cl_device_id device, cl_context context, cl_command_queue q
}
int read_uchar_image( cl_device_id device, cl_context context, cl_command_queue queue, int numElements )
int test_read_image_uchar( cl_device_id device, cl_context context, cl_command_queue queue, int numElements )
{
cl_image_format image_format_desc = { CL_RGBA, CL_UNSIGNED_INT8 };
PASSIVE_REQUIRE_IMAGE_SUPPORT( device )

View File

@@ -978,7 +978,7 @@ int test_stream_write( cl_device_id device, cl_context context, cl_command_queue
} // end test_stream_struct_write()
*/
int write_int_array( cl_device_id device, cl_context context, cl_command_queue queue, int num_elements )
int test_write_array_int( cl_device_id device, cl_context context, cl_command_queue queue, int num_elements )
{
int *inptr[5];
size_t ptrSizes[5];
@@ -1014,7 +1014,7 @@ int write_int_array( cl_device_id device, cl_context context, cl_command_queue q
} // end write_int_array()
int write_uint_array( cl_device_id device, cl_context context, cl_command_queue queue, int num_elements )
int test_write_array_uint( cl_device_id device, cl_context context, cl_command_queue queue, int num_elements )
{
cl_uint *inptr[5];
size_t ptrSizes[5];
@@ -1049,7 +1049,7 @@ int write_uint_array( cl_device_id device, cl_context context, cl_command_queue
} // end write_uint_array()
int write_short_array( cl_device_id device, cl_context context, cl_command_queue queue, int num_elements )
int test_write_array_short( cl_device_id device, cl_context context, cl_command_queue queue, int num_elements )
{
short *inptr[5];
size_t ptrSizes[5];
@@ -1084,7 +1084,7 @@ int write_short_array( cl_device_id device, cl_context context, cl_command_queue
} // end write_short_array()
int write_ushort_array( cl_device_id device, cl_context context, cl_command_queue queue, int num_elements )
int test_write_array_ushort( cl_device_id device, cl_context context, cl_command_queue queue, int num_elements )
{
cl_ushort *inptr[5];
size_t ptrSizes[5];
@@ -1119,7 +1119,7 @@ int write_ushort_array( cl_device_id device, cl_context context, cl_command_queu
} // end write_ushort_array()
int write_char_array( cl_device_id device, cl_context context, cl_command_queue queue, int num_elements )
int test_write_array_char( cl_device_id device, cl_context context, cl_command_queue queue, int num_elements )
{
char *inptr[5];
size_t ptrSizes[5];
@@ -1154,7 +1154,7 @@ int write_char_array( cl_device_id device, cl_context context, cl_command_queue
} // end write_char_array()
int write_uchar_array( cl_device_id device, cl_context context, cl_command_queue queue, int num_elements )
int test_write_array_uchar( cl_device_id device, cl_context context, cl_command_queue queue, int num_elements )
{
uchar *inptr[5];
size_t ptrSizes[5];
@@ -1189,7 +1189,7 @@ int write_uchar_array( cl_device_id device, cl_context context, cl_command_queue
} // end write_uchar_array()
int write_float_array( cl_device_id device, cl_context context, cl_command_queue queue, int num_elements )
int test_write_array_float( cl_device_id device, cl_context context, cl_command_queue queue, int num_elements )
{
float *inptr[5];
size_t ptrSizes[5];
@@ -1224,7 +1224,7 @@ int write_float_array( cl_device_id device, cl_context context, cl_command_queue
} // end write_float_array()
int write_half_array( cl_device_id device, cl_context context, cl_command_queue queue, int num_elements )
int test_write_array_half( cl_device_id device, cl_context context, cl_command_queue queue, int num_elements )
{
float *inptr[5];
size_t ptrSizes[5];
@@ -1259,7 +1259,7 @@ int write_half_array( cl_device_id device, cl_context context, cl_command_queue
} // end write_half_array()
int write_long_array( cl_device_id device, cl_context context, cl_command_queue queue, int num_elements )
int test_write_array_long( cl_device_id device, cl_context context, cl_command_queue queue, int num_elements )
{
cl_long *inptr[5];
size_t ptrSizes[5];
@@ -1300,7 +1300,7 @@ int write_long_array( cl_device_id device, cl_context context, cl_command_queue
} // end write_long_array()
int write_ulong_array( cl_device_id device, cl_context context, cl_command_queue queue, int num_elements )
int test_write_array_ulong( cl_device_id device, cl_context context, cl_command_queue queue, int num_elements )
{
cl_ulong *inptr[5];
size_t ptrSizes[5];
@@ -1341,7 +1341,7 @@ int write_ulong_array( cl_device_id device, cl_context context, cl_command_queue
} // end write_ulong_array()
int write_struct_array( cl_device_id device, cl_context context, cl_command_queue queue, int num_elements )
int test_write_array_struct( cl_device_id device, cl_context context, cl_command_queue queue, int num_elements )
{
TestStruct *inptr[1];
size_t ptrSizes[1];

View File

@@ -651,7 +651,7 @@ int write_image( cl_device_id device, cl_context context, cl_command_queue queue
} // end write_image()
int write_float_image( cl_device_id device, cl_context context, cl_command_queue queue, int numElements )
int test_write_image_float( cl_device_id device, cl_context context, cl_command_queue queue, int numElements )
{
cl_image_format image_format_desc = { CL_RGBA, CL_UNORM_INT8 };
PASSIVE_REQUIRE_IMAGE_SUPPORT( device )
@@ -661,7 +661,7 @@ int write_float_image( cl_device_id device, cl_context context, cl_command_queue
}
int write_char_image( cl_device_id device, cl_context context, cl_command_queue queue, int numElements )
int test_write_image_char( cl_device_id device, cl_context context, cl_command_queue queue, int numElements )
{
cl_image_format image_format_desc = { CL_RGBA, CL_SIGNED_INT8 };
PASSIVE_REQUIRE_IMAGE_SUPPORT( device )
@@ -671,7 +671,7 @@ int write_char_image( cl_device_id device, cl_context context, cl_command_queue
}
int write_uchar_image( cl_device_id device, cl_context context, cl_command_queue queue, int numElements )
int test_write_image_uchar( cl_device_id device, cl_context context, cl_command_queue queue, int numElements )
{
cl_image_format image_format_desc = { CL_RGBA, CL_UNSIGNED_INT8 };
PASSIVE_REQUIRE_IMAGE_SUPPORT( device )