Skip to content

Commit

Permalink
Corrected INVALID_DEVICE test, cosmetic fixes and clang format
Browse files Browse the repository at this point in the history
  • Loading branch information
@shajder
shajder committed May 7, 2024
1 parent 1557eff commit e31bd98
Show file tree
Hide file tree
Showing 3 changed files with 83 additions and 93 deletions.
11 changes: 8 additions & 3 deletions test_conformance/extensions/cl_khr_semaphore/main.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,11 +36,16 @@ test_definition test_list[] = {
ADD_TEST_VERSION(semaphores_queries, Version(1, 2)),
ADD_TEST_VERSION(semaphores_import_export_fd, Version(1, 2)),
ADD_TEST_VERSION(semaphores_negative_create_invalid_context, Version(1, 2)),
ADD_TEST_VERSION(semaphores_negative_create_invalid_property, Version(1, 2)),
ADD_TEST_VERSION(semaphores_negative_create_multi_device_property, Version(1, 2)),
ADD_TEST_VERSION(semaphores_negative_create_invalid_property,
Version(1, 2)),
ADD_TEST_VERSION(semaphores_negative_create_multi_device_property,
Version(1, 2)),
ADD_TEST_VERSION(semaphores_negative_create_invalid_device, Version(1, 2)),
ADD_TEST_VERSION(semaphores_negative_create_import_invalid_device,
Version(1, 2)),
ADD_TEST_VERSION(semaphores_negative_create_invalid_value, Version(1, 2)),
ADD_TEST_VERSION(semaphores_negative_create_invalid_operation, Version(1, 2)),
ADD_TEST_VERSION(semaphores_negative_create_invalid_operation,
Version(1, 2)),
};

