diff --git a/opencl/source/gen11/image_gen11.cpp b/opencl/source/gen11/image_gen11.cpp index 4e34974de9..498ef741d3 100644 --- a/opencl/source/gen11/image_gen11.cpp +++ b/opencl/source/gen11/image_gen11.cpp @@ -7,37 +7,15 @@ #include "shared/source/gen11/hw_cmds_base.h" -#include "opencl/source/mem_obj/image.h" #include "opencl/source/mem_obj/image.inl" #include namespace NEO { -typedef ICLFamily Family; +using Family = ICLFamily; static auto gfxCore = IGFX_GEN11_CORE; -template -void ImageHw::setMediaSurfaceRotation(void *memory) { - using MEDIA_SURFACE_STATE = typename GfxFamily::MEDIA_SURFACE_STATE; - using SURFACE_FORMAT = typename MEDIA_SURFACE_STATE::SURFACE_FORMAT; - - auto surfaceState = reinterpret_cast(memory); - - surfaceState->setRotation(MEDIA_SURFACE_STATE::ROTATION_NO_ROTATION_OR_0_DEGREE); - surfaceState->setXOffset(0); - surfaceState->setYOffset(0); -} - -template -void ImageHw::setSurfaceMemoryObjectControlStateIndexToMocsTable(void *memory, uint32_t value) { - using MEDIA_SURFACE_STATE = typename GfxFamily::MEDIA_SURFACE_STATE; - using SURFACE_FORMAT = typename MEDIA_SURFACE_STATE::SURFACE_FORMAT; - - auto surfaceState = reinterpret_cast(memory); - - surfaceState->setSurfaceMemoryObjectControlStateIndexToMocsTables(value); -} template <> void ImageHw::appendSurfaceStateParams(RENDER_SURFACE_STATE *surfaceState, uint32_t rootDeviceIndex, bool useGlobalAtomics) { if (hasAlphaChannel(&imageFormat)) { @@ -45,5 +23,7 @@ void ImageHw::appendSurfaceStateParams(RENDER_SURFACE_STATE *surfaceStat } } -#include "opencl/source/mem_obj/image_factory_init.inl" } // namespace NEO + +// factory initializer +#include "opencl/source/mem_obj/image_factory_init.inl" diff --git a/opencl/source/gen12lp/image_gen12lp.cpp b/opencl/source/gen12lp/image_gen12lp.cpp index d03452428f..303695006b 100644 --- a/opencl/source/gen12lp/image_gen12lp.cpp +++ b/opencl/source/gen12lp/image_gen12lp.cpp @@ -5,40 +5,16 @@ * */ -#include "shared/source/gen12lp/hw_cmds.h" +#include "shared/source/gen12lp/hw_cmds_base.h" -#include "opencl/source/mem_obj/image.h" #include "opencl/source/mem_obj/image.inl" namespace NEO { -typedef TGLLPFamily Family; +using Family = TGLLPFamily; static auto gfxCore = IGFX_GEN12LP_CORE; - -template -void ImageHw::setMediaSurfaceRotation(void *memory) { - using MEDIA_SURFACE_STATE = typename GfxFamily::MEDIA_SURFACE_STATE; - using SURFACE_FORMAT = typename MEDIA_SURFACE_STATE::SURFACE_FORMAT; - - auto surfaceState = reinterpret_cast(memory); - - surfaceState->setRotation(MEDIA_SURFACE_STATE::ROTATION_NO_ROTATION_OR_0_DEGREE); - surfaceState->setXOffset(0); - surfaceState->setYOffset(0); -} - -template -void ImageHw::setSurfaceMemoryObjectControlStateIndexToMocsTable(void *memory, uint32_t value) { - using MEDIA_SURFACE_STATE = typename GfxFamily::MEDIA_SURFACE_STATE; - using SURFACE_FORMAT = typename MEDIA_SURFACE_STATE::SURFACE_FORMAT; - - auto surfaceState = reinterpret_cast(memory); - - surfaceState->setSurfaceMemoryObjectControlStateIndexToMocsTables(value); -} - -// clang-format off -#include "opencl/source/mem_obj/image_tgllp_and_later.inl" -#include "opencl/source/mem_obj/image_factory_init.inl" -// clang-format on } // namespace NEO +#include "opencl/source/mem_obj/image_tgllp_and_later.inl" + +// factory initializer +#include "opencl/source/mem_obj/image_factory_init.inl" diff --git a/opencl/source/gen8/image_gen8.cpp b/opencl/source/gen8/image_gen8.cpp index ce47b0d6ad..715d7ca9e5 100644 --- a/opencl/source/gen8/image_gen8.cpp +++ b/opencl/source/gen8/image_gen8.cpp @@ -5,16 +5,15 @@ * */ -#include "shared/source/gen8/hw_cmds.h" +#include "shared/source/gen8/hw_cmds_base.h" -#include "opencl/source/mem_obj/image.h" #include "opencl/source/mem_obj/image.inl" #include namespace NEO { -typedef BDWFamily Family; +using Family = BDWFamily; static auto gfxCore = IGFX_GEN8_CORE; template <> @@ -23,5 +22,7 @@ void ImageHw::setMediaSurfaceRotation(void *) {} template <> void ImageHw::setSurfaceMemoryObjectControlStateIndexToMocsTable(void *, uint32_t) {} -#include "opencl/source/mem_obj/image_factory_init.inl" } // namespace NEO + +// factory initializer +#include "opencl/source/mem_obj/image_factory_init.inl" diff --git a/opencl/source/gen9/image_gen9.cpp b/opencl/source/gen9/image_gen9.cpp index 97af220836..1f43151c72 100644 --- a/opencl/source/gen9/image_gen9.cpp +++ b/opencl/source/gen9/image_gen9.cpp @@ -5,39 +5,15 @@ * */ -#include "shared/source/gen9/hw_cmds.h" +#include "shared/source/gen9/hw_cmds_base.h" -#include "opencl/source/mem_obj/image.h" #include "opencl/source/mem_obj/image.inl" -#include - namespace NEO { -typedef SKLFamily Family; +using Family = SKLFamily; static auto gfxCore = IGFX_GEN9_CORE; - -template -void ImageHw::setMediaSurfaceRotation(void *memory) { - using MEDIA_SURFACE_STATE = typename GfxFamily::MEDIA_SURFACE_STATE; - using SURFACE_FORMAT = typename MEDIA_SURFACE_STATE::SURFACE_FORMAT; - - auto surfaceState = reinterpret_cast(memory); - - surfaceState->setRotation(MEDIA_SURFACE_STATE::ROTATION_NO_ROTATION_OR_0_DEGREE); - surfaceState->setXOffset(0); - surfaceState->setYOffset(0); -} - -template -void ImageHw::setSurfaceMemoryObjectControlStateIndexToMocsTable(void *memory, uint32_t value) { - using MEDIA_SURFACE_STATE = typename GfxFamily::MEDIA_SURFACE_STATE; - using SURFACE_FORMAT = typename MEDIA_SURFACE_STATE::SURFACE_FORMAT; - - auto surfaceState = reinterpret_cast(memory); - - surfaceState->setSurfaceMemoryObjectControlStateIndexToMocsTables(value); -} - -#include "opencl/source/mem_obj/image_factory_init.inl" } // namespace NEO + +// factory initializer +#include "opencl/source/mem_obj/image_factory_init.inl" diff --git a/opencl/source/mem_obj/image.inl b/opencl/source/mem_obj/image.inl index 12881e87d3..ccca51e578 100644 --- a/opencl/source/mem_obj/image.inl +++ b/opencl/source/mem_obj/image.inl @@ -201,4 +201,26 @@ void ImageHw::transformImage3dTo2dArray(void *memory) { surfaceState->setSurfaceArray(true); } +template +inline void ImageHw::setMediaSurfaceRotation(void *memory) { + using MEDIA_SURFACE_STATE = typename GfxFamily::MEDIA_SURFACE_STATE; + using SURFACE_FORMAT = typename MEDIA_SURFACE_STATE::SURFACE_FORMAT; + + auto surfaceState = reinterpret_cast(memory); + + surfaceState->setRotation(MEDIA_SURFACE_STATE::ROTATION_NO_ROTATION_OR_0_DEGREE); + surfaceState->setXOffset(0); + surfaceState->setYOffset(0); +} + +template +inline void ImageHw::setSurfaceMemoryObjectControlStateIndexToMocsTable(void *memory, uint32_t value) { + using MEDIA_SURFACE_STATE = typename GfxFamily::MEDIA_SURFACE_STATE; + using SURFACE_FORMAT = typename MEDIA_SURFACE_STATE::SURFACE_FORMAT; + + auto surfaceState = reinterpret_cast(memory); + + surfaceState->setSurfaceMemoryObjectControlStateIndexToMocsTables(value); +} + } // namespace NEO diff --git a/opencl/source/mem_obj/image_factory_init.inl b/opencl/source/mem_obj/image_factory_init.inl index 68f8f5d828..e0c0908ee4 100644 --- a/opencl/source/mem_obj/image_factory_init.inl +++ b/opencl/source/mem_obj/image_factory_init.inl @@ -5,9 +5,12 @@ * */ +namespace NEO { + template class ImageHw; template <> void populateFactoryTable>() { extern ImageFactoryFuncs imageFactory[IGFX_MAX_CORE]; imageFactory[gfxCore].createImageFunction = ImageHw::create; } +} // namespace NEO diff --git a/opencl/source/mem_obj/image_tgllp_and_later.inl b/opencl/source/mem_obj/image_tgllp_and_later.inl index 4fa1af6216..a10ca12a08 100644 --- a/opencl/source/mem_obj/image_tgllp_and_later.inl +++ b/opencl/source/mem_obj/image_tgllp_and_later.inl @@ -5,6 +5,12 @@ * */ +#include "shared/source/gmm_helper/gmm.h" +#include "shared/source/gmm_helper/resource_info.h" + +#include "opencl/source/mem_obj/image.h" + +namespace NEO { template <> void ImageHw::appendSurfaceStateDepthParams(RENDER_SURFACE_STATE *surfaceState, Gmm *gmm) { if (gmm) { @@ -12,3 +18,4 @@ void ImageHw::appendSurfaceStateDepthParams(RENDER_SURFACE_STATE *surfac surfaceState->setDepthStencilResource(isDepthResource); } } +} // namespace NEO \ No newline at end of file diff --git a/opencl/source/mem_obj/image_xehp_and_later.inl b/opencl/source/mem_obj/image_xehp_and_later.inl index bc0b9ae2ee..5aa3326539 100644 --- a/opencl/source/mem_obj/image_xehp_and_later.inl +++ b/opencl/source/mem_obj/image_xehp_and_later.inl @@ -5,30 +5,10 @@ * */ +#include "opencl/source/context/context.h" +#include "opencl/source/mem_obj/image.h" + namespace NEO { - -template <> -void ImageHw::setMediaSurfaceRotation(void *memory) { - using MEDIA_SURFACE_STATE = typename Family::MEDIA_SURFACE_STATE; - using SURFACE_FORMAT = typename MEDIA_SURFACE_STATE::SURFACE_FORMAT; - - auto surfaceState = reinterpret_cast(memory); - - surfaceState->setRotation(MEDIA_SURFACE_STATE::ROTATION_NO_ROTATION_OR_0_DEGREE); - surfaceState->setXOffset(0); - surfaceState->setYOffset(0); -} - -template <> -void ImageHw::setSurfaceMemoryObjectControlStateIndexToMocsTable(void *memory, uint32_t value) { - using MEDIA_SURFACE_STATE = typename Family::MEDIA_SURFACE_STATE; - using SURFACE_FORMAT = typename MEDIA_SURFACE_STATE::SURFACE_FORMAT; - - auto surfaceState = reinterpret_cast(memory); - - surfaceState->setSurfaceMemoryObjectControlStateIndexToMocsTables(value); -} - template <> void ImageHw::appendSurfaceStateParams(Family::RENDER_SURFACE_STATE *surfaceState, uint32_t rootDeviceIndex, bool useGlobalAtomics) { auto imageCtxType = this->context->peekContextType(); @@ -51,5 +31,4 @@ void ImageHw::appendSurfaceStateParams(Family::RENDER_SURFACE_STATE *sur surfaceState->setDisableSupportForMultiGpuPartialWrites(!!DebugManager.flags.ForceMultiGpuPartialWrites.get()); } } - } // namespace NEO diff --git a/opencl/source/xe_hp_core/image_xe_hp_core.cpp b/opencl/source/xe_hp_core/image_xe_hp_core.cpp index 8303a1ce6b..28cb9154d4 100644 --- a/opencl/source/xe_hp_core/image_xe_hp_core.cpp +++ b/opencl/source/xe_hp_core/image_xe_hp_core.cpp @@ -5,25 +5,17 @@ * */ -#include "shared/source/device/device.h" -#include "shared/source/gmm_helper/client_context/gmm_client_context.h" -#include "shared/source/xe_hp_core/hw_cmds.h" +#include "shared/source/xe_hp_core/hw_cmds_base.h" -#include "opencl/source/context/context.h" #include "opencl/source/mem_obj/image.inl" namespace NEO { using Family = XeHpFamily; static auto gfxCore = IGFX_XE_HP_CORE; - } // namespace NEO - +#include "opencl/source/mem_obj/image_tgllp_and_later.inl" #include "opencl/source/mem_obj/image_xehp_and_later.inl" -namespace NEO { -// clang-format off -#include "opencl/source/mem_obj/image_tgllp_and_later.inl" +// factory initializer #include "opencl/source/mem_obj/image_factory_init.inl" -// clang-format on -} // namespace NEO diff --git a/opencl/source/xe_hpc_core/image_xe_hpc_core.cpp b/opencl/source/xe_hpc_core/image_xe_hpc_core.cpp index f6a47a449d..39a664e474 100644 --- a/opencl/source/xe_hpc_core/image_xe_hpc_core.cpp +++ b/opencl/source/xe_hpc_core/image_xe_hpc_core.cpp @@ -5,24 +5,17 @@ * */ -#include "shared/source/gmm_helper/client_context/gmm_client_context.h" -#include "shared/source/xe_hpc_core/hw_cmds.h" +#include "shared/source/xe_hpc_core/hw_cmds_base.h" -#include "opencl/source/context/context.h" #include "opencl/source/mem_obj/image.inl" namespace NEO { using Family = XE_HPC_COREFamily; static auto gfxCore = IGFX_XE_HPC_CORE; - } // namespace NEO - +#include "opencl/source/mem_obj/image_tgllp_and_later.inl" #include "opencl/source/mem_obj/image_xehp_and_later.inl" -namespace NEO { -// clang-format off -#include "opencl/source/mem_obj/image_tgllp_and_later.inl" +// factory initializer #include "opencl/source/mem_obj/image_factory_init.inl" -// clang-format on -} // namespace NEO diff --git a/opencl/source/xe_hpg_core/image_xe_hpg_core.cpp b/opencl/source/xe_hpg_core/image_xe_hpg_core.cpp index f2b724e264..f856361c91 100644 --- a/opencl/source/xe_hpg_core/image_xe_hpg_core.cpp +++ b/opencl/source/xe_hpg_core/image_xe_hpg_core.cpp @@ -5,25 +5,17 @@ * */ -#include "shared/source/device/device.h" -#include "shared/source/gmm_helper/client_context/gmm_client_context.h" -#include "shared/source/xe_hpg_core/hw_cmds.h" +#include "shared/source/xe_hpg_core/hw_cmds_base.h" -#include "opencl/source/context/context.h" #include "opencl/source/mem_obj/image.inl" namespace NEO { using Family = XE_HPG_COREFamily; static auto gfxCore = IGFX_XE_HPG_CORE; - } // namespace NEO - +#include "opencl/source/mem_obj/image_tgllp_and_later.inl" #include "opencl/source/mem_obj/image_xehp_and_later.inl" -namespace NEO { -// clang-format off -#include "opencl/source/mem_obj/image_tgllp_and_later.inl" +// factory initializer #include "opencl/source/mem_obj/image_factory_init.inl" -// clang-format on -} // namespace NEO diff --git a/opencl/test/unit_test/mem_obj/buffer_tests_xehp_and_later.cpp b/opencl/test/unit_test/mem_obj/buffer_tests_xehp_and_later.cpp index 0dd828bfec..2b554af2db 100644 --- a/opencl/test/unit_test/mem_obj/buffer_tests_xehp_and_later.cpp +++ b/opencl/test/unit_test/mem_obj/buffer_tests_xehp_and_later.cpp @@ -29,9 +29,11 @@ using namespace NEO; -typedef ::testing::Test XeHPAndLaterBufferTests; +using XeHPAndLaterBufferTests = ::testing::Test; -HWCMDTEST_F(IGFX_XE_HP_CORE, XeHPAndLaterBufferTests, givenContextTypeDefaultWhenBufferIsWritableAndOnlyOneTileIsAvailableThenRemainFlagsToTrue) { +using isXePlatform = IsWithinGfxCore; + +HWTEST2_F(XeHPAndLaterBufferTests, givenContextTypeDefaultWhenBufferIsWritableAndOnlyOneTileIsAvailableThenRemainFlagsToTrue, isXePlatform) { DebugManagerStateRestore restorer; DebugManager.flags.CreateMultipleSubDevices.set(1); initPlatform(); @@ -95,7 +97,7 @@ HWCMDTEST_F(IGFX_XE_HP_CORE, XeHPAndLaterBufferTests, givenDebugFlagSetWhenProgr } } -HWCMDTEST_F(IGFX_XE_HP_CORE, XeHPAndLaterBufferTests, givenContextTypeDefaultWhenBufferIsWritableThenFlipPartialFlagsToFalse) { +HWTEST2_F(XeHPAndLaterBufferTests, givenContextTypeDefaultWhenBufferIsWritableThenFlipPartialFlagsToFalse, isXePlatform) { DebugManagerStateRestore restorer; DebugManager.flags.CreateMultipleSubDevices.set(4); initPlatform(); @@ -125,7 +127,7 @@ HWCMDTEST_F(IGFX_XE_HP_CORE, XeHPAndLaterBufferTests, givenContextTypeDefaultWhe EXPECT_FALSE(surfaceState.getDisableSupportForMultiGpuPartialWrites()); } -HWCMDTEST_F(IGFX_XE_HP_CORE, XeHPAndLaterBufferTests, givenContextTypeUnrestrictiveWhenBufferIsWritableThenFlipPartialFlagsToFalse) { +HWTEST2_F(XeHPAndLaterBufferTests, givenContextTypeUnrestrictiveWhenBufferIsWritableThenFlipPartialFlagsToFalse, isXePlatform) { DebugManagerStateRestore restorer; DebugManager.flags.CreateMultipleSubDevices.set(4); initPlatform(); @@ -155,7 +157,7 @@ HWCMDTEST_F(IGFX_XE_HP_CORE, XeHPAndLaterBufferTests, givenContextTypeUnrestrict EXPECT_FALSE(surfaceState.getDisableSupportForMultiGpuPartialWrites()); } -HWCMDTEST_F(IGFX_XE_HP_CORE, XeHPAndLaterBufferTests, givenContextTypeDefaultWhenBufferIsNotWritableThenRemainPartialFlagsToTrue) { +HWTEST2_F(XeHPAndLaterBufferTests, givenContextTypeDefaultWhenBufferIsNotWritableThenRemainPartialFlagsToTrue, isXePlatform) { using RENDER_SURFACE_STATE = typename FamilyType::RENDER_SURFACE_STATE; MockContext context; context.contextType = ContextType::CONTEXT_TYPE_DEFAULT; @@ -183,7 +185,7 @@ HWCMDTEST_F(IGFX_XE_HP_CORE, XeHPAndLaterBufferTests, givenContextTypeDefaultWhe EXPECT_TRUE(surfaceState.getDisableSupportForMultiGpuPartialWrites()); } -HWCMDTEST_F(IGFX_XE_HP_CORE, XeHPAndLaterBufferTests, givenContextTypeSpecializedWhenBufferIsWritableThenRemainPartialFlagsToTrue) { +HWTEST2_F(XeHPAndLaterBufferTests, givenContextTypeSpecializedWhenBufferIsWritableThenRemainPartialFlagsToTrue, isXePlatform) { using RENDER_SURFACE_STATE = typename FamilyType::RENDER_SURFACE_STATE; MockContext context; context.contextType = ContextType::CONTEXT_TYPE_SPECIALIZED; @@ -211,7 +213,7 @@ HWCMDTEST_F(IGFX_XE_HP_CORE, XeHPAndLaterBufferTests, givenContextTypeSpecialize EXPECT_TRUE(surfaceState.getDisableSupportForMultiGpuPartialWrites()); } -HWCMDTEST_F(IGFX_XE_HP_CORE, XeHPAndLaterBufferTests, givenDebugFlagForMultiTileSupportWhenSurfaceStateIsSetThenValuesMatch) { +HWTEST2_F(XeHPAndLaterBufferTests, givenDebugFlagForMultiTileSupportWhenSurfaceStateIsSetThenValuesMatch, isXePlatform) { DebugManagerStateRestore restore; using RENDER_SURFACE_STATE = typename FamilyType::RENDER_SURFACE_STATE; MockContext context; @@ -247,7 +249,7 @@ HWCMDTEST_F(IGFX_XE_HP_CORE, XeHPAndLaterBufferTests, givenDebugFlagForMultiTile EXPECT_EQ(1u, surfaceState.getDisableSupportForMultiGpuPartialWrites()); } -HWCMDTEST_F(IGFX_XE_HP_CORE, XeHPAndLaterBufferTests, givenNullContextWhenBufferAllocationIsNullThenRemainPartialFlagsToTrue) { +HWTEST2_F(XeHPAndLaterBufferTests, givenNullContextWhenBufferAllocationIsNullThenRemainPartialFlagsToTrue, isXePlatform) { using RENDER_SURFACE_STATE = typename FamilyType::RENDER_SURFACE_STATE; RENDER_SURFACE_STATE surfaceState = FamilyType::cmdInitRenderSurfaceState; @@ -270,7 +272,7 @@ struct MultiGpuGlobalAtomicsBufferTest : public XeHPAndLaterBufferTests, public ::testing::WithParamInterface> { }; -HWCMDTEST_P(IGFX_XE_HP_CORE, MultiGpuGlobalAtomicsBufferTest, givenSetArgStatefulCalledThenDisableSupportForMultiGpuAtomicsIsSetCorrectly) { +HWTEST2_P(MultiGpuGlobalAtomicsBufferTest, givenSetArgStatefulCalledThenDisableSupportForMultiGpuAtomicsIsSetCorrectly, isXePlatform) { unsigned int numAvailableDevices, bufferFlags; bool useGlobalAtomics, areMultipleSubDevicesInContext, enableMultiGpuAtomicsOptimization; std::tie(numAvailableDevices, bufferFlags, useGlobalAtomics, areMultipleSubDevicesInContext, enableMultiGpuAtomicsOptimization) = GetParam(); @@ -317,7 +319,7 @@ HWCMDTEST_P(IGFX_XE_HP_CORE, MultiGpuGlobalAtomicsBufferTest, givenSetArgStatefu EXPECT_EQ(!enabled, surfaceState.getDisableSupportForMultiGpuAtomics()); } -HWCMDTEST_P(IGFX_XE_HP_CORE, MultiGpuGlobalAtomicsBufferTest, givenSetSurfaceStateCalledThenDisableSupportForMultiGpuAtomicsIsSetCorrectly) { +HWTEST2_P(MultiGpuGlobalAtomicsBufferTest, givenSetSurfaceStateCalledThenDisableSupportForMultiGpuAtomicsIsSetCorrectly, isXePlatform) { unsigned int numAvailableDevices, bufferFlags; bool useGlobalAtomics, areMultipleSubDevicesInContext, enableMultiGpuAtomicsOptimization; std::tie(numAvailableDevices, bufferFlags, useGlobalAtomics, areMultipleSubDevicesInContext, enableMultiGpuAtomicsOptimization) = GetParam(); diff --git a/opencl/test/unit_test/mem_obj/image_tests_xehp_and_later.cpp b/opencl/test/unit_test/mem_obj/image_tests_xehp_and_later.cpp index e6870c93a2..ccf4df9fd8 100644 --- a/opencl/test/unit_test/mem_obj/image_tests_xehp_and_later.cpp +++ b/opencl/test/unit_test/mem_obj/image_tests_xehp_and_later.cpp @@ -29,8 +29,9 @@ using namespace NEO; using XeHPAndLaterImageTests = ::testing::Test; +using isXePlatform = IsWithinGfxCore; -HWCMDTEST_F(IGFX_XE_HP_CORE, XeHPAndLaterImageTests, givenContextTypeDefaultWhenImageIsWritableAndOnlyOneTileIsAvailableThenRemainFlagsToTrue) { +HWTEST2_F(XeHPAndLaterImageTests, givenContextTypeDefaultWhenImageIsWritableAndOnlyOneTileIsAvailableThenRemainFlagsToTrue, isXePlatform) { DebugManagerStateRestore restorer; DebugManager.flags.CreateMultipleSubDevices.set(1); initPlatform(); @@ -69,7 +70,7 @@ HWCMDTEST_F(IGFX_XE_HP_CORE, XeHPAndLaterImageTests, givenContextTypeDefaultWhen EXPECT_TRUE(surfaceState.getDisableSupportForMultiGpuPartialWrites()); } -HWCMDTEST_F(IGFX_XE_HP_CORE, XeHPAndLaterImageTests, givenContextTypeDefaultWhenImageIsWritableThenFlipPartialFlagsToFalse) { +HWTEST2_F(XeHPAndLaterImageTests, givenContextTypeDefaultWhenImageIsWritableThenFlipPartialFlagsToFalse, isXePlatform) { DebugManagerStateRestore restorer; DebugManager.flags.CreateMultipleSubDevices.set(4); initPlatform(); @@ -106,7 +107,7 @@ HWCMDTEST_F(IGFX_XE_HP_CORE, XeHPAndLaterImageTests, givenContextTypeDefaultWhen EXPECT_FALSE(surfaceState.getDisableSupportForMultiGpuPartialWrites()); } -HWCMDTEST_F(IGFX_XE_HP_CORE, XeHPAndLaterImageTests, givenDebugFlagForMultiTileSupportWhenSurfaceStateIsProgrammedThenItHasDesiredValues) { +HWTEST2_F(XeHPAndLaterImageTests, givenDebugFlagForMultiTileSupportWhenSurfaceStateIsProgrammedThenItHasDesiredValues, isXePlatform) { DebugManagerStateRestore restorer; using RENDER_SURFACE_STATE = typename FamilyType::RENDER_SURFACE_STATE; MockContext context; @@ -149,7 +150,7 @@ HWCMDTEST_F(IGFX_XE_HP_CORE, XeHPAndLaterImageTests, givenDebugFlagForMultiTileS EXPECT_EQ(1u, surfaceState.getDisableSupportForMultiGpuPartialWrites()); } -HWCMDTEST_F(IGFX_XE_HP_CORE, XeHPAndLaterImageTests, givenContextTypeUnrestrictiveWhenImageIsWritableThenFlipPartialFlagsToFalse) { +HWTEST2_F(XeHPAndLaterImageTests, givenContextTypeUnrestrictiveWhenImageIsWritableThenFlipPartialFlagsToFalse, isXePlatform) { DebugManagerStateRestore restorer; DebugManager.flags.CreateMultipleSubDevices.set(4); initPlatform(); @@ -186,7 +187,7 @@ HWCMDTEST_F(IGFX_XE_HP_CORE, XeHPAndLaterImageTests, givenContextTypeUnrestricti EXPECT_FALSE(surfaceState.getDisableSupportForMultiGpuPartialWrites()); } -HWCMDTEST_F(IGFX_XE_HP_CORE, XeHPAndLaterImageTests, givenContextTypeDefaultWhenImageIsNotWritableThenRemainPartialFlagsToTrue) { +HWTEST2_F(XeHPAndLaterImageTests, givenContextTypeDefaultWhenImageIsNotWritableThenRemainPartialFlagsToTrue, isXePlatform) { using RENDER_SURFACE_STATE = typename FamilyType::RENDER_SURFACE_STATE; MockContext context; context.contextType = ContextType::CONTEXT_TYPE_DEFAULT; @@ -221,7 +222,7 @@ HWCMDTEST_F(IGFX_XE_HP_CORE, XeHPAndLaterImageTests, givenContextTypeDefaultWhen EXPECT_TRUE(surfaceState.getDisableSupportForMultiGpuPartialWrites()); } -HWCMDTEST_F(IGFX_XE_HP_CORE, XeHPAndLaterImageTests, givenContextTypeSpecializedWhenImageIsWritableThenRemainPartialFlagsToTrue) { +HWTEST2_F(XeHPAndLaterImageTests, givenContextTypeSpecializedWhenImageIsWritableThenRemainPartialFlagsToTrue, isXePlatform) { using RENDER_SURFACE_STATE = typename FamilyType::RENDER_SURFACE_STATE; MockContext context; context.contextType = ContextType::CONTEXT_TYPE_SPECIALIZED; @@ -260,7 +261,7 @@ struct MultiGpuGlobalAtomicsImageTest : public XeHPAndLaterImageTests, public ::testing::WithParamInterface> { }; -HWCMDTEST_P(IGFX_XE_HP_CORE, MultiGpuGlobalAtomicsImageTest, givenAppendSurfaceStateParamCalledThenDisableSupportForMultiGpuAtomicsIsSetCorrectly) { +HWTEST2_P(MultiGpuGlobalAtomicsImageTest, givenAppendSurfaceStateParamCalledThenDisableSupportForMultiGpuAtomicsIsSetCorrectly, isXePlatform) { unsigned int numAvailableDevices, memFlags; ContextType contextType; bool useGlobalAtomics, enableMultiGpuAtomicsOptimization;