intel/compute-runtime
1
0
Fork 0
mirror of https://github.com/intel/compute-runtime.git synced 2026-01-05 17:20:26 +08:00
Code Issues Packages Projects Releases Wiki Activity

Refactor DrmMemoryManager::freeGraphicsMemoryImpl

Browse Source 
- remove default value from synchronousDestroy param in
  DrmMemoryManager::unreference
- unreference BufferObject in synchronous mode  before release
  GPU and CPU memory
- add ULTs

Related-To: NEO-2877

Change-Id: I8065c27923cf4259a0fcd0f6d8d6d5b7c4b810c0
Signed-off-by: Igor Venevtsev <igor.venevtsev@intel.com>
This commit is contained in:
Igor Venevtsev
2019-08-27 15:33:58 +02:00
parent 18982bd016
commit 3371ed12f6
5 changed files with 77 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

67
unit_tests/os_interface/linux/drm_memory_manager_tests.cpp
View File

@@ -305,11 +305,11 @@ TEST_F(DrmMemoryManagerTest, unreference) {
mock->ioctl_expected.gemClose = 1;
BufferObject *bo = memoryManager->allocUserptr(0, (size_t)1024, 0ul);
ASSERT_NE(nullptr, bo);
memoryManager->unreference(bo);
memoryManager->unreference(bo, false);
}
TEST_F(DrmMemoryManagerTest, UnreferenceNullPtr) {
memoryManager->unreference(nullptr);
memoryManager->unreference(nullptr, false);
}
TEST_F(DrmMemoryManagerWithExplicitExpectationsTest, givenDrmMemoryManagerCreatedWithGemCloseWorkerModeInactiveThenGemCloseWorkerIsNotCreated) {
@@ -533,7 +533,7 @@ TEST_F(DrmMemoryManagerTest, BoWaitFailure) {
EXPECT_THROW(bo->wait(-1), std::exception);
mock->ioctl_res = 1;
memoryManager->unreference(bo);
memoryManager->unreference(bo, false);
mock->ioctl_res = 0;
}
@@ -3052,3 +3052,64 @@ TEST_F(DrmMemoryManagerTest, givenDrmMemoryManagerAndReleaseGpuRangeIsCalledThen
memoryManager->overrideGfxPartition(mockGfxPartition.release());
memoryManager->releaseGpuRange(reinterpret_cast<void *>(gpuAddressCanonized), size);
}
class GMockDrmMemoryManager : public TestedDrmMemoryManager {
public:
GMockDrmMemoryManager(ExecutionEnvironment &executionEnvironment) : TestedDrmMemoryManager(executionEnvironment) {
ON_CALL(*this, unreference).WillByDefault([this](BufferObject *bo, bool synchronousDestroy) {
return this->baseUnreference(bo, synchronousDestroy);
});
ON_CALL(*this, releaseGpuRange).WillByDefault([this](void *ptr, size_t size) {
return this->baseReleaseGpuRange(ptr, size);
});
ON_CALL(*this, alignedFreeWrapper).WillByDefault([this](void *ptr) {
return this->baseAlignedFreeWrapper(ptr);
});
}
MOCK_METHOD2(unreference, uint32_t(BufferObject *, bool));
MOCK_METHOD2(releaseGpuRange, void(void *, size_t));
MOCK_METHOD1(alignedFreeWrapper, void(void *));
uint32_t baseUnreference(BufferObject *bo, bool synchronousDestroy) { return TestedDrmMemoryManager::unreference(bo, synchronousDestroy); }
void baseReleaseGpuRange(void *ptr, size_t size) { TestedDrmMemoryManager::releaseGpuRange(ptr, size); }
void baseAlignedFreeWrapper(void *ptr) { TestedDrmMemoryManager::alignedFreeWrapper(ptr); }
};
TEST(DrmMemoryManagerFreeGraphicsMemoryCallSequenceTest, givenDrmMemoryManagerAndFreeGraphicsMemoryIsCalledThenUnreferenceBufferObjectIsCalledFirstWithSynchronousDestroySetToTrue) {
MockExecutionEnvironment executionEnvironment(*platformDevices);
executionEnvironment.osInterface = std::make_unique<OSInterface>();
executionEnvironment.osInterface->get()->setDrm(Drm::get(0));
GMockDrmMemoryManager gmockDrmMemoryManager(executionEnvironment);
AllocationProperties properties{MemoryConstants::pageSize, GraphicsAllocation::AllocationType::BUFFER};
auto allocation = gmockDrmMemoryManager.allocateGraphicsMemoryWithProperties(properties);
ASSERT_NE(allocation, nullptr);
{
::testing::InSequence inSequence;
EXPECT_CALL(gmockDrmMemoryManager, unreference(::testing::_, true));
EXPECT_CALL(gmockDrmMemoryManager, releaseGpuRange(::testing::_, ::testing::_));
EXPECT_CALL(gmockDrmMemoryManager, alignedFreeWrapper(::testing::_));
}
gmockDrmMemoryManager.freeGraphicsMemory(allocation);
}
TEST(DrmMemoryManagerFreeGraphicsMemoryUnreferenceTest, givenDrmMemoryManagerAndFreeGraphicsMemoryIsCalledForSharedAllocationThenUnreferenceBufferObjectIsCalledWithSynchronousDestroySetToFalse) {
MockExecutionEnvironment executionEnvironment(*platformDevices);
executionEnvironment.osInterface = std::make_unique<OSInterface>();
executionEnvironment.osInterface->get()->setDrm(Drm::get(0));
::testing::NiceMock<GMockDrmMemoryManager> gmockDrmMemoryManager(executionEnvironment);
osHandle handle = 1u;
AllocationProperties properties(false, MemoryConstants::pageSize, GraphicsAllocation::AllocationType::SHARED_BUFFER, false);
auto allocation = gmockDrmMemoryManager.createGraphicsAllocationFromSharedHandle(handle, properties, false);
ASSERT_NE(nullptr, allocation);
EXPECT_CALL(gmockDrmMemoryManager, unreference(::testing::_, false));
gmockDrmMemoryManager.freeGraphicsMemory(allocation);
}