From bf3d3fef75b9e647c624678854b7e6f3a84747f7 Mon Sep 17 00:00:00 2001 From: Radek Szymanski Date: Fri, 20 Nov 2020 15:06:32 +0100 Subject: [PATCH] Remove unused code in kernel_image_methods (#1048) These declarations either aren't used or aren't needed, as testBase.h already declares them. Signed-off-by: Radek Szymanski --- .../images/kernel_image_methods/main.cpp | 13 ++----------- .../images/kernel_image_methods/test_1D.cpp | 5 +---- .../images/kernel_image_methods/test_1D_array.cpp | 5 +---- .../images/kernel_image_methods/test_2D.cpp | 5 +---- .../images/kernel_image_methods/test_2D_array.cpp | 5 +---- .../images/kernel_image_methods/test_3D.cpp | 5 ----- .../images/kernel_image_methods/test_loops.cpp | 7 ------- 7 files changed, 6 insertions(+), 39 deletions(-) diff --git a/test_conformance/images/kernel_image_methods/main.cpp b/test_conformance/images/kernel_image_methods/main.cpp index ef6bd2cb..a08f133d 100644 --- a/test_conformance/images/kernel_image_methods/main.cpp +++ b/test_conformance/images/kernel_image_methods/main.cpp @@ -13,23 +13,16 @@ // See the License for the specific language governing permissions and // limitations under the License. // -#include "../harness/compat.h" -#include "../harness/parseParameters.h" #include #include - -#if !defined(_WIN32) -#include -#include -#endif - #include "../testBase.h" +#include "../harness/compat.h" +#include "../harness/parseParameters.h" bool gDebugTrace; bool gTestSmallImages; bool gTestMaxImages; -int gTypesToTest; bool gDeviceLt20 = false; cl_channel_type gChannelTypeToUse = (cl_channel_type)-1; @@ -39,8 +32,6 @@ extern int test_image_set( cl_device_id device, cl_context context, cl_command_q static void printUsage( const char *execName ); -#define MAX_ALLOWED_STD_DEVIATION_IN_MB 8.0 - int test_1D(cl_device_id device, cl_context context, cl_command_queue queue, int num_elements) { return test_image_set( device, context, queue, CL_MEM_OBJECT_IMAGE1D ); diff --git a/test_conformance/images/kernel_image_methods/test_1D.cpp b/test_conformance/images/kernel_image_methods/test_1D.cpp index f0c7685e..1093eafe 100644 --- a/test_conformance/images/kernel_image_methods/test_1D.cpp +++ b/test_conformance/images/kernel_image_methods/test_1D.cpp @@ -15,10 +15,7 @@ // #include "../testBase.h" -#define MAX_ERR 0.005f -#define MAX_HALF_LINEAR_ERR 0.3f - -extern bool gDebugTrace, gTestSmallImages, gTestMaxImages, gDeviceLt20; +extern bool gDeviceLt20; struct image_kernel_data { diff --git a/test_conformance/images/kernel_image_methods/test_1D_array.cpp b/test_conformance/images/kernel_image_methods/test_1D_array.cpp index 5353fa65..2cc39a72 100644 --- a/test_conformance/images/kernel_image_methods/test_1D_array.cpp +++ b/test_conformance/images/kernel_image_methods/test_1D_array.cpp @@ -15,10 +15,7 @@ // #include "../testBase.h" -#define MAX_ERR 0.005f -#define MAX_HALF_LINEAR_ERR 0.3f - -extern bool gDebugTrace, gTestSmallImages, gTestMaxImages, gDeviceLt20; +extern bool gDeviceLt20; struct image_kernel_data { diff --git a/test_conformance/images/kernel_image_methods/test_2D.cpp b/test_conformance/images/kernel_image_methods/test_2D.cpp index 05e63628..d036c3ea 100644 --- a/test_conformance/images/kernel_image_methods/test_2D.cpp +++ b/test_conformance/images/kernel_image_methods/test_2D.cpp @@ -15,10 +15,7 @@ // #include "../testBase.h" -#define MAX_ERR 0.005f -#define MAX_HALF_LINEAR_ERR 0.3f - -extern bool gDebugTrace, gTestSmallImages, gTestMaxImages, gDeviceLt20; +extern bool gDeviceLt20; struct image_kernel_data { diff --git a/test_conformance/images/kernel_image_methods/test_2D_array.cpp b/test_conformance/images/kernel_image_methods/test_2D_array.cpp index b9bd6bd5..73c6db2f 100644 --- a/test_conformance/images/kernel_image_methods/test_2D_array.cpp +++ b/test_conformance/images/kernel_image_methods/test_2D_array.cpp @@ -15,10 +15,7 @@ // #include "../testBase.h" -#define MAX_ERR 0.005f -#define MAX_HALF_LINEAR_ERR 0.3f - -extern bool gDebugTrace, gTestSmallImages, gTestMaxImages, gDeviceLt20; +extern bool gDeviceLt20; struct image_kernel_data { diff --git a/test_conformance/images/kernel_image_methods/test_3D.cpp b/test_conformance/images/kernel_image_methods/test_3D.cpp index 390bf8f6..3ac7a250 100644 --- a/test_conformance/images/kernel_image_methods/test_3D.cpp +++ b/test_conformance/images/kernel_image_methods/test_3D.cpp @@ -15,11 +15,6 @@ // #include "../testBase.h" -#define MAX_ERR 0.005f -#define MAX_HALF_LINEAR_ERR 0.3f - -extern bool gDebugTrace, gTestSmallImages, gTestMaxImages, gDeviceLt20; - extern int test_get_image_info_single( cl_context context, cl_command_queue queue, image_descriptor *imageInfo, MTdata d ); int test_get_image_info_3D( cl_device_id device, cl_context context, cl_command_queue queue, cl_image_format *format ) diff --git a/test_conformance/images/kernel_image_methods/test_loops.cpp b/test_conformance/images/kernel_image_methods/test_loops.cpp index 3b56d3ef..8c0a4ead 100644 --- a/test_conformance/images/kernel_image_methods/test_loops.cpp +++ b/test_conformance/images/kernel_image_methods/test_loops.cpp @@ -16,15 +16,8 @@ #include "../testBase.h" #include "../common.h" -extern cl_filter_mode gFilterModeToUse; -extern cl_addressing_mode gAddressModeToUse; -extern int gTypesToTest; -extern int gNormalizedModeToUse; -extern cl_channel_type gChannelTypeToUse; extern bool gDeviceLt20; -extern bool gDebugTrace; - extern int test_get_image_info_1D( cl_device_id device, cl_context context, cl_command_queue queue, cl_image_format *format ); extern int test_get_image_info_2D( cl_device_id device, cl_context context, cl_command_queue queue, cl_image_format *format ); extern int test_get_image_info_3D( cl_device_id device, cl_context context, cl_command_queue queue, cl_image_format *format );