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

fix: increase usm pool chunk alignment 

Increase chunk alignment from 512 to 4096.
Adjust tests to account for actual allocation size different than
requested.

Related-To: NEO-11005

Signed-off-by: Dominik Dabek <dominik.dabek@intel.com>
This commit is contained in:
Dominik Dabek 2024-04-03 11:44:38 +00:00 committed by Compute-Runtime-Automation
parent b8c30d577a
commit 9c601f8dc2
2 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
shared/source/memory_manager/unified_memory_pooling.h
View File

@ -35,7 +35,7 @@ class UsmMemAllocPool {
void *getPooledAllocationBasePtr(const void *ptr); void *getPooledAllocationBasePtr(const void *ptr);
static constexpr auto allocationThreshold = 1 * MemoryConstants::megaByte; static constexpr auto allocationThreshold = 1 * MemoryConstants::megaByte;
static constexpr auto chunkAlignment = 512u; static constexpr auto chunkAlignment = 1 * MemoryConstants::pageSize;
static constexpr auto startingOffset = 2 * allocationThreshold; static constexpr auto startingOffset = 2 * allocationThreshold;
protected: protected:

20
shared/test/unit_test/memory_manager/unified_memory_pooling_tests.cpp
View File

@ -181,29 +181,33 @@ TEST_F(InitializedHostUnifiedMemoryPoolingTest, givenPoolableAllocationWhenGetti
EXPECT_EQ(0u, usmMemAllocPool.getPooledAllocationSize(ptrInPoolButNotAllocated)); EXPECT_EQ(0u, usmMemAllocPool.getPooledAllocationSize(ptrInPoolButNotAllocated));
SVMAllocsManager::UnifiedMemoryProperties memoryProperties(InternalMemoryType::hostUnifiedMemory, MemoryConstants::pageSize64k, rootDeviceIndices, deviceBitfields); SVMAllocsManager::UnifiedMemoryProperties memoryProperties(InternalMemoryType::hostUnifiedMemory, MemoryConstants::pageSize64k, rootDeviceIndices, deviceBitfields);
const auto allocationSize = 1 * MemoryConstants::kiloByte; const auto requestedAllocSize = 1 * MemoryConstants::kiloByte;
EXPECT_GT(usmMemAllocPool.allocationThreshold, allocationSize + usmMemAllocPool.chunkAlignment); EXPECT_GT(usmMemAllocPool.allocationThreshold, requestedAllocSize + usmMemAllocPool.chunkAlignment);
// we want an allocation from the middle of the pool for testing // we want an allocation from the middle of the pool for testing
auto unusedAlloc = usmMemAllocPool.createUnifiedMemoryAllocation(allocationSize, memoryProperties); auto unusedAlloc = usmMemAllocPool.createUnifiedMemoryAllocation(requestedAllocSize, memoryProperties);
EXPECT_NE(nullptr, unusedAlloc); EXPECT_NE(nullptr, unusedAlloc);
EXPECT_TRUE(usmMemAllocPool.isInPool(unusedAlloc)); EXPECT_TRUE(usmMemAllocPool.isInPool(unusedAlloc));
auto allocFromPool = usmMemAllocPool.createUnifiedMemoryAllocation(allocationSize, memoryProperties); auto allocFromPool = usmMemAllocPool.createUnifiedMemoryAllocation(requestedAllocSize, memoryProperties);
EXPECT_NE(nullptr, allocFromPool); EXPECT_NE(nullptr, allocFromPool);
EXPECT_TRUE(usmMemAllocPool.isInPool(allocFromPool)); EXPECT_TRUE(usmMemAllocPool.isInPool(allocFromPool));
auto allocInfo = usmMemAllocPool.allocations.get(allocFromPool);
EXPECT_NE(nullptr, allocInfo);
auto actualAllocSize = allocInfo->size;
EXPECT_GE(actualAllocSize, requestedAllocSize);
EXPECT_TRUE(usmMemAllocPool.freeSVMAlloc(unusedAlloc, true)); EXPECT_TRUE(usmMemAllocPool.freeSVMAlloc(unusedAlloc, true));
auto offsetPointer = ptrOffset(allocFromPool, allocationSize - 1); auto offsetPointer = ptrOffset(allocFromPool, actualAllocSize - 1);
auto pastEndPointer = ptrOffset(allocFromPool, allocationSize); auto pastEndPointer = ptrOffset(allocFromPool, actualAllocSize);
EXPECT_TRUE(usmMemAllocPool.isInPool(offsetPointer)); EXPECT_TRUE(usmMemAllocPool.isInPool(offsetPointer));
EXPECT_TRUE(usmMemAllocPool.isInPool(pastEndPointer)); EXPECT_TRUE(usmMemAllocPool.isInPool(pastEndPointer));
EXPECT_EQ(0u, usmMemAllocPool.getPooledAllocationSize(bogusPtr)); EXPECT_EQ(0u, usmMemAllocPool.getPooledAllocationSize(bogusPtr));
EXPECT_EQ(0u, usmMemAllocPool.getPooledAllocationSize(usmMemAllocPool.pool)); EXPECT_EQ(0u, usmMemAllocPool.getPooledAllocationSize(usmMemAllocPool.pool));
EXPECT_EQ(allocationSize, usmMemAllocPool.getPooledAllocationSize(allocFromPool)); EXPECT_EQ(requestedAllocSize, usmMemAllocPool.getPooledAllocationSize(allocFromPool));
EXPECT_EQ(allocationSize, usmMemAllocPool.getPooledAllocationSize(offsetPointer)); EXPECT_EQ(requestedAllocSize, usmMemAllocPool.getPooledAllocationSize(offsetPointer));
EXPECT_EQ(0u, usmMemAllocPool.getPooledAllocationSize(pastEndPointer)); EXPECT_EQ(0u, usmMemAllocPool.getPooledAllocationSize(pastEndPointer));
EXPECT_EQ(nullptr, usmMemAllocPool.getPooledAllocationBasePtr(bogusPtr)); EXPECT_EQ(nullptr, usmMemAllocPool.getPooledAllocationBasePtr(bogusPtr));