Media
/
compute-runtime
mirror of https://github.com/intel/compute-runtime.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix: try to lower alignment in heap allocator when it is too big 

Related-To: GSD-8948
Signed-off-by: Jaroslaw Warchulski <jaroslaw.warchulski@intel.com>
This commit is contained in:
Jaroslaw Warchulski 2024-11-12 16:16:10 +00:00 committed by Compute-Runtime-Automation
parent 7e086c6a8d
commit 72efceb8a3
2 changed files with 67 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
shared/source/utilities/heap_allocator.cpp
View File

@ -77,10 +77,14 @@ uint64_t HeapAllocator::allocateWithCustomAlignment(size_t &sizeToAllocate, size
return ptrReturn;
}
if (defragmentCount == 1)
if (defragmentCount == 0) {
defragment();
defragmentCount++;
} else if (alignment > 2 * MemoryConstants::megaByte && pRightBound - pLeftBound >= sizeToAllocate) {
alignment = Math::prevPowerOfTwo(static_cast<size_t>(pRightBound - pLeftBound - 1 - sizeToAllocate + 2 * MemoryConstants::pageSize64k));
} else {
return 0llu;
defragment();
defragmentCount++;
}
}
}

60
shared/test/unit_test/os_interface/linux/drm_memory_manager_tests.cpp
View File

@ -352,6 +352,66 @@ TEST_F(DrmMemoryManagerWithExplicitExpectationsTest, givenDrmMemoryManagerWhenGp
memoryManager->freeGpuAddress(addressRange, 0);
}
TEST_F(DrmMemoryManagerWithExplicitExpectationsTest, givenDrmMemoryManagerWhenGpuAddressReservationIsAttemptedWithSizeEqualToHalfOfHeapLimitThenSuccessReturned) {
auto memoryManager = std::make_unique<TestedDrmMemoryManager>(false, true, false, *executionEnvironment);
auto gfxPartition = memoryManager->getGfxPartition(0);
if (!gfxPartition->getHeapLimit(HeapIndex::heapExtended)) {
GTEST_SKIP();
}
gfxPartition->heapInitWithAllocationAlignment(HeapIndex::heapExtended, 0x0, 0x800000000000, MemoryConstants::pageSize);
RootDeviceIndicesContainer rootDeviceIndices;
rootDeviceIndices.pushUnique(0);
uint32_t rootDeviceIndexReserved = 1;
HeapIndex heap = HeapIndex::heapStandard;
size_t size = 64 * MemoryConstants::teraByte;
auto alignment = memoryManager->selectAlignmentAndHeap(size, &heap);
auto addressRange = memoryManager->reserveGpuAddressOnHeap(0ull, size, rootDeviceIndices, &rootDeviceIndexReserved, heap, alignment);
EXPECT_EQ(heap, HeapIndex::heapExtended);
EXPECT_EQ(size, alignment);
EXPECT_NE(addressRange.address, 0ull);
EXPECT_NE(addressRange.size, 0ull);
memoryManager->freeGpuAddress(addressRange, 0);
}
TEST_F(DrmMemoryManagerWithExplicitExpectationsTest, givenDrmMemoryManagerWhenGpuAddressReservationIsAttemptedWithDifferentSizesThenCorrectResultsReturned) {
auto memoryManager = std::make_unique<TestedDrmMemoryManager>(false, true, false, *executionEnvironment);
auto gfxPartition = memoryManager->getGfxPartition(0);
if (!gfxPartition->getHeapLimit(HeapIndex::heapExtended)) {
GTEST_SKIP();
}
gfxPartition->heapInitWithAllocationAlignment(HeapIndex::heapExtended, 0x0, 0x800200400000, MemoryConstants::pageSize);
RootDeviceIndicesContainer rootDeviceIndices;
rootDeviceIndices.pushUnique(0);
uint32_t rootDeviceIndexReserved = 1;
HeapIndex heap = HeapIndex::heapStandard;
size_t size = 128 * MemoryConstants::teraByte;
auto alignment = memoryManager->selectAlignmentAndHeap(size, &heap);
auto addressRange = memoryManager->reserveGpuAddressOnHeap(0ull, size, rootDeviceIndices, &rootDeviceIndexReserved, heap, alignment);
EXPECT_EQ(heap, HeapIndex::heapExtended);
EXPECT_EQ(size, alignment);
EXPECT_NE(addressRange.address, 0ull);
EXPECT_NE(addressRange.size, 0ull);
heap = HeapIndex::heapStandard;
size = 8 * MemoryConstants::gigaByte;
alignment = memoryManager->selectAlignmentAndHeap(size, &heap);
auto addressRange2 = memoryManager->reserveGpuAddressOnHeap(0ull, size, rootDeviceIndices, &rootDeviceIndexReserved, heap, alignment);
EXPECT_EQ(heap, HeapIndex::heapExtended);
EXPECT_EQ(size, alignment);
EXPECT_EQ(addressRange2.address, 0ull);
memoryManager->freeGpuAddress(addressRange, 0);
}
TEST_F(DrmMemoryManagerWithExplicitExpectationsTest, givenDrmMemoryManagerWhenGpuAddressReservationIsAttemptedWithAnInvalidRequiredPtrThenDifferentRangeReturned) {
auto memoryManager = std::make_unique<TestedDrmMemoryManager>(false, true, false, *executionEnvironment);
RootDeviceIndicesContainer rootDeviceIndices;