ahmed/OpenCL-CTS
1
0
Fork 0
mirror of https://github.com/KhronosGroup/OpenCL-CTS.git synced 2026-03-19 06:09:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

cl22: Reuse test harness code in clCopyImage (#199)

Browse Source 
Some of the setup functionality is already there in the test harness, so
use that and remove the duplicated code from within the suite.

Signed-off-by: Radek Szymanski <radek.szymanski@arm.com>
This commit is contained in:
Radek Szymanski
2019-04-25 02:44:57 +01:00
committed by Kévin Petit
parent f42a688ac2
commit cd0af9ca25
11 changed files with 133 additions and 228 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
test_conformance/images/clCopyImage/test_loops.cpp
View File

@@ -21,22 +21,20 @@ extern int gTypesToTest;
extern int gNormalizedModeToUse;
extern bool gTestMipmaps;
extern cl_channel_type gChannelTypeToUse;
extern cl_command_queue queue;
extern cl_context context;
extern cl_channel_type gChannelTypeToUse;
extern cl_channel_order gChannelOrderToUse;
extern bool gDebugTrace;
extern int test_copy_image_set_1D( cl_device_id device, cl_image_format *format );
extern int test_copy_image_set_2D( cl_device_id device, cl_image_format *format );
extern int test_copy_image_set_3D( cl_device_id device, cl_image_format *format );
extern int test_copy_image_set_1D_array( cl_device_id device, cl_image_format *format );
extern int test_copy_image_set_2D_array( cl_device_id device, cl_image_format *format );
extern int test_copy_image_set_2D_3D( cl_device_id device, cl_image_format *format, bool reverse );
extern int test_copy_image_set_2D_2D_array( cl_device_id device, cl_image_format *format, bool reverse );
extern int test_copy_image_set_3D_2D_array( cl_device_id device, cl_image_format *format, bool reverse );
extern int test_copy_image_set_1D( cl_device_id device, cl_context context, cl_command_queue queue, cl_image_format *format );
extern int test_copy_image_set_2D( cl_device_id device, cl_context context, cl_command_queue queue, cl_image_format *format );
extern int test_copy_image_set_3D( cl_device_id device, cl_context context, cl_command_queue queue, cl_image_format *format );
extern int test_copy_image_set_1D_array( cl_device_id device, cl_context context, cl_command_queue queue, cl_image_format *format );
extern int test_copy_image_set_2D_array( cl_device_id device, cl_context context, cl_command_queue queue, cl_image_format *format );
extern int test_copy_image_set_2D_3D( cl_device_id device, cl_context context, cl_command_queue queue, cl_image_format *format, bool reverse );
extern int test_copy_image_set_2D_2D_array( cl_device_id device, cl_context context, cl_command_queue queue, cl_image_format *format, bool reverse );
extern int test_copy_image_set_3D_2D_array( cl_device_id device, cl_context context, cl_command_queue queue, cl_image_format *format, bool reverse );
int filter_formats( cl_image_format *formatList, bool *filterFlags, unsigned int formatCount, cl_channel_type *channelDataTypesToFilter )
@@ -95,7 +93,7 @@ int filter_formats( cl_image_format *formatList, bool *filterFlags, unsigned int
return numSupported;
}
int get_format_list( cl_device_id device, cl_mem_object_type imageType, cl_image_format * &outFormatList, unsigned int &outFormatCount, cl_mem_flags flags )
int get_format_list( cl_context context, cl_mem_object_type imageType, cl_image_format * &outFormatList, unsigned int &outFormatCount, cl_mem_flags flags )
{
int error;
@@ -111,7 +109,7 @@ int get_format_list( cl_device_id device, cl_mem_object_type imageType, cl_image
return 0;
}
int test_image_type( cl_device_id device, MethodsToTest testMethod, cl_mem_flags flags )
int test_image_type( cl_device_id device, cl_context context, cl_command_queue queue, MethodsToTest testMethod, cl_mem_flags flags )
{
const char *name;
cl_mem_object_type imageType;
@@ -195,7 +193,7 @@ int test_image_type( cl_device_id device, MethodsToTest testMethod, cl_mem_flags
bool *filterFlags;
unsigned int numFormats;
if( get_format_list( device, imageType, formatList, numFormats, flags ) )
if( get_format_list( context, imageType, formatList, numFormats, flags ) )
return -1;
filterFlags = new bool[ numFormats ];
@@ -222,27 +220,27 @@ int test_image_type( cl_device_id device, MethodsToTest testMethod, cl_mem_flags
gTestCount++;
if( testMethod == k1D )
test_return = test_copy_image_set_1D( device, &formatList[ i ] );
test_return = test_copy_image_set_1D( device, context, queue, &formatList[ i ] );
else if( testMethod == k2D )
test_return = test_copy_image_set_2D( device, &formatList[ i ] );
test_return = test_copy_image_set_2D( device, context, queue, &formatList[ i ] );
else if( testMethod == k3D )
test_return = test_copy_image_set_3D( device, &formatList[ i ] );
test_return = test_copy_image_set_3D( device, context, queue,&formatList[ i ] );
else if( testMethod == k1DArray )
test_return = test_copy_image_set_1D_array( device, &formatList[ i ] );
test_return = test_copy_image_set_1D_array( device, context, queue, &formatList[ i ] );
else if( testMethod == k2DArray )
test_return = test_copy_image_set_2D_array( device, &formatList[ i ] );
test_return = test_copy_image_set_2D_array( device, context, queue, &formatList[ i ] );
else if( testMethod == k2DTo3D )
test_return = test_copy_image_set_2D_3D( device, &formatList[ i ], false );
test_return = test_copy_image_set_2D_3D( device, context, queue, &formatList[ i ], false );
else if( testMethod == k3DTo2D )
test_return = test_copy_image_set_2D_3D( device, &formatList[ i ], true );
test_return = test_copy_image_set_2D_3D( device, context, queue, &formatList[ i ], true );
else if( testMethod == k2DArrayTo2D)
test_return = test_copy_image_set_2D_2D_array( device, &formatList[ i ], true);
test_return = test_copy_image_set_2D_2D_array( device, context, queue, &formatList[ i ], true);
else if( testMethod == k2DTo2DArray)
test_return = test_copy_image_set_2D_2D_array( device, &formatList[ i ], false);
test_return = test_copy_image_set_2D_2D_array( device, context, queue, &formatList[ i ], false);
else if( testMethod == k2DArrayTo3D)
test_return = test_copy_image_set_3D_2D_array( device, &formatList[ i ], true);
test_return = test_copy_image_set_3D_2D_array( device, context, queue, &formatList[ i ], true);
else if( testMethod == k3DTo2DArray)
test_return = test_copy_image_set_3D_2D_array( device, &formatList[ i ], false);
test_return = test_copy_image_set_3D_2D_array( device, context, queue, &formatList[ i ], false);
if (test_return) {
gTestFailure++;
@@ -260,11 +258,11 @@ int test_image_type( cl_device_id device, MethodsToTest testMethod, cl_mem_flags
return ret;
}
int test_image_set( cl_device_id device, MethodsToTest testMethod )
int test_image_set( cl_device_id device, cl_context context, cl_command_queue queue, MethodsToTest testMethod )
{
int ret = 0;
ret += test_image_type( device, testMethod, CL_MEM_READ_ONLY );
ret += test_image_type( device, context, queue, testMethod, CL_MEM_READ_ONLY );
return ret;
}