intel/compute-runtime
1
0
Fork 0
mirror of https://github.com/intel/compute-runtime.git synced 2026-01-10 15:12:56 +08:00
Code Issues Packages Projects Releases Wiki Activity

feature: track InOrder allocation ownership

Browse Source 
CmdList can be released before Event. In this case, GfxAllocation
destruction must be deferred.

Related-To: NEO-7966

Signed-off-by: Dunajski, Bartosz <bartosz.dunajski@intel.com>
This commit is contained in:
Dunajski, Bartosz
2023-09-25 10:10:46 +00:00
committed by Compute-Runtime-Automation
parent e16220dc9f
commit 202a33ffac
7 changed files with 79 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
level_zero/core/source/event/event.cpp
View File

@@ -335,6 +335,8 @@ ze_result_t EventPool::openEventPoolIpcHandle(const ze_ipc_event_pool_handle_t &
}
ze_result_t Event::destroy() {
freeInOrderExecAllocation();
delete this;
return ZE_RESULT_SUCCESS;
}
@@ -391,7 +393,20 @@ void Event::setIsCompleted() {
unsetCmdQueue();
}
void Event::freeInOrderExecAllocation() {
if (inOrderExecDataAllocation) {
this->device->getNEODevice()->getMemoryManager()->freeGraphicsMemory(inOrderExecDataAllocation);
inOrderExecDataAllocation = nullptr;
}
}
void Event::updateInOrderExecState(NEO::GraphicsAllocation &inOrderDependenciesAllocation, uint64_t signalValue, uint32_t allocationOffset) {
if (this->inOrderExecDataAllocation != &inOrderDependenciesAllocation) {
freeInOrderExecAllocation();
inOrderDependenciesAllocation.incNumOwners();
}
inOrderExecSignalValue = signalValue;
inOrderExecDataAllocation = &inOrderDependenciesAllocation;
inOrderAllocationOffset = allocationOffset;

1
level_zero/core/source/event/event.h
View File

@@ -232,6 +232,7 @@ struct Event : _ze_event_handle_t {
Event(EventPool *eventPool, int index, Device *device) : device(device), eventPool(eventPool), index(index) {}
void unsetCmdQueue();
void freeInOrderExecAllocation();
uint64_t globalStartTS = 1;
uint64_t globalEndTS = 1;

4
level_zero/core/source/event/event_impl.inl
View File

@@ -470,8 +470,8 @@ ze_result_t EventImp<TagSizeT>::reset() {
hostSynchronize(std::numeric_limits<uint64_t>::max());
}
if (inOrderExecEvent) {
inOrderExecEvent = false;
inOrderExecDataAllocation = nullptr;
freeInOrderExecAllocation();
inOrderExecSignalValue = 0;
inOrderAllocationOffset = 0;
}

54
level_zero/core/test/unit_tests/sources/cmdlist/test_cmdlist_append_launch_kernel_3.cpp
View File

@@ -702,7 +702,7 @@ struct InOrderCmdListTests : public CommandListAppendLaunchKernel {
for (uint32_t i = 0; i < numEvents; i++) {
eventDesc.index = i;
events.emplace_back(std::unique_ptr<MockEvent>(static_cast<MockEvent *>(Event::create<typename GfxFamily::TimestampPacketType>(eventPool.get(), &eventDesc, device))));
events.emplace_back(DestroyableZeUniquePtr<MockEvent>(static_cast<MockEvent *>(Event::create<typename GfxFamily::TimestampPacketType>(eventPool.get(), &eventDesc, device))));
EXPECT_FALSE(events.back()->inOrderExecEvent);
events.back()->inOrderExecEvent = true;
}
@@ -790,7 +790,7 @@ struct InOrderCmdListTests : public CommandListAppendLaunchKernel {
std::unique_ptr<NEO::MockOsContext> mockCopyOsContext;
uint32_t createdCmdLists = 0;
std::vector<std::unique_ptr<MockEvent>> events;
std::vector<DestroyableZeUniquePtr<MockEvent>> events;
std::vector<std::unique_ptr<Mock<CommandQueue>>> mockCmdQs;
ze_result_t returnValue = ZE_RESULT_SUCCESS;
ze_group_count_t groupCount = {3, 2, 1};
@@ -955,8 +955,6 @@ HWTEST2_F(InOrderCmdListTests, givenInOrderModeWhenResetEventCalledThenResetEven
events[0]->inOrderAllocationOffset = 123;
events[0]->reset();
EXPECT_FALSE(events[0]->inOrderExecEvent);
EXPECT_EQ(events[0]->inOrderExecSignalValue, 0u);
EXPECT_EQ(events[0]->inOrderExecDataAllocation, nullptr);
EXPECT_EQ(events[0]->inOrderAllocationOffset, 0u);
@@ -1171,35 +1169,53 @@ HWTEST2_F(InOrderCmdListTests, givenInOrderModeWhenWaitingForEventFromPreviousAp
}
HWTEST2_F(InOrderCmdListTests, givenInOrderModeWhenWaitingForEventFromAfterResetThenDontSkip, IsAtLeastXeHpCore) {
using MI_SEMAPHORE_WAIT = typename FamilyType::MI_SEMAPHORE_WAIT;
auto immCmdList = createImmCmdList<gfxCoreFamily>();
auto eventPool = createEvents<FamilyType>(1, false);
auto eventHandle = events[0]->toHandle();
auto cmdStream = immCmdList->getCmdContainer().getCommandStream();
immCmdList->appendLaunchKernel(kernel->toHandle(), &groupCount, eventHandle, 0, nullptr, launchParams, false);
events[0]->reset();
auto offset = cmdStream->getUsed();
auto retValue = immCmdList->appendLaunchKernel(kernel->toHandle(), &groupCount, nullptr, 1, &eventHandle, launchParams, false);
immCmdList->appendLaunchKernel(kernel->toHandle(), &groupCount, nullptr, 1, &eventHandle, launchParams, false);
EXPECT_EQ(ZE_RESULT_ERROR_INVALID_ARGUMENT, retValue);
}
GenCmdList cmdList;
ASSERT_TRUE(FamilyType::PARSE::parseCommandBuffer(
cmdList,
ptrOffset(cmdStream->getCpuBase(), offset),
cmdStream->getUsed() - offset));
HWTEST2_F(InOrderCmdListTests, givenMultipleAllocationOwnerWhenUsingEventsThenSetCorrectOwnersCount, IsAtLeastSkl) {
using MI_SEMAPHORE_WAIT = typename FamilyType::MI_SEMAPHORE_WAIT;
auto itor = find<typename FamilyType::MI_SEMAPHORE_WAIT *>(cmdList.begin(), cmdList.end());
auto immCmdList0 = createImmCmdList<gfxCoreFamily>();
auto immCmdList1 = createImmCmdList<gfxCoreFamily>();
ASSERT_NE(cmdList.end(), itor); // implicit dependency
auto eventPool = createEvents<FamilyType>(2, false);
auto eventHandle0 = events[0]->toHandle();
auto eventHandle1 = events[1]->toHandle();
itor = find<typename FamilyType::MI_SEMAPHORE_WAIT *>(++itor, cmdList.end());
auto inOrderAlloc0 = immCmdList0->inOrderDependencyCounterAllocation;
auto validateNumOwners = [&inOrderAlloc0](uint32_t expectedValue) {
inOrderAlloc0->incNumOwners();
auto fetchValue = inOrderAlloc0->fetchDecNumOwners();
EXPECT_NE(cmdList.end(), itor);
EXPECT_EQ(expectedValue, fetchValue - 1);
};
validateNumOwners(1);
immCmdList0->appendLaunchKernel(kernel->toHandle(), &groupCount, eventHandle0, 0, nullptr, launchParams, false);
validateNumOwners(2);
immCmdList0->appendLaunchKernel(kernel->toHandle(), &groupCount, eventHandle0, 0, nullptr, launchParams, false);
validateNumOwners(2);
immCmdList0->appendLaunchKernel(kernel->toHandle(), &groupCount, eventHandle1, 0, nullptr, launchParams, false);
validateNumOwners(3);
immCmdList1->appendLaunchKernel(kernel->toHandle(), &groupCount, eventHandle0, 0, nullptr, launchParams, false);
validateNumOwners(2);
events[1]->reset();
validateNumOwners(1);
}
HWTEST2_F(InOrderCmdListTests, givenInOrderEventModeWhenSubmittingThenProgramSemaphoreOnlyForExternalEvent, IsAtLeastXeHpCore) {