fix: use full size for HEAP_EXTENDED initialization

Related-To: GSD-8948
Signed-off-by: Jaroslaw Warchulski <jaroslaw.warchulski@intel.com>
This commit is contained in:
Jaroslaw Warchulski
2024-10-18 16:46:00 +00:00
committed by Compute-Runtime-Automation
parent 0e2c5c0129
commit 5afc63df93
5 changed files with 13 additions and 21 deletions

View File

@@ -876,7 +876,7 @@ HWTEST2_F(MemoryManagerDirectSubmissionImplicitScalingTest, givenDirectSubmissio
}
}
TEST(MemoryManagerTest, givenDebugVariableToToggleGpuVaBitsWhenAllocatingResourceInHeapExtendedThenSpecificBitIsToggled) {
TEST(MemoryManagerTest, givenDebugVariableToToggleGpuVaBitsWhenAllocatingResourceInHeapExtendedThenCorrectGpuVaIsSet) {
if (defaultHwInfo->capabilityTable.gpuAddressSpace < maxNBitValue(57)) {
GTEST_SKIP();
}
@@ -905,10 +905,7 @@ TEST(MemoryManagerTest, givenDebugVariableToToggleGpuVaBitsWhenAllocatingResourc
ASSERT_NE(nullptr, allocation);
auto gpuVA = allocation->getGpuAddress();
EXPECT_TRUE(isBitSet(gpuVA, 56));
EXPECT_FALSE(isBitSet(gpuVA, 55));
EXPECT_TRUE(isBitSet(gpuVA, 32));
EXPECT_EQ(gpuVA, 0xff0000ffffff0000);
memoryManager.freeGraphicsMemory(allocation);
}
@@ -919,10 +916,7 @@ TEST(MemoryManagerTest, givenDebugVariableToToggleGpuVaBitsWhenAllocatingResourc
ASSERT_NE(nullptr, allocation);
auto gpuVA = allocation->getGpuAddress();
EXPECT_TRUE(isBitSet(gpuVA, 56));
EXPECT_TRUE(isBitSet(gpuVA, 55));
EXPECT_TRUE(isBitSet(gpuVA, 32));
EXPECT_EQ(gpuVA, 0xff8000fffffe0000);
memoryManager.freeGraphicsMemory(allocation);
}
@@ -934,10 +928,7 @@ TEST(MemoryManagerTest, givenDebugVariableToToggleGpuVaBitsWhenAllocatingResourc
ASSERT_NE(nullptr, allocation);
auto gpuVA = allocation->getGpuAddress();
EXPECT_TRUE(isBitSet(gpuVA, 56));
EXPECT_FALSE(isBitSet(gpuVA, 55));
EXPECT_FALSE(isBitSet(gpuVA, 32));
EXPECT_EQ(gpuVA, 0xff0000fefffd0000);
memoryManager.freeGraphicsMemory(allocation);
}

View File

@@ -6717,7 +6717,7 @@ struct DrmMemoryManagerLocalMemoryAlignmentTest : DrmMemoryManagerWithLocalMemor
bool isAllocationWithinHeap(MemoryManager &memoryManager, const GraphicsAllocation &allocation, HeapIndex heap) {
const auto allocationStart = allocation.getGpuAddress();
const auto allocationEnd = allocationStart + allocation.getUnderlyingBufferSize();
const auto allocationEnd = allocationStart + allocation.getUnderlyingBufferSize() - 1;
const auto gmmHelper = device->getGmmHelper();
const auto heapStart = gmmHelper->canonize(memoryManager.getGfxPartition(rootDeviceIndex)->getHeapBase(heap));
const auto heapEnd = gmmHelper->canonize(memoryManager.getGfxPartition(rootDeviceIndex)->getHeapLimit(heap));