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

Added new query for cl_khr_semaphore test to verify device handle list (#1942)

Browse Source 
This PR addresses the first part of #1691 issue and #1875 issue.
This commit is contained in:
Marcin Hajder
2024-06-04 19:40:37 +02:00
committed by GitHub
parent a130f3d179
commit 806dd2fb61
1 changed files with 24 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
test_conformance/extensions/cl_khr_semaphore/test_semaphores.cpp
View File

@@ -21,6 +21,7 @@
#include <system_error> #include <system_error>
#include <thread> #include <thread>
#include <chrono> #include <chrono>
#include <vector>
#define FLUSH_DELAY_S 5 #define FLUSH_DELAY_S 5
@@ -82,7 +83,7 @@ static int semaphore_cross_queue_helper(cl_device_id deviceID,
if (!is_extension_available(deviceID, "cl_khr_semaphore")) if (!is_extension_available(deviceID, "cl_khr_semaphore"))
{ {
log_info("cl_khr_semaphore is not supported on this platoform. " log_info("cl_khr_semaphore is not supported on this platform. "
"Skipping test.\n"); "Skipping test.\n");
return TEST_SKIPPED_ITSELF; return TEST_SKIPPED_ITSELF;
} }
@@ -115,7 +116,7 @@ static int semaphore_cross_queue_helper(cl_device_id deviceID,
&wait_event); &wait_event);
test_error(err, "Could not wait semaphore"); test_error(err, "Could not wait semaphore");
// Finish queue_1 and queue_2 // Finish queue_1 and queue_2
err = clFinish(queue_1); err = clFinish(queue_1);
test_error(err, "Could not finish queue"); test_error(err, "Could not finish queue");
@@ -133,7 +134,7 @@ static int semaphore_cross_queue_helper(cl_device_id deviceID,
return TEST_PASS; return TEST_PASS;
} }
// Confirm that a signal followed by a wait will complete successfully // Confirm that a signal followed by a wait will complete successfully
int test_semaphores_simple_1(cl_device_id deviceID, cl_context context, int test_semaphores_simple_1(cl_device_id deviceID, cl_context context,
cl_command_queue defaultQueue, int num_elements) cl_command_queue defaultQueue, int num_elements)
{ {
@@ -141,7 +142,7 @@ int test_semaphores_simple_1(cl_device_id deviceID, cl_context context,
if (!is_extension_available(deviceID, "cl_khr_semaphore")) if (!is_extension_available(deviceID, "cl_khr_semaphore"))
{ {
log_info("cl_khr_semaphore is not supported on this platoform. " log_info("cl_khr_semaphore is not supported on this platform. "
"Skipping test.\n"); "Skipping test.\n");
return TEST_SKIPPED_ITSELF; return TEST_SKIPPED_ITSELF;
} }
@@ -203,7 +204,7 @@ int test_semaphores_simple_2(cl_device_id deviceID, cl_context context,
if (!is_extension_available(deviceID, "cl_khr_semaphore")) if (!is_extension_available(deviceID, "cl_khr_semaphore"))
{ {
log_info("cl_khr_semaphore is not supported on this platoform. " log_info("cl_khr_semaphore is not supported on this platform. "
"Skipping test.\n"); "Skipping test.\n");
return TEST_SKIPPED_ITSELF; return TEST_SKIPPED_ITSELF;
} }
@@ -295,7 +296,7 @@ int test_semaphores_reuse(cl_device_id deviceID, cl_context context,
if (!is_extension_available(deviceID, "cl_khr_semaphore")) if (!is_extension_available(deviceID, "cl_khr_semaphore"))
{ {
log_info("cl_khr_semaphore is not supported on this platoform. " log_info("cl_khr_semaphore is not supported on this platform. "
"Skipping test.\n"); "Skipping test.\n");
return TEST_SKIPPED_ITSELF; return TEST_SKIPPED_ITSELF;
} }
@@ -438,7 +439,7 @@ int test_semaphores_multi_signal(cl_device_id deviceID, cl_context context,
if (!is_extension_available(deviceID, "cl_khr_semaphore")) if (!is_extension_available(deviceID, "cl_khr_semaphore"))
{ {
log_info("cl_khr_semaphore is not supported on this platoform. " log_info("cl_khr_semaphore is not supported on this platform. "
"Skipping test.\n"); "Skipping test.\n");
return TEST_SKIPPED_ITSELF; return TEST_SKIPPED_ITSELF;
} }
@@ -514,7 +515,7 @@ int test_semaphores_multi_wait(cl_device_id deviceID, cl_context context,
if (!is_extension_available(deviceID, "cl_khr_semaphore")) if (!is_extension_available(deviceID, "cl_khr_semaphore"))
{ {
log_info("cl_khr_semaphore is not supported on this platoform. " log_info("cl_khr_semaphore is not supported on this platform. "
"Skipping test.\n"); "Skipping test.\n");
return TEST_SKIPPED_ITSELF; return TEST_SKIPPED_ITSELF;
} }
@@ -586,11 +587,11 @@ int test_semaphores_multi_wait(cl_device_id deviceID, cl_context context,
int test_semaphores_queries(cl_device_id deviceID, cl_context context, int test_semaphores_queries(cl_device_id deviceID, cl_context context,
cl_command_queue defaultQueue, int num_elements) cl_command_queue defaultQueue, int num_elements)
{ {
cl_int err; cl_int err = CL_SUCCESS;
if (!is_extension_available(deviceID, "cl_khr_semaphore")) if (!is_extension_available(deviceID, "cl_khr_semaphore"))
{ {
log_info("cl_khr_semaphore is not supported on this platoform. " log_info("cl_khr_semaphore is not supported on this platform. "
"Skipping test.\n"); "Skipping test.\n");
return TEST_SKIPPED_ITSELF; return TEST_SKIPPED_ITSELF;
} }
@@ -605,6 +606,10 @@ int test_semaphores_queries(cl_device_id deviceID, cl_context context,
cl_semaphore_properties_khr sema_props[] = { 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_KHR),
static_cast<cl_semaphore_properties_khr>(CL_SEMAPHORE_TYPE_BINARY_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)deviceID,
CL_SEMAPHORE_DEVICE_HANDLE_LIST_END_KHR,
0 0
}; };
cl_semaphore_khr sema = cl_semaphore_khr sema =
@@ -623,6 +628,11 @@ int test_semaphores_queries(cl_device_id deviceID, cl_context context,
// value // value
SEMAPHORE_PARAM_TEST(CL_SEMAPHORE_REFERENCE_COUNT_KHR, cl_uint, 1); SEMAPHORE_PARAM_TEST(CL_SEMAPHORE_REFERENCE_COUNT_KHR, cl_uint, 1);
// Confirm that querying CL_SEMAPHORE_DEVICE_HANDLE_LIST_KHR returns the
// same device id the semaphore was created with
SEMAPHORE_PARAM_TEST(CL_SEMAPHORE_DEVICE_HANDLE_LIST_KHR, cl_device_id,
deviceID);
err = clRetainSemaphoreKHR(sema); err = clRetainSemaphoreKHR(sema);
test_error(err, "Could not retain semaphore"); test_error(err, "Could not retain semaphore");
SEMAPHORE_PARAM_TEST(CL_SEMAPHORE_REFERENCE_COUNT_KHR, cl_uint, 2); SEMAPHORE_PARAM_TEST(CL_SEMAPHORE_REFERENCE_COUNT_KHR, cl_uint, 2);
@@ -634,7 +644,7 @@ int test_semaphores_queries(cl_device_id deviceID, cl_context context,
// Confirm that querying CL_SEMAPHORE_PROPERTIES_KHR returns the same // Confirm that querying CL_SEMAPHORE_PROPERTIES_KHR returns the same
// properties the semaphore was created with // properties the semaphore was created with
SEMAPHORE_PARAM_TEST_ARRAY(CL_SEMAPHORE_PROPERTIES_KHR, SEMAPHORE_PARAM_TEST_ARRAY(CL_SEMAPHORE_PROPERTIES_KHR,
cl_semaphore_properties_khr, 3, sema_props); cl_semaphore_properties_khr, 6, sema_props);
// Confirm that querying CL_SEMAPHORE_PAYLOAD_KHR returns the unsignaled // Confirm that querying CL_SEMAPHORE_PAYLOAD_KHR returns the unsignaled
// state // state
@@ -656,7 +666,7 @@ int test_semaphores_import_export_fd(cl_device_id deviceID, cl_context context,
if (!is_extension_available(deviceID, "cl_khr_semaphore")) if (!is_extension_available(deviceID, "cl_khr_semaphore"))
{ {
log_info("cl_khr_semaphore is not supported on this platoform. " log_info("cl_khr_semaphore is not supported on this platform. "
"Skipping test.\n"); "Skipping test.\n");
return TEST_SKIPPED_ITSELF; return TEST_SKIPPED_ITSELF;
} }
@@ -664,7 +674,7 @@ int test_semaphores_import_export_fd(cl_device_id deviceID, cl_context context,
if (!is_extension_available(deviceID, "cl_khr_external_semaphore_sync_fd")) if (!is_extension_available(deviceID, "cl_khr_external_semaphore_sync_fd"))
{ {
log_info("cl_khr_external_semaphore_sync_fd is not supported on this " log_info("cl_khr_external_semaphore_sync_fd is not supported on this "
"platoform. Skipping test.\n"); "platform. Skipping test.\n");
return TEST_SKIPPED_ITSELF; return TEST_SKIPPED_ITSELF;
} }
@@ -745,4 +755,4 @@ int test_semaphores_import_export_fd(cl_device_id deviceID, cl_context context,
err = clReleaseSemaphoreKHR(sema_2); err = clReleaseSemaphoreKHR(sema_2);
test_error(err, "Could not release semaphore"); test_error(err, "Could not release semaphore");
return TEST_PASS; return TEST_PASS;
} }