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

fix: set memoryBanks correctly for single memory bank

Browse Source 
Resolves: HSD-18040585222

Signed-off-by: Maciej Bielski <maciej.bielski@intel.com>
This commit is contained in:
Maciej Bielski
2025-01-10 10:01:35 +00:00
committed by Compute-Runtime-Automation
parent 7903086db3
commit e95c7aac92
2 changed files with 93 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -5512,7 +5512,7 @@ TEST_F(DrmMemoryManagerWithLocalMemoryTest, givenSingleLocalMemoryWhenParticular
EXPECT_EQ(memoryManager->computeStorageInfoMemoryBanksCalled, 2UL);
}
TEST_F(DrmMemoryManagerWithLocalMemoryTest, givenSingleLocalMemoryWhenAllSubdevicesIndicatedThenCorrectBankIsSelected) {
TEST_F(DrmMemoryManagerWithLocalMemoryTest, givenSingleLocalMemoryAndNonTileInstancedAllocationWhenAllTilesIndicatedThenCorrectBankIsSelected) {
auto *memoryInfo = static_cast<MockMemoryInfo *>(mock->memoryInfo.get());
auto &localMemoryRegions = memoryInfo->localMemoryRegions;
localMemoryRegions.resize(1U);
@@ -5529,6 +5529,72 @@ TEST_F(DrmMemoryManagerWithLocalMemoryTest, givenSingleLocalMemoryWhenAllSubdevi
EXPECT_EQ(memoryManager->computeStorageInfoMemoryBanksCalled, 2UL);
}
TEST_F(DrmMemoryManagerWithLocalMemoryTest, givenSingleLocalMemoryWhenTileInstancedAllocationCreatedThenMemoryBanksSetToAllTilesRegardlessOfSubDevicesIndicatedInProperties) {
auto *memoryInfo = static_cast<MockMemoryInfo *>(mock->memoryInfo.get());
auto &localMemoryRegions = memoryInfo->localMemoryRegions;
debugManager.flags.CreateMultipleSubDevices.set(2);
localMemoryRegions.resize(1U);
localMemoryRegions[0].tilesMask = 0b11;
const auto expectedMemoryBanks = 0b11;
for (auto subDevicesMask = 1U; subDevicesMask < 4; ++subDevicesMask) {
AllocationProperties properties{1, 4096, AllocationType::workPartitionSurface, subDevicesMask};
memoryManager->computeStorageInfoMemoryBanksCalled = 0U;
auto storageInfo = memoryManager->createStorageInfoFromProperties(properties);
EXPECT_TRUE(storageInfo.tileInstanced);
EXPECT_EQ(storageInfo.memoryBanks, expectedMemoryBanks);
EXPECT_EQ(memoryManager->computeStorageInfoMemoryBanksCalled, 2UL);
}
}
TEST_F(DrmMemoryManagerWithLocalMemoryTest, givenSingleLocalMemoryAndTileInstancedAllocationTypeEvenWhenSubsetOfTilesIndicatedThenCorrectBankIsSelected) {
auto *memoryInfo = static_cast<MockMemoryInfo *>(mock->memoryInfo.get());
auto &localMemoryRegions = memoryInfo->localMemoryRegions;
debugManager.flags.CreateMultipleSubDevices.set(2);
localMemoryRegions.resize(1U);
localMemoryRegions[0].tilesMask = 0b11;
AllocationProperties properties{1, true, 4096, AllocationType::workPartitionSurface, false, 0b10};
const auto expectedMemoryBanks = 0b11;
memoryManager->computeStorageInfoMemoryBanksCalled = 0U;
auto storageInfo = memoryManager->createStorageInfoFromProperties(properties);
EXPECT_EQ(storageInfo.memoryBanks, expectedMemoryBanks);
EXPECT_EQ(memoryManager->computeStorageInfoMemoryBanksCalled, 2UL);
}
TEST_F(DrmMemoryManagerWithLocalMemoryAndExplicitExpectationsTest, givenSingleLocalMemoryWhenTileInstancedAllocationCreatedThenItHasCorrectBOs) {
auto *memoryInfo = static_cast<MockMemoryInfo *>(mock->memoryInfo.get());
auto &localMemoryRegions = memoryInfo->localMemoryRegions;
localMemoryRegions.resize(1U);
localMemoryRegions[0].tilesMask = 0b11;
const DeviceBitfield subDeviceBitfield{0b11};
const auto expectedNumHandles{subDeviceBitfield.count()};
EXPECT_NE(expectedNumHandles, 0UL);
AllocationProperties properties{1, 4096, AllocationType::workPartitionSurface, subDeviceBitfield};
auto *allocation{memoryManager->allocateGraphicsMemoryInPreferredPool(properties, nullptr)};
EXPECT_EQ(allocation->getNumHandles(), expectedNumHandles);
const auto &bos{static_cast<DrmAllocation *>(allocation)->getBOs()};
const auto commonBoAddress{bos[0U]->peekAddress()};
auto numberOfValidBos{0U};
for (const auto bo : bos) {
if (bo == nullptr) {
continue;
}
++numberOfValidBos;
EXPECT_EQ(bo->peekAddress(), commonBoAddress);
}
EXPECT_EQ(numberOfValidBos, expectedNumHandles);
memoryManager->freeGraphicsMemory(allocation);
}
TEST_F(DrmMemoryManagerWithLocalMemoryTest, givenMultipleLocalMemoryRegionsWhenParticularSubdeviceIndicatedThenItIsSelected) {
auto *memoryInfo = static_cast<MockMemoryInfo *>(mock->memoryInfo.get());
auto &localMemoryRegions = memoryInfo->localMemoryRegions;