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

Allocate per-context memory with specific GPU VA

Browse Source 
Related-To: NEO-4829

Change-Id: I821f6709bfa98df3b51a1c966b7a953752d85f74
Signed-off-by: Mateusz Hoppe <mateusz.hoppe@intel.com>
This commit is contained in:
Mateusz Hoppe
2020-07-01 10:38:19 +02:00
committed by sys_ocldev
parent 1f63f39d77
commit fea4472553
12 changed files with 276 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

114
opencl/test/unit_test/os_interface/linux/drm_memory_manager_tests.cpp
View File

@ -114,6 +114,120 @@ TEST_F(DrmMemoryManagerTest, GivenGraphicsAllocationWhenAddAndRemoveAllocationTo
EXPECT_EQ(fragment, nullptr);
}
TEST_F(DrmMemoryManagerWithExplicitExpectationsTest, givenDrmMemoryManagerWhenGpuAddressIsReservedAndFreedThenAddressFromGfxPartitionIsUsed) {
auto memoryManager = std::make_unique<TestedDrmMemoryManager>(false, true, false, *executionEnvironment);
auto addressRange = memoryManager->reserveGpuAddress(MemoryConstants::pageSize, 0);
EXPECT_LE(memoryManager->getGfxPartition(0)->getHeapBase(HeapIndex::HEAP_STANDARD), GmmHelper::decanonize(addressRange.address));
EXPECT_GT(memoryManager->getGfxPartition(0)->getHeapLimit(HeapIndex::HEAP_STANDARD), GmmHelper::decanonize(addressRange.address));
memoryManager->freeGpuAddress(addressRange, 0);
}
TEST_F(DrmMemoryManagerWithExplicitExpectationsTest, givenSmallSizeAndGpuAddressSetWhenGraphicsMemoryIsAllocatedThenAllocationWithSpecifiedGpuAddressInSystemMemoryIsCreated) {
auto memoryManager = std::make_unique<TestedDrmMemoryManager>(false, true, false, *executionEnvironment);
auto osContext = device->getDefaultEngine().osContext;
MockAllocationProperties properties = {rootDeviceIndex, MemoryConstants::pageSize};
properties.gpuAddress = 0x2000;
properties.osContext = osContext;
mock->reset();
mock->ioctl_expected.gemUserptr = 1;
mock->ioctl_expected.execbuffer2 = 0; //pinBB not called
auto allocation = memoryManager->allocateGraphicsMemoryWithProperties(properties);
EXPECT_EQ(MemoryPool::System4KBPages, allocation->getMemoryPool());
EXPECT_EQ(0x2000u, allocation->getGpuAddress());
mock->testIoctls();
memoryManager->freeGraphicsMemory(allocation);
}
TEST_F(DrmMemoryManagerTest, givenInjectedFailuresWhenGraphicsMemoryWithGpuVaIsAllocatedThenNullptrIsReturned) {
mock->ioctl_expected.total = -1; //don't care
auto memoryManager = std::make_unique<TestedDrmMemoryManager>(false, true, false, *executionEnvironment);
auto osContext = device->getDefaultEngine().osContext;
MockAllocationProperties properties = {rootDeviceIndex, MemoryConstants::pageSize};
properties.gpuAddress = 0x2000;
properties.osContext = osContext;
InjectedFunction method = [&](size_t failureIndex) {
auto ptr = memoryManager->allocateGraphicsMemoryWithProperties(properties);
if (MemoryManagement::nonfailingAllocation != failureIndex) {
EXPECT_EQ(nullptr, ptr);
} else {
EXPECT_NE(nullptr, ptr);
memoryManager->freeGraphicsMemory(ptr);
}
};
injectFailures(method);
}
TEST_F(DrmMemoryManagerWithExplicitExpectationsTest, givenSizeExceedingThresholdAndGpuAddressSetWhenGraphicsMemoryIsAllocatedThenAllocationWithSpecifiedGpuAddressInSystemMemoryIsCreated) {
auto memoryManager = std::make_unique<TestedDrmMemoryManager>(false, true, false, *executionEnvironment);
auto osContext = device->getDefaultEngine().osContext;
MockAllocationProperties properties = {rootDeviceIndex, memoryManager->pinThreshold + MemoryConstants::pageSize};
properties.gpuAddress = 0x2000;
properties.osContext = osContext;
mock->reset();
mock->ioctl_expected.gemUserptr = 1;
mock->ioctl_expected.execbuffer2 = 1; //pinBB called
auto allocation = memoryManager->allocateGraphicsMemoryWithProperties(properties);
EXPECT_EQ(MemoryPool::System4KBPages, allocation->getMemoryPool());
EXPECT_EQ(0x2000u, allocation->getGpuAddress());
mock->testIoctls();
memoryManager->freeGraphicsMemory(allocation);
memoryManager->injectPinBB(nullptr, rootDeviceIndex); // pinBB not available
mock->reset();
mock->ioctl_expected.gemUserptr = 1;
mock->ioctl_expected.execbuffer2 = 0; //pinBB not called
properties.gpuAddress = 0x5000;
allocation = memoryManager->allocateGraphicsMemoryWithProperties(properties);
EXPECT_EQ(MemoryPool::System4KBPages, allocation->getMemoryPool());
EXPECT_EQ(0x5000u, allocation->getGpuAddress());
mock->testIoctls();
memoryManager->freeGraphicsMemory(allocation);
}
TEST_F(DrmMemoryManagerWithExplicitExpectationsTest, givenDisabledForcePinAndSizeExceedingThresholdAndGpuAddressSetWhenGraphicsMemoryIsAllocatedThenBufferIsNotPinned) {
auto memoryManager = std::make_unique<TestedDrmMemoryManager>(false, false, false, *executionEnvironment);
auto osContext = device->getDefaultEngine().osContext;
MockAllocationProperties properties = {rootDeviceIndex, memoryManager->pinThreshold + MemoryConstants::pageSize};
properties.gpuAddress = 0x2000;
properties.osContext = osContext;
mock->reset();
mock->ioctl_expected.gemUserptr = 1;
mock->ioctl_expected.execbuffer2 = 0; //pinBB not called
auto allocation = memoryManager->allocateGraphicsMemoryWithProperties(properties);
EXPECT_EQ(MemoryPool::System4KBPages, allocation->getMemoryPool());
EXPECT_EQ(0x2000u, allocation->getGpuAddress());
mock->testIoctls();
memoryManager->freeGraphicsMemory(allocation);
}
TEST_F(DrmMemoryManagerWithExplicitExpectationsTest, givenforcePinAllowedWhenMemoryManagerIsCreatedThenPinBbIsCreated) {
auto memoryManager = std::make_unique<TestedDrmMemoryManager>(false, true, false, *executionEnvironment);
EXPECT_NE(nullptr, memoryManager->pinBBs[device->getRootDeviceIndex()]);

1
opencl/test/unit_test/os_interface/windows/mock_wddm_memory_manager.h
View File

@ -21,6 +21,7 @@ class MockWddmMemoryManager : public MemoryManagerCreate<WddmMemoryManager> {
using BaseClass::allocateGraphicsMemory64kb;
using BaseClass::allocateGraphicsMemoryForNonSvmHostPtr;
using BaseClass::allocateGraphicsMemoryInDevicePool;
using BaseClass::allocateGraphicsMemoryWithGpuVa;
using BaseClass::allocateGraphicsMemoryWithProperties;
using BaseClass::allocateShareableMemory;
using BaseClass::createGraphicsAllocation;

18
opencl/test/unit_test/os_interface/windows/wddm_memory_manager_tests.cpp
View File

@ -406,6 +406,24 @@ TEST_F(WddmMemoryManagerSimpleTest, givenNonZeroFenceValueOnSomeOfMultipleEngine
memoryManager->freeGraphicsMemory(allocation);
}
TEST_F(WddmMemoryManagerSimpleTest, givenWddmMemoryManagerWhenGpuAddressIsReservedAndFreedThenAddressRangeIsZero) {
auto addressRange = memoryManager->reserveGpuAddress(MemoryConstants::pageSize, 0);
EXPECT_EQ(0u, GmmHelper::decanonize(addressRange.address));
EXPECT_EQ(0u, addressRange.size);
memoryManager->freeGpuAddress(addressRange, 0);
}
TEST_F(WddmMemoryManagerSimpleTest, givenWddmMemoryManagerWhenAllocatingWithGpuVaThenNullptrIsReturned) {
AllocationData allocationData;
allocationData.size = 0x1000;
allocationData.gpuAddress = 0x2000;
allocationData.osContext = osContext;
auto allocation = memoryManager->allocateGraphicsMemoryWithGpuVa(allocationData);
EXPECT_EQ(nullptr, allocation);
}
TEST_F(WddmMemoryManagerTest, givenDefaultWddmMemoryManagerWhenAskedForVirtualPaddingSupportThenFalseIsReturned) {
EXPECT_FALSE(memoryManager->peekVirtualPaddingSupport());
}