Revert "Improve private allocation storage."

This reverts commit be3ca800bb.

Signed-off-by: Compute-Runtime-Validation <compute-runtime-validation@intel.com>
This commit is contained in:
Compute-Runtime-Validation
2021-08-20 02:18:40 +02:00
committed by Compute-Runtime-Automation
parent e05fcbe72b
commit f1264c19dc
2 changed files with 8 additions and 7 deletions

View File

@ -108,19 +108,20 @@ TEST_F(MultiDeviceStorageInfoTest, givenDisabledFlagForMultiTileIsaPlacementWhen
}
}
TEST_F(MultiDeviceStorageInfoTest, whenCreatingStorageInfoForPrivateSurfaceThenSingleMemoryBanksAreOnAndPageTableClonningIsNotRequired) {
TEST_F(MultiDeviceStorageInfoTest, whenCreatingStorageInfoForPrivateSurfaceThenAllMemoryBanksAreOnAndPageTableClonningIsNotRequired) {
AllocationProperties properties{mockRootDeviceIndex, false, 0u, GraphicsAllocation::AllocationType::PRIVATE_SURFACE, false, false, singleTileMask};
auto storageInfo = memoryManager->createStorageInfoFromProperties(properties);
EXPECT_TRUE(storageInfo.cloningOfPageTables);
EXPECT_EQ(singleTileMask, storageInfo.memoryBanks);
EXPECT_EQ(singleTileMask, storageInfo.pageTablesVisibility);
EXPECT_FALSE(storageInfo.tileInstanced);
EXPECT_EQ(1u, storageInfo.getNumBanks());
EXPECT_FALSE(storageInfo.cloningOfPageTables);
EXPECT_EQ(allTilesMask, storageInfo.memoryBanks);
EXPECT_EQ(allTilesMask, storageInfo.pageTablesVisibility);
EXPECT_TRUE(storageInfo.tileInstanced);
EXPECT_EQ(numDevices, storageInfo.getNumBanks());
properties.flags.multiOsContextCapable = true;
auto storageInfo2 = memoryManager->createStorageInfoFromProperties(properties);
EXPECT_FALSE(storageInfo2.cloningOfPageTables);
EXPECT_EQ(allTilesMask, storageInfo2.memoryBanks);
EXPECT_EQ(allTilesMask, storageInfo.pageTablesVisibility);
EXPECT_TRUE(storageInfo2.tileInstanced);
EXPECT_EQ(numDevices, storageInfo2.getNumBanks());
}

View File

@ -66,6 +66,7 @@ StorageInfo MemoryManager::createStorageInfoFromProperties(const AllocationPrope
}
} break;
case GraphicsAllocation::AllocationType::DEBUG_CONTEXT_SAVE_AREA:
case GraphicsAllocation::AllocationType::PRIVATE_SURFACE:
case GraphicsAllocation::AllocationType::WORK_PARTITION_SURFACE:
storageInfo.cloningOfPageTables = false;
storageInfo.memoryBanks = allTilesValue;
@ -81,7 +82,6 @@ StorageInfo MemoryManager::createStorageInfoFromProperties(const AllocationPrope
}
break;
case GraphicsAllocation::AllocationType::SCRATCH_SURFACE:
case GraphicsAllocation::AllocationType::PRIVATE_SURFACE:
case GraphicsAllocation::AllocationType::PREEMPTION:
if (properties.flags.multiOsContextCapable) {
storageInfo.cloningOfPageTables = false;