Media/compute-runtime
1
0
Fork 0
mirror of https://github.com/intel/compute-runtime.git synced 2025-09-15 13:01:45 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix allocating small buffers from pool

Browse Source 
Wait for engine completion before freeing from pool

Related-To: NEO-7332

Signed-off-by: Dominik Dabek <dominik.dabek@intel.com>
This commit is contained in:
Dominik Dabek
2022-11-16 14:59:35 +00:00
committed by Compute-Runtime-Automation
parent d9d706d747
commit 0cea7fe6d1
2 changed files with 21 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
opencl/source/mem_obj/mem_obj.cpp
View File

@ -94,6 +94,8 @@ MemObj::~MemObj() {
} }
destroyGraphicsAllocation(graphicsAllocation, doAsyncDestructions); destroyGraphicsAllocation(graphicsAllocation, doAsyncDestructions);
graphicsAllocation = nullptr; graphicsAllocation = nullptr;
} else if (graphicsAllocation && context->getBufferPoolAllocator().isPoolBuffer(associatedMemObject)) {
memoryManager->waitForEnginesCompletion(*graphicsAllocation);
} }
if (!associatedMemObject) { if (!associatedMemObject) {
releaseMapAllocation(rootDeviceIndex, doAsyncDestructions); releaseMapAllocation(rootDeviceIndex, doAsyncDestructions);

19
opencl/test/unit_test/mem_obj/buffer_pool_alloc_tests.cpp
View File

@ -115,6 +115,25 @@ TEST_F(aggregatedSmallBuffersEnabledTest, givenAggregatedSmallBuffersEnabledAndS
EXPECT_EQ(retVal, CL_SUCCESS); EXPECT_EQ(retVal, CL_SUCCESS);
} }
TEST_F(aggregatedSmallBuffersEnabledTest, givenAggregatedSmallBuffersEnabledWhenClReleaseMemObjectCalledThenWaitForEnginesCompletionCalled) {
ASSERT_TRUE(poolAllocator->isAggregatedSmallBuffersEnabled());
ASSERT_NE(poolAllocator->mainStorage, nullptr);
std::unique_ptr<Buffer> buffer(Buffer::create(context.get(), flags, size, hostPtr, retVal));
ASSERT_NE(buffer, nullptr);
ASSERT_EQ(retVal, CL_SUCCESS);
ASSERT_NE(poolAllocator->mainStorage, nullptr);
auto mockBuffer = static_cast<MockBuffer *>(buffer.get());
ASSERT_TRUE(mockBuffer->isSubBuffer());
ASSERT_EQ(poolAllocator->mainStorage, mockBuffer->associatedMemObject);
ASSERT_EQ(mockMemoryManager->waitForEnginesCompletionCalled, 0u);
retVal = clReleaseMemObject(buffer.release());
ASSERT_EQ(retVal, CL_SUCCESS);
EXPECT_EQ(mockMemoryManager->waitForEnginesCompletionCalled, 1u);
}
TEST_F(aggregatedSmallBuffersEnabledTest, givenCopyHostPointerWhenCreatingBufferButCopyFailedThenDoNotUsePool) { TEST_F(aggregatedSmallBuffersEnabledTest, givenCopyHostPointerWhenCreatingBufferButCopyFailedThenDoNotUsePool) {
class MockCommandQueueFailFirstEnqueueWrite : public MockCommandQueue { class MockCommandQueueFailFirstEnqueueWrite : public MockCommandQueue {
public: public: