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

Replace get_device_version with get_cl_device_version (#733)

Browse Source 
They are duplicate functions

Fixes #709

Change-Id: I8f7d6b8254047adb9e09ede4951dedc3ec5c1099
Signed-off-by: Ellen Norris-Thompson <ellen.norris-thompson@arm.com>
This commit is contained in:
ellnor01
2020-04-15 14:31:22 +01:00
committed by GitHub
parent ce39ffdda7
commit 3b79ecdb87
7 changed files with 11 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
test_conformance/SVM/main.cpp
View File

@@ -198,12 +198,9 @@ cl_int create_cl_objects(cl_device_id device_from_harness, const char** ppCodeSt
cl_uint num_capable_devices = 0;
for(cl_uint i = 0; i < *num_devices; i++)
{
size_t major = 0;
size_t minor = 0;
error = get_device_version(devices[i], &major, &minor);
test_error(error, "get_device_version failed");
Version version = get_device_cl_version(devices[i]);
if(device_from_harness != devices[i] && major < 2)
if(device_from_harness != devices[i] && version < Version(2,0))
{
continue;
}

9
test_conformance/atomics/test_atomics.cpp
View File

@@ -94,16 +94,13 @@ bool check_atomic_support( cl_device_id device, bool extended, bool isLocal, Exp
if( isLocal )
index += 2;
size_t major, minor;
int error = get_device_version(device, &major, &minor);
test_error( error, "get_device_version" );
Version version = get_device_cl_version(device);
switch (dataType)
{
case kInt:
case kUInt:
if( major * 10 + minor >= 11 )
if( version >= Version(1,1) )
return 1;
break;
case kLong:
@@ -111,7 +108,7 @@ bool check_atomic_support( cl_device_id device, bool extended, bool isLocal, Exp
index += 4;
break;
case kFloat: // this has to stay separate since the float atomics arent in the 1.0 extensions
return major * 10 + minor >= 11;
return version >= Version(1,1);
default:
log_error( "ERROR: Unsupported data type (%d) in check_atomic_support\n", dataType );
return 0;

6
test_conformance/basic/test_sizeof.cpp
View File

@@ -49,11 +49,9 @@ cl_int get_type_size( cl_context context, cl_command_queue queue, const char *ty
{
sizeof_kernel_code[0] = "#pragma OPENCL EXTENSION cl_khr_fp16 : enable\n";
}
size_t major = 0;
size_t minor = 0;
bool deviceLt20 = false;
int error = get_device_version(device, &major, &minor);
if (major < 2) {
Version version = get_device_cl_version(device);
if (version < Version(2,0)) {
deviceLt20 = true;
}

5
test_conformance/clcpp/workitems/test_workitems.hpp
View File

@@ -218,10 +218,9 @@ int test_workitems(cl_device_id device, cl_context context, cl_command_queue que
check_sub_groups_limits = false;
if (is_extension_available(device, "cl_khr_subgroups"))
{
size_t major, minor;
error = get_device_version(device, &major, &minor);
Version version = get_device_cl_version(device);
RETURN_ON_ERROR(error)
check_sub_groups_limits = (major > 2 || major == 2 && minor >= 1); // clGetKernelSubGroupInfo is from 2.1
check_sub_groups_limits = (version >= Version(2,1)); // clGetKernelSubGroupInfo is from 2.1
check_sub_groups = true;
}
#endif

7
test_conformance/compiler/test_compiler_defines_for_extensions.cpp
View File

@@ -333,12 +333,9 @@ int test_compiler_defines_for_extensions(cl_device_id device, cl_context context
cl_program program;
cl_kernel kernel;
size_t major = 0;
size_t minor = 0;
error = get_device_version(device, &major, &minor);
test_error(error, "get_device_version failed");
Version version = get_device_cl_version(device);
error = create_single_kernel_helper(context, &program, &kernel, 1, (const char **)&kernel_code, "test", major < 2 ? "" : "-cl-std=CL2.0");
error = create_single_kernel_helper(context, &program, &kernel, 1, (const char **)&kernel_code, "test", version < Version(2,0) ? "" : "-cl-std=CL2.0");
test_error(error, "create_single_kernel_helper failed");
data = (cl_int*)malloc(sizeof(cl_int)*(num_not_supported_extensions+num_of_supported_extensions));