diff --git a/shared/source/direct_submission/direct_submission_properties.h b/shared/source/direct_submission/direct_submission_properties.h index 8c46503bab..45a47c89cc 100644 --- a/shared/source/direct_submission/direct_submission_properties.h +++ b/shared/source/direct_submission/direct_submission_properties.h @@ -18,7 +18,6 @@ struct DirectSubmissionProperties { bool useNonDefault = false; bool useRootDevice = false; bool useInternal = false; - bool useLowPriority = false; bool operator==(const DirectSubmissionProperties &) const = default; }; diff --git a/shared/source/os_interface/os_context.cpp b/shared/source/os_interface/os_context.cpp index a0574333c8..a10075c864 100644 --- a/shared/source/os_interface/os_context.cpp +++ b/shared/source/os_interface/os_context.cpp @@ -85,7 +85,7 @@ bool OsContext::isDirectSubmissionAvailable(const HardwareInfo &hwInfo, bool &su startDirect = directSubmissionProperty.useNonDefault; } if (this->isLowPriority()) { - startDirect = directSubmissionProperty.useLowPriority; + startDirect = false; } if (this->isInternalEngine()) { startDirect = directSubmissionProperty.useInternal; diff --git a/shared/test/unit_test/command_stream/command_stream_receiver_tests.cpp b/shared/test/unit_test/command_stream/command_stream_receiver_tests.cpp index 1d55b9a95f..296802e011 100644 --- a/shared/test/unit_test/command_stream/command_stream_receiver_tests.cpp +++ b/shared/test/unit_test/command_stream/command_stream_receiver_tests.cpp @@ -1284,7 +1284,6 @@ HWTEST_F(InitDirectSubmissionTest, givenLowPriorityContextWhenDirectSubmissionDi auto hwInfo = device->getRootDeviceEnvironment().getMutableHardwareInfo(); hwInfo->capabilityTable.directSubmissionEngines.data[aub_stream::ENGINE_RCS].engineSupported = true; - hwInfo->capabilityTable.directSubmissionEngines.data[aub_stream::ENGINE_RCS].useLowPriority = false; hwInfo->capabilityTable.directSubmissionEngines.data[aub_stream::ENGINE_RCS].submitOnInit = false; csr->setupContext(*osContext); @@ -1296,26 +1295,6 @@ HWTEST_F(InitDirectSubmissionTest, givenLowPriorityContextWhenDirectSubmissionDi csr.reset(); } -HWTEST_F(InitDirectSubmissionTest, givenLowPriorityContextWhenDirectSubmissionEnabledOnLowPriorityThenExpectFeatureAvailable) { - auto csr = std::make_unique>(*device->executionEnvironment, device->getRootDeviceIndex(), device->getDeviceBitfield()); - std::unique_ptr osContext(OsContext::create(device->getExecutionEnvironment()->rootDeviceEnvironments[0]->osInterface.get(), device->getRootDeviceIndex(), 0, - EngineDescriptorHelper::getDefaultDescriptor({aub_stream::ENGINE_RCS, EngineUsage::lowPriority}, - PreemptionMode::ThreadGroup, device->getDeviceBitfield()))); - osContext->ensureContextInitialized(false); - - auto hwInfo = device->getRootDeviceEnvironment().getMutableHardwareInfo(); - hwInfo->capabilityTable.directSubmissionEngines.data[aub_stream::ENGINE_RCS].engineSupported = true; - hwInfo->capabilityTable.directSubmissionEngines.data[aub_stream::ENGINE_RCS].useLowPriority = true; - hwInfo->capabilityTable.directSubmissionEngines.data[aub_stream::ENGINE_RCS].submitOnInit = false; - csr->setupContext(*osContext); - csr->initializeTagAllocation(); - bool ret = csr->initDirectSubmission(); - EXPECT_TRUE(ret); - EXPECT_TRUE(csr->isDirectSubmissionEnabled()); - - csr.reset(); -} - HWTEST_F(InitDirectSubmissionTest, givenInternalContextWhenDirectSubmissionDisabledOnInternalThenExpectFeatureNotAvailable) { auto csr = std::make_unique>(*device->executionEnvironment, device->getRootDeviceIndex(), device->getDeviceBitfield()); std::unique_ptr osContext(OsContext::create(device->getExecutionEnvironment()->rootDeviceEnvironments[0]->osInterface.get(), device->getRootDeviceIndex(), 0, diff --git a/shared/test/unit_test/xe2_hpg_core/bmg/hw_info_tests_bmg.cpp b/shared/test/unit_test/xe2_hpg_core/bmg/hw_info_tests_bmg.cpp index fb1386dd3d..e21ece3db5 100644 --- a/shared/test/unit_test/xe2_hpg_core/bmg/hw_info_tests_bmg.cpp +++ b/shared/test/unit_test/xe2_hpg_core/bmg/hw_info_tests_bmg.cpp @@ -98,7 +98,6 @@ BMGTEST_F(BmgHwInfoTest, whenCheckDirectSubmissionEnginesThenProperValuesAreSetT EXPECT_FALSE(directSubmissionEngines.data[i].useNonDefault); EXPECT_TRUE(directSubmissionEngines.data[i].useRootDevice); EXPECT_FALSE(directSubmissionEngines.data[i].useInternal); - EXPECT_FALSE(directSubmissionEngines.data[i].useLowPriority); break; case aub_stream::ENGINE_CCS1: case aub_stream::ENGINE_BCS: @@ -107,7 +106,6 @@ BMGTEST_F(BmgHwInfoTest, whenCheckDirectSubmissionEnginesThenProperValuesAreSetT EXPECT_TRUE(directSubmissionEngines.data[i].useNonDefault); EXPECT_TRUE(directSubmissionEngines.data[i].useRootDevice); EXPECT_FALSE(directSubmissionEngines.data[i].useInternal); - EXPECT_FALSE(directSubmissionEngines.data[i].useLowPriority); break; default: EXPECT_FALSE(directSubmissionEngines.data[i].engineSupported); @@ -115,7 +113,6 @@ BMGTEST_F(BmgHwInfoTest, whenCheckDirectSubmissionEnginesThenProperValuesAreSetT EXPECT_FALSE(directSubmissionEngines.data[i].useNonDefault); EXPECT_FALSE(directSubmissionEngines.data[i].useRootDevice); EXPECT_FALSE(directSubmissionEngines.data[i].useInternal); - EXPECT_FALSE(directSubmissionEngines.data[i].useLowPriority); } } } diff --git a/shared/test/unit_test/xe2_hpg_core/lnl/hw_info_tests_lnl.cpp b/shared/test/unit_test/xe2_hpg_core/lnl/hw_info_tests_lnl.cpp index da12e2a766..33e9f0ad3b 100644 --- a/shared/test/unit_test/xe2_hpg_core/lnl/hw_info_tests_lnl.cpp +++ b/shared/test/unit_test/xe2_hpg_core/lnl/hw_info_tests_lnl.cpp @@ -97,7 +97,6 @@ LNLTEST_F(LnlHwInfoTest, whenCheckDirectSubmissionEnginesThenProperValuesAreSetT EXPECT_FALSE(directSubmissionEngines.data[i].useNonDefault); EXPECT_TRUE(directSubmissionEngines.data[i].useRootDevice); EXPECT_FALSE(directSubmissionEngines.data[i].useInternal); - EXPECT_FALSE(directSubmissionEngines.data[i].useLowPriority); break; default: EXPECT_FALSE(directSubmissionEngines.data[i].engineSupported); @@ -105,7 +104,6 @@ LNLTEST_F(LnlHwInfoTest, whenCheckDirectSubmissionEnginesThenProperValuesAreSetT EXPECT_FALSE(directSubmissionEngines.data[i].useNonDefault); EXPECT_FALSE(directSubmissionEngines.data[i].useRootDevice); EXPECT_FALSE(directSubmissionEngines.data[i].useInternal); - EXPECT_FALSE(directSubmissionEngines.data[i].useLowPriority); } } } diff --git a/shared/test/unit_test/xe3_core/ptl/hw_info_tests_ptl.cpp b/shared/test/unit_test/xe3_core/ptl/hw_info_tests_ptl.cpp index 92e5236dfb..08035876ef 100644 --- a/shared/test/unit_test/xe3_core/ptl/hw_info_tests_ptl.cpp +++ b/shared/test/unit_test/xe3_core/ptl/hw_info_tests_ptl.cpp @@ -90,7 +90,6 @@ PTLTEST_F(PtlHwInfoTest, whenCheckDirectSubmissionEnginesThenProperValuesAreSetT EXPECT_FALSE(directSubmissionEngines.data[i].useNonDefault); EXPECT_TRUE(directSubmissionEngines.data[i].useRootDevice); EXPECT_FALSE(directSubmissionEngines.data[i].useInternal); - EXPECT_FALSE(directSubmissionEngines.data[i].useLowPriority); break; case aub_stream::ENGINE_BCS: EXPECT_TRUE(directSubmissionEngines.data[i].engineSupported); @@ -98,7 +97,6 @@ PTLTEST_F(PtlHwInfoTest, whenCheckDirectSubmissionEnginesThenProperValuesAreSetT EXPECT_TRUE(directSubmissionEngines.data[i].useNonDefault); EXPECT_TRUE(directSubmissionEngines.data[i].useRootDevice); EXPECT_FALSE(directSubmissionEngines.data[i].useInternal); - EXPECT_FALSE(directSubmissionEngines.data[i].useLowPriority); break; default: EXPECT_FALSE(directSubmissionEngines.data[i].engineSupported); @@ -106,7 +104,6 @@ PTLTEST_F(PtlHwInfoTest, whenCheckDirectSubmissionEnginesThenProperValuesAreSetT EXPECT_FALSE(directSubmissionEngines.data[i].useNonDefault); EXPECT_FALSE(directSubmissionEngines.data[i].useRootDevice); EXPECT_FALSE(directSubmissionEngines.data[i].useInternal); - EXPECT_FALSE(directSubmissionEngines.data[i].useLowPriority); } } } diff --git a/shared/test/unit_test/xe_hpg_core/os_agnostic_product_helper_xe_lpg_tests.cpp b/shared/test/unit_test/xe_hpg_core/os_agnostic_product_helper_xe_lpg_tests.cpp index 07a06ca3cf..d58725394a 100644 --- a/shared/test/unit_test/xe_hpg_core/os_agnostic_product_helper_xe_lpg_tests.cpp +++ b/shared/test/unit_test/xe_hpg_core/os_agnostic_product_helper_xe_lpg_tests.cpp @@ -67,7 +67,6 @@ HWTEST2_F(XeLpgHwInfoTests, whenCheckDirectSubmissionEnginesThenProperValuesAreS EXPECT_FALSE(directSubmissionEngines.data[i].useNonDefault); EXPECT_TRUE(directSubmissionEngines.data[i].useRootDevice); EXPECT_FALSE(directSubmissionEngines.data[i].useInternal); - EXPECT_FALSE(directSubmissionEngines.data[i].useLowPriority); break; default: EXPECT_FALSE(directSubmissionEngines.data[i].engineSupported); @@ -75,7 +74,6 @@ HWTEST2_F(XeLpgHwInfoTests, whenCheckDirectSubmissionEnginesThenProperValuesAreS EXPECT_FALSE(directSubmissionEngines.data[i].useNonDefault); EXPECT_FALSE(directSubmissionEngines.data[i].useRootDevice); EXPECT_FALSE(directSubmissionEngines.data[i].useInternal); - EXPECT_FALSE(directSubmissionEngines.data[i].useLowPriority); } } }