From 506db6bd7386399e639cf6fa9fc6578d52632ab4 Mon Sep 17 00:00:00 2001 From: Aravind Gopalakrishnan Date: Mon, 27 Jan 2025 19:25:40 +0000 Subject: [PATCH] fix: Revert "feature: enable event synchronization GPU status check by default" This reverts commit 17e537b6946da9119551aeff13b2178a4853c0ad. Related-To: GSD-10648 Signed-off-by: Aravind Gopalakrishnan --- level_zero/core/source/event/event_impl.inl | 2 +- .../unit_tests/sources/event/test_event.cpp | 17 +++-------------- 2 files changed, 4 insertions(+), 15 deletions(-) diff --git a/level_zero/core/source/event/event_impl.inl b/level_zero/core/source/event/event_impl.inl index 0db8c98e8b..efa5c149ff 100644 --- a/level_zero/core/source/event/event_impl.inl +++ b/level_zero/core/source/event/event_impl.inl @@ -694,7 +694,7 @@ ze_result_t EventImp::hostSynchronize(uint64_t timeout) { if (device->getNEODevice()->getRootDeviceEnvironment().assertHandler.get()) { device->getNEODevice()->getRootDeviceEnvironment().assertHandler->printAssertAndAbort(); } - if (NEO::debugManager.flags.ForceGpuStatusCheckOnSuccessfulEventHostSynchronize.get() != 0) { + if (NEO::debugManager.flags.ForceGpuStatusCheckOnSuccessfulEventHostSynchronize.get() == 1) { const bool hangDetected = this->csrs[0]->isGpuHangDetected(); if (hangDetected) { return ZE_RESULT_ERROR_DEVICE_LOST; diff --git a/level_zero/core/test/unit_tests/sources/event/test_event.cpp b/level_zero/core/test/unit_tests/sources/event/test_event.cpp index c0c970a976..9e06e50227 100644 --- a/level_zero/core/test/unit_tests/sources/event/test_event.cpp +++ b/level_zero/core/test/unit_tests/sources/event/test_event.cpp @@ -1630,6 +1630,8 @@ TEST_F(EventSynchronizeTest, GivenGpuHangWhenHostSynchronizeIsCalledThenDeviceLo } TEST_F(EventSynchronizeTest, GivenHangHappenedBeforePeriodicHangCheckAndForceGpuStatusCheckDuringHostSynchronizeThenHangIsDetected) { + NEO::debugManager.flags.ForceGpuStatusCheckOnSuccessfulEventHostSynchronize.set(1); + const auto csr = std::make_unique(*neoDevice->getExecutionEnvironment(), 0, neoDevice->getDeviceBitfield()); csr->isGpuHangDetectedReturnValue = true; @@ -1643,22 +1645,9 @@ TEST_F(EventSynchronizeTest, GivenHangHappenedBeforePeriodicHangCheckAndForceGpu } TEST_F(EventSynchronizeTest, GivenEventCompletedAndForceGpuStatusCheckThenHostSynchronizeReturnsSuccess) { - const auto csr = std::make_unique(*neoDevice->getExecutionEnvironment(), 0, neoDevice->getDeviceBitfield()); - - event->csrs[0] = csr.get(); - uint32_t *hostAddr = static_cast(event->getHostAddress()); - *hostAddr = Event::STATE_SIGNALED; - - auto result = event->hostSynchronize(0); - - EXPECT_EQ(ZE_RESULT_SUCCESS, result); -} - -TEST_F(EventSynchronizeTest, GivenHangHappenedBeforePeriodicHangCheckAndForceGpuStatusCheckDuringHostSynchronizeDisabledThenSuccessIsReturned) { - NEO::debugManager.flags.ForceGpuStatusCheckOnSuccessfulEventHostSynchronize.set(0); + NEO::debugManager.flags.ForceGpuStatusCheckOnSuccessfulEventHostSynchronize.set(1); const auto csr = std::make_unique(*neoDevice->getExecutionEnvironment(), 0, neoDevice->getDeviceBitfield()); - csr->isGpuHangDetectedReturnValue = true; event->csrs[0] = csr.get(); uint32_t *hostAddr = static_cast(event->getHostAddress());