intel/compute-runtime
1
0
Fork 0
mirror of https://github.com/intel/compute-runtime.git synced 2025-12-20 08:53:55 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: Release usage when put cmd buffer to reusable list

Browse Source 
Resolves: NEO-10004
Related-To: NEO-7116

Signed-off-by: Lukasz Jobczyk <lukasz.jobczyk@intel.com>
This commit is contained in:
Lukasz Jobczyk
2024-01-11 11:58:28 +00:00
committed by Compute-Runtime-Automation
parent 6abce2b29d
commit 2bda9f0b58
2 changed files with 34 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
shared/source/command_container/cmdcontainer.cpp
View File

@@ -298,15 +298,21 @@ void CommandContainer::handleCmdBufferAllocations(size_t startIndex) {
if (this->reusableAllocationList) { if (this->reusableAllocationList) {
if (isHandleFenceCompletionRequired) { if (isHandleFenceCompletionRequired) {
std::vector<std::unique_lock<CommandStreamReceiver::MutexType>> locks;
for (auto &engine : this->device->getMemoryManager()->getRegisteredEngines(cmdBufferAllocations[i]->getRootDeviceIndex())) { for (auto &engine : this->device->getMemoryManager()->getRegisteredEngines(cmdBufferAllocations[i]->getRootDeviceIndex())) {
if (cmdBufferAllocations[i]->isUsedByOsContext(engine.osContext->getContextId())) { if (cmdBufferAllocations[i]->isUsedByOsContext(engine.osContext->getContextId())) {
auto lock = engine.commandStreamReceiver->obtainUniqueOwnership(); locks.push_back(engine.commandStreamReceiver->obtainUniqueOwnership());
engine.commandStreamReceiver->stopDirectSubmission(false); engine.commandStreamReceiver->stopDirectSubmission(false);
} }
} }
this->device->getMemoryManager()->handleFenceCompletion(cmdBufferAllocations[i]); if (!locks.empty()) {
this->device->getMemoryManager()->handleFenceCompletion(cmdBufferAllocations[i]);
}
} }
for (auto &engine : this->device->getMemoryManager()->getRegisteredEngines(cmdBufferAllocations[i]->getRootDeviceIndex())) {
cmdBufferAllocations[i]->releaseUsageInOsContext(engine.osContext->getContextId());
}
reusableAllocationList->pushFrontOne(*cmdBufferAllocations[i]); reusableAllocationList->pushFrontOne(*cmdBufferAllocations[i]);
} else { } else {
this->device->getMemoryManager()->freeGraphicsMemory(cmdBufferAllocations[i]); this->device->getMemoryManager()->freeGraphicsMemory(cmdBufferAllocations[i]);

30
shared/test/unit_test/command_container/command_container_tests.cpp
View File

@@ -318,20 +318,33 @@ HWTEST_F(CommandContainerTest, givenCmdContainerAndHandleFenceWithAllocsListWhen
auto cmdBuffer0 = cmdBufferAllocs[0]; auto cmdBuffer0 = cmdBufferAllocs[0];
auto cmdBuffer1 = cmdBufferAllocs[1]; auto cmdBuffer1 = cmdBufferAllocs[1];
auto csr = reinterpret_cast<UltCommandStreamReceiver<FamilyType> *>(memoryManager->getRegisteredEngines(0u)[0].commandStreamReceiver);
cmdContainer->reset();
EXPECT_EQ(memoryManager->handleFenceCompletionCalled, 0u);
EXPECT_EQ(cmdBufferAllocs.size(), 1u);
EXPECT_EQ(cmdBufferAllocs[0], cmdBuffer0);
EXPECT_FALSE(allocList.peekIsEmpty());
EXPECT_FALSE(csr->stopDirectSubmissionCalled);
EXPECT_FALSE(csr->stopDirectSubmissionCalledBlocking);
cmdContainer->allocateNextCommandBuffer();
EXPECT_EQ(cmdBufferAllocs.size(), 2u);
cmdBuffer1->updateTaskCount(1u, 0u);
cmdContainer->reset(); cmdContainer->reset();
EXPECT_EQ(memoryManager->handleFenceCompletionCalled, 1u); EXPECT_EQ(memoryManager->handleFenceCompletionCalled, 1u);
EXPECT_EQ(cmdBufferAllocs.size(), 1u); EXPECT_EQ(cmdBufferAllocs.size(), 1u);
EXPECT_EQ(cmdBufferAllocs[0], cmdBuffer0); EXPECT_EQ(cmdBufferAllocs[0], cmdBuffer0);
EXPECT_FALSE(allocList.peekIsEmpty()); EXPECT_FALSE(allocList.peekIsEmpty());
EXPECT_TRUE(csr->stopDirectSubmissionCalled);
EXPECT_FALSE(csr->stopDirectSubmissionCalledBlocking);
cmdContainer->allocateNextCommandBuffer(); cmdContainer->allocateNextCommandBuffer();
EXPECT_EQ(cmdBufferAllocs.size(), 2u); EXPECT_EQ(cmdBufferAllocs.size(), 2u);
EXPECT_EQ(cmdBufferAllocs[0], cmdBuffer0); EXPECT_EQ(cmdBufferAllocs[0], cmdBuffer0);
EXPECT_EQ(cmdBufferAllocs[1], cmdBuffer1); EXPECT_EQ(cmdBufferAllocs[1], cmdBuffer1);
EXPECT_TRUE(allocList.peekIsEmpty()); EXPECT_TRUE(allocList.peekIsEmpty());
auto csr = reinterpret_cast<UltCommandStreamReceiver<FamilyType> *>(memoryManager->getRegisteredEngines(0u)[0].commandStreamReceiver); EXPECT_TRUE(csr->stopDirectSubmissionCalled);
EXPECT_FALSE(csr->stopDirectSubmissionCalled);
EXPECT_FALSE(csr->stopDirectSubmissionCalledBlocking); EXPECT_FALSE(csr->stopDirectSubmissionCalledBlocking);
cmdBuffer1->updateTaskCount(1u, 0u); cmdBuffer1->updateTaskCount(1u, 0u);
@@ -342,7 +355,7 @@ HWTEST_F(CommandContainerTest, givenCmdContainerAndHandleFenceWithAllocsListWhen
csr = reinterpret_cast<UltCommandStreamReceiver<FamilyType> *>(memoryManager->getRegisteredEngines(0u)[1].commandStreamReceiver); csr = reinterpret_cast<UltCommandStreamReceiver<FamilyType> *>(memoryManager->getRegisteredEngines(0u)[1].commandStreamReceiver);
EXPECT_FALSE(csr->stopDirectSubmissionCalled); EXPECT_FALSE(csr->stopDirectSubmissionCalled);
EXPECT_FALSE(csr->stopDirectSubmissionCalledBlocking); EXPECT_FALSE(csr->stopDirectSubmissionCalledBlocking);
EXPECT_EQ(memoryManager->handleFenceCompletionCalled, 3u); EXPECT_EQ(memoryManager->handleFenceCompletionCalled, 2u);
EXPECT_FALSE(allocList.peekIsEmpty()); EXPECT_FALSE(allocList.peekIsEmpty());
cmdBuffer1->releaseUsageInOsContext(0u); cmdBuffer1->releaseUsageInOsContext(0u);
allocList.freeAllGraphicsAllocations(pDevice); allocList.freeAllGraphicsAllocations(pDevice);
@@ -363,10 +376,19 @@ TEST_F(CommandContainerTest, givenReusableAllocationsAndRemoveUserFenceInCmdlist
EXPECT_EQ(cmdBufferAllocs.size(), 2u); EXPECT_EQ(cmdBufferAllocs.size(), 2u);
cmdContainer->reset(); cmdContainer->reset();
EXPECT_EQ(1u, memoryManager->handleFenceCompletionCalled); EXPECT_EQ(0u, memoryManager->handleFenceCompletionCalled);
cmdContainer->allocateNextCommandBuffer(); cmdContainer->allocateNextCommandBuffer();
EXPECT_EQ(cmdBufferAllocs.size(), 2u); EXPECT_EQ(cmdBufferAllocs.size(), 2u);
cmdBufferAllocs[1]->updateTaskCount(2u, 0u);
cmdContainer->reset();
EXPECT_EQ(1u, memoryManager->handleFenceCompletionCalled);
cmdContainer->allocateNextCommandBuffer();
EXPECT_EQ(cmdBufferAllocs.size(), 2u);
EXPECT_FALSE(cmdBufferAllocs[1]->isUsedByOsContext(0u));
cmdBufferAllocs[0]->updateTaskCount(5u, 0u);
cmdBufferAllocs[1]->updateTaskCount(5u, 0u);
cmdContainer.reset(); cmdContainer.reset();
EXPECT_EQ(3u, memoryManager->handleFenceCompletionCalled); EXPECT_EQ(3u, memoryManager->handleFenceCompletionCalled);
allocList.freeAllGraphicsAllocations(pDevice); allocList.freeAllGraphicsAllocations(pDevice);