ahmed/OpenCL-CTS
1
0
Fork 0
mirror of https://github.com/KhronosGroup/OpenCL-CTS.git synced 2026-03-19 06:09:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

Move kernel_arg_info compatibility test to the main api suite (#523)

Browse Source 
The diff between the compatibility and non-compatibility tests
is rather big. These tests should both be replaced by a new
maintainable one (see #522).

Contributes to #494.

Signed-off-by: Kevin Petit <kevin.petit@arm.com>
This commit is contained in:
Kévin Petit
2019-12-20 15:55:16 +00:00
committed by GitHub
parent daafdac555
commit 81cffe9132
6 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
test_conformance/api/CMakeLists.txt
View File

@@ -19,6 +19,7 @@ set(${MODULE_NAME}_SOURCES
test_device_min_data_type_align_size_alignment.cpp
test_platform.cpp
test_kernel_arg_info.c
test_kernel_arg_info_compatibility.c
test_null_buffer_arg.c
test_mem_object_info.cpp
test_queue_hint.cpp

1
test_conformance/api/main.c
View File

@@ -53,6 +53,7 @@ test_definition test_list[] = {
ADD_TEST( load_two_kernels_manually ),
ADD_TEST( get_program_info_kernel_names ),
ADD_TEST( get_kernel_arg_info ),
ADD_TEST( get_kernel_arg_info_compatibility ),
ADD_TEST( create_kernels_in_program ),
ADD_TEST( get_kernel_info ),
ADD_TEST( execute_kernel_local_sizes ),

1
test_conformance/api/procs.h
View File

@@ -107,6 +107,7 @@ extern int test_get_image1d_info( cl_device_id deviceID, cl_context context
extern int test_get_image1d_array_info( cl_device_id deviceID, cl_context context, cl_command_queue ignoreQueue, int num_elements );
extern int test_get_image2d_array_info( cl_device_id deviceID, cl_context context, cl_command_queue ignoreQueue, int num_elements );
extern int test_get_kernel_arg_info( cl_device_id deviceID, cl_context context, cl_command_queue queue, int num_elements );
extern int test_get_kernel_arg_info_compatibility( cl_device_id deviceID, cl_context context, cl_command_queue queue, int num_elements );
extern int test_queue_hint(cl_device_id deviceID, cl_context context, cl_command_queue queue, int num_elements);
extern int test_sub_group_dispatch(cl_device_id deviceID, cl_context context, cl_command_queue queue, int num_elements);
extern int test_clone_kernel(cl_device_id deviceID, cl_context context, cl_command_queue queue, int num_elements);

18
test_conformance/compatibility/test_conformance/api/test_kernel_arg_info.c → test_conformance/api/test_kernel_arg_info_compatibility.c
View File

@@ -30,7 +30,7 @@
typedef char const * kernel_args_t[];
kernel_args_t required_kernel_args = {
static kernel_args_t required_kernel_args = {
"typedef float4 typedef_type;\n"
"\n"
"typedef struct struct_type {\n"
@@ -1857,7 +1857,7 @@ kernel_args_t required_kernel_args = {
"\n"
};
const char * required_arg_info[][72] = {
static const char * required_arg_info[][72] = {
// The minimum value of CL_DEVICE_MAX_CONSTANT_ARGS is 4
{
"constant_scalar_p0",
@@ -4038,7 +4038,7 @@ const char * required_arg_info[][72] = {
};
// Support for optional image data type
const char * image_kernel_args[] = {
static const char * image_kernel_args[] = {
"#pragma OPENCL EXTENSION cl_khr_3d_image_writes: enable\n"
"kernel void image_d(read_only image2d_t image2d_td0,\n"
" write_only image2d_t image2d_td1,\n"
@@ -4057,7 +4057,7 @@ const char * image_kernel_args[] = {
"\n"
};
const char * image_arg_info[][67] = {
static const char * image_arg_info[][67] = {
{
"image_d",
(const char *)CL_KERNEL_ARG_ADDRESS_GLOBAL, (const char *)CL_KERNEL_ARG_ACCESS_READ_ONLY, (const char *)(CL_KERNEL_ARG_TYPE_NONE), "image2d_t", "image2d_td0",
@@ -4078,7 +4078,7 @@ const char * image_arg_info[][67] = {
};
// Support for optional double data type
const char * double_kernel_args[] = {
static const char * double_kernel_args[] = {
"kernel void double_scalar_p(constant double*constantdoublep,\n"
" constant double *restrict constantdoublerestrictp,\n"
" global double*globaldoublep,\n"
@@ -4249,7 +4249,7 @@ const char * double_kernel_args[] = {
"\n"
};
const char * double_arg_info[][77] = {
static const char * double_arg_info[][77] = {
{
"double_scalar_p",
(const char *)CL_KERNEL_ARG_ADDRESS_CONSTANT, (const char *)CL_KERNEL_ARG_ACCESS_NONE, (const char *)(CL_KERNEL_ARG_TYPE_CONST), "double*", "constantdoublep",
@@ -4458,7 +4458,7 @@ const char * double_arg_info[][77] = {
// Support for optional half data type
const char * half_kernel_args[] = {
static const char * half_kernel_args[] = {
"#pragma OPENCL EXTENSION cl_khr_fp16 : enable\n"
"\n"
"kernel void half_scalar_p(constant half*constanthalfp,\n"
@@ -4631,7 +4631,7 @@ const char * half_kernel_args[] = {
"\n"
};
const char * half_arg_info[][77] = {
static const char * half_arg_info[][77] = {
{
"half_scalar_p",
(const char *)CL_KERNEL_ARG_ADDRESS_CONSTANT, (const char *)CL_KERNEL_ARG_ACCESS_NONE, (const char *)(CL_KERNEL_ARG_TYPE_CONST), "half*", "constanthalfp",
@@ -5079,7 +5079,7 @@ int test(cl_device_id deviceID, cl_context context, kernel_args_t kernel_args, c
}
int test_get_kernel_arg_info( cl_device_id deviceID, cl_context context, cl_command_queue queue, int num_elements )
int test_get_kernel_arg_info_compatibility( cl_device_id deviceID, cl_context context, cl_command_queue queue, int num_elements )
{
clProgramWrapper program;
clKernelWrapper kernel;

1
test_conformance/compatibility/test_conformance/api/CMakeLists.txt
View File

@@ -3,7 +3,6 @@ set(MODULE_NAME COMPATIBILITY_API)
set(${MODULE_NAME}_SOURCES
main.c
test_mem_object_info.cpp
test_kernel_arg_info.c
)
set(${MODULE_NAME}_LIBS harness-compat)

2
test_conformance/compatibility/test_conformance/api/main.c
View File

@@ -31,8 +31,6 @@ cl_device_type gDeviceType = CL_DEVICE_TYPE_DEFAULT;
bool gTestRounding = false;
test_definition test_list[] = {
ADD_TEST( get_kernel_arg_info ),
ADD_TEST( get_buffer_info ),
ADD_TEST( get_image2d_info ),
ADD_TEST( get_image3d_info ),