From da9adc679728d3a1a4b90a446e1d891e9cb59e32 Mon Sep 17 00:00:00 2001 From: Compute-Runtime-Validation Date: Fri, 3 Nov 2023 06:04:39 +0100 Subject: [PATCH] Revert "feature: experimental Counter Based Event support" This reverts commit a8c79e0ba1eb6d21e6e8a70f2a59cfab8e8cb9c4. Signed-off-by: Compute-Runtime-Validation --- level_zero/core/source/cmdlist/cmdlist_hw.inl | 6 +-- .../source/cmdlist/cmdlist_hw_immediate.inl | 2 +- .../cmdlist/cmdlist_hw_xehp_and_later.inl | 2 +- level_zero/core/source/event/event.cpp | 14 ------ level_zero/core/source/event/event.h | 15 +++--- level_zero/core/source/event/event_imp.h | 2 +- level_zero/core/source/event/event_impl.inl | 16 +++--- .../core/test/unit_tests/mocks/mock_event.h | 2 +- .../test_cmdlist_append_launch_kernel_3.cpp | 50 +++++++++---------- .../unit_tests/sources/event/test_event.cpp | 19 +------ 10 files changed, 48 insertions(+), 80 deletions(-) diff --git a/level_zero/core/source/cmdlist/cmdlist_hw.inl b/level_zero/core/source/cmdlist/cmdlist_hw.inl index 9c6bc0b00f..26c9db6dec 100644 --- a/level_zero/core/source/cmdlist/cmdlist_hw.inl +++ b/level_zero/core/source/cmdlist/cmdlist_hw.inl @@ -172,7 +172,7 @@ void CommandListCoreFamily::handleInOrderDependencyCounter(Event this->commandContainer.addToResidencyContainer(&inOrderExecInfo->inOrderDependencyCounterAllocation); - if (signalEvent && signalEvent->isCounterBased()) { + if (signalEvent && signalEvent->isInOrderExecEvent()) { signalEvent->updateInOrderExecState(inOrderExecInfo, inOrderExecInfo->inOrderDependencyCounter, this->inOrderAllocationOffset); } @@ -495,7 +495,7 @@ template ze_result_t CommandListCoreFamily::appendEventReset(ze_event_handle_t hEvent) { auto event = Event::fromHandle(hEvent); - if (event->isCounterBased()) { + if (event->isInOrderExecEvent()) { return ZE_RESULT_ERROR_INVALID_ARGUMENT; } @@ -2430,7 +2430,7 @@ ze_result_t CommandListCoreFamily::appendWaitOnEvents(uint32_t nu continue; } - if (event->isCounterBased()) { + if (event->isInOrderExecEvent()) { if (!event->getInOrderExecDataAllocation()) { return ZE_RESULT_ERROR_INVALID_ARGUMENT; // in-order event not signaled yet } diff --git a/level_zero/core/source/cmdlist/cmdlist_hw_immediate.inl b/level_zero/core/source/cmdlist/cmdlist_hw_immediate.inl index d502a90b60..bcd97673aa 100644 --- a/level_zero/core/source/cmdlist/cmdlist_hw_immediate.inl +++ b/level_zero/core/source/cmdlist/cmdlist_hw_immediate.inl @@ -507,7 +507,7 @@ bool CommandListCoreFamilyImmediate::isSkippingInOrderBarrierAllo auto signalEvent = Event::fromHandle(hSignalEvent); - return !(signalEvent && (signalEvent->isEventTimestampFlagSet() || !signalEvent->isCounterBased())); + return !(signalEvent && (signalEvent->isEventTimestampFlagSet() || !signalEvent->isInOrderExecEvent())); } template diff --git a/level_zero/core/source/cmdlist/cmdlist_hw_xehp_and_later.inl b/level_zero/core/source/cmdlist/cmdlist_hw_xehp_and_later.inl index a6a1d992dc..46aaccd660 100644 --- a/level_zero/core/source/cmdlist/cmdlist_hw_xehp_and_later.inl +++ b/level_zero/core/source/cmdlist/cmdlist_hw_xehp_and_later.inl @@ -76,7 +76,7 @@ void programEventL3Flush(Event *event, template bool CommandListCoreFamily::isInOrderNonWalkerSignalingRequired(const Event *event) const { - return (event && (event->isUsingContextEndOffset() || !event->isCounterBased() || compactL3FlushEvent(getDcFlushRequired(event->isSignalScope())))); + return (event && (event->isUsingContextEndOffset() || !event->isInOrderExecEvent() || compactL3FlushEvent(getDcFlushRequired(event->isSignalScope())))); } template diff --git a/level_zero/core/source/event/event.cpp b/level_zero/core/source/event/event.cpp index f9a90b13d3..a355ef3a17 100644 --- a/level_zero/core/source/event/event.cpp +++ b/level_zero/core/source/event/event.cpp @@ -194,20 +194,6 @@ EventPool *EventPool::create(DriverHandle *driver, Context *context, uint32_t nu return eventPool.release(); } -void EventPool::setupDescriptorFlags(const ze_event_pool_desc_t *desc) { - eventPoolFlags = desc->flags; - - if (eventPoolFlags & ZE_EVENT_POOL_FLAG_KERNEL_MAPPED_TIMESTAMP) { - eventPoolFlags |= ZE_EVENT_POOL_FLAG_KERNEL_TIMESTAMP; - } - - auto pNext = reinterpret_cast(desc->pNext); - - if (pNext && pNext->stype == ZE_STRUCTURE_TYPE_COUNTER_BASED_EVENT_POOL_EXP_DESC) { - counterBased = true; - } -} - bool EventPool::isEventPoolTimestampFlagSet() const { if (NEO::DebugManager.flags.OverrideTimestampEvents.get() != -1) { auto timestampOverride = !!NEO::DebugManager.flags.OverrideTimestampEvents.get(); diff --git a/level_zero/core/source/event/event.h b/level_zero/core/source/event/event.h index 451e376f1f..92e5a58094 100644 --- a/level_zero/core/source/event/event.h +++ b/level_zero/core/source/event/event.h @@ -217,8 +217,8 @@ struct Event : _ze_event_handle_t { this->metricStreamer = metricStreamer; } void updateInOrderExecState(std::shared_ptr &newInOrderExecInfo, uint64_t signalValue, uint32_t allocationOffset); - bool isCounterBased() const { return counterBased; } - void enableCounterBasedMode() { this->counterBased = true; } + bool isInOrderExecEvent() const { return inOrderExecEvent; } + void enableInOrderMode() { this->inOrderExecEvent = true; } NEO::GraphicsAllocation *getInOrderExecDataAllocation() const; uint64_t getInOrderExecSignalValueWithSubmissionCounter() const; uint64_t getInOrderExecBaseSignalValue() const { return inOrderExecSignalValue; } @@ -287,7 +287,7 @@ struct Event : _ze_event_handle_t { bool usingContextEndOffset = false; bool signalAllEventPackets = false; bool isFromIpcPool = false; - bool counterBased = false; + bool inOrderExecEvent = false; uint64_t timestampRefreshIntervalInNanoSec = 0; }; @@ -296,7 +296,10 @@ struct EventPool : _ze_event_pool_handle_t { static ze_result_t openEventPoolIpcHandle(const ze_ipc_event_pool_handle_t &ipcEventPoolHandle, ze_event_pool_handle_t *eventPoolHandle, DriverHandleImp *driver, ContextImp *context, uint32_t numDevices, ze_device_handle_t *deviceHandles); EventPool(const ze_event_pool_desc_t *desc) : EventPool(desc->count) { - setupDescriptorFlags(desc); + eventPoolFlags = desc->flags; + if (eventPoolFlags & ZE_EVENT_POOL_FLAG_KERNEL_MAPPED_TIMESTAMP) { + eventPoolFlags |= ZE_EVENT_POOL_FLAG_KERNEL_TIMESTAMP; + } } virtual ~EventPool(); MOCKABLE_VIRTUAL ze_result_t destroy(); @@ -353,12 +356,9 @@ struct EventPool : _ze_event_pool_handle_t { return isImplicitScalingCapable; } - bool isCounterBased() const { return counterBased; } - protected: EventPool() = default; EventPool(size_t numEvents) : numEvents(numEvents) {} - void setupDescriptorFlags(const ze_event_pool_desc_t *desc); std::vector devices; @@ -381,7 +381,6 @@ struct EventPool : _ze_event_pool_handle_t { bool isImportedIpcPool = false; bool isShareableEventMemory = false; bool isImplicitScalingCapable = false; - bool counterBased = false; }; } // namespace L0 diff --git a/level_zero/core/source/event/event_imp.h b/level_zero/core/source/event/event_imp.h index aeec9b6287..4b0f3b5942 100644 --- a/level_zero/core/source/event/event_imp.h +++ b/level_zero/core/source/event/event_imp.h @@ -73,7 +73,7 @@ struct EventImp : public Event { ze_result_t calculateProfilingData(); ze_result_t queryStatusEventPackets(); - ze_result_t queryCounterBasedEventStatus(); + ze_result_t queryInOrderEventStatus(); void handleSuccessfulHostSynchronization(); MOCKABLE_VIRTUAL ze_result_t hostEventSetValue(TagSizeT eventValue); ze_result_t hostEventSetValueTimestamps(TagSizeT eventVal); diff --git a/level_zero/core/source/event/event_impl.inl b/level_zero/core/source/event/event_impl.inl index d4b2646095..7d511449b2 100644 --- a/level_zero/core/source/event/event_impl.inl +++ b/level_zero/core/source/event/event_impl.inl @@ -80,8 +80,8 @@ Event *Event::create(EventPool *eventPool, const ze_event_desc_t *desc, Device * event->timestampRefreshIntervalInNanoSec = refreshTime * milliSecondsToNanoSeconds; } - if (eventPool->isCounterBased() || NEO::DebugManager.flags.ForceInOrderEvents.get() == 1) { - event->enableCounterBasedMode(); + if (NEO::DebugManager.flags.ForceInOrderEvents.get() == 1) { + event->enableInOrderMode(); } return event; @@ -150,7 +150,7 @@ void EventImp::assignKernelEventCompletionData(void *address) { } template -ze_result_t EventImp::queryCounterBasedEventStatus() { +ze_result_t EventImp::queryInOrderEventStatus() { if (!this->inOrderExecInfo.get()) { return ZE_RESULT_NOT_READY; } @@ -281,8 +281,8 @@ ze_result_t EventImp::queryStatus() { return ZE_RESULT_SUCCESS; } - if (this->counterBased) { - return queryCounterBasedEventStatus(); + if (this->inOrderExecEvent) { + return queryInOrderEventStatus(); } else { return queryStatusEventPackets(); } @@ -396,7 +396,7 @@ ze_result_t EventImp::hostEventSetValue(TagSizeT eventVal) { template ze_result_t EventImp::hostSignal() { - if (this->isCounterBased()) { + if (this->isInOrderExecEvent()) { return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE; } @@ -447,7 +447,7 @@ ze_result_t EventImp::hostSynchronize(uint64_t timeout) { waitStartTime = std::chrono::high_resolution_clock::now(); lastHangCheckTime = waitStartTime; do { - if (NEO::DebugManager.flags.WaitForUserFenceOnEventHostSynchronize.get() == 1 && this->counterBased) { + if (NEO::DebugManager.flags.WaitForUserFenceOnEventHostSynchronize.get() == 1 && this->inOrderExecEvent) { ret = waitForUserFence(timeout); } else { ret = queryStatus(); @@ -494,7 +494,7 @@ ze_result_t EventImp::hostSynchronize(uint64_t timeout) { template ze_result_t EventImp::reset() { - if (this->isCounterBased()) { + if (this->isInOrderExecEvent()) { return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE; } diff --git a/level_zero/core/test/unit_tests/mocks/mock_event.h b/level_zero/core/test/unit_tests/mocks/mock_event.h index f0d3c5c07e..c39dc99f31 100644 --- a/level_zero/core/test/unit_tests/mocks/mock_event.h +++ b/level_zero/core/test/unit_tests/mocks/mock_event.h @@ -19,11 +19,11 @@ namespace ult { template <> struct WhiteBox<::L0::Event> : public ::L0::Event { using BaseClass = ::L0::Event; - using BaseClass::counterBased; using BaseClass::csrs; using BaseClass::Event; using BaseClass::gpuHangCheckPeriod; using BaseClass::hostAddress; + using BaseClass::inOrderExecEvent; using BaseClass::isFromIpcPool; using BaseClass::l3FlushAppliedOnKernel; using BaseClass::maxKernelCount; diff --git a/level_zero/core/test/unit_tests/sources/cmdlist/test_cmdlist_append_launch_kernel_3.cpp b/level_zero/core/test/unit_tests/sources/cmdlist/test_cmdlist_append_launch_kernel_3.cpp index fe469d43e7..9821d7f4db 100644 --- a/level_zero/core/test/unit_tests/sources/cmdlist/test_cmdlist_append_launch_kernel_3.cpp +++ b/level_zero/core/test/unit_tests/sources/cmdlist/test_cmdlist_append_launch_kernel_3.cpp @@ -668,7 +668,7 @@ HWTEST_F(CommandListAppendLaunchKernel, givenInvalidKernelWhenAppendingThenRetur struct InOrderCmdListTests : public CommandListAppendLaunchKernel { struct MockEvent : public EventImp { - using EventImp::counterBased; + using EventImp::inOrderExecEvent; using EventImp::maxPacketCount; using EventImp::inOrderExecInfo; using EventImp::inOrderExecSignalValue; @@ -698,9 +698,6 @@ struct InOrderCmdListTests : public CommandListAppendLaunchKernel { eventPoolDesc.flags = ZE_EVENT_POOL_FLAG_HOST_VISIBLE; eventPoolDesc.count = numEvents; - ze_event_pool_counter_based_exp_desc_t counterBasedExtension = {ZE_STRUCTURE_TYPE_COUNTER_BASED_EVENT_POOL_EXP_DESC}; - eventPoolDesc.pNext = &counterBasedExtension; - if (timestampEvent) { eventPoolDesc.flags |= ZE_EVENT_POOL_FLAG_KERNEL_TIMESTAMP; } @@ -713,7 +710,8 @@ struct InOrderCmdListTests : public CommandListAppendLaunchKernel { for (uint32_t i = 0; i < numEvents; i++) { eventDesc.index = i; events.emplace_back(DestroyableZeUniquePtr(static_cast(Event::create(eventPool.get(), &eventDesc, device)))); - EXPECT_TRUE(events.back()->counterBased); + EXPECT_FALSE(events.back()->inOrderExecEvent); + events.back()->inOrderExecEvent = true; } return eventPool; @@ -847,7 +845,7 @@ HWTEST2_F(InOrderCmdListTests, givenNotSignaledInOrderEventWhenAddedToWaitListTh eventDesc.index = 0; auto event = std::unique_ptr(static_cast(Event::create(eventPool.get(), &eventDesc, device))); - EXPECT_TRUE(event->counterBased); + EXPECT_TRUE(event->inOrderExecEvent); auto handle = event->toHandle(); @@ -858,7 +856,7 @@ HWTEST2_F(InOrderCmdListTests, givenNotSignaledInOrderEventWhenAddedToWaitListTh HWTEST2_F(InOrderCmdListTests, givenNotSignaledInOrderWhenWhenCallingQueryStatusThenReturnNotReady, IsAtLeastSkl) { auto eventPool = createEvents(1, false); - events[0]->counterBased = true; + events[0]->inOrderExecEvent = true; EXPECT_EQ(ZE_RESULT_NOT_READY, events[0]->queryStatus()); } @@ -959,7 +957,7 @@ HWTEST2_F(InOrderCmdListTests, givenDebugFlagSetWhenEventHostSyncCalledThenCallW EXPECT_EQ(2u, ultCsr->waitUserFenecParams.callCount); // non in-order event - events[1]->counterBased = false; + events[1]->inOrderExecEvent = false; events[1]->hostSynchronize(2); EXPECT_EQ(2u, ultCsr->waitUserFenecParams.callCount); } @@ -973,7 +971,7 @@ HWTEST2_F(InOrderCmdListTests, givenInOrderModeWhenHostResetOrSignalEventCalledT EXPECT_EQ(MemoryConstants::pageSize64k, immCmdList->inOrderExecInfo->inOrderDependencyCounterAllocation.getUnderlyingBufferSize()); - EXPECT_TRUE(events[0]->counterBased); + EXPECT_TRUE(events[0]->inOrderExecEvent); EXPECT_EQ(events[0]->inOrderExecSignalValue, immCmdList->inOrderExecInfo->inOrderDependencyCounter); EXPECT_EQ(&events[0]->inOrderExecInfo->inOrderDependencyCounterAllocation, &immCmdList->inOrderExecInfo->inOrderDependencyCounterAllocation); EXPECT_EQ(events[0]->inOrderAllocationOffset, 0u); @@ -1000,11 +998,11 @@ HWTEST2_F(InOrderCmdListTests, givenInOrderModeWheUsingRegularEventThenDontSetIn auto immCmdList = createImmCmdList(); auto eventPool = createEvents(1, false); - events[0]->counterBased = false; + events[0]->inOrderExecEvent = false; immCmdList->appendLaunchKernel(kernel->toHandle(), groupCount, events[0]->toHandle(), 0, nullptr, launchParams, false); - EXPECT_FALSE(events[0]->counterBased); + EXPECT_FALSE(events[0]->inOrderExecEvent); EXPECT_EQ(events[0]->inOrderExecSignalValue, 0u); EXPECT_EQ(events[0]->inOrderExecInfo.get(), nullptr); EXPECT_EQ(events[0]->inOrderAllocationOffset, 0u); @@ -1051,7 +1049,7 @@ HWTEST2_F(InOrderCmdListTests, givenDebugFlagSetWhenDispatchingSemaphoreThenProg auto eventPool = createEvents(1, false); auto eventHandle = events[0]->toHandle(); - events[0]->counterBased = false; + events[0]->inOrderExecEvent = false; auto immCmdList = createImmCmdList(); @@ -1115,7 +1113,7 @@ HWTEST2_F(InOrderCmdListTests, givenDebugFlagSetWhenDispatchingStoreDataImmThenP auto eventPool = createEvents(1, false); auto eventHandle = events[0]->toHandle(); - events[0]->counterBased = false; + events[0]->inOrderExecEvent = false; auto immCmdList = createImmCmdList(); @@ -1159,7 +1157,7 @@ HWTEST2_F(InOrderCmdListTests, givenDebugFlagSetAsMaskWhenDispatchingStoreDataIm auto eventPool = createEvents(1, false); auto eventHandle = events[0]->toHandle(); - events[0]->counterBased = false; + events[0]->inOrderExecEvent = false; auto immCmdList = createImmCmdList(); @@ -1273,7 +1271,7 @@ HWTEST2_F(InOrderCmdListTests, givenInOrderModeWhenWaitingForRegularEventFromPre auto immCmdList = createCopyOnlyImmCmdList(); auto eventPool = createEvents(1, false); - events[0]->counterBased = false; + events[0]->inOrderExecEvent = false; auto eventHandle = events[0]->toHandle(); auto cmdStream = immCmdList->getCmdContainer().getCommandStream(); @@ -1365,7 +1363,7 @@ HWTEST2_F(InOrderCmdListTests, givenCmdsChainingWhenDispatchingKernelThenProgram auto immCmdList = createImmCmdList(); auto eventPool = createEvents(1, false); - events[0]->counterBased = false; + events[0]->inOrderExecEvent = false; auto cmdStream = immCmdList->getCmdContainer().getCommandStream(); @@ -1445,7 +1443,7 @@ HWTEST2_F(InOrderCmdListTests, givenCmdsChainingFromAppendCopyWhenDispatchingKer auto immCmdList = createImmCmdList(); auto eventPool = createEvents(1, false); - events[0]->counterBased = false; + events[0]->inOrderExecEvent = false; auto cmdStream = immCmdList->getCmdContainer().getCommandStream(); @@ -1543,7 +1541,7 @@ HWTEST2_F(InOrderCmdListTests, givenCmdsChainingWhenDispatchingKernelWithRelaxed auto immCmdList = createImmCmdList(); auto eventPool = createEvents(1, false); - events[0]->counterBased = false; + events[0]->inOrderExecEvent = false; auto cmdStream = immCmdList->getCmdContainer().getCommandStream(); @@ -2037,7 +2035,7 @@ HWTEST2_F(InOrderCmdListTests, givenInOrderModeWhenProgrammingRegularEventThenCl auto eventPool = createEvents(1, false); events[0]->signalScope = 0; - events[0]->counterBased = false; + events[0]->inOrderExecEvent = false; immCmdList->appendLaunchKernel(kernel->toHandle(), groupCount, events[0]->toHandle(), 0, nullptr, launchParams, false); @@ -2151,7 +2149,7 @@ HWTEST2_F(InOrderCmdListTests, givenNonPostSyncWalkerWhenAskingForNonWalkerSigna auto eventPool1 = createEvents(1, true); auto eventPool2 = createEvents(1, false); auto eventPool3 = createEvents(1, false); - events[2]->counterBased = false; + events[2]->inOrderExecEvent = false; EXPECT_FALSE(immCmdList->isInOrderNonWalkerSignalingRequired(events[0].get())); EXPECT_FALSE(immCmdList->isInOrderNonWalkerSignalingRequired(events[1].get())); @@ -2310,7 +2308,7 @@ HWTEST2_F(InOrderCmdListTests, givenInOrderModeWhenProgrammingNonKernelAppendThe auto cmdStream = immCmdList->getCmdContainer().getCommandStream(); auto eventPool = createEvents(1, true); - events[0]->counterBased = false; + events[0]->inOrderExecEvent = false; uint64_t inOrderSyncVa = immCmdList->inOrderExecInfo->inOrderDependencyCounterAllocation.getGpuAddress(); @@ -2416,7 +2414,7 @@ HWTEST2_F(InOrderCmdListTests, givenInOrderRegularCmdListWhenProgrammingNonKerne auto cmdStream = regularCmdList->getCmdContainer().getCommandStream(); auto eventPool = createEvents(1, true); - events[0]->counterBased = false; + events[0]->inOrderExecEvent = false; uint8_t ptr[64] = {}; @@ -2995,7 +2993,7 @@ HWTEST2_F(InOrderCmdListTests, givenRegularInOrderCmdListWhenProgrammingAppendWa auto cmdStream = regularCmdList->getCmdContainer().getCommandStream(); auto eventPool = createEvents(1, false); - events[0]->counterBased = false; + events[0]->inOrderExecEvent = false; auto eventHandle = events[0]->toHandle(); @@ -3304,7 +3302,7 @@ HWTEST2_F(InOrderCmdListTests, givenInOrderModeWhenProgrammingAppendBarrierWitho auto offset = cmdStream->getUsed(); auto eventPool = createEvents(1, false); - events[0]->counterBased = false; + events[0]->inOrderExecEvent = false; auto eventHandle = events[0]->toHandle(); @@ -4157,7 +4155,7 @@ HWTEST2_F(BcsSplitInOrderCmdListTests, givenBcsSplitEnabledWhenAppendingMemoryCo constexpr size_t copySize = 8 * MemoryConstants::megaByte; auto eventPool = createEvents(1, false); - events[0]->counterBased = false; + events[0]->inOrderExecEvent = false; auto eventHandle = events[0]->toHandle(); immCmdList->appendMemoryCopy(©Data, ©Data, copySize, nullptr, 0, nullptr, false, false); @@ -4620,7 +4618,7 @@ HWTEST2_F(InOrderRegularCmdListTests, givenInOrderModeWhenDispatchingRegularCmdL auto eventPool = createEvents(1, true); auto eventHandle = events[0]->toHandle(); - events[0]->counterBased = false; + events[0]->inOrderExecEvent = false; auto regularCmdList = createRegularCmdList(false); auto regularCopyOnlyCmdList = createRegularCmdList(true); 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 76e4808add..bbf6c3b2de 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 @@ -172,21 +172,6 @@ TEST_F(EventPoolCreate, GivenEventPoolThenAllocationContainsAtLeast16Bytes) { minAllocationSize); } -TEST_F(EventPoolCreate, givenInvalidPNextWhenCreatingPoolThenIgnore) { - ze_base_desc_t baseDesc = {ZE_STRUCTURE_TYPE_FORCE_UINT32}; - - ze_event_pool_desc_t eventPoolDesc = { - ZE_STRUCTURE_TYPE_EVENT_POOL_DESC, - &baseDesc, - ZE_EVENT_POOL_FLAG_HOST_VISIBLE, - 1}; - - ze_result_t result = ZE_RESULT_SUCCESS; - std::unique_ptr eventPool(EventPool::create(driverHandle.get(), context, 0, nullptr, &eventPoolDesc, result)); - EXPECT_EQ(ZE_RESULT_SUCCESS, result); - ASSERT_NE(nullptr, eventPool); -} - HWTEST_F(EventPoolCreate, givenTimestampEventsThenEventSizeSufficientForAllKernelTimestamps) { ze_event_pool_desc_t eventPoolDesc = {}; eventPoolDesc.count = 1; @@ -3276,7 +3261,7 @@ HWTEST_F(EventTests, givenInOrderEventWhenHostSynchronizeIsCalledThenAllocationI auto inOrderExecInfo = std::make_shared(*syncAllocation, *neoDevice->getMemoryManager(), false); - event->counterBased = true; + event->inOrderExecEvent = true; event->updateInOrderExecState(inOrderExecInfo, 1, 0); constexpr uint64_t timeout = std::numeric_limits::max(); @@ -3288,7 +3273,7 @@ HWTEST_F(EventTests, givenInOrderEventWhenHostSynchronizeIsCalledThenAllocationI auto event2 = zeUniquePtr(whiteboxCast(getHelper().createEvent(eventPool.get(), &eventDesc, device))); - event2->counterBased = true; + event2->inOrderExecEvent = true; event2->updateInOrderExecState(inOrderExecInfo, 1, 0); syncAllocation->updateTaskCount(0u, ultCsr->getOsContext().getContextId()); ultCsr->downloadAllocationsCalledCount = 0;