From 05cf05e10e090a42fbe000ea015e641b1a161af9 Mon Sep 17 00:00:00 2001 From: Mateusz Jablonski Date: Mon, 28 Jul 2025 11:32:46 +0000 Subject: [PATCH] refactor: remove redundant tracking of media sampler programming Signed-off-by: Mateusz Jablonski --- .../core/source/cmdlist/cmdlist_imp.cpp | 2 +- level_zero/core/source/cmdlist/cmdlist_imp.h | 1 - .../core/source/cmdqueue/cmdqueue_hw.inl | 4 +- .../sources/cmdlist/test_cmdlist_6.cpp | 1 - .../command_queue/enqueue_kernel_1_tests.cpp | 11 --- ...and_stream_receiver_flush_task_1_tests.cpp | 24 +----- ...and_stream_receiver_flush_task_2_tests.cpp | 19 ----- .../ult_command_stream_receiver_fixture.h | 3 +- ..._stream_receiver_hw_tests_xe2_hpg_core.cpp | 2 - ...mand_stream_receiver_hw_tests_xe3_core.cpp | 2 - .../command_stream_receiver_hw_tests_pvc.cpp | 2 - .../command_stream_receiver.cpp | 1 - .../command_stream/command_stream_receiver.h | 2 - .../command_stream_receiver_hw_base.inl | 9 +-- ...mand_stream_receiver_hw_xehp_and_later.inl | 5 +- .../source/command_stream/csr_definitions.h | 1 - .../definitions/stream_properties.inl | 28 ------- .../command_stream/stream_properties.cpp | 19 +---- .../source/command_stream/stream_properties.h | 28 ++++++- .../command_stream_receiver_hw_gen12lp.cpp | 5 +- shared/source/gen12lp/hw_cmds_adlp.h | 3 +- shared/source/gen12lp/hw_cmds_base.h | 1 - shared/source/gen12lp/preamble_gen12lp.cpp | 2 +- shared/source/helpers/pipeline_select_args.h | 3 +- shared/source/os_interface/product_helper.h | 1 - shared/source/os_interface/product_helper.inl | 7 -- .../source/os_interface/product_helper_hw.h | 1 - shared/source/xe2_hpg_core/hw_cmds_base.h | 1 - shared/source/xe3_core/hw_cmds_base.h | 1 - .../xe_hpc_core/hw_cmds_xe_hpc_core_base.h | 1 - .../xe_hpg_core/hw_cmds_xe_hpg_core_base.h | 1 - .../command_stream_receiver_fixture.inl | 4 +- .../libult/ult_command_stream_receiver.h | 1 - .../test/common/mocks/mock_product_helper.cpp | 1 - .../command_stream_receiver_tests.cpp | 73 ------------------- .../stream_properties_tests.cpp | 1 - .../stream_properties_tests_common.cpp | 71 ++++-------------- .../gen12lp/adln/test_product_helper_adln.cpp | 1 - .../command_stream_receiver_hw_tests_adlp.cpp | 4 +- .../gen12lp/adlp/test_product_helper_adlp.cpp | 1 - .../gen12lp/adls/test_product_helper_adls.cpp | 1 - .../gen12lp/dg1/test_product_helper_dg1.cpp | 1 - .../gen12lp/rkl/test_product_helper_rkl.cpp | 1 - .../tgllp/product_helper_tests_tgllp.cpp | 1 - .../os_interface/product_helper_tests.cpp | 1 - .../bmg/product_helper_tests_bmg.cpp | 1 - .../lnl/product_helper_tests_lnl.cpp | 1 - .../product_helper_tests_xe3_core.cpp | 1 - .../pvc/test_product_helper_pvc.cpp | 1 - .../dg2/test_product_helper_dg2.cpp | 1 - ...s_agnostic_product_helper_xe_lpg_tests.cpp | 1 - 51 files changed, 61 insertions(+), 298 deletions(-) diff --git a/level_zero/core/source/cmdlist/cmdlist_imp.cpp b/level_zero/core/source/cmdlist/cmdlist_imp.cpp index b1fd588ef5..577491aa09 100644 --- a/level_zero/core/source/cmdlist/cmdlist_imp.cpp +++ b/level_zero/core/source/cmdlist/cmdlist_imp.cpp @@ -307,7 +307,7 @@ void CommandListImp::setStreamPropertiesDefaultSettings(NEO::StreamProperties &s } streamProperties.frontEndState.setPropertiesDisableOverdispatch(cmdListDefaultDisableOverdispatch, true); - streamProperties.pipelineSelect.setPropertiesModeSelectedMediaSamplerClockGate(cmdListDefaultPipelineSelectModeSelected, cmdListDefaultMediaSamplerClockGate, true); + streamProperties.pipelineSelect.setPropertiesModeSelected(cmdListDefaultPipelineSelectModeSelected, true); } void CommandListImp::enableInOrderExecution() { diff --git a/level_zero/core/source/cmdlist/cmdlist_imp.h b/level_zero/core/source/cmdlist/cmdlist_imp.h index cadf422529..e835630dea 100644 --- a/level_zero/core/source/cmdlist/cmdlist_imp.h +++ b/level_zero/core/source/cmdlist/cmdlist_imp.h @@ -62,7 +62,6 @@ struct CommandListImp : public CommandList { static constexpr bool cmdListDefaultCoherency = false; static constexpr bool cmdListDefaultDisableOverdispatch = true; static constexpr bool cmdListDefaultPipelineSelectModeSelected = true; - static constexpr bool cmdListDefaultMediaSamplerClockGate = false; static constexpr bool cmdListDefaultGlobalAtomics = false; std::vector mappedTsEventList; std::vector interruptEvents; diff --git a/level_zero/core/source/cmdqueue/cmdqueue_hw.inl b/level_zero/core/source/cmdqueue/cmdqueue_hw.inl index b962a985cc..9ecd43d377 100644 --- a/level_zero/core/source/cmdqueue/cmdqueue_hw.inl +++ b/level_zero/core/source/cmdqueue/cmdqueue_hw.inl @@ -656,7 +656,7 @@ template void CommandQueueHw::programPipelineSelectIfGpgpuDisabled(NEO::LinearStream &cmdStream) { bool gpgpuEnabled = this->csr->getPreambleSetFlag(); if (!gpgpuEnabled) { - NEO::PipelineSelectArgs args = {false, false, false, false}; + NEO::PipelineSelectArgs args = {false, false, false}; NEO::PreambleHelper::programPipelineSelect(&cmdStream, args, device->getNEODevice()->getRootDeviceEnvironment()); this->csr->setPreambleSetFlag(true); } @@ -1566,7 +1566,6 @@ void CommandQueueHw::programOneCmdListPipelineSelect(NEO::LinearS NEO::PipelineSelectArgs args = { systolic, false, - false, cmdListRequired.commandList->getSystolicModeSupport()}; NEO::PreambleHelper::programPipelineSelect(&commandStream, args, device->getNEODevice()->getRootDeviceEnvironment()); @@ -1624,7 +1623,6 @@ void CommandQueueHw::programRequiredStateComputeModeForCommandLis NEO::PipelineSelectArgs pipelineSelectArgs = { cmdListRequired.requiredState.pipelineSelect.systolicMode.value == 1, false, - false, cmdListRequired.commandList->getSystolicModeSupport()}; NEO::EncodeComputeMode::programComputeModeCommandWithSynchronization(commandStream, cmdListRequired.requiredState.stateComputeMode, pipelineSelectArgs, diff --git a/level_zero/core/test/unit_tests/sources/cmdlist/test_cmdlist_6.cpp b/level_zero/core/test/unit_tests/sources/cmdlist/test_cmdlist_6.cpp index 1da4083a4b..61cab8ce70 100644 --- a/level_zero/core/test/unit_tests/sources/cmdlist/test_cmdlist_6.cpp +++ b/level_zero/core/test/unit_tests/sources/cmdlist/test_cmdlist_6.cpp @@ -274,7 +274,6 @@ HWTEST_F(CommandListExecuteImmediate, GivenImmediateCommandListWhenCommandListIs EXPECT_EQ(-1, currentCsrStreamProperties.frontEndState.singleSliceDispatchCcsMode.value); EXPECT_EQ(-1, currentCsrStreamProperties.pipelineSelect.modeSelected.value); - EXPECT_EQ(-1, currentCsrStreamProperties.pipelineSelect.mediaSamplerDopClockGate.value); } struct CommandListTest : Test { diff --git a/opencl/test/unit_test/command_queue/enqueue_kernel_1_tests.cpp b/opencl/test/unit_test/command_queue/enqueue_kernel_1_tests.cpp index f8d9023ee3..eb1b9f1a29 100644 --- a/opencl/test/unit_test/command_queue/enqueue_kernel_1_tests.cpp +++ b/opencl/test/unit_test/command_queue/enqueue_kernel_1_tests.cpp @@ -1728,17 +1728,6 @@ HWTEST_TEMPLATED_F(EnqueueKernelTestWithMockCsrHw2, givenContextWithSeveralDevic context->deviceBitfields[rootDeviceIndex].set(3, false); } -HWTEST_TEMPLATED_F(EnqueueKernelTestWithMockCsrHw2, givenNonVMEKernelWhenEnqueueKernelThenDispatchFlagsDoesntHaveMediaSamplerRequired) { - auto *mockCsr = static_cast *>(&pDevice->getGpgpuCommandStreamReceiver()); - mockCsr->overrideDispatchPolicy(DispatchMode::batchedDispatch); - - MockKernelWithInternals mockKernel(*pClDevice, context); - size_t gws[3] = {1, 0, 0}; - mockKernel.kernelInfo.kernelDescriptor.kernelAttributes.flags.usesVme = false; - clEnqueueNDRangeKernel(this->pCmdQ, mockKernel.mockMultiDeviceKernel, 1, nullptr, gws, nullptr, 0, nullptr, nullptr); - EXPECT_FALSE(mockCsr->passedDispatchFlags.pipelineSelectArgs.mediaSamplerRequired); -} - HWTEST_F(EnqueueKernelTest, whenEnqueueKernelWithEngineHintsThenEpilogRequiredIsSet) { auto &csr = pDevice->getUltCommandStreamReceiver(); size_t off[3] = {0, 0, 0}; diff --git a/opencl/test/unit_test/command_stream/command_stream_receiver_flush_task_1_tests.cpp b/opencl/test/unit_test/command_stream/command_stream_receiver_flush_task_1_tests.cpp index e12190aa30..82f51944ca 100644 --- a/opencl/test/unit_test/command_stream/command_stream_receiver_flush_task_1_tests.cpp +++ b/opencl/test/unit_test/command_stream/command_stream_receiver_flush_task_1_tests.cpp @@ -718,28 +718,17 @@ HWTEST_F(CommandStreamReceiverFlushTaskTests, givenFlushTaskWhenInitProgrammingF EXPECT_FALSE(commandStreamReceiver.bindingTableBaseAddressRequired); } -HWTEST2_F(CommandStreamReceiverFlushTaskTests, GivenPreambleNotSentAndMediaSamplerRequirementChangedWhenFlushingTaskThenPipelineSelectIsSent, IsAtMostXeCore) { +HWTEST2_F(CommandStreamReceiverFlushTaskTests, GivenPreambleNotSentWhenFlushingTaskThenPipelineSelectIsSent, IsAtMostXeCore) { auto &commandStreamReceiver = pDevice->getUltCommandStreamReceiver(); commandStreamReceiver.isPreambleSent = false; - commandStreamReceiver.lastMediaSamplerConfig = -1; flushTask(commandStreamReceiver); parseCommands(commandStreamReceiver.commandStream, 0); EXPECT_NE(nullptr, getCommand()); } -HWTEST2_F(CommandStreamReceiverFlushTaskTests, GivenPreambleNotSentAndMediaSamplerRequirementNotChangedWhenFlushingTaskThenPipelineSelectIsSent, IsAtMostXeCore) { - auto &commandStreamReceiver = pDevice->getUltCommandStreamReceiver(); - commandStreamReceiver.isPreambleSent = false; - commandStreamReceiver.lastMediaSamplerConfig = 0; - flushTask(commandStreamReceiver); - parseCommands(commandStreamReceiver.commandStream, 0); - EXPECT_NE(nullptr, getCommand()); -} - -HWTEST_F(CommandStreamReceiverFlushTaskTests, GivenPreambleSentAndMediaSamplerRequirementNotChangedWhenFlushingTaskThenPipelineSelectIsNotSent) { +HWTEST_F(CommandStreamReceiverFlushTaskTests, GivenPreambleSentWhenFlushingTaskThenPipelineSelectIsNotSent) { auto &commandStreamReceiver = pDevice->getUltCommandStreamReceiver(); commandStreamReceiver.isPreambleSent = true; - commandStreamReceiver.lastMediaSamplerConfig = 0; flushTask(commandStreamReceiver); parseCommands(commandStreamReceiver.commandStream, 0); auto &productHelper = pDevice->getProductHelper(); @@ -749,15 +738,6 @@ HWTEST_F(CommandStreamReceiverFlushTaskTests, GivenPreambleSentAndMediaSamplerRe EXPECT_EQ(nullptr, getCommand()); } } -HWTEST2_F(CommandStreamReceiverFlushTaskTests, GivenPreambleSentAndMediaSamplerRequirementChangedWhenFlushingTaskThenPipelineSelectIsSent, IsAtMostXeCore) { - auto &commandStreamReceiver = pDevice->getUltCommandStreamReceiver(); - commandStreamReceiver.pipelineSupportFlags.mediaSamplerDopClockGate = true; - commandStreamReceiver.isPreambleSent = true; - commandStreamReceiver.lastMediaSamplerConfig = 1; - flushTask(commandStreamReceiver); - parseCommands(commandStreamReceiver.commandStream, 0); - EXPECT_NE(nullptr, getCommand()); -} HWTEST2_F(CommandStreamReceiverFlushTaskTests, GivenStateBaseAddressNotSentWhenFlushingTaskThenStateBaseAddressIsSent, IsHeapfulSupported) { auto &commandStreamReceiver = pDevice->getUltCommandStreamReceiver(); diff --git a/opencl/test/unit_test/command_stream/command_stream_receiver_flush_task_2_tests.cpp b/opencl/test/unit_test/command_stream/command_stream_receiver_flush_task_2_tests.cpp index 5d242abc8f..c64bca6444 100644 --- a/opencl/test/unit_test/command_stream/command_stream_receiver_flush_task_2_tests.cpp +++ b/opencl/test/unit_test/command_stream/command_stream_receiver_flush_task_2_tests.cpp @@ -1064,7 +1064,6 @@ HWCMDTEST_F(IGFX_GEN12LP_CORE, CommandStreamReceiverFlushTaskTests, GivenPreambl taskLevel = commandStreamReceiver.peekTaskLevel() + 1; commandStreamReceiver.isPreambleSent = true; commandStreamReceiver.lastPreemptionMode = pDevice->getPreemptionMode(); - commandStreamReceiver.lastMediaSamplerConfig = 0; commandStreamReceiver.streamProperties.stateComputeMode.isCoherencyRequired.value = 0; csrSizeRequest.l3ConfigChanged = true; commandStreamReceiver.overrideCsrSizeReqFlags(csrSizeRequest); @@ -1117,24 +1116,6 @@ HWTEST_F(CommandStreamReceiverFlushTaskTests, givenCsrWhenPreambleNotSentThenReq EXPECT_EQ(l3ConfigNotChangedSize, l3ConfigChangedSize); } -HWTEST_F(CommandStreamReceiverFlushTaskTests, givenCsrWhenPreambleNotSentThenRequiredCsrSizeDoesntDependOnmediaSamplerConfigChanged) { - UltCommandStreamReceiver &commandStreamReceiver = (UltCommandStreamReceiver &)pDevice->getGpgpuCommandStreamReceiver(); - CsrSizeRequestFlags csrSizeRequest = {}; - DispatchFlags flags = DispatchFlagsHelper::createDefaultDispatchFlags(); - - commandStreamReceiver.isPreambleSent = false; - - csrSizeRequest.mediaSamplerConfigChanged = false; - commandStreamReceiver.overrideCsrSizeReqFlags(csrSizeRequest); - auto mediaSamplerConfigNotChangedSize = commandStreamReceiver.getRequiredCmdStreamSize(flags, *pDevice); - - csrSizeRequest.mediaSamplerConfigChanged = true; - commandStreamReceiver.overrideCsrSizeReqFlags(csrSizeRequest); - auto mediaSamplerConfigChangedSize = commandStreamReceiver.getRequiredCmdStreamSize(flags, *pDevice); - - EXPECT_EQ(mediaSamplerConfigChangedSize, mediaSamplerConfigNotChangedSize); -} - HWTEST_F(CommandStreamReceiverFlushTaskTests, givenCsrWhenSamplerCacheFlushSentThenRequiredCsrSizeContainsPipecontrolSize) { UltCommandStreamReceiver &commandStreamReceiver = (UltCommandStreamReceiver &)pDevice->getGpgpuCommandStreamReceiver(); CsrSizeRequestFlags csrSizeRequest = {}; diff --git a/opencl/test/unit_test/fixtures/ult_command_stream_receiver_fixture.h b/opencl/test/unit_test/fixtures/ult_command_stream_receiver_fixture.h index aaca84a5c5..ead4c45c71 100644 --- a/opencl/test/unit_test/fixtures/ult_command_stream_receiver_fixture.h +++ b/opencl/test/unit_test/fixtures/ult_command_stream_receiver_fixture.h @@ -165,8 +165,7 @@ struct UltCommandStreamReceiverTest configureCSRHeapStatesToNonDirty(); commandStreamReceiver.taskLevel = taskLevel; - commandStreamReceiver.lastMediaSamplerConfig = 0; - commandStreamReceiver.streamProperties.pipelineSelect.setPropertiesAll(true, false, false); + commandStreamReceiver.streamProperties.pipelineSelect.setPropertiesAll(true, false); commandStreamReceiver.streamProperties.stateComputeMode.setPropertiesAll(0, GrfConfig::defaultGrfNumber, gfxCoreHelper.getDefaultThreadArbitrationPolicy(), pDevice->getPreemptionMode()); commandStreamReceiver.streamProperties.frontEndState.setPropertiesAll(false, false, false); diff --git a/opencl/test/unit_test/xe2_hpg_core/command_stream_receiver_hw_tests_xe2_hpg_core.cpp b/opencl/test/unit_test/xe2_hpg_core/command_stream_receiver_hw_tests_xe2_hpg_core.cpp index 0ea1a1a520..9e96b3a926 100644 --- a/opencl/test/unit_test/xe2_hpg_core/command_stream_receiver_hw_tests_xe2_hpg_core.cpp +++ b/opencl/test/unit_test/xe2_hpg_core/command_stream_receiver_hw_tests_xe2_hpg_core.cpp @@ -554,8 +554,6 @@ XE2_HPG_CORETEST_F(Xe2CommandStreamReceiverFlushTaskTests, givenNotExistPolicyWh XE2_HPG_CORETEST_F(Xe2CommandStreamReceiverFlushTaskTests, givenLastSystolicPipelineSelectModeWhenFlushTaskIsCalledThenDontReprogramPipelineSelect) { auto &commandStreamReceiver = pDevice->getUltCommandStreamReceiver(); commandStreamReceiver.isPreambleSent = true; - commandStreamReceiver.lastMediaSamplerConfig = false; - flushTaskFlags.pipelineSelectArgs.mediaSamplerRequired = false; flushTaskFlags.pipelineSelectArgs.systolicPipelineSelectMode = true; flushTask(commandStreamReceiver); diff --git a/opencl/test/unit_test/xe3_core/command_stream_receiver_hw_tests_xe3_core.cpp b/opencl/test/unit_test/xe3_core/command_stream_receiver_hw_tests_xe3_core.cpp index 5f00af2dd6..2823bd8233 100644 --- a/opencl/test/unit_test/xe3_core/command_stream_receiver_hw_tests_xe3_core.cpp +++ b/opencl/test/unit_test/xe3_core/command_stream_receiver_hw_tests_xe3_core.cpp @@ -325,8 +325,6 @@ XE3_CORETEST_F(Xe3CommandStreamReceiverFlushTaskTests, givenNotExistPolicyWhenFl XE3_CORETEST_F(Xe3CommandStreamReceiverFlushTaskTests, givenLastSystolicPipelineSelectModeWhenFlushTaskIsCalledThenDontReprogramPipelineSelect) { auto &commandStreamReceiver = pDevice->getUltCommandStreamReceiver(); commandStreamReceiver.isPreambleSent = true; - commandStreamReceiver.lastMediaSamplerConfig = false; - flushTaskFlags.pipelineSelectArgs.mediaSamplerRequired = false; flushTaskFlags.pipelineSelectArgs.systolicPipelineSelectMode = true; flushTask(commandStreamReceiver); diff --git a/opencl/test/unit_test/xe_hpc_core/pvc/command_stream_receiver_hw_tests_pvc.cpp b/opencl/test/unit_test/xe_hpc_core/pvc/command_stream_receiver_hw_tests_pvc.cpp index 1ec812786f..ddeb7c16f4 100644 --- a/opencl/test/unit_test/xe_hpc_core/pvc/command_stream_receiver_hw_tests_pvc.cpp +++ b/opencl/test/unit_test/xe_hpc_core/pvc/command_stream_receiver_hw_tests_pvc.cpp @@ -71,7 +71,6 @@ PVCTEST_F(PvcCommandStreamReceiverFlushTaskTests, givenRevisionBAndAboveWhenLast auto &commandStreamReceiver = pDevice->getUltCommandStreamReceiver(); flushTaskFlags.pipelineSelectArgs.systolicPipelineSelectMode = true; - flushTaskFlags.pipelineSelectArgs.mediaSamplerRequired = false; struct { unsigned short revId; @@ -89,7 +88,6 @@ PVCTEST_F(PvcCommandStreamReceiverFlushTaskTests, givenRevisionBAndAboveWhenLast hwInfo->platform.usRevId = testInput.revId; productHelper.fillPipelineSelectPropertiesSupportStructure(commandStreamReceiver.pipelineSupportFlags, *hwInfo); commandStreamReceiver.isPreambleSent = true; - commandStreamReceiver.lastMediaSamplerConfig = false; commandStreamReceiver.lastSystolicPipelineSelectMode = false; commandStreamReceiver.streamProperties.pipelineSelect.systolicMode.value = -1; diff --git a/shared/source/command_stream/command_stream_receiver.cpp b/shared/source/command_stream/command_stream_receiver.cpp index 50bdc96084..8dad0fd68a 100644 --- a/shared/source/command_stream/command_stream_receiver.cpp +++ b/shared/source/command_stream/command_stream_receiver.cpp @@ -599,7 +599,6 @@ void CommandStreamReceiver::initProgrammingFlags() { stateComputeModeDirty = true; lastSentL3Config = 0; - lastMediaSamplerConfig = -1; lastPreemptionMode = PreemptionMode::Initial; latestSentStatelessMocsConfig = CacheSettings::unknownMocs; diff --git a/shared/source/command_stream/command_stream_receiver.h b/shared/source/command_stream/command_stream_receiver.h index e167c36720..27d24dbb71 100644 --- a/shared/source/command_stream/command_stream_receiver.h +++ b/shared/source/command_stream/command_stream_receiver.h @@ -674,8 +674,6 @@ class CommandStreamReceiver : NEO::NonCopyableAndNonMovableClass { const uint32_t rootDeviceIndex; const DeviceBitfield deviceBitfield; - int8_t lastMediaSamplerConfig = -1; - bool isPreambleSent = false; bool isStateSipSent = false; bool isEnginePrologueSent = false; diff --git a/shared/source/command_stream/command_stream_receiver_hw_base.inl b/shared/source/command_stream/command_stream_receiver_hw_base.inl index bb6fa990d7..f437bed8ac 100644 --- a/shared/source/command_stream/command_stream_receiver_hw_base.inl +++ b/shared/source/command_stream/command_stream_receiver_hw_base.inl @@ -849,8 +849,7 @@ size_t CommandStreamReceiverHw::getRequiredCmdStreamSize(const Dispat template inline size_t CommandStreamReceiverHw::getCmdSizeForPipelineSelect() const { size_t size = 0; - if ((csrSizeRequestFlags.mediaSamplerConfigChanged || - csrSizeRequestFlags.systolicPipelineSelectMode || + if ((csrSizeRequestFlags.systolicPipelineSelectMode || !isPreambleSent) && !isPipelineSelectAlreadyProgrammed()) { size += PreambleHelper::getCmdSizeForPipelineSelect(peekRootDeviceEnvironment()); @@ -1571,15 +1570,10 @@ void CommandStreamReceiverHw::handleFrontEndStateTransition(const Dis template void CommandStreamReceiverHw::handlePipelineSelectStateTransition(const DispatchFlags &dispatchFlags) { - if (streamProperties.pipelineSelect.mediaSamplerDopClockGate.value != -1) { - this->lastMediaSamplerConfig = static_cast(streamProperties.pipelineSelect.mediaSamplerDopClockGate.value); - } if (streamProperties.pipelineSelect.systolicMode.value != -1) { this->lastSystolicPipelineSelectMode = !!streamProperties.pipelineSelect.systolicMode.value; } - csrSizeRequestFlags.mediaSamplerConfigChanged = this->pipelineSupportFlags.mediaSamplerDopClockGate && - (this->lastMediaSamplerConfig != static_cast(dispatchFlags.pipelineSelectArgs.mediaSamplerRequired)); csrSizeRequestFlags.systolicPipelineSelectMode = this->pipelineSupportFlags.systolicMode && (this->lastSystolicPipelineSelectMode != dispatchFlags.pipelineSelectArgs.systolicPipelineSelectMode); } @@ -2005,7 +1999,6 @@ void CommandStreamReceiverHw::handleImmediateFlushPipelineSelectState flushData.pipelineSelectArgs = { this->streamProperties.pipelineSelect.systolicMode.value == 1, false, - false, this->pipelineSupportFlags.systolicMode}; } diff --git a/shared/source/command_stream/command_stream_receiver_hw_xehp_and_later.inl b/shared/source/command_stream/command_stream_receiver_hw_xehp_and_later.inl index b7d32d06db..024333b1f6 100644 --- a/shared/source/command_stream/command_stream_receiver_hw_xehp_and_later.inl +++ b/shared/source/command_stream/command_stream_receiver_hw_xehp_and_later.inl @@ -44,11 +44,10 @@ size_t CommandStreamReceiverHw::getCmdSizeForL3Config() const { retur template void CommandStreamReceiverHw::programPipelineSelect(LinearStream &commandStream, PipelineSelectArgs &pipelineSelectArgs) { - if (csrSizeRequestFlags.mediaSamplerConfigChanged || csrSizeRequestFlags.systolicPipelineSelectMode || !isPreambleSent) { + if (csrSizeRequestFlags.systolicPipelineSelectMode || !isPreambleSent) { PreambleHelper::programPipelineSelect(&commandStream, pipelineSelectArgs, peekRootDeviceEnvironment()); - this->lastMediaSamplerConfig = pipelineSelectArgs.mediaSamplerRequired; this->lastSystolicPipelineSelectMode = pipelineSelectArgs.systolicPipelineSelectMode; - this->streamProperties.pipelineSelect.setPropertiesAll(true, this->lastMediaSamplerConfig, this->lastSystolicPipelineSelectMode); + this->streamProperties.pipelineSelect.setPropertiesAll(true, this->lastSystolicPipelineSelectMode); this->streamProperties.pipelineSelect.clearIsDirty(); } } diff --git a/shared/source/command_stream/csr_definitions.h b/shared/source/command_stream/csr_definitions.h index 807b4c67a5..8fcafbbdfc 100644 --- a/shared/source/command_stream/csr_definitions.h +++ b/shared/source/command_stream/csr_definitions.h @@ -133,7 +133,6 @@ struct DispatchFlags { struct CsrSizeRequestFlags { bool l3ConfigChanged = false; bool preemptionRequestChanged = false; - bool mediaSamplerConfigChanged = false; bool hasSharedHandles = false; bool systolicPipelineSelectMode = false; bool activePartitionsChanged = false; diff --git a/shared/source/command_stream/definitions/stream_properties.inl b/shared/source/command_stream/definitions/stream_properties.inl index b02e7bf81b..320b0e8540 100644 --- a/shared/source/command_stream/definitions/stream_properties.inl +++ b/shared/source/command_stream/definitions/stream_properties.inl @@ -102,34 +102,6 @@ struct FrontEndProperties { bool propertiesSupportLoaded = false; }; -struct PipelineSelectPropertiesSupport { - bool mediaSamplerDopClockGate = false; - bool systolicMode = false; -}; - -struct PipelineSelectProperties { - StreamProperty modeSelected{}; - StreamProperty mediaSamplerDopClockGate{}; - StreamProperty systolicMode{}; - - void initSupport(const RootDeviceEnvironment &rootDeviceEnvironment); - void resetState(); - - void setPropertiesAll(bool modeSelected, bool mediaSamplerDopClockGate, bool systolicMode); - void setPropertiesModeSelectedMediaSamplerClockGate(bool modeSelected, bool mediaSamplerDopClockGate, bool clearDirtyState); - void setPropertySystolicMode(bool systolicMode); - - void copyPropertiesAll(const PipelineSelectProperties &properties); - void copyPropertiesSystolicMode(const PipelineSelectProperties &properties); - - bool isDirty() const; - void clearIsDirty(); - - protected: - PipelineSelectPropertiesSupport pipelineSelectPropertiesSupport = {}; - bool propertiesSupportLoaded = false; -}; - struct StateBaseAddressPropertiesSupport { bool bindingTablePoolBaseAddress = false; }; diff --git a/shared/source/command_stream/stream_properties.cpp b/shared/source/command_stream/stream_properties.cpp index c693093031..1baa6e5442 100644 --- a/shared/source/command_stream/stream_properties.cpp +++ b/shared/source/command_stream/stream_properties.cpp @@ -310,42 +310,31 @@ void PipelineSelectProperties::resetState() { clearIsDirty(); this->modeSelected.value = StreamProperty::initValue; - this->mediaSamplerDopClockGate.value = StreamProperty::initValue; this->systolicMode.value = StreamProperty::initValue; } -void PipelineSelectProperties::setPropertiesAll(bool modeSelected, bool mediaSamplerDopClockGate, bool systolicMode) { +void PipelineSelectProperties::setPropertiesAll(bool modeSelected, bool systolicMode) { DEBUG_BREAK_IF(!this->propertiesSupportLoaded); clearIsDirty(); this->modeSelected.set(modeSelected); - if (this->pipelineSelectPropertiesSupport.mediaSamplerDopClockGate) { - this->mediaSamplerDopClockGate.set(mediaSamplerDopClockGate); - } - if (this->pipelineSelectPropertiesSupport.systolicMode) { this->systolicMode.set(systolicMode); } } -void PipelineSelectProperties::setPropertiesModeSelectedMediaSamplerClockGate(bool modeSelected, bool mediaSamplerDopClockGate, bool clearDirtyState) { +void PipelineSelectProperties::setPropertiesModeSelected(bool modeSelected, bool clearDirtyState) { DEBUG_BREAK_IF(!this->propertiesSupportLoaded); if (!clearDirtyState) { this->modeSelected.isDirty = false; - this->mediaSamplerDopClockGate.isDirty = false; } this->modeSelected.set(modeSelected); - if (this->pipelineSelectPropertiesSupport.mediaSamplerDopClockGate) { - this->mediaSamplerDopClockGate.set(mediaSamplerDopClockGate); - } - if (clearDirtyState) { this->modeSelected.isDirty = false; - this->mediaSamplerDopClockGate.isDirty = false; } } @@ -363,7 +352,6 @@ void PipelineSelectProperties::copyPropertiesAll(const PipelineSelectProperties clearIsDirty(); modeSelected.set(properties.modeSelected.value); - mediaSamplerDopClockGate.set(properties.mediaSamplerDopClockGate.value); systolicMode.set(properties.systolicMode.value); } @@ -373,12 +361,11 @@ void PipelineSelectProperties::copyPropertiesSystolicMode(const PipelineSelectPr } bool PipelineSelectProperties::isDirty() const { - return modeSelected.isDirty || mediaSamplerDopClockGate.isDirty || systolicMode.isDirty; + return modeSelected.isDirty || systolicMode.isDirty; } void PipelineSelectProperties::clearIsDirty() { modeSelected.isDirty = false; - mediaSamplerDopClockGate.isDirty = false; systolicMode.isDirty = false; } diff --git a/shared/source/command_stream/stream_properties.h b/shared/source/command_stream/stream_properties.h index 2af315e402..dcf1f57a5f 100644 --- a/shared/source/command_stream/stream_properties.h +++ b/shared/source/command_stream/stream_properties.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2021-2023 Intel Corporation + * Copyright (C) 2021-2025 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -11,6 +11,32 @@ namespace NEO { +struct PipelineSelectPropertiesSupport { + bool systolicMode = false; +}; + +struct PipelineSelectProperties { + StreamProperty modeSelected{}; + StreamProperty systolicMode{}; + + void initSupport(const RootDeviceEnvironment &rootDeviceEnvironment); + void resetState(); + + void setPropertiesAll(bool modeSelected, bool systolicMode); + void setPropertiesModeSelected(bool modeSelected, bool clearDirtyState); + void setPropertySystolicMode(bool systolicMode); + + void copyPropertiesAll(const PipelineSelectProperties &properties); + void copyPropertiesSystolicMode(const PipelineSelectProperties &properties); + + bool isDirty() const; + void clearIsDirty(); + + protected: + PipelineSelectPropertiesSupport pipelineSelectPropertiesSupport = {}; + bool propertiesSupportLoaded = false; +}; + struct StreamProperties { StateComputeModeProperties stateComputeMode{}; FrontEndProperties frontEndState{}; diff --git a/shared/source/gen12lp/command_stream_receiver_hw_gen12lp.cpp b/shared/source/gen12lp/command_stream_receiver_hw_gen12lp.cpp index 4ca2063d0b..63e5757dc4 100644 --- a/shared/source/gen12lp/command_stream_receiver_hw_gen12lp.cpp +++ b/shared/source/gen12lp/command_stream_receiver_hw_gen12lp.cpp @@ -39,13 +39,12 @@ size_t CommandStreamReceiverHw::getRequiredStateBaseAddressSize(const template void CommandStreamReceiverHw::programPipelineSelect(LinearStream &commandStream, PipelineSelectArgs &pipelineSelectArgs) { - if (csrSizeRequestFlags.mediaSamplerConfigChanged || csrSizeRequestFlags.systolicPipelineSelectMode || !isPreambleSent) { + if (csrSizeRequestFlags.systolicPipelineSelectMode || !isPreambleSent) { if (!isPipelineSelectAlreadyProgrammed()) { PreambleHelper::programPipelineSelect(&commandStream, pipelineSelectArgs, peekRootDeviceEnvironment()); } - this->lastMediaSamplerConfig = pipelineSelectArgs.mediaSamplerRequired; this->lastSystolicPipelineSelectMode = pipelineSelectArgs.systolicPipelineSelectMode; - this->streamProperties.pipelineSelect.setPropertiesAll(true, this->lastMediaSamplerConfig, this->lastSystolicPipelineSelectMode); + this->streamProperties.pipelineSelect.setPropertiesAll(true, this->lastSystolicPipelineSelectMode); this->streamProperties.pipelineSelect.clearIsDirty(); } } diff --git a/shared/source/gen12lp/hw_cmds_adlp.h b/shared/source/gen12lp/hw_cmds_adlp.h index 91556cd13f..7ea67bd475 100644 --- a/shared/source/gen12lp/hw_cmds_adlp.h +++ b/shared/source/gen12lp/hw_cmds_adlp.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2021-2023 Intel Corporation + * Copyright (C) 2021-2025 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -26,7 +26,6 @@ struct ADLP : public Gen12LpFamily { static void setupHardwareInfoBase(HardwareInfo *hwInfo, bool setupFeatureTableAndWorkaroundTable, const ReleaseHelper *releaseHelper); struct PipelineSelectStateSupport { - static constexpr bool mediaSamplerDopClockGate = true; static constexpr bool systolicMode = true; }; }; diff --git a/shared/source/gen12lp/hw_cmds_base.h b/shared/source/gen12lp/hw_cmds_base.h index c042f572ef..b2a26d1f1d 100644 --- a/shared/source/gen12lp/hw_cmds_base.h +++ b/shared/source/gen12lp/hw_cmds_base.h @@ -53,7 +53,6 @@ struct Gen12Lp { }; struct PipelineSelectStateSupport { - static constexpr bool mediaSamplerDopClockGate = true; static constexpr bool systolicMode = false; }; diff --git a/shared/source/gen12lp/preamble_gen12lp.cpp b/shared/source/gen12lp/preamble_gen12lp.cpp index 8e8fac3ff2..3b6b897301 100644 --- a/shared/source/gen12lp/preamble_gen12lp.cpp +++ b/shared/source/gen12lp/preamble_gen12lp.cpp @@ -105,7 +105,7 @@ void PreambleHelper::programPipelineSelect(LinearStream *pCommandStream, auto pipeline = pipelineSelectArgs.is3DPipelineRequired ? PIPELINE_SELECT::PIPELINE_SELECTION_3D : PIPELINE_SELECT::PIPELINE_SELECTION_GPGPU; pipelineSelectCmd.setPipelineSelection(pipeline); - pipelineSelectCmd.setMediaSamplerDopClockGateEnable(!pipelineSelectArgs.mediaSamplerRequired); + pipelineSelectCmd.setMediaSamplerDopClockGateEnable(true); if (pipelineSelectArgs.systolicPipelineSelectSupport) { mask |= pipelineSelectSystolicModeEnableMaskBits; diff --git a/shared/source/helpers/pipeline_select_args.h b/shared/source/helpers/pipeline_select_args.h index 892d005e2a..6d4f81d458 100644 --- a/shared/source/helpers/pipeline_select_args.h +++ b/shared/source/helpers/pipeline_select_args.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2019-2022 Intel Corporation + * Copyright (C) 2019-2025 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -10,7 +10,6 @@ namespace NEO { struct PipelineSelectArgs { bool systolicPipelineSelectMode = false; - bool mediaSamplerRequired = false; bool is3DPipelineRequired = false; bool systolicPipelineSelectSupport = false; }; diff --git a/shared/source/os_interface/product_helper.h b/shared/source/os_interface/product_helper.h index 707be88181..ece57b7bf0 100644 --- a/shared/source/os_interface/product_helper.h +++ b/shared/source/os_interface/product_helper.h @@ -213,7 +213,6 @@ class ProductHelper { virtual bool getPreemptionDbgPropertyStateSipSupport() const = 0; virtual bool getPreemptionDbgPropertyCsrSurfaceSupport() const = 0; - virtual bool getPipelineSelectPropertyMediaSamplerDopClockGateSupport() const = 0; virtual bool getPipelineSelectPropertySystolicModeSupport() const = 0; virtual void fillScmPropertiesSupportStructure(StateComputeModePropertiesSupport &propertiesSupport) const = 0; diff --git a/shared/source/os_interface/product_helper.inl b/shared/source/os_interface/product_helper.inl index 77b025a787..3cb995283f 100644 --- a/shared/source/os_interface/product_helper.inl +++ b/shared/source/os_interface/product_helper.inl @@ -779,12 +779,6 @@ void ProductHelperHw::fillFrontEndPropertiesSupportStructure(FrontEn propertiesSupport.singleSliceDispatchCcsMode = getFrontEndPropertySingleSliceDispatchCcsModeSupport(); } -template -bool ProductHelperHw::getPipelineSelectPropertyMediaSamplerDopClockGateSupport() const { - using GfxProduct = typename HwMapper::GfxProduct; - return GfxProduct::PipelineSelectStateSupport::mediaSamplerDopClockGate; -} - template bool ProductHelperHw::getPipelineSelectPropertySystolicModeSupport() const { using GfxProduct = typename HwMapper::GfxProduct; @@ -793,7 +787,6 @@ bool ProductHelperHw::getPipelineSelectPropertySystolicModeSupport() template void ProductHelperHw::fillPipelineSelectPropertiesSupportStructure(PipelineSelectPropertiesSupport &propertiesSupport, const HardwareInfo &hwInfo) const { - propertiesSupport.mediaSamplerDopClockGate = getPipelineSelectPropertyMediaSamplerDopClockGateSupport(); propertiesSupport.systolicMode = isSystolicModeConfigurable(hwInfo); } diff --git a/shared/source/os_interface/product_helper_hw.h b/shared/source/os_interface/product_helper_hw.h index 7876520a86..095952be4d 100644 --- a/shared/source/os_interface/product_helper_hw.h +++ b/shared/source/os_interface/product_helper_hw.h @@ -154,7 +154,6 @@ class ProductHelperHw : public ProductHelper { bool getPreemptionDbgPropertyStateSipSupport() const override; bool getPreemptionDbgPropertyCsrSurfaceSupport() const override; - bool getPipelineSelectPropertyMediaSamplerDopClockGateSupport() const override; bool getPipelineSelectPropertySystolicModeSupport() const override; void fillScmPropertiesSupportStructure(StateComputeModePropertiesSupport &propertiesSupport) const override; diff --git a/shared/source/xe2_hpg_core/hw_cmds_base.h b/shared/source/xe2_hpg_core/hw_cmds_base.h index e182aad7e5..e2e58352f6 100644 --- a/shared/source/xe2_hpg_core/hw_cmds_base.h +++ b/shared/source/xe2_hpg_core/hw_cmds_base.h @@ -60,7 +60,6 @@ struct Xe2HpgCore { }; struct PipelineSelectStateSupport { - static constexpr bool mediaSamplerDopClockGate = false; static constexpr bool systolicMode = false; }; diff --git a/shared/source/xe3_core/hw_cmds_base.h b/shared/source/xe3_core/hw_cmds_base.h index b1988e89c8..54da179864 100644 --- a/shared/source/xe3_core/hw_cmds_base.h +++ b/shared/source/xe3_core/hw_cmds_base.h @@ -62,7 +62,6 @@ struct Xe3Core { }; struct PipelineSelectStateSupport { - static constexpr bool mediaSamplerDopClockGate = false; static constexpr bool systolicMode = false; }; diff --git a/shared/source/xe_hpc_core/hw_cmds_xe_hpc_core_base.h b/shared/source/xe_hpc_core/hw_cmds_xe_hpc_core_base.h index de85af4f0f..e79b83d210 100644 --- a/shared/source/xe_hpc_core/hw_cmds_xe_hpc_core_base.h +++ b/shared/source/xe_hpc_core/hw_cmds_xe_hpc_core_base.h @@ -42,7 +42,6 @@ struct XeHpcCore { }; struct PipelineSelectStateSupport { - static constexpr bool mediaSamplerDopClockGate = false; static constexpr bool systolicMode = true; }; diff --git a/shared/source/xe_hpg_core/hw_cmds_xe_hpg_core_base.h b/shared/source/xe_hpg_core/hw_cmds_xe_hpg_core_base.h index 04116dd11f..be3ec1d582 100644 --- a/shared/source/xe_hpg_core/hw_cmds_xe_hpg_core_base.h +++ b/shared/source/xe_hpg_core/hw_cmds_xe_hpg_core_base.h @@ -60,7 +60,6 @@ struct XeHpgCore { }; struct PipelineSelectStateSupport { - static constexpr bool mediaSamplerDopClockGate = false; static constexpr bool systolicMode = true; }; diff --git a/shared/test/common/fixtures/command_stream_receiver_fixture.inl b/shared/test/common/fixtures/command_stream_receiver_fixture.inl index a9dd93a88c..38de1c427a 100644 --- a/shared/test/common/fixtures/command_stream_receiver_fixture.inl +++ b/shared/test/common/fixtures/command_stream_receiver_fixture.inl @@ -1,5 +1,5 @@ /* - * Copyright (C) 2022-2023 Intel Corporation + * Copyright (C) 2022-2025 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -20,10 +20,8 @@ void CommandStreamReceiverSystolicFixture::testBody() { bool systolicModeSupported = commandStreamReceiver.pipelineSupportFlags.systolicMode; commandStreamReceiver.isPreambleSent = true; - commandStreamReceiver.lastMediaSamplerConfig = false; flushTaskFlags.pipelineSelectArgs.systolicPipelineSelectMode = true; - flushTaskFlags.pipelineSelectArgs.mediaSamplerRequired = false; commandStreamReceiver.flushTask(commandStream, 0, diff --git a/shared/test/common/libult/ult_command_stream_receiver.h b/shared/test/common/libult/ult_command_stream_receiver.h index 2d43bda68e..0d3fec37e0 100644 --- a/shared/test/common/libult/ult_command_stream_receiver.h +++ b/shared/test/common/libult/ult_command_stream_receiver.h @@ -140,7 +140,6 @@ class UltCommandStreamReceiver : public CommandStreamReceiverHw { using BaseClass::CommandStreamReceiver::isStateSipSent; using BaseClass::CommandStreamReceiver::lastAdditionalKernelExecInfo; using BaseClass::CommandStreamReceiver::lastKernelExecutionType; - using BaseClass::CommandStreamReceiver::lastMediaSamplerConfig; using BaseClass::CommandStreamReceiver::lastMemoryCompressionState; using BaseClass::CommandStreamReceiver::lastPreemptionMode; using BaseClass::CommandStreamReceiver::lastSentL3Config; diff --git a/shared/test/common/mocks/mock_product_helper.cpp b/shared/test/common/mocks/mock_product_helper.cpp index a976a7ac3f..dc6b46eb0a 100644 --- a/shared/test/common/mocks/mock_product_helper.cpp +++ b/shared/test/common/mocks/mock_product_helper.cpp @@ -434,7 +434,6 @@ struct UnknownProduct { }; struct PipelineSelectStateSupport { - static constexpr bool mediaSamplerDopClockGate = false; static constexpr bool systolicMode = false; }; 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 d232930346..a56c1d397b 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 @@ -350,7 +350,6 @@ HWTEST_F(CommandStreamReceiverTest, WhenCreatingCsrThenFlagsAreSetCorrectly) { EXPECT_TRUE(csr.stateComputeModeDirty); EXPECT_FALSE(csr.lastVmeSubslicesConfig); EXPECT_EQ(0u, csr.lastSentL3Config); - EXPECT_EQ(-1, csr.lastMediaSamplerConfig); EXPECT_EQ(PreemptionMode::Initial, csr.lastPreemptionMode); EXPECT_EQ(static_cast(-1), csr.latestSentStatelessMocsConfig); } @@ -2808,28 +2807,6 @@ HWTEST_F(CommandStreamReceiverTest, givenPipelineSelectStateNotInitedWhenTransit auto &commandStreamReceiver = pDevice->getUltCommandStreamReceiver(); - commandStreamReceiver.pipelineSupportFlags.systolicMode = false; - commandStreamReceiver.pipelineSupportFlags.mediaSamplerDopClockGate = true; - - dispatchFlags.pipelineSelectArgs.mediaSamplerRequired = false; - commandStreamReceiver.handlePipelineSelectStateTransition(dispatchFlags); - EXPECT_TRUE(commandStreamReceiver.csrSizeRequestFlags.mediaSamplerConfigChanged); - - commandStreamReceiver.pipelineSupportFlags.mediaSamplerDopClockGate = false; - commandStreamReceiver.lastMediaSamplerConfig = -1; - commandStreamReceiver.handlePipelineSelectStateTransition(dispatchFlags); - EXPECT_FALSE(commandStreamReceiver.csrSizeRequestFlags.mediaSamplerConfigChanged); - - commandStreamReceiver.pipelineSupportFlags.mediaSamplerDopClockGate = true; - commandStreamReceiver.lastMediaSamplerConfig = 0; - commandStreamReceiver.handlePipelineSelectStateTransition(dispatchFlags); - EXPECT_FALSE(commandStreamReceiver.csrSizeRequestFlags.mediaSamplerConfigChanged); - - dispatchFlags.pipelineSelectArgs.mediaSamplerRequired = true; - commandStreamReceiver.handlePipelineSelectStateTransition(dispatchFlags); - EXPECT_TRUE(commandStreamReceiver.csrSizeRequestFlags.mediaSamplerConfigChanged); - - commandStreamReceiver.pipelineSupportFlags.mediaSamplerDopClockGate = false; commandStreamReceiver.pipelineSupportFlags.systolicMode = true; commandStreamReceiver.lastSystolicPipelineSelectMode = false; @@ -2856,27 +2833,6 @@ HWTEST_F(CommandStreamReceiverTest, auto &commandStreamReceiver = pDevice->getUltCommandStreamReceiver(); - commandStreamReceiver.pipelineSupportFlags.systolicMode = false; - commandStreamReceiver.pipelineSupportFlags.mediaSamplerDopClockGate = true; - - commandStreamReceiver.streamProperties.pipelineSelect.mediaSamplerDopClockGate.value = 1; - commandStreamReceiver.lastMediaSamplerConfig = -1; - dispatchFlags.pipelineSelectArgs.mediaSamplerRequired = false; - commandStreamReceiver.handlePipelineSelectStateTransition(dispatchFlags); - EXPECT_TRUE(commandStreamReceiver.csrSizeRequestFlags.mediaSamplerConfigChanged); - - commandStreamReceiver.streamProperties.pipelineSelect.mediaSamplerDopClockGate.value = 0; - dispatchFlags.pipelineSelectArgs.mediaSamplerRequired = true; - commandStreamReceiver.handlePipelineSelectStateTransition(dispatchFlags); - EXPECT_TRUE(commandStreamReceiver.csrSizeRequestFlags.mediaSamplerConfigChanged); - - commandStreamReceiver.streamProperties.pipelineSelect.mediaSamplerDopClockGate.value = 0; - commandStreamReceiver.lastMediaSamplerConfig = 1; - dispatchFlags.pipelineSelectArgs.mediaSamplerRequired = false; - commandStreamReceiver.handlePipelineSelectStateTransition(dispatchFlags); - EXPECT_FALSE(commandStreamReceiver.csrSizeRequestFlags.mediaSamplerConfigChanged); - - commandStreamReceiver.pipelineSupportFlags.mediaSamplerDopClockGate = false; commandStreamReceiver.pipelineSupportFlags.systolicMode = true; commandStreamReceiver.streamProperties.pipelineSelect.systolicMode.value = 1; @@ -5618,35 +5574,6 @@ HWTEST2_F(CommandStreamReceiverHwTest, givenSpecialPipelineSelectModeChangedWhen EXPECT_EQ(expectedSize, size); } -HWTEST2_F(CommandStreamReceiverHwTest, givenCsrWhenPreambleSentThenRequiredCsrSizeDependsOnmediaSamplerConfigChanged, IsAtMostXeCore) { - using PIPELINE_SELECT = typename FamilyType::PIPELINE_SELECT; - using PIPE_CONTROL = typename FamilyType::PIPE_CONTROL; - - auto &commandStreamReceiver = pDevice->getUltCommandStreamReceiver(); - CsrSizeRequestFlags csrSizeRequest = {}; - DispatchFlags flags = DispatchFlagsHelper::createDefaultDispatchFlags(); - - commandStreamReceiver.isPreambleSent = true; - - csrSizeRequest.mediaSamplerConfigChanged = false; - commandStreamReceiver.overrideCsrSizeReqFlags(csrSizeRequest); - auto mediaSamplerConfigNotChangedSize = commandStreamReceiver.getRequiredCmdStreamSize(flags, *pDevice); - - csrSizeRequest.mediaSamplerConfigChanged = true; - commandStreamReceiver.overrideCsrSizeReqFlags(csrSizeRequest); - auto mediaSamplerConfigChangedSize = commandStreamReceiver.getRequiredCmdStreamSize(flags, *pDevice); - - EXPECT_NE(mediaSamplerConfigChangedSize, mediaSamplerConfigNotChangedSize); - auto difference = mediaSamplerConfigChangedSize - mediaSamplerConfigNotChangedSize; - - size_t expectedDifference = sizeof(PIPELINE_SELECT); - if (MemorySynchronizationCommands::isBarrierPriorToPipelineSelectWaRequired(pDevice->getRootDeviceEnvironment())) { - expectedDifference += sizeof(PIPE_CONTROL); - } - - EXPECT_EQ(expectedDifference, difference); -} - HWTEST_F(CommandStreamReceiverHwTest, givenPreambleSentWhenEstimatingFlushTaskSizeThenResultDependsOnAdditionalCmdsSize) { auto &commandStreamReceiver = pDevice->getUltCommandStreamReceiver(); diff --git a/shared/test/unit_test/command_stream/stream_properties_tests.cpp b/shared/test/unit_test/command_stream/stream_properties_tests.cpp index 65928d4aa6..8e6bd5f57f 100644 --- a/shared/test/unit_test/command_stream/stream_properties_tests.cpp +++ b/shared/test/unit_test/command_stream/stream_properties_tests.cpp @@ -36,7 +36,6 @@ std::vector getAllFrontEndProperties(FrontEndProperties &prope std::vector getAllPipelineSelectProperties(PipelineSelectProperties &properties) { std::vector allProperties; allProperties.push_back(&properties.modeSelected); - allProperties.push_back(&properties.mediaSamplerDopClockGate); allProperties.push_back(&properties.systolicMode); return allProperties; } diff --git a/shared/test/unit_test/command_stream/stream_properties_tests_common.cpp b/shared/test/unit_test/command_stream/stream_properties_tests_common.cpp index 57435fcf9e..46cafbd6f4 100644 --- a/shared/test/unit_test/command_stream/stream_properties_tests_common.cpp +++ b/shared/test/unit_test/command_stream/stream_properties_tests_common.cpp @@ -759,21 +759,14 @@ TEST(StreamPropertiesTests, whenSettingPipelineSelectPropertiesThenCorrectValueI productHelper.fillPipelineSelectPropertiesSupportStructure(pipelineSelectPropertiesSupport, *defaultHwInfo); for (auto modeSelected : ::testing::Bool()) { - for (auto mediaSamplerDopClockGate : ::testing::Bool()) { - for (auto systolicMode : ::testing::Bool()) { - properties.pipelineSelect.setPropertiesAll(modeSelected, mediaSamplerDopClockGate, systolicMode); + for (auto systolicMode : ::testing::Bool()) { + properties.pipelineSelect.setPropertiesAll(modeSelected, systolicMode); - EXPECT_EQ(modeSelected, properties.pipelineSelect.modeSelected.value); - if (pipelineSelectPropertiesSupport.mediaSamplerDopClockGate) { - EXPECT_EQ(mediaSamplerDopClockGate, properties.pipelineSelect.mediaSamplerDopClockGate.value); - } else { - EXPECT_EQ(-1, properties.pipelineSelect.mediaSamplerDopClockGate.value); - } - if (pipelineSelectPropertiesSupport.systolicMode) { - EXPECT_EQ(systolicMode, properties.pipelineSelect.systolicMode.value); - } else { - EXPECT_EQ(-1, properties.pipelineSelect.systolicMode.value); - } + EXPECT_EQ(modeSelected, properties.pipelineSelect.modeSelected.value); + if (pipelineSelectPropertiesSupport.systolicMode) { + EXPECT_EQ(systolicMode, properties.pipelineSelect.systolicMode.value); + } else { + EXPECT_EQ(-1, properties.pipelineSelect.systolicMode.value); } } } @@ -782,17 +775,16 @@ TEST(StreamPropertiesTests, whenSettingPipelineSelectPropertiesThenCorrectValueI TEST(StreamPropertiesTests, givenModeSelectPipelineSelectPropertyWhenSettingChangedPropertyAndCheckIfDirtyThenExpectDirtyState) { MockPipelineSelectProperties pipeProperties{}; pipeProperties.propertiesSupportLoaded = true; - pipeProperties.pipelineSelectPropertiesSupport.mediaSamplerDopClockGate = true; pipeProperties.pipelineSelectPropertiesSupport.systolicMode = true; constexpr bool constState = false; bool changingState = false; - pipeProperties.setPropertiesAll(changingState, constState, constState); + pipeProperties.setPropertiesAll(changingState, constState); EXPECT_TRUE(pipeProperties.isDirty()); changingState = !changingState; - pipeProperties.setPropertiesAll(changingState, constState, constState); + pipeProperties.setPropertiesAll(changingState, constState); EXPECT_TRUE(pipeProperties.isDirty()); } @@ -800,26 +792,21 @@ TEST(StreamPropertiesTests, givenModeSelectPipelineSelectPropertyWhenSettingChan TEST(StreamPropertiesTests, givenSetAllPipelineSelectPropertiesWhenResettingStateThenResetValuesAndDirtyKeepSupportFlagLoaded) { MockPipelineSelectProperties psProperties{}; psProperties.propertiesSupportLoaded = true; - psProperties.pipelineSelectPropertiesSupport.mediaSamplerDopClockGate = true; psProperties.pipelineSelectPropertiesSupport.systolicMode = true; bool modeSelected = false; - bool mediaSamplerDopClockGate = false; bool systolicMode = true; - psProperties.setPropertiesAll(modeSelected, mediaSamplerDopClockGate, systolicMode); + psProperties.setPropertiesAll(modeSelected, systolicMode); EXPECT_TRUE(psProperties.isDirty()); EXPECT_EQ(0, psProperties.modeSelected.value); - EXPECT_EQ(0, psProperties.mediaSamplerDopClockGate.value); EXPECT_EQ(1, psProperties.systolicMode.value); psProperties.resetState(); EXPECT_FALSE(psProperties.isDirty()); EXPECT_EQ(-1, psProperties.modeSelected.value); - EXPECT_EQ(-1, psProperties.mediaSamplerDopClockGate.value); EXPECT_EQ(-1, psProperties.systolicMode.value); EXPECT_TRUE(psProperties.propertiesSupportLoaded); - EXPECT_TRUE(psProperties.pipelineSelectPropertiesSupport.mediaSamplerDopClockGate); EXPECT_TRUE(psProperties.pipelineSelectPropertiesSupport.systolicMode); } @@ -887,53 +874,29 @@ TEST(StreamPropertiesTests, givenModeSelectedMediaSamplerClockGatePipelineSelect bool clearDirtyState = false; MockPipelineSelectProperties pipeProperties{}; pipeProperties.propertiesSupportLoaded = true; - pipeProperties.pipelineSelectPropertiesSupport.mediaSamplerDopClockGate = false; bool modeSelected = false; - bool mediaSamplerDopClockGate = false; - pipeProperties.setPropertiesModeSelectedMediaSamplerClockGate(modeSelected, mediaSamplerDopClockGate, clearDirtyState); + pipeProperties.setPropertiesModeSelected(modeSelected, clearDirtyState); EXPECT_TRUE(pipeProperties.isDirty()); EXPECT_EQ(0, pipeProperties.modeSelected.value); - EXPECT_EQ(-1, pipeProperties.mediaSamplerDopClockGate.value); - pipeProperties.setPropertiesModeSelectedMediaSamplerClockGate(modeSelected, mediaSamplerDopClockGate, clearDirtyState); + pipeProperties.setPropertiesModeSelected(modeSelected, clearDirtyState); EXPECT_FALSE(pipeProperties.isDirty()); - pipeProperties.pipelineSelectPropertiesSupport.mediaSamplerDopClockGate = true; - pipeProperties.setPropertiesModeSelectedMediaSamplerClockGate(modeSelected, mediaSamplerDopClockGate, clearDirtyState); - EXPECT_TRUE(pipeProperties.isDirty()); - EXPECT_EQ(0, pipeProperties.modeSelected.value); - EXPECT_EQ(0, pipeProperties.mediaSamplerDopClockGate.value); - - pipeProperties.setPropertiesModeSelectedMediaSamplerClockGate(modeSelected, mediaSamplerDopClockGate, clearDirtyState); - EXPECT_FALSE(pipeProperties.isDirty()); - EXPECT_EQ(0, pipeProperties.modeSelected.value); - EXPECT_EQ(0, pipeProperties.mediaSamplerDopClockGate.value); - modeSelected = true; - mediaSamplerDopClockGate = true; - pipeProperties.setPropertiesModeSelectedMediaSamplerClockGate(modeSelected, mediaSamplerDopClockGate, clearDirtyState); + pipeProperties.setPropertiesModeSelected(modeSelected, clearDirtyState); EXPECT_TRUE(pipeProperties.isDirty()); EXPECT_EQ(1, pipeProperties.modeSelected.value); - EXPECT_EQ(1, pipeProperties.mediaSamplerDopClockGate.value); - pipeProperties.setPropertiesModeSelectedMediaSamplerClockGate(modeSelected, mediaSamplerDopClockGate, clearDirtyState); + pipeProperties.setPropertiesModeSelected(modeSelected, clearDirtyState); EXPECT_FALSE(pipeProperties.isDirty()); EXPECT_EQ(1, pipeProperties.modeSelected.value); - EXPECT_EQ(1, pipeProperties.mediaSamplerDopClockGate.value); - - pipeProperties.setPropertiesModeSelectedMediaSamplerClockGate(modeSelected, mediaSamplerDopClockGate, clearDirtyState); - EXPECT_FALSE(pipeProperties.isDirty()); - EXPECT_EQ(1, pipeProperties.modeSelected.value); - EXPECT_EQ(1, pipeProperties.mediaSamplerDopClockGate.value); clearDirtyState = true; modeSelected = false; - mediaSamplerDopClockGate = false; - pipeProperties.setPropertiesModeSelectedMediaSamplerClockGate(modeSelected, mediaSamplerDopClockGate, clearDirtyState); + pipeProperties.setPropertiesModeSelected(modeSelected, clearDirtyState); EXPECT_FALSE(pipeProperties.isDirty()); EXPECT_EQ(0, pipeProperties.modeSelected.value); - EXPECT_EQ(0, pipeProperties.mediaSamplerDopClockGate.value); } TEST(StreamPropertiesTests, givenStateBaseAddressSupportFlagStateWhenSettingPropertyAndCheckIfDirtyThenExpectCleanStateForNotSupportedAndDirtyForSupported) { @@ -1491,9 +1454,8 @@ TEST(StreamPropertiesTests, givenAllStreamPropertiesSetWhenAllStreamPropertiesRe globalStreamProperties.frontEndState.setPropertiesAll(isCooperativeKernel, disableEuFusion, disableOverdispatch); bool modeSelected = false; - bool mediaSamplerDopClockGate = false; bool systolicMode = true; - globalStreamProperties.pipelineSelect.setPropertiesAll(modeSelected, mediaSamplerDopClockGate, systolicMode); + globalStreamProperties.pipelineSelect.setPropertiesAll(modeSelected, systolicMode); int32_t statelessMocs = 1; int64_t bindingTablePoolBaseAddress = 2; @@ -1523,7 +1485,6 @@ TEST(StreamPropertiesTests, givenAllStreamPropertiesSetWhenAllStreamPropertiesRe EXPECT_EQ(-1, globalStreamProperties.frontEndState.singleSliceDispatchCcsMode.value); EXPECT_EQ(-1, globalStreamProperties.pipelineSelect.modeSelected.value); - EXPECT_EQ(-1, globalStreamProperties.pipelineSelect.mediaSamplerDopClockGate.value); EXPECT_EQ(-1, globalStreamProperties.pipelineSelect.systolicMode.value); EXPECT_EQ(-1, globalStreamProperties.stateBaseAddress.statelessMocs.value); diff --git a/shared/test/unit_test/gen12lp/adln/test_product_helper_adln.cpp b/shared/test/unit_test/gen12lp/adln/test_product_helper_adln.cpp index fee45e649d..b27fadf492 100644 --- a/shared/test/unit_test/gen12lp/adln/test_product_helper_adln.cpp +++ b/shared/test/unit_test/gen12lp/adln/test_product_helper_adln.cpp @@ -101,7 +101,6 @@ ADLNTEST_F(AdlnProductHelper, givenProductHelperWhenGetCommandsStreamPropertiesS EXPECT_FALSE(productHelper->getFrontEndPropertyDisableOverDispatchSupport()); EXPECT_FALSE(productHelper->getFrontEndPropertySingleSliceDispatchCcsModeSupport()); - EXPECT_TRUE(productHelper->getPipelineSelectPropertyMediaSamplerDopClockGateSupport()); EXPECT_FALSE(productHelper->getPipelineSelectPropertySystolicModeSupport()); } diff --git a/shared/test/unit_test/gen12lp/adlp/command_stream_receiver_hw_tests_adlp.cpp b/shared/test/unit_test/gen12lp/adlp/command_stream_receiver_hw_tests_adlp.cpp index 5266b04c1e..5ece8e5d76 100644 --- a/shared/test/unit_test/gen12lp/adlp/command_stream_receiver_hw_tests_adlp.cpp +++ b/shared/test/unit_test/gen12lp/adlp/command_stream_receiver_hw_tests_adlp.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2022-2023 Intel Corporation + * Copyright (C) 2022-2025 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -24,10 +24,8 @@ ADLPTEST_F(Gen12LpCommandStreamReceiverHwTests, givenSystolicModeChangedWhenFlus StreamProperties &streamProperties = commandStreamReceiver.getStreamProperties(); commandStreamReceiver.isPreambleSent = true; - commandStreamReceiver.lastMediaSamplerConfig = false; flushTaskFlags.pipelineSelectArgs.systolicPipelineSelectMode = true; - flushTaskFlags.pipelineSelectArgs.mediaSamplerRequired = false; commandStreamReceiver.flushTask(commandStream, 0, diff --git a/shared/test/unit_test/gen12lp/adlp/test_product_helper_adlp.cpp b/shared/test/unit_test/gen12lp/adlp/test_product_helper_adlp.cpp index ee82c43a89..af6d0893e4 100644 --- a/shared/test/unit_test/gen12lp/adlp/test_product_helper_adlp.cpp +++ b/shared/test/unit_test/gen12lp/adlp/test_product_helper_adlp.cpp @@ -108,7 +108,6 @@ ADLPTEST_F(AdlpProductHelper, givenProductHelperWhenGetCommandsStreamPropertiesS EXPECT_FALSE(productHelper->getFrontEndPropertyDisableOverDispatchSupport()); EXPECT_FALSE(productHelper->getFrontEndPropertySingleSliceDispatchCcsModeSupport()); - EXPECT_TRUE(productHelper->getPipelineSelectPropertyMediaSamplerDopClockGateSupport()); EXPECT_TRUE(productHelper->getPipelineSelectPropertySystolicModeSupport()); } diff --git a/shared/test/unit_test/gen12lp/adls/test_product_helper_adls.cpp b/shared/test/unit_test/gen12lp/adls/test_product_helper_adls.cpp index 38aea6aac6..f3f543b771 100644 --- a/shared/test/unit_test/gen12lp/adls/test_product_helper_adls.cpp +++ b/shared/test/unit_test/gen12lp/adls/test_product_helper_adls.cpp @@ -103,7 +103,6 @@ ADLSTEST_F(AdlsProductHelper, givenProductHelperWhenGetCommandsStreamPropertiesS EXPECT_FALSE(productHelper->getFrontEndPropertyDisableOverDispatchSupport()); EXPECT_FALSE(productHelper->getFrontEndPropertySingleSliceDispatchCcsModeSupport()); - EXPECT_TRUE(productHelper->getPipelineSelectPropertyMediaSamplerDopClockGateSupport()); EXPECT_FALSE(productHelper->getPipelineSelectPropertySystolicModeSupport()); } diff --git a/shared/test/unit_test/gen12lp/dg1/test_product_helper_dg1.cpp b/shared/test/unit_test/gen12lp/dg1/test_product_helper_dg1.cpp index a0257935db..d23a79014e 100644 --- a/shared/test/unit_test/gen12lp/dg1/test_product_helper_dg1.cpp +++ b/shared/test/unit_test/gen12lp/dg1/test_product_helper_dg1.cpp @@ -157,6 +157,5 @@ DG1TEST_F(Dg1ProductHelper, givenProductHelperWhenGetCommandsStreamPropertiesSup EXPECT_FALSE(productHelper->getFrontEndPropertyDisableOverDispatchSupport()); EXPECT_FALSE(productHelper->getFrontEndPropertySingleSliceDispatchCcsModeSupport()); - EXPECT_TRUE(productHelper->getPipelineSelectPropertyMediaSamplerDopClockGateSupport()); EXPECT_FALSE(productHelper->getPipelineSelectPropertySystolicModeSupport()); } diff --git a/shared/test/unit_test/gen12lp/rkl/test_product_helper_rkl.cpp b/shared/test/unit_test/gen12lp/rkl/test_product_helper_rkl.cpp index 9dd9dd8b4c..d24a35ea8f 100644 --- a/shared/test/unit_test/gen12lp/rkl/test_product_helper_rkl.cpp +++ b/shared/test/unit_test/gen12lp/rkl/test_product_helper_rkl.cpp @@ -105,7 +105,6 @@ RKLTEST_F(RklProductHelper, givenProductHelperWhenGetCommandsStreamPropertiesSup EXPECT_FALSE(productHelper->getFrontEndPropertyDisableOverDispatchSupport()); EXPECT_FALSE(productHelper->getFrontEndPropertySingleSliceDispatchCcsModeSupport()); - EXPECT_TRUE(productHelper->getPipelineSelectPropertyMediaSamplerDopClockGateSupport()); EXPECT_FALSE(productHelper->getPipelineSelectPropertySystolicModeSupport()); } diff --git a/shared/test/unit_test/gen12lp/tgllp/product_helper_tests_tgllp.cpp b/shared/test/unit_test/gen12lp/tgllp/product_helper_tests_tgllp.cpp index 14a2df83e6..adb23b10fd 100644 --- a/shared/test/unit_test/gen12lp/tgllp/product_helper_tests_tgllp.cpp +++ b/shared/test/unit_test/gen12lp/tgllp/product_helper_tests_tgllp.cpp @@ -193,7 +193,6 @@ TGLLPTEST_F(TgllpProductHelper, givenProductHelperWhenGetCommandsStreamPropertie EXPECT_FALSE(productHelper->getFrontEndPropertyDisableOverDispatchSupport()); EXPECT_FALSE(productHelper->getFrontEndPropertySingleSliceDispatchCcsModeSupport()); - EXPECT_TRUE(productHelper->getPipelineSelectPropertyMediaSamplerDopClockGateSupport()); EXPECT_FALSE(productHelper->getPipelineSelectPropertySystolicModeSupport()); } diff --git a/shared/test/unit_test/os_interface/product_helper_tests.cpp b/shared/test/unit_test/os_interface/product_helper_tests.cpp index a2d5b35b67..5d4f274dfd 100644 --- a/shared/test/unit_test/os_interface/product_helper_tests.cpp +++ b/shared/test/unit_test/os_interface/product_helper_tests.cpp @@ -611,7 +611,6 @@ HWTEST_F(ProductHelperTest, WhenFillingPipelineSelectPropertiesSupportThenExpect PipelineSelectPropertiesSupport pipelineSelectPropertiesSupport = {}; productHelper->fillPipelineSelectPropertiesSupportStructure(pipelineSelectPropertiesSupport, pInHwInfo); - EXPECT_EQ(productHelper->getPipelineSelectPropertyMediaSamplerDopClockGateSupport(), pipelineSelectPropertiesSupport.mediaSamplerDopClockGate); EXPECT_EQ(productHelper->isSystolicModeConfigurable(pInHwInfo), pipelineSelectPropertiesSupport.systolicMode); } diff --git a/shared/test/unit_test/xe2_hpg_core/bmg/product_helper_tests_bmg.cpp b/shared/test/unit_test/xe2_hpg_core/bmg/product_helper_tests_bmg.cpp index 51b3823556..70690f66ef 100644 --- a/shared/test/unit_test/xe2_hpg_core/bmg/product_helper_tests_bmg.cpp +++ b/shared/test/unit_test/xe2_hpg_core/bmg/product_helper_tests_bmg.cpp @@ -64,7 +64,6 @@ BMGTEST_F(BmgProductHelper, givenProductHelperWhenGetCommandsStreamPropertiesSup EXPECT_TRUE(productHelper->getFrontEndPropertyDisableOverDispatchSupport()); EXPECT_TRUE(productHelper->getFrontEndPropertySingleSliceDispatchCcsModeSupport()); - EXPECT_FALSE(productHelper->getPipelineSelectPropertyMediaSamplerDopClockGateSupport()); EXPECT_FALSE(productHelper->getPipelineSelectPropertySystolicModeSupport()); } diff --git a/shared/test/unit_test/xe2_hpg_core/lnl/product_helper_tests_lnl.cpp b/shared/test/unit_test/xe2_hpg_core/lnl/product_helper_tests_lnl.cpp index 78c80acc52..90d1f3f0a5 100644 --- a/shared/test/unit_test/xe2_hpg_core/lnl/product_helper_tests_lnl.cpp +++ b/shared/test/unit_test/xe2_hpg_core/lnl/product_helper_tests_lnl.cpp @@ -64,7 +64,6 @@ LNLTEST_F(LnlProductHelper, givenProductHelperWhenGetCommandsStreamPropertiesSup EXPECT_TRUE(productHelper->getFrontEndPropertyDisableOverDispatchSupport()); EXPECT_TRUE(productHelper->getFrontEndPropertySingleSliceDispatchCcsModeSupport()); - EXPECT_FALSE(productHelper->getPipelineSelectPropertyMediaSamplerDopClockGateSupport()); EXPECT_FALSE(productHelper->getPipelineSelectPropertySystolicModeSupport()); } diff --git a/shared/test/unit_test/xe3_core/product_helper_tests_xe3_core.cpp b/shared/test/unit_test/xe3_core/product_helper_tests_xe3_core.cpp index 6835d3ad45..e04715449f 100644 --- a/shared/test/unit_test/xe3_core/product_helper_tests_xe3_core.cpp +++ b/shared/test/unit_test/xe3_core/product_helper_tests_xe3_core.cpp @@ -56,7 +56,6 @@ XE3_CORETEST_F(Xe3CoreProductHelper, givenProductHelperWhenGetCommandsStreamProp EXPECT_TRUE(productHelper->getFrontEndPropertyDisableOverDispatchSupport()); EXPECT_TRUE(productHelper->getFrontEndPropertySingleSliceDispatchCcsModeSupport()); - EXPECT_FALSE(productHelper->getPipelineSelectPropertyMediaSamplerDopClockGateSupport()); EXPECT_FALSE(productHelper->getPipelineSelectPropertySystolicModeSupport()); } diff --git a/shared/test/unit_test/xe_hpc_core/pvc/test_product_helper_pvc.cpp b/shared/test/unit_test/xe_hpc_core/pvc/test_product_helper_pvc.cpp index f203c17df7..30160af05e 100644 --- a/shared/test/unit_test/xe_hpc_core/pvc/test_product_helper_pvc.cpp +++ b/shared/test/unit_test/xe_hpc_core/pvc/test_product_helper_pvc.cpp @@ -139,7 +139,6 @@ PVCTEST_F(PvcProductHelper, givenProductHelperWhenGetCommandsStreamPropertiesSup EXPECT_TRUE(productHelper->getFrontEndPropertyDisableOverDispatchSupport()); EXPECT_TRUE(productHelper->getFrontEndPropertySingleSliceDispatchCcsModeSupport()); - EXPECT_FALSE(productHelper->getPipelineSelectPropertyMediaSamplerDopClockGateSupport()); EXPECT_TRUE(productHelper->getPipelineSelectPropertySystolicModeSupport()); } diff --git a/shared/test/unit_test/xe_hpg_core/dg2/test_product_helper_dg2.cpp b/shared/test/unit_test/xe_hpg_core/dg2/test_product_helper_dg2.cpp index 6a368059c5..138c6f46cf 100644 --- a/shared/test/unit_test/xe_hpg_core/dg2/test_product_helper_dg2.cpp +++ b/shared/test/unit_test/xe_hpg_core/dg2/test_product_helper_dg2.cpp @@ -80,7 +80,6 @@ DG2TEST_F(Dg2ProductHelper, givenProductHelperWhenGetCommandsStreamPropertiesSup EXPECT_TRUE(productHelper->getFrontEndPropertyDisableOverDispatchSupport()); EXPECT_TRUE(productHelper->getFrontEndPropertySingleSliceDispatchCcsModeSupport()); - EXPECT_FALSE(productHelper->getPipelineSelectPropertyMediaSamplerDopClockGateSupport()); EXPECT_TRUE(productHelper->getPipelineSelectPropertySystolicModeSupport()); } 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 57c333aea9..07a06ca3cf 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 @@ -232,7 +232,6 @@ HWTEST2_F(XeLpgProductHelperTests, givenProductHelperWhenGetCommandsStreamProper EXPECT_TRUE(productHelper->getFrontEndPropertyDisableOverDispatchSupport()); EXPECT_TRUE(productHelper->getFrontEndPropertySingleSliceDispatchCcsModeSupport()); - EXPECT_FALSE(productHelper->getPipelineSelectPropertyMediaSamplerDopClockGateSupport()); EXPECT_TRUE(productHelper->getPipelineSelectPropertySystolicModeSupport()); }