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

Update cl_khr_integer_dot_product tests for v2 (#1317)

Browse Source 
* Update cl_khr_integer_dot_product tests for v2

Signed-off-by: Kevin Petit <kevin.petit@arm.com>
Signed-off-by: Marco Cattani <marco.cattani@arm.com>
Change-Id: I97dbd820f1f32f6b377e47d0bf638f36bb91930a

* only query acceleration properties with v2+

Change-Id: I3f13a0cba7f1f686365b10adf81690e089cd3d74
This commit is contained in:
Kévin Petit
2021-09-29 12:38:42 +01:00
committed by GitHub
parent 4fb5deeec1
commit 2b770c4f34
3 changed files with 106 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
test_common/harness/deviceInfo.cpp
View File

@@ -63,6 +63,40 @@ int is_extension_available(cl_device_id device, const char *extensionName)
return false;
}
cl_version get_extension_version(cl_device_id device, const char *extensionName)
{
cl_int err;
size_t size;
err = clGetDeviceInfo(device, CL_DEVICE_EXTENSIONS_WITH_VERSION, 0, nullptr,
&size);
if (err != CL_SUCCESS)
{
throw std::runtime_error("clGetDeviceInfo(CL_DEVICE_EXTENSIONS_WITH_"
"VERSION) failed to return size\n");
}
std::vector<cl_name_version> extensions(size / sizeof(cl_name_version));
err = clGetDeviceInfo(device, CL_DEVICE_EXTENSIONS_WITH_VERSION, size,
extensions.data(), &size);
if (err != CL_SUCCESS)
{
throw std::runtime_error("clGetDeviceInfo(CL_DEVICE_EXTENSIONS_WITH_"
"VERSION) failed to return value\n");
}
for (auto &ext : extensions)
{
if (!strcmp(extensionName, ext.name))
{
return ext.version;
}
}
throw std::runtime_error("Extension " + std::string(extensionName)
+ " not supported by device!");
}
/* Returns a string containing the supported extensions list for a device. */
std::string get_device_extensions_string(cl_device_id device)
{

5
test_common/harness/deviceInfo.h
View File

@@ -31,6 +31,11 @@ std::string get_device_info_string(cl_device_id device,
/* Determines if an extension is supported by a device. */
int is_extension_available(cl_device_id device, const char *extensionName);
/* Returns the version of the extension the device supports or throws an
* exception if the extension is not supported by the device. */
cl_version get_extension_version(cl_device_id device,
const char *extensionName);
/* Returns a string containing the supported extensions list for a device. */
std::string get_device_extensions_string(cl_device_id device);

67
test_conformance/integer_ops/test_integer_dot_product.cpp
View File

@@ -336,6 +336,21 @@ int test_integer_dot_product(cl_device_id deviceID, cl_context context,
return TEST_SKIPPED_ITSELF;
}
Version deviceVersion = get_device_cl_version(deviceID);
cl_version extensionVersion;
if ((deviceVersion >= Version(3, 0))
|| is_extension_available(deviceID, "cl_khr_extended_versioning"))
{
extensionVersion =
get_extension_version(deviceID, "cl_khr_integer_dot_product");
}
else
{
// Assume 1.0.0 is supported if the version can't be queried
extensionVersion = CL_MAKE_VERSION(1, 0, 0);
}
cl_int error = CL_SUCCESS;
int result = TEST_PASS;
@@ -346,12 +361,63 @@ int test_integer_dot_product(cl_device_id deviceID, cl_context context,
test_error(
error,
"Unable to query CL_DEVICE_INTEGER_DOT_PRODUCT_CAPABILITIES_KHR");
// Check that the required capabilities are reported
test_assert_error(
dotCaps & CL_DEVICE_INTEGER_DOT_PRODUCT_INPUT_4x8BIT_PACKED_KHR,
"When cl_khr_integer_dot_product is supported "
"CL_DEVICE_INTEGER_DOT_PRODUCT_INPUT_4x8BIT_PACKED_KHR must be "
"supported");
if (extensionVersion >= CL_MAKE_VERSION(2, 0, 0))
{
test_assert_error(
dotCaps & CL_DEVICE_INTEGER_DOT_PRODUCT_INPUT_4x8BIT_KHR,
"When cl_khr_integer_dot_product is supported with version >= 2.0.0"
"CL_DEVICE_INTEGER_DOT_PRODUCT_INPUT_4x8BIT_KHR must be "
"supported");
}
// Check that acceleration properties can be queried
if (extensionVersion >= CL_MAKE_VERSION(2, 0, 0))
{
size_t size_ret;
error = clGetDeviceInfo(
deviceID,
CL_DEVICE_INTEGER_DOT_PRODUCT_ACCELERATION_PROPERTIES_8BIT_KHR, 0,
nullptr, &size_ret);
test_error(
error,
"Unable to query size of data returned by "
"CL_DEVICE_INTEGER_DOT_PRODUCT_ACCELERATION_PROPERTIES_8BIT_KHR");
cl_device_integer_dot_product_acceleration_properties_khr
accelerationProperties;
error = clGetDeviceInfo(
deviceID,
CL_DEVICE_INTEGER_DOT_PRODUCT_ACCELERATION_PROPERTIES_8BIT_KHR,
sizeof(accelerationProperties), &accelerationProperties, nullptr);
test_error(error, "Unable to query 8-bit acceleration properties");
error = clGetDeviceInfo(
deviceID,
CL_DEVICE_INTEGER_DOT_PRODUCT_ACCELERATION_PROPERTIES_4x8BIT_PACKED_KHR,
0, nullptr, &size_ret);
test_error(
error,
"Unable to query size of data returned by "
"CL_DEVICE_INTEGER_DOT_PRODUCT_ACCELERATION_PROPERTIES_4x8BIT_"
"PACKED_KHR");
error = clGetDeviceInfo(
deviceID,
CL_DEVICE_INTEGER_DOT_PRODUCT_ACCELERATION_PROPERTIES_4x8BIT_PACKED_KHR,
sizeof(accelerationProperties), &accelerationProperties, nullptr);
test_error(error,
"Unable to query 4x8-bit packed acceleration properties");
}
// Report when unknown capabilities are found
if (dotCaps
& ~(CL_DEVICE_INTEGER_DOT_PRODUCT_INPUT_4x8BIT_PACKED_KHR
| CL_DEVICE_INTEGER_DOT_PRODUCT_INPUT_4x8BIT_KHR))
@@ -359,6 +425,7 @@ int test_integer_dot_product(cl_device_id deviceID, cl_context context,
log_info("NOTE: found an unknown / untested capability!\n");
}
// Test built-in functions
if (dotCaps & CL_DEVICE_INTEGER_DOT_PRODUCT_INPUT_4x8BIT_KHR)
{
result |= test_vectype<cl_uchar, cl_uint, 4>(deviceID, context, queue,