From 956d9a05e610c107e9273837d45025e8198b7826 Mon Sep 17 00:00:00 2001 From: Radek Szymanski Date: Fri, 20 Nov 2020 15:06:40 +0100 Subject: [PATCH] Remove unused code in kernel_read_write (#1050) These declarations either aren't used or aren't needed, as testBase.h already declares them. Some definitions got moved to test_common.h, as these are duplicated across few files. There's further opportunity to improve code reuse via test_common.h, but that's for future patch. Signed-off-by: Radek Szymanski --- .../images/kernel_read_write/main.cpp | 12 +----------- .../images/kernel_read_write/test_common.h | 9 +++++++++ .../kernel_read_write/test_iterations.cpp | 16 +--------------- .../images/kernel_read_write/test_loops.cpp | 9 +-------- .../images/kernel_read_write/test_read_1D.cpp | 17 ----------------- .../kernel_read_write/test_read_1D_array.cpp | 17 ----------------- .../kernel_read_write/test_read_2D_array.cpp | 15 --------------- .../images/kernel_read_write/test_read_3D.cpp | 17 ----------------- .../images/kernel_read_write/test_write_1D.cpp | 3 --- .../kernel_read_write/test_write_1D_array.cpp | 2 -- .../kernel_read_write/test_write_2D_array.cpp | 3 --- .../images/kernel_read_write/test_write_3D.cpp | 3 --- .../kernel_read_write/test_write_image.cpp | 3 +-- 13 files changed, 13 insertions(+), 113 deletions(-) diff --git a/test_conformance/images/kernel_read_write/main.cpp b/test_conformance/images/kernel_read_write/main.cpp index 98506934..243cff7c 100644 --- a/test_conformance/images/kernel_read_write/main.cpp +++ b/test_conformance/images/kernel_read_write/main.cpp @@ -13,22 +13,14 @@ // 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/fpcontrol.h" #include "../harness/parseParameters.h" -#include - #if defined(__PPC__) // Global varaiable used to hold the FPU control register state. The FPSCR register can not // be used because not all Power implementations retain or observed the NI (non-IEEE @@ -58,8 +50,6 @@ bool gEnablePitch = false; int gtestTypesToRun = 0; static int testTypesToRun; -#define MAX_ALLOWED_STD_DEVIATION_IN_MB 8.0 - static void printUsage( const char *execName ); extern int test_image_set( cl_device_id device, cl_context context, cl_command_queue queue, test_format_set_fn formatTestFn, cl_mem_object_type imageType ); diff --git a/test_conformance/images/kernel_read_write/test_common.h b/test_conformance/images/kernel_read_write/test_common.h index 1a1a8a1a..cb0d54a4 100644 --- a/test_conformance/images/kernel_read_write/test_common.h +++ b/test_conformance/images/kernel_read_write/test_common.h @@ -2,6 +2,15 @@ #include "../testBase.h" #define ABS_ERROR(result, expected) (fabs(expected - result)) +#define CLAMP(_val, _min, _max) \ + ((_val) < (_min) ? (_min) : (_val) > (_max) ? (_max) : (_val)) + +#define MAX_ERR 0.005f +#define MAX_TRIES 1 +#define MAX_CLAMPED 1 extern cl_sampler create_sampler(cl_context context, image_sampler_data *sdata, bool test_mipmaps, cl_int *error); +extern bool gExtraValidateInfo; +extern bool gDisableOffsets; +extern bool gUseKernelSamplers; diff --git a/test_conformance/images/kernel_read_write/test_iterations.cpp b/test_conformance/images/kernel_read_write/test_iterations.cpp index c518b768..06c6c9cf 100644 --- a/test_conformance/images/kernel_read_write/test_iterations.cpp +++ b/test_conformance/images/kernel_read_write/test_iterations.cpp @@ -22,21 +22,12 @@ #include #endif -#define MAX_ERR 0.005f -#define MAX_HALF_LINEAR_ERR 0.3f - -extern bool gDebugTrace, gExtraValidateInfo, gDisableOffsets, gTestSmallImages, gEnablePitch, gTestMaxImages, gTestImage2DFromBuffer, gTestMipmaps; -extern bool gUseKernelSamplers; -extern cl_filter_mode gFilterModeToUse; -extern cl_addressing_mode gAddressModeToUse; +extern bool gTestImage2DFromBuffer; extern uint64_t gRoundingStartValue; extern cl_mem_flags gMemFlagsToUse; extern int gtestTypesToRun; extern bool gDeviceLt20; -#define MAX_TRIES 1 -#define MAX_CLAMPED 1 - // Utility function to clamp down image sizes for certain tests to avoid // using too much memory. static size_t reduceImageSizeRange(size_t maxDimSize) { @@ -290,8 +281,6 @@ template int determine_validation_error( void *imagePtr, image_descrip return 0; } -#define CLAMP( _val, _min, _max ) ((_val) < (_min) ? (_min) : (_val) > (_max) ? (_max) : (_val)) - static void InitFloatCoords( image_descriptor *imageInfo, image_sampler_data *imageSampler, float *xOffsets, float *yOffsets, float xfract, float yfract, int normalized_coords, MTdata d ) { size_t i = 0; @@ -404,9 +393,6 @@ static void InitFloatCoords( image_descriptor *imageInfo, image_sampler_data *im } } } -#ifndef MAX - #define MAX( _a, _b ) ((_a) > (_b) ? (_a) : (_b)) -#endif int validate_image_2D_depth_results(void *imageValues, void *resultValues, double formatAbsoluteError, float *xOffsetValues, float *yOffsetValues, ExplicitType outputType, int &numTries, int &numClamped, image_sampler_data *imageSampler, image_descriptor *imageInfo, size_t lod, char *imagePtr) diff --git a/test_conformance/images/kernel_read_write/test_loops.cpp b/test_conformance/images/kernel_read_write/test_loops.cpp index 1789df04..b1e0b7e4 100644 --- a/test_conformance/images/kernel_read_write/test_loops.cpp +++ b/test_conformance/images/kernel_read_write/test_loops.cpp @@ -18,16 +18,9 @@ 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 bool gDebugTrace; -extern bool gTestMipmaps; - +extern int gTypesToTest; extern int gtestTypesToRun; -extern bool gDeviceLt20; extern int test_read_image_set_1D(cl_device_id device, cl_context context, cl_command_queue queue, diff --git a/test_conformance/images/kernel_read_write/test_read_1D.cpp b/test_conformance/images/kernel_read_write/test_read_1D.cpp index f094ed63..3e3b930d 100644 --- a/test_conformance/images/kernel_read_write/test_read_1D.cpp +++ b/test_conformance/images/kernel_read_write/test_read_1D.cpp @@ -23,21 +23,11 @@ #include #endif -#define MAX_ERR 0.005f -#define MAX_HALF_LINEAR_ERR 0.3f - -extern bool gDebugTrace, gExtraValidateInfo, gDisableOffsets, gTestSmallImages, gEnablePitch, gTestMaxImages, gTestMipmaps; -extern bool gUseKernelSamplers; -extern cl_filter_mode gFilterModeToUse; -extern cl_addressing_mode gAddressModeToUse; extern uint64_t gRoundingStartValue; extern cl_mem_flags gMemFlagsToUse; extern int gtestTypesToRun; extern bool gDeviceLt20; -#define MAX_TRIES 1 -#define MAX_CLAMPED 1 - const char *read1DKernelSourcePattern = "__kernel void sample_kernel( read_only image1d_t input,%s __global float *xOffsets, __global %s4 *results %s)\n" "{\n" @@ -184,8 +174,6 @@ template int determine_validation_error_1D( void *imagePtr, image_desc return 0; } -#define CLAMP( _val, _min, _max ) ((_val) < (_min) ? (_min) : (_val) > (_max) ? (_max) : (_val)) - static void InitFloatCoords( image_descriptor *imageInfo, image_sampler_data *imageSampler, float *xOffsets, float xfract, int normalized_coords, MTdata d, int lod) { size_t i = 0; @@ -228,11 +216,6 @@ static void InitFloatCoords( image_descriptor *imageInfo, image_sampler_data *im } } -#ifndef MAX - #define MAX( _a, _b ) ((_a) > (_b) ? (_a) : (_b)) -#endif - - int test_read_image_1D( cl_context context, cl_command_queue queue, cl_kernel kernel, image_descriptor *imageInfo, image_sampler_data *imageSampler, bool useFloatCoords, ExplicitType outputType, MTdata d ) diff --git a/test_conformance/images/kernel_read_write/test_read_1D_array.cpp b/test_conformance/images/kernel_read_write/test_read_1D_array.cpp index 1826f208..44797b19 100644 --- a/test_conformance/images/kernel_read_write/test_read_1D_array.cpp +++ b/test_conformance/images/kernel_read_write/test_read_1D_array.cpp @@ -22,21 +22,11 @@ #include #endif -#define MAX_ERR 0.005f -#define MAX_HALF_LINEAR_ERR 0.3f - -extern bool gDebugTrace, gExtraValidateInfo, gDisableOffsets, gTestSmallImages, gEnablePitch, gTestMaxImages, gTestMipmaps; -extern bool gUseKernelSamplers; -extern cl_filter_mode gFilterModeToUse; -extern cl_addressing_mode gAddressModeToUse; extern uint64_t gRoundingStartValue; extern cl_mem_flags gMemFlagsToUse; extern int gtestTypesToRun; extern bool gDeviceLt20; -#define MAX_TRIES 1 -#define MAX_CLAMPED 1 - const char *read1DArrayKernelSourcePattern = "__kernel void sample_kernel( read_only image1d_array_t input,%s __global float *xOffsets, __global float *yOffsets, __global %s4 *results %s)\n" "{\n" @@ -218,8 +208,6 @@ template int determine_validation_error_1D_arr( void *imagePtr, image_ return 0; } -#define CLAMP( _val, _min, _max ) ((_val) < (_min) ? (_min) : (_val) > (_max) ? (_max) : (_val)) - static void InitFloatCoords( image_descriptor *imageInfo, image_sampler_data *imageSampler, float *xOffsets, float *yOffsets, float xfract, float yfract, int normalized_coords, MTdata d , int lod) { size_t i = 0; @@ -277,11 +265,6 @@ static void InitFloatCoords( image_descriptor *imageInfo, image_sampler_data *im } } -#ifndef MAX -#define MAX( _a, _b ) ((_a) > (_b) ? (_a) : (_b)) -#endif - - int test_read_image_1D_array( cl_context context, cl_command_queue queue, cl_kernel kernel, image_descriptor *imageInfo, image_sampler_data *imageSampler, bool useFloatCoords, ExplicitType outputType, MTdata d ) diff --git a/test_conformance/images/kernel_read_write/test_read_2D_array.cpp b/test_conformance/images/kernel_read_write/test_read_2D_array.cpp index ceabceaa..d424fbdd 100644 --- a/test_conformance/images/kernel_read_write/test_read_2D_array.cpp +++ b/test_conformance/images/kernel_read_write/test_read_2D_array.cpp @@ -16,18 +16,9 @@ #include "test_common.h" #include -#define MAX_ERR 0.005f -#define MAX_HALF_LINEAR_ERR 0.3f - -extern bool gDebugTrace, gExtraValidateInfo, gDisableOffsets, gTestSmallImages, gEnablePitch, gTestMaxImages, gTestMipmaps; -extern bool gUseKernelSamplers; -extern cl_filter_mode gFilterModeToUse; -extern cl_addressing_mode gAddressModeToUse; extern cl_mem_flags gMemFlagsToUse; extern int gtestTypesToRun; extern bool gDeviceLt20; -#define MAX_TRIES 1 -#define MAX_CLAMPED 1 // Utility function to clamp down image sizes for certain tests to avoid // using too much memory. @@ -230,8 +221,6 @@ template int determine_validation_error_offset_2D_array( void *imagePt return 0; } -#define CLAMP( _val, _min, _max ) ((_val) < (_min) ? (_min) : (_val) > (_max) ? (_max) : (_val)) - static void InitFloatCoords( image_descriptor *imageInfo, image_sampler_data *imageSampler, float *xOffsets, float *yOffsets, float *zOffsets, float xfract, float yfract, float zfract, int normalized_coords, MTdata d , int lod) { size_t i = 0; @@ -308,10 +297,6 @@ static void InitFloatCoords( image_descriptor *imageInfo, image_sampler_data *im } } -#ifndef MAX -#define MAX(_a, _b) ((_a) > (_b) ? (_a) : (_b)) -#endif - int test_read_image_2D_array( cl_context context, cl_command_queue queue, cl_kernel kernel, image_descriptor *imageInfo, image_sampler_data *imageSampler, bool useFloatCoords, ExplicitType outputType, MTdata d ) diff --git a/test_conformance/images/kernel_read_write/test_read_3D.cpp b/test_conformance/images/kernel_read_write/test_read_3D.cpp index ffb5779a..ae8d737d 100644 --- a/test_conformance/images/kernel_read_write/test_read_3D.cpp +++ b/test_conformance/images/kernel_read_write/test_read_3D.cpp @@ -16,21 +16,10 @@ #include "test_common.h" #include -#define MAX_ERR 0.005f -#define MAX_HALF_LINEAR_ERR 0.3f - -extern bool gDebugTrace, gExtraValidateInfo, gDisableOffsets, gTestSmallImages, gEnablePitch, gTestMaxImages, gTestMipmaps; -extern bool gUseKernelSamplers; -extern cl_filter_mode gFilterModeToUse; -extern cl_addressing_mode gAddressModeToUse; extern cl_mem_flags gMemFlagsToUse; - extern int gtestTypesToRun; extern bool gDeviceLt20; -#define MAX_TRIES 1 -#define MAX_CLAMPED 1 - // Utility function to clamp down image sizes for certain tests to avoid // using too much memory. static size_t reduceImageSizeRange(size_t maxDimSize, RandomSeed& seed) { @@ -214,8 +203,6 @@ template int determine_validation_error_offset( void *imagePtr, image_ return 0; } -#define CLAMP( _val, _min, _max ) ((_val) < (_min) ? (_min) : (_val) > (_max) ? (_max) : (_val)) - static void InitFloatCoords( image_descriptor *imageInfo, image_sampler_data *imageSampler, float *xOffsets, float *yOffsets, float *zOffsets, float xfract, float yfract, float zfract, int normalized_coords, MTdata d , int lod) { size_t i = 0; @@ -309,10 +296,6 @@ static void InitFloatCoords( image_descriptor *imageInfo, image_sampler_data *im } } -#ifndef MAX -#define MAX(_a, _b) ((_a) > (_b) ? (_a) : (_b)) -#endif - int test_read_image_3D( cl_context context, cl_command_queue queue, cl_kernel kernel, image_descriptor *imageInfo, image_sampler_data *imageSampler, bool useFloatCoords, ExplicitType outputType, MTdata d ) diff --git a/test_conformance/images/kernel_read_write/test_write_1D.cpp b/test_conformance/images/kernel_read_write/test_write_1D.cpp index bda5a442..68b913e9 100644 --- a/test_conformance/images/kernel_read_write/test_write_1D.cpp +++ b/test_conformance/images/kernel_read_write/test_write_1D.cpp @@ -19,10 +19,7 @@ #include #endif -extern bool gDebugTrace, gDisableOffsets, gTestSmallImages, gEnablePitch, gTestMaxImages, gTestMipmaps; -extern cl_filter_mode gFilterModeToSkip; extern cl_mem_flags gMemFlagsToUse; - extern int gtestTypesToRun; extern bool gDeviceLt20; diff --git a/test_conformance/images/kernel_read_write/test_write_1D_array.cpp b/test_conformance/images/kernel_read_write/test_write_1D_array.cpp index 1ab59604..57bdd546 100644 --- a/test_conformance/images/kernel_read_write/test_write_1D_array.cpp +++ b/test_conformance/images/kernel_read_write/test_write_1D_array.cpp @@ -19,8 +19,6 @@ #include #endif -extern bool gDebugTrace, gDisableOffsets, gTestSmallImages, gEnablePitch, gTestMaxImages, gTestMipmaps; -extern cl_filter_mode gFilterModeToSkip; extern cl_mem_flags gMemFlagsToUse; extern int gtestTypesToRun; extern bool gDeviceLt20; diff --git a/test_conformance/images/kernel_read_write/test_write_2D_array.cpp b/test_conformance/images/kernel_read_write/test_write_2D_array.cpp index 949bc690..3de46710 100644 --- a/test_conformance/images/kernel_read_write/test_write_2D_array.cpp +++ b/test_conformance/images/kernel_read_write/test_write_2D_array.cpp @@ -19,10 +19,7 @@ #include #endif -extern bool gDebugTrace, gDisableOffsets, gTestSmallImages, gEnablePitch, gTestMaxImages, gTestMipmaps; -extern cl_filter_mode gFilterModeToSkip; extern cl_mem_flags gMemFlagsToUse; - extern int gtestTypesToRun; extern bool gDeviceLt20; diff --git a/test_conformance/images/kernel_read_write/test_write_3D.cpp b/test_conformance/images/kernel_read_write/test_write_3D.cpp index 1ec3f6d7..c6223d8a 100644 --- a/test_conformance/images/kernel_read_write/test_write_3D.cpp +++ b/test_conformance/images/kernel_read_write/test_write_3D.cpp @@ -19,10 +19,7 @@ #include #endif -extern bool gDebugTrace, gDisableOffsets, gTestSmallImages, gEnablePitch, gTestMaxImages, gTestMipmaps; -extern cl_filter_mode gFilterModeToSkip; extern cl_mem_flags gMemFlagsToUse; - extern int gtestTypesToRun; extern bool gDeviceLt20; diff --git a/test_conformance/images/kernel_read_write/test_write_image.cpp b/test_conformance/images/kernel_read_write/test_write_image.cpp index 5830370f..e848ab4f 100644 --- a/test_conformance/images/kernel_read_write/test_write_image.cpp +++ b/test_conformance/images/kernel_read_write/test_write_image.cpp @@ -19,8 +19,7 @@ #include #endif -extern bool gDebugTrace, gDisableOffsets, gTestSmallImages, gEnablePitch, gTestMaxImages, gTestImage2DFromBuffer, gTestMipmaps; -extern cl_filter_mode gFilterModeToSkip; +extern bool gTestImage2DFromBuffer; extern cl_mem_flags gMemFlagsToUse; extern int gtestTypesToRun; extern bool gDeviceLt20;