From d97dccc4094dbadf9611093e3c1c8962e55964fb Mon Sep 17 00:00:00 2001 From: Kamil Kopryk Date: Wed, 19 Jun 2024 10:41:06 +0000 Subject: [PATCH] refactor: rename MaximumNumberOfThreads debug key Signed-off-by: Kamil Kopryk --- .../test/unit_test/helpers/test_preamble_xehp_and_later.cpp | 2 +- shared/source/debug_settings/debug_variables_base.inl | 2 +- shared/source/helpers/preamble_xehp_and_later.inl | 4 ++-- shared/test/common/test_files/igdrcl.config | 2 +- .../test/unit_test/xe_hpc_core/test_preamble_xe_hpc_core.cpp | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/opencl/test/unit_test/helpers/test_preamble_xehp_and_later.cpp b/opencl/test/unit_test/helpers/test_preamble_xehp_and_later.cpp index c01de11833..cef7cefb7d 100644 --- a/opencl/test/unit_test/helpers/test_preamble_xehp_and_later.cpp +++ b/opencl/test/unit_test/helpers/test_preamble_xehp_and_later.cpp @@ -189,7 +189,7 @@ HWTEST2_F(PreambleCfeStateXeHPAndLater, givenSetDebugFlagWhenPreambleCfeStateIsP debugManager.flags.CFESingleSliceDispatchCCSMode.set(expectedValue1); debugManager.flags.CFELargeGRFThreadAdjustDisable.set(expectedValue1); debugManager.flags.CFENumberOfWalkers.set(expectedValue2); - debugManager.flags.CFEMaximumNumberOfThreads.set(expectedValue2); + debugManager.flags.MaximumNumberOfThreads.set(expectedValue2); uint64_t expectedAddress = 1 << CFE_STATE::SCRATCHSPACEBUFFER_BIT_SHIFT; auto pVfeCmd = PreambleHelper::getSpaceForVfeState(&linearStream, *defaultHwInfo, EngineGroupType::renderCompute); diff --git a/shared/source/debug_settings/debug_variables_base.inl b/shared/source/debug_settings/debug_variables_base.inl index 2c7651d21e..225ea391c7 100644 --- a/shared/source/debug_settings/debug_variables_base.inl +++ b/shared/source/debug_settings/debug_variables_base.inl @@ -149,7 +149,7 @@ DECLARE_DEBUG_VARIABLE(int32_t, ComputeOverdispatchDisable, -1, "Set Compute Ove DECLARE_DEBUG_VARIABLE(int32_t, CFEWeightedDispatchModeDisable, -1, "Set Weighted Dispatch Mode Disable field in CFE_STATE on XEHP, -1: do not set.") DECLARE_DEBUG_VARIABLE(int32_t, CFESingleSliceDispatchCCSMode, -1, "Set Single Slice Dispatch CCS Mode in CFE_STATE on XEHP, -1 - do not set") DECLARE_DEBUG_VARIABLE(int32_t, CFENumberOfWalkers, -1, "Set Number of Walkers in CFE_STATE on XEHP, -1 - do not set") -DECLARE_DEBUG_VARIABLE(int32_t, CFEMaximumNumberOfThreads, -1, "Set Maximum Number of Threads in CFE_STATE on XEHP, -1 - do not set") +DECLARE_DEBUG_VARIABLE(int32_t, MaximumNumberOfThreads, -1, "Set Maximum Number of Threads, -1 - do not set") DECLARE_DEBUG_VARIABLE(int32_t, OverDispatchControl, -1, "Set Over Dispatch Control, -1 - do not set") DECLARE_DEBUG_VARIABLE(int32_t, CFELargeGRFThreadAdjustDisable, -1, "Set Large GRF thread adjust Disable field in CFE_STATE, -1 - do not set") DECLARE_DEBUG_VARIABLE(int32_t, OverrideNumComputeUnitsForScratch, -1, "Override number of compute units used for scratch size calculation") diff --git a/shared/source/helpers/preamble_xehp_and_later.inl b/shared/source/helpers/preamble_xehp_and_later.inl index 2fdd4d34fb..614f62995c 100644 --- a/shared/source/helpers/preamble_xehp_and_later.inl +++ b/shared/source/helpers/preamble_xehp_and_later.inl @@ -64,8 +64,8 @@ void PreambleHelper::programVfeState(void *pVfeState, cmd.setComputeOverdispatchDisable(debugManager.flags.ComputeOverdispatchDisable.get()); } - if (debugManager.flags.CFEMaximumNumberOfThreads.get() != -1) { - cmd.setMaximumNumberOfThreads(debugManager.flags.CFEMaximumNumberOfThreads.get()); + if (debugManager.flags.MaximumNumberOfThreads.get() != -1) { + cmd.setMaximumNumberOfThreads(debugManager.flags.MaximumNumberOfThreads.get()); } if (debugManager.flags.OverDispatchControl.get() != -1) { cmd.setOverDispatchControl(static_cast(debugManager.flags.OverDispatchControl.get())); diff --git a/shared/test/common/test_files/igdrcl.config b/shared/test/common/test_files/igdrcl.config index 2d93b1ed33..d181f4d6be 100644 --- a/shared/test/common/test_files/igdrcl.config +++ b/shared/test/common/test_files/igdrcl.config @@ -301,7 +301,7 @@ CFEWeightedDispatchModeDisable = -1 CFESingleSliceDispatchCCSMode = -1 CleanStateInPreamble = 0 CFENumberOfWalkers = -1 -CFEMaximumNumberOfThreads = -1 +MaximumNumberOfThreads = -1 OverDispatchControl = -1 CFELargeGRFThreadAdjustDisable = -1 SynchronizeWalkerInWparidMode = -1 diff --git a/shared/test/unit_test/xe_hpc_core/test_preamble_xe_hpc_core.cpp b/shared/test/unit_test/xe_hpc_core/test_preamble_xe_hpc_core.cpp index 43372bb859..a59a3563e1 100644 --- a/shared/test/unit_test/xe_hpc_core/test_preamble_xe_hpc_core.cpp +++ b/shared/test/unit_test/xe_hpc_core/test_preamble_xe_hpc_core.cpp @@ -97,7 +97,7 @@ XE_HPC_CORETEST_F(PreambleCfeState, givenSetDebugFlagWhenPreambleCfeStateIsProgr debugManager.flags.CFESingleSliceDispatchCCSMode.set(expectedValue1); debugManager.flags.CFELargeGRFThreadAdjustDisable.set(expectedValue1); debugManager.flags.CFENumberOfWalkers.set(expectedValue2); - debugManager.flags.CFEMaximumNumberOfThreads.set(expectedValue2); + debugManager.flags.MaximumNumberOfThreads.set(expectedValue2); uint64_t expectedAddress = 1 << CFE_STATE::SCRATCHSPACEBUFFER_BIT_SHIFT; auto pVfeCmd = PreambleHelper::getSpaceForVfeState(&linearStream, *defaultHwInfo, EngineGroupType::renderCompute);