mirror of
https://github.com/KhronosGroup/OpenCL-CTS.git
synced 2026-03-19 06:09:01 +00:00
Modernization of semaphores_negative_create_invalid_device related to creating sub-devices (#2307)
Due to the improvements developed during work on #2237 with @bashbaug
This commit is contained in:
@@ -251,38 +251,77 @@ struct CreateInvalidDevice : public SemaphoreTestBase
|
||||
cl_int Run() override
|
||||
{
|
||||
// create sub devices if possible
|
||||
cl_uint maxComputeUnits = 0;
|
||||
int err =
|
||||
clGetDeviceInfo(device, CL_DEVICE_MAX_COMPUTE_UNITS,
|
||||
sizeof(maxComputeUnits), &maxComputeUnits, NULL);
|
||||
test_error(err, "Unable to get maximal number of compute units");
|
||||
size_t size = 0;
|
||||
|
||||
cl_device_partition_property partitionProp[] = {
|
||||
CL_DEVICE_PARTITION_EQUALLY,
|
||||
static_cast<cl_device_partition_property>(maxComputeUnits / 2), 0
|
||||
};
|
||||
// query multi-device context and perform objects comparability test
|
||||
cl_int err = clGetDeviceInfo(device, CL_DEVICE_PARTITION_PROPERTIES, 0,
|
||||
nullptr, &size);
|
||||
test_error_fail(err, "clGetDeviceInfo failed");
|
||||
|
||||
cl_uint deviceCount = 0;
|
||||
// how many sub-devices can we create?
|
||||
err =
|
||||
clCreateSubDevices(device, partitionProp, 0, nullptr, &deviceCount);
|
||||
if (err != CL_SUCCESS)
|
||||
if ((size / sizeof(cl_device_partition_property)) == 0)
|
||||
{
|
||||
log_info("Can't partition device, test not supported\n");
|
||||
return TEST_SKIPPED_ITSELF;
|
||||
}
|
||||
|
||||
if (deviceCount < 2)
|
||||
test_error_ret(
|
||||
CL_INVALID_VALUE,
|
||||
"Multi context test for CL_INVALID_PROPERTY not supported",
|
||||
TEST_SKIPPED_ITSELF);
|
||||
std::vector<cl_device_partition_property> supported_props(
|
||||
size / sizeof(cl_device_partition_property), 0);
|
||||
err = clGetDeviceInfo(device, CL_DEVICE_PARTITION_PROPERTIES,
|
||||
supported_props.size()
|
||||
* sizeof(cl_device_partition_property),
|
||||
supported_props.data(), nullptr);
|
||||
test_error_fail(err, "clGetDeviceInfo failed");
|
||||
|
||||
if (supported_props.front() == 0)
|
||||
{
|
||||
log_info("Can't partition device, test not supported\n");
|
||||
return TEST_SKIPPED_ITSELF;
|
||||
}
|
||||
|
||||
cl_uint maxComputeUnits = 0;
|
||||
err =
|
||||
clGetDeviceInfo(device, CL_DEVICE_MAX_COMPUTE_UNITS,
|
||||
sizeof(maxComputeUnits), &maxComputeUnits, nullptr);
|
||||
test_error_ret(err, "Unable to get maximal number of compute units",
|
||||
TEST_FAIL);
|
||||
|
||||
std::vector<std::array<cl_device_partition_property, 5>>
|
||||
partition_props = {
|
||||
{ CL_DEVICE_PARTITION_EQUALLY, (cl_int)maxComputeUnits / 2, 0,
|
||||
0, 0 },
|
||||
{ CL_DEVICE_PARTITION_BY_COUNTS, 1, (cl_int)maxComputeUnits - 1,
|
||||
CL_DEVICE_PARTITION_BY_COUNTS_LIST_END, 0 },
|
||||
{ CL_DEVICE_PARTITION_BY_AFFINITY_DOMAIN,
|
||||
CL_DEVICE_AFFINITY_DOMAIN_NEXT_PARTITIONABLE, 0, 0, 0 }
|
||||
};
|
||||
|
||||
std::unique_ptr<SubDevicesScopeGuarded> scope_guard;
|
||||
cl_uint num_devices = 0;
|
||||
for (auto &sup_prop : supported_props)
|
||||
{
|
||||
for (auto &prop : partition_props)
|
||||
{
|
||||
if (sup_prop == prop[0])
|
||||
{
|
||||
// how many sub-devices can we create?
|
||||
err = clCreateSubDevices(device, prop.data(), 0, nullptr,
|
||||
&num_devices);
|
||||
test_error_fail(err, "clCreateSubDevices failed");
|
||||
if (num_devices < 2) continue;
|
||||
|
||||
// get the list of subDevices
|
||||
SubDevicesScopeGuarded scope_guard(deviceCount);
|
||||
err = clCreateSubDevices(device, partitionProp, deviceCount,
|
||||
scope_guard.sub_devices.data(), &deviceCount);
|
||||
if (err != CL_SUCCESS)
|
||||
scope_guard.reset(new SubDevicesScopeGuarded(num_devices));
|
||||
err = clCreateSubDevices(device, prop.data(), num_devices,
|
||||
scope_guard->sub_devices.data(),
|
||||
&num_devices);
|
||||
test_error_fail(err, "clCreateSubDevices failed");
|
||||
break;
|
||||
}
|
||||
}
|
||||
if (scope_guard.get() != nullptr) break;
|
||||
}
|
||||
|
||||
if (scope_guard.get() == nullptr)
|
||||
{
|
||||
log_info("Can't partition device, test not supported\n");
|
||||
return TEST_SKIPPED_ITSELF;
|
||||
@@ -297,7 +336,7 @@ struct CreateInvalidDevice : public SemaphoreTestBase
|
||||
(cl_semaphore_properties_khr)
|
||||
CL_SEMAPHORE_DEVICE_HANDLE_LIST_KHR,
|
||||
(cl_semaphore_properties_khr)device,
|
||||
(cl_semaphore_properties_khr)scope_guard.sub_devices.front(),
|
||||
(cl_semaphore_properties_khr)scope_guard->sub_devices.front(),
|
||||
(cl_semaphore_properties_khr)
|
||||
CL_SEMAPHORE_DEVICE_HANDLE_LIST_END_KHR,
|
||||
0
|
||||
@@ -317,7 +356,7 @@ struct CreateInvalidDevice : public SemaphoreTestBase
|
||||
{
|
||||
/* Create new context with sub-device */
|
||||
clContextWrapper new_context = clCreateContext(
|
||||
NULL, (cl_uint)1, scope_guard.sub_devices.data(), nullptr,
|
||||
NULL, (cl_uint)1, scope_guard->sub_devices.data(), nullptr,
|
||||
nullptr, &err);
|
||||
test_error_ret(err, "Unable to create testing context", CL_SUCCESS);
|
||||
|
||||
|
||||
Reference in New Issue
Block a user