From 22cebedcd11c692c5e1a04c8a9072b6022a6ebdd Mon Sep 17 00:00:00 2001 From: Compute-Runtime-Validation Date: Thu, 9 Jan 2025 04:33:08 +0100 Subject: [PATCH] Revert "refactor: Update thread scheduling mode naming" This reverts commit d50beb5df4f676c4d90ed447db6b883df8f4c1ae. Signed-off-by: Compute-Runtime-Validation --- .../unit_tests/fixtures/cmdlist_fixture.inl | 14 ++++----- .../hw_cmds_generated_xe2_hpg_core.inl | 24 +++++++-------- .../xe3_core/hw_cmds_generated_xe3_core.inl | 24 +++++++-------- .../hw_cmds_generated_xe_hpc_core.inl | 24 +++++++-------- .../command_encoder_xe2_hpg_core.cpp | 8 ++--- .../xe3_core/command_encoder_xe3_core.cpp | 8 ++--- .../command_encoder_xe_hpc_core.cpp | 8 ++--- .../unit_test_helper_xe_hpc_and_later.inl | 8 ++--- .../compute_mode_tests_xe2_hpg_core.cpp | 14 ++++----- .../xe2_hpg_core/test_encode_xe2_hpg_core.cpp | 18 +++++------ .../xe3_core/compute_mode_tests_xe3_core.cpp | 10 +++---- .../compute_mode_tests_xe_hpc_core.cpp | 30 +++++++++---------- .../xe_hpc_core/test_encode_xe_hpc_core.cpp | 24 +++++++-------- 13 files changed, 107 insertions(+), 107 deletions(-) diff --git a/level_zero/core/test/unit_tests/fixtures/cmdlist_fixture.inl b/level_zero/core/test/unit_tests/fixtures/cmdlist_fixture.inl index 856e64431a..f160ab0981 100644 --- a/level_zero/core/test/unit_tests/fixtures/cmdlist_fixture.inl +++ b/level_zero/core/test/unit_tests/fixtures/cmdlist_fixture.inl @@ -817,7 +817,7 @@ void CmdListPipelineSelectStateFixture::testBodySystolicAndScratchOnSecondComman template void CmdListThreadArbitrationFixture::testBody() { using STATE_COMPUTE_MODE = typename FamilyType::STATE_COMPUTE_MODE; - using EU_THREAD_SCHEDULING_MODE = typename STATE_COMPUTE_MODE::EU_THREAD_SCHEDULING_MODE; + using EU_THREAD_SCHEDULING_MODE_OVERRIDE = typename STATE_COMPUTE_MODE::EU_THREAD_SCHEDULING_MODE_OVERRIDE; const ze_group_count_t groupCount{1, 1, 1}; CmdListKernelLaunchParams launchParams = {}; @@ -881,7 +881,7 @@ void CmdListThreadArbitrationFixture::testBody() { ASSERT_EQ(1u, stateComputeModeList.size()); auto stateComputeModeCmd = genCmdCast(*stateComputeModeList[0]); - EXPECT_EQ(EU_THREAD_SCHEDULING_MODE::EU_THREAD_SCHEDULING_MODE_OLDEST_FIRST, stateComputeModeCmd->getEuThreadSchedulingMode()); + EXPECT_EQ(EU_THREAD_SCHEDULING_MODE_OVERRIDE::EU_THREAD_SCHEDULING_MODE_OVERRIDE_OLDEST_FIRST, stateComputeModeCmd->getEuThreadSchedulingModeOverride()); cmdList.clear(); stateComputeModeList.clear(); @@ -927,7 +927,7 @@ void CmdListThreadArbitrationFixture::testBody() { ASSERT_EQ(1u, stateComputeModeList.size()); auto stateComputeModeCmd = genCmdCast(*stateComputeModeList[0]); - EXPECT_EQ(EU_THREAD_SCHEDULING_MODE::EU_THREAD_SCHEDULING_MODE_OLDEST_FIRST, stateComputeModeCmd->getEuThreadSchedulingMode()); + EXPECT_EQ(EU_THREAD_SCHEDULING_MODE_OVERRIDE::EU_THREAD_SCHEDULING_MODE_OVERRIDE_OLDEST_FIRST, stateComputeModeCmd->getEuThreadSchedulingModeOverride()); cmdList.clear(); stateComputeModeList.clear(); @@ -948,7 +948,7 @@ void CmdListThreadArbitrationFixture::testBody() { ASSERT_EQ(1u, stateComputeModeList.size()); stateComputeModeCmd = genCmdCast(*stateComputeModeList[0]); - EXPECT_EQ(EU_THREAD_SCHEDULING_MODE::EU_THREAD_SCHEDULING_MODE_ROUND_ROBIN, stateComputeModeCmd->getEuThreadSchedulingMode()); + EXPECT_EQ(EU_THREAD_SCHEDULING_MODE_OVERRIDE::EU_THREAD_SCHEDULING_MODE_OVERRIDE_ROUND_ROBIN, stateComputeModeCmd->getEuThreadSchedulingModeOverride()); cmdList.clear(); stateComputeModeList.clear(); @@ -994,7 +994,7 @@ void CmdListThreadArbitrationFixture::testBody() { ASSERT_EQ(1u, stateComputeModeList.size()); auto stateComputeModeCmd = genCmdCast(*stateComputeModeList[0]); - EXPECT_EQ(EU_THREAD_SCHEDULING_MODE::EU_THREAD_SCHEDULING_MODE_OLDEST_FIRST, stateComputeModeCmd->getEuThreadSchedulingMode()); + EXPECT_EQ(EU_THREAD_SCHEDULING_MODE_OVERRIDE::EU_THREAD_SCHEDULING_MODE_OVERRIDE_OLDEST_FIRST, stateComputeModeCmd->getEuThreadSchedulingModeOverride()); cmdList.clear(); stateComputeModeList.clear(); @@ -1017,7 +1017,7 @@ void CmdListThreadArbitrationFixture::testBody() { ASSERT_EQ(1u, stateComputeModeList.size()); stateComputeModeCmd = genCmdCast(*stateComputeModeList[0]); - EXPECT_EQ(EU_THREAD_SCHEDULING_MODE::EU_THREAD_SCHEDULING_MODE_STALL_BASED_ROUND_ROBIN, stateComputeModeCmd->getEuThreadSchedulingMode()); + EXPECT_EQ(EU_THREAD_SCHEDULING_MODE_OVERRIDE::EU_THREAD_SCHEDULING_MODE_OVERRIDE_STALL_BASED_ROUND_ROBIN, stateComputeModeCmd->getEuThreadSchedulingModeOverride()); cmdList.clear(); stateComputeModeList.clear(); @@ -1038,7 +1038,7 @@ void CmdListThreadArbitrationFixture::testBody() { ASSERT_EQ(1u, stateComputeModeList.size()); stateComputeModeCmd = genCmdCast(*stateComputeModeList[0]); - EXPECT_EQ(EU_THREAD_SCHEDULING_MODE::EU_THREAD_SCHEDULING_MODE_ROUND_ROBIN, stateComputeModeCmd->getEuThreadSchedulingMode()); + EXPECT_EQ(EU_THREAD_SCHEDULING_MODE_OVERRIDE::EU_THREAD_SCHEDULING_MODE_OVERRIDE_ROUND_ROBIN, stateComputeModeCmd->getEuThreadSchedulingModeOverride()); cmdList.clear(); stateComputeModeList.clear(); diff --git a/shared/source/generated/xe2_hpg_core/hw_cmds_generated_xe2_hpg_core.inl b/shared/source/generated/xe2_hpg_core/hw_cmds_generated_xe2_hpg_core.inl index d631ed5163..22bf42c988 100644 --- a/shared/source/generated/xe2_hpg_core/hw_cmds_generated_xe2_hpg_core.inl +++ b/shared/source/generated/xe2_hpg_core/hw_cmds_generated_xe2_hpg_core.inl @@ -6912,7 +6912,7 @@ typedef struct tagSTATE_COMPUTE_MODE { uint32_t Reserved_37 : BITFIELD_RANGE(5, 6); uint32_t AsyncComputeThreadLimit : BITFIELD_RANGE(7, 9); uint32_t Reserved_42 : BITFIELD_RANGE(10, 12); - uint32_t EuThreadSchedulingMode : BITFIELD_RANGE(13, 14); + uint32_t EuThreadSchedulingModeOverride : BITFIELD_RANGE(13, 14); uint32_t LargeGrfMode : BITFIELD_RANGE(15, 15); uint32_t Mask1 : BITFIELD_RANGE(16, 31); // DWORD 2 @@ -6965,12 +6965,12 @@ typedef struct tagSTATE_COMPUTE_MODE { ASYNC_COMPUTE_THREAD_LIMIT_MAX_40 = 0x6, ASYNC_COMPUTE_THREAD_LIMIT_MAX_48 = 0x7, } ASYNC_COMPUTE_THREAD_LIMIT; - typedef enum tagEU_THREAD_SCHEDULING_MODE { - EU_THREAD_SCHEDULING_MODE_HW_DEFAULT = 0x0, - EU_THREAD_SCHEDULING_MODE_OLDEST_FIRST = 0x1, - EU_THREAD_SCHEDULING_MODE_ROUND_ROBIN = 0x2, - EU_THREAD_SCHEDULING_MODE_STALL_BASED_ROUND_ROBIN = 0x3, - } EU_THREAD_SCHEDULING_MODE; + typedef enum tagEU_THREAD_SCHEDULING_MODE_OVERRIDE { + EU_THREAD_SCHEDULING_MODE_OVERRIDE_HW_DEFAULT = 0x0, + EU_THREAD_SCHEDULING_MODE_OVERRIDE_OLDEST_FIRST = 0x1, + EU_THREAD_SCHEDULING_MODE_OVERRIDE_ROUND_ROBIN = 0x2, + EU_THREAD_SCHEDULING_MODE_OVERRIDE_STALL_BASED_ROUND_ROBIN = 0x3, + } EU_THREAD_SCHEDULING_MODE_OVERRIDE; typedef enum tagMIDTHREAD_PREEMPTION_DELAY_TIMER { MIDTHREAD_PREEMPTION_DELAY_TIMER_MTP_TIMER_VAL_0 = 0x0, MIDTHREAD_PREEMPTION_DELAY_TIMER_MTP_TIMER_VAL_50 = 0x1, @@ -7000,7 +7000,7 @@ typedef struct tagSTATE_COMPUTE_MODE { TheStructure.Common.CommandType = COMMAND_TYPE_GFXPIPE; TheStructure.Common.ZPassAsyncComputeThreadLimit = Z_PASS_ASYNC_COMPUTE_THREAD_LIMIT_MAX_60; TheStructure.Common.AsyncComputeThreadLimit = ASYNC_COMPUTE_THREAD_LIMIT_DISABLED; - TheStructure.Common.EuThreadSchedulingMode = EU_THREAD_SCHEDULING_MODE_HW_DEFAULT; + TheStructure.Common.EuThreadSchedulingModeOverride = EU_THREAD_SCHEDULING_MODE_OVERRIDE_HW_DEFAULT; TheStructure.Common.MidthreadPreemptionDelayTimer = MIDTHREAD_PREEMPTION_DELAY_TIMER_MTP_TIMER_VAL_0; TheStructure.Common.MidthreadPreemptionOverdispatchThreadGroupCount = MIDTHREAD_PREEMPTION_OVERDISPATCH_THREAD_GROUP_COUNT_OD_TG_M2; TheStructure.Common.MidthreadPreemptionOverdispatchTestMode = MIDTHREAD_PREEMPTION_OVERDISPATCH_TEST_MODE_REGULAR; @@ -7033,11 +7033,11 @@ typedef struct tagSTATE_COMPUTE_MODE { inline ASYNC_COMPUTE_THREAD_LIMIT getAsyncComputeThreadLimit() const { return static_cast(TheStructure.Common.AsyncComputeThreadLimit); } - inline void setEuThreadSchedulingMode(const EU_THREAD_SCHEDULING_MODE value) { - TheStructure.Common.EuThreadSchedulingMode = value; + inline void setEuThreadSchedulingModeOverride(const EU_THREAD_SCHEDULING_MODE_OVERRIDE value) { + TheStructure.Common.EuThreadSchedulingModeOverride = value; } - inline EU_THREAD_SCHEDULING_MODE getEuThreadSchedulingMode() const { - return static_cast(TheStructure.Common.EuThreadSchedulingMode); + inline EU_THREAD_SCHEDULING_MODE_OVERRIDE getEuThreadSchedulingModeOverride() const { + return static_cast(TheStructure.Common.EuThreadSchedulingModeOverride); } inline void setLargeGrfMode(const bool value) { TheStructure.Common.LargeGrfMode = value; diff --git a/shared/source/generated/xe3_core/hw_cmds_generated_xe3_core.inl b/shared/source/generated/xe3_core/hw_cmds_generated_xe3_core.inl index 9205798ed5..2b96b8e315 100644 --- a/shared/source/generated/xe3_core/hw_cmds_generated_xe3_core.inl +++ b/shared/source/generated/xe3_core/hw_cmds_generated_xe3_core.inl @@ -6951,7 +6951,7 @@ typedef struct tagSTATE_COMPUTE_MODE { uint32_t AsyncComputeThreadLimit : BITFIELD_RANGE(7, 9); uint32_t EnableVariableRegisterSizeAllocation_Vrt : BITFIELD_RANGE(10, 10); uint32_t Reserved_43 : BITFIELD_RANGE(11, 12); - uint32_t EuThreadSchedulingMode : BITFIELD_RANGE(13, 14); + uint32_t EuThreadSchedulingModeOverride : BITFIELD_RANGE(13, 14); uint32_t LargeGrfMode : BITFIELD_RANGE(15, 15); uint32_t Mask1 : BITFIELD_RANGE(16, 31); // DWORD 2 @@ -7002,12 +7002,12 @@ typedef struct tagSTATE_COMPUTE_MODE { ASYNC_COMPUTE_THREAD_LIMIT_MAX_40 = 0x6, ASYNC_COMPUTE_THREAD_LIMIT_MAX_48 = 0x7, } ASYNC_COMPUTE_THREAD_LIMIT; - typedef enum tagEU_THREAD_SCHEDULING_MODE { - EU_THREAD_SCHEDULING_MODE_HW_DEFAULT = 0x0, - EU_THREAD_SCHEDULING_MODE_OLDEST_FIRST = 0x1, - EU_THREAD_SCHEDULING_MODE_ROUND_ROBIN = 0x2, - EU_THREAD_SCHEDULING_MODE_STALL_BASED_ROUND_ROBIN = 0x3, - } EU_THREAD_SCHEDULING_MODE; + typedef enum tagEU_THREAD_SCHEDULING_MODE_OVERRIDE { + EU_THREAD_SCHEDULING_MODE_OVERRIDE_HW_DEFAULT = 0x0, + EU_THREAD_SCHEDULING_MODE_OVERRIDE_OLDEST_FIRST = 0x1, + EU_THREAD_SCHEDULING_MODE_OVERRIDE_ROUND_ROBIN = 0x2, + EU_THREAD_SCHEDULING_MODE_OVERRIDE_STALL_BASED_ROUND_ROBIN = 0x3, + } EU_THREAD_SCHEDULING_MODE_OVERRIDE; typedef enum tagMIDTHREAD_PREEMPTION_DELAY_TIMER { MIDTHREAD_PREEMPTION_DELAY_TIMER_MTP_TIMER_VAL_0 = 0x0, MIDTHREAD_PREEMPTION_DELAY_TIMER_MTP_TIMER_VAL_50 = 0x1, @@ -7037,7 +7037,7 @@ typedef struct tagSTATE_COMPUTE_MODE { TheStructure.Common.CommandType = COMMAND_TYPE_GFXPIPE; TheStructure.Common.ZPassAsyncComputeThreadLimit = Z_PASS_ASYNC_COMPUTE_THREAD_LIMIT_MAX_60; TheStructure.Common.AsyncComputeThreadLimit = ASYNC_COMPUTE_THREAD_LIMIT_DISABLED; - TheStructure.Common.EuThreadSchedulingMode = EU_THREAD_SCHEDULING_MODE_HW_DEFAULT; + TheStructure.Common.EuThreadSchedulingModeOverride = EU_THREAD_SCHEDULING_MODE_OVERRIDE_HW_DEFAULT; TheStructure.Common.MidthreadPreemptionDelayTimer = MIDTHREAD_PREEMPTION_DELAY_TIMER_MTP_TIMER_VAL_0; TheStructure.Common.MidthreadPreemptionOverdispatchThreadGroupCount = MIDTHREAD_PREEMPTION_OVERDISPATCH_THREAD_GROUP_COUNT_OD_TG_M2; TheStructure.Common.MidthreadPreemptionOverdispatchTestMode = MIDTHREAD_PREEMPTION_OVERDISPATCH_TEST_MODE_REGULAR; @@ -7076,11 +7076,11 @@ typedef struct tagSTATE_COMPUTE_MODE { inline bool getEnableVariableRegisterSizeAllocationVrt() const { return TheStructure.Common.EnableVariableRegisterSizeAllocation_Vrt; } - inline void setEuThreadSchedulingMode(const EU_THREAD_SCHEDULING_MODE value) { - TheStructure.Common.EuThreadSchedulingMode = value; + inline void setEuThreadSchedulingModeOverride(const EU_THREAD_SCHEDULING_MODE_OVERRIDE value) { + TheStructure.Common.EuThreadSchedulingModeOverride = value; } - inline EU_THREAD_SCHEDULING_MODE getEuThreadSchedulingMode() const { - return static_cast(TheStructure.Common.EuThreadSchedulingMode); + inline EU_THREAD_SCHEDULING_MODE_OVERRIDE getEuThreadSchedulingModeOverride() const { + return static_cast(TheStructure.Common.EuThreadSchedulingModeOverride); } inline void setLargeGrfMode(const bool value) { TheStructure.Common.LargeGrfMode = value; diff --git a/shared/source/generated/xe_hpc_core/hw_cmds_generated_xe_hpc_core.inl b/shared/source/generated/xe_hpc_core/hw_cmds_generated_xe_hpc_core.inl index 4d68443e2f..ff9cbcf322 100644 --- a/shared/source/generated/xe_hpc_core/hw_cmds_generated_xe_hpc_core.inl +++ b/shared/source/generated/xe_hpc_core/hw_cmds_generated_xe_hpc_core.inl @@ -6849,7 +6849,7 @@ typedef struct tagSTATE_COMPUTE_MODE { uint32_t Reserved_42 : BITFIELD_RANGE(10, 10); uint32_t DisableAtomicOnClearData : BITFIELD_RANGE(11, 11); uint32_t Reserved_44 : BITFIELD_RANGE(12, 12); - uint32_t EuThreadSchedulingMode : BITFIELD_RANGE(13, 14); + uint32_t EuThreadSchedulingModeOverride : BITFIELD_RANGE(13, 14); uint32_t LargeGrfMode : BITFIELD_RANGE(15, 15); uint32_t Mask : BITFIELD_RANGE(16, 31); } Common; @@ -6887,12 +6887,12 @@ typedef struct tagSTATE_COMPUTE_MODE { DISABLE_ATOMIC_ON_CLEAR_DATA_ENABLE = 0x0, DISABLE_ATOMIC_ON_CLEAR_DATA_DISABLE = 0x1, } DISABLE_ATOMIC_ON_CLEAR_DATA; - typedef enum tagEU_THREAD_SCHEDULING_MODE { - EU_THREAD_SCHEDULING_MODE_HW_DEFAULT = 0x0, - EU_THREAD_SCHEDULING_MODE_OLDEST_FIRST = 0x1, - EU_THREAD_SCHEDULING_MODE_ROUND_ROBIN = 0x2, - EU_THREAD_SCHEDULING_MODE_STALL_BASED_ROUND_ROBIN = 0x3, - } EU_THREAD_SCHEDULING_MODE; + typedef enum tagEU_THREAD_SCHEDULING_MODE_OVERRIDE { + EU_THREAD_SCHEDULING_MODE_OVERRIDE_HW_DEFAULT = 0x0, + EU_THREAD_SCHEDULING_MODE_OVERRIDE_OLDEST_FIRST = 0x1, + EU_THREAD_SCHEDULING_MODE_OVERRIDE_ROUND_ROBIN = 0x2, + EU_THREAD_SCHEDULING_MODE_OVERRIDE_STALL_BASED_ROUND_ROBIN = 0x3, + } EU_THREAD_SCHEDULING_MODE_OVERRIDE; inline void init() { memset(&TheStructure, 0, sizeof(TheStructure)); TheStructure.Common.DwordLength = DWORD_LENGTH_EXCLUDES_DWORD_0_1; @@ -6904,7 +6904,7 @@ typedef struct tagSTATE_COMPUTE_MODE { TheStructure.Common.FastClearDisabledOnCompressedSurface = FAST_CLEAR_DISABLED_ON_COMPRESSED_SURFACE_ENABLED; TheStructure.Common.DisableSlmReadMergeOptimization = DISABLE_SLM_READ_MERGE_OPTIMIZATION_ENABLED; TheStructure.Common.DisableAtomicOnClearData = DISABLE_ATOMIC_ON_CLEAR_DATA_ENABLE; - TheStructure.Common.EuThreadSchedulingMode = EU_THREAD_SCHEDULING_MODE_HW_DEFAULT; + TheStructure.Common.EuThreadSchedulingModeOverride = EU_THREAD_SCHEDULING_MODE_OVERRIDE_HW_DEFAULT; } static tagSTATE_COMPUTE_MODE sInit() { STATE_COMPUTE_MODE state; @@ -6939,11 +6939,11 @@ typedef struct tagSTATE_COMPUTE_MODE { inline DISABLE_ATOMIC_ON_CLEAR_DATA getDisableAtomicOnClearData() const { return static_cast(TheStructure.Common.DisableAtomicOnClearData); } - inline void setEuThreadSchedulingMode(const EU_THREAD_SCHEDULING_MODE value) { - TheStructure.Common.EuThreadSchedulingMode = value; + inline void setEuThreadSchedulingModeOverride(const EU_THREAD_SCHEDULING_MODE_OVERRIDE value) { + TheStructure.Common.EuThreadSchedulingModeOverride = value; } - inline EU_THREAD_SCHEDULING_MODE getEuThreadSchedulingMode() const { - return static_cast(TheStructure.Common.EuThreadSchedulingMode); + inline EU_THREAD_SCHEDULING_MODE_OVERRIDE getEuThreadSchedulingModeOverride() const { + return static_cast(TheStructure.Common.EuThreadSchedulingModeOverride); } inline void setLargeGrfMode(const bool value) { TheStructure.Common.LargeGrfMode = value; diff --git a/shared/source/xe2_hpg_core/command_encoder_xe2_hpg_core.cpp b/shared/source/xe2_hpg_core/command_encoder_xe2_hpg_core.cpp index 63798b6b6a..8de26d7037 100644 --- a/shared/source/xe2_hpg_core/command_encoder_xe2_hpg_core.cpp +++ b/shared/source/xe2_hpg_core/command_encoder_xe2_hpg_core.cpp @@ -59,16 +59,16 @@ void EncodeComputeMode::programComputeModeCommand(LinearStream &csr, Sta if (properties.threadArbitrationPolicy.isDirty) { switch (properties.threadArbitrationPolicy.value) { case ThreadArbitrationPolicy::RoundRobin: - stateComputeMode.setEuThreadSchedulingMode(STATE_COMPUTE_MODE::EU_THREAD_SCHEDULING_MODE::EU_THREAD_SCHEDULING_MODE_ROUND_ROBIN); + stateComputeMode.setEuThreadSchedulingModeOverride(STATE_COMPUTE_MODE::EU_THREAD_SCHEDULING_MODE_OVERRIDE::EU_THREAD_SCHEDULING_MODE_OVERRIDE_ROUND_ROBIN); break; case ThreadArbitrationPolicy::AgeBased: - stateComputeMode.setEuThreadSchedulingMode(STATE_COMPUTE_MODE::EU_THREAD_SCHEDULING_MODE::EU_THREAD_SCHEDULING_MODE_OLDEST_FIRST); + stateComputeMode.setEuThreadSchedulingModeOverride(STATE_COMPUTE_MODE::EU_THREAD_SCHEDULING_MODE_OVERRIDE::EU_THREAD_SCHEDULING_MODE_OVERRIDE_OLDEST_FIRST); break; case ThreadArbitrationPolicy::RoundRobinAfterDependency: - stateComputeMode.setEuThreadSchedulingMode(STATE_COMPUTE_MODE::EU_THREAD_SCHEDULING_MODE::EU_THREAD_SCHEDULING_MODE_STALL_BASED_ROUND_ROBIN); + stateComputeMode.setEuThreadSchedulingModeOverride(STATE_COMPUTE_MODE::EU_THREAD_SCHEDULING_MODE_OVERRIDE::EU_THREAD_SCHEDULING_MODE_OVERRIDE_STALL_BASED_ROUND_ROBIN); break; default: - stateComputeMode.setEuThreadSchedulingMode(STATE_COMPUTE_MODE::EU_THREAD_SCHEDULING_MODE::EU_THREAD_SCHEDULING_MODE_HW_DEFAULT); + stateComputeMode.setEuThreadSchedulingModeOverride(STATE_COMPUTE_MODE::EU_THREAD_SCHEDULING_MODE_OVERRIDE::EU_THREAD_SCHEDULING_MODE_OVERRIDE_HW_DEFAULT); } maskBits |= Family::stateComputeModeEuThreadSchedulingModeOverrideMask; } diff --git a/shared/source/xe3_core/command_encoder_xe3_core.cpp b/shared/source/xe3_core/command_encoder_xe3_core.cpp index 466b71c408..372c40e560 100644 --- a/shared/source/xe3_core/command_encoder_xe3_core.cpp +++ b/shared/source/xe3_core/command_encoder_xe3_core.cpp @@ -35,16 +35,16 @@ void EncodeComputeMode::programComputeModeCommand(LinearStream &csr, Sta if (properties.threadArbitrationPolicy.isDirty) { switch (properties.threadArbitrationPolicy.value) { case ThreadArbitrationPolicy::RoundRobin: - stateComputeMode.setEuThreadSchedulingMode(STATE_COMPUTE_MODE::EU_THREAD_SCHEDULING_MODE::EU_THREAD_SCHEDULING_MODE_ROUND_ROBIN); + stateComputeMode.setEuThreadSchedulingModeOverride(STATE_COMPUTE_MODE::EU_THREAD_SCHEDULING_MODE_OVERRIDE::EU_THREAD_SCHEDULING_MODE_OVERRIDE_ROUND_ROBIN); break; case ThreadArbitrationPolicy::AgeBased: - stateComputeMode.setEuThreadSchedulingMode(STATE_COMPUTE_MODE::EU_THREAD_SCHEDULING_MODE::EU_THREAD_SCHEDULING_MODE_OLDEST_FIRST); + stateComputeMode.setEuThreadSchedulingModeOverride(STATE_COMPUTE_MODE::EU_THREAD_SCHEDULING_MODE_OVERRIDE::EU_THREAD_SCHEDULING_MODE_OVERRIDE_OLDEST_FIRST); break; case ThreadArbitrationPolicy::RoundRobinAfterDependency: - stateComputeMode.setEuThreadSchedulingMode(STATE_COMPUTE_MODE::EU_THREAD_SCHEDULING_MODE::EU_THREAD_SCHEDULING_MODE_STALL_BASED_ROUND_ROBIN); + stateComputeMode.setEuThreadSchedulingModeOverride(STATE_COMPUTE_MODE::EU_THREAD_SCHEDULING_MODE_OVERRIDE::EU_THREAD_SCHEDULING_MODE_OVERRIDE_STALL_BASED_ROUND_ROBIN); break; default: - stateComputeMode.setEuThreadSchedulingMode(STATE_COMPUTE_MODE::EU_THREAD_SCHEDULING_MODE::EU_THREAD_SCHEDULING_MODE_HW_DEFAULT); + stateComputeMode.setEuThreadSchedulingModeOverride(STATE_COMPUTE_MODE::EU_THREAD_SCHEDULING_MODE_OVERRIDE::EU_THREAD_SCHEDULING_MODE_OVERRIDE_HW_DEFAULT); } maskBits |= Family::stateComputeModeEuThreadSchedulingModeOverrideMask; } diff --git a/shared/source/xe_hpc_core/command_encoder_xe_hpc_core.cpp b/shared/source/xe_hpc_core/command_encoder_xe_hpc_core.cpp index 279344343d..5c72888356 100644 --- a/shared/source/xe_hpc_core/command_encoder_xe_hpc_core.cpp +++ b/shared/source/xe_hpc_core/command_encoder_xe_hpc_core.cpp @@ -45,16 +45,16 @@ void EncodeComputeMode::programComputeModeCommand(LinearStream &csr, Sta if (properties.threadArbitrationPolicy.isDirty) { switch (properties.threadArbitrationPolicy.value) { case ThreadArbitrationPolicy::RoundRobin: - stateComputeMode.setEuThreadSchedulingMode(STATE_COMPUTE_MODE::EU_THREAD_SCHEDULING_MODE::EU_THREAD_SCHEDULING_MODE_ROUND_ROBIN); + stateComputeMode.setEuThreadSchedulingModeOverride(STATE_COMPUTE_MODE::EU_THREAD_SCHEDULING_MODE_OVERRIDE::EU_THREAD_SCHEDULING_MODE_OVERRIDE_ROUND_ROBIN); break; case ThreadArbitrationPolicy::AgeBased: - stateComputeMode.setEuThreadSchedulingMode(STATE_COMPUTE_MODE::EU_THREAD_SCHEDULING_MODE::EU_THREAD_SCHEDULING_MODE_OLDEST_FIRST); + stateComputeMode.setEuThreadSchedulingModeOverride(STATE_COMPUTE_MODE::EU_THREAD_SCHEDULING_MODE_OVERRIDE::EU_THREAD_SCHEDULING_MODE_OVERRIDE_OLDEST_FIRST); break; case ThreadArbitrationPolicy::RoundRobinAfterDependency: - stateComputeMode.setEuThreadSchedulingMode(STATE_COMPUTE_MODE::EU_THREAD_SCHEDULING_MODE::EU_THREAD_SCHEDULING_MODE_STALL_BASED_ROUND_ROBIN); + stateComputeMode.setEuThreadSchedulingModeOverride(STATE_COMPUTE_MODE::EU_THREAD_SCHEDULING_MODE_OVERRIDE::EU_THREAD_SCHEDULING_MODE_OVERRIDE_STALL_BASED_ROUND_ROBIN); break; default: - stateComputeMode.setEuThreadSchedulingMode(STATE_COMPUTE_MODE::EU_THREAD_SCHEDULING_MODE::EU_THREAD_SCHEDULING_MODE_HW_DEFAULT); + stateComputeMode.setEuThreadSchedulingModeOverride(STATE_COMPUTE_MODE::EU_THREAD_SCHEDULING_MODE_OVERRIDE::EU_THREAD_SCHEDULING_MODE_OVERRIDE_HW_DEFAULT); } maskBits |= Family::stateComputeModeEuThreadSchedulingModeOverrideMask; } diff --git a/shared/test/common/helpers/unit_test_helper_xe_hpc_and_later.inl b/shared/test/common/helpers/unit_test_helper_xe_hpc_and_later.inl index b8f2ac0c04..6959289685 100644 --- a/shared/test/common/helpers/unit_test_helper_xe_hpc_and_later.inl +++ b/shared/test/common/helpers/unit_test_helper_xe_hpc_and_later.inl @@ -19,13 +19,13 @@ uint32_t UnitTestHelper::getAppropriateThreadArbitrationPolicy(int32_ using STATE_COMPUTE_MODE = typename GfxFamily::STATE_COMPUTE_MODE; switch (policy) { case ThreadArbitrationPolicy::RoundRobin: - return STATE_COMPUTE_MODE::EU_THREAD_SCHEDULING_MODE::EU_THREAD_SCHEDULING_MODE_ROUND_ROBIN; + return STATE_COMPUTE_MODE::EU_THREAD_SCHEDULING_MODE_OVERRIDE::EU_THREAD_SCHEDULING_MODE_OVERRIDE_ROUND_ROBIN; case ThreadArbitrationPolicy::AgeBased: - return STATE_COMPUTE_MODE::EU_THREAD_SCHEDULING_MODE::EU_THREAD_SCHEDULING_MODE_OLDEST_FIRST; + return STATE_COMPUTE_MODE::EU_THREAD_SCHEDULING_MODE_OVERRIDE::EU_THREAD_SCHEDULING_MODE_OVERRIDE_OLDEST_FIRST; case ThreadArbitrationPolicy::RoundRobinAfterDependency: - return STATE_COMPUTE_MODE::EU_THREAD_SCHEDULING_MODE::EU_THREAD_SCHEDULING_MODE_STALL_BASED_ROUND_ROBIN; + return STATE_COMPUTE_MODE::EU_THREAD_SCHEDULING_MODE_OVERRIDE::EU_THREAD_SCHEDULING_MODE_OVERRIDE_STALL_BASED_ROUND_ROBIN; default: - return STATE_COMPUTE_MODE::EU_THREAD_SCHEDULING_MODE::EU_THREAD_SCHEDULING_MODE_HW_DEFAULT; + return STATE_COMPUTE_MODE::EU_THREAD_SCHEDULING_MODE_OVERRIDE::EU_THREAD_SCHEDULING_MODE_OVERRIDE_HW_DEFAULT; } } diff --git a/shared/test/unit_test/xe2_hpg_core/compute_mode_tests_xe2_hpg_core.cpp b/shared/test/unit_test/xe2_hpg_core/compute_mode_tests_xe2_hpg_core.cpp index 78877a9ff6..7bc6478803 100644 --- a/shared/test/unit_test/xe2_hpg_core/compute_mode_tests_xe2_hpg_core.cpp +++ b/shared/test/unit_test/xe2_hpg_core/compute_mode_tests_xe2_hpg_core.cpp @@ -36,11 +36,11 @@ XE2_HPG_CORETEST_F(ComputeModeRequirementsXe2HpgCore, givenNewRequiredThreadArbi LinearStream stream(buff, 1024); auto &gfxCoreHelper = device->getGfxCoreHelper(); auto newEuThreadSchedulingMode = gfxCoreHelper.getDefaultThreadArbitrationPolicy(); - typename STATE_COMPUTE_MODE::EU_THREAD_SCHEDULING_MODE expectedEuThreadSchedulingMode = static_cast(UnitTestHelper::getAppropriateThreadArbitrationPolicy(newEuThreadSchedulingMode)); + typename STATE_COMPUTE_MODE::EU_THREAD_SCHEDULING_MODE_OVERRIDE expectedEuThreadSchedulingMode = static_cast(UnitTestHelper::getAppropriateThreadArbitrationPolicy(newEuThreadSchedulingMode)); auto expectedScmCmd = FamilyType::cmdInitStateComputeMode; expectedScmCmd.setMask1(FamilyType::stateComputeModeLargeGrfModeMask | FamilyType::stateComputeModeEuThreadSchedulingModeOverrideMask); - expectedScmCmd.setEuThreadSchedulingMode(expectedEuThreadSchedulingMode); + expectedScmCmd.setEuThreadSchedulingModeOverride(expectedEuThreadSchedulingMode); overrideComputeModeRequest(false, false, false, true, true); getCsrHw()->programComputeMode(stream, flags, *defaultHwInfo); @@ -49,7 +49,7 @@ XE2_HPG_CORETEST_F(ComputeModeRequirementsXe2HpgCore, givenNewRequiredThreadArbi auto scmCmd = reinterpret_cast(stream.getCpuBase()); EXPECT_TRUE(memcmp(&expectedScmCmd, scmCmd, sizeof(STATE_COMPUTE_MODE)) == 0); - EXPECT_EQ(expectedEuThreadSchedulingMode, static_cast(stream.getCpuBase())->getEuThreadSchedulingMode()); + EXPECT_EQ(expectedEuThreadSchedulingMode, static_cast(stream.getCpuBase())->getEuThreadSchedulingModeOverride()); } XE2_HPG_CORETEST_F(ComputeModeRequirementsXe2HpgCore, givenRequiredThreadArbitrationPolicyAlreadySetWhenComputeModeIsProgrammedThenStateComputeIsNotProgrammedAgain) { @@ -69,7 +69,7 @@ XE2_HPG_CORETEST_F(ComputeModeRequirementsXe2HpgCore, givenRequiredThreadArbitra auto scmCmd = reinterpret_cast(stream.getCpuBase()); EXPECT_FALSE(memcmp(&expectedScmCmd, scmCmd, sizeof(STATE_COMPUTE_MODE)) == 0); - EXPECT_NE(STATE_COMPUTE_MODE::EU_THREAD_SCHEDULING_MODE::EU_THREAD_SCHEDULING_MODE_ROUND_ROBIN, static_cast(stream.getCpuBase())->getEuThreadSchedulingMode()); + EXPECT_NE(STATE_COMPUTE_MODE::EU_THREAD_SCHEDULING_MODE_OVERRIDE::EU_THREAD_SCHEDULING_MODE_OVERRIDE_ROUND_ROBIN, static_cast(stream.getCpuBase())->getEuThreadSchedulingModeOverride()); } XE2_HPG_CORETEST_F(ComputeModeRequirementsXe2HpgCore, givenCoherencyWithoutSharedHandlesWhenCommandSizeIsCalculatedThenCorrectCommandSizeIsReturned) { @@ -209,7 +209,7 @@ XE2_HPG_CORETEST_F(ComputeModeRequirementsXe2HpgCore, givenComputeModeProgrammin auto expectedScmCmd = FamilyType::cmdInitStateComputeMode; expectedScmCmd.setLargeGrfMode(true); - expectedScmCmd.setEuThreadSchedulingMode(STATE_COMPUTE_MODE::EU_THREAD_SCHEDULING_MODE_STALL_BASED_ROUND_ROBIN); + expectedScmCmd.setEuThreadSchedulingModeOverride(STATE_COMPUTE_MODE::EU_THREAD_SCHEDULING_MODE_OVERRIDE_STALL_BASED_ROUND_ROBIN); expectedScmCmd.setMask1(FamilyType::stateComputeModeLargeGrfModeMask | FamilyType::stateComputeModeEuThreadSchedulingModeOverrideMask); overrideComputeModeRequest(false, false, false, true, true, 256u); @@ -227,7 +227,7 @@ XE2_HPG_CORETEST_F(ComputeModeRequirementsXe2HpgCore, givenComputeModeProgrammin expectedScmCmd = FamilyType::cmdInitStateComputeMode; expectedScmCmd.setLargeGrfMode(false); - expectedScmCmd.setEuThreadSchedulingMode(STATE_COMPUTE_MODE::EU_THREAD_SCHEDULING_MODE_STALL_BASED_ROUND_ROBIN); + expectedScmCmd.setEuThreadSchedulingModeOverride(STATE_COMPUTE_MODE::EU_THREAD_SCHEDULING_MODE_OVERRIDE_STALL_BASED_ROUND_ROBIN); expectedScmCmd.setMask1(FamilyType::stateComputeModeLargeGrfModeMask | FamilyType::stateComputeModeEuThreadSchedulingModeOverrideMask); scmCmd = reinterpret_cast(ptrOffset(stream.getCpuBase(), startOffset)); EXPECT_TRUE(memcmp(&expectedScmCmd, scmCmd, sizeof(STATE_COMPUTE_MODE)) == 0); @@ -243,7 +243,7 @@ XE2_HPG_CORETEST_F(ComputeModeRequirementsXe2HpgCore, givenComputeModeProgrammin auto expectedScmCmd = FamilyType::cmdInitStateComputeMode; expectedScmCmd.setLargeGrfMode(false); - expectedScmCmd.setEuThreadSchedulingMode(STATE_COMPUTE_MODE::EU_THREAD_SCHEDULING_MODE_STALL_BASED_ROUND_ROBIN); + expectedScmCmd.setEuThreadSchedulingModeOverride(STATE_COMPUTE_MODE::EU_THREAD_SCHEDULING_MODE_OVERRIDE_STALL_BASED_ROUND_ROBIN); expectedScmCmd.setMask1(FamilyType::stateComputeModeLargeGrfModeMask | FamilyType::stateComputeModeEuThreadSchedulingModeOverrideMask); overrideComputeModeRequest(false, false, false, true, true, 127u); diff --git a/shared/test/unit_test/xe2_hpg_core/test_encode_xe2_hpg_core.cpp b/shared/test/unit_test/xe2_hpg_core/test_encode_xe2_hpg_core.cpp index 27a8b0058e..777ad11509 100644 --- a/shared/test/unit_test/xe2_hpg_core/test_encode_xe2_hpg_core.cpp +++ b/shared/test/unit_test/xe2_hpg_core/test_encode_xe2_hpg_core.cpp @@ -209,7 +209,7 @@ XE2_HPG_CORETEST_F(CommandEncodeXe2HpgCoreTest, givenOffsetWhenProgrammingStateP XE2_HPG_CORETEST_F(CommandEncodeXe2HpgCoreTest, whenProgrammingStateComputeModeThenProperFieldsAreSet) { using STATE_COMPUTE_MODE = typename FamilyType::STATE_COMPUTE_MODE; - using EU_THREAD_SCHEDULING_MODE = typename STATE_COMPUTE_MODE::EU_THREAD_SCHEDULING_MODE; + using EU_THREAD_SCHEDULING_MODE_OVERRIDE = typename STATE_COMPUTE_MODE::EU_THREAD_SCHEDULING_MODE_OVERRIDE; uint8_t buffer[64]{}; MockExecutionEnvironment executionEnvironment{}; @@ -222,7 +222,7 @@ XE2_HPG_CORETEST_F(CommandEncodeXe2HpgCoreTest, whenProgrammingStateComputeModeT EXPECT_EQ(0u, pScm->getMask1()); EXPECT_EQ(0u, pScm->getMask2()); EXPECT_FALSE(pScm->getMemoryAllocationForScratchAndMidthreadPreemptionBuffers()); - EXPECT_EQ(EU_THREAD_SCHEDULING_MODE::EU_THREAD_SCHEDULING_MODE_HW_DEFAULT, pScm->getEuThreadSchedulingMode()); + EXPECT_EQ(EU_THREAD_SCHEDULING_MODE_OVERRIDE::EU_THREAD_SCHEDULING_MODE_OVERRIDE_HW_DEFAULT, pScm->getEuThreadSchedulingModeOverride()); EXPECT_FALSE(pScm->getLargeGrfMode()); properties.memoryAllocationForScratchAndMidthreadPreemptionBuffers.value = 1; @@ -234,7 +234,7 @@ XE2_HPG_CORETEST_F(CommandEncodeXe2HpgCoreTest, whenProgrammingStateComputeModeT EXPECT_EQ(0u, pScm->getMask1()); EXPECT_EQ(0u, pScm->getMask2()); EXPECT_FALSE(pScm->getMemoryAllocationForScratchAndMidthreadPreemptionBuffers()); - EXPECT_EQ(EU_THREAD_SCHEDULING_MODE::EU_THREAD_SCHEDULING_MODE_HW_DEFAULT, pScm->getEuThreadSchedulingMode()); + EXPECT_EQ(EU_THREAD_SCHEDULING_MODE_OVERRIDE::EU_THREAD_SCHEDULING_MODE_OVERRIDE_HW_DEFAULT, pScm->getEuThreadSchedulingModeOverride()); EXPECT_FALSE(pScm->getLargeGrfMode()); properties.memoryAllocationForScratchAndMidthreadPreemptionBuffers.isDirty = true; @@ -247,13 +247,13 @@ XE2_HPG_CORETEST_F(CommandEncodeXe2HpgCoreTest, whenProgrammingStateComputeModeT EXPECT_EQ(expectedMask, pScm->getMask1()); EXPECT_EQ(FamilyType::stateComputeModeMemoryAllocationForScratchAndMidthreadPreemptionBuffersMask, pScm->getMask2()); EXPECT_TRUE(pScm->getMemoryAllocationForScratchAndMidthreadPreemptionBuffers()); - EXPECT_EQ(EU_THREAD_SCHEDULING_MODE::EU_THREAD_SCHEDULING_MODE_ROUND_ROBIN, pScm->getEuThreadSchedulingMode()); + EXPECT_EQ(EU_THREAD_SCHEDULING_MODE_OVERRIDE::EU_THREAD_SCHEDULING_MODE_OVERRIDE_ROUND_ROBIN, pScm->getEuThreadSchedulingModeOverride()); EXPECT_TRUE(pScm->getLargeGrfMode()); } XE2_HPG_CORETEST_F(CommandEncodeXe2HpgCoreTest, whenAdjustComputeModeIsCalledThenCorrectPolicyIsProgrammed) { using STATE_COMPUTE_MODE = typename FamilyType::STATE_COMPUTE_MODE; - using EU_THREAD_SCHEDULING_MODE = typename STATE_COMPUTE_MODE::EU_THREAD_SCHEDULING_MODE; + using EU_THREAD_SCHEDULING_MODE_OVERRIDE = typename STATE_COMPUTE_MODE::EU_THREAD_SCHEDULING_MODE_OVERRIDE; uint8_t buffer[64]{}; StreamProperties properties{}; @@ -266,25 +266,25 @@ XE2_HPG_CORETEST_F(CommandEncodeXe2HpgCoreTest, whenAdjustComputeModeIsCalledThe properties.stateComputeMode.setPropertiesAll(false, 0, ThreadArbitrationPolicy::AgeBased, PreemptionMode::Disabled); EncodeComputeMode::programComputeModeCommand(*pLinearStream, properties.stateComputeMode, rootDeviceEnvironment); auto pScm = reinterpret_cast(pLinearStream->getCpuBase()); - EXPECT_EQ(EU_THREAD_SCHEDULING_MODE::EU_THREAD_SCHEDULING_MODE_OLDEST_FIRST, pScm->getEuThreadSchedulingMode()); + EXPECT_EQ(EU_THREAD_SCHEDULING_MODE_OVERRIDE::EU_THREAD_SCHEDULING_MODE_OVERRIDE_OLDEST_FIRST, pScm->getEuThreadSchedulingModeOverride()); pLinearStream = std::make_unique(buffer, sizeof(buffer)); properties.stateComputeMode.setPropertiesAll(false, 0, ThreadArbitrationPolicy::RoundRobin, PreemptionMode::Disabled); EncodeComputeMode::programComputeModeCommand(*pLinearStream, properties.stateComputeMode, rootDeviceEnvironment); pScm = reinterpret_cast(pLinearStream->getCpuBase()); - EXPECT_EQ(EU_THREAD_SCHEDULING_MODE::EU_THREAD_SCHEDULING_MODE_ROUND_ROBIN, pScm->getEuThreadSchedulingMode()); + EXPECT_EQ(EU_THREAD_SCHEDULING_MODE_OVERRIDE::EU_THREAD_SCHEDULING_MODE_OVERRIDE_ROUND_ROBIN, pScm->getEuThreadSchedulingModeOverride()); pLinearStream = std::make_unique(buffer, sizeof(buffer)); properties.stateComputeMode.setPropertiesAll(false, 0, ThreadArbitrationPolicy::RoundRobinAfterDependency, PreemptionMode::Disabled); EncodeComputeMode::programComputeModeCommand(*pLinearStream, properties.stateComputeMode, rootDeviceEnvironment); pScm = reinterpret_cast(pLinearStream->getCpuBase()); - EXPECT_EQ(EU_THREAD_SCHEDULING_MODE::EU_THREAD_SCHEDULING_MODE_STALL_BASED_ROUND_ROBIN, pScm->getEuThreadSchedulingMode()); + EXPECT_EQ(EU_THREAD_SCHEDULING_MODE_OVERRIDE::EU_THREAD_SCHEDULING_MODE_OVERRIDE_STALL_BASED_ROUND_ROBIN, pScm->getEuThreadSchedulingModeOverride()); pLinearStream = std::make_unique(buffer, sizeof(buffer)); properties.stateComputeMode.setPropertiesAll(false, 0, ThreadArbitrationPolicy::NotPresent, PreemptionMode::Disabled); EncodeComputeMode::programComputeModeCommand(*pLinearStream, properties.stateComputeMode, rootDeviceEnvironment); pScm = reinterpret_cast(pLinearStream->getCpuBase()); - EXPECT_EQ(EU_THREAD_SCHEDULING_MODE::EU_THREAD_SCHEDULING_MODE_HW_DEFAULT, pScm->getEuThreadSchedulingMode()); + EXPECT_EQ(EU_THREAD_SCHEDULING_MODE_OVERRIDE::EU_THREAD_SCHEDULING_MODE_OVERRIDE_HW_DEFAULT, pScm->getEuThreadSchedulingModeOverride()); } using EncodeKernelXe2HpgCoreTest = Test; diff --git a/shared/test/unit_test/xe3_core/compute_mode_tests_xe3_core.cpp b/shared/test/unit_test/xe3_core/compute_mode_tests_xe3_core.cpp index 3ab2c1a15e..33d0362c33 100644 --- a/shared/test/unit_test/xe3_core/compute_mode_tests_xe3_core.cpp +++ b/shared/test/unit_test/xe3_core/compute_mode_tests_xe3_core.cpp @@ -41,11 +41,11 @@ XE3_CORETEST_F(ComputeModeRequirementsXe3Core, givenNewRequiredThreadArbitration LinearStream stream(buff, 1024); auto &gfxCoreHelper = device->getGfxCoreHelper(); auto newEuThreadSchedulingMode = gfxCoreHelper.getDefaultThreadArbitrationPolicy(); - typename STATE_COMPUTE_MODE::EU_THREAD_SCHEDULING_MODE expectedEuThreadSchedulingMode = static_cast(UnitTestHelper::getAppropriateThreadArbitrationPolicy(newEuThreadSchedulingMode)); + typename STATE_COMPUTE_MODE::EU_THREAD_SCHEDULING_MODE_OVERRIDE expectedEuThreadSchedulingMode = static_cast(UnitTestHelper::getAppropriateThreadArbitrationPolicy(newEuThreadSchedulingMode)); auto expectedScmCmd = FamilyType::cmdInitStateComputeMode; expectedScmCmd.setMask1(FamilyType::stateComputeModeLargeGrfModeMask | FamilyType::stateComputeModeEuThreadSchedulingModeOverrideMask); - expectedScmCmd.setEuThreadSchedulingMode(expectedEuThreadSchedulingMode); + expectedScmCmd.setEuThreadSchedulingModeOverride(expectedEuThreadSchedulingMode); overrideComputeModeRequest(false, false, false, true, true); getCsrHw()->programComputeMode(stream, flags, *defaultHwInfo); @@ -54,7 +54,7 @@ XE3_CORETEST_F(ComputeModeRequirementsXe3Core, givenNewRequiredThreadArbitration auto scmCmd = reinterpret_cast(stream.getCpuBase()); EXPECT_TRUE(memcmp(&expectedScmCmd, scmCmd, sizeof(STATE_COMPUTE_MODE)) == 0); - EXPECT_EQ(expectedEuThreadSchedulingMode, static_cast(stream.getCpuBase())->getEuThreadSchedulingMode()); + EXPECT_EQ(expectedEuThreadSchedulingMode, static_cast(stream.getCpuBase())->getEuThreadSchedulingModeOverride()); } XE3_CORETEST_F(ComputeModeRequirementsXe3Core, givenCoherencyWithoutSharedHandlesWhenCommandSizeIsCalculatedThenCorrectCommandSizeIsReturned) { @@ -194,7 +194,7 @@ XE3_CORETEST_F(ComputeModeRequirementsXe3Core, givenComputeModeProgrammingWhenLa auto expectedScmCmd = FamilyType::cmdInitStateComputeMode; expectedScmCmd.setLargeGrfMode(true); - expectedScmCmd.setEuThreadSchedulingMode(STATE_COMPUTE_MODE::EU_THREAD_SCHEDULING_MODE_STALL_BASED_ROUND_ROBIN); + expectedScmCmd.setEuThreadSchedulingModeOverride(STATE_COMPUTE_MODE::EU_THREAD_SCHEDULING_MODE_OVERRIDE_STALL_BASED_ROUND_ROBIN); expectedScmCmd.setMask1(FamilyType::stateComputeModeLargeGrfModeMask | FamilyType::stateComputeModeEuThreadSchedulingModeOverrideMask); overrideComputeModeRequest(false, false, false, true, true, 256u); @@ -212,7 +212,7 @@ XE3_CORETEST_F(ComputeModeRequirementsXe3Core, givenComputeModeProgrammingWhenLa expectedScmCmd = FamilyType::cmdInitStateComputeMode; expectedScmCmd.setLargeGrfMode(false); - expectedScmCmd.setEuThreadSchedulingMode(STATE_COMPUTE_MODE::EU_THREAD_SCHEDULING_MODE_STALL_BASED_ROUND_ROBIN); + expectedScmCmd.setEuThreadSchedulingModeOverride(STATE_COMPUTE_MODE::EU_THREAD_SCHEDULING_MODE_OVERRIDE_STALL_BASED_ROUND_ROBIN); expectedScmCmd.setMask1(FamilyType::stateComputeModeLargeGrfModeMask | FamilyType::stateComputeModeEuThreadSchedulingModeOverrideMask); scmCmd = reinterpret_cast(ptrOffset(stream.getCpuBase(), startOffset)); EXPECT_TRUE(memcmp(&expectedScmCmd, scmCmd, sizeof(STATE_COMPUTE_MODE)) == 0); diff --git a/shared/test/unit_test/xe_hpc_core/compute_mode_tests_xe_hpc_core.cpp b/shared/test/unit_test/xe_hpc_core/compute_mode_tests_xe_hpc_core.cpp index 7be6ffd203..ec9e974bba 100644 --- a/shared/test/unit_test/xe_hpc_core/compute_mode_tests_xe_hpc_core.cpp +++ b/shared/test/unit_test/xe_hpc_core/compute_mode_tests_xe_hpc_core.cpp @@ -27,19 +27,19 @@ using XeHpcComputeModeRequirements = ComputeModeRequirements; HWTEST2_F(XeHpcComputeModeRequirements, givenNewRequiredThreadArbitrationPolicyWhenComputeModeIsProgrammedThenStateComputeIsProgrammedAgain, IsXeHpcCore) { setUpImpl(); using STATE_COMPUTE_MODE = typename FamilyType::STATE_COMPUTE_MODE; - using EU_THREAD_SCHEDULING_MODE = typename STATE_COMPUTE_MODE::EU_THREAD_SCHEDULING_MODE; + using EU_THREAD_SCHEDULING_MODE_OVERRIDE = typename STATE_COMPUTE_MODE::EU_THREAD_SCHEDULING_MODE_OVERRIDE; auto cmdsSize = sizeof(STATE_COMPUTE_MODE); char buff[1024] = {0}; LinearStream stream(buff, 1024); auto &gfxCoreHelper = device->getGfxCoreHelper(); auto newEuThreadSchedulingMode = gfxCoreHelper.getDefaultThreadArbitrationPolicy(); - auto expectedEuThreadSchedulingMode = static_cast(UnitTestHelper::getAppropriateThreadArbitrationPolicy(newEuThreadSchedulingMode)); + auto expectedEuThreadSchedulingMode = static_cast(UnitTestHelper::getAppropriateThreadArbitrationPolicy(newEuThreadSchedulingMode)); auto expectedScmCmd = FamilyType::cmdInitStateComputeMode; expectedScmCmd.setForceNonCoherent(STATE_COMPUTE_MODE::FORCE_NON_COHERENT_FORCE_GPU_NON_COHERENT); expectedScmCmd.setMaskBits(FamilyType::stateComputeModeForceNonCoherentMask | FamilyType::stateComputeModeLargeGrfModeMask | FamilyType::stateComputeModeEuThreadSchedulingModeOverrideMask); - expectedScmCmd.setEuThreadSchedulingMode(expectedEuThreadSchedulingMode); + expectedScmCmd.setEuThreadSchedulingModeOverride(expectedEuThreadSchedulingMode); overrideComputeModeRequest(true, false, false, true, true); getCsrHw()->programComputeMode(stream, flags, *defaultHwInfo); @@ -48,7 +48,7 @@ HWTEST2_F(XeHpcComputeModeRequirements, givenNewRequiredThreadArbitrationPolicyW auto scmCmd = reinterpret_cast(stream.getCpuBase()); EXPECT_TRUE(memcmp(&expectedScmCmd, scmCmd, sizeof(STATE_COMPUTE_MODE)) == 0); - EXPECT_EQ(expectedEuThreadSchedulingMode, static_cast(stream.getCpuBase())->getEuThreadSchedulingMode()); + EXPECT_EQ(expectedEuThreadSchedulingMode, static_cast(stream.getCpuBase())->getEuThreadSchedulingModeOverride()); } HWTEST2_F(XeHpcComputeModeRequirements, givenRequiredThreadArbitrationPolicyAlreadySetWhenComputeModeIsProgrammedThenStateComputeIsNotProgrammedAgain, IsXeHpcCore) { @@ -69,7 +69,7 @@ HWTEST2_F(XeHpcComputeModeRequirements, givenRequiredThreadArbitrationPolicyAlre auto scmCmd = reinterpret_cast(stream.getCpuBase()); EXPECT_FALSE(memcmp(&expectedScmCmd, scmCmd, sizeof(STATE_COMPUTE_MODE)) == 0); - EXPECT_NE(STATE_COMPUTE_MODE::EU_THREAD_SCHEDULING_MODE::EU_THREAD_SCHEDULING_MODE_ROUND_ROBIN, static_cast(stream.getCpuBase())->getEuThreadSchedulingMode()); + EXPECT_NE(STATE_COMPUTE_MODE::EU_THREAD_SCHEDULING_MODE_OVERRIDE::EU_THREAD_SCHEDULING_MODE_OVERRIDE_ROUND_ROBIN, static_cast(stream.getCpuBase())->getEuThreadSchedulingModeOverride()); } HWTEST2_F(XeHpcComputeModeRequirements, givenCoherencyWithoutSharedHandlesWhenCommandSizeIsCalculatedThenCorrectCommandSizeIsReturned, IsXeHpcCore) { @@ -213,7 +213,7 @@ HWTEST2_F(XeHpcComputeModeRequirements, givenCoherencyWithoutSharedHandlesWhenCo auto expectedScmCmd = FamilyType::cmdInitStateComputeMode; expectedScmCmd.setForceNonCoherent(STATE_COMPUTE_MODE::FORCE_NON_COHERENT_FORCE_GPU_NON_COHERENT); - expectedScmCmd.setEuThreadSchedulingMode(STATE_COMPUTE_MODE::EU_THREAD_SCHEDULING_MODE_STALL_BASED_ROUND_ROBIN); + expectedScmCmd.setEuThreadSchedulingModeOverride(STATE_COMPUTE_MODE::EU_THREAD_SCHEDULING_MODE_OVERRIDE_STALL_BASED_ROUND_ROBIN); expectedScmCmd.setMaskBits(FamilyType::stateComputeModeForceNonCoherentMask | FamilyType::stateComputeModeLargeGrfModeMask | FamilyType::stateComputeModeEuThreadSchedulingModeOverrideMask); @@ -232,7 +232,7 @@ HWTEST2_F(XeHpcComputeModeRequirements, givenCoherencyWithoutSharedHandlesWhenCo expectedScmCmd = FamilyType::cmdInitStateComputeMode; expectedScmCmd.setForceNonCoherent(STATE_COMPUTE_MODE::FORCE_NON_COHERENT_FORCE_DISABLED); - expectedScmCmd.setEuThreadSchedulingMode(STATE_COMPUTE_MODE::EU_THREAD_SCHEDULING_MODE_STALL_BASED_ROUND_ROBIN); + expectedScmCmd.setEuThreadSchedulingModeOverride(STATE_COMPUTE_MODE::EU_THREAD_SCHEDULING_MODE_OVERRIDE_STALL_BASED_ROUND_ROBIN); expectedScmCmd.setMaskBits(FamilyType::stateComputeModeForceNonCoherentMask | FamilyType::stateComputeModeLargeGrfModeMask | FamilyType::stateComputeModeEuThreadSchedulingModeOverrideMask); scmCmd = reinterpret_cast(ptrOffset(stream.getCpuBase(), startOffset)); @@ -250,7 +250,7 @@ HWTEST2_F(XeHpcComputeModeRequirements, givenCoherencyWithSharedHandlesWhenCompu auto expectedScmCmd = FamilyType::cmdInitStateComputeMode; expectedScmCmd.setForceNonCoherent(STATE_COMPUTE_MODE::FORCE_NON_COHERENT_FORCE_GPU_NON_COHERENT); - expectedScmCmd.setEuThreadSchedulingMode(STATE_COMPUTE_MODE::EU_THREAD_SCHEDULING_MODE_STALL_BASED_ROUND_ROBIN); + expectedScmCmd.setEuThreadSchedulingModeOverride(STATE_COMPUTE_MODE::EU_THREAD_SCHEDULING_MODE_OVERRIDE_STALL_BASED_ROUND_ROBIN); expectedScmCmd.setMaskBits(FamilyType::stateComputeModeForceNonCoherentMask | FamilyType::stateComputeModeLargeGrfModeMask | FamilyType::stateComputeModeEuThreadSchedulingModeOverrideMask); @@ -274,7 +274,7 @@ HWTEST2_F(XeHpcComputeModeRequirements, givenCoherencyWithSharedHandlesWhenCompu expectedScmCmd = FamilyType::cmdInitStateComputeMode; expectedScmCmd.setForceNonCoherent(STATE_COMPUTE_MODE::FORCE_NON_COHERENT_FORCE_DISABLED); - expectedScmCmd.setEuThreadSchedulingMode(STATE_COMPUTE_MODE::EU_THREAD_SCHEDULING_MODE_STALL_BASED_ROUND_ROBIN); + expectedScmCmd.setEuThreadSchedulingModeOverride(STATE_COMPUTE_MODE::EU_THREAD_SCHEDULING_MODE_OVERRIDE_STALL_BASED_ROUND_ROBIN); expectedScmCmd.setMaskBits(FamilyType::stateComputeModeForceNonCoherentMask | FamilyType::stateComputeModeLargeGrfModeMask | FamilyType::stateComputeModeEuThreadSchedulingModeOverrideMask); scmCmd = reinterpret_cast(ptrOffset(stream.getCpuBase(), startOffset)); @@ -295,7 +295,7 @@ HWTEST2_F(XeHpcComputeModeRequirements, givenComputeModeProgrammingWhenLargeGrfM auto expectedScmCmd = FamilyType::cmdInitStateComputeMode; expectedScmCmd.setLargeGrfMode(true); expectedScmCmd.setForceNonCoherent(STATE_COMPUTE_MODE::FORCE_NON_COHERENT_FORCE_GPU_NON_COHERENT); - expectedScmCmd.setEuThreadSchedulingMode(STATE_COMPUTE_MODE::EU_THREAD_SCHEDULING_MODE_STALL_BASED_ROUND_ROBIN); + expectedScmCmd.setEuThreadSchedulingModeOverride(STATE_COMPUTE_MODE::EU_THREAD_SCHEDULING_MODE_OVERRIDE_STALL_BASED_ROUND_ROBIN); expectedScmCmd.setMaskBits(FamilyType::stateComputeModeForceNonCoherentMask | FamilyType::stateComputeModeLargeGrfModeMask | FamilyType::stateComputeModeEuThreadSchedulingModeOverrideMask); @@ -314,7 +314,7 @@ HWTEST2_F(XeHpcComputeModeRequirements, givenComputeModeProgrammingWhenLargeGrfM expectedScmCmd = FamilyType::cmdInitStateComputeMode; expectedScmCmd.setLargeGrfMode(false); expectedScmCmd.setForceNonCoherent(STATE_COMPUTE_MODE::FORCE_NON_COHERENT_FORCE_GPU_NON_COHERENT); - expectedScmCmd.setEuThreadSchedulingMode(STATE_COMPUTE_MODE::EU_THREAD_SCHEDULING_MODE_STALL_BASED_ROUND_ROBIN); + expectedScmCmd.setEuThreadSchedulingModeOverride(STATE_COMPUTE_MODE::EU_THREAD_SCHEDULING_MODE_OVERRIDE_STALL_BASED_ROUND_ROBIN); expectedScmCmd.setMaskBits(FamilyType::stateComputeModeForceNonCoherentMask | FamilyType::stateComputeModeLargeGrfModeMask | FamilyType::stateComputeModeEuThreadSchedulingModeOverrideMask); auto scmCmd = reinterpret_cast(ptrOffset(stream.getCpuBase(), startOffset)); @@ -332,7 +332,7 @@ HWTEST2_F(XeHpcComputeModeRequirements, givenComputeModeProgrammingWhenRequiredG auto expectedScmCmd = FamilyType::cmdInitStateComputeMode; expectedScmCmd.setLargeGrfMode(false); expectedScmCmd.setForceNonCoherent(STATE_COMPUTE_MODE::FORCE_NON_COHERENT_FORCE_GPU_NON_COHERENT); - expectedScmCmd.setEuThreadSchedulingMode(STATE_COMPUTE_MODE::EU_THREAD_SCHEDULING_MODE_STALL_BASED_ROUND_ROBIN); + expectedScmCmd.setEuThreadSchedulingModeOverride(STATE_COMPUTE_MODE::EU_THREAD_SCHEDULING_MODE_OVERRIDE_STALL_BASED_ROUND_ROBIN); expectedScmCmd.setMaskBits(FamilyType::stateComputeModeForceNonCoherentMask | FamilyType::stateComputeModeLargeGrfModeMask | FamilyType::stateComputeModeEuThreadSchedulingModeOverrideMask); @@ -354,7 +354,7 @@ HWTEST2_F(XeHpcComputeModeRequirements, givenComputeModeProgrammingThenCorrectCo auto expectedScmCmd = FamilyType::cmdInitStateComputeMode; expectedScmCmd.setForceNonCoherent(STATE_COMPUTE_MODE::FORCE_NON_COHERENT_FORCE_GPU_NON_COHERENT); - expectedScmCmd.setEuThreadSchedulingMode(STATE_COMPUTE_MODE::EU_THREAD_SCHEDULING_MODE_STALL_BASED_ROUND_ROBIN); + expectedScmCmd.setEuThreadSchedulingModeOverride(STATE_COMPUTE_MODE::EU_THREAD_SCHEDULING_MODE_OVERRIDE_STALL_BASED_ROUND_ROBIN); expectedScmCmd.setMaskBits(FamilyType::stateComputeModeForceNonCoherentMask | FamilyType::stateComputeModeLargeGrfModeMask | FamilyType::stateComputeModeEuThreadSchedulingModeOverrideMask); @@ -389,7 +389,7 @@ HWTEST2_F(XeHpcComputeModeRequirements, givenProgramExtendedPipeControlPriorToNo auto expectedScmCmd = FamilyType::cmdInitStateComputeMode; expectedScmCmd.setForceNonCoherent(STATE_COMPUTE_MODE::FORCE_NON_COHERENT_FORCE_GPU_NON_COHERENT); - expectedScmCmd.setEuThreadSchedulingMode(STATE_COMPUTE_MODE::EU_THREAD_SCHEDULING_MODE_STALL_BASED_ROUND_ROBIN); + expectedScmCmd.setEuThreadSchedulingModeOverride(STATE_COMPUTE_MODE::EU_THREAD_SCHEDULING_MODE_OVERRIDE_STALL_BASED_ROUND_ROBIN); expectedScmCmd.setMaskBits(FamilyType::stateComputeModeForceNonCoherentMask | FamilyType::stateComputeModeLargeGrfModeMask | FamilyType::stateComputeModeEuThreadSchedulingModeOverrideMask); @@ -449,7 +449,7 @@ HWTEST2_F(XeHpcComputeModeRequirements, GivenSingleCCSEnabledSetupThenCorrectCom auto expectedScmCmd = FamilyType::cmdInitStateComputeMode; expectedScmCmd.setForceNonCoherent(STATE_COMPUTE_MODE::FORCE_NON_COHERENT_FORCE_GPU_NON_COHERENT); - expectedScmCmd.setEuThreadSchedulingMode(STATE_COMPUTE_MODE::EU_THREAD_SCHEDULING_MODE_STALL_BASED_ROUND_ROBIN); + expectedScmCmd.setEuThreadSchedulingModeOverride(STATE_COMPUTE_MODE::EU_THREAD_SCHEDULING_MODE_OVERRIDE_STALL_BASED_ROUND_ROBIN); expectedScmCmd.setMaskBits(FamilyType::stateComputeModeForceNonCoherentMask | FamilyType::stateComputeModeLargeGrfModeMask | FamilyType::stateComputeModeEuThreadSchedulingModeOverrideMask); diff --git a/shared/test/unit_test/xe_hpc_core/test_encode_xe_hpc_core.cpp b/shared/test/unit_test/xe_hpc_core/test_encode_xe_hpc_core.cpp index a13d2062bb..56bb974d0e 100644 --- a/shared/test/unit_test/xe_hpc_core/test_encode_xe_hpc_core.cpp +++ b/shared/test/unit_test/xe_hpc_core/test_encode_xe_hpc_core.cpp @@ -218,7 +218,7 @@ XE_HPC_CORETEST_F(CommandEncodeXeHpcCoreTest, givenDebugFlagSetWhenProgrammingPr XE_HPC_CORETEST_F(CommandEncodeXeHpcCoreTest, whenProgrammingStateComputeModeThenProperFieldsAreSet) { using STATE_COMPUTE_MODE = typename FamilyType::STATE_COMPUTE_MODE; - using EU_THREAD_SCHEDULING_MODE = typename STATE_COMPUTE_MODE::EU_THREAD_SCHEDULING_MODE; + using EU_THREAD_SCHEDULING_MODE_OVERRIDE = typename STATE_COMPUTE_MODE::EU_THREAD_SCHEDULING_MODE_OVERRIDE; uint8_t buffer[64]{}; MockExecutionEnvironment executionEnvironment{}; auto &rootDeviceEnvironment = *executionEnvironment.rootDeviceEnvironments[0]; @@ -228,7 +228,7 @@ XE_HPC_CORETEST_F(CommandEncodeXeHpcCoreTest, whenProgrammingStateComputeModeThe auto pScm = reinterpret_cast(pLinearStream->getCpuBase()); EXPECT_EQ(0u, pScm->getMaskBits()); EXPECT_EQ(STATE_COMPUTE_MODE::FORCE_NON_COHERENT_FORCE_DISABLED, pScm->getForceNonCoherent()); - EXPECT_EQ(EU_THREAD_SCHEDULING_MODE::EU_THREAD_SCHEDULING_MODE_HW_DEFAULT, pScm->getEuThreadSchedulingMode()); + EXPECT_EQ(EU_THREAD_SCHEDULING_MODE_OVERRIDE::EU_THREAD_SCHEDULING_MODE_OVERRIDE_HW_DEFAULT, pScm->getEuThreadSchedulingModeOverride()); EXPECT_FALSE(pScm->getLargeGrfMode()); properties.isCoherencyRequired.value = 0; @@ -239,7 +239,7 @@ XE_HPC_CORETEST_F(CommandEncodeXeHpcCoreTest, whenProgrammingStateComputeModeThe pScm = reinterpret_cast(pLinearStream->getCpuBase()); EXPECT_EQ(0u, pScm->getMaskBits()); EXPECT_EQ(STATE_COMPUTE_MODE::FORCE_NON_COHERENT_FORCE_DISABLED, pScm->getForceNonCoherent()); - EXPECT_EQ(EU_THREAD_SCHEDULING_MODE::EU_THREAD_SCHEDULING_MODE_HW_DEFAULT, pScm->getEuThreadSchedulingMode()); + EXPECT_EQ(EU_THREAD_SCHEDULING_MODE_OVERRIDE::EU_THREAD_SCHEDULING_MODE_OVERRIDE_HW_DEFAULT, pScm->getEuThreadSchedulingModeOverride()); EXPECT_FALSE(pScm->getLargeGrfMode()); properties.isCoherencyRequired.isDirty = true; @@ -252,13 +252,13 @@ XE_HPC_CORETEST_F(CommandEncodeXeHpcCoreTest, whenProgrammingStateComputeModeThe FamilyType::stateComputeModeLargeGrfModeMask; EXPECT_EQ(expectedMask, pScm->getMaskBits()); EXPECT_EQ(STATE_COMPUTE_MODE::FORCE_NON_COHERENT_FORCE_GPU_NON_COHERENT, pScm->getForceNonCoherent()); - EXPECT_EQ(EU_THREAD_SCHEDULING_MODE::EU_THREAD_SCHEDULING_MODE_ROUND_ROBIN, pScm->getEuThreadSchedulingMode()); + EXPECT_EQ(EU_THREAD_SCHEDULING_MODE_OVERRIDE::EU_THREAD_SCHEDULING_MODE_OVERRIDE_ROUND_ROBIN, pScm->getEuThreadSchedulingModeOverride()); EXPECT_TRUE(pScm->getLargeGrfMode()); } XE_HPC_CORETEST_F(CommandEncodeXeHpcCoreTest, whenAdjustComputeModeIsCalledThenCorrectPolicyIsProgrammed) { using STATE_COMPUTE_MODE = typename FamilyType::STATE_COMPUTE_MODE; - using EU_THREAD_SCHEDULING_MODE = typename STATE_COMPUTE_MODE::EU_THREAD_SCHEDULING_MODE; + using EU_THREAD_SCHEDULING_MODE_OVERRIDE = typename STATE_COMPUTE_MODE::EU_THREAD_SCHEDULING_MODE_OVERRIDE; uint8_t buffer[64]{}; StreamProperties properties{}; @@ -272,9 +272,9 @@ XE_HPC_CORETEST_F(CommandEncodeXeHpcCoreTest, whenAdjustComputeModeIsCalledThenC EncodeComputeMode::programComputeModeCommand(*pLinearStream, properties.stateComputeMode, rootDeviceEnvironment); auto pScm = reinterpret_cast(pLinearStream->getCpuBase()); if (productHelper.isThreadArbitrationPolicyReportedWithScm()) { - EXPECT_EQ(EU_THREAD_SCHEDULING_MODE::EU_THREAD_SCHEDULING_MODE_OLDEST_FIRST, pScm->getEuThreadSchedulingMode()); + EXPECT_EQ(EU_THREAD_SCHEDULING_MODE_OVERRIDE::EU_THREAD_SCHEDULING_MODE_OVERRIDE_OLDEST_FIRST, pScm->getEuThreadSchedulingModeOverride()); } else { - EXPECT_EQ(EU_THREAD_SCHEDULING_MODE::EU_THREAD_SCHEDULING_MODE_HW_DEFAULT, pScm->getEuThreadSchedulingMode()); + EXPECT_EQ(EU_THREAD_SCHEDULING_MODE_OVERRIDE::EU_THREAD_SCHEDULING_MODE_OVERRIDE_HW_DEFAULT, pScm->getEuThreadSchedulingModeOverride()); } pLinearStream = std::make_unique(buffer, sizeof(buffer)); @@ -282,9 +282,9 @@ XE_HPC_CORETEST_F(CommandEncodeXeHpcCoreTest, whenAdjustComputeModeIsCalledThenC EncodeComputeMode::programComputeModeCommand(*pLinearStream, properties.stateComputeMode, rootDeviceEnvironment); pScm = reinterpret_cast(pLinearStream->getCpuBase()); if (productHelper.isThreadArbitrationPolicyReportedWithScm()) { - EXPECT_EQ(EU_THREAD_SCHEDULING_MODE::EU_THREAD_SCHEDULING_MODE_ROUND_ROBIN, pScm->getEuThreadSchedulingMode()); + EXPECT_EQ(EU_THREAD_SCHEDULING_MODE_OVERRIDE::EU_THREAD_SCHEDULING_MODE_OVERRIDE_ROUND_ROBIN, pScm->getEuThreadSchedulingModeOverride()); } else { - EXPECT_EQ(EU_THREAD_SCHEDULING_MODE::EU_THREAD_SCHEDULING_MODE_HW_DEFAULT, pScm->getEuThreadSchedulingMode()); + EXPECT_EQ(EU_THREAD_SCHEDULING_MODE_OVERRIDE::EU_THREAD_SCHEDULING_MODE_OVERRIDE_HW_DEFAULT, pScm->getEuThreadSchedulingModeOverride()); } pLinearStream = std::make_unique(buffer, sizeof(buffer)); @@ -292,16 +292,16 @@ XE_HPC_CORETEST_F(CommandEncodeXeHpcCoreTest, whenAdjustComputeModeIsCalledThenC EncodeComputeMode::programComputeModeCommand(*pLinearStream, properties.stateComputeMode, rootDeviceEnvironment); pScm = reinterpret_cast(pLinearStream->getCpuBase()); if (productHelper.isThreadArbitrationPolicyReportedWithScm()) { - EXPECT_EQ(EU_THREAD_SCHEDULING_MODE::EU_THREAD_SCHEDULING_MODE_STALL_BASED_ROUND_ROBIN, pScm->getEuThreadSchedulingMode()); + EXPECT_EQ(EU_THREAD_SCHEDULING_MODE_OVERRIDE::EU_THREAD_SCHEDULING_MODE_OVERRIDE_STALL_BASED_ROUND_ROBIN, pScm->getEuThreadSchedulingModeOverride()); } else { - EXPECT_EQ(EU_THREAD_SCHEDULING_MODE::EU_THREAD_SCHEDULING_MODE_HW_DEFAULT, pScm->getEuThreadSchedulingMode()); + EXPECT_EQ(EU_THREAD_SCHEDULING_MODE_OVERRIDE::EU_THREAD_SCHEDULING_MODE_OVERRIDE_HW_DEFAULT, pScm->getEuThreadSchedulingModeOverride()); } pLinearStream = std::make_unique(buffer, sizeof(buffer)); properties.stateComputeMode.setPropertiesAll(false, 0, ThreadArbitrationPolicy::NotPresent, PreemptionMode::Disabled); EncodeComputeMode::programComputeModeCommand(*pLinearStream, properties.stateComputeMode, rootDeviceEnvironment); pScm = reinterpret_cast(pLinearStream->getCpuBase()); - EXPECT_EQ(EU_THREAD_SCHEDULING_MODE::EU_THREAD_SCHEDULING_MODE_HW_DEFAULT, pScm->getEuThreadSchedulingMode()); + EXPECT_EQ(EU_THREAD_SCHEDULING_MODE_OVERRIDE::EU_THREAD_SCHEDULING_MODE_OVERRIDE_HW_DEFAULT, pScm->getEuThreadSchedulingModeOverride()); } using EncodeKernelXeHpcCoreTest = Test;