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

Revert "Replicate CONSTANT_SURFACE across tiles"

Browse Source 
This reverts commit 9a4467f368.

Signed-off-by: Compute-Runtime-Validation <compute-runtime-validation@intel.com>
This commit is contained in:
Compute-Runtime-Validation
2022-11-05 06:11:55 +01:00
committed by Compute-Runtime-Automation
parent dba54846a1
commit d91d22d1fe
4 changed files with 17 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
shared/test/common/test_files/igdrcl.config
View File

@@ -295,7 +295,7 @@ EnablePrivateScratchSlot1 = -1
DisablePipeControlPrecedingPostSyncCommand = -1
UseClearColorAllocationForBlitter = false
OverrideMultiStoragePlacement = -1
MultiTileAllocPlacement = -1
MultiTileIsaPlacement = -1
FormatForStatelessCompressionWithUnifiedMemory = 0xF
ForceMultiGpuPartialWritesInComputeMode = -1
ForceMultiGpuPartialWrites = -1

22
shared/test/unit_test/memory_manager/storage_info_tests.cpp
View File

@@ -38,14 +38,14 @@ struct MultiDeviceStorageInfoTest : public ::testing::Test {
MockMemoryManager *memoryManager;
};
TEST_F(MultiDeviceStorageInfoTest, givenEnabledFlagForMultiTileAllocPlacementWhenCreatingStorageInfoForAllocationThenAllMemoryBanksAreOnAndPageTableClonningIsNotRequired) {
TEST_F(MultiDeviceStorageInfoTest, givenEnabledFlagForMultiTileIsaPlacementWhenCreatingStorageInfoForKernelIsaThenAllMemoryBanksAreOnAndPageTableClonningIsNotRequired) {
DebugManagerStateRestore restorer;
DebugManager.flags.MultiTileAllocPlacement.set(1);
DebugManager.flags.MultiTileIsaPlacement.set(1);
AllocationType allocTypes[] = {AllocationType::KERNEL_ISA, AllocationType::KERNEL_ISA_INTERNAL, AllocationType::CONSTANT_SURFACE};
AllocationType isaTypes[] = {AllocationType::KERNEL_ISA, AllocationType::KERNEL_ISA_INTERNAL};
for (uint32_t i = 0; i < 2; i++) {
AllocationProperties properties{mockRootDeviceIndex, false, 0u, allocTypes[i], false, false, singleTileMask};
AllocationProperties properties{mockRootDeviceIndex, false, 0u, isaTypes[i], false, false, singleTileMask};
auto storageInfo = memoryManager->createStorageInfoFromProperties(properties);
EXPECT_FALSE(storageInfo.cloningOfPageTables);
EXPECT_EQ(allTilesMask, storageInfo.memoryBanks);
@@ -61,12 +61,12 @@ TEST_F(MultiDeviceStorageInfoTest, givenEnabledFlagForMultiTileAllocPlacementWhe
}
}
TEST_F(MultiDeviceStorageInfoTest, givenDefaultFlagForMultiTileAllocPlacementWhenCreatingStorageInfoForAllocationThenSingleMemoryBanksIsOnAndPageTableClonningIsRequired) {
TEST_F(MultiDeviceStorageInfoTest, givenDefaultFlagForMultiTileIsaPlacementWhenCreatingStorageInfoForKernelIsaThenSingleMemoryBanksIsOnAndPageTableClonningIsRequired) {
AllocationType allocTypes[] = {AllocationType::KERNEL_ISA, AllocationType::KERNEL_ISA_INTERNAL, AllocationType::CONSTANT_SURFACE};
AllocationType isaTypes[] = {AllocationType::KERNEL_ISA, AllocationType::KERNEL_ISA_INTERNAL};
for (uint32_t i = 0; i < 2; i++) {
AllocationProperties properties{mockRootDeviceIndex, false, 0u, allocTypes[i], false, false, singleTileMask};
AllocationProperties properties{mockRootDeviceIndex, false, 0u, isaTypes[i], false, false, singleTileMask};
auto storageInfo = memoryManager->createStorageInfoFromProperties(properties);
EXPECT_TRUE(storageInfo.cloningOfPageTables);
@@ -83,14 +83,14 @@ TEST_F(MultiDeviceStorageInfoTest, givenDefaultFlagForMultiTileAllocPlacementWhe
}
}
TEST_F(MultiDeviceStorageInfoTest, givenDisabledFlagForMultiTileAllocPlacementWhenCreatingStorageInfoForAllocationThenSingleMemoryBanksIsOnAndPageTableClonningIsRequired) {
TEST_F(MultiDeviceStorageInfoTest, givenDisabledFlagForMultiTileIsaPlacementWhenCreatingStorageInfoForKernelIsaThenSingleMemoryBanksIsOnAndPageTableClonningIsRequired) {
DebugManagerStateRestore restorer;
DebugManager.flags.MultiTileAllocPlacement.set(0);
DebugManager.flags.MultiTileIsaPlacement.set(0);
AllocationType allocTypes[] = {AllocationType::KERNEL_ISA, AllocationType::KERNEL_ISA_INTERNAL, AllocationType::CONSTANT_SURFACE};
AllocationType isaTypes[] = {AllocationType::KERNEL_ISA, AllocationType::KERNEL_ISA_INTERNAL};
for (uint32_t i = 0; i < 2; i++) {
AllocationProperties properties{mockRootDeviceIndex, false, 0u, allocTypes[i], false, false, singleTileMask};
AllocationProperties properties{mockRootDeviceIndex, false, 0u, isaTypes[i], false, false, singleTileMask};
auto storageInfo = memoryManager->createStorageInfoFromProperties(properties);
EXPECT_TRUE(storageInfo.cloningOfPageTables);
EXPECT_EQ(singleTileMask, storageInfo.memoryBanks.to_ulong());