From 4ef879867c676cd5a7d35abbed175971dc686676 Mon Sep 17 00:00:00 2001 From: Zbigniew Zdanowicz Date: Fri, 14 Apr 2023 14:52:56 +0000 Subject: [PATCH] [fix] correct fence not ready value Signed-off-by: Zbigniew Zdanowicz --- level_zero/core/source/fence/fence.cpp | 7 +++++-- .../core/test/unit_tests/sources/fence/test_fence.cpp | 5 +++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/level_zero/core/source/fence/fence.cpp b/level_zero/core/source/fence/fence.cpp index 41ef8566a8..f0bb05fda4 100644 --- a/level_zero/core/source/fence/fence.cpp +++ b/level_zero/core/source/fence/fence.cpp @@ -12,6 +12,9 @@ #include "level_zero/core/source/cmdqueue/cmdqueue_imp.h" namespace L0 { +namespace FenceDefinition { +static constexpr TaskCountType fenceNotReady = NEO::CompletionStamp::notReady; +} // namespace FenceDefinition Fence *Fence::create(CommandQueueImp *cmdQueue, const ze_fence_desc_t *desc) { auto fence = new Fence(cmdQueue); @@ -39,7 +42,7 @@ ze_result_t Fence::reset(bool signaled) { if (signaled) { taskCount = 0; } else { - taskCount = std::numeric_limits::max(); + taskCount = FenceDefinition::fenceNotReady; } return ZE_RESULT_SUCCESS; } @@ -54,7 +57,7 @@ ze_result_t Fence::hostSynchronize(uint64_t timeout) { return ZE_RESULT_SUCCESS; } - if (std::numeric_limits::max() == taskCount) { + if (FenceDefinition::fenceNotReady == taskCount) { return ZE_RESULT_NOT_READY; } diff --git a/level_zero/core/test/unit_tests/sources/fence/test_fence.cpp b/level_zero/core/test/unit_tests/sources/fence/test_fence.cpp index cb3f8ac3a3..0e33b4c812 100644 --- a/level_zero/core/test/unit_tests/sources/fence/test_fence.cpp +++ b/level_zero/core/test/unit_tests/sources/fence/test_fence.cpp @@ -6,6 +6,7 @@ */ #include "shared/source/built_ins/sip.h" +#include "shared/source/helpers/completion_stamp.h" #include "shared/test/common/mocks/mock_command_stream_receiver.h" #include "shared/test/common/mocks/mock_csr.h" #include "shared/test/common/mocks/mock_driver_model.h" @@ -341,12 +342,12 @@ TEST_F(FenceTest, givenFenceWhenResettingThenTaskCountIsReset) { auto fence = whiteboxCast(Fence::create(&cmdqueue, &desc)); ASSERT_NE(fence, nullptr); - EXPECT_EQ(std::numeric_limits::max(), fence->taskCount); + EXPECT_EQ(NEO::CompletionStamp::notReady, fence->taskCount); fence->taskCount = 1; auto result = fence->reset(false); ASSERT_EQ(ZE_RESULT_SUCCESS, result); - EXPECT_EQ(std::numeric_limits::max(), fence->taskCount); + EXPECT_EQ(NEO::CompletionStamp::notReady, fence->taskCount); delete fence; }