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

api: Fix testing of local memory size requirement (#1112)

Browse Source 
The current test would always end up assuming a minimum of 16 KB
regardless of the exposed OpenCL version, and the logic for testing the
OpenCL version was hard to follow.

Besides fixing the test for OpenCL 1.1 through 2.1, it also
* adds support for OpenCL 2.2, 3.0, and future OpenCL versions (as long
  as `get_device_cl_version()` supports those);
* adapts the error message to mention the currently exposed OpenCL
  version rather than a hardcoded OpenCL 1.1;
* reports the advertised local memory size as KB and not Kb, since local
  memory size is given in bytes.
This commit is contained in:
Pierre Moreau
2021-02-05 12:34:10 +01:00
committed by GitHub
parent b67f6bbb29
commit 3719a0183c
1 changed files with 24 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
test_conformance/api/test_api_min_max.cpp
View File

@@ -1670,8 +1670,7 @@ int test_min_max_local_mem_size(cl_device_id deviceID, cl_context context, cl_co
size_t threads[1], localThreads[1];
cl_int *localData, *resultData;
cl_ulong maxSize, kernelLocalUsage, min_max_local_mem_size;
cl_char buffer[ 4098 ];
size_t length;
Version device_version;
int i;
int err = 0;
MTdata d;
@@ -1680,31 +1679,33 @@ int test_min_max_local_mem_size(cl_device_id deviceID, cl_context context, cl_co
error = clGetDeviceInfo( deviceID, CL_DEVICE_LOCAL_MEM_SIZE, sizeof( maxSize ), &maxSize, 0 );
test_error( error, "Unable to get max local buffer size" );
// 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 (!gIsEmbedded)
try
{
if( memcmp( buffer, "OpenCL 2.0", strlen( "OpenCL 2.0" ) ) == 0 )
min_max_local_mem_size = 16L * 1024L;
else if( memcmp( buffer, "OpenCL 2.1", strlen( "OpenCL 2.1" ) ) != 0 )
min_max_local_mem_size = 16L * 1024L;
else if( memcmp( buffer, "OpenCL 1.2", strlen( "OpenCL 1.2" ) ) != 0 )
min_max_local_mem_size = 16L * 1024L;
else if( memcmp( buffer, "OpenCL 1.1", strlen( "OpenCL 1.1" ) ) != 0 )
min_max_local_mem_size = 16L * 1024L;
else if ( memcmp( buffer, "OpenCL 1.0", strlen( "OpenCL 1.0" ) ) != 0 )
min_max_local_mem_size = 32L * 1024L;
else
{
log_error( "ERROR: device version string does not match required format! (returned: %s)\n", (char *)buffer );
return -1;
}
device_version = get_device_cl_version(deviceID);
} catch (const std::runtime_error &e)
{
log_error("%s", e.what());
return -1;
}
if( maxSize < (gIsEmbedded ? 1L * 1024L : min_max_local_mem_size) )
if (!gIsEmbedded)
{
log_error( "ERROR: Reported local mem size less than required by OpenCL 1.1 (reported %dKb)\n", (int)( maxSize / 1024L ) );
if (device_version == Version(1, 0))
min_max_local_mem_size = 16L * 1024L;
else
min_max_local_mem_size = 32L * 1024L;
}
else
{
min_max_local_mem_size = 1L * 1024L;
}
if (maxSize < min_max_local_mem_size)
{
const std::string version_as_string = device_version.to_string();
log_error("ERROR: Reported local mem size less than required by OpenCL "
"%s (reported %d KB)\n",
version_as_string.c_str(), (int)(maxSize / 1024L));
return -1;
}