const int test_num = ARRAY_SIZE(test_list);
Expand Down
3 changes: 3 additions & 0 deletions test_conformance/extensions/cl_khr_semaphore/procs.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,9 @@ extern int test_semaphores_negative_create_multi_device_property(
extern int test_semaphores_negative_create_invalid_device(
cl_device_id device, cl_context context, cl_command_queue queue,
int num_elements);
extern int test_semaphores_negative_create_import_invalid_device(
cl_device_id device, cl_context context, cl_command_queue queue,
int num_elements);
extern int test_semaphores_negative_create_invalid_value(cl_device_id device,
cl_context context,
cl_command_queue queue,
Expand Down
162 changes: 72 additions & 90 deletions test_conformance/extensions/cl_khr_semaphore/test_semaphores_negative_create.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@
#include <thread>
#include <vector>


namespace {

// CL_INVALID_CONTEXT if context is nullptr.
Expand All @@ -37,10 +36,8 @@ struct CreateInvalidContext : public SemaphoreTestBase
{
// Create semaphore
cl_semaphore_properties_khr sema_props[] = {
static_cast<cl_semaphore_properties_khr>(CL_SEMAPHORE_TYPE_KHR),
static_cast<cl_semaphore_properties_khr>(
CL_SEMAPHORE_TYPE_BINARY_KHR),
0
(cl_semaphore_properties_khr)CL_SEMAPHORE_TYPE_KHR,
(cl_semaphore_properties_khr)CL_SEMAPHORE_TYPE_BINARY_KHR, 0
};

cl_int err = CL_SUCCESS;
Expand Down Expand Up @@ -91,11 +88,8 @@ struct CreateInvalidProperty : public SemaphoreTestBase
// 1) Property name in sema_props is not a supported property name
{
cl_semaphore_properties_khr sema_props[] = {
static_cast<cl_semaphore_properties_khr>(
CL_INVALID_SEMAPHORE_KHR),
static_cast<cl_semaphore_properties_khr>(
CL_SEMAPHORE_TYPE_BINARY_KHR),
0
(cl_semaphore_properties_khr)CL_INVALID_SEMAPHORE_KHR,
(cl_semaphore_properties_khr)CL_SEMAPHORE_TYPE_BINARY_KHR, 0
};

semaphore =
Expand All @@ -108,10 +102,8 @@ struct CreateInvalidProperty : public SemaphoreTestBase
// 2) Value specified for a supported property name is not valid
{
cl_semaphore_properties_khr sema_props[] = {
static_cast<cl_semaphore_properties_khr>(CL_SEMAPHORE_TYPE_KHR),
static_cast<cl_semaphore_properties_khr>(
CL_INVALID_SEMAPHORE_KHR),
0
(cl_semaphore_properties_khr)CL_SEMAPHORE_TYPE_KHR,
(cl_semaphore_properties_khr)CL_INVALID_SEMAPHORE_KHR, 0
};

semaphore =
Expand All @@ -124,11 +116,9 @@ struct CreateInvalidProperty : public SemaphoreTestBase
// 3) The same property name is specified more than once
{
cl_semaphore_properties_khr sema_props[] = {
static_cast<cl_semaphore_properties_khr>(CL_SEMAPHORE_TYPE_KHR),
static_cast<cl_semaphore_properties_khr>(
CL_SEMAPHORE_TYPE_BINARY_KHR),
static_cast<cl_semaphore_properties_khr>(CL_SEMAPHORE_TYPE_KHR),
0
(cl_semaphore_properties_khr)CL_SEMAPHORE_TYPE_KHR,
(cl_semaphore_properties_khr)CL_SEMAPHORE_TYPE_BINARY_KHR,
(cl_semaphore_properties_khr)CL_SEMAPHORE_TYPE_KHR, 0
};

semaphore =
Expand Down Expand Up @@ -198,10 +188,8 @@ struct CreateInvalidMultiDeviceProperty : public SemaphoreTestBase
test_error_ret(err, "Unable to create testing context", CL_SUCCESS);

cl_semaphore_properties_khr sema_props[] = {
static_cast<cl_semaphore_properties_khr>(CL_SEMAPHORE_TYPE_KHR),
static_cast<cl_semaphore_properties_khr>(
CL_SEMAPHORE_TYPE_BINARY_KHR),
0
(cl_semaphore_properties_khr)CL_SEMAPHORE_TYPE_KHR,
(cl_semaphore_properties_khr)CL_SEMAPHORE_TYPE_BINARY_KHR, 0
};

// Try to create semaphore with multi device context - expect
Expand Down Expand Up @@ -270,14 +258,14 @@ struct CreateInvalidDevice : public SemaphoreTestBase
// sema_props, but it does not identify exactly one valid device;
{
cl_semaphore_properties_khr sema_props[] = {
static_cast<cl_semaphore_properties_khr>(CL_SEMAPHORE_TYPE_KHR),
static_cast<cl_semaphore_properties_khr>(
CL_SEMAPHORE_TYPE_BINARY_KHR),
static_cast<cl_semaphore_properties_khr>(
CL_SEMAPHORE_DEVICE_HANDLE_LIST_KHR),
(cl_semaphore_properties_khr)CL_SEMAPHORE_TYPE_KHR,
(cl_semaphore_properties_khr)CL_SEMAPHORE_TYPE_BINARY_KHR,
(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_DEVICE_HANDLE_LIST_END_KHR,
(cl_semaphore_properties_khr)
CL_SEMAPHORE_DEVICE_HANDLE_LIST_END_KHR,
0
};

Expand All @@ -300,13 +288,13 @@ struct CreateInvalidDevice : public SemaphoreTestBase
test_error_ret(err, "Unable to create testing context", CL_SUCCESS);

cl_semaphore_properties_khr sema_props[] = {
static_cast<cl_semaphore_properties_khr>(CL_SEMAPHORE_TYPE_KHR),
static_cast<cl_semaphore_properties_khr>(
CL_SEMAPHORE_TYPE_BINARY_KHR),
static_cast<cl_semaphore_properties_khr>(
CL_SEMAPHORE_DEVICE_HANDLE_LIST_KHR),
(cl_semaphore_properties_khr)CL_SEMAPHORE_TYPE_KHR,
(cl_semaphore_properties_khr)CL_SEMAPHORE_TYPE_BINARY_KHR,
(cl_semaphore_properties_khr)
CL_SEMAPHORE_DEVICE_HANDLE_LIST_KHR,
(cl_semaphore_properties_khr)device,
CL_SEMAPHORE_DEVICE_HANDLE_LIST_END_KHR,
(cl_semaphore_properties_khr)
CL_SEMAPHORE_DEVICE_HANDLE_LIST_END_KHR,
0
};

Expand Down Expand Up @@ -370,20 +358,19 @@ struct CreateImportExternalWithInvalidDevice : public SemaphoreTestBase
{
if (platform_id == platforms[p]) continue;

err = clGetDeviceIDs(platform_id, CL_DEVICE_TYPE_ALL, 0, nullptr,
err = clGetDeviceIDs(platforms[p], CL_DEVICE_TYPE_ALL, 0, nullptr,
&num_devices);
test_error(err, "clGetDeviceIDs failed");

std::vector<cl_device_id> devices(num_devices);
err = clGetDeviceIDs(platform_id, CL_DEVICE_TYPE_ALL, num_devices,
err = clGetDeviceIDs(platforms[p], CL_DEVICE_TYPE_ALL, num_devices,
devices.data(), nullptr);
test_error(err, "clGetDeviceIDs failed");

// try to find invalid device
for (auto did : devices)
{
if (did != device
&& !is_extension_available(device, "cl_khr_semaphore"))
if (!is_extension_available(did, "cl_khr_semaphore"))
{
invalid_device = did;
break;
Expand All @@ -395,7 +382,7 @@ struct CreateImportExternalWithInvalidDevice : public SemaphoreTestBase

if (invalid_device == nullptr)
{
log_info("Can't find appropriate resources. Skipping test.\n");
log_info("Can't find needed resources. Skipping test.\n");
return TEST_SKIPPED_ITSELF;
}

Expand All @@ -406,15 +393,12 @@ struct CreateImportExternalWithInvalidDevice : public SemaphoreTestBase

// Create semaphore
cl_semaphore_properties_khr sema_1_props[] = {
static_cast<cl_semaphore_properties_khr>(CL_SEMAPHORE_TYPE_KHR),
static_cast<cl_semaphore_properties_khr>(
CL_SEMAPHORE_TYPE_BINARY_KHR),
static_cast<cl_semaphore_properties_khr>(
CL_SEMAPHORE_EXPORT_HANDLE_TYPES_KHR),
static_cast<cl_semaphore_properties_khr>(
CL_SEMAPHORE_HANDLE_OPAQUE_FD_KHR),
static_cast<cl_semaphore_properties_khr>(
CL_SEMAPHORE_EXPORT_HANDLE_TYPES_LIST_END_KHR),
(cl_semaphore_properties_khr)CL_SEMAPHORE_TYPE_KHR,
(cl_semaphore_properties_khr)CL_SEMAPHORE_TYPE_BINARY_KHR,
(cl_semaphore_properties_khr)CL_SEMAPHORE_EXPORT_HANDLE_TYPES_KHR,
(cl_semaphore_properties_khr)CL_SEMAPHORE_HANDLE_OPAQUE_FD_KHR,
(cl_semaphore_properties_khr)
CL_SEMAPHORE_EXPORT_HANDLE_TYPES_LIST_END_KHR,
0
};
semaphore =
Expand Down Expand Up @@ -444,16 +428,14 @@ struct CreateImportExternalWithInvalidDevice : public SemaphoreTestBase

// Create semaphore from sync fd
cl_semaphore_properties_khr sema_2_props[] = {
static_cast<cl_semaphore_properties_khr>(CL_SEMAPHORE_TYPE_KHR),
static_cast<cl_semaphore_properties_khr>(
CL_SEMAPHORE_TYPE_BINARY_KHR),
static_cast<cl_semaphore_properties_khr>(
CL_SEMAPHORE_HANDLE_OPAQUE_FD_KHR),
static_cast<cl_semaphore_properties_khr>(handle),
static_cast<cl_semaphore_properties_khr>(
CL_SEMAPHORE_DEVICE_HANDLE_LIST_KHR),
(cl_semaphore_properties_khr)CL_SEMAPHORE_TYPE_KHR,
(cl_semaphore_properties_khr)CL_SEMAPHORE_TYPE_BINARY_KHR,
(cl_semaphore_properties_khr)CL_SEMAPHORE_HANDLE_OPAQUE_FD_KHR,
(cl_semaphore_properties_khr)handle,
(cl_semaphore_properties_khr)CL_SEMAPHORE_DEVICE_HANDLE_LIST_KHR,
(cl_semaphore_properties_khr)invalid_device,
CL_SEMAPHORE_DEVICE_HANDLE_LIST_END_KHR,
(cl_semaphore_properties_khr)
CL_SEMAPHORE_DEVICE_HANDLE_LIST_END_KHR,
0
};

Expand Down Expand Up @@ -515,17 +497,14 @@ struct CreateInvalidValue : public SemaphoreTestBase

// Create semaphore
cl_semaphore_properties_khr sema_1_props[] = {
static_cast<cl_semaphore_properties_khr>(CL_SEMAPHORE_TYPE_KHR),
static_cast<cl_semaphore_properties_khr>(
CL_SEMAPHORE_TYPE_BINARY_KHR),
static_cast<cl_semaphore_properties_khr>(
CL_SEMAPHORE_EXPORT_HANDLE_TYPES_KHR),
static_cast<cl_semaphore_properties_khr>(
CL_SEMAPHORE_HANDLE_OPAQUE_FD_KHR),
static_cast<cl_semaphore_properties_khr>(
CL_SEMAPHORE_HANDLE_OPAQUE_FD_KHR),
static_cast<cl_semaphore_properties_khr>(
CL_SEMAPHORE_EXPORT_HANDLE_TYPES_LIST_END_KHR),
(cl_semaphore_properties_khr)CL_SEMAPHORE_TYPE_KHR,
(cl_semaphore_properties_khr)CL_SEMAPHORE_TYPE_BINARY_KHR,
(cl_semaphore_properties_khr)
CL_SEMAPHORE_EXPORT_HANDLE_TYPES_KHR,
(cl_semaphore_properties_khr)CL_SEMAPHORE_HANDLE_OPAQUE_FD_KHR,
(cl_semaphore_properties_khr)CL_SEMAPHORE_HANDLE_OPAQUE_FD_KHR,
(cl_semaphore_properties_khr)
CL_SEMAPHORE_EXPORT_HANDLE_TYPES_LIST_END_KHR,
0
};
semaphore =
Expand Down Expand Up @@ -566,15 +545,12 @@ struct CreateInvalidOperation : public SemaphoreTestBase

// Create semaphore
cl_semaphore_properties_khr sema_1_props[] = {
static_cast<cl_semaphore_properties_khr>(CL_SEMAPHORE_TYPE_KHR),
static_cast<cl_semaphore_properties_khr>(
CL_SEMAPHORE_TYPE_BINARY_KHR),
static_cast<cl_semaphore_properties_khr>(
CL_SEMAPHORE_EXPORT_HANDLE_TYPES_KHR),
static_cast<cl_semaphore_properties_khr>(
CL_SEMAPHORE_HANDLE_OPAQUE_FD_KHR),
static_cast<cl_semaphore_properties_khr>(
CL_SEMAPHORE_EXPORT_HANDLE_TYPES_LIST_END_KHR),
(cl_semaphore_properties_khr)CL_SEMAPHORE_TYPE_KHR,
(cl_semaphore_properties_khr)CL_SEMAPHORE_TYPE_BINARY_KHR,
(cl_semaphore_properties_khr)CL_SEMAPHORE_EXPORT_HANDLE_TYPES_KHR,
(cl_semaphore_properties_khr)CL_SEMAPHORE_HANDLE_OPAQUE_FD_KHR,
(cl_semaphore_properties_khr)
CL_SEMAPHORE_EXPORT_HANDLE_TYPES_LIST_END_KHR,
0
};
semaphore =
Expand All @@ -601,18 +577,14 @@ struct CreateInvalidOperation : public SemaphoreTestBase
// a semaphore that was created by importing an external semaphore
// handle is not permitted.
cl_semaphore_properties_khr sema_2_props[] = {
static_cast<cl_semaphore_properties_khr>(CL_SEMAPHORE_TYPE_KHR),
static_cast<cl_semaphore_properties_khr>(
CL_SEMAPHORE_TYPE_BINARY_KHR),
static_cast<cl_semaphore_properties_khr>(
CL_SEMAPHORE_HANDLE_OPAQUE_FD_KHR),
static_cast<cl_semaphore_properties_khr>(handle),
static_cast<cl_semaphore_properties_khr>(
CL_SEMAPHORE_EXPORT_HANDLE_TYPES_KHR),
static_cast<cl_semaphore_properties_khr>(
CL_SEMAPHORE_HANDLE_OPAQUE_FD_KHR),
static_cast<cl_semaphore_properties_khr>(
CL_SEMAPHORE_EXPORT_HANDLE_TYPES_LIST_END_KHR),
(cl_semaphore_properties_khr)CL_SEMAPHORE_TYPE_KHR,
(cl_semaphore_properties_khr)CL_SEMAPHORE_TYPE_BINARY_KHR,
(cl_semaphore_properties_khr)CL_SEMAPHORE_HANDLE_OPAQUE_FD_KHR,
(cl_semaphore_properties_khr)(handle),
(cl_semaphore_properties_khr)CL_SEMAPHORE_EXPORT_HANDLE_TYPES_KHR,
(cl_semaphore_properties_khr)CL_SEMAPHORE_HANDLE_OPAQUE_FD_KHR,
(cl_semaphore_properties_khr)
CL_SEMAPHORE_EXPORT_HANDLE_TYPES_LIST_END_KHR,
0
};

Expand Down Expand Up @@ -658,6 +630,16 @@ int test_semaphores_negative_create_invalid_device(cl_device_id device, cl_conte
return MakeAndRunTest<CreateInvalidDevice>(device, context, queue);
}

// Confirm that creation semaphore with invalid device(s) return
// CL_INVALID_DEVICE
int test_semaphores_negative_create_import_invalid_device(
cl_device_id device, cl_context context, cl_command_queue queue,
int num_elements)
{
return MakeAndRunTest<CreateImportExternalWithInvalidDevice>(
device, context, queue);
}

// Confirm that creation semaphore with invalid props values return CL_INVALID_VALUE
int test_semaphores_negative_create_invalid_value(cl_device_id device, cl_context context,
cl_command_queue queue, int num_elements)
Expand Down

0 comments on commit e31bd98

Please sign in to comment.