From 037756460f74e3034d52b0666dfc3ee39f0b57bc Mon Sep 17 00:00:00 2001 From: Szymon Morek Date: Fri, 31 Oct 2025 15:51:47 +0000 Subject: [PATCH] refactor: remove unused code Related-To: NEO-14360 Signed-off-by: Szymon Morek --- level_zero/core/source/cmdlist/cmdlist_hw.inl | 6 +- .../cmdlist/cmdlist_hw_xehp_and_later.inl | 8 +- level_zero/core/source/event/event.h | 10 +- level_zero/core/source/event/event_impl.inl | 9 +- .../unit_tests/sources/assert/test_assert.cpp | 1 - .../test_cmdlist_append_event_reset.cpp | 6 +- .../test_cmdlist_append_launch_kernel_2.cpp | 2 +- .../test_cmdlist_append_signal_event.cpp | 6 +- .../test_cmdlist_append_wait_on_events.cpp | 3 +- ...test_cmdlist_copy_event_xehp_and_later.cpp | 16 +- ...test_cmdlist_fill_event_xehp_and_later.cpp | 16 +- .../cmdlist/test_cmdlist_xehp_and_later.cpp | 2 +- .../cmdlist/test_in_order_cmdlist_1.cpp | 3 - .../unit_tests/sources/event/test_event.cpp | 139 ++---------------- .../debug_settings/debug_variables_base.inl | 1 - shared/test/common/test_files/igdrcl.config | 1 - 16 files changed, 42 insertions(+), 187 deletions(-) diff --git a/level_zero/core/source/cmdlist/cmdlist_hw.inl b/level_zero/core/source/cmdlist/cmdlist_hw.inl index 0da6963592..e43cd6181b 100644 --- a/level_zero/core/source/cmdlist/cmdlist_hw.inl +++ b/level_zero/core/source/cmdlist/cmdlist_hw.inl @@ -478,7 +478,7 @@ ze_result_t CommandListCoreFamily::appendLaunchKernel(ze_kernel_h auto res = appendLaunchKernelWithParams(kernel, threadGroupDimensions, event, launchParams); if (!launchParams.skipInOrderNonWalkerSignaling) { - handleInOrderDependencyCounter(event, isInOrderNonWalkerSignalingRequired(event) && !(event && event->isCounterBased() && event->isUsingContextEndOffset()), false); + handleInOrderDependencyCounter(event, isInOrderNonWalkerSignalingRequired(event) && !(event && event->isCounterBased() && event->isEventTimestampFlagSet()), false); } if (this->synchronizedDispatchMode != NEO::SynchronizedDispatchMode::disabled) { @@ -4814,7 +4814,7 @@ bool CommandListCoreFamily::handleCounterBasedEventOperations(Eve } } - if (signalEvent->isUsingContextEndOffset()) { + if (signalEvent->isEventTimestampFlagSet()) { auto tag = device->getInOrderTimestampAllocator()->getTag(); if (skipAddingEventToResidency == false) { @@ -5046,7 +5046,7 @@ void CommandListCoreFamily::programEventL3Flush(Event *event) { auto eventPartitionOffset = (partitionCount > 1) ? (partitionCount * event->getSinglePacketSize()) : event->getSinglePacketSize(); uint64_t eventAddress = event->getPacketAddress(device) + eventPartitionOffset; - if (event->isUsingContextEndOffset()) { + if (event->isEventTimestampFlagSet()) { eventAddress += event->getContextEndOffset(); } 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 da2ad6b1d2..0b16cfde7e 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 @@ -50,7 +50,7 @@ bool CommandListCoreFamily::isInOrderNonWalkerSignalingRequired(c const bool flushRequired = compactL3FlushEvent(getDcFlushRequired(event->isSignalScope())); const bool inOrderRequired = !this->duplicatedInOrderCounterStorageEnabled && - (event->isUsingContextEndOffset() || !event->isCounterBased()); + (event->isEventTimestampFlagSet() || !event->isCounterBased()); return flushRequired || inOrderRequired; } @@ -200,7 +200,7 @@ ze_result_t CommandListCoreFamily::appendLaunchKernelWithParams(K commandContainer.addToResidencyContainer(eventPoolAlloc); } eventAddress = event->getPacketAddress(this->device); - isTimestampEvent = event->isUsingContextEndOffset(); + isTimestampEvent = event->isEventTimestampFlagSet(); } bool flushRequired = event->isSignalScope() && @@ -328,7 +328,7 @@ ze_result_t CommandListCoreFamily::appendLaunchKernelWithParams(K inOrderNonWalkerSignalling = isInOrderNonWalkerSignalingRequired(eventForInOrderExec); if (inOrderExecSignalRequired) { - if (!compactEvent || !compactEvent->isCounterBased() || compactEvent->isUsingContextEndOffset()) { + if (!compactEvent || !compactEvent->isCounterBased() || compactEvent->isEventTimestampFlagSet()) { if (inOrderNonWalkerSignalling) { if (!eventForInOrderExec->getAllocation(this->device)) { eventForInOrderExec->resetInOrderTimestampNode(device->getInOrderTimestampAllocator()->getTag(), this->partitionCount); @@ -498,7 +498,7 @@ ze_result_t CommandListCoreFamily::appendLaunchKernelWithParams(K if (inOrderExecSignalRequired) { if (inOrderNonWalkerSignalling) { if (!launchParams.skipInOrderNonWalkerSignaling) { - if (!(eventForInOrderExec->isCounterBased() && eventForInOrderExec->isUsingContextEndOffset())) { + if (!(eventForInOrderExec->isCounterBased() && eventForInOrderExec->isEventTimestampFlagSet())) { if (compactEvent && compactEvent->isCounterBased()) { auto pcCmdPtr = this->commandContainer.getCommandStream()->getSpace(0u); inOrderCounterValue = this->inOrderExecInfo->getCounterValue() + getInOrderIncrementValue(); diff --git a/level_zero/core/source/event/event.h b/level_zero/core/source/event/event.h index d93d61f815..5a6770a8df 100644 --- a/level_zero/core/source/event/event.h +++ b/level_zero/core/source/event/event.h @@ -170,7 +170,7 @@ struct Event : _ze_event_handle_t { MOCKABLE_VIRTUAL void setGpuStartTimestamp(); MOCKABLE_VIRTUAL void setGpuEndTimestamp(); size_t getCompletionFieldOffset() const { - return this->isUsingContextEndOffset() ? this->getContextEndOffset() : 0; + return this->isEventTimestampFlagSet() ? this->getContextEndOffset() : 0; } uint64_t getCompletionFieldGpuAddress(Device *device) const { return this->getGpuAddress(device) + getCompletionFieldOffset(); @@ -203,12 +203,7 @@ struct Event : _ze_event_handle_t { bool isEventTimestampFlagSet() const { return isTimestampEvent; } - void setUsingContextEndOffset(bool usingContextEndOffset) { - this->usingContextEndOffset = usingContextEndOffset; - } - bool isUsingContextEndOffset() const { - return isTimestampEvent || usingContextEndOffset; - } + void setCsr(NEO::CommandStreamReceiver *csr, bool clearPreviousCsrs) { if (clearPreviousCsrs) { this->csrs.clear(); @@ -442,7 +437,6 @@ struct Event : _ze_event_handle_t { std::atomic isCompleted{STATE_INITIAL}; bool isTimestampEvent = false; - bool usingContextEndOffset = false; bool signalAllEventPackets = false; bool isFromIpcPool = false; bool kmdWaitMode = false; diff --git a/level_zero/core/source/event/event_impl.inl b/level_zero/core/source/event/event_impl.inl index 58235ca1c7..f366031c19 100644 --- a/level_zero/core/source/event/event_impl.inl +++ b/level_zero/core/source/event/event_impl.inl @@ -77,13 +77,6 @@ Event *Event::create(const EventDescriptor &eventDescriptor, Device *device, ze_ event->kernelEventCompletionData = std::make_unique[]>(event->maxKernelCount); - bool useContextEndOffset = false; - int32_t overrideUseContextEndOffset = NEO::debugManager.flags.UseContextEndOffsetForEventCompletion.get(); - if (overrideUseContextEndOffset != -1) { - useContextEndOffset = !!overrideUseContextEndOffset; - } - event->setUsingContextEndOffset(useContextEndOffset); - const auto frequency = device->getNEODevice()->getDeviceInfo().profilingTimerResolution; const auto maxKernelTsValue = maxNBitValue(hwInfo.capabilityTable.kernelTimestampValidBits); if (hwInfo.capabilityTable.kernelTimestampValidBits < 64u) { @@ -405,7 +398,7 @@ ze_result_t EventImp::queryStatusEventPackets() { for (uint32_t i = 0; i < this->kernelCount; i++) { uint32_t packetsToCheck = kernelEventCompletionData[i].getPacketsUsed(); for (uint32_t packetId = 0; packetId < packetsToCheck; packetId++, packets++) { - void const *queryAddress = isUsingContextEndOffset() + void const *queryAddress = isEventTimestampFlagSet() ? kernelEventCompletionData[i].getContextEndAddress(packetId) : kernelEventCompletionData[i].getContextStartAddress(packetId); bool ready = NEO::WaitUtils::waitFunctionWithPredicate( diff --git a/level_zero/core/test/unit_tests/sources/assert/test_assert.cpp b/level_zero/core/test/unit_tests/sources/assert/test_assert.cpp index 1c9d28303c..d2210020ac 100644 --- a/level_zero/core/test/unit_tests/sources/assert/test_assert.cpp +++ b/level_zero/core/test/unit_tests/sources/assert/test_assert.cpp @@ -718,7 +718,6 @@ TEST_F(EventAssertTest, GivenEventSignalledWhenHostSynchronizeIsCalledThenAssert uint32_t *hostAddr = static_cast(event->getHostAddress()); *hostAddr = Event::STATE_SIGNALED; - event->setUsingContextEndOffset(false); event->csrs[0] = csr.get(); auto assertHandler = new MockAssertHandler(device->getNEODevice()); diff --git a/level_zero/core/test/unit_tests/sources/cmdlist/test_cmdlist_append_event_reset.cpp b/level_zero/core/test/unit_tests/sources/cmdlist/test_cmdlist_append_event_reset.cpp index e739ea2452..da29a4369c 100644 --- a/level_zero/core/test/unit_tests/sources/cmdlist/test_cmdlist_append_event_reset.cpp +++ b/level_zero/core/test/unit_tests/sources/cmdlist/test_cmdlist_append_event_reset.cpp @@ -377,7 +377,6 @@ HWTEST2_F(CommandListAppendUsedPacketSignalEvent, constexpr uint32_t packets = 2u; event->setPacketsInUse(packets); event->setEventTimestampFlag(false); - event->setUsingContextEndOffset(true); event->signalScope = ZE_EVENT_SCOPE_FLAG_HOST; commandList->partitionCount = packets; @@ -385,7 +384,7 @@ HWTEST2_F(CommandListAppendUsedPacketSignalEvent, EXPECT_EQ(ZE_RESULT_SUCCESS, returnValue); EXPECT_EQ(2u, event->getPacketsInUse()); - auto gpuAddress = event->getGpuAddress(device) + event->getContextEndOffset(); + auto gpuAddress = event->getGpuAddress(device); size_t expectedSize = NEO::MemorySynchronizationCommands::getSizeForBarrierWithPostSyncOperation(device->getNEODevice()->getRootDeviceEnvironment(), NEO::PostSyncMode::immediateData) + commandList->estimateBufferSizeMultiTileBarrier(device->getNEODevice()->getRootDeviceEnvironment()); @@ -447,7 +446,6 @@ HWTEST2_F(CommandListAppendUsedPacketSignalEvent, constexpr uint32_t packets = 2u; event->setPacketsInUse(packets); - event->setUsingContextEndOffset(true); size_t usedBeforeSize = cmdStream->getUsed(); returnValue = commandList->appendEventReset(event->toHandle()); @@ -459,7 +457,7 @@ HWTEST2_F(CommandListAppendUsedPacketSignalEvent, size_t expectedSize = NEO::EncodeMiFlushDW::getCommandSizeWithWa(waArgs) * packets; EXPECT_EQ(expectedSize, (usedAfterSize - usedBeforeSize)); - auto gpuAddress = event->getGpuAddress(device) + event->getContextEndOffset(); + auto gpuAddress = event->getGpuAddress(device); GenCmdList cmdList; ASSERT_TRUE(FamilyType::Parse::parseCommandBuffer( diff --git a/level_zero/core/test/unit_tests/sources/cmdlist/test_cmdlist_append_launch_kernel_2.cpp b/level_zero/core/test/unit_tests/sources/cmdlist/test_cmdlist_append_launch_kernel_2.cpp index 79ab38c74b..f86afa85ef 100644 --- a/level_zero/core/test/unit_tests/sources/cmdlist/test_cmdlist_append_launch_kernel_2.cpp +++ b/level_zero/core/test/unit_tests/sources/cmdlist/test_cmdlist_append_launch_kernel_2.cpp @@ -1442,7 +1442,7 @@ HWCMDTEST_F(IGFX_XE_HP_CORE, MultiTileCommandListAppendLaunchKernelXeHpCoreTest, EXPECT_EQ(ZE_RESULT_SUCCESS, result); std::unique_ptr event(Event::create(eventPool.get(), &eventDesc, device, result)); - EXPECT_FALSE(event->isUsingContextEndOffset()); + EXPECT_FALSE(event->isEventTimestampFlagSet()); ze_event_handle_t hEventHandle = event->toHandle(); diff --git a/level_zero/core/test/unit_tests/sources/cmdlist/test_cmdlist_append_signal_event.cpp b/level_zero/core/test/unit_tests/sources/cmdlist/test_cmdlist_append_signal_event.cpp index 8b4375d8dc..2d64f79fac 100644 --- a/level_zero/core/test/unit_tests/sources/cmdlist/test_cmdlist_append_signal_event.cpp +++ b/level_zero/core/test/unit_tests/sources/cmdlist/test_cmdlist_append_signal_event.cpp @@ -510,7 +510,6 @@ HWTEST2_F(CommandListAppendUsedPacketSignalEvent, constexpr uint32_t packets = 2u; event->setEventTimestampFlag(false); - event->setUsingContextEndOffset(true); event->signalScope = ZE_EVENT_SCOPE_FLAG_HOST; commandList->partitionCount = packets; @@ -518,7 +517,7 @@ HWTEST2_F(CommandListAppendUsedPacketSignalEvent, EXPECT_EQ(ZE_RESULT_SUCCESS, returnValue); EXPECT_EQ(packets, event->getPacketsInUse()); - auto gpuAddress = event->getGpuAddress(device) + event->getContextEndOffset(); + auto gpuAddress = event->getGpuAddress(device); size_t expectedSize = NEO::MemorySynchronizationCommands::getSizeForBarrierWithPostSyncOperation(device->getNEODevice()->getRootDeviceEnvironment(), NEO::PostSyncMode::immediateData); size_t usedSize = cmdStream->getUsed(); @@ -647,7 +646,6 @@ HWTEST2_F(CommandListAppendUsedPacketSignalEvent, constexpr uint32_t packets = 2u; event->setEventTimestampFlag(false); - event->setUsingContextEndOffset(true); event->signalScope = 0; commandList->partitionCount = packets; @@ -655,7 +653,7 @@ HWTEST2_F(CommandListAppendUsedPacketSignalEvent, EXPECT_EQ(ZE_RESULT_SUCCESS, returnValue); EXPECT_EQ(packets, event->getPacketsInUse()); - auto gpuAddress = event->getGpuAddress(device) + event->getContextEndOffset(); + auto gpuAddress = event->getGpuAddress(device); size_t expectedSize = NEO::EncodeStoreMemory::getStoreDataImmSize(); size_t usedSize = cmdStream->getUsed(); diff --git a/level_zero/core/test/unit_tests/sources/cmdlist/test_cmdlist_append_wait_on_events.cpp b/level_zero/core/test/unit_tests/sources/cmdlist/test_cmdlist_append_wait_on_events.cpp index 512377f507..0947b3d579 100644 --- a/level_zero/core/test/unit_tests/sources/cmdlist/test_cmdlist_append_wait_on_events.cpp +++ b/level_zero/core/test/unit_tests/sources/cmdlist/test_cmdlist_append_wait_on_events.cpp @@ -834,7 +834,6 @@ HWTEST2_F(MultTileCommandListAppendWaitOnEvent, size_t expectedSize = commandList->partitionCount * NEO::EncodeSemaphore::getSizeMiSemaphoreWait(); event->setPacketsInUse(commandList->partitionCount); - event->setUsingContextEndOffset(true); ze_event_handle_t eventHandle = event->toHandle(); @@ -845,7 +844,7 @@ HWTEST2_F(MultTileCommandListAppendWaitOnEvent, auto usedSpaceAfter = commandList->getCmdContainer().getCommandStream()->getUsed(); EXPECT_EQ(expectedSize, (usedSpaceAfter - usedSpaceBefore)); - auto gpuAddress = event->getGpuAddress(device) + event->getContextEndOffset(); + auto gpuAddress = event->getGpuAddress(device); GenCmdList cmdList; ASSERT_TRUE(FamilyType::Parse::parseCommandBuffer(cmdList, diff --git a/level_zero/core/test/unit_tests/sources/cmdlist/test_cmdlist_copy_event_xehp_and_later.cpp b/level_zero/core/test/unit_tests/sources/cmdlist/test_cmdlist_copy_event_xehp_and_later.cpp index 1b9da15c85..4c6382aa8f 100644 --- a/level_zero/core/test/unit_tests/sources/cmdlist/test_cmdlist_copy_event_xehp_and_later.cpp +++ b/level_zero/core/test/unit_tests/sources/cmdlist/test_cmdlist_copy_event_xehp_and_later.cpp @@ -151,7 +151,7 @@ void testSingleTileAppendMemoryCopyThreeKernels(CopyTestInput &input, TestExpect EXPECT_EQ(kernelEventAddresses[i], postSync.getDestinationAddress()); } - if (event->isUsingContextEndOffset()) { + if (event->isEventTimestampFlagSet()) { gpuBaseAddress += event->getContextEndOffset(); } @@ -240,7 +240,7 @@ void testSingleTileAppendMemoryCopyThreeKernelsAndL3Flush(CopyTestInput &input, EXPECT_EQ(kernelEventAddresses[i], postSync.getDestinationAddress()); } - if (event->isUsingContextEndOffset()) { + if (event->isEventTimestampFlagSet()) { gpuBaseAddress += event->getContextEndOffset(); } @@ -337,7 +337,7 @@ void testSingleTileAppendMemoryCopySingleKernel(CopyTestInput &input, TestExpect EXPECT_EQ(static_cast(arg.expectedWalkerPostSyncOp), postSync.getOperation()); EXPECT_EQ(firstKernelEventAddress, postSync.getDestinationAddress()); - if (event->isUsingContextEndOffset()) { + if (event->isEventTimestampFlagSet()) { gpuBaseAddress += event->getContextEndOffset(); } @@ -413,7 +413,7 @@ void testSingleTileAppendMemoryCopySingleKernelAndL3Flush(CopyTestInput &input, EXPECT_EQ(static_cast(arg.expectedWalkerPostSyncOp), postSync.getOperation()); EXPECT_EQ(firstKernelEventAddress, postSync.getDestinationAddress()); - if (event->isUsingContextEndOffset()) { + if (event->isEventTimestampFlagSet()) { gpuBaseAddress += event->getContextEndOffset(); } @@ -576,7 +576,7 @@ void testMultiTileAppendMemoryCopyThreeKernels(CopyTestInput &input, TestExpecte EXPECT_EQ(expectedKernelEventAddress[i], postSync.getDestinationAddress()); } - if (event->isUsingContextEndOffset()) { + if (event->isEventTimestampFlagSet()) { gpuBaseAddress += event->getContextEndOffset(); } @@ -674,7 +674,7 @@ void testMultiTileAppendMemoryCopyThreeKernelsAndL3Flush(CopyTestInput &input, T EXPECT_EQ(expectedKernelEventAddress[i], postSync.getDestinationAddress()); } - if (event->isUsingContextEndOffset()) { + if (event->isEventTimestampFlagSet()) { gpuBaseAddress += event->getContextEndOffset(); } @@ -784,7 +784,7 @@ void testMultiTileAppendMemoryCopySingleKernel(CopyTestInput &input, TestExpecte EXPECT_EQ(static_cast(arg.expectedWalkerPostSyncOp), postSync.getOperation()); EXPECT_EQ(firstKernelEventAddress, postSync.getDestinationAddress()); - if (event->isUsingContextEndOffset()) { + if (event->isEventTimestampFlagSet()) { gpuBaseAddress += event->getContextEndOffset(); } // single kernel, cleanup of 3 SDI @@ -869,7 +869,7 @@ void testMultiTileAppendMemoryCopySingleKernelAndL3Flush(CopyTestInput &input, T EXPECT_EQ(static_cast(arg.expectedWalkerPostSyncOp), postSync.getOperation()); EXPECT_EQ(firstKernelEventAddress, postSync.getDestinationAddress()); - if (event->isUsingContextEndOffset()) { + if (event->isEventTimestampFlagSet()) { gpuBaseAddress += event->getContextEndOffset(); } diff --git a/level_zero/core/test/unit_tests/sources/cmdlist/test_cmdlist_fill_event_xehp_and_later.cpp b/level_zero/core/test/unit_tests/sources/cmdlist/test_cmdlist_fill_event_xehp_and_later.cpp index fda06a9718..c2063211b4 100644 --- a/level_zero/core/test/unit_tests/sources/cmdlist/test_cmdlist_fill_event_xehp_and_later.cpp +++ b/level_zero/core/test/unit_tests/sources/cmdlist/test_cmdlist_fill_event_xehp_and_later.cpp @@ -143,7 +143,7 @@ void testSingleTileAppendMemoryFillManyImmediateKernels(FillTestInput &input, Te EXPECT_EQ(expectedKernelEventAddress[i], postSync.getDestinationAddress()); } - if (event->isUsingContextEndOffset()) { + if (event->isEventTimestampFlagSet()) { gpuBaseAddress += event->getContextEndOffset(); } @@ -225,7 +225,7 @@ void testSingleTileAppendMemoryFillManyKernels(FillTestInput &input, TestExpecte EXPECT_EQ(expectedKernelEventAddress[i], postSync.getDestinationAddress()); } - if (event->isUsingContextEndOffset()) { + if (event->isEventTimestampFlagSet()) { gpuBaseAddress += event->getContextEndOffset(); } @@ -308,7 +308,7 @@ void testSingleTileAppendMemoryFillManyKernelsAndL3Flush(FillTestInput &input, T EXPECT_EQ(expectedKernelEventAddress[i], postSync.getDestinationAddress()); } - if (event->isUsingContextEndOffset()) { + if (event->isEventTimestampFlagSet()) { gpuBaseAddress += event->getContextEndOffset(); } @@ -387,7 +387,7 @@ void testSingleTileAppendMemoryFillSingleKernel(FillTestInput &input, TestExpect EXPECT_EQ(static_cast(arg.expectedWalkerPostSyncOp), postSync.getOperation()); EXPECT_EQ(firstKernelEventAddress, postSync.getDestinationAddress()); - if (event->isUsingContextEndOffset()) { + if (event->isEventTimestampFlagSet()) { gpuBaseAddress += event->getContextEndOffset(); } @@ -468,7 +468,7 @@ void testSingleTileAppendMemoryFillSingleKernelAndL3Flush(FillTestInput &input, EXPECT_EQ(static_cast(arg.expectedWalkerPostSyncOp), postSync.getOperation()); EXPECT_EQ(firstKernelEventAddress, postSync.getDestinationAddress()); - if (event->isUsingContextEndOffset()) { + if (event->isEventTimestampFlagSet()) { gpuBaseAddress += event->getContextEndOffset(); } @@ -587,7 +587,7 @@ void testMultiTileAppendMemoryFillManyKernels(FillTestInput &input, TestExpected EXPECT_EQ(expectedKernelEventAddress[i], postSync.getDestinationAddress()); } - if (event->isUsingContextEndOffset()) { + if (event->isEventTimestampFlagSet()) { gpuBaseAddress += event->getContextEndOffset(); } @@ -698,11 +698,11 @@ void testMultiTileAppendMemoryFillSingleKernelAndL3Flush(FillTestInput &input, T size_t extraCleanupStoreDataImm = kernels * sdiCount; uint64_t l3FlushPostSyncAddress = firstKernelEventAddress + 2 * event->getSinglePacketSize(); - if (event->isUsingContextEndOffset()) { + if (event->isEventTimestampFlagSet()) { l3FlushPostSyncAddress += event->getContextEndOffset(); } - if (event->isUsingContextEndOffset()) { + if (event->isEventTimestampFlagSet()) { gpuBaseAddress += event->getContextEndOffset(); } diff --git a/level_zero/core/test/unit_tests/sources/cmdlist/test_cmdlist_xehp_and_later.cpp b/level_zero/core/test/unit_tests/sources/cmdlist/test_cmdlist_xehp_and_later.cpp index 3188f9c462..d9a427c119 100644 --- a/level_zero/core/test/unit_tests/sources/cmdlist/test_cmdlist_xehp_and_later.cpp +++ b/level_zero/core/test/unit_tests/sources/cmdlist/test_cmdlist_xehp_and_later.cpp @@ -417,7 +417,7 @@ struct CommandListAppendLaunchKernelCompactL3FlushEventFixture : public ModuleFi if (input.useFirstEventPacketAddress) { l3FlushPostSyncAddress = event->getGpuAddress(input.device); } - if (event->isUsingContextEndOffset()) { + if (event->isEventTimestampFlagSet()) { l3FlushPostSyncAddress += event->getContextEndOffset(); } diff --git a/level_zero/core/test/unit_tests/sources/cmdlist/test_in_order_cmdlist_1.cpp b/level_zero/core/test/unit_tests/sources/cmdlist/test_in_order_cmdlist_1.cpp index e44f6521bd..0db03dd989 100644 --- a/level_zero/core/test/unit_tests/sources/cmdlist/test_in_order_cmdlist_1.cpp +++ b/level_zero/core/test/unit_tests/sources/cmdlist/test_in_order_cmdlist_1.cpp @@ -505,19 +505,16 @@ HWCMDTEST_F(IGFX_XE_HP_CORE, InOrderCmdListTests, givenCounterBasedTimestampEven event1->enableCounterBasedMode(true, ZE_EVENT_POOL_COUNTER_BASED_EXP_FLAG_IMMEDIATE); event1->assignKernelEventCompletionDataFailCounter = 2; - event1->setUsingContextEndOffset(true); event1->setEventTimestampFlag(true); event1->useContextEndForVerification = true; event2->enableCounterBasedMode(true, ZE_EVENT_POOL_COUNTER_BASED_EXP_FLAG_IMMEDIATE); event2->assignKernelEventCompletionDataFailCounter = 2; - event2->setUsingContextEndOffset(true); event2->setEventTimestampFlag(true); event2->useContextEndForVerification = false; event3->disableImplicitCounterBasedMode(); event3->assignKernelEventCompletionDataFailCounter = 2; - event3->setUsingContextEndOffset(true); event3->setEventTimestampFlag(true); cmdList->appendLaunchKernel(kernel->toHandle(), groupCount, event1->toHandle(), 0, nullptr, launchParams); 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 02d7340da9..a15740dfbd 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 @@ -1471,9 +1471,9 @@ TEST_F(EventCreate, givenEventWhenSignaledAndResetFromTheHostThenCorrectDataAndO ASSERT_NE(nullptr, event); if (eventPool->isImplicitScalingCapableFlagSet()) { - EXPECT_TRUE(event->isUsingContextEndOffset()); + EXPECT_TRUE(event->isEventTimestampFlagSet()); } else { - EXPECT_FALSE(event->isUsingContextEndOffset()); + EXPECT_FALSE(event->isEventTimestampFlagSet()); } uint32_t *eventCompletionMemory = reinterpret_cast(event->getCompletionFieldHostAddress()); @@ -1620,74 +1620,6 @@ TEST_F(EventCreate, givenEventWhenCallingGetWaitScopelThenCorrectScopeIsReturned } } -HWTEST2_F(EventCreate, givenPlatformSupportMultTileWhenDebugKeyIsSetToNotUseContextEndThenDoNotUseContextEndOffset, IsXeHpcCore) { - DebugManagerStateRestore restorer; - NEO::debugManager.flags.UseContextEndOffsetForEventCompletion.set(0); - - ze_event_pool_desc_t eventPoolDesc = { - ZE_STRUCTURE_TYPE_EVENT_POOL_DESC, - nullptr, - 0, - 1}; - const ze_event_desc_t eventDesc = { - ZE_STRUCTURE_TYPE_EVENT_DESC, - nullptr, - 0, - 0, - 0}; - - ze_event_handle_t eventHandle = nullptr; - - 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); - - ze_result_t value = eventPool->createEvent(&eventDesc, &eventHandle); - ASSERT_NE(nullptr, eventHandle); - EXPECT_EQ(ZE_RESULT_SUCCESS, value); - - auto event = Event::fromHandle(eventHandle); - EXPECT_FALSE(event->isEventTimestampFlagSet()); - EXPECT_FALSE(event->isUsingContextEndOffset()); - - event->destroy(); -} - -HWTEST2_F(EventCreate, givenPlatformNotSupportsMultTileWhenDebugKeyIsSetToUseContextEndThenUseContextEndOffset, IsNotXeHpcCore) { - DebugManagerStateRestore restorer; - NEO::debugManager.flags.UseContextEndOffsetForEventCompletion.set(1); - - ze_event_pool_desc_t eventPoolDesc = { - ZE_STRUCTURE_TYPE_EVENT_POOL_DESC, - nullptr, - 0, - 1}; - const ze_event_desc_t eventDesc = { - ZE_STRUCTURE_TYPE_EVENT_DESC, - nullptr, - 0, - 0, - 0}; - - ze_event_handle_t eventHandle = nullptr; - - 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); - - ze_result_t value = eventPool->createEvent(&eventDesc, &eventHandle); - ASSERT_NE(nullptr, eventHandle); - EXPECT_EQ(ZE_RESULT_SUCCESS, value); - - auto event = Event::fromHandle(eventHandle); - EXPECT_FALSE(event->isEventTimestampFlagSet()); - EXPECT_TRUE(event->isUsingContextEndOffset()); - - event->destroy(); -} - template struct MockL0GfxCoreHelperAlwaysAllocateEventInLocalMemHw : L0::L0GfxCoreHelperHw { bool alwaysAllocateEventInLocalMem() const override { return true; } @@ -1953,7 +1885,6 @@ TEST_F(EventSynchronizeTest, givenCallToEventHostSynchronizeWithTimeoutZeroWhenS uint32_t *hostAddr = static_cast(event->getHostAddress()); *hostAddr = Event::STATE_SIGNALED; - event->setUsingContextEndOffset(false); ze_result_t result = event->hostSynchronize(0); EXPECT_EQ(ZE_RESULT_SUCCESS, result); } @@ -1962,25 +1893,13 @@ TEST_F(EventSynchronizeTest, givenCallToEventHostSynchronizeWithTimeoutNonZeroWh uint32_t *hostAddr = static_cast(event->getHostAddress()); *hostAddr = Event::STATE_SIGNALED; - event->setUsingContextEndOffset(false); ze_result_t result = event->hostSynchronize(10); EXPECT_EQ(ZE_RESULT_SUCCESS, result); } -TEST_F(EventSynchronizeTest, givenCallToEventHostSynchronizeWithTimeoutZeroWhenOffsetEventStateSignaledThenHostSynchronizeReturnsSuccess) { - uint32_t *hostAddr = static_cast(event->getHostAddress()); - hostAddr = ptrOffset(hostAddr, event->getContextEndOffset()); - *hostAddr = Event::STATE_SIGNALED; - - event->setUsingContextEndOffset(true); - ze_result_t result = event->hostSynchronize(0); - EXPECT_EQ(ZE_RESULT_SUCCESS, result); -} - TEST_F(EventUsedPacketSignalSynchronizeTest, givenInfiniteTimeoutWhenWaitingForNonTimestampEventCompletionThenReturnOnlyAfterAllEventPacketsAreCompleted) { constexpr uint32_t packetsInUse = 2; event->setPacketsInUse(packetsInUse); - event->setUsingContextEndOffset(false); const size_t eventPacketSize = event->getSinglePacketSize(); const size_t eventCompletionOffset = event->getContextStartOffset(); @@ -2013,42 +1932,6 @@ TEST_F(EventUsedPacketSignalSynchronizeTest, givenInfiniteTimeoutWhenWaitingForN EXPECT_EQ(ZE_RESULT_SUCCESS, result); } -TEST_F(EventUsedPacketSignalSynchronizeTest, givenInfiniteTimeoutWhenWaitingForOffsetNonTimestampEventCompletionThenReturnOnlyAfterAllEventPacketsAreCompleted) { - constexpr uint32_t packetsInUse = 2; - event->setPacketsInUse(packetsInUse); - event->setUsingContextEndOffset(true); - - const size_t eventPacketSize = event->getSinglePacketSize(); - const size_t eventCompletionOffset = event->getContextEndOffset(); - - VariableBackup backupPauseAddress(&CpuIntrinsicsTests::pauseAddress); - VariableBackup backupPauseValue(&CpuIntrinsicsTests::pauseValue, Event::STATE_CLEARED); - VariableBackup backupPauseOffset(&CpuIntrinsicsTests::pauseOffset); - VariableBackup> backupSetupPauseAddress(&CpuIntrinsicsTests::setupPauseAddress); - CpuIntrinsicsTests::pauseCounter = 0u; - CpuIntrinsicsTests::pauseAddress = static_cast(ptrOffset(event->getHostAddress(), eventCompletionOffset)); - - uint64_t *hostAddr = static_cast(ptrOffset(event->getHostAddress(), eventCompletionOffset)); - for (uint32_t i = 0; i < packetsInUse; i++) { - *hostAddr = Event::STATE_CLEARED; - hostAddr = ptrOffset(hostAddr, eventPacketSize); - } - - CpuIntrinsicsTests::setupPauseAddress = [&]() { - if (CpuIntrinsicsTests::pauseCounter > 10) { - volatile TagAddressType *nextPacket = CpuIntrinsicsTests::pauseAddress; - for (uint32_t i = 0; i < packetsInUse; i++) { - *nextPacket = Event::STATE_SIGNALED; - nextPacket = ptrOffset(nextPacket, eventPacketSize); - } - } - }; - - constexpr uint64_t infiniteTimeout = std::numeric_limits::max(); - ze_result_t result = event->hostSynchronize(infiniteTimeout); - EXPECT_EQ(ZE_RESULT_SUCCESS, result); -} - TEST_F(EventUsedPacketSignalSynchronizeTest, givenInfiniteTimeoutWhenWaitingForTimestampEventCompletionThenReturnOnlyAfterAllEventPacketsAreCompleted) { constexpr uint32_t packetsInUse = 2; event->setPacketsInUse(packetsInUse); @@ -3425,8 +3308,6 @@ TEST_F(EventTests, GivenResetWhenQueryingStatusThenNotReadyIsReturned) { auto result = event->hostSignal(false); ASSERT_EQ(ZE_RESULT_SUCCESS, result); - event->setUsingContextEndOffset(true); - result = event->reset(); ASSERT_EQ(ZE_RESULT_SUCCESS, result); @@ -3749,10 +3630,9 @@ HWTEST_F(EventTests, GivenEventWhenHostSynchronizeCalledThenExpectDownloadEventA ASSERT_NE(event, nullptr); ASSERT_NE(nullptr, event->csrs[0]); ASSERT_EQ(device->getNEODevice()->getDefaultEngine().commandStreamReceiver, event->csrs[0]); - event->setUsingContextEndOffset(false); size_t eventCompletionOffset = event->getContextStartOffset(); - if (event->isUsingContextEndOffset()) { + if (event->isEventTimestampFlagSet()) { eventCompletionOffset = event->getContextEndOffset(); } TagAddressType *eventAddress = static_cast(ptrOffset(event->getHostAddress(), eventCompletionOffset)); @@ -3839,7 +3719,7 @@ HWTEST_F(EventContextGroupTests, givenSecondaryCsrWhenDownloadingAllocationThenU auto event = whiteboxCast(getHelper().createEvent(eventPool.get(), &eventDesc, device, result)); size_t eventCompletionOffset = event->getContextStartOffset(); - if (event->isUsingContextEndOffset()) { + if (event->isEventTimestampFlagSet()) { eventCompletionOffset = event->getContextEndOffset(); } TagAddressType *eventAddress = static_cast(ptrOffset(event->getHostAddress(), eventCompletionOffset)); @@ -3881,10 +3761,9 @@ HWTEST_F(EventTests, GivenEventUsedOnNonDefaultCsrWhenHostSynchronizeCalledThenA ASSERT_NE(event, nullptr); ASSERT_NE(nullptr, event->csrs[0]); ASSERT_EQ(device->getNEODevice()->getDefaultEngine().commandStreamReceiver, event->csrs[0]); - event->setUsingContextEndOffset(false); size_t eventCompletionOffset = event->getContextStartOffset(); - if (event->isUsingContextEndOffset()) { + if (event->isEventTimestampFlagSet()) { eventCompletionOffset = event->getContextEndOffset(); } TagAddressType *eventAddress = static_cast(ptrOffset(event->getHostAddress(), eventCompletionOffset)); @@ -4743,7 +4622,7 @@ struct EventDynamicPacketUseFixture : public DeviceFixture { void *eventHostAddress = event->getHostAddress(); uint32_t remainingPackets = maxPackets - usedPackets; void *remainingPacketsAddress = ptrOffset(eventHostAddress, (usedPackets * packetSize)); - if (event->isUsingContextEndOffset()) { + if (event->isEventTimestampFlagSet()) { remainingPacketsAddress = ptrOffset(remainingPacketsAddress, event->getContextEndOffset()); } @@ -4760,7 +4639,7 @@ struct EventDynamicPacketUseFixture : public DeviceFixture { event->hostSignal(false); remainingPacketsAddress = ptrOffset(eventHostAddress, (usedPackets * packetSize)); - if (event->isUsingContextEndOffset()) { + if (event->isEventTimestampFlagSet()) { remainingPacketsAddress = ptrOffset(remainingPacketsAddress, event->getContextEndOffset()); } @@ -4775,7 +4654,7 @@ struct EventDynamicPacketUseFixture : public DeviceFixture { event->resetCompletionStatus(); remainingPacketsAddress = ptrOffset(eventHostAddress, (usedPackets * packetSize)); - if (event->isUsingContextEndOffset()) { + if (event->isEventTimestampFlagSet()) { remainingPacketsAddress = ptrOffset(remainingPacketsAddress, event->getContextEndOffset()); } @@ -4869,7 +4748,7 @@ HWTEST2_F(EventMultiTileDynamicPacketUseTest, givenEventUsedCreatedOnSubDeviceBu auto event = whiteboxCast(getHelper().createEvent(eventPool.get(), &eventDesc, subDevice1, result)); size_t eventCompletionOffset = event->getContextStartOffset(); - if (event->isUsingContextEndOffset()) { + if (event->isEventTimestampFlagSet()) { eventCompletionOffset = event->getContextEndOffset(); } TagAddressType *eventAddress = static_cast(ptrOffset(event->getHostAddress(), eventCompletionOffset)); diff --git a/shared/source/debug_settings/debug_variables_base.inl b/shared/source/debug_settings/debug_variables_base.inl index bac7d0587f..3533e6e1ba 100644 --- a/shared/source/debug_settings/debug_variables_base.inl +++ b/shared/source/debug_settings/debug_variables_base.inl @@ -241,7 +241,6 @@ DECLARE_DEBUG_VARIABLE(int32_t, BatchBufferStartPrepatchingWaEnabled, -1, "-1: d DECLARE_DEBUG_VARIABLE(int32_t, SetVmAdviseAtomicAttribute, -1, "-1: default - atomic system, 0: atomic none, 1: atomic device, 2: atomic system)") DECLARE_DEBUG_VARIABLE(int32_t, SetVmAdvisePreferredLocation, -1, "-1: default - device, 0: system, 1: device, 2: none. Set preferred location for kmd-migrated shared allocation") DECLARE_DEBUG_VARIABLE(int32_t, ReadBackCommandBufferAllocation, -1, "Read command buffer allocation back on the host side. -1: default, 0 - disabled, 1 - local memory only, 2 - local and system memory") -DECLARE_DEBUG_VARIABLE(int32_t, UseContextEndOffsetForEventCompletion, -1, "Use Context End or Context Start for event completion signalling. -1: default: platform dependent, 0 - Use Context Start, 1 - Use Context End") DECLARE_DEBUG_VARIABLE(int32_t, ForceWddmLowPriorityContextValue, -1, "Force scheduling priority value during Wddm low priority context creation. -1 - default.") DECLARE_DEBUG_VARIABLE(int32_t, FailBuildProgramWithStatefulAccess, -1, "-1: default, 0: disable, 1: enable, Fail build program/module creation whenever stateful access is discovered (except built in kernels).") DECLARE_DEBUG_VARIABLE(int32_t, ForceImagesSupport, -1, "-1: default, 0: disable, 1: enable. Override support for Images.") diff --git a/shared/test/common/test_files/igdrcl.config b/shared/test/common/test_files/igdrcl.config index 3e11086c49..725611cadc 100644 --- a/shared/test/common/test_files/igdrcl.config +++ b/shared/test/common/test_files/igdrcl.config @@ -468,7 +468,6 @@ ReadBackCommandBufferAllocation = -1 PrintImageBlitBlockCopyCmdDetails = 0 LogGdiCalls = 0 LogGdiCallsToFile = 0 -UseContextEndOffsetForEventCompletion = -1 DirectSubmissionInsertExtraMiMemFenceCommands = -1 EnableTimestampWaitForEvents = -1 ForceEvictOnlyIfNecessaryFlag = -1