From 239159fd26a6ddedd3b10410bbe745079076422c Mon Sep 17 00:00:00 2001 From: joshqti <127994991+joshqti@users.noreply.github.com> Date: Tue, 12 Nov 2024 10:10:07 -0800 Subject: [PATCH] Re-enable simple_semaphore_2 (#2123) Re-enable a disabled external semaphore test. Delete obsolete subtests that remain in comments. --- .../cl_khr_external_semaphore/main.cpp | 6 +----- .../extensions/cl_khr_external_semaphore/procs.h | 16 ---------------- .../test_external_semaphore.cpp | 7 ++++--- 3 files changed, 5 insertions(+), 24 deletions(-) diff --git a/test_conformance/extensions/cl_khr_external_semaphore/main.cpp b/test_conformance/extensions/cl_khr_external_semaphore/main.cpp index 909a0172..f3ead65e 100644 --- a/test_conformance/extensions/cl_khr_external_semaphore/main.cpp +++ b/test_conformance/extensions/cl_khr_external_semaphore/main.cpp @@ -19,17 +19,13 @@ test_definition test_list[] = { ADD_TEST(external_semaphores_queries), ADD_TEST(external_semaphores_cross_context), ADD_TEST(external_semaphores_simple_1), - // ADD_TEST(external_semaphores_simple_2), + ADD_TEST(external_semaphores_simple_2), ADD_TEST(external_semaphores_reuse), ADD_TEST(external_semaphores_cross_queues_ooo), ADD_TEST(external_semaphores_cross_queues_io), ADD_TEST(external_semaphores_cross_queues_io2), ADD_TEST(external_semaphores_multi_signal), ADD_TEST(external_semaphores_multi_wait), - // ADD_TEST(external_semaphores_order_1), - // ADD_TEST(external_semaphores_order_2), - // ADD_TEST(external_semaphores_order_3), - // ADD_TEST(external_semaphores_invalid_command) }; diff --git a/test_conformance/extensions/cl_khr_external_semaphore/procs.h b/test_conformance/extensions/cl_khr_external_semaphore/procs.h index 75d7f9d2..f9b7a4ce 100644 --- a/test_conformance/extensions/cl_khr_external_semaphore/procs.h +++ b/test_conformance/extensions/cl_khr_external_semaphore/procs.h @@ -59,24 +59,8 @@ extern int test_external_semaphores_multi_wait(cl_device_id deviceID, cl_context context, cl_command_queue queue, int num_elements); -extern int test_external_semaphores_order_1(cl_device_id deviceID, - cl_context context, - cl_command_queue queue, - int num_elements); -extern int test_external_semaphores_order_2(cl_device_id deviceID, - cl_context context, - cl_command_queue queue, - int num_elements); -extern int test_external_semaphores_order_3(cl_device_id deviceID, - cl_context context, - cl_command_queue queue, - int num_elements); extern int test_external_semaphores_import_export_fd(cl_device_id deviceID, cl_context context, cl_command_queue queue, int num_elements); -extern int test_external_semaphores_invalid_command(cl_device_id deviceID, - cl_context context, - cl_command_queue queue, - int num_elements); #endif // CL_KHR_EXTERNAL_SEMAPHORE_PROCS_H \ No newline at end of file diff --git a/test_conformance/extensions/cl_khr_external_semaphore/test_external_semaphore.cpp b/test_conformance/extensions/cl_khr_external_semaphore/test_external_semaphore.cpp index 2c963428..78431c76 100644 --- a/test_conformance/extensions/cl_khr_external_semaphore/test_external_semaphore.cpp +++ b/test_conformance/extensions/cl_khr_external_semaphore/test_external_semaphore.cpp @@ -6,8 +6,6 @@ #include #include -#define FLUSH_DELAY_S 5 - #define SEMAPHORE_PARAM_TEST(param_name, param_type, expected) \ do \ { \ @@ -507,7 +505,10 @@ int test_external_semaphores_simple_2(cl_device_id deviceID, cl_context context, // Flush and delay err = clFlush(queue); test_error(err, "Could not flush queue"); - std::this_thread::sleep_for(std::chrono::seconds(FLUSH_DELAY_S)); + + cl_event event_list[] = { signal_event, wait_event }; + err = clWaitForEvents(2, event_list); + test_error(err, "Could not wait on events"); // Ensure all events are completed except for task_1 test_assert_event_inprogress(task_1_event);