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

test_api - fix minRequiredDimension in case of new OpenCL version (#779)

Browse Source 
* Fix minRequiredDimension in case of new OpenCL version

* Fix code formatting
This commit is contained in:
Grzegorz Wawiorko
2020-05-19 11:16:21 +02:00
committed by GitHub
parent ec32bd9b5e
commit 223c43b7d9
1 changed files with 11 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
test_conformance/api/test_api_min_max.cpp
View File

@@ -554,29 +554,19 @@ int test_min_max_image_2d_width(cl_device_id deviceID, cl_context context, cl_co
cl_image_format image_format_desc;
cl_ulong maxAllocSize;
cl_uint minRequiredDimension;
cl_char buffer[ 4098 ];
size_t length;
PASSIVE_REQUIRE_IMAGE_SUPPORT( deviceID )
// Device version should fit the regex "OpenCL [0-9]+\.[0-9]+ *.*"
error = clGetDeviceInfo( deviceID, CL_DEVICE_VERSION, sizeof( buffer ), buffer, &length );
test_error( error, "Unable to get device version string" );
if( memcmp( buffer, "OpenCL 2.0", strlen( "OpenCL 2.0" ) ) == 0 )
minRequiredDimension = gIsEmbedded ? 2048 : 8192;
else if( memcmp( buffer, "OpenCL 2.1", strlen( "OpenCL 2.1" ) ) == 0 )
minRequiredDimension = gIsEmbedded ? 2048 : 8192;
else if( memcmp( buffer, "OpenCL 1.2", strlen( "OpenCL 1.2" ) ) == 0 )
minRequiredDimension = gIsEmbedded ? 2048 : 8192;
else if( memcmp( buffer, "OpenCL 1.1", strlen( "OpenCL 1.1" ) ) == 0 )
minRequiredDimension = gIsEmbedded ? 2048 : 8192;
else if ( memcmp( buffer, "OpenCL 1.0", strlen( "OpenCL 1.0" ) ) == 0 )
auto version = get_device_cl_version(deviceID);
if (version == Version(1, 0))
{
minRequiredDimension = gIsEmbedded ? 2048 : 4096;
}
else
{
log_error( "ERROR: device version string does not match required format! (returned: %s)\n", (char *)buffer );
return -1;
minRequiredDimension = gIsEmbedded ? 2048 : 8192;
}
@@ -633,28 +623,18 @@ int test_min_max_image_2d_height(cl_device_id deviceID, cl_context context, cl_c
cl_image_format image_format_desc;
cl_ulong maxAllocSize;
cl_uint minRequiredDimension;
cl_char buffer[ 4098 ];
size_t length;
PASSIVE_REQUIRE_IMAGE_SUPPORT( deviceID )
// Device version should fit the regex "OpenCL [0-9]+\.[0-9]+ *.*"
error = clGetDeviceInfo( deviceID, CL_DEVICE_VERSION, sizeof( buffer ), buffer, &length );
test_error( error, "Unable to get device version string" );
if( memcmp( buffer, "OpenCL 2.0", strlen( "OpenCL 2.0" ) ) == 0 )
minRequiredDimension = gIsEmbedded ? 2048 : 8192;
else if( memcmp( buffer, "OpenCL 2.1", strlen( "OpenCL 2.1" ) ) == 0 )
minRequiredDimension = gIsEmbedded ? 2048 : 8192;
else if( memcmp( buffer, "OpenCL 1.2", strlen( "OpenCL 1.2" ) ) == 0 )
minRequiredDimension = gIsEmbedded ? 2048 : 8192;
else if( memcmp( buffer, "OpenCL 1.1", strlen( "OpenCL 1.1" ) ) == 0 )
minRequiredDimension = gIsEmbedded ? 2048 : 8192;
else if ( memcmp( buffer, "OpenCL 1.0", strlen( "OpenCL 1.0" ) ) == 0 )
minRequiredDimension = gIsEmbedded ? 2048 : 4096;
auto version = get_device_cl_version(deviceID);
if (version == Version(1, 0))
{
minRequiredDimension = gIsEmbedded ? 2048 : 4096;
}
else
{
log_error( "ERROR: device version string does not match required format! (returned: %s)\n", (char *)buffer );
return -1;
minRequiredDimension = gIsEmbedded ? 2048 : 8192;
}
/* Just get any ol format to test with */