Skip to content

Commit f1264c1

Browse files
Revert "Improve private allocation storage."
This reverts commit be3ca80. Signed-off-by: Compute-Runtime-Validation <[email protected]>
1 parent e05fcbe commit f1264c1

File tree

2 files changed

+8
-7
lines changed

2 files changed

+8
-7
lines changed

opencl/test/unit_test/memory_manager/storage_info_tests.cpp

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -108,19 +108,20 @@ TEST_F(MultiDeviceStorageInfoTest, givenDisabledFlagForMultiTileIsaPlacementWhen
108108
}
109109
}
110110

111-
TEST_F(MultiDeviceStorageInfoTest, whenCreatingStorageInfoForPrivateSurfaceThenSingleMemoryBanksAreOnAndPageTableClonningIsNotRequired) {
111+
TEST_F(MultiDeviceStorageInfoTest, whenCreatingStorageInfoForPrivateSurfaceThenAllMemoryBanksAreOnAndPageTableClonningIsNotRequired) {
112112
AllocationProperties properties{mockRootDeviceIndex, false, 0u, GraphicsAllocation::AllocationType::PRIVATE_SURFACE, false, false, singleTileMask};
113113
auto storageInfo = memoryManager->createStorageInfoFromProperties(properties);
114-
EXPECT_TRUE(storageInfo.cloningOfPageTables);
115-
EXPECT_EQ(singleTileMask, storageInfo.memoryBanks);
116-
EXPECT_EQ(singleTileMask, storageInfo.pageTablesVisibility);
117-
EXPECT_FALSE(storageInfo.tileInstanced);
118-
EXPECT_EQ(1u, storageInfo.getNumBanks());
114+
EXPECT_FALSE(storageInfo.cloningOfPageTables);
115+
EXPECT_EQ(allTilesMask, storageInfo.memoryBanks);
116+
EXPECT_EQ(allTilesMask, storageInfo.pageTablesVisibility);
117+
EXPECT_TRUE(storageInfo.tileInstanced);
118+
EXPECT_EQ(numDevices, storageInfo.getNumBanks());
119119

120120
properties.flags.multiOsContextCapable = true;
121121
auto storageInfo2 = memoryManager->createStorageInfoFromProperties(properties);
122122
EXPECT_FALSE(storageInfo2.cloningOfPageTables);
123123
EXPECT_EQ(allTilesMask, storageInfo2.memoryBanks);
124+
EXPECT_EQ(allTilesMask, storageInfo.pageTablesVisibility);
124125
EXPECT_TRUE(storageInfo2.tileInstanced);
125126
EXPECT_EQ(numDevices, storageInfo2.getNumBanks());
126127
}

shared/source/memory_manager/definitions/storage_info.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,7 @@ StorageInfo MemoryManager::createStorageInfoFromProperties(const AllocationPrope
6666
}
6767
} break;
6868
case GraphicsAllocation::AllocationType::DEBUG_CONTEXT_SAVE_AREA:
69+
case GraphicsAllocation::AllocationType::PRIVATE_SURFACE:
6970
case GraphicsAllocation::AllocationType::WORK_PARTITION_SURFACE:
7071
storageInfo.cloningOfPageTables = false;
7172
storageInfo.memoryBanks = allTilesValue;
@@ -81,7 +82,6 @@ StorageInfo MemoryManager::createStorageInfoFromProperties(const AllocationPrope
8182
}
8283
break;
8384
case GraphicsAllocation::AllocationType::SCRATCH_SURFACE:
84-
case GraphicsAllocation::AllocationType::PRIVATE_SURFACE:
8585
case GraphicsAllocation::AllocationType::PREEMPTION:
8686
if (properties.flags.multiOsContextCapable) {
8787
storageInfo.cloningOfPageTables = false;

0 commit comments

Comments
 (0)