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 8762eaa59d..53c732952f 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 @@ -1123,7 +1123,7 @@ HWTEST2_F(CommandStreamReceiverFlushTaskTests, givenSpecialPipelineSelectModeCha size_t size = commandStreamReceiver.getCmdSizeForPipelineSelect(); size_t expectedSize = sizeof(PIPELINE_SELECT); - if (MemorySynchronizationCommands::isBarrierlPriorToPipelineSelectWaRequired(pDevice->getRootDeviceEnvironment())) { + if (MemorySynchronizationCommands::isBarrierPriorToPipelineSelectWaRequired(pDevice->getRootDeviceEnvironment())) { expectedSize += sizeof(PIPE_CONTROL); } EXPECT_EQ(expectedSize, size); @@ -1151,7 +1151,7 @@ HWTEST2_F(CommandStreamReceiverFlushTaskTests, givenCsrWhenPreambleSentThenRequi auto difference = mediaSamplerConfigChangedSize - mediaSamplerConfigNotChangedSize; size_t expectedDifference = sizeof(PIPELINE_SELECT); - if (MemorySynchronizationCommands::isBarrierlPriorToPipelineSelectWaRequired(pDevice->getRootDeviceEnvironment())) { + if (MemorySynchronizationCommands::isBarrierPriorToPipelineSelectWaRequired(pDevice->getRootDeviceEnvironment())) { expectedDifference += sizeof(PIPE_CONTROL); } diff --git a/shared/source/gen12lp/gfx_core_helper_gen12lp.cpp b/shared/source/gen12lp/gfx_core_helper_gen12lp.cpp index f53c6d70d3..ac5e93286a 100644 --- a/shared/source/gen12lp/gfx_core_helper_gen12lp.cpp +++ b/shared/source/gen12lp/gfx_core_helper_gen12lp.cpp @@ -184,7 +184,7 @@ bool MemorySynchronizationCommands::isBarrierWaRequired(const RootDevice } template <> -bool MemorySynchronizationCommands::isBarrierlPriorToPipelineSelectWaRequired(const RootDeviceEnvironment &rootDeviceEnvironment) { +bool MemorySynchronizationCommands::isBarrierPriorToPipelineSelectWaRequired(const RootDeviceEnvironment &rootDeviceEnvironment) { return MemorySynchronizationCommands::isBarrierWaRequired(rootDeviceEnvironment); } diff --git a/shared/source/gen12lp/preamble_gen12lp.cpp b/shared/source/gen12lp/preamble_gen12lp.cpp index fa62721f6c..f5a6a3152f 100644 --- a/shared/source/gen12lp/preamble_gen12lp.cpp +++ b/shared/source/gen12lp/preamble_gen12lp.cpp @@ -38,7 +38,7 @@ void PreambleHelper::programPipelineSelect(LinearStream *pCommandStream, using PIPELINE_SELECT = typename Family::PIPELINE_SELECT; - if (MemorySynchronizationCommands::isBarrierlPriorToPipelineSelectWaRequired(rootDeviceEnvironment)) { + if (MemorySynchronizationCommands::isBarrierPriorToPipelineSelectWaRequired(rootDeviceEnvironment)) { PipeControlArgs args; args.renderTargetCacheFlushEnable = true; MemorySynchronizationCommands::addSingleBarrier(*pCommandStream, args); diff --git a/shared/source/helpers/gfx_core_helper.h b/shared/source/helpers/gfx_core_helper.h index b1b703ff4d..1853b2c77d 100644 --- a/shared/source/helpers/gfx_core_helper.h +++ b/shared/source/helpers/gfx_core_helper.h @@ -442,7 +442,7 @@ struct MemorySynchronizationCommands { static size_t getSizeForFullCacheFlush(); static bool isBarrierWaRequired(const RootDeviceEnvironment &rootDeviceEnvironment); - static bool isBarrierlPriorToPipelineSelectWaRequired(const RootDeviceEnvironment &rootDeviceEnvironment); + static bool isBarrierPriorToPipelineSelectWaRequired(const RootDeviceEnvironment &rootDeviceEnvironment); static void setBarrierExtraProperties(void *barrierCmd, PipeControlArgs &args); }; diff --git a/shared/source/helpers/gfx_core_helper_base.inl b/shared/source/helpers/gfx_core_helper_base.inl index 2f7645bda5..d7217525e4 100644 --- a/shared/source/helpers/gfx_core_helper_base.inl +++ b/shared/source/helpers/gfx_core_helper_base.inl @@ -548,7 +548,7 @@ bool GfxCoreHelperHw::useSystemMemoryPlacementForISA(const HardwareIn } template -bool MemorySynchronizationCommands::isBarrierlPriorToPipelineSelectWaRequired(const RootDeviceEnvironment &rootDeviceEnvironment) { +bool MemorySynchronizationCommands::isBarrierPriorToPipelineSelectWaRequired(const RootDeviceEnvironment &rootDeviceEnvironment) { return false; } diff --git a/shared/source/helpers/preamble_base.inl b/shared/source/helpers/preamble_base.inl index 4ca0f00bbe..cd51fd7d3a 100644 --- a/shared/source/helpers/preamble_base.inl +++ b/shared/source/helpers/preamble_base.inl @@ -58,7 +58,7 @@ size_t PreambleHelper::getCmdSizeForPipelineSelect(const RootDeviceEn size_t size = 0; using PIPELINE_SELECT = typename GfxFamily::PIPELINE_SELECT; size += sizeof(PIPELINE_SELECT); - if (MemorySynchronizationCommands::isBarrierlPriorToPipelineSelectWaRequired(rootDeviceEnvironment)) { + if (MemorySynchronizationCommands::isBarrierPriorToPipelineSelectWaRequired(rootDeviceEnvironment)) { size += sizeof(PIPE_CONTROL); } return size; diff --git a/shared/test/unit_test/gen12lp/coherency_tests_gen12lp.inl b/shared/test/unit_test/gen12lp/coherency_tests_gen12lp.inl index 4ba5004394..1f3b88dc14 100644 --- a/shared/test/unit_test/gen12lp/coherency_tests_gen12lp.inl +++ b/shared/test/unit_test/gen12lp/coherency_tests_gen12lp.inl @@ -242,7 +242,7 @@ GEN12LPTEST_F(Gen12LpCoherencyRequirements, givenCoherencyRequirementWithoutShar }; flushTask(false); - if (MemorySynchronizationCommands::isBarrierlPriorToPipelineSelectWaRequired(device->getRootDeviceEnvironment())) { + if (MemorySynchronizationCommands::isBarrierPriorToPipelineSelectWaRequired(device->getRootDeviceEnvironment())) { findCmd(true, false, true); // first time } else { findCmd(true, false, false); // first time diff --git a/shared/test/unit_test/gen12lp/test_command_encoder_gen12lp.cpp b/shared/test/unit_test/gen12lp/test_command_encoder_gen12lp.cpp index 9718170a31..74c0b9a47d 100644 --- a/shared/test/unit_test/gen12lp/test_command_encoder_gen12lp.cpp +++ b/shared/test/unit_test/gen12lp/test_command_encoder_gen12lp.cpp @@ -164,7 +164,7 @@ GEN12LPTEST_F(CommandEncodeStatesTest, givenGen12LpPlatformWhenAdjustPipelineSel using PIPELINE_SELECT = typename FamilyType::PIPELINE_SELECT; size_t barrierSize = 0; - if (MemorySynchronizationCommands::isBarrierlPriorToPipelineSelectWaRequired(pDevice->getRootDeviceEnvironment())) { + if (MemorySynchronizationCommands::isBarrierPriorToPipelineSelectWaRequired(pDevice->getRootDeviceEnvironment())) { barrierSize = MemorySynchronizationCommands::getSizeForSingleBarrier(false); }