ahmed/OpenCL-CTS
1
0
Fork 0
mirror of https://github.com/KhronosGroup/OpenCL-CTS.git synced 2026-03-24 15:59:03 +00:00
Code Packages Projects Releases Wiki Activity

Remove duplicated random_in_ranges function (#763)

Browse Source 
This function is duplicated across clCopyImages files, so just keep one
definition in common file, and get rid of the duplicated ones.

Signed-off-by: Radek Szymanski <radek.szymanski@arm.com>
This commit is contained in:
Radek Szymanski
2020-05-06 13:09:48 +01:00
committed by GitHub
parent 8d28a5dc83
commit 77d755c8ee
6 changed files with 11 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
test_conformance/images/clCopyImage/test_copy_2D_2D_array.cpp
View File

@@ -14,6 +14,7 @@
// limitations under the License. // limitations under the License.
// //
#include "../testBase.h" #include "../testBase.h"
#include "../common.h"
#define MAX_ERR 0.005f #define MAX_ERR 0.005f
#define MAX_HALF_LINEAR_ERR 0.3f #define MAX_HALF_LINEAR_ERR 0.3f
@@ -26,17 +27,6 @@ extern uint64_t gRoundingStartValue;
extern int test_copy_image_generic( cl_context context, cl_command_queue queue, image_descriptor *srcImageInfo, image_descriptor *dstImageInfo, extern int test_copy_image_generic( cl_context context, cl_command_queue queue, image_descriptor *srcImageInfo, image_descriptor *dstImageInfo,
const size_t sourcePos[], const size_t destPos[], const size_t regionSize[], MTdata d ); const size_t sourcePos[], const size_t destPos[], const size_t regionSize[], MTdata d );
static size_t random_in_ranges( size_t minimum, size_t rangeA, size_t rangeB, MTdata d )
{
if( rangeB < rangeA )
rangeA = rangeB;
if( rangeA < minimum )
return rangeA;
return (size_t)random_in_range( (int)minimum, (int)rangeA - 1, d );
}
static void set_image_dimensions( image_descriptor *imageInfo, size_t width, size_t height, size_t arraySize, size_t rowPadding, size_t slicePadding ) static void set_image_dimensions( image_descriptor *imageInfo, size_t width, size_t height, size_t arraySize, size_t rowPadding, size_t slicePadding )
{ {
size_t pixelSize = get_pixel_size( imageInfo->format ); size_t pixelSize = get_pixel_size( imageInfo->format );

12
test_conformance/images/clCopyImage/test_copy_2D_3D.cpp
View File

@@ -14,6 +14,7 @@
// limitations under the License. // limitations under the License.
// //
#include "../testBase.h" #include "../testBase.h"
#include "../common.h"
#define MAX_ERR 0.005f #define MAX_ERR 0.005f
#define MAX_HALF_LINEAR_ERR 0.3f #define MAX_HALF_LINEAR_ERR 0.3f
@@ -26,17 +27,6 @@ extern uint64_t gRoundingStartValue;
extern int test_copy_image_generic( cl_context context, cl_command_queue queue, image_descriptor *srcImageInfo, image_descriptor *dstImageInfo, extern int test_copy_image_generic( cl_context context, cl_command_queue queue, image_descriptor *srcImageInfo, image_descriptor *dstImageInfo,
const size_t sourcePos[], const size_t destPos[], const size_t regionSize[], MTdata d ); const size_t sourcePos[], const size_t destPos[], const size_t regionSize[], MTdata d );
static size_t random_in_ranges( size_t minimum, size_t rangeA, size_t rangeB, MTdata d )
{
if( rangeB < rangeA )
rangeA = rangeB;
if( rangeA < minimum )
return rangeA;
return (size_t)random_in_range( (int)minimum, (int)rangeA - 1, d );
}
static void set_image_dimensions( image_descriptor *imageInfo, size_t width, size_t height, size_t depth, size_t rowPadding, size_t slicePadding ) static void set_image_dimensions( image_descriptor *imageInfo, size_t width, size_t height, size_t depth, size_t rowPadding, size_t slicePadding )
{ {
size_t pixelSize = get_pixel_size( imageInfo->format ); size_t pixelSize = get_pixel_size( imageInfo->format );

12
test_conformance/images/clCopyImage/test_copy_3D_2D_array.cpp
View File

@@ -14,6 +14,7 @@
// limitations under the License. // limitations under the License.
// //
#include "../testBase.h" #include "../testBase.h"
#include "../common.h"
#define MAX_ERR 0.005f #define MAX_ERR 0.005f
#define MAX_HALF_LINEAR_ERR 0.3f #define MAX_HALF_LINEAR_ERR 0.3f
@@ -26,17 +27,6 @@ extern uint64_t gRoundingStartValue;
extern int test_copy_image_generic( cl_context context, cl_command_queue queue, image_descriptor *srcImageInfo, image_descriptor *dstImageInfo, extern int test_copy_image_generic( cl_context context, cl_command_queue queue, image_descriptor *srcImageInfo, image_descriptor *dstImageInfo,
const size_t sourcePos[], const size_t destPos[], const size_t regionSize[], MTdata d ); const size_t sourcePos[], const size_t destPos[], const size_t regionSize[], MTdata d );
static size_t random_in_ranges( size_t minimum, size_t rangeA, size_t rangeB, MTdata d )
{
if( rangeB < rangeA )
rangeA = rangeB;
if( rangeA < minimum )
return rangeA;
return (size_t)random_in_range( (int)minimum, (int)rangeA - 1, d );
}
static void set_image_dimensions( image_descriptor *imageInfo, size_t width, size_t height, size_t depth, size_t arraySize, size_t rowPadding, size_t slicePadding ) static void set_image_dimensions( image_descriptor *imageInfo, size_t width, size_t height, size_t depth, size_t arraySize, size_t rowPadding, size_t slicePadding )
{ {
size_t pixelSize = get_pixel_size( imageInfo->format ); size_t pixelSize = get_pixel_size( imageInfo->format );

9
test_conformance/images/clCopyImage/test_copy_generic.cpp
View File

@@ -23,15 +23,6 @@ extern cl_filter_mode gFilterModeToUse;
extern cl_addressing_mode gAddressModeToUse; extern cl_addressing_mode gAddressModeToUse;
extern uint64_t gRoundingStartValue; extern uint64_t gRoundingStartValue;
size_t random_in_ranges( size_t minimum, size_t rangeA, size_t rangeB, MTdata d )
{
if( rangeB < rangeA )
rangeA = rangeB;
if( rangeA < minimum )
return rangeA;
return (size_t)random_in_range( (int)minimum, (int)rangeA - 1, d );
}
static void CL_CALLBACK free_pitch_buffer( cl_mem image, void *buf ) static void CL_CALLBACK free_pitch_buffer( cl_mem image, void *buf )
{ {
free( buf ); free( buf );

7
test_conformance/images/common.cpp
View File

@@ -158,3 +158,10 @@ int get_format_list(cl_context context, cl_mem_object_type imageType,
test_error(error, "Unable to get list of supported image formats"); test_error(error, "Unable to get list of supported image formats");
return 0; return 0;
} }
size_t random_in_ranges(size_t minimum, size_t rangeA, size_t rangeB, MTdata d)
{
if (rangeB < rangeA) rangeA = rangeB;
if (rangeA < minimum) return rangeA;
return (size_t)random_in_range((int)minimum, (int)rangeA - 1, d);
}

1
test_conformance/images/common.h
View File

@@ -48,5 +48,6 @@ int filter_formats(cl_image_format *formatList, bool *filterFlags,
int get_format_list(cl_context context, cl_mem_object_type imageType, int get_format_list(cl_context context, cl_mem_object_type imageType,
cl_image_format *&outFormatList, cl_image_format *&outFormatList,
unsigned int &outFormatCount, cl_mem_flags flags); unsigned int &outFormatCount, cl_mem_flags flags);
size_t random_in_ranges(size_t minimum, size_t rangeA, size_t rangeB, MTdata d);
#endif // IMAGES_COMMON_H #endif // IMAGES_COMMON_H