diff --git a/opencl/test/unit_test/command_stream/command_stream_receiver_hw_1_tests.cpp b/opencl/test/unit_test/command_stream/command_stream_receiver_hw_1_tests.cpp index bc3ef5ac14..f01461f0b9 100644 --- a/opencl/test/unit_test/command_stream/command_stream_receiver_hw_1_tests.cpp +++ b/opencl/test/unit_test/command_stream/command_stream_receiver_hw_1_tests.cpp @@ -694,7 +694,7 @@ HWTEST_F(BcsTests, givenBlitPropertiesContainerWhenEstimatingCommandsSizeThenCal waArgs.isWaRequired = false; auto baseSize = EncodeMiFlushDW::getCommandSizeWithWa(waArgs) + sizeof(typename FamilyType::MI_BATCH_BUFFER_END); - size_t cmdsSizePerBlit = sizeof(typename FamilyType::XY_COPY_BLT) + EncodeMiArbCheck::getCommandSizeWithWa(waArgs) + dummyBlitWaSize; + size_t cmdsSizePerBlit = sizeof(typename FamilyType::XY_COPY_BLT) + EncodeMiArbCheck::getCommandSize() + dummyBlitWaSize; if (BlitCommandsHelper::miArbCheckWaRequired()) { cmdsSizePerBlit += EncodeMiFlushDW::getCommandSizeWithWa(waArgs); @@ -737,7 +737,7 @@ HWTEST_F(BcsTests, givenBlitPropertiesContainerWhenDirectsubmissionEnabledEstima size_t dummyBlitWaSize = BlitCommandsHelper::getDummyBlitSize(waArgs); waArgs.isWaRequired = false; auto baseSize = EncodeMiFlushDW::getCommandSizeWithWa(waArgs) + sizeof(typename FamilyType::MI_BATCH_BUFFER_START); - size_t cmdsSizePerBlit = sizeof(typename FamilyType::XY_COPY_BLT) + EncodeMiArbCheck::getCommandSizeWithWa(waArgs) + dummyBlitWaSize; + size_t cmdsSizePerBlit = sizeof(typename FamilyType::XY_COPY_BLT) + EncodeMiArbCheck::getCommandSize() + dummyBlitWaSize; if (BlitCommandsHelper::miArbCheckWaRequired()) { cmdsSizePerBlit += EncodeMiFlushDW::getCommandSizeWithWa(waArgs); @@ -778,7 +778,7 @@ HWTEST_F(BcsTests, givenBlitPropertiesContainerWhenEstimatingCommandsSizeForWrit EncodeDummyBlitWaArgs waArgs{true, &(pDevice->getRootDeviceEnvironmentRef())}; size_t dummyBlitWaSize = BlitCommandsHelper::getDummyBlitSize(waArgs); waArgs.isWaRequired = false; - size_t cmdsSizePerBlit = sizeof(typename FamilyType::XY_COPY_BLT) + EncodeMiArbCheck::getCommandSizeWithWa(waArgs) + dummyBlitWaSize; + size_t cmdsSizePerBlit = sizeof(typename FamilyType::XY_COPY_BLT) + EncodeMiArbCheck::getCommandSize() + dummyBlitWaSize; if (BlitCommandsHelper::miArbCheckWaRequired()) { cmdsSizePerBlit += EncodeMiFlushDW::getCommandSizeWithWa(waArgs); @@ -820,7 +820,7 @@ HWTEST_F(BcsTests, givenBlitPropertiesContainerWhenDirectSubmissionEnabledEstima EncodeDummyBlitWaArgs waArgs{true, &(pDevice->getRootDeviceEnvironmentRef())}; size_t dummyBlitWaSize = BlitCommandsHelper::getDummyBlitSize(waArgs); waArgs.isWaRequired = false; - size_t cmdsSizePerBlit = sizeof(typename FamilyType::XY_COPY_BLT) + EncodeMiArbCheck::getCommandSizeWithWa(waArgs) + dummyBlitWaSize; + size_t cmdsSizePerBlit = sizeof(typename FamilyType::XY_COPY_BLT) + EncodeMiArbCheck::getCommandSize() + dummyBlitWaSize; if (BlitCommandsHelper::miArbCheckWaRequired()) { cmdsSizePerBlit += EncodeMiFlushDW::getCommandSizeWithWa(waArgs); @@ -858,7 +858,7 @@ HWTEST_F(BcsTests, givenTimestampPacketWriteRequestWhenEstimatingSizeForCommands EncodeDummyBlitWaArgs waArgs{true, &(pDevice->getRootDeviceEnvironmentRef())}; size_t dummyBlitWaSize = BlitCommandsHelper::getDummyBlitSize(waArgs); waArgs.isWaRequired = false; - size_t expectedBaseSize = sizeof(typename FamilyType::XY_COPY_BLT) + EncodeMiArbCheck::getCommandSizeWithWa(waArgs) + dummyBlitWaSize; + size_t expectedBaseSize = sizeof(typename FamilyType::XY_COPY_BLT) + EncodeMiArbCheck::getCommandSize() + dummyBlitWaSize; if (BlitCommandsHelper::miArbCheckWaRequired()) { expectedBaseSize += EncodeMiFlushDW::getCommandSizeWithWa(waArgs); @@ -884,7 +884,7 @@ HWTEST_F(BcsTests, givenTimestampPacketWriteRequestWhenEstimatingSizeForCommands EncodeDummyBlitWaArgs waArgs{true, &(pDevice->getRootDeviceEnvironmentRef())}; size_t dummyBlitWaSize = BlitCommandsHelper::getDummyBlitSize(waArgs); waArgs.isWaRequired = false; - size_t expectedBaseSize = sizeof(typename FamilyType::XY_COPY_BLT) + EncodeMiArbCheck::getCommandSizeWithWa(waArgs) + dummyBlitWaSize; + size_t expectedBaseSize = sizeof(typename FamilyType::XY_COPY_BLT) + EncodeMiArbCheck::getCommandSize() + dummyBlitWaSize; if (BlitCommandsHelper::miArbCheckWaRequired()) { expectedBaseSize += EncodeMiFlushDW::getCommandSizeWithWa(waArgs); @@ -920,7 +920,7 @@ HWTEST_F(BcsTests, givenBltSizeAndCsrDependenciesWhenEstimatingCommandSizeThenAd EncodeDummyBlitWaArgs waArgs{true, &(pDevice->getRootDeviceEnvironmentRef())}; size_t dummyBlitWaSize = BlitCommandsHelper::getDummyBlitSize(waArgs); waArgs.isWaRequired = false; - size_t cmdsSizePerBlit = sizeof(typename FamilyType::XY_COPY_BLT) + EncodeMiArbCheck::getCommandSizeWithWa(waArgs) + dummyBlitWaSize; + size_t cmdsSizePerBlit = sizeof(typename FamilyType::XY_COPY_BLT) + EncodeMiArbCheck::getCommandSize() + dummyBlitWaSize; if (BlitCommandsHelper::miArbCheckWaRequired()) { cmdsSizePerBlit += EncodeMiFlushDW::getCommandSizeWithWa(waArgs); @@ -952,7 +952,7 @@ HWTEST_F(BcsTests, givenBltSizeWithCsrDependenciesAndRelaxedOrderingWhenEstimati EncodeDummyBlitWaArgs waArgs{true, &(pDevice->getRootDeviceEnvironmentRef())}; size_t dummyBlitWaSize = BlitCommandsHelper::getDummyBlitSize(waArgs); waArgs.isWaRequired = false; - size_t cmdsSizePerBlit = sizeof(typename FamilyType::XY_COPY_BLT) + EncodeMiArbCheck::getCommandSizeWithWa(waArgs) + dummyBlitWaSize; + size_t cmdsSizePerBlit = sizeof(typename FamilyType::XY_COPY_BLT) + EncodeMiArbCheck::getCommandSize() + dummyBlitWaSize; if (BlitCommandsHelper::miArbCheckWaRequired()) { cmdsSizePerBlit += EncodeMiFlushDW::getCommandSizeWithWa(waArgs); @@ -977,7 +977,7 @@ HWTEST_F(BcsTests, givenImageAndBufferWhenEstimateBlitCommandSizeThenReturnCorre EncodeDummyBlitWaArgs waArgs{true, &(pDevice->getRootDeviceEnvironmentRef())}; size_t dummyBlitWaSize = BlitCommandsHelper::getDummyBlitSize(waArgs); waArgs.isWaRequired = false; - auto expectedSize = EncodeMiArbCheck::getCommandSizeWithWa(waArgs) + dummyBlitWaSize; + auto expectedSize = EncodeMiArbCheck::getCommandSize() + dummyBlitWaSize; expectedSize += isImage ? sizeof(typename FamilyType::XY_BLOCK_COPY_BLT) : sizeof(typename FamilyType::XY_COPY_BLT); if (BlitCommandsHelper::miArbCheckWaRequired()) { diff --git a/opencl/test/unit_test/command_stream/command_stream_receiver_hw_2_tests.cpp b/opencl/test/unit_test/command_stream/command_stream_receiver_hw_2_tests.cpp index 885289ce7b..afb9adaa63 100644 --- a/opencl/test/unit_test/command_stream/command_stream_receiver_hw_2_tests.cpp +++ b/opencl/test/unit_test/command_stream/command_stream_receiver_hw_2_tests.cpp @@ -41,7 +41,7 @@ HWTEST_F(BcsTests, givenBltSizeWhenEstimatingCommandSizeThenAddAllRequiredComman EncodeDummyBlitWaArgs waArgs{true, &(pDevice->getRootDeviceEnvironmentRef())}; size_t dummyBlitWaSize = BlitCommandsHelper::getDummyBlitSize(waArgs); waArgs.isWaRequired = false; - size_t cmdsSizePerBlit = sizeof(typename FamilyType::XY_COPY_BLT) + EncodeMiArbCheck::getCommandSizeWithWa(waArgs) + dummyBlitWaSize; + size_t cmdsSizePerBlit = sizeof(typename FamilyType::XY_COPY_BLT) + EncodeMiArbCheck::getCommandSize() + dummyBlitWaSize; if (BlitCommandsHelper::miArbCheckWaRequired()) { cmdsSizePerBlit += EncodeMiFlushDW::getCommandSizeWithWa(waArgs); @@ -79,7 +79,7 @@ HWTEST_F(BcsTests, givenDebugCapabilityWhenEstimatingCommandSizeThenAddAllRequir EncodeDummyBlitWaArgs waArgs{true, &(pDevice->getRootDeviceEnvironmentRef())}; size_t dummyBlitWaSize = BlitCommandsHelper::getDummyBlitSize(waArgs); waArgs.isWaRequired = false; - size_t cmdsSizePerBlit = sizeof(typename FamilyType::XY_COPY_BLT) + EncodeMiArbCheck::getCommandSizeWithWa(waArgs) + dummyBlitWaSize; + size_t cmdsSizePerBlit = sizeof(typename FamilyType::XY_COPY_BLT) + EncodeMiArbCheck::getCommandSize() + dummyBlitWaSize; if (BlitCommandsHelper::miArbCheckWaRequired()) { cmdsSizePerBlit += EncodeMiFlushDW::getCommandSizeWithWa(waArgs); @@ -110,7 +110,7 @@ HWTEST_F(BcsTests, givenRelaxedOrderingEnabledWhenEstimatingCommandSizeThenAddAl EncodeDummyBlitWaArgs waArgs{true, &(pDevice->getRootDeviceEnvironmentRef())}; size_t dummyBlitWaSize = BlitCommandsHelper::getDummyBlitSize(waArgs); waArgs.isWaRequired = false; - size_t cmdsSizePerBlit = sizeof(typename FamilyType::XY_COPY_BLT) + EncodeMiArbCheck::getCommandSizeWithWa(waArgs) + dummyBlitWaSize; + size_t cmdsSizePerBlit = sizeof(typename FamilyType::XY_COPY_BLT) + EncodeMiArbCheck::getCommandSize() + dummyBlitWaSize; if (BlitCommandsHelper::miArbCheckWaRequired()) { cmdsSizePerBlit += EncodeMiFlushDW::getCommandSizeWithWa(waArgs); @@ -142,7 +142,7 @@ HWTEST_F(BcsTests, givenBltSizeWhenEstimatingCommandSizeForReadBufferRectThenAdd EncodeDummyBlitWaArgs waArgs{true, &(pDevice->getRootDeviceEnvironmentRef())}; size_t dummyBlitWaSize = BlitCommandsHelper::getDummyBlitSize(waArgs); waArgs.isWaRequired = false; - size_t cmdsSizePerBlit = sizeof(typename FamilyType::XY_COPY_BLT) + EncodeMiArbCheck::getCommandSizeWithWa(waArgs) + dummyBlitWaSize; + size_t cmdsSizePerBlit = sizeof(typename FamilyType::XY_COPY_BLT) + EncodeMiArbCheck::getCommandSize() + dummyBlitWaSize; if (BlitCommandsHelper::miArbCheckWaRequired()) { cmdsSizePerBlit += EncodeMiFlushDW::getCommandSizeWithWa(waArgs); @@ -180,7 +180,7 @@ HWTEST_F(BcsTests, givenBltWithBigCopySizeWhenEstimatingCommandSizeForReadBuffer EncodeDummyBlitWaArgs waArgs{true, &(pDevice->getRootDeviceEnvironmentRef())}; size_t dummyBlitWaSize = BlitCommandsHelper::getDummyBlitSize(waArgs); waArgs.isWaRequired = false; - size_t cmdsSizePerBlit = sizeof(typename FamilyType::XY_COPY_BLT) + EncodeMiArbCheck::getCommandSizeWithWa(waArgs) + dummyBlitWaSize; + size_t cmdsSizePerBlit = sizeof(typename FamilyType::XY_COPY_BLT) + EncodeMiArbCheck::getCommandSize() + dummyBlitWaSize; if (BlitCommandsHelper::miArbCheckWaRequired()) { cmdsSizePerBlit += EncodeMiFlushDW::getCommandSizeWithWa(waArgs); diff --git a/shared/source/command_container/command_encoder.h b/shared/source/command_container/command_encoder.h index d20406e4bd..44da50161c 100644 --- a/shared/source/command_container/command_encoder.h +++ b/shared/source/command_container/command_encoder.h @@ -541,12 +541,10 @@ template struct EncodeMiArbCheck { using MI_ARB_CHECK = typename GfxFamily::MI_ARB_CHECK; - static void programWithWa(LinearStream &commandStream, std::optional preParserDisable, EncodeDummyBlitWaArgs &waArgs); - static size_t getCommandSizeWithWa(const EncodeDummyBlitWaArgs &waArgs); - - protected: static void program(LinearStream &commandStream, std::optional preParserDisable); static size_t getCommandSize(); + + protected: static void adjust(MI_ARB_CHECK &miArbCheck, std::optional preParserDisable); }; diff --git a/shared/source/command_container/command_encoder.inl b/shared/source/command_container/command_encoder.inl index 4a5f4d1f18..480fe10466 100644 --- a/shared/source/command_container/command_encoder.inl +++ b/shared/source/command_container/command_encoder.inl @@ -1041,17 +1041,6 @@ void EncodeMiArbCheck::program(LinearStream &commandStream, std::optiona template size_t EncodeMiArbCheck::getCommandSize() { return sizeof(MI_ARB_CHECK); } -template -void EncodeMiArbCheck::programWithWa(LinearStream &commandStream, std::optional preParserDisable, EncodeDummyBlitWaArgs &waArgs) { - BlitCommandsHelper::dispatchDummyBlit(commandStream, waArgs); - EncodeMiArbCheck::program(commandStream, preParserDisable); -} - -template -size_t EncodeMiArbCheck::getCommandSizeWithWa(const EncodeDummyBlitWaArgs &waArgs) { - return EncodeMiArbCheck::getCommandSize() + BlitCommandsHelper::getDummyBlitSize(waArgs); -} - template inline void EncodeNoop::alignToCacheLine(LinearStream &commandStream) { auto used = commandStream.getUsed(); diff --git a/shared/source/debugger/debugger_l0_tgllp_and_later.inl b/shared/source/debugger/debugger_l0_tgllp_and_later.inl index 0fac6b97e6..813d2fd22a 100644 --- a/shared/source/debugger/debugger_l0_tgllp_and_later.inl +++ b/shared/source/debugger/debugger_l0_tgllp_and_later.inl @@ -1,5 +1,5 @@ /* - * Copyright (C) 2022-2023 Intel Corporation + * Copyright (C) 2022-2024 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -11,12 +11,11 @@ namespace NEO { template size_t DebuggerL0Hw::getSbaTrackingCommandsSize(size_t trackedAddressCount) { if (singleAddressSpaceSbaTracking) { - NEO::EncodeDummyBlitWaArgs waArgs{false}; constexpr uint32_t aluCmdSize = sizeof(typename GfxFamily::MI_MATH) + sizeof(typename GfxFamily::MI_MATH_ALU_INST_INLINE) * RegisterConstants::numAluInstForReadModifyWrite; - return 2 * (EncodeMiArbCheck::getCommandSizeWithWa(waArgs) + sizeof(typename GfxFamily::MI_BATCH_BUFFER_START)) + + return 2 * (EncodeMiArbCheck::getCommandSize() + sizeof(typename GfxFamily::MI_BATCH_BUFFER_START)) + trackedAddressCount * (sizeof(typename GfxFamily::MI_LOAD_REGISTER_IMM) + aluCmdSize + 2 * sizeof(typename GfxFamily::MI_STORE_REGISTER_MEM) + 3 * sizeof(typename GfxFamily::MI_STORE_DATA_IMM) + - EncodeMiArbCheck::getCommandSizeWithWa(waArgs) + + EncodeMiArbCheck::getCommandSize() + sizeof(typename GfxFamily::MI_BATCH_BUFFER_START)); } return trackedAddressCount * NEO::EncodeStoreMemory::getStoreDataImmSize(); @@ -59,9 +58,8 @@ void DebuggerL0Hw::programSbaTrackingCommandsSingleAddressSpace(NEO:: const auto cmdStreamCpuBase = reinterpret_cast(cmdStream.getCpuBase()); auto bbLevel = useFirstLevelBB ? MI_BATCH_BUFFER_START::SECOND_LEVEL_BATCH_BUFFER_FIRST_LEVEL_BATCH : MI_BATCH_BUFFER_START::SECOND_LEVEL_BATCH_BUFFER_SECOND_LEVEL_BATCH; - EncodeDummyBlitWaArgs waArgs{false}; if (fieldOffsetAndValue.size()) { - EncodeMiArbCheck::programWithWa(cmdStream, true, waArgs); + EncodeMiArbCheck::program(cmdStream, true); // Jump to SDI command that is modified auto newBuffer = cmdStream.getSpaceForCmd(); @@ -89,7 +87,7 @@ void DebuggerL0Hw::programSbaTrackingCommandsSingleAddressSpace(NEO:: auto miStoreDataSettingSbaBufferAddress = cmdStream.getSpaceForCmd(); auto miStoreDataSettingSbaBufferAddress2 = cmdStream.getSpaceForCmd(); - EncodeMiArbCheck::programWithWa(cmdStream, true, waArgs); + EncodeMiArbCheck::program(cmdStream, true); // Jump to SDI command that is modified auto newBuffer = cmdStream.getSpaceForCmd(); @@ -150,7 +148,7 @@ void DebuggerL0Hw::programSbaTrackingCommandsSingleAddressSpace(NEO:: bbCmd.setSecondLevelBatchBuffer(bbLevel); *previousBuffer = bbCmd; - EncodeMiArbCheck::programWithWa(cmdStream, false, waArgs); + EncodeMiArbCheck::program(cmdStream, false); } } diff --git a/shared/source/direct_submission/direct_submission_hw.inl b/shared/source/direct_submission/direct_submission_hw.inl index 774fc1f0d5..658b96863f 100644 --- a/shared/source/direct_submission/direct_submission_hw.inl +++ b/shared/source/direct_submission/direct_submission_hw.inl @@ -238,8 +238,7 @@ void DirectSubmissionHw::dispatchStaticRelaxedOrderingSch using MI_LOAD_REGISTER_IMM = typename GfxFamily::MI_LOAD_REGISTER_IMM; - EncodeDummyBlitWaArgs waArgs{false, const_cast(&this->rootDeviceEnvironment)}; - EncodeMiArbCheck::programWithWa(schedulerCmdStream, std::nullopt, waArgs); + EncodeMiArbCheck::program(schedulerCmdStream, std::nullopt); if (debugManager.flags.DirectSubmissionRelaxedOrderingQueueSizeLimit.get() != -1) { currentRelaxedOrderingQueueSize = static_cast(debugManager.flags.DirectSubmissionRelaxedOrderingQueueSizeLimit.get()); diff --git a/shared/source/direct_submission/direct_submission_prefetch_mitigation_xe_hp_core_and_later.inl b/shared/source/direct_submission/direct_submission_prefetch_mitigation_xe_hp_core_and_later.inl index 4518c68725..ebf769b63a 100644 --- a/shared/source/direct_submission/direct_submission_prefetch_mitigation_xe_hp_core_and_later.inl +++ b/shared/source/direct_submission/direct_submission_prefetch_mitigation_xe_hp_core_and_later.inl @@ -1,5 +1,5 @@ /* - * Copyright (C) 2021-2023 Intel Corporation + * Copyright (C) 2021-2024 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -21,8 +21,7 @@ inline size_t DirectSubmissionHw::getSizePrefetchMitigati template inline size_t DirectSubmissionHw::getSizeDisablePrefetcher() { - EncodeDummyBlitWaArgs waArgs{false, const_cast(&this->rootDeviceEnvironment)}; - return EncodeMiArbCheck::getCommandSizeWithWa(waArgs); + return EncodeMiArbCheck::getCommandSize(); } } // namespace NEO \ No newline at end of file diff --git a/shared/source/direct_submission/direct_submission_prefetcher_pvc_and_later.inl b/shared/source/direct_submission/direct_submission_prefetcher_pvc_and_later.inl index df5c652e13..ae3e8b3b95 100644 --- a/shared/source/direct_submission/direct_submission_prefetcher_pvc_and_later.inl +++ b/shared/source/direct_submission/direct_submission_prefetcher_pvc_and_later.inl @@ -1,5 +1,5 @@ /* - * Copyright (C) 2021-2023 Intel Corporation + * Copyright (C) 2021-2024 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -13,8 +13,7 @@ template inline void DirectSubmissionHw::dispatchDisablePrefetcher(bool disable) { if (isDisablePrefetcherRequired) { - EncodeDummyBlitWaArgs waArgs{false, const_cast(&this->rootDeviceEnvironment)}; - EncodeMiArbCheck::programWithWa(ringCommandStream, disable, waArgs); + EncodeMiArbCheck::program(ringCommandStream, disable); } } diff --git a/shared/source/direct_submission/direct_submission_prefetcher_xe_hp_core_and_later.inl b/shared/source/direct_submission/direct_submission_prefetcher_xe_hp_core_and_later.inl index df5c652e13..ae3e8b3b95 100644 --- a/shared/source/direct_submission/direct_submission_prefetcher_xe_hp_core_and_later.inl +++ b/shared/source/direct_submission/direct_submission_prefetcher_xe_hp_core_and_later.inl @@ -1,5 +1,5 @@ /* - * Copyright (C) 2021-2023 Intel Corporation + * Copyright (C) 2021-2024 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -13,8 +13,7 @@ template inline void DirectSubmissionHw::dispatchDisablePrefetcher(bool disable) { if (isDisablePrefetcherRequired) { - EncodeDummyBlitWaArgs waArgs{false, const_cast(&this->rootDeviceEnvironment)}; - EncodeMiArbCheck::programWithWa(ringCommandStream, disable, waArgs); + EncodeMiArbCheck::program(ringCommandStream, disable); } } diff --git a/shared/source/helpers/blit_commands_helper_base.inl b/shared/source/helpers/blit_commands_helper_base.inl index 1792d36177..9b8d6ce756 100644 --- a/shared/source/helpers/blit_commands_helper_base.inl +++ b/shared/source/helpers/blit_commands_helper_base.inl @@ -66,7 +66,7 @@ void BlitCommandsHelper::dispatchPostBlitCommand(LinearStream &linear if (debugManager.flags.PostBlitCommand.get() != BlitterConstants::PostBlitMode::defaultMode) { switch (debugManager.flags.PostBlitCommand.get()) { case BlitterConstants::PostBlitMode::miArbCheck: - EncodeMiArbCheck::programWithWa(linearStream, std::nullopt, waArgs); + EncodeMiArbCheck::program(linearStream, std::nullopt); return; case BlitterConstants::PostBlitMode::miFlush: EncodeMiFlushDW::programWithWa(linearStream, 0, 0, args); @@ -81,7 +81,7 @@ void BlitCommandsHelper::dispatchPostBlitCommand(LinearStream &linear args.waArgs.isWaRequired = false; } - EncodeMiArbCheck::programWithWa(linearStream, std::nullopt, waArgs); + EncodeMiArbCheck::program(linearStream, std::nullopt); } template @@ -91,7 +91,7 @@ size_t BlitCommandsHelper::estimatePostBlitCommandSize(const RootDevi if (debugManager.flags.PostBlitCommand.get() != BlitterConstants::PostBlitMode::defaultMode) { switch (debugManager.flags.PostBlitCommand.get()) { case BlitterConstants::PostBlitMode::miArbCheck: - return EncodeMiArbCheck::getCommandSizeWithWa(waArgs); + return EncodeMiArbCheck::getCommandSize(); case BlitterConstants::PostBlitMode::miFlush: return EncodeMiFlushDW::getCommandSizeWithWa(waArgs); default: @@ -101,9 +101,8 @@ size_t BlitCommandsHelper::estimatePostBlitCommandSize(const RootDevi size_t size = 0u; if (BlitCommandsHelper::miArbCheckWaRequired()) { size += EncodeMiFlushDW::getCommandSizeWithWa(waArgs); - waArgs.isWaRequired = false; } - size += EncodeMiArbCheck::getCommandSizeWithWa(waArgs); + size += EncodeMiArbCheck::getCommandSize(); return size; } diff --git a/shared/test/unit_test/command_container/command_encoder_tests.cpp b/shared/test/unit_test/command_container/command_encoder_tests.cpp index 819c57d3de..52a0a8eab6 100644 --- a/shared/test/unit_test/command_container/command_encoder_tests.cpp +++ b/shared/test/unit_test/command_container/command_encoder_tests.cpp @@ -384,8 +384,7 @@ HWCMDTEST_F(IGFX_XE_HP_CORE, CommandEncoderTests, givenDebugFlagSetWhenProgrammi auto &rootDeviceEnvironment = *executionEnvironment.rootDeviceEnvironments[0]; rootDeviceEnvironment.initGmm(); - EncodeDummyBlitWaArgs waArgs{}; - EncodeMiArbCheck::programWithWa(linearStream, false, waArgs); + EncodeMiArbCheck::program(linearStream, false); if (value == 0) { EXPECT_TRUE(buffer[0].getPreParserDisable()); diff --git a/shared/test/unit_test/debugger/test_l0_debugger_single_address_space.cpp b/shared/test/unit_test/debugger/test_l0_debugger_single_address_space.cpp index 3a15d92c4f..3174eab37e 100644 --- a/shared/test/unit_test/debugger/test_l0_debugger_single_address_space.cpp +++ b/shared/test/unit_test/debugger/test_l0_debugger_single_address_space.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2021-2023 Intel Corporation + * Copyright (C) 2021-2024 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -148,19 +148,19 @@ HWTEST2_P(L0DebuggerBBlevelParameterizedTest, GivenNonZeroSbaAddressesWhenProgra GenCmdList cmdList; ASSERT_TRUE(FamilyType::Parse::parseCommandBuffer(cmdList, cmdStream.getCpuBase(), cmdStream.getUsed())); - size_t sizeExpected = EncodeMiArbCheck::getCommandSizeWithWa(EncodeDummyBlitWaArgs{}) + sizeof(MI_BATCH_BUFFER_START); + size_t sizeExpected = EncodeMiArbCheck::getCommandSize() + sizeof(MI_BATCH_BUFFER_START); for (int i = 0; i < 6; i++) { sizeExpected += NEO::EncodeSetMMIO::sizeIMM; sizeExpected += NEO::EncodeMath::streamCommandSize; sizeExpected += 2 * sizeof(MI_STORE_REGISTER_MEM); sizeExpected += 2 * sizeof(MI_STORE_DATA_IMM); - sizeExpected += EncodeMiArbCheck::getCommandSizeWithWa(EncodeDummyBlitWaArgs{}); + sizeExpected += EncodeMiArbCheck::getCommandSize(); sizeExpected += sizeof(MI_BATCH_BUFFER_START); sizeExpected += sizeof(MI_STORE_DATA_IMM); } - sizeExpected += EncodeMiArbCheck::getCommandSizeWithWa(EncodeDummyBlitWaArgs{}) + sizeof(MI_BATCH_BUFFER_START); + sizeExpected += EncodeMiArbCheck::getCommandSize() + sizeof(MI_BATCH_BUFFER_START); EXPECT_EQ(sizeExpected, cmdStream.getUsed()); @@ -260,17 +260,17 @@ HWTEST2_P(L0DebuggerBBlevelParameterizedTest, GivenOneNonZeroSbaAddressesWhenPro GenCmdList cmdList; ASSERT_TRUE(FamilyType::Parse::parseCommandBuffer(cmdList, cmdStream.getCpuBase(), cmdStream.getUsed())); - size_t sizeExpected = EncodeMiArbCheck::getCommandSizeWithWa(EncodeDummyBlitWaArgs{}) + sizeof(MI_BATCH_BUFFER_START); + size_t sizeExpected = EncodeMiArbCheck::getCommandSize() + sizeof(MI_BATCH_BUFFER_START); sizeExpected += NEO::EncodeSetMMIO::sizeIMM; sizeExpected += NEO::EncodeMath::streamCommandSize; sizeExpected += 2 * sizeof(MI_STORE_REGISTER_MEM); sizeExpected += 2 * sizeof(MI_STORE_DATA_IMM); - sizeExpected += EncodeMiArbCheck::getCommandSizeWithWa(EncodeDummyBlitWaArgs{}); + sizeExpected += EncodeMiArbCheck::getCommandSize(); sizeExpected += sizeof(MI_BATCH_BUFFER_START); sizeExpected += sizeof(MI_STORE_DATA_IMM); - sizeExpected += EncodeMiArbCheck::getCommandSizeWithWa(EncodeDummyBlitWaArgs{}) + sizeof(MI_BATCH_BUFFER_START); + sizeExpected += EncodeMiArbCheck::getCommandSize() + sizeof(MI_BATCH_BUFFER_START); EXPECT_EQ(sizeExpected, cmdStream.getUsed()); EXPECT_EQ(sizeExpected, debugger->getSbaTrackingCommandsSize(1)); diff --git a/shared/test/unit_test/direct_submission/direct_submission_tests_2.cpp b/shared/test/unit_test/direct_submission/direct_submission_tests_2.cpp index b59c00bcaf..a318fc6b4b 100644 --- a/shared/test/unit_test/direct_submission/direct_submission_tests_2.cpp +++ b/shared/test/unit_test/direct_submission/direct_submission_tests_2.cpp @@ -1568,7 +1568,7 @@ HWTEST2_F(DirectSubmissionRelaxedOrderingTests, givenNewNumberOfClientsWhenDispa const uint64_t expectedQueueSizeValueVa = directSubmission.relaxedOrderingSchedulerAllocation->getGpuAddress() + RelaxedOrderingHelper::StaticSchedulerSizeAndOffsetSection::drainRequestSectionStart + - EncodeMiArbCheck::getCommandSizeWithWa(EncodeDummyBlitWaArgs{}) + + EncodeMiArbCheck::getCommandSize() + RelaxedOrderingHelper::getQueueSizeLimitValueOffset(); auto findStaticSchedulerUpdate = [&](LinearStream &cs, size_t offset, uint32_t expectedQueueSize) { diff --git a/shared/test/unit_test/direct_submission/direct_submission_tests_xe_hpc_core.cpp b/shared/test/unit_test/direct_submission/direct_submission_tests_xe_hpc_core.cpp index 369920a3d9..2a57a0c608 100644 --- a/shared/test/unit_test/direct_submission/direct_submission_tests_xe_hpc_core.cpp +++ b/shared/test/unit_test/direct_submission/direct_submission_tests_xe_hpc_core.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2022-2023 Intel Corporation + * Copyright (C) 2022-2024 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -22,7 +22,7 @@ XE_HPC_CORETEST_F(DirectSubmissionTestXeHpcCore, givenXeHpcCoreWhenDispatchDisab MockDirectSubmissionHw directSubmission(*pDevice->getDefaultEngine().commandStreamReceiver); - EXPECT_EQ(EncodeMiArbCheck::getCommandSizeWithWa(EncodeDummyBlitWaArgs{}), directSubmission.getSizeDisablePrefetcher()); + EXPECT_EQ(EncodeMiArbCheck::getCommandSize(), directSubmission.getSizeDisablePrefetcher()); bool ret = directSubmission.allocateResources(); EXPECT_TRUE(ret); diff --git a/shared/test/unit_test/helpers/blit_commands_helper_tests.cpp b/shared/test/unit_test/helpers/blit_commands_helper_tests.cpp index 42a15ac8f0..797ac8d9d3 100644 --- a/shared/test/unit_test/helpers/blit_commands_helper_tests.cpp +++ b/shared/test/unit_test/helpers/blit_commands_helper_tests.cpp @@ -155,11 +155,9 @@ HWTEST_F(BlitTests, givenDebugVariablesWhenGettingMaxBlitSizeThenHonorUseProvide HWTEST_F(BlitTests, givenDebugVariableWhenEstimatingPostBlitsCommandSizeThenReturnCorrectResult) { EncodeDummyBlitWaArgs waArgs{true, &(pDevice->getRootDeviceEnvironmentRef())}; - size_t dummyBlitWaSize = BlitCommandsHelper::getDummyBlitSize(waArgs); - waArgs.isWaRequired = false; DebugManagerStateRestore restore{}; - size_t arbCheckSize = EncodeMiArbCheck::getCommandSizeWithWa(waArgs) + dummyBlitWaSize; + size_t arbCheckSize = EncodeMiArbCheck::getCommandSize(); size_t expectedDefaultSize = arbCheckSize; if (BlitCommandsHelper::miArbCheckWaRequired()) { @@ -187,7 +185,7 @@ HWTEST_F(BlitTests, givenDebugVariableWhenDispatchingPostBlitsCommandThenUseCorr LinearStream linearStream{streamBuffer, sizeof(streamBuffer)}; GenCmdList commands{}; EncodeDummyBlitWaArgs waArgs{false, &(pDevice->getRootDeviceEnvironmentRef())}; - size_t expectedDefaultSize = EncodeMiArbCheck::getCommandSizeWithWa(waArgs) + BlitCommandsHelper::getDummyBlitSize(waArgs); + size_t expectedDefaultSize = EncodeMiArbCheck::getCommandSize() + BlitCommandsHelper::getDummyBlitSize(waArgs); if (BlitCommandsHelper::miArbCheckWaRequired()) { expectedDefaultSize += EncodeMiFlushDW::getCommandSizeWithWa(waArgs);