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

Add utility macro to skip test when an extension is not supported (#2178)

Browse Source 
Use in cl_khr_external_semaphore suite as an example.

Signed-off-by: Kevin Petit <kevin.petit@arm.com>
This commit is contained in:
Kévin Petit
2024-12-17 17:54:51 +00:00
committed by GitHub
parent 09e4d03e46
commit be1278d5b2
2 changed files with 23 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
test_common/harness/testHarness.h
View File

@@ -150,6 +150,17 @@ template <typename T> T *register_test(const char *name, Version version)
#define REGISTER_TEST(name) REGISTER_TEST_VERSION(name, Version(1, 2)) #define REGISTER_TEST(name) REGISTER_TEST_VERSION(name, Version(1, 2))
#define REQUIRE_EXTENSION(name) \
do \
{ \
if (!is_extension_available(deviceID, name)) \
{ \
log_info(name \
" is not supported on this device. Skipping test.\n"); \
return TEST_SKIPPED_ITSELF; \
} \
} while (0)
extern int gFailCount; extern int gFailCount;
extern int gTestCount; extern int gTestCount;
extern cl_uint gReSeed; extern cl_uint gReSeed;

76
test_conformance/extensions/cl_khr_external_semaphore/test_external_semaphore.cpp
View File

@@ -122,19 +122,8 @@ int test_external_semaphores_queries(cl_device_id deviceID, cl_context context,
cl_command_queue defaultQueue, cl_command_queue defaultQueue,
int num_elements) int num_elements)
{ {
if (!is_extension_available(deviceID, "cl_khr_semaphore")) REQUIRE_EXTENSION("cl_khr_semaphore");
{ REQUIRE_EXTENSION("cl_khr_external_semaphore");
log_info("cl_khr_semaphore is not supported on this platform. "
"Skipping test.\n");
return TEST_SKIPPED_ITSELF;
}
if (!is_extension_available(deviceID, "cl_khr_external_semaphore"))
{
log_info("cl_khr_semaphore is not supported on this platform. "
"Skipping test.\n");
return TEST_SKIPPED_ITSELF;
}
if (init_vuikan_device(1, &deviceID)) if (init_vuikan_device(1, &deviceID))
{ {
@@ -214,13 +203,7 @@ int test_external_semaphores_cross_context(cl_device_id deviceID,
cl_command_queue defaultQueue, cl_command_queue defaultQueue,
int num_elements) int num_elements)
{ {
cl_int err = CL_SUCCESS; REQUIRE_EXTENSION("cl_khr_external_semaphore");
if (!is_extension_available(deviceID, "cl_khr_external_semaphore"))
{
log_info("cl_khr_semaphore is not supported on this platform. "
"Skipping test.\n");
return TEST_SKIPPED_ITSELF;
}
GET_PFN(deviceID, clEnqueueSignalSemaphoresKHR); GET_PFN(deviceID, clEnqueueSignalSemaphoresKHR);
GET_PFN(deviceID, clEnqueueWaitSemaphoresKHR); GET_PFN(deviceID, clEnqueueWaitSemaphoresKHR);
@@ -228,10 +211,10 @@ int test_external_semaphores_cross_context(cl_device_id deviceID,
GET_PFN(deviceID, clGetSemaphoreHandleForTypeKHR); GET_PFN(deviceID, clGetSemaphoreHandleForTypeKHR);
GET_PFN(deviceID, clReleaseSemaphoreKHR); GET_PFN(deviceID, clReleaseSemaphoreKHR);
std::vector<cl_external_semaphore_handle_type_khr> import_handle_types; std::vector<cl_external_semaphore_handle_type_khr> import_handle_types;
std::vector<cl_external_semaphore_handle_type_khr> export_handle_types; std::vector<cl_external_semaphore_handle_type_khr> export_handle_types;
cl_int err = CL_SUCCESS;
err = get_device_semaphore_handle_types( err = get_device_semaphore_handle_types(
deviceID, CL_DEVICE_SEMAPHORE_IMPORT_HANDLE_TYPES_KHR, deviceID, CL_DEVICE_SEMAPHORE_IMPORT_HANDLE_TYPES_KHR,
import_handle_types); import_handle_types);
@@ -345,12 +328,7 @@ int test_external_semaphores_simple_1(cl_device_id deviceID, cl_context context,
cl_command_queue defaultQueue, cl_command_queue defaultQueue,
int num_elements) int num_elements)
{ {
if (!is_extension_available(deviceID, "cl_khr_external_semaphore")) REQUIRE_EXTENSION("cl_khr_external_semaphore");
{
log_info("cl_khr_semaphore is not supported on this platform. "
"Skipping test.\n");
return TEST_SKIPPED_ITSELF;
}
if (init_vuikan_device(1, &deviceID)) if (init_vuikan_device(1, &deviceID))
{ {
@@ -425,12 +403,7 @@ int test_external_semaphores_simple_2(cl_device_id deviceID, cl_context context,
cl_command_queue defaultQueue, cl_command_queue defaultQueue,
int num_elements) int num_elements)
{ {
if (!is_extension_available(deviceID, "cl_khr_external_semaphore")) REQUIRE_EXTENSION("cl_khr_external_semaphore");
{
log_info("cl_khr_semaphore is not supported on this platform. "
"Skipping test.\n");
return TEST_SKIPPED_ITSELF;
}
if (init_vuikan_device(1, &deviceID)) if (init_vuikan_device(1, &deviceID))
{ {
@@ -537,12 +510,7 @@ int test_external_semaphores_reuse(cl_device_id deviceID, cl_context context,
cl_command_queue defaultQueue, cl_command_queue defaultQueue,
int num_elements) int num_elements)
{ {
if (!is_extension_available(deviceID, "cl_khr_external_semaphore")) REQUIRE_EXTENSION("cl_khr_external_semaphore");
{
log_info("cl_khr_semaphore is not supported on this platform. "
"Skipping test.\n");
return TEST_SKIPPED_ITSELF;
}
if (init_vuikan_device(1, &deviceID)) if (init_vuikan_device(1, &deviceID))
{ {
@@ -662,12 +630,7 @@ static int external_semaphore_cross_queue_helper(cl_device_id deviceID,
cl_command_queue queue_1, cl_command_queue queue_1,
cl_command_queue queue_2) cl_command_queue queue_2)
{ {
if (!is_extension_available(deviceID, "cl_khr_external_semaphore")) REQUIRE_EXTENSION("cl_khr_external_semaphore");
{
log_info("cl_khr_semaphore is not supported on this platform. "
"Skipping test.\n");
return TEST_SKIPPED_ITSELF;
}
if (init_vuikan_device(1, &deviceID)) if (init_vuikan_device(1, &deviceID))
{ {
@@ -782,12 +745,7 @@ int test_external_semaphores_cross_queues_io2(cl_device_id deviceID,
cl_command_queue defaultQueue, cl_command_queue defaultQueue,
int num_elements) int num_elements)
{ {
if (!is_extension_available(deviceID, "cl_khr_external_semaphore")) REQUIRE_EXTENSION("cl_khr_external_semaphore");
{
log_info("cl_khr_semaphore is not supported on this platform. "
"Skipping test.\n");
return TEST_SKIPPED_ITSELF;
}
if (init_vuikan_device(1, &deviceID)) if (init_vuikan_device(1, &deviceID))
{ {
@@ -896,12 +854,7 @@ int test_external_semaphores_multi_signal(cl_device_id deviceID,
cl_command_queue defaultQueue, cl_command_queue defaultQueue,
int num_elements) int num_elements)
{ {
if (!is_extension_available(deviceID, "cl_khr_external_semaphore")) REQUIRE_EXTENSION("cl_khr_external_semaphore");
{
log_info("cl_khr_semaphore is not supported on this platform. "
"Skipping test.\n");
return TEST_SKIPPED_ITSELF;
}
if (init_vuikan_device(1, &deviceID)) if (init_vuikan_device(1, &deviceID))
{ {
@@ -992,12 +945,7 @@ int test_external_semaphores_multi_wait(cl_device_id deviceID,
cl_command_queue defaultQueue, cl_command_queue defaultQueue,
int num_elements) int num_elements)
{ {
if (!is_extension_available(deviceID, "cl_khr_external_semaphore")) REQUIRE_EXTENSION("cl_khr_external_semaphore");
{
log_info("cl_khr_semaphore is not supported on this platform. "
"Skipping test.\n");
return TEST_SKIPPED_ITSELF;
}
if (init_vuikan_device(1, &deviceID)) if (init_vuikan_device(1, &deviceID))
{ {
@@ -1080,4 +1028,4 @@ int test_external_semaphores_multi_wait(cl_device_id deviceID,
} }
return TEST_PASS; return TEST_PASS;
} }