From afee8814efce3714f72ca44fa2f04d7b1edd1757 Mon Sep 17 00:00:00 2001 From: Maciej Plewka Date: Wed, 24 Jul 2024 11:27:35 +0000 Subject: [PATCH] refactor: get ioh alignment from static function Signed-off-by: Maciej Plewka --- .../test_cmdlist_append_launch_kernel_2.cpp | 3 +-- .../cmdlist/test_cmdlist_xehp_and_later.cpp | 2 +- .../helpers/hardware_commands_helper_base.inl | 4 ++-- .../command_queue/dispatch_walker_tests.cpp | 2 +- shared/source/command_container/command_encoder.h | 1 + .../command_encoder_pre_xe2_hpg_core.inl | 13 +++++++++++++ .../command_encoder_xe2_hpg_core_and_later.inl | 10 ++++++++-- .../command_encoder_xehp_and_later.inl | 2 +- shared/source/gen11/command_encoder_gen11.cpp | 5 +++-- shared/source/gen12lp/command_encoder_gen12lp.cpp | 5 +++-- shared/source/gen8/command_encoder_gen8.cpp | 5 +++-- shared/source/gen9/command_encoder_gen9.cpp | 5 +++-- shared/source/helpers/gfx_core_helper.h | 2 -- shared/source/helpers/gfx_core_helper_base.inl | 5 ----- .../helpers/gfx_core_helper_xe2_and_later.inl | 9 --------- .../xe2_hpg_core/command_encoder_xe2_hpg_core.cpp | 6 +++++- .../xe_hpc_core/command_encoder_xe_hpc_core.cpp | 1 + .../xe_hpg_core/command_encoder_xe_hpg_core.cpp | 1 + .../common/test_macros/header/common_matchers.h | 1 + .../encoders/test_encode_dispatch_kernel.cpp | 14 ++++++++++++++ ...test_encode_dispatch_kernel_xehp_and_later.cpp | 6 +++--- .../helpers/gfx_core_helper_xe2_and_later.cpp | 15 --------------- 22 files changed, 65 insertions(+), 52 deletions(-) create mode 100644 shared/source/command_container/command_encoder_pre_xe2_hpg_core.inl diff --git a/level_zero/core/test/unit_tests/sources/cmdlist/test_cmdlist_append_launch_kernel_2.cpp b/level_zero/core/test/unit_tests/sources/cmdlist/test_cmdlist_append_launch_kernel_2.cpp index ab1b5d7fb7..48f37009e9 100644 --- a/level_zero/core/test/unit_tests/sources/cmdlist/test_cmdlist_append_launch_kernel_2.cpp +++ b/level_zero/core/test/unit_tests/sources/cmdlist/test_cmdlist_append_launch_kernel_2.cpp @@ -997,11 +997,10 @@ struct CmdlistAppendLaunchKernelWithImplicitArgsTests : CmdlistAppendLaunchKerne EXPECT_EQ(ZE_RESULT_SUCCESS, result); const auto &rootDeviceEnvironment = device->getNEODevice()->getRootDeviceEnvironment(); - const auto &gfxCoreHelper = device->getNEODevice()->getGfxCoreHelper(); implicitArgsProgrammingSize = ImplicitArgsHelper::getSizeForImplicitArgsPatching(&expectedImplicitArgs, *kernelDescriptor, !kernelRequiresGenerationOfLocalIdsByRuntime, rootDeviceEnvironment); auto sizeCrossThreadData = kernel->getCrossThreadDataSize(); auto sizePerThreadDataForWholeGroup = kernel->getPerThreadDataSizeForWholeThreadGroup(); - EXPECT_EQ(indirectHeap->getUsed(), alignUp(sizeCrossThreadData + sizePerThreadDataForWholeGroup + implicitArgsProgrammingSize, gfxCoreHelper.getIOHAlignment())); + EXPECT_EQ(indirectHeap->getUsed(), alignUp(sizeCrossThreadData + sizePerThreadDataForWholeGroup + implicitArgsProgrammingSize, NEO::EncodeDispatchKernel::getDefaultIOHAlignment())); if (FamilyType::supportsCmdSet(IGFX_XE_HP_CORE)) { expectedImplicitArgs.localIdTablePtr = indirectHeapAllocation->getGpuAddress(); diff --git a/level_zero/core/test/unit_tests/sources/cmdlist/test_cmdlist_xehp_and_later.cpp b/level_zero/core/test/unit_tests/sources/cmdlist/test_cmdlist_xehp_and_later.cpp index e4d1869ac8..289ddf28be 100644 --- a/level_zero/core/test/unit_tests/sources/cmdlist/test_cmdlist_xehp_and_later.cpp +++ b/level_zero/core/test/unit_tests/sources/cmdlist/test_cmdlist_xehp_and_later.cpp @@ -3018,7 +3018,7 @@ HWTEST2_F(CommandListAppendLaunchKernel, auto ioh = commandContainer.getIndirectHeap(NEO::IndirectHeapType::indirectObject); size_t totalSize = 1024 + 64; - size_t expectedSize = alignUp(totalSize, device->getGfxCoreHelper().getIOHAlignment()); + size_t expectedSize = alignUp(totalSize, NEO::EncodeDispatchKernel::getDefaultIOHAlignment()); EXPECT_EQ(expectedSize, ioh->getUsed()); } diff --git a/opencl/source/helpers/hardware_commands_helper_base.inl b/opencl/source/helpers/hardware_commands_helper_base.inl index eec3926c31..2b06abe1c0 100644 --- a/opencl/source/helpers/hardware_commands_helper_base.inl +++ b/opencl/source/helpers/hardware_commands_helper_base.inl @@ -76,7 +76,7 @@ size_t HardwareCommandsHelper::getSizeRequiredIOH(const Kernel &kerne if (pImplicitArgs) { size += ImplicitArgsHelper::getSizeForImplicitArgsPatching(pImplicitArgs, kernelDescriptor, isHwLocalIdGeneration, rootDeviceEnvironment); } - return alignUp(size, rootDeviceEnvironment.getHelper().getIOHAlignment()); + return alignUp(size, NEO::EncodeDispatchKernel::getDefaultIOHAlignment()); } template @@ -347,7 +347,7 @@ size_t HardwareCommandsHelper::sendIndirectState( WalkerType::INDIRECTDATASTARTADDRESS_ALIGN_SIZE); walkerCmd->setIndirectDataLength(indirectDataLength); - ioh.align(kernel.getGfxCoreHelper().getIOHAlignment()); + ioh.align(NEO::EncodeDispatchKernel::getDefaultIOHAlignment()); } return offsetCrossThreadData; diff --git a/opencl/test/unit_test/command_queue/dispatch_walker_tests.cpp b/opencl/test/unit_test/command_queue/dispatch_walker_tests.cpp index ec4e7f2f30..aa081b391a 100644 --- a/opencl/test/unit_test/command_queue/dispatch_walker_tests.cpp +++ b/opencl/test/unit_test/command_queue/dispatch_walker_tests.cpp @@ -1385,7 +1385,7 @@ HWTEST_F(DispatchWalkerTest, WhenKernelRequiresImplicitArgsThenIohRequiresMoreSp HardwareCommandsHelper::getPerThreadDataSizeTotal(simdSize, grfSize, numGrf, numChannels, Math::computeTotalElementsCount(workGroupSize), false, rootDeviceEnvironment) + ImplicitArgsHelper::getSizeForImplicitArgsPatching(kernelWithImplicitArgs.getImplicitArgs(), kernelWithImplicitArgs.getDescriptor(), false, rootDeviceEnvironment); - size = alignUp(size, pClDevice->getGfxCoreHelper().getIOHAlignment()); + size = alignUp(size, NEO::EncodeDispatchKernel::getDefaultIOHAlignment()); EXPECT_EQ(size, iohSizeWithImplicitArgs); } } diff --git a/shared/source/command_container/command_encoder.h b/shared/source/command_container/command_encoder.h index 3a0082faa2..86228ae471 100644 --- a/shared/source/command_container/command_encoder.h +++ b/shared/source/command_container/command_encoder.h @@ -200,6 +200,7 @@ struct EncodeDispatchKernel { return BINDING_TABLE_STATE::SURFACESTATEPOINTER_ALIGN_SIZE; } + static size_t getDefaultIOHAlignment(); template static void setScratchAddress(uint64_t &scratchAddress, uint32_t requiredScratchSlot0Size, uint32_t requiredScratchSlot1Size, IndirectHeap *ssh, CommandStreamReceiver &csr); template diff --git a/shared/source/command_container/command_encoder_pre_xe2_hpg_core.inl b/shared/source/command_container/command_encoder_pre_xe2_hpg_core.inl new file mode 100644 index 0000000000..23d10f1412 --- /dev/null +++ b/shared/source/command_container/command_encoder_pre_xe2_hpg_core.inl @@ -0,0 +1,13 @@ +/* + * Copyright (C) 2024 Intel Corporation + * + * SPDX-License-Identifier: MIT + * + */ + +namespace NEO { +template +size_t EncodeDispatchKernel::getDefaultIOHAlignment() { + return 1; +} +} // namespace NEO \ No newline at end of file diff --git a/shared/source/command_container/command_encoder_xe2_hpg_core_and_later.inl b/shared/source/command_container/command_encoder_xe2_hpg_core_and_later.inl index 6a711598dc..3c62ec0b10 100644 --- a/shared/source/command_container/command_encoder_xe2_hpg_core_and_later.inl +++ b/shared/source/command_container/command_encoder_xe2_hpg_core_and_later.inl @@ -6,7 +6,13 @@ */ namespace NEO { -template <> -void EncodeSurfaceState::setCoherencyType(Family::RENDER_SURFACE_STATE *surfaceState, Family::RENDER_SURFACE_STATE::COHERENCY_TYPE coherencyType) { +template +size_t EncodeDispatchKernel::getDefaultIOHAlignment() { + size_t alignment = Family::cacheLineSize; + if (NEO::debugManager.flags.ForceIOHAlignment.get() != -1) { + alignment = static_cast(debugManager.flags.ForceIOHAlignment.get()); + } + return alignment; } + } // namespace NEO \ No newline at end of file diff --git a/shared/source/command_container/command_encoder_xehp_and_later.inl b/shared/source/command_container/command_encoder_xehp_and_later.inl index d4c931b9e4..f7a4bbc3fc 100644 --- a/shared/source/command_container/command_encoder_xehp_and_later.inl +++ b/shared/source/command_container/command_encoder_xehp_and_later.inl @@ -329,7 +329,7 @@ void EncodeDispatchKernel::encode(CommandContainer &container, EncodeDis walkerCmd.setIndirectDataStartAddress(static_cast(offsetThreadData)); walkerCmd.setIndirectDataLength(sizeThreadData); - container.getIndirectHeap(HeapType::indirectObject)->align(rootDeviceEnvironment.getHelper().getIOHAlignment()); + container.getIndirectHeap(HeapType::indirectObject)->align(NEO::EncodeDispatchKernel::getDefaultIOHAlignment()); } EncodeDispatchKernel::encodeThreadData(walkerCmd, diff --git a/shared/source/gen11/command_encoder_gen11.cpp b/shared/source/gen11/command_encoder_gen11.cpp index 33bea71c6a..7fb47c1c82 100644 --- a/shared/source/gen11/command_encoder_gen11.cpp +++ b/shared/source/gen11/command_encoder_gen11.cpp @@ -6,14 +6,15 @@ */ #include "shared/source/command_container/command_encoder.h" +#include "shared/source/command_container/command_encoder.inl" +#include "shared/source/command_container/command_encoder_bdw_and_later.inl" +#include "shared/source/command_container/command_encoder_pre_xe2_hpg_core.inl" #include "shared/source/gen11/hw_cmds_base.h" #include "shared/source/gen11/reg_configs.h" #include "shared/source/gen_common/reg_configs_common.h" using Family = NEO::Gen11Family; -#include "shared/source/command_container/command_encoder.inl" -#include "shared/source/command_container/command_encoder_bdw_and_later.inl" #include "shared/source/command_container/command_encoder_heap_addressing.inl" #include "shared/source/command_container/encode_compute_mode_bdw_and_later.inl" #include "shared/source/command_container/image_surface_state/compression_params_bdw_and_later.inl" diff --git a/shared/source/gen12lp/command_encoder_gen12lp.cpp b/shared/source/gen12lp/command_encoder_gen12lp.cpp index 1a7a8452fa..8ef8c4b96d 100644 --- a/shared/source/gen12lp/command_encoder_gen12lp.cpp +++ b/shared/source/gen12lp/command_encoder_gen12lp.cpp @@ -6,6 +6,9 @@ */ #include "shared/source/command_container/command_encoder.h" +#include "shared/source/command_container/command_encoder.inl" +#include "shared/source/command_container/command_encoder_bdw_and_later.inl" +#include "shared/source/command_container/command_encoder_pre_xe2_hpg_core.inl" #include "shared/source/command_stream/stream_properties.h" #include "shared/source/gen12lp/hw_cmds_base.h" #include "shared/source/gen12lp/reg_configs.h" @@ -17,8 +20,6 @@ using Family = NEO::Gen12LpFamily; -#include "shared/source/command_container/command_encoder.inl" -#include "shared/source/command_container/command_encoder_bdw_and_later.inl" #include "shared/source/command_container/command_encoder_heap_addressing.inl" #include "shared/source/command_container/command_encoder_tgllp_and_later.inl" #include "shared/source/command_container/encode_compute_mode_tgllp_and_later.inl" diff --git a/shared/source/gen8/command_encoder_gen8.cpp b/shared/source/gen8/command_encoder_gen8.cpp index d9ddb09c6b..9905b6ea0f 100644 --- a/shared/source/gen8/command_encoder_gen8.cpp +++ b/shared/source/gen8/command_encoder_gen8.cpp @@ -6,13 +6,14 @@ */ #include "shared/source/command_container/command_encoder.h" +#include "shared/source/command_container/command_encoder.inl" +#include "shared/source/command_container/command_encoder_bdw_and_later.inl" +#include "shared/source/command_container/command_encoder_pre_xe2_hpg_core.inl" #include "shared/source/gen8/hw_cmds_base.h" #include "shared/source/gen8/reg_configs.h" using Family = NEO::Gen8Family; -#include "shared/source/command_container/command_encoder.inl" -#include "shared/source/command_container/command_encoder_bdw_and_later.inl" #include "shared/source/command_container/command_encoder_heap_addressing.inl" #include "shared/source/command_container/encode_compute_mode_bdw_and_later.inl" #include "shared/source/command_container/image_surface_state/compression_params_bdw_and_later.inl" diff --git a/shared/source/gen9/command_encoder_gen9.cpp b/shared/source/gen9/command_encoder_gen9.cpp index 7c6dbd9421..ca44111503 100644 --- a/shared/source/gen9/command_encoder_gen9.cpp +++ b/shared/source/gen9/command_encoder_gen9.cpp @@ -6,13 +6,14 @@ */ #include "shared/source/command_container/command_encoder.h" +#include "shared/source/command_container/command_encoder.inl" +#include "shared/source/command_container/command_encoder_bdw_and_later.inl" +#include "shared/source/command_container/command_encoder_pre_xe2_hpg_core.inl" #include "shared/source/gen9/hw_cmds_base.h" #include "shared/source/gen9/reg_configs.h" using Family = NEO::Gen9Family; -#include "shared/source/command_container/command_encoder.inl" -#include "shared/source/command_container/command_encoder_bdw_and_later.inl" #include "shared/source/command_container/command_encoder_heap_addressing.inl" #include "shared/source/command_container/encode_compute_mode_bdw_and_later.inl" #include "shared/source/command_container/image_surface_state/compression_params_bdw_and_later.inl" diff --git a/shared/source/helpers/gfx_core_helper.h b/shared/source/helpers/gfx_core_helper.h index 738ebde06b..fd7a526b5c 100644 --- a/shared/source/helpers/gfx_core_helper.h +++ b/shared/source/helpers/gfx_core_helper.h @@ -160,7 +160,6 @@ class GfxCoreHelper { virtual size_t getMax3dImageWidthOrHeight() const = 0; virtual uint64_t getMaxMemAllocSize() const = 0; virtual uint64_t getPatIndex(CacheRegion cacheRegion, CachePolicy cachePolicy) const = 0; - virtual size_t getIOHAlignment() const = 0; virtual bool isStatelessToStatefulWithOffsetSupported() const = 0; virtual void encodeBufferSurfaceState(EncodeSurfaceStateArgs &args) const = 0; virtual bool platformSupportsImplicitScaling(const NEO::RootDeviceEnvironment &rootDeviceEnvironment) const = 0; @@ -399,7 +398,6 @@ class GfxCoreHelperHw : public GfxCoreHelper { size_t getMax3dImageWidthOrHeight() const override; uint64_t getMaxMemAllocSize() const override; uint64_t getPatIndex(CacheRegion cacheRegion, CachePolicy cachePolicy) const override; - size_t getIOHAlignment() const override; bool isStatelessToStatefulWithOffsetSupported() const override; void encodeBufferSurfaceState(EncodeSurfaceStateArgs &args) const override; bool platformSupportsImplicitScaling(const NEO::RootDeviceEnvironment &rootDeviceEnvironment) const override; diff --git a/shared/source/helpers/gfx_core_helper_base.inl b/shared/source/helpers/gfx_core_helper_base.inl index 02c2cfd883..3ad499b9ae 100644 --- a/shared/source/helpers/gfx_core_helper_base.inl +++ b/shared/source/helpers/gfx_core_helper_base.inl @@ -670,11 +670,6 @@ uint64_t GfxCoreHelperHw::getPatIndex(CacheRegion cacheRegion, CacheP return -1; } -template -size_t GfxCoreHelperHw::getIOHAlignment() const { - return 1; -} - template bool GfxCoreHelperHw::copyThroughLockedPtrEnabled(const HardwareInfo &hwInfo, const ProductHelper &productHelper) const { if (debugManager.flags.ExperimentalCopyThroughLock.get() != -1) { diff --git a/shared/source/helpers/gfx_core_helper_xe2_and_later.inl b/shared/source/helpers/gfx_core_helper_xe2_and_later.inl index 36167b8827..2671a00403 100644 --- a/shared/source/helpers/gfx_core_helper_xe2_and_later.inl +++ b/shared/source/helpers/gfx_core_helper_xe2_and_later.inl @@ -22,15 +22,6 @@ void GfxCoreHelperHw::applyAdditionalCompressionSettings(Gmm &gmm, bool } } -template <> -size_t GfxCoreHelperHw::getIOHAlignment() const { - size_t alignment = 256; - if (debugManager.flags.ForceIOHAlignment.get() != -1) { - alignment = static_cast(debugManager.flags.ForceIOHAlignment.get()); - } - return alignment; -} - template <> void GfxCoreHelperHw::applyRenderCompressionFlag(Gmm &gmm, uint32_t isCompressed) const {} diff --git a/shared/source/xe2_hpg_core/command_encoder_xe2_hpg_core.cpp b/shared/source/xe2_hpg_core/command_encoder_xe2_hpg_core.cpp index 432b1250cd..684f9d9389 100644 --- a/shared/source/xe2_hpg_core/command_encoder_xe2_hpg_core.cpp +++ b/shared/source/xe2_hpg_core/command_encoder_xe2_hpg_core.cpp @@ -8,6 +8,7 @@ #include "shared/source/command_container/command_encoder.h" #include "shared/source/command_container/command_encoder.inl" #include "shared/source/command_container/command_encoder_heap_addressing.inl" +#include "shared/source/command_container/command_encoder_xe2_hpg_core_and_later.inl" #include "shared/source/command_container/command_encoder_xehp_and_later.inl" #include "shared/source/command_container/encode_compute_mode_tgllp_and_later.inl" #include "shared/source/command_stream/stream_properties.h" @@ -20,7 +21,6 @@ using Family = NEO::Xe2HpgCoreFamily; #include "shared/source/command_container/command_encoder_tgllp_and_later.inl" -#include "shared/source/command_container/command_encoder_xe2_hpg_core_and_later.inl" #include "shared/source/command_container/command_encoder_xe_hpc_core_and_later.inl" #include "shared/source/command_container/command_encoder_xe_hpg_core_and_later.inl" #include "shared/source/command_container/image_surface_state/compression_params_xehp_and_later.inl" @@ -333,6 +333,10 @@ void EncodeDispatchKernel::adjustWalkOrder(WalkerType &walkerCmd, uint32 } } +template <> +void EncodeSurfaceState::setCoherencyType(Family::RENDER_SURFACE_STATE *surfaceState, Family::RENDER_SURFACE_STATE::COHERENCY_TYPE coherencyType) { +} + } // namespace NEO #include "shared/source/command_container/command_encoder_enablers.inl" diff --git a/shared/source/xe_hpc_core/command_encoder_xe_hpc_core.cpp b/shared/source/xe_hpc_core/command_encoder_xe_hpc_core.cpp index eab5f509cd..4344214dde 100644 --- a/shared/source/xe_hpc_core/command_encoder_xe_hpc_core.cpp +++ b/shared/source/xe_hpc_core/command_encoder_xe_hpc_core.cpp @@ -7,6 +7,7 @@ #include "shared/source/command_container/command_encoder.h" #include "shared/source/command_container/command_encoder.inl" +#include "shared/source/command_container/command_encoder_pre_xe2_hpg_core.inl" #include "shared/source/command_container/command_encoder_xehp_and_later.inl" #include "shared/source/command_container/encode_compute_mode_tgllp_and_later.inl" #include "shared/source/command_stream/stream_properties.h" diff --git a/shared/source/xe_hpg_core/command_encoder_xe_hpg_core.cpp b/shared/source/xe_hpg_core/command_encoder_xe_hpg_core.cpp index c1c4a41283..5330cce939 100644 --- a/shared/source/xe_hpg_core/command_encoder_xe_hpg_core.cpp +++ b/shared/source/xe_hpg_core/command_encoder_xe_hpg_core.cpp @@ -7,6 +7,7 @@ #include "shared/source/command_container/command_encoder.h" #include "shared/source/command_container/command_encoder.inl" +#include "shared/source/command_container/command_encoder_pre_xe2_hpg_core.inl" #include "shared/source/command_container/command_encoder_xehp_and_later.inl" #include "shared/source/command_container/encode_compute_mode_tgllp_and_later.inl" #include "shared/source/command_stream/stream_properties.h" diff --git a/shared/test/common/test_macros/header/common_matchers.h b/shared/test/common/test_macros/header/common_matchers.h index a21865b39a..f22e3eab16 100644 --- a/shared/test/common/test_macros/header/common_matchers.h +++ b/shared/test/common/test_macros/header/common_matchers.h @@ -90,6 +90,7 @@ using IsAtMostPVC = IsAtMostProduct; using IsNotPVC = IsNotWithinProducts; using IsNotPvcOrDg2 = IsNotWithinProducts; +using IsAtMostArl = IsAtMostProduct; using IsAtLeastBmg = IsAtLeastProduct; using HasStatefulSupport = IsNotAnyGfxCores; diff --git a/shared/test/unit_test/encoders/test_encode_dispatch_kernel.cpp b/shared/test/unit_test/encoders/test_encode_dispatch_kernel.cpp index 217396c126..891bed2f29 100644 --- a/shared/test/unit_test/encoders/test_encode_dispatch_kernel.cpp +++ b/shared/test/unit_test/encoders/test_encode_dispatch_kernel.cpp @@ -1629,3 +1629,17 @@ HWCMDTEST_F(IGFX_GEN8_CORE, CommandEncodeStatesTest, givenEncodeDispatchKernelWh EXPECT_EQ(0u, EncodeDispatchKernel::getInlineDataOffset(dispatchArgs)); } +HWTEST2_F(CommandEncodeStatesTest, givenEncodeDispatchKernelWhenGetIohAlignemntThenOneReturned, IsAtMostArl) { + EXPECT_EQ(NEO::EncodeDispatchKernel::getDefaultIOHAlignment(), 1u); +} + +HWTEST2_F(CommandEncodeStatesTest, givenEncodeDispatchKernelWhenGetIohAlignemntThenCacheLineSizeReturned, IsAtLeastBmg) { + EXPECT_EQ(NEO::EncodeDispatchKernel::getDefaultIOHAlignment(), FamilyType::cacheLineSize); +} + +HWTEST2_F(CommandEncodeStatesTest, givenEncodeDispatchKernelWhenForcingDifferentIohAlignemntThenExpectedAlignmentReturned, IsAtLeastBmg) { + DebugManagerStateRestore restorer; + auto expectedAlignemnt = 1024u; + debugManager.flags.ForceIOHAlignment.set(expectedAlignemnt); + EXPECT_EQ(NEO::EncodeDispatchKernel::getDefaultIOHAlignment(), expectedAlignemnt); +} \ No newline at end of file diff --git a/shared/test/unit_test/encoders/test_encode_dispatch_kernel_xehp_and_later.cpp b/shared/test/unit_test/encoders/test_encode_dispatch_kernel_xehp_and_later.cpp index 43c0e6e9d9..e21b66d328 100644 --- a/shared/test/unit_test/encoders/test_encode_dispatch_kernel_xehp_and_later.cpp +++ b/shared/test/unit_test/encoders/test_encode_dispatch_kernel_xehp_and_later.cpp @@ -595,7 +595,7 @@ HWCMDTEST_F(IGFX_XE_HP_CORE, CommandEncodeStatesTest, givenInlineDataRequiredWhe size_t expectedSizeIOH = alignUp(dispatchInterface->getCrossThreadDataSize() + dispatchInterface->getPerThreadDataSizeForWholeThreadGroup() - inlineDataSize, - this->getHelper().getIOHAlignment()); + NEO::EncodeDispatchKernel::getDefaultIOHAlignment()); auto heap = cmdContainer->getIndirectHeap(HeapType::indirectObject); EXPECT_EQ(expectedSizeIOH, heap->getUsed()); } @@ -622,7 +622,7 @@ HWCMDTEST_F(IGFX_XE_HP_CORE, CommandEncodeStatesTest, givenInlineDataRequiredIsF size_t expectedSizeIOH = alignUp(dispatchInterface->getCrossThreadDataSize() + dispatchInterface->getPerThreadDataSizeForWholeThreadGroup(), - this->getHelper().getIOHAlignment()); + NEO::EncodeDispatchKernel::getDefaultIOHAlignment()); auto heap = cmdContainer->getIndirectHeap(HeapType::indirectObject); EXPECT_EQ(expectedSizeIOH, heap->getUsed()); } @@ -1613,6 +1613,6 @@ HWTEST2_F(CommandEncodeStatesTest, givenEncodeDispatchKernelWhenRequestingExtraP auto heap = cmdContainer->getIndirectHeap(HeapType::indirectObject); size_t expectedConsumedSize = 64 + 1024; - expectedConsumedSize = alignUp(expectedConsumedSize, pDevice->getGfxCoreHelper().getIOHAlignment()); + expectedConsumedSize = alignUp(expectedConsumedSize, NEO::EncodeDispatchKernel::getDefaultIOHAlignment()); EXPECT_EQ(expectedConsumedSize, heap->getUsed()); } diff --git a/shared/test/unit_test/helpers/gfx_core_helper_xe2_and_later.cpp b/shared/test/unit_test/helpers/gfx_core_helper_xe2_and_later.cpp index e3f2ecbc79..fe6ab84a2c 100644 --- a/shared/test/unit_test/helpers/gfx_core_helper_xe2_and_later.cpp +++ b/shared/test/unit_test/helpers/gfx_core_helper_xe2_and_later.cpp @@ -25,21 +25,6 @@ HWTEST2_F(GfxCoreHelperXe2AndLaterTests, givenAtLeastXe2HpgWhenCallIsTimestampSh EXPECT_FALSE(gfxCoreHelper.isTimestampShiftRequired()); } -HWTEST2_F(GfxCoreHelperXe2AndLaterTests, givenAtLeastXe2HpgWhenGetIOHAlignmentThenReturnsCorrectValue, IsAtLeastXe2HpgCore) { - MockExecutionEnvironment mockExecutionEnvironment{}; - auto &gfxCoreHelper = mockExecutionEnvironment.rootDeviceEnvironments[0]->getHelper(); - EXPECT_EQ(gfxCoreHelper.getIOHAlignment(), 256u); -} - -HWTEST2_F(GfxCoreHelperXe2AndLaterTests, givenAtLeastXe2HpgAndForceIOHAlignmentFlagWhenGetIOHAlignmentThenReturnsCorrectValue, IsAtLeastXe2HpgCore) { - DebugManagerStateRestore restorer; - debugManager.flags.ForceIOHAlignment.set(1024); - - MockExecutionEnvironment mockExecutionEnvironment{}; - auto &gfxCoreHelper = mockExecutionEnvironment.rootDeviceEnvironments[0]->getHelper(); - EXPECT_EQ(gfxCoreHelper.getIOHAlignment(), 1024u); -} - HWTEST2_F(GfxCoreHelperXe2AndLaterTests, givenDebugFlagWhenCheckingIsResolveDependenciesByPipeControlsSupportedThenCorrectValueIsReturned, IsLNL) { DebugManagerStateRestore restorer;