diff --git a/level_zero/core/test/unit_tests/sources/context/test_context.cpp b/level_zero/core/test/unit_tests/sources/context/test_context.cpp index 213139ac31..446deefb2a 100644 --- a/level_zero/core/test/unit_tests/sources/context/test_context.cpp +++ b/level_zero/core/test/unit_tests/sources/context/test_context.cpp @@ -1352,8 +1352,6 @@ TEST_F(ContextTest, whenCallingVirtualMemoryGetAttributeWithInvalidValuesThenFai } TEST_F(ContextTest, whenCallingVirtualMemoryFreeWithInvalidValuesThenFailuresReturned) { - DebugManagerStateRestore restore; - debugManager.flags.EnableReservingInSvmRange.set(true); ze_context_handle_t hContext; ze_context_desc_t desc = {ZE_STRUCTURE_TYPE_CONTEXT_DESC, nullptr, 0}; @@ -1483,8 +1481,6 @@ class ReserveMemoryManagerMock : public NEO::MemoryManager { }; TEST_F(ContextTest, whenCallingVirtualMemReserveWithPStartInSvmRangeWithSuccessfulAllocationThenSuccessReturned) { - DebugManagerStateRestore restore; - debugManager.flags.EnableReservingInSvmRange.set(true); ze_context_handle_t hContext{}; ze_context_desc_t desc = {ZE_STRUCTURE_TYPE_CONTEXT_DESC, nullptr, 0}; @@ -1516,8 +1512,6 @@ TEST_F(ContextTest, whenCallingVirtualMemReserveWithPStartInSvmRangeWithSuccessf } TEST_F(ContextTest, whenCallingVirtualMemReserveWithPStartAboveSvmRangeWithSuccessfulAllocationThenSuccessReturned) { - DebugManagerStateRestore restore; - debugManager.flags.EnableReservingInSvmRange.set(true); ze_context_handle_t hContext{}; ze_context_desc_t desc = {ZE_STRUCTURE_TYPE_CONTEXT_DESC, nullptr, 0}; @@ -1691,8 +1685,6 @@ TEST_F(ContextTest, whenUsingOffsetsIntoReservedVirtualMemoryWithMultiplePhysica } TEST_F(ContextTest, whenCallingVirtualMemoryReservationWhenOutOfMemoryThenOutOfMemoryReturned) { - DebugManagerStateRestore restore; - debugManager.flags.EnableReservingInSvmRange.set(true); ze_context_handle_t hContext; ze_context_desc_t desc = {ZE_STRUCTURE_TYPE_CONTEXT_DESC, nullptr, 0}; @@ -1728,8 +1720,6 @@ TEST_F(ContextTest, whenCallingVirtualMemoryReservationWhenOutOfMemoryThenOutOfM } TEST_F(ContextTest, whenCallingVirtualMemoryReservationWithInvalidArgumentsThenUnsupportedSizeReturned) { - DebugManagerStateRestore restore; - debugManager.flags.EnableReservingInSvmRange.set(true); ze_context_handle_t hContext; ze_context_desc_t desc = {ZE_STRUCTURE_TYPE_CONTEXT_DESC, nullptr, 0}; @@ -1827,8 +1817,6 @@ TEST_F(ContextTest, whenCallingVirtualMemoryReservationWithValidMultiPageSizeInA } TEST_F(ContextTest, whenCallingVirtualMemoryReservationWithOverlappingReservationRangeThenSuccessReturned) { - DebugManagerStateRestore restore; - debugManager.flags.EnableReservingInSvmRange.set(true); ze_context_handle_t hContext; ze_context_desc_t desc = {ZE_STRUCTURE_TYPE_CONTEXT_DESC, nullptr, 0}; @@ -1889,8 +1877,6 @@ class MockCpuInfoOverrideVirtualAddressSize { }; TEST_F(ContextTest, Given32BitCpuAddressWidthWhenCallingVirtualMemoryReservationCorrectAllocationMethodIsSelected) { - DebugManagerStateRestore restore; - debugManager.flags.EnableReservingInSvmRange.set(true); MockCpuInfoOverrideVirtualAddressSize overrideCpuInfo(32); ze_context_handle_t hContext; @@ -1936,8 +1922,6 @@ TEST_F(ContextTest, Given32BitCpuAddressWidthWhenCallingVirtualMemoryReservation } TEST_F(ContextTest, Given48BitCpuAddressWidthWhenCallingVirtualMemoryReservationCorrectAllocationMethodIsSelected) { - DebugManagerStateRestore restore; - debugManager.flags.EnableReservingInSvmRange.set(true); MockCpuInfoOverrideVirtualAddressSize overrideCpuInfo(48); ze_context_handle_t hContext; @@ -1982,8 +1966,6 @@ TEST_F(ContextTest, Given48BitCpuAddressWidthWhenCallingVirtualMemoryReservation } TEST_F(ContextTest, Given57BitCpuAddressWidthWhenCallingVirtualMemoryReservationCorrectAllocationMethodIsSelected) { - DebugManagerStateRestore restore; - debugManager.flags.EnableReservingInSvmRange.set(true); MockCpuInfoOverrideVirtualAddressSize overrideCpuInfo(57); ze_context_handle_t hContext; diff --git a/shared/source/debug_settings/debug_variables_base.inl b/shared/source/debug_settings/debug_variables_base.inl index ce81220d71..a7f309c1e7 100644 --- a/shared/source/debug_settings/debug_variables_base.inl +++ b/shared/source/debug_settings/debug_variables_base.inl @@ -467,7 +467,7 @@ DECLARE_DEBUG_VARIABLE(bool, EnableFreeMemory, true, "Enable freeMemory in memor DECLARE_DEBUG_VARIABLE(bool, ForceSamplerLowFilteringPrecision, false, "Force Low Filtering Precision Sampler mode") DECLARE_DEBUG_VARIABLE(bool, EnablePrivateBO, false, "Enable PRELIM_I915_GEM_CREATE_EXT_VM_PRIVATE extension creating VM_PRIVATE BOs") DECLARE_DEBUG_VARIABLE(bool, EnableAIL, true, "Enables AIL") -DECLARE_DEBUG_VARIABLE(bool, EnableReservingInSvmRange, false, "Enables reserving virtual memory in the SVM range") +DECLARE_DEBUG_VARIABLE(bool, EnableReservingInSvmRange, true, "Enables reserving virtual memory in the SVM range") DECLARE_DEBUG_VARIABLE(bool, EnableProgrammableMetricsSupport, false, "Enable Programmable Metrics support") DECLARE_DEBUG_VARIABLE(int64_t, VmBindWaitUserFenceTimeout, -1, "-1: default, >0: time in ns for wait function timeout") DECLARE_DEBUG_VARIABLE(int32_t, ForceRunAloneContext, -1, "Control creation of run-alone HW context, -1:default, 0:disable, 1:enable") diff --git a/shared/test/common/test_files/igdrcl.config b/shared/test/common/test_files/igdrcl.config index a675bd992a..066e9595b6 100644 --- a/shared/test/common/test_files/igdrcl.config +++ b/shared/test/common/test_files/igdrcl.config @@ -495,7 +495,7 @@ OverridePlatformName = unk WddmResidencyLoggerOutputDirectory = unk ToggleBitIn57GpuVa = unk EnablePrivateBO = 0 -EnableReservingInSvmRange = 0 +EnableReservingInSvmRange = 1 ExperimentalEnableDeviceAllocationCache = -1 OverrideL1CachePolicyInSurfaceStateAndStateless = -1 EnableBcsSwControlWa = -1