From 81cffe91326fef77d819de51ac37bde5795723cd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?K=C3=A9vin=20Petit?= Date: Fri, 20 Dec 2019 15:55:16 +0000 Subject: [PATCH] Move kernel_arg_info compatibility test to the main api suite (#523) 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 --- test_conformance/api/CMakeLists.txt | 1 + test_conformance/api/main.c | 1 + test_conformance/api/procs.h | 1 + .../test_kernel_arg_info_compatibility.c} | 18 +++++++++--------- .../test_conformance/api/CMakeLists.txt | 1 - .../compatibility/test_conformance/api/main.c | 2 -- 6 files changed, 12 insertions(+), 12 deletions(-) rename test_conformance/{compatibility/test_conformance/api/test_kernel_arg_info.c => api/test_kernel_arg_info_compatibility.c} (99%) diff --git a/test_conformance/api/CMakeLists.txt b/test_conformance/api/CMakeLists.txt index 42a1042e..9856baef 100644 --- a/test_conformance/api/CMakeLists.txt +++ b/test_conformance/api/CMakeLists.txt @@ -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 diff --git a/test_conformance/api/main.c b/test_conformance/api/main.c index a2ab9353..1c8cce1f 100644 --- a/test_conformance/api/main.c +++ b/test_conformance/api/main.c @@ -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 ), diff --git a/test_conformance/api/procs.h b/test_conformance/api/procs.h index 1eaa303f..0d952962 100644 --- a/test_conformance/api/procs.h +++ b/test_conformance/api/procs.h @@ -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); diff --git a/test_conformance/compatibility/test_conformance/api/test_kernel_arg_info.c b/test_conformance/api/test_kernel_arg_info_compatibility.c similarity index 99% rename from test_conformance/compatibility/test_conformance/api/test_kernel_arg_info.c rename to test_conformance/api/test_kernel_arg_info_compatibility.c index 5b1e5e6d..eaed9ef8 100644 --- a/test_conformance/compatibility/test_conformance/api/test_kernel_arg_info.c +++ b/test_conformance/api/test_kernel_arg_info_compatibility.c @@ -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; diff --git a/test_conformance/compatibility/test_conformance/api/CMakeLists.txt b/test_conformance/compatibility/test_conformance/api/CMakeLists.txt index 1b387a9e..20e3474c 100644 --- a/test_conformance/compatibility/test_conformance/api/CMakeLists.txt +++ b/test_conformance/compatibility/test_conformance/api/CMakeLists.txt @@ -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) diff --git a/test_conformance/compatibility/test_conformance/api/main.c b/test_conformance/compatibility/test_conformance/api/main.c index 5a07741a..c19d484e 100644 --- a/test_conformance/compatibility/test_conformance/api/main.c +++ b/test_conformance/compatibility/test_conformance/api/main.c @@ -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 ),