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

cl21: Reuse test harness code in samplerlessReads (#245)

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-30 15:17:44 +01:00
committed by Kévin Petit
parent 17b102e2e4
commit 211ea1e342
8 changed files with 72 additions and 171 deletions
Download Patch File Download Diff File Expand all files Collapse all files

126
test_conformance/images/samplerlessReads/main.cpp
View File

@@ -34,45 +34,43 @@
__thread fpu_control_t fpu_control = 0;
#endif
bool gTestReadWrite = false;
bool gDebugTrace = false;
bool gTestMaxImages = false, gTestSmallImages = false, gTestRounding = false;
int gTypesToTest = 0;
bool gTestReadWrite;
bool gDebugTrace;
bool gTestMaxImages;
bool gTestSmallImages;
bool gTestRounding;
int gTypesToTest;
cl_channel_type gChannelTypeToUse = (cl_channel_type)-1;
cl_channel_order gChannelOrderToUse = (cl_channel_order)-1;
bool gEnablePitch = false;
cl_device_type gDeviceType = CL_DEVICE_TYPE_DEFAULT;
cl_command_queue queue;
cl_context context;
static cl_device_id device;
#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_mem_object_type imageType );
extern int test_image_set( cl_device_id device, cl_context context, cl_command_queue queue, cl_mem_object_type imageType );
int test_1D(cl_device_id deviceID, cl_context context, cl_command_queue queue, int num_elements)
int test_1D(cl_device_id device, cl_context context, cl_command_queue queue, int num_elements)
{
return test_image_set( device, CL_MEM_OBJECT_IMAGE1D ) +
test_image_set( device, CL_MEM_OBJECT_IMAGE1D_BUFFER );
return test_image_set( device, context, queue, CL_MEM_OBJECT_IMAGE1D ) +
test_image_set( device, context, queue, CL_MEM_OBJECT_IMAGE1D_BUFFER );
}
int test_2D(cl_device_id deviceID, cl_context context, cl_command_queue queue, int num_elements)
int test_2D(cl_device_id device, cl_context context, cl_command_queue queue, int num_elements)
{
return test_image_set( device, CL_MEM_OBJECT_IMAGE2D );
return test_image_set( device, context, queue, CL_MEM_OBJECT_IMAGE2D );
}
int test_3D(cl_device_id deviceID, cl_context context, cl_command_queue queue, int num_elements)
int test_3D(cl_device_id device, cl_context context, cl_command_queue queue, int num_elements)
{
return test_image_set( device, CL_MEM_OBJECT_IMAGE3D );
return test_image_set( device, context, queue, CL_MEM_OBJECT_IMAGE3D );
}
int test_1Darray(cl_device_id deviceID, cl_context context, cl_command_queue queue, int num_elements)
int test_1Darray(cl_device_id device, cl_context context, cl_command_queue queue, int num_elements)
{
return test_image_set( device, CL_MEM_OBJECT_IMAGE1D_ARRAY );
return test_image_set( device, context, queue, CL_MEM_OBJECT_IMAGE1D_ARRAY );
}
int test_2Darray(cl_device_id deviceID, cl_context context, cl_command_queue queue, int num_elements)
int test_2Darray(cl_device_id device, cl_context context, cl_command_queue queue, int num_elements)
{
return test_image_set( device, CL_MEM_OBJECT_IMAGE2D_ARRAY );
return test_image_set( device, context, queue, CL_MEM_OBJECT_IMAGE2D_ARRAY );
}
test_definition test_list[] = {
@@ -87,17 +85,12 @@ const int test_num = ARRAY_SIZE( test_list );
int main(int argc, const char *argv[])
{
cl_platform_id platform;
cl_channel_type chanType;
cl_channel_order chanOrder;
bool randomize = false;
test_start();
argc = parseCustomParam(argc, argv);
if (argc == -1)
{
test_finish();
return -1;
}
@@ -145,9 +138,6 @@ int main(int argc, const char *argv[])
else if ( strcmp( argv[i], "float" ) == 0 )
gTypesToTest |= kTestFloat;
else if ( strcmp( argv[i], "randomize" ) == 0 )
randomize = true;
else if ( strcmp( argv[i], "--help" ) == 0 || strcmp( argv[i], "-h" ) == 0 )
{
printUsage( argv[ 0 ] );
@@ -169,74 +159,6 @@ int main(int argc, const char *argv[])
if ( gTypesToTest == 0 )
gTypesToTest = kTestAllTypes;
// Seed the random # generators
if ( randomize )
{
gRandomSeed = (cl_uint) time( NULL );
gReSeed = 1;
log_info( "Random seed: %u.\n", gRandomSeed );
}
int error;
// Get our platform
error = clGetPlatformIDs(1, &platform, NULL);
if ( error )
{
print_error( error, "Unable to get platform" );
test_finish();
return -1;
}
// Get our device
error = clGetDeviceIDs(platform, gDeviceType, 1, &device, NULL );
if ( error )
{
print_error( error, "Unable to get specified device" );
test_finish();
return -1;
}
// Get the device type so we know if it is a GPU even if default is passed in.
error = clGetDeviceInfo(device, CL_DEVICE_TYPE, sizeof(gDeviceType), &gDeviceType, NULL);
if ( error )
{
print_error( error, "Unable to get device type" );
test_finish();
return -1;
}
if ( printDeviceHeader( device ) != CL_SUCCESS )
{
test_finish();
return -1;
}
// Check for image support
if (checkForImageSupport( device ) == CL_IMAGE_FORMAT_NOT_SUPPORTED) {
log_info("Device does not support images. Skipping test.\n");
test_finish();
return 0;
}
// Create a context to test with
context = clCreateContext( NULL, 1, &device, notify_callback, NULL, &error );
if ( error != CL_SUCCESS )
{
print_error( error, "Unable to create testing context" );
test_finish();
return -1;
}
// Create a queue against the context
queue = clCreateCommandQueueWithProperties( context, device, 0, &error );
if ( error != CL_SUCCESS )
{
print_error( error, "Unable to create testing command queue" );
test_finish();
return -1;
}
if ( gTestSmallImages )
log_info( "Note: Using small test images\n" );
@@ -251,18 +173,11 @@ int main(int argc, const char *argv[])
FPU_mode_type oldMode;
DisableFTZ(&oldMode);
int ret = parseAndCallCommandLineTests( argCount, argList, NULL, test_num, test_list, true, 0, 0 );
int ret = runTestHarness( argCount, argList, test_num, test_list, true, false, 0 );
// Restore FP state before leaving
RestoreFPState(&oldMode);
error = clFinish(queue);
if (error)
print_error(error, "clFinish failed.");
clReleaseContext(context);
clReleaseCommandQueue(queue);
if (gTestFailure == 0) {
if (gTestCount > 1)
log_info("PASSED %d of %d sub-tests.\n", gTestCount, gTestCount);
@@ -276,10 +191,7 @@ int main(int argc, const char *argv[])
log_error("FAILED sub-test.\n");
}
// Clean up
free(argList);
test_finish();
return ret;
}