From 83cc521e17f18fd1c8ec091c57d718eb2c188843 Mon Sep 17 00:00:00 2001 From: Radek Szymanski Date: Fri, 6 Nov 2020 12:25:12 +0100 Subject: [PATCH] Remove unused code in clFillImage (#1036) These declarations either aren't used or aren't needed, as testBase.h already declares them. Signed-off-by: Radek Szymanski --- test_conformance/images/clFillImage/main.cpp | 9 +-------- test_conformance/images/clFillImage/test_fill_1D.cpp | 8 -------- .../images/clFillImage/test_fill_1D_array.cpp | 8 -------- test_conformance/images/clFillImage/test_fill_2D.cpp | 8 -------- .../images/clFillImage/test_fill_2D_array.cpp | 7 ------- test_conformance/images/clFillImage/test_fill_3D.cpp | 7 ------- .../images/clFillImage/test_fill_generic.cpp | 10 ---------- test_conformance/images/clFillImage/test_loops.cpp | 9 +-------- 8 files changed, 2 insertions(+), 64 deletions(-) diff --git a/test_conformance/images/clFillImage/main.cpp b/test_conformance/images/clFillImage/main.cpp index 23d9e4cc..1f09a49e 100644 --- a/test_conformance/images/clFillImage/main.cpp +++ b/test_conformance/images/clFillImage/main.cpp @@ -13,17 +13,11 @@ // See the License for the specific language governing permissions and // limitations under the License. // -#include "../harness/compat.h" #include #include - -#if !defined(_WIN32) -#include -#include -#endif - #include "../testBase.h" +#include "../harness/compat.h" #include "../harness/testHarness.h" bool gDebugTrace; @@ -37,7 +31,6 @@ cl_channel_order gChannelOrderToUse = (cl_channel_order)-1; extern int test_image_set( cl_device_id device, cl_context context, cl_command_queue queue, MethodsToTest testMethod ); 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) { diff --git a/test_conformance/images/clFillImage/test_fill_1D.cpp b/test_conformance/images/clFillImage/test_fill_1D.cpp index 51eb822b..c3f23185 100644 --- a/test_conformance/images/clFillImage/test_fill_1D.cpp +++ b/test_conformance/images/clFillImage/test_fill_1D.cpp @@ -15,14 +15,6 @@ // #include "../testBase.h" -#define MAX_ERR 0.005f -#define MAX_HALF_LINEAR_ERR 0.3f - -extern bool gDebugTrace, gDisableOffsets, gTestSmallImages, gEnablePitch, gTestMaxImages; -extern cl_filter_mode gFilterModeToUse; -extern cl_addressing_mode gAddressModeToUse; -extern uint64_t gRoundingStartValue; - // Defined in test_fill_2D_3D.cpp extern int test_fill_image_generic( cl_context context, cl_command_queue queue, image_descriptor *imageInfo, const size_t origin[], const size_t region[], ExplicitType outputType, MTdata d ); diff --git a/test_conformance/images/clFillImage/test_fill_1D_array.cpp b/test_conformance/images/clFillImage/test_fill_1D_array.cpp index edbcacd9..b4347a47 100644 --- a/test_conformance/images/clFillImage/test_fill_1D_array.cpp +++ b/test_conformance/images/clFillImage/test_fill_1D_array.cpp @@ -15,14 +15,6 @@ // #include "../testBase.h" -#define MAX_ERR 0.005f -#define MAX_HALF_LINEAR_ERR 0.3f - -extern bool gDebugTrace, gDisableOffsets, gTestSmallImages, gEnablePitch, gTestMaxImages; -extern cl_filter_mode gFilterModeToUse; -extern cl_addressing_mode gAddressModeToUse; -extern uint64_t gRoundingStartValue; - // Defined in test_fill_2D_3D.cpp extern int test_fill_image_generic( cl_context context, cl_command_queue queue, image_descriptor *imageInfo, const size_t origin[], const size_t region[], ExplicitType outputType, MTdata d ); diff --git a/test_conformance/images/clFillImage/test_fill_2D.cpp b/test_conformance/images/clFillImage/test_fill_2D.cpp index 8e76e86c..bb66fc27 100644 --- a/test_conformance/images/clFillImage/test_fill_2D.cpp +++ b/test_conformance/images/clFillImage/test_fill_2D.cpp @@ -15,14 +15,6 @@ // #include "../testBase.h" -#define MAX_ERR 0.005f -#define MAX_HALF_LINEAR_ERR 0.3f - -extern bool gDebugTrace, gDisableOffsets, gTestSmallImages, gEnablePitch, gTestMaxImages; -extern cl_filter_mode gFilterModeToUse; -extern cl_addressing_mode gAddressModeToUse; -extern uint64_t gRoundingStartValue; - // Defined in test_fill_2D_3D.cpp extern int test_fill_image_generic( cl_context context, cl_command_queue queue, image_descriptor *imageInfo, const size_t origin[], const size_t region[], ExplicitType outputType, MTdata d ); diff --git a/test_conformance/images/clFillImage/test_fill_2D_array.cpp b/test_conformance/images/clFillImage/test_fill_2D_array.cpp index 260b869f..3265aab0 100644 --- a/test_conformance/images/clFillImage/test_fill_2D_array.cpp +++ b/test_conformance/images/clFillImage/test_fill_2D_array.cpp @@ -15,13 +15,6 @@ // #include "../testBase.h" -#define MAX_ERR 0.005f -#define MAX_HALF_LINEAR_ERR 0.3f - -extern bool gDebugTrace, gDisableOffsets, gTestSmallImages, gTestMaxImages, gEnablePitch; -extern cl_filter_mode gFilterModeToUse; -extern cl_addressing_mode gAddressModeToUse; - // Defined in test_fill_2D_3D.cpp extern int test_fill_image_generic( cl_context context, cl_command_queue queue, image_descriptor *imageInfo, const size_t origin[], const size_t region[], ExplicitType outputType, MTdata d ); diff --git a/test_conformance/images/clFillImage/test_fill_3D.cpp b/test_conformance/images/clFillImage/test_fill_3D.cpp index 298db0e7..9db0ac7c 100644 --- a/test_conformance/images/clFillImage/test_fill_3D.cpp +++ b/test_conformance/images/clFillImage/test_fill_3D.cpp @@ -15,13 +15,6 @@ // #include "../testBase.h" -#define MAX_ERR 0.005f -#define MAX_HALF_LINEAR_ERR 0.3f - -extern bool gDebugTrace, gDisableOffsets, gTestSmallImages, gTestMaxImages, gEnablePitch; -extern cl_filter_mode gFilterModeToUse; -extern cl_addressing_mode gAddressModeToUse; - // Defined in test_fill_2D_3D.cpp extern int test_fill_image_generic( cl_context context, cl_command_queue queue, image_descriptor *imageInfo, const size_t origin[], const size_t region[], ExplicitType outputType, MTdata d ); diff --git a/test_conformance/images/clFillImage/test_fill_generic.cpp b/test_conformance/images/clFillImage/test_fill_generic.cpp index 6b59bada..c5989392 100644 --- a/test_conformance/images/clFillImage/test_fill_generic.cpp +++ b/test_conformance/images/clFillImage/test_fill_generic.cpp @@ -15,23 +15,13 @@ // #include "../testBase.h" -#define MAX_ERR 0.005f -#define MAX_HALF_LINEAR_ERR 0.3f - -extern bool gDebugTrace, gDisableOffsets, gTestSmallImages, gTestMaxImages, gEnablePitch; -extern cl_filter_mode gFilterModeToUse; -extern cl_addressing_mode gAddressModeToUse; -extern uint64_t gRoundingStartValue; - extern void read_image_pixel_float( void *imageData, image_descriptor *imageInfo, int x, int y, int z, float *outData ); - static void CL_CALLBACK free_pitch_buffer( cl_mem image, void *buf ) { free( buf ); } - cl_mem create_image( cl_context context, cl_command_queue queue, BufferOwningPtr& data, image_descriptor *imageInfo, int *error ) { cl_mem img; diff --git a/test_conformance/images/clFillImage/test_loops.cpp b/test_conformance/images/clFillImage/test_loops.cpp index 0a4c571f..3ab696ef 100644 --- a/test_conformance/images/clFillImage/test_loops.cpp +++ b/test_conformance/images/clFillImage/test_loops.cpp @@ -16,14 +16,7 @@ #include "../testBase.h" #include "../common.h" -extern bool gDebugTrace; -extern cl_filter_mode gFilterModeToUse; -extern cl_addressing_mode gAddressModeToUse; -extern int gTypesToTest; -extern int gNormalizedModeToUse; -extern cl_channel_type gChannelTypeToUse; -extern cl_channel_order gChannelOrderToUse; - +extern int gTypesToTest; extern int test_fill_image_set_1D( cl_device_id device, cl_context context, cl_command_queue queue, cl_image_format *format, ExplicitType outputType ); extern int test_fill_image_set_2D( cl_device_id device, cl_context context, cl_command_queue queue, cl_image_format *format, ExplicitType outputType );