From 00764d1b2bc83286e22384f5de69c2c27c2b015d Mon Sep 17 00:00:00 2001 From: Alexander Batashev Date: Tue, 24 Aug 2021 21:25:02 +0300 Subject: [PATCH 1/2] [SYCL] Fix test regressions caused by conflicting changes --- sycl/unittests/SYCL2020/GetNativeOpenCL.cpp | 9 +++++++++ sycl/unittests/helpers/CommonRedefinitions.hpp | 6 +++++- sycl/unittests/scheduler/InOrderQueueHostTaskDeps.cpp | 1 + 3 files changed, 15 insertions(+), 1 deletion(-) diff --git a/sycl/unittests/SYCL2020/GetNativeOpenCL.cpp b/sycl/unittests/SYCL2020/GetNativeOpenCL.cpp index 151c56d8e9a8a..343cb522faa6d 100644 --- a/sycl/unittests/SYCL2020/GetNativeOpenCL.cpp +++ b/sycl/unittests/SYCL2020/GetNativeOpenCL.cpp @@ -61,6 +61,13 @@ pi_result redefinedEventGetInfo(pi_event event, pi_event_info param_name, return PI_SUCCESS; } +static pi_result redefinedUSMEnqueueMemset(pi_queue, void *, pi_int32, size_t, + pi_uint32, const pi_event *, + pi_event *event) { + *event = reinterpret_cast(new int{}); + return PI_SUCCESS; +} + TEST(GetNative, GetNativeHandle) { platform Plt{default_selector()}; if (Plt.get_backend() != backend::opencl) { @@ -83,6 +90,8 @@ TEST(GetNative, GetNativeHandle) { Mock.redefine(redefinedDeviceRetain); Mock.redefine(redefinedProgramRetain); Mock.redefine(redefinedEventRetain); + Mock.redefine( + redefinedUSMEnqueueMemset); default_selector Selector; context Context(Plt); diff --git a/sycl/unittests/helpers/CommonRedefinitions.hpp b/sycl/unittests/helpers/CommonRedefinitions.hpp index 274425eb6a6ea..862de0556ff12 100644 --- a/sycl/unittests/helpers/CommonRedefinitions.hpp +++ b/sycl/unittests/helpers/CommonRedefinitions.hpp @@ -106,13 +106,17 @@ inline pi_result redefinedEventsWaitCommon(pi_uint32 num_events, } inline pi_result redefinedEventReleaseCommon(pi_event event) { + if (event != nullptr) + delete reinterpret_cast(event); return PI_SUCCESS; } inline pi_result redefinedEnqueueKernelLaunchCommon( pi_queue, pi_kernel, pi_uint32, const size_t *, const size_t *, - const size_t *, pi_uint32, const pi_event *, pi_event *) { + const size_t *, pi_uint32, const pi_event *, pi_event *event) { + *event = reinterpret_cast(new int{}); return PI_SUCCESS; + ; } inline pi_result redefinedKernelGetGroupInfoCommon( diff --git a/sycl/unittests/scheduler/InOrderQueueHostTaskDeps.cpp b/sycl/unittests/scheduler/InOrderQueueHostTaskDeps.cpp index 5fb7589605e4a..e98997877b894 100644 --- a/sycl/unittests/scheduler/InOrderQueueHostTaskDeps.cpp +++ b/sycl/unittests/scheduler/InOrderQueueHostTaskDeps.cpp @@ -110,5 +110,6 @@ TEST_F(SchedulerTest, InOrderQueueHostTaskDeps) { }) .wait(); + std::cout << GEventsWaitCounter << "\n"; EXPECT_TRUE(GEventsWaitCounter == 1); } From 9d48af3829b1c9c435c510838bbc811163fde7e7 Mon Sep 17 00:00:00 2001 From: Alexander Batashev Date: Tue, 24 Aug 2021 21:42:04 +0300 Subject: [PATCH 2/2] Apply suggestions from code review Co-authored-by: Alexey Bader --- sycl/unittests/helpers/CommonRedefinitions.hpp | 1 - sycl/unittests/scheduler/InOrderQueueHostTaskDeps.cpp | 1 - 2 files changed, 2 deletions(-) diff --git a/sycl/unittests/helpers/CommonRedefinitions.hpp b/sycl/unittests/helpers/CommonRedefinitions.hpp index 862de0556ff12..60a35f9b71404 100644 --- a/sycl/unittests/helpers/CommonRedefinitions.hpp +++ b/sycl/unittests/helpers/CommonRedefinitions.hpp @@ -116,7 +116,6 @@ inline pi_result redefinedEnqueueKernelLaunchCommon( const size_t *, pi_uint32, const pi_event *, pi_event *event) { *event = reinterpret_cast(new int{}); return PI_SUCCESS; - ; } inline pi_result redefinedKernelGetGroupInfoCommon( diff --git a/sycl/unittests/scheduler/InOrderQueueHostTaskDeps.cpp b/sycl/unittests/scheduler/InOrderQueueHostTaskDeps.cpp index e98997877b894..5fb7589605e4a 100644 --- a/sycl/unittests/scheduler/InOrderQueueHostTaskDeps.cpp +++ b/sycl/unittests/scheduler/InOrderQueueHostTaskDeps.cpp @@ -110,6 +110,5 @@ TEST_F(SchedulerTest, InOrderQueueHostTaskDeps) { }) .wait(); - std::cout << GEventsWaitCounter << "\n"; EXPECT_TRUE(GEventsWaitCounter == 1); }