Skip to content

Commit 87dccc2

Browse files
committed
Remove redundant debug flag.
- We now have ForceSystemMemoryPlacement to achieve the same. Change-Id: I84512b0f8b070edbdbd54fdce46a2958afb8ef41 Signed-off-by: Michal Mrozek <michal.mrozek@intel.com>
1 parent a5ef9e0 commit 87dccc2

File tree

4 files changed

+0
-26
lines changed

4 files changed

+0
-26
lines changed

opencl/test/unit_test/memory_manager/memory_manager_allocate_in_preferred_pool_tests.inl

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -130,24 +130,6 @@ TEST(MemoryManagerGetAlloctionDataTest, givenDefaultAllocationFlagsWhenAllocatio
130130
EXPECT_FALSE(allocData.flags.allocateMemory);
131131
}
132132

133-
TEST(MemoryManagerGetAlloctionDataTest, givenDebugModeToForceBuffersToSystemMemoryWhenGetAllocationDataIsCalledThenSystemMemoryIsRequired) {
134-
DebugManagerStateRestore restorer;
135-
DebugManager.flags.ForceBuffersToSystemMemory.set(true);
136-
137-
AllocationData allocData;
138-
AllocationProperties properties(0, true, 0, GraphicsAllocation::AllocationType::BUFFER, false);
139-
MockMemoryManager mockMemoryManager;
140-
MockMemoryManager::getAllocationData(allocData, properties, nullptr, mockMemoryManager.createStorageInfoFromProperties(properties));
141-
142-
EXPECT_TRUE(allocData.flags.useSystemMemory);
143-
144-
//do not affect BUFFER COMPRESSED
145-
allocData.flags.useSystemMemory = false;
146-
AllocationProperties properties2(0, true, 0, GraphicsAllocation::AllocationType::BUFFER_COMPRESSED, false);
147-
MockMemoryManager::getAllocationData(allocData, properties2, nullptr, mockMemoryManager.createStorageInfoFromProperties(properties));
148-
EXPECT_FALSE(allocData.flags.useSystemMemory);
149-
}
150-
151133
TEST(MemoryManagerGetAlloctionDataTest, givenDebugModeWhenCertainAllocationTypesAreSelectedThenSystemPlacementIsChoosen) {
152134
DebugManagerStateRestore restorer;
153135
auto allocationType = GraphicsAllocation::AllocationType::BUFFER;

opencl/test/unit_test/test_files/igdrcl.config

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -141,6 +141,5 @@ DirectSubmissionDisableMonitorFence = 0
141141
ForceFineGrainedSVMSupport = -1
142142
DirectSubmissionBufferAddressing = -1
143143
DirectSubmissionSemaphoreAddressing = -1
144-
ForceBuffersToSystemMemory = 0
145144
Report64BitIdentifier = 0
146145
DirectSubmissionDiagnosticExecutionCount = 30

shared/source/debug_settings/debug_variables_base.inl

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,6 @@ DECLARE_DEBUG_VARIABLE(bool, UseNoRingFlushesKmdMode, true, "Windows only, passe
105105
DECLARE_DEBUG_VARIABLE(bool, DisableZeroCopyForUseHostPtr, false, "When active all buffer allocations created with CL_MEM_USE_HOST_PTR flag will not share memory with CPU.")
106106
DECLARE_DEBUG_VARIABLE(bool, DisableZeroCopyForBuffers, false, "When active all buffer allocations will not share memory with CPU.")
107107
DECLARE_DEBUG_VARIABLE(bool, DisableDcFlushInEpilogue, false, "Disable DC flush in epilogue")
108-
DECLARE_DEBUG_VARIABLE(bool, ForceBuffersToSystemMemory, false, "Forces buffers to be in system memory")
109108
DECLARE_DEBUG_VARIABLE(int32_t, EnableHostPtrTracking, -1, "Enable host ptr tracking: -1 - default platform setting, 0 - disabled, 1 - enabled")
110109

111110
/*FEATURE FLAGS*/

shared/source/memory_manager/memory_manager.cpp

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -300,12 +300,6 @@ bool MemoryManager::getAllocationData(AllocationData &allocationData, const Allo
300300
break;
301301
}
302302

303-
if (DebugManager.flags.ForceBuffersToSystemMemory.get()) {
304-
if (properties.allocationType == GraphicsAllocation::AllocationType::BUFFER) {
305-
allocationData.flags.useSystemMemory = true;
306-
}
307-
}
308-
309303
if (DebugManager.flags.ForceSystemMemoryPlacement.get()) {
310304
if ((1llu << (static_cast<int64_t>(properties.allocationType) - 1)) & DebugManager.flags.ForceSystemMemoryPlacement.get()) {
311305
allocationData.flags.useSystemMemory = true;

0 commit comments

Comments
 (0)