diff --git a/cmake/setup_platform_flags.cmake b/cmake/setup_platform_flags.cmake index de6f1e0ad2..4d3c128790 100644 --- a/cmake/setup_platform_flags.cmake +++ b/cmake/setup_platform_flags.cmake @@ -48,7 +48,7 @@ endforeach() if(SUPPORT_GEN8) set(CORE_GEN8_REVISIONS 0) if(TESTS_GEN8) - ADD_ITEM_FOR_CORE_TYPE("FAMILY_NAME" "TESTED" "GEN8" "BDWFamily") + ADD_ITEM_FOR_CORE_TYPE("FAMILY_NAME" "TESTED" "GEN8" "Gen8Family") endif() if(SUPPORT_BDW) ADD_PRODUCT("SUPPORTED" "BDW" "IGFX_BROADWELL") @@ -66,7 +66,7 @@ if(SUPPORT_GEN9) set(CORE_GEN9_REVISIONS 9) set(LP_GEN9_REVISIONS 0) if(TESTS_GEN9) - ADD_ITEM_FOR_CORE_TYPE("FAMILY_NAME" "TESTED" "GEN9" "SKLFamily") + ADD_ITEM_FOR_CORE_TYPE("FAMILY_NAME" "TESTED" "GEN9" "Gen9Family") endif() if(SUPPORT_SKL) ADD_PRODUCT("SUPPORTED" "SKL" "IGFX_SKYLAKE") @@ -76,7 +76,7 @@ if(SUPPORT_GEN9) ADD_PLATFORM_FOR_CORE_TYPE("SUPPORTED_IMAGES" "GEN9" "SKL" "CORE") set(PREFERRED_PLATFORM "SKL") if(TESTS_SKL) - set(PREFERRED_FAMILY_NAME "SKLFamily") + set(PREFERRED_FAMILY_NAME "Gen9Family") ADD_ITEM_FOR_CORE_TYPE("PLATFORMS" "TESTED" "GEN9" "SKL") ADD_PRODUCT("TESTED" "SKL" "IGFX_SKYLAKE") endif() @@ -133,7 +133,7 @@ if(SUPPORT_GEN11) set(CORE_GEN11_REVISIONS 0) set(LP_GEN11_REVISIONS 0) if(TESTS_GEN11) - ADD_ITEM_FOR_CORE_TYPE("FAMILY_NAME" "TESTED" "GEN11" "ICLFamily") + ADD_ITEM_FOR_CORE_TYPE("FAMILY_NAME" "TESTED" "GEN11" "Gen11Family") endif() if(SUPPORT_ICLLP) @@ -172,7 +172,7 @@ endif() if(SUPPORT_GEN12LP) set(LP_GEN12LP_REVISIONS 0) if(TESTS_GEN12LP) - ADD_ITEM_FOR_CORE_TYPE("FAMILY_NAME" "TESTED" "GEN12LP" "TGLLPFamily") + ADD_ITEM_FOR_CORE_TYPE("FAMILY_NAME" "TESTED" "GEN12LP" "Gen12LpFamily") endif() if(SUPPORT_TGLLP) ADD_PRODUCT("SUPPORTED" "TGLLP" "IGFX_TIGERLAKE_LP") @@ -267,7 +267,7 @@ endif() if(SUPPORT_XE_HPG_CORE) set(CORE_XE_HPG_CORE_REVISIONS 0) if(TESTS_XE_HPG_CORE) - ADD_ITEM_FOR_CORE_TYPE("FAMILY_NAME" "TESTED" "XE_HPG_CORE" "XE_HPG_COREFamily") + ADD_ITEM_FOR_CORE_TYPE("FAMILY_NAME" "TESTED" "XE_HPG_CORE" "XeHpgCoreFamily") endif() if(SUPPORT_DG2) set(DG2_XE_HPG_CORE_REVISIONS 0) @@ -285,7 +285,7 @@ endif() if(SUPPORT_XE_HPC_CORE) set(XE_HPC_CORE_TEST_KERNELS_BLOCKLIST "CopyBuffer_simd8.cl") if(TESTS_XE_HPC_CORE) - ADD_ITEM_FOR_CORE_TYPE("FAMILY_NAME" "TESTED" "XE_HPC_CORE" "XE_HPC_COREFamily") + ADD_ITEM_FOR_CORE_TYPE("FAMILY_NAME" "TESTED" "XE_HPC_CORE" "XeHpcCoreFamily") endif() if(SUPPORT_PVC) diff --git a/level_zero/core/source/gen11/enable_family_full_l0_gen11.cpp b/level_zero/core/source/gen11/enable_family_full_l0_gen11.cpp index 3b922a615d..367eb76e48 100644 --- a/level_zero/core/source/gen11/enable_family_full_l0_gen11.cpp +++ b/level_zero/core/source/gen11/enable_family_full_l0_gen11.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2020-2021 Intel Corporation + * Copyright (C) 2020-2022 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -12,7 +12,7 @@ namespace NEO { -using Family = ICLFamily; +using Family = Gen11Family; struct EnableL0Gen11 { EnableL0Gen11() { diff --git a/level_zero/core/source/gen11/l0_hw_helper_gen11.cpp b/level_zero/core/source/gen11/l0_hw_helper_gen11.cpp index 39dde5bed5..ffa7a9e938 100644 --- a/level_zero/core/source/gen11/l0_hw_helper_gen11.cpp +++ b/level_zero/core/source/gen11/l0_hw_helper_gen11.cpp @@ -13,7 +13,7 @@ namespace L0 { -using Family = NEO::ICLFamily; +using Family = NEO::Gen11Family; static auto gfxCore = IGFX_GEN11_CORE; template <> diff --git a/level_zero/core/source/gen12lp/enable_family_full_l0_gen12lp.cpp b/level_zero/core/source/gen12lp/enable_family_full_l0_gen12lp.cpp index 26720e9231..562acc4dcf 100644 --- a/level_zero/core/source/gen12lp/enable_family_full_l0_gen12lp.cpp +++ b/level_zero/core/source/gen12lp/enable_family_full_l0_gen12lp.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2020-2021 Intel Corporation + * Copyright (C) 2020-2022 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -12,7 +12,7 @@ namespace NEO { -using Family = TGLLPFamily; +using Family = Gen12LpFamily; struct EnableL0Gen12LP { EnableL0Gen12LP() { diff --git a/level_zero/core/source/gen12lp/l0_hw_helper_gen12lp.cpp b/level_zero/core/source/gen12lp/l0_hw_helper_gen12lp.cpp index e6b2bc6aac..8606552e63 100644 --- a/level_zero/core/source/gen12lp/l0_hw_helper_gen12lp.cpp +++ b/level_zero/core/source/gen12lp/l0_hw_helper_gen12lp.cpp @@ -14,7 +14,7 @@ namespace L0 { -using Family = NEO::TGLLPFamily; +using Family = NEO::Gen12LpFamily; static auto gfxCore = IGFX_GEN12LP_CORE; template <> diff --git a/level_zero/core/source/gen8/enable_family_full_l0_gen8.cpp b/level_zero/core/source/gen8/enable_family_full_l0_gen8.cpp index 7084495b78..47b4b65a45 100644 --- a/level_zero/core/source/gen8/enable_family_full_l0_gen8.cpp +++ b/level_zero/core/source/gen8/enable_family_full_l0_gen8.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2020-2021 Intel Corporation + * Copyright (C) 2020-2022 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -9,7 +9,7 @@ namespace NEO { -using Family = BDWFamily; +using Family = Gen8Family; struct EnableL0Gen8 { EnableL0Gen8() { diff --git a/level_zero/core/source/gen9/enable_family_full_l0_gen9.cpp b/level_zero/core/source/gen9/enable_family_full_l0_gen9.cpp index 0083c3a79a..a1767952b4 100644 --- a/level_zero/core/source/gen9/enable_family_full_l0_gen9.cpp +++ b/level_zero/core/source/gen9/enable_family_full_l0_gen9.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2020-2021 Intel Corporation + * Copyright (C) 2020-2022 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -12,7 +12,7 @@ namespace NEO { -using Family = SKLFamily; +using Family = Gen9Family; struct EnableL0Gen9 { EnableL0Gen9() { diff --git a/level_zero/core/source/gen9/l0_hw_helper_gen9.cpp b/level_zero/core/source/gen9/l0_hw_helper_gen9.cpp index c6dc9f5909..b75e935ed6 100644 --- a/level_zero/core/source/gen9/l0_hw_helper_gen9.cpp +++ b/level_zero/core/source/gen9/l0_hw_helper_gen9.cpp @@ -13,7 +13,7 @@ namespace L0 { -using Family = NEO::SKLFamily; +using Family = NEO::Gen9Family; static auto gfxCore = IGFX_GEN9_CORE; template <> diff --git a/level_zero/core/source/xe_hpc_core/enable_family_full_l0_xe_hpc_core.cpp b/level_zero/core/source/xe_hpc_core/enable_family_full_l0_xe_hpc_core.cpp index 78291cf848..d8f57570d9 100644 --- a/level_zero/core/source/xe_hpc_core/enable_family_full_l0_xe_hpc_core.cpp +++ b/level_zero/core/source/xe_hpc_core/enable_family_full_l0_xe_hpc_core.cpp @@ -12,7 +12,7 @@ namespace NEO { -using Family = XE_HPC_COREFamily; +using Family = XeHpcCoreFamily; struct EnableL0XeHpcCore { EnableL0XeHpcCore() { diff --git a/level_zero/core/source/xe_hpc_core/l0_hw_helper_xe_hpc_core.cpp b/level_zero/core/source/xe_hpc_core/l0_hw_helper_xe_hpc_core.cpp index 44bcb743e6..726cb78a6f 100644 --- a/level_zero/core/source/xe_hpc_core/l0_hw_helper_xe_hpc_core.cpp +++ b/level_zero/core/source/xe_hpc_core/l0_hw_helper_xe_hpc_core.cpp @@ -13,7 +13,7 @@ namespace L0 { -using Family = NEO::XE_HPC_COREFamily; +using Family = NEO::XeHpcCoreFamily; static auto gfxCore = IGFX_XE_HPC_CORE; template <> diff --git a/level_zero/core/source/xe_hpg_core/enable_family_full_l0_xe_hpg_core.cpp b/level_zero/core/source/xe_hpg_core/enable_family_full_l0_xe_hpg_core.cpp index 5c43bca222..9d340c121a 100644 --- a/level_zero/core/source/xe_hpg_core/enable_family_full_l0_xe_hpg_core.cpp +++ b/level_zero/core/source/xe_hpg_core/enable_family_full_l0_xe_hpg_core.cpp @@ -12,7 +12,7 @@ namespace NEO { -using Family = XE_HPG_COREFamily; +using Family = XeHpgCoreFamily; struct EnableL0XeHpgCore { EnableL0XeHpgCore() { diff --git a/level_zero/core/source/xe_hpg_core/l0_hw_helper_xe_hpg_core.cpp b/level_zero/core/source/xe_hpg_core/l0_hw_helper_xe_hpg_core.cpp index 530861a10f..f1cd76213d 100644 --- a/level_zero/core/source/xe_hpg_core/l0_hw_helper_xe_hpg_core.cpp +++ b/level_zero/core/source/xe_hpg_core/l0_hw_helper_xe_hpg_core.cpp @@ -13,7 +13,7 @@ namespace L0 { -using Family = NEO::XE_HPG_COREFamily; +using Family = NEO::XeHpgCoreFamily; static auto gfxCore = IGFX_XE_HPG_CORE; template <> diff --git a/level_zero/core/test/unit_tests/gen11/enable_l0_mocks_gen11.cpp b/level_zero/core/test/unit_tests/gen11/enable_l0_mocks_gen11.cpp index 5b0ab840d8..8be23e74da 100644 --- a/level_zero/core/test/unit_tests/gen11/enable_l0_mocks_gen11.cpp +++ b/level_zero/core/test/unit_tests/gen11/enable_l0_mocks_gen11.cpp @@ -9,8 +9,8 @@ namespace NEO { -struct ICLFamily; -using GfxFamily = ICLFamily; +struct Gen11Family; +using GfxFamily = Gen11Family; } // namespace NEO namespace L0 { diff --git a/level_zero/core/test/unit_tests/gen12lp/enable_l0_mocks_gen12lp.cpp b/level_zero/core/test/unit_tests/gen12lp/enable_l0_mocks_gen12lp.cpp index 2d1eaf7e78..acc2fcd4a4 100644 --- a/level_zero/core/test/unit_tests/gen12lp/enable_l0_mocks_gen12lp.cpp +++ b/level_zero/core/test/unit_tests/gen12lp/enable_l0_mocks_gen12lp.cpp @@ -9,8 +9,8 @@ namespace NEO { -struct TGLLPFamily; -using GfxFamily = TGLLPFamily; +struct Gen12LpFamily; +using GfxFamily = Gen12LpFamily; } // namespace NEO diff --git a/level_zero/core/test/unit_tests/gen9/enable_l0_mocks_gen9.cpp b/level_zero/core/test/unit_tests/gen9/enable_l0_mocks_gen9.cpp index a81995c9a1..2d519f0cb6 100644 --- a/level_zero/core/test/unit_tests/gen9/enable_l0_mocks_gen9.cpp +++ b/level_zero/core/test/unit_tests/gen9/enable_l0_mocks_gen9.cpp @@ -8,8 +8,8 @@ #include "shared/test/unit_test/mocks/mock_l0_debugger.h" namespace NEO { -struct SKLFamily; -using GfxFamily = SKLFamily; +struct Gen9Family; +using GfxFamily = Gen9Family; } // namespace NEO namespace L0 { diff --git a/level_zero/core/test/unit_tests/xe_hpc_core/enable_l0_mocks_xe_hpc_core.cpp b/level_zero/core/test/unit_tests/xe_hpc_core/enable_l0_mocks_xe_hpc_core.cpp index d6f92613ff..9c0e60dcd4 100644 --- a/level_zero/core/test/unit_tests/xe_hpc_core/enable_l0_mocks_xe_hpc_core.cpp +++ b/level_zero/core/test/unit_tests/xe_hpc_core/enable_l0_mocks_xe_hpc_core.cpp @@ -8,8 +8,8 @@ #include "shared/test/unit_test/mocks/mock_l0_debugger.h" namespace NEO { -struct XE_HPC_COREFamily; -using GfxFamily = XE_HPC_COREFamily; +struct XeHpcCoreFamily; +using GfxFamily = XeHpcCoreFamily; } // namespace NEO namespace L0 { diff --git a/level_zero/core/test/unit_tests/xe_hpc_core/xe_hpc_core_test_l0_fixtures.cpp b/level_zero/core/test/unit_tests/xe_hpc_core/xe_hpc_core_test_l0_fixtures.cpp index a33c8c7692..f518f5c534 100644 --- a/level_zero/core/test/unit_tests/xe_hpc_core/xe_hpc_core_test_l0_fixtures.cpp +++ b/level_zero/core/test/unit_tests/xe_hpc_core/xe_hpc_core_test_l0_fixtures.cpp @@ -29,7 +29,7 @@ void DeviceFixtureXeHpcTests::checkIfCallingGetMemoryPropertiesWithNonNullPtrThe } void CommandListStatePrefetchXeHpcCore::checkIfDebugFlagSetWhenPrefetchApiCalledAThenStatePrefetchProgrammed(HardwareInfo *hwInfo) { - using STATE_PREFETCH = typename XE_HPC_COREFamily::STATE_PREFETCH; + using STATE_PREFETCH = typename XeHpcCoreFamily::STATE_PREFETCH; DebugManagerStateRestore restore; auto pCommandList = std::make_unique>>(); auto result = pCommandList->initialize(device, NEO::EngineGroupType::Compute, 0u); @@ -76,8 +76,8 @@ void CommandListStatePrefetchXeHpcCore::checkIfDebugFlagSetWhenPrefetchApiCalled } void CommandListStatePrefetchXeHpcCore::checkIfCommandBufferIsExhaustedWhenPrefetchApiCalledThenStatePrefetchProgrammed(HardwareInfo *hwInfo) { - using STATE_PREFETCH = typename XE_HPC_COREFamily::STATE_PREFETCH; - using MI_BATCH_BUFFER_END = typename XE_HPC_COREFamily::MI_BATCH_BUFFER_END; + using STATE_PREFETCH = typename XeHpcCoreFamily::STATE_PREFETCH; + using MI_BATCH_BUFFER_END = typename XeHpcCoreFamily::MI_BATCH_BUFFER_END; DebugManagerStateRestore restore; diff --git a/level_zero/core/test/unit_tests/xe_hpg_core/dg2/test_sampler_dg2.cpp b/level_zero/core/test/unit_tests/xe_hpg_core/dg2/test_sampler_dg2.cpp index 1efdd77e05..ae5dba22e1 100644 --- a/level_zero/core/test/unit_tests/xe_hpg_core/dg2/test_sampler_dg2.cpp +++ b/level_zero/core/test/unit_tests/xe_hpg_core/dg2/test_sampler_dg2.cpp @@ -18,7 +18,7 @@ namespace ult { using SamplerCreateTest = Test; HWTEST2_F(SamplerCreateTest, givenDg2WhenInitializeSamplerAndForceSamplerLowFilteringPrecisionIsFalseThenLowQualityFilterIsDisabled, IsDG2) { - using SAMPLER_STATE = typename NEO::XE_HPG_COREFamily::SAMPLER_STATE; + using SAMPLER_STATE = typename NEO::XeHpgCoreFamily::SAMPLER_STATE; EXPECT_FALSE(DebugManager.flags.ForceSamplerLowFilteringPrecision.get()); ze_sampler_address_mode_t addressMode = ZE_SAMPLER_ADDRESS_MODE_REPEAT; ze_sampler_filter_mode_t filterMode = ZE_SAMPLER_FILTER_MODE_NEAREST; @@ -38,7 +38,7 @@ HWTEST2_F(SamplerCreateTest, givenDg2WhenInitializeSamplerAndForceSamplerLowFilt } HWTEST2_F(SamplerCreateTest, givenDg2WhenInitializeSamplerAndForceSamplerLowFilteringPrecisionIsTrueThenLowQualityFilterIsEnabled, IsDG2) { - using SAMPLER_STATE = typename NEO::XE_HPG_COREFamily::SAMPLER_STATE; + using SAMPLER_STATE = typename NEO::XeHpgCoreFamily::SAMPLER_STATE; DebugManagerStateRestore dbgRestore; DebugManager.flags.ForceSamplerLowFilteringPrecision.set(true); EXPECT_TRUE(DebugManager.flags.ForceSamplerLowFilteringPrecision.get()); diff --git a/level_zero/core/test/unit_tests/xe_hpg_core/enable_l0_mocks_xe_hpg_core.cpp b/level_zero/core/test/unit_tests/xe_hpg_core/enable_l0_mocks_xe_hpg_core.cpp index 6d3602cda3..a2aaa338ce 100644 --- a/level_zero/core/test/unit_tests/xe_hpg_core/enable_l0_mocks_xe_hpg_core.cpp +++ b/level_zero/core/test/unit_tests/xe_hpg_core/enable_l0_mocks_xe_hpg_core.cpp @@ -8,8 +8,8 @@ #include "shared/test/unit_test/mocks/mock_l0_debugger.h" namespace NEO { -struct XE_HPG_COREFamily; -using GfxFamily = XE_HPG_COREFamily; +struct XeHpgCoreFamily; +using GfxFamily = XeHpgCoreFamily; } // namespace NEO namespace L0 { diff --git a/opencl/source/gen11/buffer_gen11.cpp b/opencl/source/gen11/buffer_gen11.cpp index 6c3e71824a..d8ad193c2d 100644 --- a/opencl/source/gen11/buffer_gen11.cpp +++ b/opencl/source/gen11/buffer_gen11.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2019-2021 Intel Corporation + * Copyright (C) 2019-2022 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -11,7 +11,7 @@ namespace NEO { -typedef ICLFamily Family; +typedef Gen11Family Family; static auto gfxCore = IGFX_GEN11_CORE; #include "opencl/source/mem_obj/buffer_factory_init.inl" diff --git a/opencl/source/gen11/cl_hw_helper_gen11.cpp b/opencl/source/gen11/cl_hw_helper_gen11.cpp index ebd5519ec9..15cd3254fb 100644 --- a/opencl/source/gen11/cl_hw_helper_gen11.cpp +++ b/opencl/source/gen11/cl_hw_helper_gen11.cpp @@ -13,7 +13,7 @@ namespace NEO { -using Family = ICLFamily; +using Family = Gen11Family; static auto gfxCore = IGFX_GEN11_CORE; template <> diff --git a/opencl/source/gen11/command_queue_gen11.cpp b/opencl/source/gen11/command_queue_gen11.cpp index b5349b4b30..c1efcf0cea 100644 --- a/opencl/source/gen11/command_queue_gen11.cpp +++ b/opencl/source/gen11/command_queue_gen11.cpp @@ -15,7 +15,7 @@ namespace NEO { -typedef ICLFamily Family; +typedef Gen11Family Family; static auto gfxCore = IGFX_GEN11_CORE; template class CommandQueueHw; diff --git a/opencl/source/gen11/enable_family_full_ocl_gen11.cpp b/opencl/source/gen11/enable_family_full_ocl_gen11.cpp index cb731073c8..d9c9cf30ef 100644 --- a/opencl/source/gen11/enable_family_full_ocl_gen11.cpp +++ b/opencl/source/gen11/enable_family_full_ocl_gen11.cpp @@ -16,7 +16,7 @@ namespace NEO { -using Family = ICLFamily; +using Family = Gen11Family; struct EnableOCLGen11 { EnableOCLGen11() { diff --git a/opencl/source/gen11/gpgpu_walker_gen11.cpp b/opencl/source/gen11/gpgpu_walker_gen11.cpp index 1d18edc574..57ff8add61 100644 --- a/opencl/source/gen11/gpgpu_walker_gen11.cpp +++ b/opencl/source/gen11/gpgpu_walker_gen11.cpp @@ -13,10 +13,10 @@ namespace NEO { -template class HardwareInterface; +template class HardwareInterface; -template class GpgpuWalkerHelper; +template class GpgpuWalkerHelper; -template struct EnqueueOperation; +template struct EnqueueOperation; } // namespace NEO diff --git a/opencl/source/gen11/gtpin_setup_gen11.cpp b/opencl/source/gen11/gtpin_setup_gen11.cpp index 86393bd131..7904f01302 100644 --- a/opencl/source/gen11/gtpin_setup_gen11.cpp +++ b/opencl/source/gen11/gtpin_setup_gen11.cpp @@ -17,7 +17,7 @@ namespace NEO { extern GTPinHwHelper *gtpinHwHelperFactory[IGFX_MAX_CORE]; -typedef ICLFamily Family; +typedef Gen11Family Family; static const auto gfxFamily = IGFX_GEN11_CORE; template <> diff --git a/opencl/source/gen11/hardware_commands_helper_gen11.cpp b/opencl/source/gen11/hardware_commands_helper_gen11.cpp index cf06124d26..79798c2beb 100644 --- a/opencl/source/gen11/hardware_commands_helper_gen11.cpp +++ b/opencl/source/gen11/hardware_commands_helper_gen11.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2019-2021 Intel Corporation + * Copyright (C) 2019-2022 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -13,7 +13,7 @@ #include "opencl/source/helpers/hardware_commands_helper_bdw_and_later.inl" namespace NEO { -using FamilyType = ICLFamily; +using FamilyType = Gen11Family; template struct HardwareCommandsHelper; } // namespace NEO diff --git a/opencl/source/gen11/image_gen11.cpp b/opencl/source/gen11/image_gen11.cpp index 498ef741d3..14e4d65e9c 100644 --- a/opencl/source/gen11/image_gen11.cpp +++ b/opencl/source/gen11/image_gen11.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2019-2021 Intel Corporation + * Copyright (C) 2019-2022 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -13,7 +13,7 @@ namespace NEO { -using Family = ICLFamily; +using Family = Gen11Family; static auto gfxCore = IGFX_GEN11_CORE; template <> diff --git a/opencl/source/gen11/sampler_gen11.cpp b/opencl/source/gen11/sampler_gen11.cpp index 80e6b0ae1b..28d1e530f1 100644 --- a/opencl/source/gen11/sampler_gen11.cpp +++ b/opencl/source/gen11/sampler_gen11.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2019-2021 Intel Corporation + * Copyright (C) 2019-2022 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -12,7 +12,7 @@ namespace NEO { -typedef ICLFamily Family; +typedef Gen11Family Family; static auto gfxCore = IGFX_GEN11_CORE; #include "opencl/source/sampler/sampler_factory_init.inl" diff --git a/opencl/source/gen12lp/buffer_gen12lp.cpp b/opencl/source/gen12lp/buffer_gen12lp.cpp index d6d8cd8537..17bef8805b 100644 --- a/opencl/source/gen12lp/buffer_gen12lp.cpp +++ b/opencl/source/gen12lp/buffer_gen12lp.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2019-2020 Intel Corporation + * Copyright (C) 2019-2022 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -11,7 +11,7 @@ namespace NEO { -typedef TGLLPFamily Family; +typedef Gen12LpFamily Family; static auto gfxCore = IGFX_GEN12LP_CORE; #include "opencl/source/mem_obj/buffer_factory_init.inl" diff --git a/opencl/source/gen12lp/cl_hw_helper_gen12lp.cpp b/opencl/source/gen12lp/cl_hw_helper_gen12lp.cpp index e4f9453c2e..fec9092166 100644 --- a/opencl/source/gen12lp/cl_hw_helper_gen12lp.cpp +++ b/opencl/source/gen12lp/cl_hw_helper_gen12lp.cpp @@ -13,7 +13,7 @@ namespace NEO { -using Family = TGLLPFamily; +using Family = Gen12LpFamily; static auto gfxCore = IGFX_GEN12LP_CORE; template <> diff --git a/opencl/source/gen12lp/command_queue_gen12lp.cpp b/opencl/source/gen12lp/command_queue_gen12lp.cpp index c1686b4d7d..7ad2d1f9e9 100644 --- a/opencl/source/gen12lp/command_queue_gen12lp.cpp +++ b/opencl/source/gen12lp/command_queue_gen12lp.cpp @@ -15,7 +15,7 @@ namespace NEO { -typedef TGLLPFamily Family; +typedef Gen12LpFamily Family; static auto gfxCore = IGFX_GEN12LP_CORE; template <> diff --git a/opencl/source/gen12lp/enable_family_full_ocl_gen12lp.cpp b/opencl/source/gen12lp/enable_family_full_ocl_gen12lp.cpp index e3dd3ecf0c..61edb9c945 100644 --- a/opencl/source/gen12lp/enable_family_full_ocl_gen12lp.cpp +++ b/opencl/source/gen12lp/enable_family_full_ocl_gen12lp.cpp @@ -16,7 +16,7 @@ namespace NEO { -using Family = TGLLPFamily; +using Family = Gen12LpFamily; struct EnableOCLGen12LP { EnableOCLGen12LP() { diff --git a/opencl/source/gen12lp/gpgpu_walker_gen12lp.cpp b/opencl/source/gen12lp/gpgpu_walker_gen12lp.cpp index 9e6dcdbe6c..1a52d720eb 100644 --- a/opencl/source/gen12lp/gpgpu_walker_gen12lp.cpp +++ b/opencl/source/gen12lp/gpgpu_walker_gen12lp.cpp @@ -13,47 +13,47 @@ namespace NEO { template <> -void GpgpuWalkerHelper::adjustMiStoreRegMemMode(MI_STORE_REG_MEM *storeCmd) { +void GpgpuWalkerHelper::adjustMiStoreRegMemMode(MI_STORE_REG_MEM *storeCmd) { storeCmd->setMmioRemapEnable(true); } template <> -void HardwareInterface::dispatchWorkarounds( +void HardwareInterface::dispatchWorkarounds( LinearStream *commandStream, CommandQueue &commandQueue, Kernel &kernel, const bool &enable) { - using MI_LOAD_REGISTER_IMM = typename TGLLPFamily::MI_LOAD_REGISTER_IMM; - using PIPE_CONTROL = typename TGLLPFamily::PIPE_CONTROL; + using MI_LOAD_REGISTER_IMM = typename Gen12LpFamily::MI_LOAD_REGISTER_IMM; + using PIPE_CONTROL = typename Gen12LpFamily::PIPE_CONTROL; if (kernel.requiresWaDisableRccRhwoOptimization()) { - PIPE_CONTROL cmdPipeControl = TGLLPFamily::cmdInitPipeControl; + PIPE_CONTROL cmdPipeControl = Gen12LpFamily::cmdInitPipeControl; cmdPipeControl.setCommandStreamerStallEnable(true); auto pCmdPipeControl = commandStream->getSpaceForCmd(); *pCmdPipeControl = cmdPipeControl; uint32_t value = enable ? 0x40004000 : 0x40000000; - NEO::LriHelper::program(commandStream, - 0x7010, - value, - false); + NEO::LriHelper::program(commandStream, + 0x7010, + value, + false); } } template <> -size_t GpgpuWalkerHelper::getSizeForWaDisableRccRhwoOptimization(const Kernel *pKernel) { +size_t GpgpuWalkerHelper::getSizeForWaDisableRccRhwoOptimization(const Kernel *pKernel) { if (pKernel->requiresWaDisableRccRhwoOptimization()) { - return (2 * (sizeof(TGLLPFamily::PIPE_CONTROL) + sizeof(TGLLPFamily::MI_LOAD_REGISTER_IMM))); + return (2 * (sizeof(Gen12LpFamily::PIPE_CONTROL) + sizeof(Gen12LpFamily::MI_LOAD_REGISTER_IMM))); } return 0u; } -template class HardwareInterface; +template class HardwareInterface; -template class GpgpuWalkerHelper; +template class GpgpuWalkerHelper; -template struct EnqueueOperation; +template struct EnqueueOperation; } // namespace NEO diff --git a/opencl/source/gen12lp/gtpin_setup_gen12lp.cpp b/opencl/source/gen12lp/gtpin_setup_gen12lp.cpp index 0b3a46ea82..ce2312911a 100644 --- a/opencl/source/gen12lp/gtpin_setup_gen12lp.cpp +++ b/opencl/source/gen12lp/gtpin_setup_gen12lp.cpp @@ -17,7 +17,7 @@ namespace NEO { extern GTPinHwHelper *gtpinHwHelperFactory[IGFX_MAX_CORE]; -typedef TGLLPFamily Family; +typedef Gen12LpFamily Family; static const auto gfxFamily = IGFX_GEN12LP_CORE; template <> diff --git a/opencl/source/gen12lp/hardware_commands_helper_gen12lp.cpp b/opencl/source/gen12lp/hardware_commands_helper_gen12lp.cpp index 5190ca2978..ce5f611b7d 100644 --- a/opencl/source/gen12lp/hardware_commands_helper_gen12lp.cpp +++ b/opencl/source/gen12lp/hardware_commands_helper_gen12lp.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2019-2021 Intel Corporation + * Copyright (C) 2019-2022 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -15,7 +15,7 @@ #include "opencl/source/helpers/hardware_commands_helper_bdw_and_later.inl" namespace NEO { -using FamilyType = TGLLPFamily; +using FamilyType = Gen12LpFamily; template <> size_t HardwareCommandsHelper::getSizeRequiredCS() { diff --git a/opencl/source/gen12lp/image_gen12lp.cpp b/opencl/source/gen12lp/image_gen12lp.cpp index 303695006b..4823d7b858 100644 --- a/opencl/source/gen12lp/image_gen12lp.cpp +++ b/opencl/source/gen12lp/image_gen12lp.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2019-2021 Intel Corporation + * Copyright (C) 2019-2022 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -11,7 +11,7 @@ namespace NEO { -using Family = TGLLPFamily; +using Family = Gen12LpFamily; static auto gfxCore = IGFX_GEN12LP_CORE; } // namespace NEO #include "opencl/source/mem_obj/image_tgllp_and_later.inl" diff --git a/opencl/source/gen12lp/sampler_gen12lp.cpp b/opencl/source/gen12lp/sampler_gen12lp.cpp index bb09bbcf97..1a4baaae15 100644 --- a/opencl/source/gen12lp/sampler_gen12lp.cpp +++ b/opencl/source/gen12lp/sampler_gen12lp.cpp @@ -1,11 +1,11 @@ /* - * Copyright (C) 2019-2021 Intel Corporation + * Copyright (C) 2019-2022 Intel Corporation * * SPDX-License-Identifier: MIT * */ #include "shared/source/gen12lp/hw_cmds_base.h" -using Family = NEO::TGLLPFamily; +using Family = NEO::Gen12LpFamily; constexpr static auto gfxCore = IGFX_GEN12LP_CORE; #include "opencl/source/sampler/sampler_tgllp_and_later.inl" diff --git a/opencl/source/gen8/buffer_gen8.cpp b/opencl/source/gen8/buffer_gen8.cpp index c2bea34beb..f980e91276 100644 --- a/opencl/source/gen8/buffer_gen8.cpp +++ b/opencl/source/gen8/buffer_gen8.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2021 Intel Corporation + * Copyright (C) 2018-2022 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -11,7 +11,7 @@ namespace NEO { -typedef BDWFamily Family; +typedef Gen8Family Family; static auto gfxCore = IGFX_GEN8_CORE; #include "opencl/source/mem_obj/buffer_factory_init.inl" diff --git a/opencl/source/gen8/cl_hw_helper_gen8.cpp b/opencl/source/gen8/cl_hw_helper_gen8.cpp index 845b81d87b..1cc7d64dc9 100644 --- a/opencl/source/gen8/cl_hw_helper_gen8.cpp +++ b/opencl/source/gen8/cl_hw_helper_gen8.cpp @@ -13,7 +13,7 @@ namespace NEO { -using Family = BDWFamily; +using Family = Gen8Family; static auto gfxCore = IGFX_GEN8_CORE; template <> diff --git a/opencl/source/gen8/command_queue_gen8.cpp b/opencl/source/gen8/command_queue_gen8.cpp index c3eb63191b..dc3fcae08e 100644 --- a/opencl/source/gen8/command_queue_gen8.cpp +++ b/opencl/source/gen8/command_queue_gen8.cpp @@ -15,7 +15,7 @@ namespace NEO { -typedef BDWFamily Family; +typedef Gen8Family Family; static auto gfxCore = IGFX_GEN8_CORE; template class CommandQueueHw; diff --git a/opencl/source/gen8/enable_family_full_ocl_gen8.cpp b/opencl/source/gen8/enable_family_full_ocl_gen8.cpp index d31524b988..8a6d8063f8 100644 --- a/opencl/source/gen8/enable_family_full_ocl_gen8.cpp +++ b/opencl/source/gen8/enable_family_full_ocl_gen8.cpp @@ -16,7 +16,7 @@ namespace NEO { -using Family = BDWFamily; +using Family = Gen8Family; struct EnableOCLGen8 { EnableOCLGen8() { diff --git a/opencl/source/gen8/gpgpu_walker_gen8.cpp b/opencl/source/gen8/gpgpu_walker_gen8.cpp index ca65095f0f..0b06735b0d 100644 --- a/opencl/source/gen8/gpgpu_walker_gen8.cpp +++ b/opencl/source/gen8/gpgpu_walker_gen8.cpp @@ -14,33 +14,33 @@ namespace NEO { template <> -void GpgpuWalkerHelper::applyWADisableLSQCROPERFforOCL(NEO::LinearStream *pCommandStream, const Kernel &kernel, bool disablePerfMode) { +void GpgpuWalkerHelper::applyWADisableLSQCROPERFforOCL(NEO::LinearStream *pCommandStream, const Kernel &kernel, bool disablePerfMode) { if (disablePerfMode) { if (kernel.getKernelInfo().kernelDescriptor.kernelAttributes.flags.usesFencesForReadWriteImages) { // Set bit L3SQC_BIT_LQSC_RO_PERF_DIS in L3SQC_REG4 - GpgpuWalkerHelper::addAluReadModifyWriteRegister(pCommandStream, L3SQC_REG4, AluRegisters::OPCODE_OR, L3SQC_BIT_LQSC_RO_PERF_DIS); + GpgpuWalkerHelper::addAluReadModifyWriteRegister(pCommandStream, L3SQC_REG4, AluRegisters::OPCODE_OR, L3SQC_BIT_LQSC_RO_PERF_DIS); } } else { if (kernel.getKernelInfo().kernelDescriptor.kernelAttributes.flags.usesFencesForReadWriteImages) { // Add PIPE_CONTROL with CS_Stall to wait till GPU finishes its work - typedef typename BDWFamily::PIPE_CONTROL PIPE_CONTROL; + typedef typename Gen8Family::PIPE_CONTROL PIPE_CONTROL; auto pipeControlSpace = reinterpret_cast(pCommandStream->getSpace(sizeof(PIPE_CONTROL))); - auto pipeControl = BDWFamily::cmdInitPipeControl; + auto pipeControl = Gen8Family::cmdInitPipeControl; pipeControl.setCommandStreamerStallEnable(true); *pipeControlSpace = pipeControl; // Clear bit L3SQC_BIT_LQSC_RO_PERF_DIS in L3SQC_REG4 - GpgpuWalkerHelper::addAluReadModifyWriteRegister(pCommandStream, L3SQC_REG4, AluRegisters::OPCODE_AND, ~L3SQC_BIT_LQSC_RO_PERF_DIS); + GpgpuWalkerHelper::addAluReadModifyWriteRegister(pCommandStream, L3SQC_REG4, AluRegisters::OPCODE_AND, ~L3SQC_BIT_LQSC_RO_PERF_DIS); } } } template <> -size_t GpgpuWalkerHelper::getSizeForWADisableLSQCROPERFforOCL(const Kernel *pKernel) { - typedef typename BDWFamily::MI_LOAD_REGISTER_REG MI_LOAD_REGISTER_REG; - typedef typename BDWFamily::MI_LOAD_REGISTER_IMM MI_LOAD_REGISTER_IMM; - typedef typename BDWFamily::PIPE_CONTROL PIPE_CONTROL; - typedef typename BDWFamily::MI_MATH MI_MATH; - typedef typename BDWFamily::MI_MATH_ALU_INST_INLINE MI_MATH_ALU_INST_INLINE; +size_t GpgpuWalkerHelper::getSizeForWADisableLSQCROPERFforOCL(const Kernel *pKernel) { + typedef typename Gen8Family::MI_LOAD_REGISTER_REG MI_LOAD_REGISTER_REG; + typedef typename Gen8Family::MI_LOAD_REGISTER_IMM MI_LOAD_REGISTER_IMM; + typedef typename Gen8Family::PIPE_CONTROL PIPE_CONTROL; + typedef typename Gen8Family::MI_MATH MI_MATH; + typedef typename Gen8Family::MI_MATH_ALU_INST_INLINE MI_MATH_ALU_INST_INLINE; size_t n = 0; if (pKernel->getKernelInfo().kernelDescriptor.kernelAttributes.flags.usesFencesForReadWriteImages) { n += sizeof(PIPE_CONTROL) + @@ -54,10 +54,10 @@ size_t GpgpuWalkerHelper::getSizeForWADisableLSQCROPERFforOCL(const K return n; } -template class HardwareInterface; +template class HardwareInterface; -template class GpgpuWalkerHelper; +template class GpgpuWalkerHelper; -template struct EnqueueOperation; +template struct EnqueueOperation; } // namespace NEO diff --git a/opencl/source/gen8/gtpin_setup_gen8.cpp b/opencl/source/gen8/gtpin_setup_gen8.cpp index 92163164c2..190991838e 100644 --- a/opencl/source/gen8/gtpin_setup_gen8.cpp +++ b/opencl/source/gen8/gtpin_setup_gen8.cpp @@ -17,7 +17,7 @@ namespace NEO { extern GTPinHwHelper *gtpinHwHelperFactory[IGFX_MAX_CORE]; -typedef BDWFamily Family; +typedef Gen8Family Family; static const auto gfxFamily = IGFX_GEN8_CORE; template <> diff --git a/opencl/source/gen8/hardware_commands_helper_gen8.cpp b/opencl/source/gen8/hardware_commands_helper_gen8.cpp index 313eecbc7f..db55e5d34f 100644 --- a/opencl/source/gen8/hardware_commands_helper_gen8.cpp +++ b/opencl/source/gen8/hardware_commands_helper_gen8.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2019-2021 Intel Corporation + * Copyright (C) 2019-2022 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -12,7 +12,7 @@ #include "opencl/source/helpers/hardware_commands_helper_bdw_and_later.inl" namespace NEO { -using FamilyType = BDWFamily; +using FamilyType = Gen8Family; template struct HardwareCommandsHelper; } // namespace NEO diff --git a/opencl/source/gen8/image_gen8.cpp b/opencl/source/gen8/image_gen8.cpp index 62e456430b..abe0d8994a 100644 --- a/opencl/source/gen8/image_gen8.cpp +++ b/opencl/source/gen8/image_gen8.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2021 Intel Corporation + * Copyright (C) 2018-2022 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -13,7 +13,7 @@ namespace NEO { -using Family = BDWFamily; +using Family = Gen8Family; static auto gfxCore = IGFX_GEN8_CORE; template <> diff --git a/opencl/source/gen8/sampler_gen8.cpp b/opencl/source/gen8/sampler_gen8.cpp index f69e7c8fad..24dce33f8c 100644 --- a/opencl/source/gen8/sampler_gen8.cpp +++ b/opencl/source/gen8/sampler_gen8.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2021 Intel Corporation + * Copyright (C) 2018-2022 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -12,7 +12,7 @@ namespace NEO { -typedef BDWFamily Family; +typedef Gen8Family Family; static auto gfxCore = IGFX_GEN8_CORE; #include "opencl/source/sampler/sampler_factory_init.inl" diff --git a/opencl/source/gen9/buffer_gen9.cpp b/opencl/source/gen9/buffer_gen9.cpp index 6346f34755..84eb4bea31 100644 --- a/opencl/source/gen9/buffer_gen9.cpp +++ b/opencl/source/gen9/buffer_gen9.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2021 Intel Corporation + * Copyright (C) 2018-2022 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -11,7 +11,7 @@ namespace NEO { -typedef SKLFamily Family; +typedef Gen9Family Family; static auto gfxCore = IGFX_GEN9_CORE; #include "opencl/source/mem_obj/buffer_factory_init.inl" diff --git a/opencl/source/gen9/cl_hw_helper_gen9.cpp b/opencl/source/gen9/cl_hw_helper_gen9.cpp index 47fa55473e..e7dcdbca04 100644 --- a/opencl/source/gen9/cl_hw_helper_gen9.cpp +++ b/opencl/source/gen9/cl_hw_helper_gen9.cpp @@ -13,7 +13,7 @@ namespace NEO { -using Family = SKLFamily; +using Family = Gen9Family; static auto gfxCore = IGFX_GEN9_CORE; template <> diff --git a/opencl/source/gen9/command_queue_gen9.cpp b/opencl/source/gen9/command_queue_gen9.cpp index 284bb16c53..8dddd508a9 100644 --- a/opencl/source/gen9/command_queue_gen9.cpp +++ b/opencl/source/gen9/command_queue_gen9.cpp @@ -15,7 +15,7 @@ namespace NEO { -typedef SKLFamily Family; +typedef Gen9Family Family; static auto gfxCore = IGFX_GEN9_CORE; template class CommandQueueHw; diff --git a/opencl/source/gen9/enable_family_full_ocl_gen9.cpp b/opencl/source/gen9/enable_family_full_ocl_gen9.cpp index af3f54e3bc..59c7d0b8c4 100644 --- a/opencl/source/gen9/enable_family_full_ocl_gen9.cpp +++ b/opencl/source/gen9/enable_family_full_ocl_gen9.cpp @@ -16,7 +16,7 @@ namespace NEO { -using Family = SKLFamily; +using Family = Gen9Family; struct EnableOCLGen9 { EnableOCLGen9() { diff --git a/opencl/source/gen9/gpgpu_walker_gen9.cpp b/opencl/source/gen9/gpgpu_walker_gen9.cpp index 8ee04f5645..d4ca679a79 100644 --- a/opencl/source/gen9/gpgpu_walker_gen9.cpp +++ b/opencl/source/gen9/gpgpu_walker_gen9.cpp @@ -13,34 +13,34 @@ namespace NEO { template <> -void GpgpuWalkerHelper::applyWADisableLSQCROPERFforOCL(NEO::LinearStream *pCommandStream, const Kernel &kernel, bool disablePerfMode) { +void GpgpuWalkerHelper::applyWADisableLSQCROPERFforOCL(NEO::LinearStream *pCommandStream, const Kernel &kernel, bool disablePerfMode) { if (disablePerfMode) { if (kernel.getKernelInfo().kernelDescriptor.kernelAttributes.flags.usesFencesForReadWriteImages) { // Set bit L3SQC_BIT_LQSC_RO_PERF_DIS in L3SQC_REG4 - GpgpuWalkerHelper::addAluReadModifyWriteRegister(pCommandStream, L3SQC_REG4, AluRegisters::OPCODE_OR, L3SQC_BIT_LQSC_RO_PERF_DIS); + GpgpuWalkerHelper::addAluReadModifyWriteRegister(pCommandStream, L3SQC_REG4, AluRegisters::OPCODE_OR, L3SQC_BIT_LQSC_RO_PERF_DIS); } } else { if (kernel.getKernelInfo().kernelDescriptor.kernelAttributes.flags.usesFencesForReadWriteImages) { // Add PIPE_CONTROL with CS_Stall to wait till GPU finishes its work - typedef typename SKLFamily::PIPE_CONTROL PIPE_CONTROL; + typedef typename Gen9Family::PIPE_CONTROL PIPE_CONTROL; auto pipeControlSpace = reinterpret_cast(pCommandStream->getSpace(sizeof(PIPE_CONTROL))); - auto pipeControl = SKLFamily::cmdInitPipeControl; + auto pipeControl = Gen9Family::cmdInitPipeControl; pipeControl.setCommandStreamerStallEnable(true); *pipeControlSpace = pipeControl; // Clear bit L3SQC_BIT_LQSC_RO_PERF_DIS in L3SQC_REG4 - GpgpuWalkerHelper::addAluReadModifyWriteRegister(pCommandStream, L3SQC_REG4, AluRegisters::OPCODE_AND, ~L3SQC_BIT_LQSC_RO_PERF_DIS); + GpgpuWalkerHelper::addAluReadModifyWriteRegister(pCommandStream, L3SQC_REG4, AluRegisters::OPCODE_AND, ~L3SQC_BIT_LQSC_RO_PERF_DIS); } } } template <> -size_t GpgpuWalkerHelper::getSizeForWADisableLSQCROPERFforOCL(const Kernel *pKernel) { - typedef typename SKLFamily::MI_LOAD_REGISTER_REG MI_LOAD_REGISTER_REG; - typedef typename SKLFamily::MI_LOAD_REGISTER_IMM MI_LOAD_REGISTER_IMM; - typedef typename SKLFamily::PIPE_CONTROL PIPE_CONTROL; - typedef typename SKLFamily::MI_MATH MI_MATH; - typedef typename SKLFamily::MI_MATH_ALU_INST_INLINE MI_MATH_ALU_INST_INLINE; +size_t GpgpuWalkerHelper::getSizeForWADisableLSQCROPERFforOCL(const Kernel *pKernel) { + typedef typename Gen9Family::MI_LOAD_REGISTER_REG MI_LOAD_REGISTER_REG; + typedef typename Gen9Family::MI_LOAD_REGISTER_IMM MI_LOAD_REGISTER_IMM; + typedef typename Gen9Family::PIPE_CONTROL PIPE_CONTROL; + typedef typename Gen9Family::MI_MATH MI_MATH; + typedef typename Gen9Family::MI_MATH_ALU_INST_INLINE MI_MATH_ALU_INST_INLINE; size_t n = 0; if (pKernel->getKernelInfo().kernelDescriptor.kernelAttributes.flags.usesFencesForReadWriteImages) { n += sizeof(PIPE_CONTROL) + @@ -54,10 +54,10 @@ size_t GpgpuWalkerHelper::getSizeForWADisableLSQCROPERFforOCL(const K return n; } -template class HardwareInterface; +template class HardwareInterface; -template class GpgpuWalkerHelper; +template class GpgpuWalkerHelper; -template struct EnqueueOperation; +template struct EnqueueOperation; } // namespace NEO diff --git a/opencl/source/gen9/gtpin_setup_gen9.cpp b/opencl/source/gen9/gtpin_setup_gen9.cpp index 9f421cc551..a542ca9bda 100644 --- a/opencl/source/gen9/gtpin_setup_gen9.cpp +++ b/opencl/source/gen9/gtpin_setup_gen9.cpp @@ -17,7 +17,7 @@ namespace NEO { extern GTPinHwHelper *gtpinHwHelperFactory[IGFX_MAX_CORE]; -typedef SKLFamily Family; +typedef Gen9Family Family; static const auto gfxFamily = IGFX_GEN9_CORE; template <> diff --git a/opencl/source/gen9/hardware_commands_helper_gen9.cpp b/opencl/source/gen9/hardware_commands_helper_gen9.cpp index ef8879acf1..a516a8db23 100644 --- a/opencl/source/gen9/hardware_commands_helper_gen9.cpp +++ b/opencl/source/gen9/hardware_commands_helper_gen9.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2019-2021 Intel Corporation + * Copyright (C) 2019-2022 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -14,7 +14,7 @@ #include namespace NEO { -using FamilyType = SKLFamily; +using FamilyType = Gen9Family; template struct HardwareCommandsHelper; } // namespace NEO diff --git a/opencl/source/gen9/image_gen9.cpp b/opencl/source/gen9/image_gen9.cpp index 1f43151c72..8ed5121411 100644 --- a/opencl/source/gen9/image_gen9.cpp +++ b/opencl/source/gen9/image_gen9.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2021 Intel Corporation + * Copyright (C) 2018-2022 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -11,7 +11,7 @@ namespace NEO { -using Family = SKLFamily; +using Family = Gen9Family; static auto gfxCore = IGFX_GEN9_CORE; } // namespace NEO diff --git a/opencl/source/gen9/sampler_gen9.cpp b/opencl/source/gen9/sampler_gen9.cpp index b24db15369..18a1690e64 100644 --- a/opencl/source/gen9/sampler_gen9.cpp +++ b/opencl/source/gen9/sampler_gen9.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2021 Intel Corporation + * Copyright (C) 2018-2022 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -12,7 +12,7 @@ namespace NEO { -typedef SKLFamily Family; +typedef Gen9Family Family; static auto gfxCore = IGFX_GEN9_CORE; #include "opencl/source/sampler/sampler_factory_init.inl" diff --git a/opencl/source/xe_hpc_core/buffer_xe_hpc_core.cpp b/opencl/source/xe_hpc_core/buffer_xe_hpc_core.cpp index c8d5ad76df..dfc05b8b20 100644 --- a/opencl/source/xe_hpc_core/buffer_xe_hpc_core.cpp +++ b/opencl/source/xe_hpc_core/buffer_xe_hpc_core.cpp @@ -11,7 +11,7 @@ namespace NEO { -using Family = XE_HPC_COREFamily; +using Family = XeHpcCoreFamily; static auto gfxCore = IGFX_XE_HPC_CORE; template class BufferHw; diff --git a/opencl/source/xe_hpc_core/cl_hw_helper_xe_hpc_core.cpp b/opencl/source/xe_hpc_core/cl_hw_helper_xe_hpc_core.cpp index d62d6dc673..575ed0c61c 100644 --- a/opencl/source/xe_hpc_core/cl_hw_helper_xe_hpc_core.cpp +++ b/opencl/source/xe_hpc_core/cl_hw_helper_xe_hpc_core.cpp @@ -13,7 +13,7 @@ namespace NEO { -using Family = XE_HPC_COREFamily; +using Family = XeHpcCoreFamily; static auto gfxCore = IGFX_XE_HPC_CORE; #include "opencl/source/helpers/cl_hw_helper_pvc_and_later.inl" diff --git a/opencl/source/xe_hpc_core/command_queue_xe_hpc_core.cpp b/opencl/source/xe_hpc_core/command_queue_xe_hpc_core.cpp index ba2417691d..56cc5c5a63 100644 --- a/opencl/source/xe_hpc_core/command_queue_xe_hpc_core.cpp +++ b/opencl/source/xe_hpc_core/command_queue_xe_hpc_core.cpp @@ -14,7 +14,7 @@ namespace NEO { -using Family = XE_HPC_COREFamily; +using Family = XeHpcCoreFamily; static auto gfxCore = IGFX_XE_HPC_CORE; } // namespace NEO diff --git a/opencl/source/xe_hpc_core/enable_family_full_ocl_xe_hpc_core.cpp b/opencl/source/xe_hpc_core/enable_family_full_ocl_xe_hpc_core.cpp index 6e348848f5..cfd7e773d9 100644 --- a/opencl/source/xe_hpc_core/enable_family_full_ocl_xe_hpc_core.cpp +++ b/opencl/source/xe_hpc_core/enable_family_full_ocl_xe_hpc_core.cpp @@ -16,7 +16,7 @@ namespace NEO { -using Family = XE_HPC_COREFamily; +using Family = XeHpcCoreFamily; struct EnableOCLXeHpcCore { EnableOCLXeHpcCore() { diff --git a/opencl/source/xe_hpc_core/gpgpu_walker_xe_hpc_core.cpp b/opencl/source/xe_hpc_core/gpgpu_walker_xe_hpc_core.cpp index ffab73a304..7e59135851 100644 --- a/opencl/source/xe_hpc_core/gpgpu_walker_xe_hpc_core.cpp +++ b/opencl/source/xe_hpc_core/gpgpu_walker_xe_hpc_core.cpp @@ -12,10 +12,10 @@ namespace NEO { -template class GpgpuWalkerHelper; +template class GpgpuWalkerHelper; -template class HardwareInterface; +template class HardwareInterface; -template struct EnqueueOperation; +template struct EnqueueOperation; } // namespace NEO diff --git a/opencl/source/xe_hpc_core/gtpin_setup_xe_hpc_core.cpp b/opencl/source/xe_hpc_core/gtpin_setup_xe_hpc_core.cpp index 93e9b42997..3bae0f56b1 100644 --- a/opencl/source/xe_hpc_core/gtpin_setup_xe_hpc_core.cpp +++ b/opencl/source/xe_hpc_core/gtpin_setup_xe_hpc_core.cpp @@ -16,7 +16,7 @@ namespace NEO { extern GTPinHwHelper *gtpinHwHelperFactory[IGFX_MAX_CORE]; -using Family = XE_HPC_COREFamily; +using Family = XeHpcCoreFamily; static const auto gfxFamily = IGFX_XE_HPC_CORE; template class GTPinHwHelperHw; diff --git a/opencl/source/xe_hpc_core/hardware_commands_helper_xe_hpc_core.cpp b/opencl/source/xe_hpc_core/hardware_commands_helper_xe_hpc_core.cpp index 1ec2908cbf..cef401bdac 100644 --- a/opencl/source/xe_hpc_core/hardware_commands_helper_xe_hpc_core.cpp +++ b/opencl/source/xe_hpc_core/hardware_commands_helper_xe_hpc_core.cpp @@ -13,7 +13,7 @@ #include "opencl/source/helpers/hardware_commands_helper_xehp_and_later.inl" namespace NEO { -using FamilyType = XE_HPC_COREFamily; +using FamilyType = XeHpcCoreFamily; template struct HardwareCommandsHelper; } // 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 e02d32ea79..6c744202d5 100644 --- a/opencl/source/xe_hpc_core/image_xe_hpc_core.cpp +++ b/opencl/source/xe_hpc_core/image_xe_hpc_core.cpp @@ -11,7 +11,7 @@ namespace NEO { -using Family = XE_HPC_COREFamily; +using Family = XeHpcCoreFamily; static auto gfxCore = IGFX_XE_HPC_CORE; } // namespace NEO #include "opencl/source/mem_obj/image_tgllp_and_later.inl" diff --git a/opencl/source/xe_hpc_core/sampler_xe_hpc_core.cpp b/opencl/source/xe_hpc_core/sampler_xe_hpc_core.cpp index 2ecd284bb1..051cfd5a12 100644 --- a/opencl/source/xe_hpc_core/sampler_xe_hpc_core.cpp +++ b/opencl/source/xe_hpc_core/sampler_xe_hpc_core.cpp @@ -6,6 +6,6 @@ */ #include "shared/source/xe_hpc_core/hw_cmds_xe_hpc_core_base.h" -using Family = NEO::XE_HPC_COREFamily; +using Family = NEO::XeHpcCoreFamily; constexpr static auto gfxCore = IGFX_XE_HPC_CORE; #include "opencl/source/sampler/sampler_tgllp_and_later.inl" diff --git a/opencl/source/xe_hpg_core/buffer_xe_hpg_core.cpp b/opencl/source/xe_hpg_core/buffer_xe_hpg_core.cpp index 7d3a14c6cb..e4d600c4c9 100644 --- a/opencl/source/xe_hpg_core/buffer_xe_hpg_core.cpp +++ b/opencl/source/xe_hpg_core/buffer_xe_hpg_core.cpp @@ -11,7 +11,7 @@ namespace NEO { -typedef XE_HPG_COREFamily Family; +typedef XeHpgCoreFamily Family; static auto gfxCore = IGFX_XE_HPG_CORE; template class BufferHw; diff --git a/opencl/source/xe_hpg_core/cl_hw_helper_xe_hpg_core.cpp b/opencl/source/xe_hpg_core/cl_hw_helper_xe_hpg_core.cpp index 6b5af235cf..0e233ebbca 100644 --- a/opencl/source/xe_hpg_core/cl_hw_helper_xe_hpg_core.cpp +++ b/opencl/source/xe_hpg_core/cl_hw_helper_xe_hpg_core.cpp @@ -16,7 +16,7 @@ namespace NEO { -using Family = XE_HPG_COREFamily; +using Family = XeHpgCoreFamily; static auto gfxCore = IGFX_XE_HPG_CORE; template <> diff --git a/opencl/source/xe_hpg_core/command_queue_xe_hpg_core.cpp b/opencl/source/xe_hpg_core/command_queue_xe_hpg_core.cpp index ff9e0eef0e..3f0647ce99 100644 --- a/opencl/source/xe_hpg_core/command_queue_xe_hpg_core.cpp +++ b/opencl/source/xe_hpg_core/command_queue_xe_hpg_core.cpp @@ -14,7 +14,7 @@ namespace NEO { -using Family = XE_HPG_COREFamily; +using Family = XeHpgCoreFamily; static auto gfxCore = IGFX_XE_HPG_CORE; } // namespace NEO diff --git a/opencl/source/xe_hpg_core/enable_family_full_ocl_xe_hpg_core.cpp b/opencl/source/xe_hpg_core/enable_family_full_ocl_xe_hpg_core.cpp index 414300d2cc..d18ee25c73 100644 --- a/opencl/source/xe_hpg_core/enable_family_full_ocl_xe_hpg_core.cpp +++ b/opencl/source/xe_hpg_core/enable_family_full_ocl_xe_hpg_core.cpp @@ -16,7 +16,7 @@ namespace NEO { -using Family = XE_HPG_COREFamily; +using Family = XeHpgCoreFamily; struct EnableOCLXeHpgCore { EnableOCLXeHpgCore() { diff --git a/opencl/source/xe_hpg_core/gpgpu_walker_xe_hpg_core.cpp b/opencl/source/xe_hpg_core/gpgpu_walker_xe_hpg_core.cpp index 586be00090..f49c56f531 100644 --- a/opencl/source/xe_hpg_core/gpgpu_walker_xe_hpg_core.cpp +++ b/opencl/source/xe_hpg_core/gpgpu_walker_xe_hpg_core.cpp @@ -12,10 +12,10 @@ namespace NEO { -template class GpgpuWalkerHelper; +template class GpgpuWalkerHelper; -template class HardwareInterface; +template class HardwareInterface; -template struct EnqueueOperation; +template struct EnqueueOperation; } // namespace NEO diff --git a/opencl/source/xe_hpg_core/gtpin_setup_xe_hpg_core.cpp b/opencl/source/xe_hpg_core/gtpin_setup_xe_hpg_core.cpp index 40955735d1..dc7bb68155 100644 --- a/opencl/source/xe_hpg_core/gtpin_setup_xe_hpg_core.cpp +++ b/opencl/source/xe_hpg_core/gtpin_setup_xe_hpg_core.cpp @@ -16,7 +16,7 @@ namespace NEO { extern GTPinHwHelper *gtpinHwHelperFactory[IGFX_MAX_CORE]; -typedef XE_HPG_COREFamily Family; +typedef XeHpgCoreFamily Family; static const auto gfxFamily = IGFX_XE_HPG_CORE; template class GTPinHwHelperHw; diff --git a/opencl/source/xe_hpg_core/hardware_commands_helper_xe_hpg_core.cpp b/opencl/source/xe_hpg_core/hardware_commands_helper_xe_hpg_core.cpp index 3525d28790..2da640b709 100644 --- a/opencl/source/xe_hpg_core/hardware_commands_helper_xe_hpg_core.cpp +++ b/opencl/source/xe_hpg_core/hardware_commands_helper_xe_hpg_core.cpp @@ -13,7 +13,7 @@ #include "opencl/source/helpers/hardware_commands_helper_xehp_and_later.inl" namespace NEO { -using FamilyType = XE_HPG_COREFamily; +using FamilyType = XeHpgCoreFamily; template struct HardwareCommandsHelper; } // 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 ca1941d7e4..f91a8c4493 100644 --- a/opencl/source/xe_hpg_core/image_xe_hpg_core.cpp +++ b/opencl/source/xe_hpg_core/image_xe_hpg_core.cpp @@ -11,7 +11,7 @@ namespace NEO { -using Family = XE_HPG_COREFamily; +using Family = XeHpgCoreFamily; static auto gfxCore = IGFX_XE_HPG_CORE; } // namespace NEO #include "opencl/source/mem_obj/image_tgllp_and_later.inl" diff --git a/opencl/source/xe_hpg_core/sampler_xe_hpg_core.cpp b/opencl/source/xe_hpg_core/sampler_xe_hpg_core.cpp index bb99348d6e..9997683068 100644 --- a/opencl/source/xe_hpg_core/sampler_xe_hpg_core.cpp +++ b/opencl/source/xe_hpg_core/sampler_xe_hpg_core.cpp @@ -6,7 +6,7 @@ */ #include "shared/source/xe_hpg_core/hw_cmds_xe_hpg_core_base.h" -using Family = NEO::XE_HPG_COREFamily; +using Family = NEO::XeHpgCoreFamily; constexpr static auto gfxCore = IGFX_XE_HPG_CORE; #include "opencl/source/sampler/sampler.h" diff --git a/opencl/test/unit_test/aub_tests/xe_hpc_core/copy_engine_aub_tests_xe_hpc_core.cpp b/opencl/test/unit_test/aub_tests/xe_hpc_core/copy_engine_aub_tests_xe_hpc_core.cpp index ea8158387a..5ba27385ad 100644 --- a/opencl/test/unit_test/aub_tests/xe_hpc_core/copy_engine_aub_tests_xe_hpc_core.cpp +++ b/opencl/test/unit_test/aub_tests/xe_hpc_core/copy_engine_aub_tests_xe_hpc_core.cpp @@ -33,7 +33,7 @@ constexpr uint32_t allSupportedCopyEngines[] = { aub_stream::EngineType::ENGINE_BCS8, }; -using OneTileXeHpcTests = CopyEnginesXeHpcFixture<1, XE_HPC_COREFamily>; +using OneTileXeHpcTests = CopyEnginesXeHpcFixture<1, XeHpcCoreFamily>; INSTANTIATE_TEST_CASE_P( MemCopyBcsCmd, @@ -84,7 +84,7 @@ XE_HPC_CORETEST_P(OneTileXeHpcTests, givenCopyBufferRectWithBigSizesWhenHostPtrB givenCopyBufferRectWithBigSizesWhenHostPtrBlitCommandIsDispatchedToHostPtrThenDataIsCorrectlyCopiedImpl(); } -using OneTileSystemMemoryXeHpcTests = CopyEnginesXeHpcFixture<1, XE_HPC_COREFamily, false>; +using OneTileSystemMemoryXeHpcTests = CopyEnginesXeHpcFixture<1, XeHpcCoreFamily, false>; INSTANTIATE_TEST_CASE_P( MemCopyBcsCmd, diff --git a/opencl/test/unit_test/gen11/command_stream_receiver_hw_tests_gen11.cpp b/opencl/test/unit_test/gen11/command_stream_receiver_hw_tests_gen11.cpp index 7a8714a28a..91ad51ca89 100644 --- a/opencl/test/unit_test/gen11/command_stream_receiver_hw_tests_gen11.cpp +++ b/opencl/test/unit_test/gen11/command_stream_receiver_hw_tests_gen11.cpp @@ -27,7 +27,7 @@ using namespace NEO; #include "opencl/test/unit_test/command_stream/command_stream_receiver_hw_tests.inl" -using CommandStreamReceiverHwTestGen11 = CommandStreamReceiverHwTest; +using CommandStreamReceiverHwTestGen11 = CommandStreamReceiverHwTest; GEN11TEST_F(CommandStreamReceiverHwTestGen11, GivenKernelWithSlmWhenPreviousNOSLML3WasSentThenProgramL3WithSLML3Config) { givenKernelWithSlmWhenPreviousNOSLML3WasSentThenProgramL3WithSLML3ConfigImpl(); diff --git a/opencl/test/unit_test/gen11/enqueue_media_kernel_gen11.cpp b/opencl/test/unit_test/gen11/enqueue_media_kernel_gen11.cpp index ea835b7cf5..341c5c9aaf 100644 --- a/opencl/test/unit_test/gen11/enqueue_media_kernel_gen11.cpp +++ b/opencl/test/unit_test/gen11/enqueue_media_kernel_gen11.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2019-2021 Intel Corporation + * Copyright (C) 2019-2022 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -18,7 +18,7 @@ auto expectedMask = pipelineSelectEnablePipelineSelectMaskBits | pipelineSelectMediaSamplerPowerClockGateMaskBits; GEN11TEST_F(MediaKernelTest, givenGen11CsrWhenEnqueueBlockedVmeKernelFirstTimeThenProgramPipelineSelectionAndMediaSampler) { - typedef typename ICLFamily::PIPELINE_SELECT PIPELINE_SELECT; + typedef typename Gen11Family::PIPELINE_SELECT PIPELINE_SELECT; cl_uint workDim = 1; size_t globalWorkOffset[3] = {0, 0, 0}; @@ -40,7 +40,7 @@ GEN11TEST_F(MediaKernelTest, givenGen11CsrWhenEnqueueBlockedVmeKernelFirstTimeTh userEvent.setStatus(CL_COMPLETE); - parseCommands(*pCmdQ); + parseCommands(*pCmdQ); ASSERT_NE(cmdPipelineSelect, nullptr); auto *pCmd = genCmdCast(cmdPipelineSelect); auto expectedPipelineSelection = PIPELINE_SELECT::PIPELINE_SELECTION_GPGPU; @@ -50,7 +50,7 @@ GEN11TEST_F(MediaKernelTest, givenGen11CsrWhenEnqueueBlockedVmeKernelFirstTimeTh } GEN11TEST_F(MediaKernelTest, givenGen11CsrWhenEnqueueBlockedNonVmeKernelFirstTimeThenProgramPipelineSelectionAndMediaSampler) { - typedef typename ICLFamily::PIPELINE_SELECT PIPELINE_SELECT; + typedef typename Gen11Family::PIPELINE_SELECT PIPELINE_SELECT; cl_uint workDim = 1; size_t globalWorkOffset[3] = {0, 0, 0}; @@ -72,7 +72,7 @@ GEN11TEST_F(MediaKernelTest, givenGen11CsrWhenEnqueueBlockedNonVmeKernelFirstTim userEvent.setStatus(CL_COMPLETE); - parseCommands(*pCmdQ); + parseCommands(*pCmdQ); ASSERT_NE(cmdPipelineSelect, nullptr); auto *pCmd = genCmdCast(cmdPipelineSelect); auto expectedPipelineSelection = PIPELINE_SELECT::PIPELINE_SELECTION_GPGPU; @@ -82,8 +82,8 @@ GEN11TEST_F(MediaKernelTest, givenGen11CsrWhenEnqueueBlockedNonVmeKernelFirstTim } GEN11TEST_F(MediaKernelTest, givenGen11CsrWhenEnqueueVmeKernelFirstTimeThenProgramPipelineSelectionAndMediaSampler) { - typedef typename ICLFamily::PIPELINE_SELECT PIPELINE_SELECT; - enqueueVmeKernel(); + typedef typename Gen11Family::PIPELINE_SELECT PIPELINE_SELECT; + enqueueVmeKernel(); auto numCommands = getCommandsList().size(); EXPECT_EQ(1u, numCommands); @@ -97,8 +97,8 @@ GEN11TEST_F(MediaKernelTest, givenGen11CsrWhenEnqueueVmeKernelFirstTimeThenProgr } GEN11TEST_F(MediaKernelTest, givenGen11CsrWhenEnqueueNonVmeKernelFirstTimeThenProgramPipelineSelectionAndMediaSampler) { - typedef typename ICLFamily::PIPELINE_SELECT PIPELINE_SELECT; - enqueueRegularKernel(); + typedef typename Gen11Family::PIPELINE_SELECT PIPELINE_SELECT; + enqueueRegularKernel(); auto numCommands = getCommandsList().size(); EXPECT_EQ(1u, numCommands); @@ -112,23 +112,23 @@ GEN11TEST_F(MediaKernelTest, givenGen11CsrWhenEnqueueNonVmeKernelFirstTimeThenPr } GEN11TEST_F(MediaKernelTest, givenGen11CsrWhenEnqueueVmeKernelTwiceThenProgramPipelineSelectOnce) { - typedef typename ICLFamily::PIPELINE_SELECT PIPELINE_SELECT; - enqueueVmeKernel(); + typedef typename Gen11Family::PIPELINE_SELECT PIPELINE_SELECT; + enqueueVmeKernel(); auto numCommands = getCommandsList().size(); EXPECT_EQ(1u, numCommands); } GEN11TEST_F(MediaKernelTest, givenGen11CsrWhenEnqueueNonVmeKernelTwiceThenProgramPipelineSelectOnce) { - typedef typename ICLFamily::PIPELINE_SELECT PIPELINE_SELECT; - enqueueVmeKernel(); + typedef typename Gen11Family::PIPELINE_SELECT PIPELINE_SELECT; + enqueueVmeKernel(); auto numCommands = getCommandsList().size(); EXPECT_EQ(1u, numCommands); } GEN11TEST_F(MediaKernelTest, givenGen11CsrWhenEnqueueVmeKernelAfterNonVmeKernelThenProgramPipelineSelectionAndMediaSamplerTwice) { - typedef typename ICLFamily::PIPELINE_SELECT PIPELINE_SELECT; - enqueueRegularKernel(); - enqueueVmeKernel(); + typedef typename Gen11Family::PIPELINE_SELECT PIPELINE_SELECT; + enqueueRegularKernel(); + enqueueVmeKernel(); auto commands = getCommandsList(); EXPECT_EQ(2u, commands.size()); @@ -141,9 +141,9 @@ GEN11TEST_F(MediaKernelTest, givenGen11CsrWhenEnqueueVmeKernelAfterNonVmeKernelT } GEN11TEST_F(MediaKernelTest, givenGen11CsrWhenEnqueueNonVmeKernelAfterVmeKernelThenProgramProgramPipelineSelectionAndMediaSamplerTwice) { - typedef typename ICLFamily::PIPELINE_SELECT PIPELINE_SELECT; - enqueueVmeKernel(); - enqueueRegularKernel(); + typedef typename Gen11Family::PIPELINE_SELECT PIPELINE_SELECT; + enqueueVmeKernel(); + enqueueRegularKernel(); auto commands = getCommandsList(); EXPECT_EQ(2u, commands.size()); diff --git a/opencl/test/unit_test/gen11/image_tests_gen11.cpp b/opencl/test/unit_test/gen11/image_tests_gen11.cpp index e2d75a480d..738ee54f90 100644 --- a/opencl/test/unit_test/gen11/image_tests_gen11.cpp +++ b/opencl/test/unit_test/gen11/image_tests_gen11.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2019-2021 Intel Corporation + * Copyright (C) 2019-2022 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -14,11 +14,11 @@ using namespace NEO; -typedef ICLFamily::RENDER_SURFACE_STATE RENDER_SURFACE_STATE; +typedef Gen11Family::RENDER_SURFACE_STATE RENDER_SURFACE_STATE; struct AppendSurfaceStateParamsTest : public ::testing::Test { void SetUp() override { - surfaceState = ICLFamily::cmdInitRenderSurfaceState; + surfaceState = Gen11Family::cmdInitRenderSurfaceState; EXPECT_EQ(RENDER_SURFACE_STATE::SAMPLE_TAP_DISCARD_DISABLE_DISABLE, surfaceState.getSampleTapDiscardDisable()); imageDesc.image_width = 32; @@ -58,7 +58,7 @@ GEN11TEST_F(AppendSurfaceStateParamsTest, givenImageFormatWithoutAlphaChannelWhe imageFormat.image_channel_order = CL_R; createImage(); - auto imageHw = static_cast *>(image.get()); + auto imageHw = static_cast *>(image.get()); imageHw->appendSurfaceStateParams(&surfaceState, context.getDevice(0)->getRootDeviceIndex(), false); bool tapDiscardConfigChanged = RENDER_SURFACE_STATE::SAMPLE_TAP_DISCARD_DISABLE_DISABLE != surfaceState.getSampleTapDiscardDisable(); @@ -70,7 +70,7 @@ GEN11TEST_F(AppendSurfaceStateParamsTest, givenImageFormatWithAlphaChannelWhenAp imageFormat.image_channel_order = CL_RGBA; createImage(); - auto imageHw = static_cast *>(image.get()); + auto imageHw = static_cast *>(image.get()); imageHw->appendSurfaceStateParams(&surfaceState, context.getDevice(0)->getRootDeviceIndex(), false); bool tapDiscardConfigChanged = RENDER_SURFACE_STATE::SAMPLE_TAP_DISCARD_DISABLE_DISABLE != surfaceState.getSampleTapDiscardDisable(); diff --git a/opencl/test/unit_test/gen12lp/coherency_tests_gen12lp.inl b/opencl/test/unit_test/gen12lp/coherency_tests_gen12lp.inl index 01ecc85bd9..9619069f38 100644 --- a/opencl/test/unit_test/gen12lp/coherency_tests_gen12lp.inl +++ b/opencl/test/unit_test/gen12lp/coherency_tests_gen12lp.inl @@ -17,14 +17,14 @@ using namespace NEO; struct Gen12LpCoherencyRequirements : public ::testing::Test { - using STATE_COMPUTE_MODE = typename TGLLPFamily::STATE_COMPUTE_MODE; - using PIPE_CONTROL = typename TGLLPFamily::PIPE_CONTROL; - using PIPELINE_SELECT = typename TGLLPFamily::PIPELINE_SELECT; + using STATE_COMPUTE_MODE = typename Gen12LpFamily::STATE_COMPUTE_MODE; + using PIPE_CONTROL = typename Gen12LpFamily::PIPE_CONTROL; + using PIPELINE_SELECT = typename Gen12LpFamily::PIPELINE_SELECT; - struct myCsr : public CommandStreamReceiverHw { + struct myCsr : public CommandStreamReceiverHw { using CommandStreamReceiver::commandStream; using CommandStreamReceiver::streamProperties; - myCsr(ExecutionEnvironment &executionEnvironment) : CommandStreamReceiverHw(executionEnvironment, 0, 1){}; + myCsr(ExecutionEnvironment &executionEnvironment) : CommandStreamReceiverHw(executionEnvironment, 0, 1){}; CsrSizeRequestFlags *getCsrRequestFlags() { return &csrSizeRequestFlags; } }; diff --git a/opencl/test/unit_test/gen12lp/command_stream_receiver_hw_tests_gen12lp.inl b/opencl/test/unit_test/gen12lp/command_stream_receiver_hw_tests_gen12lp.inl index 1a2c3fecbd..7488eedc6a 100644 --- a/opencl/test/unit_test/gen12lp/command_stream_receiver_hw_tests_gen12lp.inl +++ b/opencl/test/unit_test/gen12lp/command_stream_receiver_hw_tests_gen12lp.inl @@ -27,7 +27,7 @@ using namespace NEO; #include "opencl/test/unit_test/command_stream/command_stream_receiver_hw_tests.inl" -using CommandStreamReceiverHwTestGen12lp = CommandStreamReceiverHwTest; +using CommandStreamReceiverHwTestGen12lp = CommandStreamReceiverHwTest; GEN12LPTEST_F(CommandStreamReceiverHwTestGen12lp, givenPreambleSentWhenL3ConfigRequestChangedThenDontProgramL3Register) { size_t gws = 1; diff --git a/opencl/test/unit_test/gen12lp/enqueue_media_kernel_gen12lp.inl b/opencl/test/unit_test/gen12lp/enqueue_media_kernel_gen12lp.inl index b983925894..6e6e1500e5 100644 --- a/opencl/test/unit_test/gen12lp/enqueue_media_kernel_gen12lp.inl +++ b/opencl/test/unit_test/gen12lp/enqueue_media_kernel_gen12lp.inl @@ -1,5 +1,5 @@ /* - * Copyright (C) 2019-2021 Intel Corporation + * Copyright (C) 2019-2022 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -13,7 +13,7 @@ using namespace NEO; typedef MediaKernelFixture MediaKernelTest; GEN12LPTEST_F(MediaKernelTest, givenGen12LpCsrWhenEnqueueBlockedVmeKernelFirstTimeThenProgramPipelineSelectionAndMediaSampler) { - typedef typename TGLLPFamily::PIPELINE_SELECT PIPELINE_SELECT; + typedef typename Gen12LpFamily::PIPELINE_SELECT PIPELINE_SELECT; cl_uint workDim = 1; size_t globalWorkOffset[3] = {0, 0, 0}; @@ -35,7 +35,7 @@ GEN12LPTEST_F(MediaKernelTest, givenGen12LpCsrWhenEnqueueBlockedVmeKernelFirstTi userEvent.setStatus(CL_COMPLETE); - parseCommands(*pCmdQ); + parseCommands(*pCmdQ); ASSERT_NE(cmdPipelineSelect, nullptr); auto *pCmd = genCmdCast(cmdPipelineSelect); @@ -47,7 +47,7 @@ GEN12LPTEST_F(MediaKernelTest, givenGen12LpCsrWhenEnqueueBlockedVmeKernelFirstTi } GEN12LPTEST_F(MediaKernelTest, givenGen12LpCsrWhenEnqueueBlockedNonVmeKernelFirstTimeThenProgramPipelineSelectionAndMediaSampler) { - typedef typename TGLLPFamily::PIPELINE_SELECT PIPELINE_SELECT; + typedef typename Gen12LpFamily::PIPELINE_SELECT PIPELINE_SELECT; cl_uint workDim = 1; size_t globalWorkOffset[3] = {0, 0, 0}; @@ -69,7 +69,7 @@ GEN12LPTEST_F(MediaKernelTest, givenGen12LpCsrWhenEnqueueBlockedNonVmeKernelFirs userEvent.setStatus(CL_COMPLETE); - parseCommands(*pCmdQ); + parseCommands(*pCmdQ); ASSERT_NE(cmdPipelineSelect, nullptr); auto *pCmd = genCmdCast(cmdPipelineSelect); @@ -81,8 +81,8 @@ GEN12LPTEST_F(MediaKernelTest, givenGen12LpCsrWhenEnqueueBlockedNonVmeKernelFirs } GEN12LPTEST_F(MediaKernelTest, givenGen12LpCsrWhenEnqueueVmeKernelFirstTimeThenProgramPipelineSelectionAndMediaSampler) { - typedef typename TGLLPFamily::PIPELINE_SELECT PIPELINE_SELECT; - enqueueVmeKernel(); + typedef typename Gen12LpFamily::PIPELINE_SELECT PIPELINE_SELECT; + enqueueVmeKernel(); auto numCommands = getCommandsList().size(); EXPECT_EQ(1u, numCommands); @@ -96,8 +96,8 @@ GEN12LPTEST_F(MediaKernelTest, givenGen12LpCsrWhenEnqueueVmeKernelFirstTimeThenP } GEN12LPTEST_F(MediaKernelTest, givenGen12LpCsrWhenEnqueueNonVmeKernelFirstTimeThenProgramPipelineSelectionAndMediaSampler) { - typedef typename TGLLPFamily::PIPELINE_SELECT PIPELINE_SELECT; - enqueueRegularKernel(); + typedef typename Gen12LpFamily::PIPELINE_SELECT PIPELINE_SELECT; + enqueueRegularKernel(); auto numCommands = getCommandsList().size(); EXPECT_EQ(1u, numCommands); @@ -111,23 +111,23 @@ GEN12LPTEST_F(MediaKernelTest, givenGen12LpCsrWhenEnqueueNonVmeKernelFirstTimeTh } GEN12LPTEST_F(MediaKernelTest, givenGen12LpCsrWhenEnqueueVmeKernelTwiceThenProgramPipelineSelectOnce) { - typedef typename TGLLPFamily::PIPELINE_SELECT PIPELINE_SELECT; - enqueueVmeKernel(); + typedef typename Gen12LpFamily::PIPELINE_SELECT PIPELINE_SELECT; + enqueueVmeKernel(); auto numCommands = getCommandsList().size(); EXPECT_EQ(1u, numCommands); } GEN12LPTEST_F(MediaKernelTest, givenGen12LpCsrWhenEnqueueNonVmeKernelTwiceThenProgramPipelineSelectOnce) { - typedef typename TGLLPFamily::PIPELINE_SELECT PIPELINE_SELECT; - enqueueVmeKernel(); + typedef typename Gen12LpFamily::PIPELINE_SELECT PIPELINE_SELECT; + enqueueVmeKernel(); auto numCommands = getCommandsList().size(); EXPECT_EQ(1u, numCommands); } GEN12LPTEST_F(MediaKernelTest, givenGen12LpCsrWhenEnqueueVmeKernelAfterNonVmeKernelThenProgramPipelineSelectionAndMediaSamplerTwice) { - typedef typename TGLLPFamily::PIPELINE_SELECT PIPELINE_SELECT; - enqueueRegularKernel(); - enqueueVmeKernel(); + typedef typename Gen12LpFamily::PIPELINE_SELECT PIPELINE_SELECT; + enqueueRegularKernel(); + enqueueVmeKernel(); auto commands = getCommandsList(); EXPECT_EQ(2u, commands.size()); @@ -140,9 +140,9 @@ GEN12LPTEST_F(MediaKernelTest, givenGen12LpCsrWhenEnqueueVmeKernelAfterNonVmeKer } GEN12LPTEST_F(MediaKernelTest, givenGen12LpCsrWhenEnqueueNonVmeKernelAfterVmeKernelThenProgramProgramPipelineSelectionAndMediaSamplerTwice) { - typedef typename TGLLPFamily::PIPELINE_SELECT PIPELINE_SELECT; - enqueueVmeKernel(); - enqueueRegularKernel(); + typedef typename Gen12LpFamily::PIPELINE_SELECT PIPELINE_SELECT; + enqueueVmeKernel(); + enqueueRegularKernel(); auto commands = getCommandsList(); EXPECT_EQ(2u, commands.size()); diff --git a/opencl/test/unit_test/gen8/command_stream_receiver_hw_tests_gen8.cpp b/opencl/test/unit_test/gen8/command_stream_receiver_hw_tests_gen8.cpp index fbebd4a7a0..a464a3e195 100644 --- a/opencl/test/unit_test/gen8/command_stream_receiver_hw_tests_gen8.cpp +++ b/opencl/test/unit_test/gen8/command_stream_receiver_hw_tests_gen8.cpp @@ -28,7 +28,7 @@ using namespace NEO; #include "opencl/test/unit_test/command_stream/command_stream_receiver_hw_tests.inl" -using CommandStreamReceiverHwTestGen8 = CommandStreamReceiverHwTest; +using CommandStreamReceiverHwTestGen8 = CommandStreamReceiverHwTest; GEN8TEST_F(CommandStreamReceiverHwTestGen8, GivenKernelWithSlmWhenPreviousNOSLML3WasSentThenProgramL3WithSLML3Config) { givenKernelWithSlmWhenPreviousNOSLML3WasSentThenProgramL3WithSLML3ConfigImpl(); diff --git a/opencl/test/unit_test/gen8/enqueue_media_kernel_gen8.cpp b/opencl/test/unit_test/gen8/enqueue_media_kernel_gen8.cpp index e2d847bcd1..dc97150c0b 100644 --- a/opencl/test/unit_test/gen8/enqueue_media_kernel_gen8.cpp +++ b/opencl/test/unit_test/gen8/enqueue_media_kernel_gen8.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2021 Intel Corporation + * Copyright (C) 2018-2022 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -15,7 +15,7 @@ using namespace NEO; typedef MediaKernelFixture MediaKernelTest; GEN8TEST_F(MediaKernelTest, givenGen8CSRWhenEnqueueVmeKernelThenProgramOnlyPipelineSelection) { - typedef typename BDWFamily::PIPELINE_SELECT PIPELINE_SELECT; + typedef typename Gen8Family::PIPELINE_SELECT PIPELINE_SELECT; enqueueVmeKernel(); auto pCmd = getCommand(); auto expectedMask = pipelineSelectEnablePipelineSelectMaskBits; diff --git a/opencl/test/unit_test/gen9/command_stream_receiver_hw_tests_gen9.cpp b/opencl/test/unit_test/gen9/command_stream_receiver_hw_tests_gen9.cpp index 9afe92458c..fb12761a84 100644 --- a/opencl/test/unit_test/gen9/command_stream_receiver_hw_tests_gen9.cpp +++ b/opencl/test/unit_test/gen9/command_stream_receiver_hw_tests_gen9.cpp @@ -31,7 +31,7 @@ using namespace NEO; #include "opencl/test/unit_test/command_stream/command_stream_receiver_hw_tests.inl" -using CommandStreamReceiverHwTestGen9 = CommandStreamReceiverHwTest; +using CommandStreamReceiverHwTestGen9 = CommandStreamReceiverHwTest; GEN9TEST_F(UltCommandStreamReceiverTest, whenPreambleIsProgrammedThenStateSipCmdIsNotPresentInPreambleCmdStream) { using STATE_SIP = typename FamilyType::STATE_SIP; diff --git a/opencl/test/unit_test/gen9/enqueue_kernel_gen9.cpp b/opencl/test/unit_test/gen9/enqueue_kernel_gen9.cpp index ee4c401ba7..94efb69a76 100644 --- a/opencl/test/unit_test/gen9/enqueue_kernel_gen9.cpp +++ b/opencl/test/unit_test/gen9/enqueue_kernel_gen9.cpp @@ -22,7 +22,7 @@ namespace NEO { using Gen9EnqueueTest = Test; GEN9TEST_F(Gen9EnqueueTest, givenKernelRequiringIndependentForwardProgressWhenKernelIsSubmittedThenRoundRobinPolicyIsProgrammed) { MockContext mc; - CommandQueueHw cmdQ{&mc, pClDevice, 0, false}; + CommandQueueHw cmdQ{&mc, pClDevice, 0, false}; SPatchExecutionEnvironment sPatchExecEnv = {}; sPatchExecEnv.SubgroupIndependentForwardProgressRequired = true; @@ -41,7 +41,7 @@ GEN9TEST_F(Gen9EnqueueTest, givenKernelRequiringIndependentForwardProgressWhenKe GEN9TEST_F(Gen9EnqueueTest, givenKernelNotRequiringIndependentForwardProgressWhenKernelIsSubmittedThenAgeBasedPolicyIsProgrammed) { MockContext mc; - CommandQueueHw cmdQ{&mc, pClDevice, 0, false}; + CommandQueueHw cmdQ{&mc, pClDevice, 0, false}; SPatchExecutionEnvironment sPatchExecEnv = {}; sPatchExecEnv.SubgroupIndependentForwardProgressRequired = false; diff --git a/opencl/test/unit_test/gen9/enqueue_media_kernel_gen9.cpp b/opencl/test/unit_test/gen9/enqueue_media_kernel_gen9.cpp index 5d435b7305..d6733f5b20 100644 --- a/opencl/test/unit_test/gen9/enqueue_media_kernel_gen9.cpp +++ b/opencl/test/unit_test/gen9/enqueue_media_kernel_gen9.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2021 Intel Corporation + * Copyright (C) 2018-2022 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -15,7 +15,7 @@ using namespace NEO; typedef MediaKernelFixture MediaKernelTest; GEN9TEST_F(MediaKernelTest, givenGen9CsrWhenEnqueueBlockedVmeKernelFirstTimeThenProgramPipelineSelectionAndMediaSampler) { - typedef typename SKLFamily::PIPELINE_SELECT PIPELINE_SELECT; + typedef typename Gen9Family::PIPELINE_SELECT PIPELINE_SELECT; cl_uint workDim = 1; size_t globalWorkOffset[3] = {0, 0, 0}; @@ -37,7 +37,7 @@ GEN9TEST_F(MediaKernelTest, givenGen9CsrWhenEnqueueBlockedVmeKernelFirstTimeThen userEvent.setStatus(CL_COMPLETE); - parseCommands(*pCmdQ); + parseCommands(*pCmdQ); ASSERT_NE(cmdPipelineSelect, nullptr); auto *pCmd = genCmdCast(cmdPipelineSelect); @@ -49,7 +49,7 @@ GEN9TEST_F(MediaKernelTest, givenGen9CsrWhenEnqueueBlockedVmeKernelFirstTimeThen } GEN9TEST_F(MediaKernelTest, givenGen9CsrWhenEnqueueBlockedNonVmeKernelFirstTimeThenProgramPipelineSelectionAndMediaSampler) { - typedef typename SKLFamily::PIPELINE_SELECT PIPELINE_SELECT; + typedef typename Gen9Family::PIPELINE_SELECT PIPELINE_SELECT; cl_uint workDim = 1; size_t globalWorkOffset[3] = {0, 0, 0}; @@ -71,7 +71,7 @@ GEN9TEST_F(MediaKernelTest, givenGen9CsrWhenEnqueueBlockedNonVmeKernelFirstTimeT userEvent.setStatus(CL_COMPLETE); - parseCommands(*pCmdQ); + parseCommands(*pCmdQ); ASSERT_NE(cmdPipelineSelect, nullptr); auto *pCmd = genCmdCast(cmdPipelineSelect); @@ -83,8 +83,8 @@ GEN9TEST_F(MediaKernelTest, givenGen9CsrWhenEnqueueBlockedNonVmeKernelFirstTimeT } GEN9TEST_F(MediaKernelTest, givenGen9CsrWhenEnqueueVmeKernelFirstTimeThenProgramPipelineSelectionAndMediaSampler) { - typedef typename SKLFamily::PIPELINE_SELECT PIPELINE_SELECT; - enqueueVmeKernel(); + typedef typename Gen9Family::PIPELINE_SELECT PIPELINE_SELECT; + enqueueVmeKernel(); auto numCommands = getCommandsList().size(); EXPECT_EQ(1u, numCommands); @@ -98,8 +98,8 @@ GEN9TEST_F(MediaKernelTest, givenGen9CsrWhenEnqueueVmeKernelFirstTimeThenProgram } GEN9TEST_F(MediaKernelTest, givenGen9CsrWhenEnqueueNonVmeKernelFirstTimeThenProgramPipelineSelectionAndMediaSampler) { - typedef typename SKLFamily::PIPELINE_SELECT PIPELINE_SELECT; - enqueueRegularKernel(); + typedef typename Gen9Family::PIPELINE_SELECT PIPELINE_SELECT; + enqueueRegularKernel(); auto numCommands = getCommandsList().size(); EXPECT_EQ(1u, numCommands); @@ -113,23 +113,23 @@ GEN9TEST_F(MediaKernelTest, givenGen9CsrWhenEnqueueNonVmeKernelFirstTimeThenProg } GEN9TEST_F(MediaKernelTest, givenGen9CsrWhenEnqueueVmeKernelTwiceThenProgramPipelineSelectOnce) { - typedef typename SKLFamily::PIPELINE_SELECT PIPELINE_SELECT; - enqueueVmeKernel(); + typedef typename Gen9Family::PIPELINE_SELECT PIPELINE_SELECT; + enqueueVmeKernel(); auto numCommands = getCommandsList().size(); EXPECT_EQ(1u, numCommands); } GEN9TEST_F(MediaKernelTest, givenGen9CsrWhenEnqueueNonVmeKernelTwiceThenProgramPipelineSelectOnce) { - typedef typename SKLFamily::PIPELINE_SELECT PIPELINE_SELECT; - enqueueVmeKernel(); + typedef typename Gen9Family::PIPELINE_SELECT PIPELINE_SELECT; + enqueueVmeKernel(); auto numCommands = getCommandsList().size(); EXPECT_EQ(1u, numCommands); } GEN9TEST_F(MediaKernelTest, givenGen9CsrWhenEnqueueVmeKernelAfterNonVmeKernelThenProgramPipelineSelectionAndMediaSamplerTwice) { - typedef typename SKLFamily::PIPELINE_SELECT PIPELINE_SELECT; - enqueueRegularKernel(); - enqueueVmeKernel(); + typedef typename Gen9Family::PIPELINE_SELECT PIPELINE_SELECT; + enqueueRegularKernel(); + enqueueVmeKernel(); auto commands = getCommandsList(); EXPECT_EQ(2u, commands.size()); @@ -142,9 +142,9 @@ GEN9TEST_F(MediaKernelTest, givenGen9CsrWhenEnqueueVmeKernelAfterNonVmeKernelThe } GEN9TEST_F(MediaKernelTest, givenGen9CsrWhenEnqueueNonVmeKernelAfterVmeKernelThenProgramProgramPipelineSelectionAndMediaSamplerTwice) { - typedef typename SKLFamily::PIPELINE_SELECT PIPELINE_SELECT; - enqueueVmeKernel(); - enqueueRegularKernel(); + typedef typename Gen9Family::PIPELINE_SELECT PIPELINE_SELECT; + enqueueVmeKernel(); + enqueueRegularKernel(); auto commands = getCommandsList(); EXPECT_EQ(2u, commands.size()); diff --git a/opencl/test/unit_test/gen9/test_preemption_gen9.cpp b/opencl/test/unit_test/gen9/test_preemption_gen9.cpp index 8876dbc89a..9c170e5860 100644 --- a/opencl/test/unit_test/gen9/test_preemption_gen9.cpp +++ b/opencl/test/unit_test/gen9/test_preemption_gen9.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2020-2021 Intel Corporation + * Copyright (C) 2020-2022 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -17,8 +17,8 @@ namespace NEO { template <> -void HardwareParse::findCsrBaseAddress() { - typedef typename GEN9::GPGPU_CSR_BASE_ADDRESS GPGPU_CSR_BASE_ADDRESS; +void HardwareParse::findCsrBaseAddress() { + typedef typename Gen9::GPGPU_CSR_BASE_ADDRESS GPGPU_CSR_BASE_ADDRESS; itorGpgpuCsrBaseAddress = find(cmdList.begin(), itorWalker); if (itorGpgpuCsrBaseAddress != itorWalker) { cmdGpgpuCsrBaseAddress = *itorGpgpuCsrBaseAddress; diff --git a/opencl/test/unit_test/xe_hpc_core/pvc/hw_helper_tests_pvc.cpp b/opencl/test/unit_test/xe_hpc_core/pvc/hw_helper_tests_pvc.cpp index 3de4a8a79d..5e5bec729e 100644 --- a/opencl/test/unit_test/xe_hpc_core/pvc/hw_helper_tests_pvc.cpp +++ b/opencl/test/unit_test/xe_hpc_core/pvc/hw_helper_tests_pvc.cpp @@ -76,17 +76,17 @@ PVCTEST_F(HwHelperTestsPvc, givenRevisionEnumAndPlatformFamilyTypeThenProperValu } PVCTEST_F(HwHelperTestsPvc, givenDefaultMemorySynchronizationCommandsWhenGettingSizeForAdditionalSynchronizationThenCorrectValueIsReturned) { - using MI_SEMAPHORE_WAIT = typename XE_HPC_COREFamily::MI_SEMAPHORE_WAIT; + using MI_SEMAPHORE_WAIT = typename XeHpcCoreFamily::MI_SEMAPHORE_WAIT; - EXPECT_EQ(sizeof(MI_SEMAPHORE_WAIT), MemorySynchronizationCommands::getSizeForAdditonalSynchronization(*defaultHwInfo)); + EXPECT_EQ(sizeof(MI_SEMAPHORE_WAIT), MemorySynchronizationCommands::getSizeForAdditonalSynchronization(*defaultHwInfo)); } PVCTEST_F(HwHelperTestsPvc, givenDebugMemorySynchronizationCommandsWhenGettingSizeForAdditionalSynchronizationThenCorrectValueIsReturned) { DebugManagerStateRestore restorer; DebugManager.flags.DisablePipeControlPrecedingPostSyncCommand.set(1); - using MI_SEMAPHORE_WAIT = typename XE_HPC_COREFamily::MI_SEMAPHORE_WAIT; + using MI_SEMAPHORE_WAIT = typename XeHpcCoreFamily::MI_SEMAPHORE_WAIT; - EXPECT_EQ(2 * sizeof(MI_SEMAPHORE_WAIT), MemorySynchronizationCommands::getSizeForAdditonalSynchronization(*defaultHwInfo)); + EXPECT_EQ(2 * sizeof(MI_SEMAPHORE_WAIT), MemorySynchronizationCommands::getSizeForAdditonalSynchronization(*defaultHwInfo)); } PVCTEST_F(HwHelperTestsPvc, givenRevisionIdWhenGetComputeUnitsUsedForScratchThenReturnValidValue) { diff --git a/shared/source/gen11/aub_command_stream_receiver_gen11.cpp b/shared/source/gen11/aub_command_stream_receiver_gen11.cpp index 6996a5967d..90211fee9b 100644 --- a/shared/source/gen11/aub_command_stream_receiver_gen11.cpp +++ b/shared/source/gen11/aub_command_stream_receiver_gen11.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2019-2021 Intel Corporation + * Copyright (C) 2019-2022 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -12,7 +12,7 @@ namespace NEO { -typedef ICLFamily Family; +typedef Gen11Family Family; static auto gfxCore = IGFX_GEN11_CORE; template <> diff --git a/shared/source/gen11/aub_mapper.h b/shared/source/gen11/aub_mapper.h index 970b62f2d8..8c3413f621 100644 --- a/shared/source/gen11/aub_mapper.h +++ b/shared/source/gen11/aub_mapper.h @@ -13,10 +13,10 @@ #include "engine_node.h" namespace NEO { -struct ICLFamily; +struct Gen11Family; template <> -struct AUBFamilyMapper { +struct AUBFamilyMapper { enum { device = AubMemDump::DeviceValues::Icllp }; using AubTraits = AubMemDump::Traits; diff --git a/shared/source/gen11/aub_mem_dump_gen11.cpp b/shared/source/gen11/aub_mem_dump_gen11.cpp index f949f50d56..e4f2f899cb 100644 --- a/shared/source/gen11/aub_mem_dump_gen11.cpp +++ b/shared/source/gen11/aub_mem_dump_gen11.cpp @@ -30,7 +30,7 @@ template struct AubPageTableHelper64>; } // namespace AubMemDump namespace NEO { -using Family = ICLFamily; +using Family = Gen11Family; static const AubMemDump::LrcaHelperRcs rcs(0x002000); static const AubMemDump::LrcaHelperBcs bcs(0x022000); diff --git a/shared/source/gen11/command_encoder_gen11.cpp b/shared/source/gen11/command_encoder_gen11.cpp index 525e8947e6..5a15e88231 100644 --- a/shared/source/gen11/command_encoder_gen11.cpp +++ b/shared/source/gen11/command_encoder_gen11.cpp @@ -11,7 +11,7 @@ #include "reg_configs_common.h" -using Family = NEO::ICLFamily; +using Family = NEO::Gen11Family; #include "shared/source/command_container/command_encoder.inl" #include "shared/source/command_container/command_encoder_bdw_and_later.inl" diff --git a/shared/source/gen11/command_stream_receiver_hw_gen11.cpp b/shared/source/gen11/command_stream_receiver_hw_gen11.cpp index e5f8fa533f..4bde26850b 100644 --- a/shared/source/gen11/command_stream_receiver_hw_gen11.cpp +++ b/shared/source/gen11/command_stream_receiver_hw_gen11.cpp @@ -15,7 +15,7 @@ #include "shared/source/helpers/populate_factory.h" namespace NEO { -typedef ICLFamily Family; +typedef Gen11Family Family; static auto gfxCore = IGFX_GEN11_CORE; template <> diff --git a/shared/source/gen11/command_stream_receiver_simulated_common_hw_gen11.cpp b/shared/source/gen11/command_stream_receiver_simulated_common_hw_gen11.cpp index b87e44a580..811d2ddcb6 100644 --- a/shared/source/gen11/command_stream_receiver_simulated_common_hw_gen11.cpp +++ b/shared/source/gen11/command_stream_receiver_simulated_common_hw_gen11.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2019-2021 Intel Corporation + * Copyright (C) 2019-2022 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -8,7 +8,7 @@ #include "shared/source/command_stream/command_stream_receiver_simulated_common_hw_bdw_and_later.inl" namespace NEO { -typedef ICLFamily Family; +typedef Gen11Family Family; template <> void CommandStreamReceiverSimulatedCommonHw::submitLRCA(const MiContextDescriptorReg &contextDescriptor) { diff --git a/shared/source/gen11/create_device_command_stream_receiver_gen11.cpp b/shared/source/gen11/create_device_command_stream_receiver_gen11.cpp index cfe6347981..c6652b8097 100644 --- a/shared/source/gen11/create_device_command_stream_receiver_gen11.cpp +++ b/shared/source/gen11/create_device_command_stream_receiver_gen11.cpp @@ -13,11 +13,11 @@ namespace NEO { template <> -CommandStreamReceiver *createDeviceCommandStreamReceiver(bool withAubDump, - ExecutionEnvironment &executionEnvironment, - uint32_t rootDeviceIndex, - const DeviceBitfield deviceBitfield) { - return createCommandStreamReceiver(withAubDump, executionEnvironment, rootDeviceIndex, deviceBitfield); +CommandStreamReceiver *createDeviceCommandStreamReceiver(bool withAubDump, + ExecutionEnvironment &executionEnvironment, + uint32_t rootDeviceIndex, + const DeviceBitfield deviceBitfield) { + return createCommandStreamReceiver(withAubDump, executionEnvironment, rootDeviceIndex, deviceBitfield); } } // namespace NEO diff --git a/shared/source/gen11/debugger_gen11.cpp b/shared/source/gen11/debugger_gen11.cpp index ee91360a34..47cf767fdf 100644 --- a/shared/source/gen11/debugger_gen11.cpp +++ b/shared/source/gen11/debugger_gen11.cpp @@ -11,8 +11,8 @@ #include "shared/source/helpers/populate_factory.h" namespace NEO { -struct ICLFamily; -using GfxFamily = ICLFamily; +struct Gen11Family; +using GfxFamily = Gen11Family; static auto coreFamily = IGFX_GEN11_CORE; template <> diff --git a/shared/source/gen11/enable_family_full_core_gen11.cpp b/shared/source/gen11/enable_family_full_core_gen11.cpp index 4e8f5e03c7..9ff703044e 100644 --- a/shared/source/gen11/enable_family_full_core_gen11.cpp +++ b/shared/source/gen11/enable_family_full_core_gen11.cpp @@ -17,7 +17,7 @@ namespace NEO { extern HwHelper *hwHelperFactory[IGFX_MAX_CORE]; -using Family = ICLFamily; +using Family = Gen11Family; static auto gfxFamily = IGFX_GEN11_CORE; struct EnableCoreGen11 { diff --git a/shared/source/gen11/experimental_command_buffer_gen11.cpp b/shared/source/gen11/experimental_command_buffer_gen11.cpp index c2050a7a89..c70c1173ad 100644 --- a/shared/source/gen11/experimental_command_buffer_gen11.cpp +++ b/shared/source/gen11/experimental_command_buffer_gen11.cpp @@ -11,7 +11,7 @@ #include "shared/source/helpers/hw_helper.h" namespace NEO { -typedef ICLFamily GfxFamily; +typedef Gen11Family GfxFamily; template void ExperimentalCommandBuffer::injectBufferStart(LinearStream &parentStream, size_t cmdBufferOffset); template size_t ExperimentalCommandBuffer::getRequiredInjectionSize() noexcept; diff --git a/shared/source/gen11/hw_cmds_base.h b/shared/source/gen11/hw_cmds_base.h index 774d6dbff7..8f2d47c6dd 100644 --- a/shared/source/gen11/hw_cmds_base.h +++ b/shared/source/gen11/hw_cmds_base.h @@ -18,7 +18,7 @@ struct CmdParse; namespace NEO { class LogicalStateHelper; -struct GEN11 { +struct Gen11 { #include "shared/source/generated/gen11/hw_cmds_generated_gen11.inl" static constexpr bool supportsSampler = true; @@ -50,9 +50,9 @@ struct GEN11 { static_assert(sizeof(DataPortBindlessSurfaceExtendedMessageDescriptor) == sizeof(DataPortBindlessSurfaceExtendedMessageDescriptor::packed), ""); }; -struct ICLFamily : public GEN11 { - using PARSE = CmdParse; - using GfxFamily = ICLFamily; +struct Gen11Family : public Gen11 { + using PARSE = CmdParse; + using GfxFamily = Gen11Family; using WALKER_TYPE = GPGPU_WALKER; using VFE_STATE_TYPE = MEDIA_VFE_STATE; using XY_BLOCK_COPY_BLT = typename GfxFamily::XY_SRC_COPY_BLT; diff --git a/shared/source/gen11/hw_cmds_ehl.h b/shared/source/gen11/hw_cmds_ehl.h index b6d5be2e6e..8dae956f08 100644 --- a/shared/source/gen11/hw_cmds_ehl.h +++ b/shared/source/gen11/hw_cmds_ehl.h @@ -10,7 +10,7 @@ namespace NEO { -struct EHL : public ICLFamily { +struct EHL : public Gen11Family { static const PLATFORM platform; static const HardwareInfo hwInfo; static const uint64_t defaultHardwareInfoConfig; diff --git a/shared/source/gen11/hw_cmds_icllp.h b/shared/source/gen11/hw_cmds_icllp.h index 3f9000e4bf..bca7794bc1 100644 --- a/shared/source/gen11/hw_cmds_icllp.h +++ b/shared/source/gen11/hw_cmds_icllp.h @@ -10,7 +10,7 @@ namespace NEO { -struct ICLLP : public ICLFamily { +struct ICLLP : public Gen11Family { static const PLATFORM platform; static const HardwareInfo hwInfo; static const uint64_t defaultHardwareInfoConfig; diff --git a/shared/source/gen11/hw_cmds_lkf.h b/shared/source/gen11/hw_cmds_lkf.h index 8487218866..b08eb038ff 100644 --- a/shared/source/gen11/hw_cmds_lkf.h +++ b/shared/source/gen11/hw_cmds_lkf.h @@ -10,7 +10,7 @@ namespace NEO { -struct LKF : public ICLFamily { +struct LKF : public Gen11Family { static const PLATFORM platform; static const HardwareInfo hwInfo; static const uint64_t defaultHardwareInfoConfig; diff --git a/shared/source/gen11/hw_helper_gen11.cpp b/shared/source/gen11/hw_helper_gen11.cpp index 2a0b1cf661..6a9e243470 100644 --- a/shared/source/gen11/hw_helper_gen11.cpp +++ b/shared/source/gen11/hw_helper_gen11.cpp @@ -14,7 +14,7 @@ #include "shared/source/helpers/logical_state_helper.inl" namespace NEO { -typedef ICLFamily Family; +typedef Gen11Family Family; template <> uint32_t HwHelperHw::getComputeUnitsUsedForScratch(const HardwareInfo *pHwInfo) const { diff --git a/shared/source/gen11/hw_info_gen11.h b/shared/source/gen11/hw_info_gen11.h index 228c994aeb..734a3d817c 100644 --- a/shared/source/gen11/hw_info_gen11.h +++ b/shared/source/gen11/hw_info_gen11.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2019-2021 Intel Corporation + * Copyright (C) 2019-2022 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -10,11 +10,11 @@ namespace NEO { -struct ICLFamily; +struct Gen11Family; template <> struct GfxFamilyMapper { - typedef ICLFamily GfxFamily; + typedef Gen11Family GfxFamily; static const char *name; }; } // namespace NEO diff --git a/shared/source/gen11/image_core_gen11.cpp b/shared/source/gen11/image_core_gen11.cpp index 583a6d0a81..f8f87f7633 100644 --- a/shared/source/gen11/image_core_gen11.cpp +++ b/shared/source/gen11/image_core_gen11.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2020-2021 Intel Corporation + * Copyright (C) 2020-2022 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -10,7 +10,7 @@ namespace NEO { -typedef ICLFamily Family; +typedef Gen11Family Family; // clang-format off #include "shared/source/image/image_bdw_and_later.inl" diff --git a/shared/source/gen11/linux/command_stream_receiver_gen11.cpp b/shared/source/gen11/linux/command_stream_receiver_gen11.cpp index 2fe0edb13c..939ab45d31 100644 --- a/shared/source/gen11/linux/command_stream_receiver_gen11.cpp +++ b/shared/source/gen11/linux/command_stream_receiver_gen11.cpp @@ -13,7 +13,7 @@ namespace NEO { -template class DeviceCommandStreamReceiver; -template class DrmCommandStreamReceiver; -template class CommandStreamReceiverWithAUBDump>; +template class DeviceCommandStreamReceiver; +template class DrmCommandStreamReceiver; +template class CommandStreamReceiverWithAUBDump>; } // namespace NEO diff --git a/shared/source/gen11/linux/direct_submission_gen11.cpp b/shared/source/gen11/linux/direct_submission_gen11.cpp index f9beef1292..63ae51fbc5 100644 --- a/shared/source/gen11/linux/direct_submission_gen11.cpp +++ b/shared/source/gen11/linux/direct_submission_gen11.cpp @@ -16,7 +16,7 @@ #include "shared/source/gen11/hw_cmds.h" namespace NEO { -using GfxFamily = ICLFamily; +using GfxFamily = Gen11Family; template class Dispatcher; template class BlitterDispatcher; diff --git a/shared/source/gen11/preamble_gen11.cpp b/shared/source/gen11/preamble_gen11.cpp index 79ee4b02c1..75aa320a9a 100644 --- a/shared/source/gen11/preamble_gen11.cpp +++ b/shared/source/gen11/preamble_gen11.cpp @@ -14,7 +14,7 @@ namespace NEO { -using Family = ICLFamily; +using Family = Gen11Family; template <> uint32_t PreambleHelper::getL3Config(const HardwareInfo &hwInfo, bool useSLM) { diff --git a/shared/source/gen11/preemption_gen11.cpp b/shared/source/gen11/preemption_gen11.cpp index 8245befe8d..7b38182108 100644 --- a/shared/source/gen11/preemption_gen11.cpp +++ b/shared/source/gen11/preemption_gen11.cpp @@ -11,7 +11,7 @@ namespace NEO { -using GfxFamily = ICLFamily; +using GfxFamily = Gen11Family; template void PreemptionHelper::programCmdStream(LinearStream &cmdStream, PreemptionMode newPreemptionMode, PreemptionMode oldPreemptionMode, GraphicsAllocation *preemptionCsr); diff --git a/shared/source/gen11/reg_configs.h b/shared/source/gen11/reg_configs.h index 7d03f24247..ee8536409c 100644 --- a/shared/source/gen11/reg_configs.h +++ b/shared/source/gen11/reg_configs.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2019-2021 Intel Corporation + * Copyright (C) 2019-2022 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -10,7 +10,7 @@ namespace NEO { -struct ICLFamily; +struct Gen11Family; template <> struct L3CNTLREGConfig { @@ -19,12 +19,12 @@ struct L3CNTLREGConfig { }; template <> -struct L3CNTLRegisterOffset { +struct L3CNTLRegisterOffset { static const uint32_t registerOffset = 0x7034; }; template <> -struct DebugModeRegisterOffset { +struct DebugModeRegisterOffset { enum { registerOffset = 0x20d8, debugEnabledValue = (1 << 5) | (1 << 21) diff --git a/shared/source/gen11/state_base_address_gen11.cpp b/shared/source/gen11/state_base_address_gen11.cpp index 9a7db4d9b4..4b3c48e78a 100644 --- a/shared/source/gen11/state_base_address_gen11.cpp +++ b/shared/source/gen11/state_base_address_gen11.cpp @@ -11,5 +11,5 @@ #include "shared/source/helpers/state_base_address_icllp_and_later.inl" namespace NEO { -template struct StateBaseAddressHelper; +template struct StateBaseAddressHelper; } diff --git a/shared/source/gen11/tbx_command_stream_receiver_gen11.cpp b/shared/source/gen11/tbx_command_stream_receiver_gen11.cpp index 0086726d3f..d7596ae210 100644 --- a/shared/source/gen11/tbx_command_stream_receiver_gen11.cpp +++ b/shared/source/gen11/tbx_command_stream_receiver_gen11.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2019-2021 Intel Corporation + * Copyright (C) 2019-2022 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -13,7 +13,7 @@ #include "shared/source/helpers/populate_factory.h" namespace NEO { -typedef ICLFamily Family; +typedef Gen11Family Family; static auto gfxCore = IGFX_GEN11_CORE; template <> diff --git a/shared/source/gen11/windows/command_stream_receiver_gen11.cpp b/shared/source/gen11/windows/command_stream_receiver_gen11.cpp index 2d2713432f..c9dc199e58 100644 --- a/shared/source/gen11/windows/command_stream_receiver_gen11.cpp +++ b/shared/source/gen11/windows/command_stream_receiver_gen11.cpp @@ -12,7 +12,7 @@ namespace NEO { -template class DeviceCommandStreamReceiver; -template class WddmCommandStreamReceiver; -template class CommandStreamReceiverWithAUBDump>; +template class DeviceCommandStreamReceiver; +template class WddmCommandStreamReceiver; +template class CommandStreamReceiverWithAUBDump>; } // namespace NEO diff --git a/shared/source/gen11/windows/direct_submission_gen11.cpp b/shared/source/gen11/windows/direct_submission_gen11.cpp index 99da9935e3..348265d203 100644 --- a/shared/source/gen11/windows/direct_submission_gen11.cpp +++ b/shared/source/gen11/windows/direct_submission_gen11.cpp @@ -16,7 +16,7 @@ #include "shared/source/gen11/hw_cmds_base.h" namespace NEO { -using GfxFamily = ICLFamily; +using GfxFamily = Gen11Family; template class Dispatcher; template class BlitterDispatcher; diff --git a/shared/source/gen11/windows/gmm_callbacks_gen11.cpp b/shared/source/gen11/windows/gmm_callbacks_gen11.cpp index d07eae3c89..70c00e2332 100644 --- a/shared/source/gen11/windows/gmm_callbacks_gen11.cpp +++ b/shared/source/gen11/windows/gmm_callbacks_gen11.cpp @@ -10,6 +10,6 @@ #include "shared/source/helpers/windows/gmm_callbacks.inl" namespace NEO { -template struct DeviceCallbacks; -template struct TTCallbacks; +template struct DeviceCallbacks; +template struct TTCallbacks; } // namespace NEO diff --git a/shared/source/gen12lp/adlp/os_agnostic_hw_info_config_adlp.inl b/shared/source/gen12lp/adlp/os_agnostic_hw_info_config_adlp.inl index 0cff5f1186..7ef4463fb7 100644 --- a/shared/source/gen12lp/adlp/os_agnostic_hw_info_config_adlp.inl +++ b/shared/source/gen12lp/adlp/os_agnostic_hw_info_config_adlp.inl @@ -36,7 +36,7 @@ template <> void HwInfoConfigHw::setAdditionalPipelineSelectFields(void *pipelineSelectCmd, const PipelineSelectArgs &pipelineSelectArgs, const HardwareInfo &hwInfo) { - using PIPELINE_SELECT = typename TGLLPFamily::PIPELINE_SELECT; + using PIPELINE_SELECT = typename Gen12LpFamily::PIPELINE_SELECT; auto pipelineSelectTglplpCmd = reinterpret_cast(pipelineSelectCmd); auto mask = pipelineSelectTglplpCmd->getMaskBits(); diff --git a/shared/source/gen12lp/aub_command_stream_receiver_gen12lp.cpp b/shared/source/gen12lp/aub_command_stream_receiver_gen12lp.cpp index 862870becc..9e9e01b21f 100644 --- a/shared/source/gen12lp/aub_command_stream_receiver_gen12lp.cpp +++ b/shared/source/gen12lp/aub_command_stream_receiver_gen12lp.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2019-2021 Intel Corporation + * Copyright (C) 2019-2022 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -13,7 +13,7 @@ #include "shared/source/memory_manager/memory_pool.h" namespace NEO { -typedef TGLLPFamily Family; +typedef Gen12LpFamily Family; static auto gfxCore = IGFX_GEN12LP_CORE; template <> diff --git a/shared/source/gen12lp/aub_mapper.h b/shared/source/gen12lp/aub_mapper.h index fe09012ef1..d2304117ef 100644 --- a/shared/source/gen12lp/aub_mapper.h +++ b/shared/source/gen12lp/aub_mapper.h @@ -13,10 +13,10 @@ #include "engine_node.h" namespace NEO { -struct TGLLPFamily; +struct Gen12LpFamily; template <> -struct AUBFamilyMapper { +struct AUBFamilyMapper { enum { device = AubMemDump::DeviceValues::Tgllp }; using AubTraits = AubMemDump::Traits; diff --git a/shared/source/gen12lp/aub_mem_dump_gen12lp.cpp b/shared/source/gen12lp/aub_mem_dump_gen12lp.cpp index 9c4822742a..5066e3e5c5 100644 --- a/shared/source/gen12lp/aub_mem_dump_gen12lp.cpp +++ b/shared/source/gen12lp/aub_mem_dump_gen12lp.cpp @@ -31,7 +31,7 @@ template struct AubPageTableHelper64>; } // namespace AubMemDump namespace NEO { -using Family = TGLLPFamily; +using Family = Gen12LpFamily; static const AubMemDump::LrcaHelperRcs rcs(0x002000); static const AubMemDump::LrcaHelperBcs bcs(0x022000); diff --git a/shared/source/gen12lp/command_encoder_gen12lp.cpp b/shared/source/gen12lp/command_encoder_gen12lp.cpp index 0025899426..f13fec5314 100644 --- a/shared/source/gen12lp/command_encoder_gen12lp.cpp +++ b/shared/source/gen12lp/command_encoder_gen12lp.cpp @@ -12,7 +12,7 @@ #include "shared/source/gmm_helper/gmm_helper.h" #include "shared/source/helpers/preamble.h" -using Family = NEO::TGLLPFamily; +using Family = NEO::Gen12LpFamily; #include "shared/source/command_container/command_encoder.inl" #include "shared/source/command_container/command_encoder_bdw_and_later.inl" diff --git a/shared/source/gen12lp/command_stream_receiver_hw_gen12lp.cpp b/shared/source/gen12lp/command_stream_receiver_hw_gen12lp.cpp index 0f13e50916..f58e4c0a1e 100644 --- a/shared/source/gen12lp/command_stream_receiver_hw_gen12lp.cpp +++ b/shared/source/gen12lp/command_stream_receiver_hw_gen12lp.cpp @@ -7,7 +7,7 @@ #include "shared/source/gen12lp/hw_cmds.h" -using Family = NEO::TGLLPFamily; +using Family = NEO::Gen12LpFamily; #include "shared/source/command_stream/command_stream_receiver_hw_bdw_and_later.inl" #include "shared/source/command_stream/device_command_stream.h" diff --git a/shared/source/gen12lp/command_stream_receiver_simulated_common_hw_gen12lp.cpp b/shared/source/gen12lp/command_stream_receiver_simulated_common_hw_gen12lp.cpp index a4ba7702c6..03c9b398ba 100644 --- a/shared/source/gen12lp/command_stream_receiver_simulated_common_hw_gen12lp.cpp +++ b/shared/source/gen12lp/command_stream_receiver_simulated_common_hw_gen12lp.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2019-2021 Intel Corporation + * Copyright (C) 2019-2022 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -8,7 +8,7 @@ #include "shared/source/command_stream/command_stream_receiver_simulated_common_hw_bdw_and_later.inl" namespace NEO { -typedef TGLLPFamily Family; +typedef Gen12LpFamily Family; template <> void CommandStreamReceiverSimulatedCommonHw::initGlobalMMIO() { diff --git a/shared/source/gen12lp/create_device_command_stream_receiver_gen12lp.cpp b/shared/source/gen12lp/create_device_command_stream_receiver_gen12lp.cpp index 49ff19d5de..493034dd33 100644 --- a/shared/source/gen12lp/create_device_command_stream_receiver_gen12lp.cpp +++ b/shared/source/gen12lp/create_device_command_stream_receiver_gen12lp.cpp @@ -13,11 +13,11 @@ namespace NEO { template <> -CommandStreamReceiver *createDeviceCommandStreamReceiver(bool withAubDump, - ExecutionEnvironment &executionEnvironment, - uint32_t rootDeviceIndex, - const DeviceBitfield deviceBitfield) { - return createCommandStreamReceiver(withAubDump, executionEnvironment, rootDeviceIndex, deviceBitfield); +CommandStreamReceiver *createDeviceCommandStreamReceiver(bool withAubDump, + ExecutionEnvironment &executionEnvironment, + uint32_t rootDeviceIndex, + const DeviceBitfield deviceBitfield) { + return createCommandStreamReceiver(withAubDump, executionEnvironment, rootDeviceIndex, deviceBitfield); } } // namespace NEO diff --git a/shared/source/gen12lp/debugger_gen12lp.cpp b/shared/source/gen12lp/debugger_gen12lp.cpp index e507d020f5..596edf3878 100644 --- a/shared/source/gen12lp/debugger_gen12lp.cpp +++ b/shared/source/gen12lp/debugger_gen12lp.cpp @@ -12,7 +12,7 @@ namespace NEO { -using Family = NEO::TGLLPFamily; +using Family = NEO::Gen12LpFamily; static auto coreFamily = IGFX_GEN12LP_CORE; diff --git a/shared/source/gen12lp/enable_family_full_core_gen12lp.cpp b/shared/source/gen12lp/enable_family_full_core_gen12lp.cpp index 7c8def8814..878cf8c01d 100644 --- a/shared/source/gen12lp/enable_family_full_core_gen12lp.cpp +++ b/shared/source/gen12lp/enable_family_full_core_gen12lp.cpp @@ -17,7 +17,7 @@ namespace NEO { extern HwHelper *hwHelperFactory[IGFX_MAX_CORE]; -using Family = TGLLPFamily; +using Family = Gen12LpFamily; static auto gfxFamily = IGFX_GEN12LP_CORE; struct EnableCoreGen12LP { diff --git a/shared/source/gen12lp/experimental_command_buffer_gen12lp.cpp b/shared/source/gen12lp/experimental_command_buffer_gen12lp.cpp index 234e3a9ded..f750d1c1e9 100644 --- a/shared/source/gen12lp/experimental_command_buffer_gen12lp.cpp +++ b/shared/source/gen12lp/experimental_command_buffer_gen12lp.cpp @@ -11,7 +11,7 @@ #include "shared/source/helpers/hw_helper.h" namespace NEO { -typedef TGLLPFamily GfxFamily; +typedef Gen12LpFamily GfxFamily; template void ExperimentalCommandBuffer::injectBufferStart(LinearStream &parentStream, size_t cmdBufferOffset); template size_t ExperimentalCommandBuffer::getRequiredInjectionSize() noexcept; diff --git a/shared/source/gen12lp/hw_cmds_adln.h b/shared/source/gen12lp/hw_cmds_adln.h index 41508e1d7f..9cace02da5 100644 --- a/shared/source/gen12lp/hw_cmds_adln.h +++ b/shared/source/gen12lp/hw_cmds_adln.h @@ -9,7 +9,7 @@ #include "shared/source/gen12lp/hw_cmds_base.h" namespace NEO { -struct ADLN : public TGLLPFamily { +struct ADLN : public Gen12LpFamily { static const PLATFORM platform; static const HardwareInfo hwInfo; static const uint64_t defaultHardwareInfoConfig; diff --git a/shared/source/gen12lp/hw_cmds_adlp.h b/shared/source/gen12lp/hw_cmds_adlp.h index 00c4183d60..a71a050135 100644 --- a/shared/source/gen12lp/hw_cmds_adlp.h +++ b/shared/source/gen12lp/hw_cmds_adlp.h @@ -9,7 +9,7 @@ #include "shared/source/gen12lp/hw_cmds_base.h" namespace NEO { -struct ADLP : public TGLLPFamily { +struct ADLP : public Gen12LpFamily { static const PLATFORM platform; static const HardwareInfo hwInfo; static const uint64_t defaultHardwareInfoConfig; diff --git a/shared/source/gen12lp/hw_cmds_adls.h b/shared/source/gen12lp/hw_cmds_adls.h index 66dbbef7d6..4b2163a9d0 100644 --- a/shared/source/gen12lp/hw_cmds_adls.h +++ b/shared/source/gen12lp/hw_cmds_adls.h @@ -9,7 +9,7 @@ #include "shared/source/gen12lp/hw_cmds_base.h" namespace NEO { -struct ADLS : public TGLLPFamily { +struct ADLS : public Gen12LpFamily { static const PLATFORM platform; static const HardwareInfo hwInfo; static const uint64_t defaultHardwareInfoConfig; diff --git a/shared/source/gen12lp/hw_cmds_base.h b/shared/source/gen12lp/hw_cmds_base.h index b970e15c9b..2eba941db9 100644 --- a/shared/source/gen12lp/hw_cmds_base.h +++ b/shared/source/gen12lp/hw_cmds_base.h @@ -20,7 +20,7 @@ struct CmdParse; namespace NEO { class LogicalStateHelper; -struct GEN12LP { +struct Gen12Lp { #include "shared/source/generated/gen12lp/hw_cmds_generated_gen12lp.inl" static constexpr bool supportsSampler = true; @@ -53,9 +53,9 @@ struct GEN12LP { static_assert(sizeof(DataPortBindlessSurfaceExtendedMessageDescriptor) == sizeof(DataPortBindlessSurfaceExtendedMessageDescriptor::packed), ""); }; -struct TGLLPFamily : public GEN12LP { - using PARSE = CmdParse; - using GfxFamily = TGLLPFamily; +struct Gen12LpFamily : public Gen12Lp { + using PARSE = CmdParse; + using GfxFamily = Gen12LpFamily; using WALKER_TYPE = GPGPU_WALKER; using VFE_STATE_TYPE = MEDIA_VFE_STATE; using XY_COPY_BLT = typename GfxFamily::XY_BLOCK_COPY_BLT; diff --git a/shared/source/gen12lp/hw_cmds_dg1.h b/shared/source/gen12lp/hw_cmds_dg1.h index 811fe117ed..59bd42cd1a 100644 --- a/shared/source/gen12lp/hw_cmds_dg1.h +++ b/shared/source/gen12lp/hw_cmds_dg1.h @@ -8,7 +8,7 @@ #pragma once #include "shared/source/gen12lp/hw_cmds_base.h" namespace NEO { -struct DG1 : public TGLLPFamily { +struct DG1 : public Gen12LpFamily { static const PLATFORM platform; static const HardwareInfo hwInfo; static const uint64_t defaultHardwareInfoConfig; diff --git a/shared/source/gen12lp/hw_cmds_rkl.h b/shared/source/gen12lp/hw_cmds_rkl.h index 717f7cfb1d..a515a2eeec 100644 --- a/shared/source/gen12lp/hw_cmds_rkl.h +++ b/shared/source/gen12lp/hw_cmds_rkl.h @@ -8,7 +8,7 @@ #pragma once #include "shared/source/gen12lp/hw_cmds_base.h" namespace NEO { -struct RKL : public TGLLPFamily { +struct RKL : public Gen12LpFamily { static const PLATFORM platform; static const HardwareInfo hwInfo; static const uint64_t defaultHardwareInfoConfig; diff --git a/shared/source/gen12lp/hw_cmds_tgllp.h b/shared/source/gen12lp/hw_cmds_tgllp.h index 8e9a06caa9..f13953efe6 100644 --- a/shared/source/gen12lp/hw_cmds_tgllp.h +++ b/shared/source/gen12lp/hw_cmds_tgllp.h @@ -9,7 +9,7 @@ #include "shared/source/gen12lp/hw_cmds_base.h" namespace NEO { -struct TGLLP : public TGLLPFamily { +struct TGLLP : public Gen12LpFamily { static const PLATFORM platform; static const HardwareInfo hwInfo; static const uint64_t defaultHardwareInfoConfig; diff --git a/shared/source/gen12lp/hw_helper_gen12lp.cpp b/shared/source/gen12lp/hw_helper_gen12lp.cpp index 55acabd42d..b1cb2817d2 100644 --- a/shared/source/gen12lp/hw_helper_gen12lp.cpp +++ b/shared/source/gen12lp/hw_helper_gen12lp.cpp @@ -8,7 +8,7 @@ #include "shared/source/gen12lp/aub_mapper.h" #include "shared/source/gen12lp/hw_cmds.h" -using Family = NEO::TGLLPFamily; +using Family = NEO::Gen12LpFamily; #include "shared/source/helpers/flat_batch_buffer_helper_hw.inl" #include "shared/source/helpers/hw_helper_base.inl" diff --git a/shared/source/gen12lp/hw_info_gen12lp.h b/shared/source/gen12lp/hw_info_gen12lp.h index 33f0020eb3..78e262bbbe 100644 --- a/shared/source/gen12lp/hw_info_gen12lp.h +++ b/shared/source/gen12lp/hw_info_gen12lp.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2019-2020 Intel Corporation + * Copyright (C) 2019-2022 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -10,11 +10,11 @@ namespace NEO { -struct TGLLPFamily; +struct Gen12LpFamily; template <> struct GfxFamilyMapper { - typedef TGLLPFamily GfxFamily; + typedef Gen12LpFamily GfxFamily; static const char *name; }; } // namespace NEO diff --git a/shared/source/gen12lp/image_core_gen12lp.cpp b/shared/source/gen12lp/image_core_gen12lp.cpp index 1f3bc9f62a..ad59fabf6c 100644 --- a/shared/source/gen12lp/image_core_gen12lp.cpp +++ b/shared/source/gen12lp/image_core_gen12lp.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2020-2021 Intel Corporation + * Copyright (C) 2020-2022 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -10,7 +10,7 @@ namespace NEO { -using Family = TGLLPFamily; +using Family = Gen12LpFamily; // clang-format off #include "shared/source/image/image_bdw_and_later.inl" diff --git a/shared/source/gen12lp/linux/command_stream_receiver_gen12lp.cpp b/shared/source/gen12lp/linux/command_stream_receiver_gen12lp.cpp index 25af2b4c1a..9ed5279343 100644 --- a/shared/source/gen12lp/linux/command_stream_receiver_gen12lp.cpp +++ b/shared/source/gen12lp/linux/command_stream_receiver_gen12lp.cpp @@ -13,7 +13,7 @@ namespace NEO { -template class DeviceCommandStreamReceiver; -template class DrmCommandStreamReceiver; -template class CommandStreamReceiverWithAUBDump>; +template class DeviceCommandStreamReceiver; +template class DrmCommandStreamReceiver; +template class CommandStreamReceiverWithAUBDump>; } // namespace NEO diff --git a/shared/source/gen12lp/linux/direct_submission_gen12lp.cpp b/shared/source/gen12lp/linux/direct_submission_gen12lp.cpp index 4ef20ee547..8aec102fa9 100644 --- a/shared/source/gen12lp/linux/direct_submission_gen12lp.cpp +++ b/shared/source/gen12lp/linux/direct_submission_gen12lp.cpp @@ -16,7 +16,7 @@ #include "shared/source/gen12lp/hw_cmds.h" namespace NEO { -using GfxFamily = TGLLPFamily; +using GfxFamily = Gen12LpFamily; template class Dispatcher; template class BlitterDispatcher; diff --git a/shared/source/gen12lp/os_agnostic_hw_info_config_gen12lp.inl b/shared/source/gen12lp/os_agnostic_hw_info_config_gen12lp.inl index 9094327c00..5d69ed536d 100644 --- a/shared/source/gen12lp/os_agnostic_hw_info_config_gen12lp.inl +++ b/shared/source/gen12lp/os_agnostic_hw_info_config_gen12lp.inl @@ -1,5 +1,5 @@ /* - * Copyright (C) 2021 Intel Corporation + * Copyright (C) 2021-2022 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -18,7 +18,7 @@ bool HwInfoConfigHw::isPageTableManagerSupported(const HardwareInfo template <> void HwInfoConfigHw::adjustSamplerState(void *sampler, const HardwareInfo &hwInfo) { - using SAMPLER_STATE = typename TGLLPFamily::SAMPLER_STATE; + using SAMPLER_STATE = typename Gen12LpFamily::SAMPLER_STATE; auto samplerState = reinterpret_cast(sampler); if (DebugManager.flags.ForceSamplerLowFilteringPrecision.get()) { samplerState->setLowQualityFilter(SAMPLER_STATE::LOW_QUALITY_FILTER_ENABLE); diff --git a/shared/source/gen12lp/preamble_gen12lp.cpp b/shared/source/gen12lp/preamble_gen12lp.cpp index 938d203947..ab13951c9c 100644 --- a/shared/source/gen12lp/preamble_gen12lp.cpp +++ b/shared/source/gen12lp/preamble_gen12lp.cpp @@ -15,7 +15,7 @@ namespace NEO { -using Family = TGLLPFamily; +using Family = Gen12LpFamily; template <> uint32_t PreambleHelper::getL3Config(const HardwareInfo &hwInfo, bool useSLM) { diff --git a/shared/source/gen12lp/preemption_gen12lp.cpp b/shared/source/gen12lp/preemption_gen12lp.cpp index e95fc4bf6a..21af88eefe 100644 --- a/shared/source/gen12lp/preemption_gen12lp.cpp +++ b/shared/source/gen12lp/preemption_gen12lp.cpp @@ -11,7 +11,7 @@ namespace NEO { -using GfxFamily = TGLLPFamily; +using GfxFamily = Gen12LpFamily; template void PreemptionHelper::programCmdStream(LinearStream &cmdStream, PreemptionMode newPreemptionMode, PreemptionMode oldPreemptionMode, GraphicsAllocation *preemptionCsr); diff --git a/shared/source/gen12lp/reg_configs.h b/shared/source/gen12lp/reg_configs.h index 43fdd1233a..e86bb52f87 100644 --- a/shared/source/gen12lp/reg_configs.h +++ b/shared/source/gen12lp/reg_configs.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2019-2020 Intel Corporation + * Copyright (C) 2019-2022 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -10,7 +10,7 @@ namespace NEO { -struct TGLLPFamily; +struct Gen12LpFamily; template <> struct L3CNTLREGConfig { static const uint32_t valueForSLM = 0xD0000020u; @@ -18,13 +18,13 @@ struct L3CNTLREGConfig { }; template <> -struct L3CNTLRegisterOffset { +struct L3CNTLRegisterOffset { static const uint32_t registerOffset = 0xB134; static const uint32_t registerOffsetCCS = 0xB234; }; template <> -struct DebugModeRegisterOffset { +struct DebugModeRegisterOffset { enum { registerOffset = 0x20d8, debugEnabledValue = (1 << 5) | (1 << 21) diff --git a/shared/source/gen12lp/state_base_address_gen12lp.cpp b/shared/source/gen12lp/state_base_address_gen12lp.cpp index eade2899b5..062d3c04cc 100644 --- a/shared/source/gen12lp/state_base_address_gen12lp.cpp +++ b/shared/source/gen12lp/state_base_address_gen12lp.cpp @@ -11,5 +11,5 @@ #include "shared/source/helpers/state_base_address_icllp_and_later.inl" namespace NEO { -template struct StateBaseAddressHelper; +template struct StateBaseAddressHelper; } diff --git a/shared/source/gen12lp/tbx_command_stream_receiver_gen12lp.cpp b/shared/source/gen12lp/tbx_command_stream_receiver_gen12lp.cpp index 83014d7bec..caa5c233c2 100644 --- a/shared/source/gen12lp/tbx_command_stream_receiver_gen12lp.cpp +++ b/shared/source/gen12lp/tbx_command_stream_receiver_gen12lp.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2019-2021 Intel Corporation + * Copyright (C) 2019-2022 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -15,7 +15,7 @@ #include "shared/source/memory_manager/memory_pool.h" namespace NEO { -typedef TGLLPFamily Family; +typedef Gen12LpFamily Family; static auto gfxCore = IGFX_GEN12LP_CORE; template <> diff --git a/shared/source/gen12lp/windows/command_stream_receiver_gen12lp.cpp b/shared/source/gen12lp/windows/command_stream_receiver_gen12lp.cpp index b0bb18fc4f..fa38923ddd 100644 --- a/shared/source/gen12lp/windows/command_stream_receiver_gen12lp.cpp +++ b/shared/source/gen12lp/windows/command_stream_receiver_gen12lp.cpp @@ -12,7 +12,7 @@ namespace NEO { -template class DeviceCommandStreamReceiver; -template class WddmCommandStreamReceiver; -template class CommandStreamReceiverWithAUBDump>; +template class DeviceCommandStreamReceiver; +template class WddmCommandStreamReceiver; +template class CommandStreamReceiverWithAUBDump>; } // namespace NEO diff --git a/shared/source/gen12lp/windows/direct_submission_gen12lp.cpp b/shared/source/gen12lp/windows/direct_submission_gen12lp.cpp index 947f8b0b1f..41ff7b039c 100644 --- a/shared/source/gen12lp/windows/direct_submission_gen12lp.cpp +++ b/shared/source/gen12lp/windows/direct_submission_gen12lp.cpp @@ -16,7 +16,7 @@ #include "shared/source/gen12lp/hw_cmds_base.h" namespace NEO { -using GfxFamily = TGLLPFamily; +using GfxFamily = Gen12LpFamily; template class Dispatcher; template class BlitterDispatcher; diff --git a/shared/source/gen12lp/windows/gmm_callbacks_gen12lp.cpp b/shared/source/gen12lp/windows/gmm_callbacks_gen12lp.cpp index 25f58d2a1c..2c4c8927ad 100644 --- a/shared/source/gen12lp/windows/gmm_callbacks_gen12lp.cpp +++ b/shared/source/gen12lp/windows/gmm_callbacks_gen12lp.cpp @@ -9,6 +9,6 @@ #include "shared/source/helpers/windows/gmm_callbacks_tgllp_and_later.inl" namespace NEO { -template struct DeviceCallbacks; -template struct TTCallbacks; +template struct DeviceCallbacks; +template struct TTCallbacks; } // namespace NEO diff --git a/shared/source/gen8/aub_command_stream_receiver_gen8.cpp b/shared/source/gen8/aub_command_stream_receiver_gen8.cpp index bbcc3e46c7..0e51303613 100644 --- a/shared/source/gen8/aub_command_stream_receiver_gen8.cpp +++ b/shared/source/gen8/aub_command_stream_receiver_gen8.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2021 Intel Corporation + * Copyright (C) 2018-2022 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -12,7 +12,7 @@ namespace NEO { -typedef BDWFamily Family; +typedef Gen8Family Family; static auto gfxCore = IGFX_GEN8_CORE; template <> diff --git a/shared/source/gen8/aub_mapper.h b/shared/source/gen8/aub_mapper.h index b62e5f4b69..fc9ec6aa78 100644 --- a/shared/source/gen8/aub_mapper.h +++ b/shared/source/gen8/aub_mapper.h @@ -13,10 +13,10 @@ #include "engine_node.h" namespace NEO { -struct BDWFamily; +struct Gen8Family; template <> -struct AUBFamilyMapper { +struct AUBFamilyMapper { enum { device = AubMemDump::DeviceValues::Bdw }; using AubTraits = AubMemDump::Traits; diff --git a/shared/source/gen8/aub_mem_dump_gen8.cpp b/shared/source/gen8/aub_mem_dump_gen8.cpp index ebd23d3b92..5cf55092c2 100644 --- a/shared/source/gen8/aub_mem_dump_gen8.cpp +++ b/shared/source/gen8/aub_mem_dump_gen8.cpp @@ -27,7 +27,7 @@ template struct AubPageTableHelper64>; } // namespace AubMemDump namespace NEO { -using Family = BDWFamily; +using Family = Gen8Family; static const AubMemDump::LrcaHelperRcs rcs(0x002000); static const AubMemDump::LrcaHelperBcs bcs(0x022000); diff --git a/shared/source/gen8/command_encoder_gen8.cpp b/shared/source/gen8/command_encoder_gen8.cpp index ca9b0bbcd9..c670bede91 100644 --- a/shared/source/gen8/command_encoder_gen8.cpp +++ b/shared/source/gen8/command_encoder_gen8.cpp @@ -9,7 +9,7 @@ #include "shared/source/gen8/hw_cmds_base.h" #include "shared/source/gen8/reg_configs.h" -using Family = NEO::BDWFamily; +using Family = NEO::Gen8Family; #include "shared/source/command_container/command_encoder.inl" #include "shared/source/command_container/command_encoder_bdw_and_later.inl" diff --git a/shared/source/gen8/command_stream_receiver_hw_gen8.cpp b/shared/source/gen8/command_stream_receiver_hw_gen8.cpp index f3a735b0c1..945df7f59b 100644 --- a/shared/source/gen8/command_stream_receiver_hw_gen8.cpp +++ b/shared/source/gen8/command_stream_receiver_hw_gen8.cpp @@ -12,7 +12,7 @@ #include "shared/source/helpers/populate_factory.h" namespace NEO { -typedef BDWFamily Family; +typedef Gen8Family Family; static auto gfxCore = IGFX_GEN8_CORE; template <> diff --git a/shared/source/gen8/command_stream_receiver_simulated_common_hw_gen8.cpp b/shared/source/gen8/command_stream_receiver_simulated_common_hw_gen8.cpp index e3254663e6..4c342d3c99 100644 --- a/shared/source/gen8/command_stream_receiver_simulated_common_hw_gen8.cpp +++ b/shared/source/gen8/command_stream_receiver_simulated_common_hw_gen8.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2021 Intel Corporation + * Copyright (C) 2018-2022 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -8,7 +8,7 @@ #include "shared/source/command_stream/command_stream_receiver_simulated_common_hw_bdw_and_later.inl" namespace NEO { -typedef BDWFamily Family; +typedef Gen8Family Family; template class CommandStreamReceiverSimulatedCommonHw; } // namespace NEO diff --git a/shared/source/gen8/create_device_command_stream_receiver_gen8.cpp b/shared/source/gen8/create_device_command_stream_receiver_gen8.cpp index 69fb721cbb..f6403c0911 100644 --- a/shared/source/gen8/create_device_command_stream_receiver_gen8.cpp +++ b/shared/source/gen8/create_device_command_stream_receiver_gen8.cpp @@ -13,11 +13,11 @@ namespace NEO { template <> -CommandStreamReceiver *createDeviceCommandStreamReceiver(bool withAubDump, - ExecutionEnvironment &executionEnvironment, - uint32_t rootDeviceIndex, - const DeviceBitfield deviceBitfield) { - return createCommandStreamReceiver(withAubDump, executionEnvironment, rootDeviceIndex, deviceBitfield); +CommandStreamReceiver *createDeviceCommandStreamReceiver(bool withAubDump, + ExecutionEnvironment &executionEnvironment, + uint32_t rootDeviceIndex, + const DeviceBitfield deviceBitfield) { + return createCommandStreamReceiver(withAubDump, executionEnvironment, rootDeviceIndex, deviceBitfield); } } // namespace NEO diff --git a/shared/source/gen8/debugger_gen8.cpp b/shared/source/gen8/debugger_gen8.cpp index 0cd3901848..df2c8d4948 100644 --- a/shared/source/gen8/debugger_gen8.cpp +++ b/shared/source/gen8/debugger_gen8.cpp @@ -12,8 +12,8 @@ namespace NEO { -struct BDWFamily; -using GfxFamily = BDWFamily; +struct Gen8Family; +using GfxFamily = Gen8Family; static auto coreFamily = IGFX_GEN8_CORE; template <> diff --git a/shared/source/gen8/enable_family_full_core_gen8.cpp b/shared/source/gen8/enable_family_full_core_gen8.cpp index 64df61bb29..f891cf55a1 100644 --- a/shared/source/gen8/enable_family_full_core_gen8.cpp +++ b/shared/source/gen8/enable_family_full_core_gen8.cpp @@ -19,7 +19,7 @@ namespace NEO { extern HwHelper *hwHelperFactory[IGFX_MAX_CORE]; -using Family = BDWFamily; +using Family = Gen8Family; static const auto gfxFamily = IGFX_GEN8_CORE; struct EnableCoreGen8 { diff --git a/shared/source/gen8/experimental_command_buffer_gen8.cpp b/shared/source/gen8/experimental_command_buffer_gen8.cpp index 83aee55b6c..9b8f297942 100644 --- a/shared/source/gen8/experimental_command_buffer_gen8.cpp +++ b/shared/source/gen8/experimental_command_buffer_gen8.cpp @@ -11,7 +11,7 @@ #include "shared/source/helpers/hw_helper.h" namespace NEO { -typedef BDWFamily GfxFamily; +typedef Gen8Family GfxFamily; template void ExperimentalCommandBuffer::injectBufferStart(LinearStream &parentStream, size_t cmdBufferOffset); template size_t ExperimentalCommandBuffer::getRequiredInjectionSize() noexcept; diff --git a/shared/source/gen8/hw_cmds_base.h b/shared/source/gen8/hw_cmds_base.h index c64f5fad1a..d1d6a0cb39 100644 --- a/shared/source/gen8/hw_cmds_base.h +++ b/shared/source/gen8/hw_cmds_base.h @@ -20,7 +20,7 @@ struct CmdParse; namespace NEO { class LogicalStateHelper; -struct GEN8 { +struct Gen8 { #include "shared/source/generated/gen8/hw_cmds_generated_gen8.inl" static constexpr bool supportsSampler = true; @@ -52,9 +52,9 @@ struct GEN8 { static_assert(sizeof(DataPortBindlessSurfaceExtendedMessageDescriptor) == sizeof(DataPortBindlessSurfaceExtendedMessageDescriptor::packed), ""); }; -struct BDWFamily : public GEN8 { - using PARSE = CmdParse; - using GfxFamily = BDWFamily; +struct Gen8Family : public Gen8 { + using PARSE = CmdParse; + using GfxFamily = Gen8Family; using WALKER_TYPE = GPGPU_WALKER; using VFE_STATE_TYPE = MEDIA_VFE_STATE; using XY_BLOCK_COPY_BLT = typename GfxFamily::XY_SRC_COPY_BLT; diff --git a/shared/source/gen8/hw_cmds_bdw.h b/shared/source/gen8/hw_cmds_bdw.h index 1979a025f3..6111529973 100644 --- a/shared/source/gen8/hw_cmds_bdw.h +++ b/shared/source/gen8/hw_cmds_bdw.h @@ -12,7 +12,7 @@ namespace NEO { -struct BDW : public BDWFamily { +struct BDW : public Gen8Family { static const PLATFORM platform; static const HardwareInfo hwInfo; static const uint64_t defaultHardwareInfoConfig; diff --git a/shared/source/gen8/hw_helper_gen8.cpp b/shared/source/gen8/hw_helper_gen8.cpp index f68950cc76..2cfd35b299 100644 --- a/shared/source/gen8/hw_helper_gen8.cpp +++ b/shared/source/gen8/hw_helper_gen8.cpp @@ -15,7 +15,7 @@ #include "shared/source/helpers/logical_state_helper.inl" namespace NEO { -typedef BDWFamily Family; +typedef Gen8Family Family; static uint32_t slmSizeId[] = {0, 1, 2, 4, 4, 8, 8, 8, 8, 16, 16, 16, 16, 16, 16, 16}; diff --git a/shared/source/gen8/hw_info_gen8.h b/shared/source/gen8/hw_info_gen8.h index f37cb57cf1..9b3bea3ce2 100644 --- a/shared/source/gen8/hw_info_gen8.h +++ b/shared/source/gen8/hw_info_gen8.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2019-2021 Intel Corporation + * Copyright (C) 2019-2022 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -10,11 +10,11 @@ namespace NEO { -struct BDWFamily; +struct Gen8Family; template <> struct GfxFamilyMapper { - typedef BDWFamily GfxFamily; + typedef Gen8Family GfxFamily; static const char *name; }; } // namespace NEO diff --git a/shared/source/gen8/image_core_gen8.cpp b/shared/source/gen8/image_core_gen8.cpp index 990b67b70f..91a9ae01fd 100644 --- a/shared/source/gen8/image_core_gen8.cpp +++ b/shared/source/gen8/image_core_gen8.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2020-2021 Intel Corporation + * Copyright (C) 2020-2022 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -10,7 +10,7 @@ namespace NEO { -typedef BDWFamily Family; +typedef Gen8Family Family; template <> void setMipTailStartLod(Family::RENDER_SURFACE_STATE *surfaceState, Gmm *gmm) {} diff --git a/shared/source/gen8/linux/command_stream_receiver_gen8.cpp b/shared/source/gen8/linux/command_stream_receiver_gen8.cpp index 38879263c6..e58ccdcae6 100644 --- a/shared/source/gen8/linux/command_stream_receiver_gen8.cpp +++ b/shared/source/gen8/linux/command_stream_receiver_gen8.cpp @@ -13,7 +13,7 @@ namespace NEO { -template class DeviceCommandStreamReceiver; -template class DrmCommandStreamReceiver; -template class CommandStreamReceiverWithAUBDump>; +template class DeviceCommandStreamReceiver; +template class DrmCommandStreamReceiver; +template class CommandStreamReceiverWithAUBDump>; } // namespace NEO diff --git a/shared/source/gen8/linux/direct_submission_gen8.cpp b/shared/source/gen8/linux/direct_submission_gen8.cpp index c9537bf4fc..14f1f2edcb 100644 --- a/shared/source/gen8/linux/direct_submission_gen8.cpp +++ b/shared/source/gen8/linux/direct_submission_gen8.cpp @@ -16,7 +16,7 @@ #include "shared/source/gen8/hw_cmds.h" namespace NEO { -using GfxFamily = BDWFamily; +using GfxFamily = Gen8Family; template class Dispatcher; template class BlitterDispatcher; diff --git a/shared/source/gen8/preamble_gen8.cpp b/shared/source/gen8/preamble_gen8.cpp index 486b6e1cb1..c3a5764868 100644 --- a/shared/source/gen8/preamble_gen8.cpp +++ b/shared/source/gen8/preamble_gen8.cpp @@ -11,7 +11,7 @@ namespace NEO { -using Family = BDWFamily; +using Family = Gen8Family; template <> void PreambleHelper::addPipeControlBeforeVfeCmd(LinearStream *pCommandStream, const HardwareInfo *hwInfo, EngineGroupType engineGroupType) { diff --git a/shared/source/gen8/preemption_gen8.cpp b/shared/source/gen8/preemption_gen8.cpp index 5b3e9fafdf..d897daf01c 100644 --- a/shared/source/gen8/preemption_gen8.cpp +++ b/shared/source/gen8/preemption_gen8.cpp @@ -12,7 +12,7 @@ namespace NEO { -using GfxFamily = BDWFamily; +using GfxFamily = Gen8Family; template <> struct PreemptionConfig { diff --git a/shared/source/gen8/reg_configs.h b/shared/source/gen8/reg_configs.h index 25339709c3..09794aa376 100644 --- a/shared/source/gen8/reg_configs.h +++ b/shared/source/gen8/reg_configs.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2021 Intel Corporation + * Copyright (C) 2018-2022 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -10,7 +10,7 @@ namespace NEO { -struct BDWFamily; +struct Gen8Family; template <> struct L3CNTLREGConfig { static const uint32_t valueForSLM = 0x60000321u; @@ -18,7 +18,7 @@ struct L3CNTLREGConfig { }; template <> -struct L3CNTLRegisterOffset { +struct L3CNTLRegisterOffset { static const uint32_t registerOffset = 0x7034; }; } // namespace NEO diff --git a/shared/source/gen8/state_base_address_gen8.cpp b/shared/source/gen8/state_base_address_gen8.cpp index 594f00f3c1..f2209308c0 100644 --- a/shared/source/gen8/state_base_address_gen8.cpp +++ b/shared/source/gen8/state_base_address_gen8.cpp @@ -13,7 +13,7 @@ namespace NEO { template <> -void StateBaseAddressHelper::programStateBaseAddress( +void StateBaseAddressHelper::programStateBaseAddress( STATE_BASE_ADDRESS *stateBaseAddress, const IndirectHeap *dsh, const IndirectHeap *ioh, @@ -33,7 +33,7 @@ void StateBaseAddressHelper::programStateBaseAddress( bool areMultipleSubDevicesInContext, LogicalStateHelper *logicalStateHelper) { - *stateBaseAddress = BDWFamily::cmdInitStateBaseAddress; + *stateBaseAddress = Gen8Family::cmdInitStateBaseAddress; if (dsh) { stateBaseAddress->setDynamicStateBaseAddressModifyEnable(true); @@ -81,5 +81,5 @@ void StateBaseAddressHelper::programStateBaseAddress( appendStateBaseAddressParameters(stateBaseAddress, ssh, setGeneralStateBaseAddress, indirectObjectHeapBaseAddress, gmmHelper, isMultiOsContextCapable, memoryCompressionState, true, useGlobalAtomics, areMultipleSubDevicesInContext); } -template struct StateBaseAddressHelper; +template struct StateBaseAddressHelper; } // namespace NEO diff --git a/shared/source/gen8/tbx_command_stream_receiver_gen8.cpp b/shared/source/gen8/tbx_command_stream_receiver_gen8.cpp index b4053c408d..6a7ceb2d23 100644 --- a/shared/source/gen8/tbx_command_stream_receiver_gen8.cpp +++ b/shared/source/gen8/tbx_command_stream_receiver_gen8.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2021 Intel Corporation + * Copyright (C) 2018-2022 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -13,7 +13,7 @@ namespace NEO { -typedef BDWFamily Family; +typedef Gen8Family Family; static auto gfxCore = IGFX_GEN8_CORE; template <> diff --git a/shared/source/gen8/windows/command_stream_receiver_gen8.cpp b/shared/source/gen8/windows/command_stream_receiver_gen8.cpp index 275bc8f2e9..14d6af0586 100644 --- a/shared/source/gen8/windows/command_stream_receiver_gen8.cpp +++ b/shared/source/gen8/windows/command_stream_receiver_gen8.cpp @@ -12,7 +12,7 @@ namespace NEO { -template class DeviceCommandStreamReceiver; -template class WddmCommandStreamReceiver; -template class CommandStreamReceiverWithAUBDump>; +template class DeviceCommandStreamReceiver; +template class WddmCommandStreamReceiver; +template class CommandStreamReceiverWithAUBDump>; } // namespace NEO diff --git a/shared/source/gen8/windows/direct_submission_gen8.cpp b/shared/source/gen8/windows/direct_submission_gen8.cpp index eba3d15bf5..3d4f8dd5bb 100644 --- a/shared/source/gen8/windows/direct_submission_gen8.cpp +++ b/shared/source/gen8/windows/direct_submission_gen8.cpp @@ -17,7 +17,7 @@ #include "shared/source/gen8/hw_cmds_base.h" namespace NEO { -using GfxFamily = BDWFamily; +using GfxFamily = Gen8Family; template class Dispatcher; template class BlitterDispatcher; diff --git a/shared/source/gen8/windows/gmm_callbacks_gen8.cpp b/shared/source/gen8/windows/gmm_callbacks_gen8.cpp index c8759ca0bd..d886f07555 100644 --- a/shared/source/gen8/windows/gmm_callbacks_gen8.cpp +++ b/shared/source/gen8/windows/gmm_callbacks_gen8.cpp @@ -10,6 +10,6 @@ #include "shared/source/helpers/windows/gmm_callbacks.inl" namespace NEO { -template struct DeviceCallbacks; -template struct TTCallbacks; +template struct DeviceCallbacks; +template struct TTCallbacks; } // namespace NEO diff --git a/shared/source/gen9/aub_command_stream_receiver_gen9.cpp b/shared/source/gen9/aub_command_stream_receiver_gen9.cpp index 8aea317f30..9bfb0cfcbd 100644 --- a/shared/source/gen9/aub_command_stream_receiver_gen9.cpp +++ b/shared/source/gen9/aub_command_stream_receiver_gen9.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2021 Intel Corporation + * Copyright (C) 2018-2022 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -12,7 +12,7 @@ namespace NEO { -typedef SKLFamily Family; +typedef Gen9Family Family; static auto gfxCore = IGFX_GEN9_CORE; template <> diff --git a/shared/source/gen9/aub_mapper.h b/shared/source/gen9/aub_mapper.h index d5b7ef104b..f7f44a8885 100644 --- a/shared/source/gen9/aub_mapper.h +++ b/shared/source/gen9/aub_mapper.h @@ -13,10 +13,10 @@ #include "engine_node.h" namespace NEO { -struct SKLFamily; +struct Gen9Family; template <> -struct AUBFamilyMapper { +struct AUBFamilyMapper { enum { device = AubMemDump::DeviceValues::Skl }; using AubTraits = AubMemDump::Traits; diff --git a/shared/source/gen9/aub_mem_dump_gen9.cpp b/shared/source/gen9/aub_mem_dump_gen9.cpp index 5e9081739d..4b7a9c01b0 100644 --- a/shared/source/gen9/aub_mem_dump_gen9.cpp +++ b/shared/source/gen9/aub_mem_dump_gen9.cpp @@ -27,7 +27,7 @@ template struct AubPageTableHelper64>; } // namespace AubMemDump namespace NEO { -using Family = SKLFamily; +using Family = Gen9Family; static const AubMemDump::LrcaHelperRcs rcs(0x002000); static const AubMemDump::LrcaHelperBcs bcs(0x022000); diff --git a/shared/source/gen9/command_encoder_gen9.cpp b/shared/source/gen9/command_encoder_gen9.cpp index 8e45d58b74..c5374bd333 100644 --- a/shared/source/gen9/command_encoder_gen9.cpp +++ b/shared/source/gen9/command_encoder_gen9.cpp @@ -9,7 +9,7 @@ #include "shared/source/gen9/hw_cmds_base.h" #include "shared/source/gen9/reg_configs.h" -using Family = NEO::SKLFamily; +using Family = NEO::Gen9Family; #include "shared/source/command_container/command_encoder.inl" #include "shared/source/command_container/command_encoder_bdw_and_later.inl" @@ -47,10 +47,10 @@ void EncodeComputeMode::programComputeModeCommand(LinearStream &csr, Sta args.csStallOnly = true; MemorySynchronizationCommands::addSingleBarrier(csr, args); - LriHelper::program(&csr, - DebugControlReg2::address, - DebugControlReg2::getRegData(properties.threadArbitrationPolicy.value), - false); + LriHelper::program(&csr, + DebugControlReg2::address, + DebugControlReg2::getRegData(properties.threadArbitrationPolicy.value), + false); } } diff --git a/shared/source/gen9/command_stream_receiver_hw_gen9.cpp b/shared/source/gen9/command_stream_receiver_hw_gen9.cpp index 373426af65..34d95056dd 100644 --- a/shared/source/gen9/command_stream_receiver_hw_gen9.cpp +++ b/shared/source/gen9/command_stream_receiver_hw_gen9.cpp @@ -12,7 +12,7 @@ #include "shared/source/helpers/populate_factory.h" namespace NEO { -typedef SKLFamily Family; +typedef Gen9Family Family; static auto gfxCore = IGFX_GEN9_CORE; template <> diff --git a/shared/source/gen9/command_stream_receiver_simulated_common_hw_gen9.cpp b/shared/source/gen9/command_stream_receiver_simulated_common_hw_gen9.cpp index de4d118afc..04c452235a 100644 --- a/shared/source/gen9/command_stream_receiver_simulated_common_hw_gen9.cpp +++ b/shared/source/gen9/command_stream_receiver_simulated_common_hw_gen9.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2021 Intel Corporation + * Copyright (C) 2018-2022 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -8,7 +8,7 @@ #include "shared/source/command_stream/command_stream_receiver_simulated_common_hw_bdw_and_later.inl" namespace NEO { -typedef SKLFamily Family; +typedef Gen9Family Family; template class CommandStreamReceiverSimulatedCommonHw; } // namespace NEO diff --git a/shared/source/gen9/create_device_command_stream_receiver_gen9.cpp b/shared/source/gen9/create_device_command_stream_receiver_gen9.cpp index a91d83be15..7f62c30797 100644 --- a/shared/source/gen9/create_device_command_stream_receiver_gen9.cpp +++ b/shared/source/gen9/create_device_command_stream_receiver_gen9.cpp @@ -13,11 +13,11 @@ namespace NEO { template <> -CommandStreamReceiver *createDeviceCommandStreamReceiver(bool withAubDump, - ExecutionEnvironment &executionEnvironment, - uint32_t rootDeviceIndex, - const DeviceBitfield deviceBitfield) { - return createCommandStreamReceiver(withAubDump, executionEnvironment, rootDeviceIndex, deviceBitfield); +CommandStreamReceiver *createDeviceCommandStreamReceiver(bool withAubDump, + ExecutionEnvironment &executionEnvironment, + uint32_t rootDeviceIndex, + const DeviceBitfield deviceBitfield) { + return createCommandStreamReceiver(withAubDump, executionEnvironment, rootDeviceIndex, deviceBitfield); } } // namespace NEO diff --git a/shared/source/gen9/debugger_gen9.cpp b/shared/source/gen9/debugger_gen9.cpp index e3cb797cea..1ece4f60f3 100644 --- a/shared/source/gen9/debugger_gen9.cpp +++ b/shared/source/gen9/debugger_gen9.cpp @@ -11,8 +11,8 @@ #include "shared/source/helpers/populate_factory.h" namespace NEO { -struct SKLFamily; -using GfxFamily = SKLFamily; +struct Gen9Family; +using GfxFamily = Gen9Family; static auto coreFamily = IGFX_GEN9_CORE; diff --git a/shared/source/gen9/enable_family_full_core_gen9.cpp b/shared/source/gen9/enable_family_full_core_gen9.cpp index bb879f459c..6edcfc39ee 100644 --- a/shared/source/gen9/enable_family_full_core_gen9.cpp +++ b/shared/source/gen9/enable_family_full_core_gen9.cpp @@ -19,7 +19,7 @@ namespace NEO { extern HwHelper *hwHelperFactory[IGFX_MAX_CORE]; -using Family = SKLFamily; +using Family = Gen9Family; static const auto gfxFamily = IGFX_GEN9_CORE; struct EnableCoreGen9 { diff --git a/shared/source/gen9/experimental_command_buffer_gen9.cpp b/shared/source/gen9/experimental_command_buffer_gen9.cpp index 2e1864c920..e947880dc8 100644 --- a/shared/source/gen9/experimental_command_buffer_gen9.cpp +++ b/shared/source/gen9/experimental_command_buffer_gen9.cpp @@ -11,7 +11,7 @@ #include "shared/source/helpers/hw_helper.h" namespace NEO { -typedef SKLFamily GfxFamily; +typedef Gen9Family GfxFamily; template void ExperimentalCommandBuffer::injectBufferStart(LinearStream &parentStream, size_t cmdBufferOffset); template size_t ExperimentalCommandBuffer::getRequiredInjectionSize() noexcept; diff --git a/shared/source/gen9/hw_cmds_base.h b/shared/source/gen9/hw_cmds_base.h index a757610ed7..27f6adb674 100644 --- a/shared/source/gen9/hw_cmds_base.h +++ b/shared/source/gen9/hw_cmds_base.h @@ -19,7 +19,7 @@ struct CmdParse; namespace NEO { class LogicalStateHelper; -struct GEN9 { +struct Gen9 { #include "shared/source/generated/gen9/hw_cmds_generated_gen9.inl" static constexpr bool supportsSampler = true; @@ -52,9 +52,9 @@ struct GEN9 { static_assert(sizeof(DataPortBindlessSurfaceExtendedMessageDescriptor) == sizeof(DataPortBindlessSurfaceExtendedMessageDescriptor::packed), ""); }; -struct SKLFamily : public GEN9 { - using PARSE = CmdParse; - using GfxFamily = SKLFamily; +struct Gen9Family : public Gen9 { + using PARSE = CmdParse; + using GfxFamily = Gen9Family; using WALKER_TYPE = GPGPU_WALKER; using VFE_STATE_TYPE = MEDIA_VFE_STATE; using XY_BLOCK_COPY_BLT = typename GfxFamily::XY_SRC_COPY_BLT; diff --git a/shared/source/gen9/hw_cmds_bxt.h b/shared/source/gen9/hw_cmds_bxt.h index 23b65bc690..26c6fb780c 100644 --- a/shared/source/gen9/hw_cmds_bxt.h +++ b/shared/source/gen9/hw_cmds_bxt.h @@ -10,7 +10,7 @@ namespace NEO { -struct BXT : public SKLFamily { +struct BXT : public Gen9Family { static const PLATFORM platform; static const HardwareInfo hwInfo; static const uint64_t defaultHardwareInfoConfig; diff --git a/shared/source/gen9/hw_cmds_cfl.h b/shared/source/gen9/hw_cmds_cfl.h index f83fdfc8ec..febf9c1910 100644 --- a/shared/source/gen9/hw_cmds_cfl.h +++ b/shared/source/gen9/hw_cmds_cfl.h @@ -10,7 +10,7 @@ namespace NEO { -struct CFL : public SKLFamily { +struct CFL : public Gen9Family { static const PLATFORM platform; static const HardwareInfo hwInfo; static const uint64_t defaultHardwareInfoConfig; diff --git a/shared/source/gen9/hw_cmds_glk.h b/shared/source/gen9/hw_cmds_glk.h index a65e9f182e..0f383cf0b8 100644 --- a/shared/source/gen9/hw_cmds_glk.h +++ b/shared/source/gen9/hw_cmds_glk.h @@ -10,7 +10,7 @@ namespace NEO { -struct GLK : public SKLFamily { +struct GLK : public Gen9Family { static const PLATFORM platform; static const HardwareInfo hwInfo; static const uint64_t defaultHardwareInfoConfig; diff --git a/shared/source/gen9/hw_cmds_kbl.h b/shared/source/gen9/hw_cmds_kbl.h index 5e5da33f99..ba35be68ec 100644 --- a/shared/source/gen9/hw_cmds_kbl.h +++ b/shared/source/gen9/hw_cmds_kbl.h @@ -10,7 +10,7 @@ namespace NEO { -struct KBL : public SKLFamily { +struct KBL : public Gen9Family { static const PLATFORM platform; static const HardwareInfo hwInfo; static const uint64_t defaultHardwareInfoConfig; diff --git a/shared/source/gen9/hw_cmds_skl.h b/shared/source/gen9/hw_cmds_skl.h index 70f45eee07..8dfb6d6544 100644 --- a/shared/source/gen9/hw_cmds_skl.h +++ b/shared/source/gen9/hw_cmds_skl.h @@ -10,7 +10,7 @@ namespace NEO { -struct SKL : public SKLFamily { +struct SKL : public Gen9Family { static const PLATFORM platform; static const HardwareInfo hwInfo; static const uint64_t defaultHardwareInfoConfig; diff --git a/shared/source/gen9/hw_helper_gen9.cpp b/shared/source/gen9/hw_helper_gen9.cpp index 094388c63f..bf22c13e70 100644 --- a/shared/source/gen9/hw_helper_gen9.cpp +++ b/shared/source/gen9/hw_helper_gen9.cpp @@ -16,7 +16,7 @@ #include namespace NEO { -typedef SKLFamily Family; +typedef Gen9Family Family; template <> SipKernelType HwHelperHw::getSipKernelType(bool debuggingActive) const { diff --git a/shared/source/gen9/hw_info_gen9.h b/shared/source/gen9/hw_info_gen9.h index 2ee9c7fe15..75ae70fb66 100644 --- a/shared/source/gen9/hw_info_gen9.h +++ b/shared/source/gen9/hw_info_gen9.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2019-2021 Intel Corporation + * Copyright (C) 2019-2022 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -10,11 +10,11 @@ namespace NEO { -struct SKLFamily; +struct Gen9Family; template <> struct GfxFamilyMapper { - typedef SKLFamily GfxFamily; + typedef Gen9Family GfxFamily; static const char *name; }; } // namespace NEO diff --git a/shared/source/gen9/image_core_gen9.cpp b/shared/source/gen9/image_core_gen9.cpp index 204ec5c5ca..e96c2155ab 100644 --- a/shared/source/gen9/image_core_gen9.cpp +++ b/shared/source/gen9/image_core_gen9.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2020-2021 Intel Corporation + * Copyright (C) 2020-2022 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -10,7 +10,7 @@ namespace NEO { -typedef SKLFamily Family; +typedef Gen9Family Family; // clang-format off #include "shared/source/image/image_bdw_and_later.inl" diff --git a/shared/source/gen9/linux/command_stream_receiver_gen9.cpp b/shared/source/gen9/linux/command_stream_receiver_gen9.cpp index 4754e691af..54d8c50b3d 100644 --- a/shared/source/gen9/linux/command_stream_receiver_gen9.cpp +++ b/shared/source/gen9/linux/command_stream_receiver_gen9.cpp @@ -13,7 +13,7 @@ namespace NEO { -template class DeviceCommandStreamReceiver; -template class DrmCommandStreamReceiver; -template class CommandStreamReceiverWithAUBDump>; +template class DeviceCommandStreamReceiver; +template class DrmCommandStreamReceiver; +template class CommandStreamReceiverWithAUBDump>; } // namespace NEO diff --git a/shared/source/gen9/linux/direct_submission_gen9.cpp b/shared/source/gen9/linux/direct_submission_gen9.cpp index 92b39c403f..b10a58d992 100644 --- a/shared/source/gen9/linux/direct_submission_gen9.cpp +++ b/shared/source/gen9/linux/direct_submission_gen9.cpp @@ -16,7 +16,7 @@ #include "shared/source/gen9/hw_cmds.h" namespace NEO { -using GfxFamily = SKLFamily; +using GfxFamily = Gen9Family; template class Dispatcher; template class BlitterDispatcher; diff --git a/shared/source/gen9/preamble_gen9.cpp b/shared/source/gen9/preamble_gen9.cpp index 0470551307..23b8c7b633 100644 --- a/shared/source/gen9/preamble_gen9.cpp +++ b/shared/source/gen9/preamble_gen9.cpp @@ -12,7 +12,7 @@ namespace NEO { -using Family = SKLFamily; +using Family = Gen9Family; template <> uint32_t PreambleHelper::getL3Config(const HardwareInfo &hwInfo, bool useSLM) { diff --git a/shared/source/gen9/preemption_gen9.cpp b/shared/source/gen9/preemption_gen9.cpp index 7efe6b73b3..fe3703186e 100644 --- a/shared/source/gen9/preemption_gen9.cpp +++ b/shared/source/gen9/preemption_gen9.cpp @@ -16,7 +16,7 @@ namespace NEO { -using GfxFamily = SKLFamily; +using GfxFamily = Gen9Family; template <> size_t PreemptionHelper::getPreemptionWaCsSize(const Device &device) { diff --git a/shared/source/gen9/reg_configs.h b/shared/source/gen9/reg_configs.h index 9aba269adb..83bf8c7b15 100644 --- a/shared/source/gen9/reg_configs.h +++ b/shared/source/gen9/reg_configs.h @@ -10,7 +10,7 @@ #include "shared/source/helpers/preamble.h" namespace NEO { -struct SKLFamily; +struct Gen9Family; template <> struct L3CNTLREGConfig { static const uint32_t valueForSLM = 0x60000321u; @@ -18,7 +18,7 @@ struct L3CNTLREGConfig { }; template <> -struct L3CNTLRegisterOffset { +struct L3CNTLRegisterOffset { static const uint32_t registerOffset = 0x7034; }; diff --git a/shared/source/gen9/state_base_address_gen9.cpp b/shared/source/gen9/state_base_address_gen9.cpp index 388cdf4125..bfe2fcfe63 100644 --- a/shared/source/gen9/state_base_address_gen9.cpp +++ b/shared/source/gen9/state_base_address_gen9.cpp @@ -11,5 +11,5 @@ #include "shared/source/helpers/state_base_address_skl.inl" namespace NEO { -template struct StateBaseAddressHelper; +template struct StateBaseAddressHelper; } diff --git a/shared/source/gen9/tbx_command_stream_receiver_gen9.cpp b/shared/source/gen9/tbx_command_stream_receiver_gen9.cpp index 7cc0610c1e..072d24e38e 100644 --- a/shared/source/gen9/tbx_command_stream_receiver_gen9.cpp +++ b/shared/source/gen9/tbx_command_stream_receiver_gen9.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2021 Intel Corporation + * Copyright (C) 2018-2022 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -14,7 +14,7 @@ namespace NEO { -typedef SKLFamily Family; +typedef Gen9Family Family; static auto gfxCore = IGFX_GEN9_CORE; template <> diff --git a/shared/source/gen9/windows/command_stream_receiver_gen9.cpp b/shared/source/gen9/windows/command_stream_receiver_gen9.cpp index a63c9926c7..0918062775 100644 --- a/shared/source/gen9/windows/command_stream_receiver_gen9.cpp +++ b/shared/source/gen9/windows/command_stream_receiver_gen9.cpp @@ -12,7 +12,7 @@ namespace NEO { -template class DeviceCommandStreamReceiver; -template class WddmCommandStreamReceiver; -template class CommandStreamReceiverWithAUBDump>; +template class DeviceCommandStreamReceiver; +template class WddmCommandStreamReceiver; +template class CommandStreamReceiverWithAUBDump>; } // namespace NEO diff --git a/shared/source/gen9/windows/direct_submission_gen9.cpp b/shared/source/gen9/windows/direct_submission_gen9.cpp index 78e433f70a..38a13ea10e 100644 --- a/shared/source/gen9/windows/direct_submission_gen9.cpp +++ b/shared/source/gen9/windows/direct_submission_gen9.cpp @@ -16,7 +16,7 @@ #include "shared/source/gen9/hw_cmds_base.h" namespace NEO { -using GfxFamily = SKLFamily; +using GfxFamily = Gen9Family; template class Dispatcher; template class BlitterDispatcher; diff --git a/shared/source/gen9/windows/gmm_callbacks_gen9.cpp b/shared/source/gen9/windows/gmm_callbacks_gen9.cpp index 700ae2dca8..3a8abde017 100644 --- a/shared/source/gen9/windows/gmm_callbacks_gen9.cpp +++ b/shared/source/gen9/windows/gmm_callbacks_gen9.cpp @@ -10,6 +10,6 @@ #include "shared/source/helpers/windows/gmm_callbacks.inl" namespace NEO { -template struct DeviceCallbacks; -template struct TTCallbacks; +template struct DeviceCallbacks; +template struct TTCallbacks; } // namespace NEO diff --git a/shared/source/xe_hpc_core/aub_command_stream_receiver_xe_hpc_core.cpp b/shared/source/xe_hpc_core/aub_command_stream_receiver_xe_hpc_core.cpp index 8e0c1bbd0f..eabbfd2b99 100644 --- a/shared/source/xe_hpc_core/aub_command_stream_receiver_xe_hpc_core.cpp +++ b/shared/source/xe_hpc_core/aub_command_stream_receiver_xe_hpc_core.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2021 Intel Corporation + * Copyright (C) 2021-2022 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -11,7 +11,7 @@ namespace NEO { -using Family = XE_HPC_COREFamily; +using Family = XeHpcCoreFamily; static auto gfxCore = IGFX_XE_HPC_CORE; template <> diff --git a/shared/source/xe_hpc_core/aub_mapper.h b/shared/source/xe_hpc_core/aub_mapper.h index 6e0394946e..682b220ec0 100644 --- a/shared/source/xe_hpc_core/aub_mapper.h +++ b/shared/source/xe_hpc_core/aub_mapper.h @@ -13,10 +13,10 @@ #include "engine_node.h" namespace NEO { -struct XE_HPC_COREFamily; +struct XeHpcCoreFamily; template <> -struct AUBFamilyMapper { +struct AUBFamilyMapper { enum { device = AubMemDump::DeviceValues::Pvc }; using AubTraits = AubMemDump::Traits; diff --git a/shared/source/xe_hpc_core/aub_mem_dump_xe_hpc_core.cpp b/shared/source/xe_hpc_core/aub_mem_dump_xe_hpc_core.cpp index d839f3c425..dad658f595 100644 --- a/shared/source/xe_hpc_core/aub_mem_dump_xe_hpc_core.cpp +++ b/shared/source/xe_hpc_core/aub_mem_dump_xe_hpc_core.cpp @@ -10,8 +10,8 @@ #include "shared/source/xe_hpc_core/hw_cmds_xe_hpc_core_base.h" namespace NEO { -struct XE_HPC_COREFamily; -using Family = NEO::XE_HPC_COREFamily; +struct XeHpcCoreFamily; +using Family = NEO::XeHpcCoreFamily; constexpr static auto deviceValue = AubMemDump::DeviceValues::Pvc; template class AubHelperHw; 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 f05f7a122e..9d3d4f4316 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 @@ -15,7 +15,7 @@ #include "shared/source/utilities/lookup_array.h" #include "shared/source/xe_hpc_core/hw_cmds_xe_hpc_core_base.h" -using Family = NEO::XE_HPC_COREFamily; +using Family = NEO::XeHpcCoreFamily; #include "shared/source/command_container/command_encoder_tgllp_and_later.inl" #include "shared/source/command_container/command_encoder_xe_hpc_core_and_later.inl" diff --git a/shared/source/xe_hpc_core/command_stream_receiver_hw_xe_hpc_core.cpp b/shared/source/xe_hpc_core/command_stream_receiver_hw_xe_hpc_core.cpp index 7acdeabd75..2c1bbb2326 100644 --- a/shared/source/xe_hpc_core/command_stream_receiver_hw_xe_hpc_core.cpp +++ b/shared/source/xe_hpc_core/command_stream_receiver_hw_xe_hpc_core.cpp @@ -8,7 +8,7 @@ #include "shared/source/xe_hpc_core/hw_cmds_xe_hpc_core_base.h" #include "shared/source/xe_hpc_core/hw_info.h" -using Family = NEO::XE_HPC_COREFamily; +using Family = NEO::XeHpcCoreFamily; #include "shared/source/command_stream/command_stream_receiver_hw_dg2_and_later.inl" #include "shared/source/command_stream/command_stream_receiver_hw_xehp_and_later.inl" diff --git a/shared/source/xe_hpc_core/command_stream_receiver_simulated_common_hw_xe_hpc_core.cpp b/shared/source/xe_hpc_core/command_stream_receiver_simulated_common_hw_xe_hpc_core.cpp index 5e79e5856d..afc96a3b6a 100644 --- a/shared/source/xe_hpc_core/command_stream_receiver_simulated_common_hw_xe_hpc_core.cpp +++ b/shared/source/xe_hpc_core/command_stream_receiver_simulated_common_hw_xe_hpc_core.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2021 Intel Corporation + * Copyright (C) 2021-2022 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -8,7 +8,7 @@ #include "shared/source/command_stream/command_stream_receiver_simulated_common_hw_xehp_and_later.inl" namespace NEO { -using Family = XE_HPC_COREFamily; +using Family = XeHpcCoreFamily; template <> bool CommandStreamReceiverSimulatedCommonHw::expectMemoryCompressed(void *gfxAddress, const void *srcAddress, size_t length) { diff --git a/shared/source/xe_hpc_core/create_device_command_stream_receiver_xe_hpc_core.cpp b/shared/source/xe_hpc_core/create_device_command_stream_receiver_xe_hpc_core.cpp index 8bcc7ebabf..0511f3e3ed 100644 --- a/shared/source/xe_hpc_core/create_device_command_stream_receiver_xe_hpc_core.cpp +++ b/shared/source/xe_hpc_core/create_device_command_stream_receiver_xe_hpc_core.cpp @@ -13,11 +13,11 @@ namespace NEO { template <> -CommandStreamReceiver *createDeviceCommandStreamReceiver(bool withAubDump, - ExecutionEnvironment &executionEnvironment, - uint32_t rootDeviceIndex, - const DeviceBitfield deviceBitfield) { - return createCommandStreamReceiver(withAubDump, executionEnvironment, rootDeviceIndex, deviceBitfield); +CommandStreamReceiver *createDeviceCommandStreamReceiver(bool withAubDump, + ExecutionEnvironment &executionEnvironment, + uint32_t rootDeviceIndex, + const DeviceBitfield deviceBitfield) { + return createCommandStreamReceiver(withAubDump, executionEnvironment, rootDeviceIndex, deviceBitfield); } } // namespace NEO diff --git a/shared/source/xe_hpc_core/debugger_xe_hpc_core.cpp b/shared/source/xe_hpc_core/debugger_xe_hpc_core.cpp index 83263fc4d6..be30fa2308 100644 --- a/shared/source/xe_hpc_core/debugger_xe_hpc_core.cpp +++ b/shared/source/xe_hpc_core/debugger_xe_hpc_core.cpp @@ -12,7 +12,7 @@ namespace NEO { -using Family = NEO::XE_HPC_COREFamily; +using Family = NEO::XeHpcCoreFamily; static auto coreFamily = IGFX_XE_HPC_CORE; diff --git a/shared/source/xe_hpc_core/enable_family_full_core_xe_hpc_core.cpp b/shared/source/xe_hpc_core/enable_family_full_core_xe_hpc_core.cpp index 2d31d4451d..93cc71da6b 100644 --- a/shared/source/xe_hpc_core/enable_family_full_core_xe_hpc_core.cpp +++ b/shared/source/xe_hpc_core/enable_family_full_core_xe_hpc_core.cpp @@ -17,7 +17,7 @@ namespace NEO { extern HwHelper *hwHelperFactory[IGFX_MAX_CORE]; -using Family = XE_HPC_COREFamily; +using Family = XeHpcCoreFamily; static auto gfxFamily = IGFX_XE_HPC_CORE; struct EnableCoreXeHpcCore { diff --git a/shared/source/xe_hpc_core/experimental_command_buffer_xe_hpc_core.cpp b/shared/source/xe_hpc_core/experimental_command_buffer_xe_hpc_core.cpp index dfab37a535..b3a871ac67 100644 --- a/shared/source/xe_hpc_core/experimental_command_buffer_xe_hpc_core.cpp +++ b/shared/source/xe_hpc_core/experimental_command_buffer_xe_hpc_core.cpp @@ -9,7 +9,7 @@ #include "shared/source/xe_hpc_core/hw_cmds_xe_hpc_core_base.h" namespace NEO { -using GfxFamily = XE_HPC_COREFamily; +using GfxFamily = XeHpcCoreFamily; template void ExperimentalCommandBuffer::injectBufferStart(LinearStream &parentStream, size_t cmdBufferOffset); template size_t ExperimentalCommandBuffer::getRequiredInjectionSize() noexcept; diff --git a/shared/source/xe_hpc_core/hw_cmds_pvc.h b/shared/source/xe_hpc_core/hw_cmds_pvc.h index 52a44e54f9..2ef5357efe 100644 --- a/shared/source/xe_hpc_core/hw_cmds_pvc.h +++ b/shared/source/xe_hpc_core/hw_cmds_pvc.h @@ -14,7 +14,7 @@ namespace NEO { -struct PVC : public XE_HPC_COREFamily { +struct PVC : public XeHpcCoreFamily { static const PLATFORM platform; static const HardwareInfo hwInfo; static const uint64_t defaultHardwareInfoConfig; 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 4eda040800..b837f8df4d 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 @@ -21,7 +21,7 @@ struct CmdParse; namespace NEO { class LogicalStateHelper; -struct XE_HPC_CORE { +struct XeHpcCore { #include "shared/source/generated/xe_hpc_core/hw_cmds_generated_xe_hpc_core.inl" static constexpr uint32_t stateComputeModeForceNonCoherentMask = (0b11u << 3); @@ -59,9 +59,9 @@ struct XE_HPC_CORE { static_assert(sizeof(DataPortBindlessSurfaceExtendedMessageDescriptor) == sizeof(DataPortBindlessSurfaceExtendedMessageDescriptor::packed), ""); }; -struct XE_HPC_COREFamily : public XE_HPC_CORE { - using PARSE = CmdParse; - using GfxFamily = XE_HPC_COREFamily; +struct XeHpcCoreFamily : public XeHpcCore { + using PARSE = CmdParse; + using GfxFamily = XeHpcCoreFamily; using WALKER_TYPE = COMPUTE_WALKER; using VFE_STATE_TYPE = CFE_STATE; using XY_BLOCK_COPY_BLT = typename GfxFamily::XY_BLOCK_COPY_BLT; diff --git a/shared/source/xe_hpc_core/hw_helper_xe_hpc_core.cpp b/shared/source/xe_hpc_core/hw_helper_xe_hpc_core.cpp index a98da2826e..0c796a719f 100644 --- a/shared/source/xe_hpc_core/hw_helper_xe_hpc_core.cpp +++ b/shared/source/xe_hpc_core/hw_helper_xe_hpc_core.cpp @@ -8,7 +8,7 @@ #include "shared/source/xe_hpc_core/aub_mapper.h" #include "shared/source/xe_hpc_core/hw_cmds_xe_hpc_core_base.h" -using Family = NEO::XE_HPC_COREFamily; +using Family = NEO::XeHpcCoreFamily; #include "shared/source/command_container/command_encoder.h" #include "shared/source/debug_settings/debug_settings_manager.h" diff --git a/shared/source/xe_hpc_core/hw_info_xe_hpc_core.h b/shared/source/xe_hpc_core/hw_info_xe_hpc_core.h index 4ba0549944..593074583b 100644 --- a/shared/source/xe_hpc_core/hw_info_xe_hpc_core.h +++ b/shared/source/xe_hpc_core/hw_info_xe_hpc_core.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2021 Intel Corporation + * Copyright (C) 2021-2022 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -10,11 +10,11 @@ namespace NEO { -struct XE_HPC_COREFamily; +struct XeHpcCoreFamily; template <> struct GfxFamilyMapper { - using GfxFamily = XE_HPC_COREFamily; + using GfxFamily = XeHpcCoreFamily; static const char *name; }; } // namespace NEO diff --git a/shared/source/xe_hpc_core/image_core_xe_hpc_core.cpp b/shared/source/xe_hpc_core/image_core_xe_hpc_core.cpp index dfc6830592..cef29ca944 100644 --- a/shared/source/xe_hpc_core/image_core_xe_hpc_core.cpp +++ b/shared/source/xe_hpc_core/image_core_xe_hpc_core.cpp @@ -10,7 +10,7 @@ namespace NEO { -using Family = XE_HPC_COREFamily; +using Family = XeHpcCoreFamily; // clang-format off #include "shared/source/image/image_bdw_and_later.inl" diff --git a/shared/source/xe_hpc_core/implicit_scaling_xe_hpc_core.cpp b/shared/source/xe_hpc_core/implicit_scaling_xe_hpc_core.cpp index 247a093f46..46ca5fb0bb 100644 --- a/shared/source/xe_hpc_core/implicit_scaling_xe_hpc_core.cpp +++ b/shared/source/xe_hpc_core/implicit_scaling_xe_hpc_core.cpp @@ -13,7 +13,7 @@ namespace NEO { -using Family = XE_HPC_COREFamily; +using Family = XeHpcCoreFamily; template <> bool ImplicitScalingDispatch::pipeControlStallRequired = false; diff --git a/shared/source/xe_hpc_core/linux/command_stream_receiver_xe_hpc_core.cpp b/shared/source/xe_hpc_core/linux/command_stream_receiver_xe_hpc_core.cpp index 8539765ef5..27e4ebbbdb 100644 --- a/shared/source/xe_hpc_core/linux/command_stream_receiver_xe_hpc_core.cpp +++ b/shared/source/xe_hpc_core/linux/command_stream_receiver_xe_hpc_core.cpp @@ -13,7 +13,7 @@ namespace NEO { -template class DeviceCommandStreamReceiver; -template class DrmCommandStreamReceiver; -template class CommandStreamReceiverWithAUBDump>; +template class DeviceCommandStreamReceiver; +template class DrmCommandStreamReceiver; +template class CommandStreamReceiverWithAUBDump>; } // namespace NEO diff --git a/shared/source/xe_hpc_core/linux/direct_submission_xe_hpc_core.cpp b/shared/source/xe_hpc_core/linux/direct_submission_xe_hpc_core.cpp index b2f70d2a8b..4997008fb9 100644 --- a/shared/source/xe_hpc_core/linux/direct_submission_xe_hpc_core.cpp +++ b/shared/source/xe_hpc_core/linux/direct_submission_xe_hpc_core.cpp @@ -16,7 +16,7 @@ #include "shared/source/xe_hpc_core/hw_cmds_xe_hpc_core_base.h" namespace NEO { -using GfxFamily = XE_HPC_COREFamily; +using GfxFamily = XeHpcCoreFamily; template class Dispatcher; template class BlitterDispatcher; diff --git a/shared/source/xe_hpc_core/os_agnostic_hw_info_config_xe_hpc_core.inl b/shared/source/xe_hpc_core/os_agnostic_hw_info_config_xe_hpc_core.inl index c0bc33ed75..1cb3aeb6ea 100644 --- a/shared/source/xe_hpc_core/os_agnostic_hw_info_config_xe_hpc_core.inl +++ b/shared/source/xe_hpc_core/os_agnostic_hw_info_config_xe_hpc_core.inl @@ -39,7 +39,7 @@ std::pair HwInfoConfigHw::isPipeControlPriorToNonPipelin template <> void HwInfoConfigHw::adjustSamplerState(void *sampler, const HardwareInfo &hwInfo) { - using SAMPLER_STATE = typename XE_HPC_COREFamily::SAMPLER_STATE; + using SAMPLER_STATE = typename XeHpcCoreFamily::SAMPLER_STATE; auto samplerState = reinterpret_cast(sampler); if (DebugManager.flags.ForceSamplerLowFilteringPrecision.get()) { diff --git a/shared/source/xe_hpc_core/preamble_xe_hpc_core.cpp b/shared/source/xe_hpc_core/preamble_xe_hpc_core.cpp index efa12499d6..2409365cb3 100644 --- a/shared/source/xe_hpc_core/preamble_xe_hpc_core.cpp +++ b/shared/source/xe_hpc_core/preamble_xe_hpc_core.cpp @@ -8,8 +8,8 @@ #include "shared/source/xe_hpc_core/hw_cmds_xe_hpc_core_base.h" namespace NEO { -struct XE_HPC_COREFamily; -using Family = XE_HPC_COREFamily; +struct XeHpcCoreFamily; +using Family = XeHpcCoreFamily; } // namespace NEO #include "shared/source/command_stream/stream_properties.h" diff --git a/shared/source/xe_hpc_core/preemption_xe_hpc_core.cpp b/shared/source/xe_hpc_core/preemption_xe_hpc_core.cpp index deb627a6e2..c76b5bff4d 100644 --- a/shared/source/xe_hpc_core/preemption_xe_hpc_core.cpp +++ b/shared/source/xe_hpc_core/preemption_xe_hpc_core.cpp @@ -11,7 +11,7 @@ namespace NEO { -using GfxFamily = XE_HPC_COREFamily; +using GfxFamily = XeHpcCoreFamily; #include "shared/source/command_stream/preemption_xehp_and_later.inl" diff --git a/shared/source/xe_hpc_core/state_base_address_xe_hpc_core.cpp b/shared/source/xe_hpc_core/state_base_address_xe_hpc_core.cpp index 40872106e3..d7fbbf91f1 100644 --- a/shared/source/xe_hpc_core/state_base_address_xe_hpc_core.cpp +++ b/shared/source/xe_hpc_core/state_base_address_xe_hpc_core.cpp @@ -10,5 +10,5 @@ namespace NEO { #include "shared/source/helpers/state_base_address_xe_hpg_core_and_later.inl" -template struct StateBaseAddressHelper; +template struct StateBaseAddressHelper; } // namespace NEO diff --git a/shared/source/xe_hpc_core/tbx_command_stream_receiver_xe_hpc_core.cpp b/shared/source/xe_hpc_core/tbx_command_stream_receiver_xe_hpc_core.cpp index 55923808f4..70c17f2554 100644 --- a/shared/source/xe_hpc_core/tbx_command_stream_receiver_xe_hpc_core.cpp +++ b/shared/source/xe_hpc_core/tbx_command_stream_receiver_xe_hpc_core.cpp @@ -15,7 +15,7 @@ #include "shared/source/xe_hpc_core/hw_cmds_xe_hpc_core_base.h" namespace NEO { -using Family = XE_HPC_COREFamily; +using Family = XeHpcCoreFamily; static auto gfxCore = IGFX_XE_HPC_CORE; template <> diff --git a/shared/source/xe_hpc_core/windows/command_stream_receiver_xe_hpc_core.cpp b/shared/source/xe_hpc_core/windows/command_stream_receiver_xe_hpc_core.cpp index 2316b04808..8e90f1de6c 100644 --- a/shared/source/xe_hpc_core/windows/command_stream_receiver_xe_hpc_core.cpp +++ b/shared/source/xe_hpc_core/windows/command_stream_receiver_xe_hpc_core.cpp @@ -12,7 +12,7 @@ namespace NEO { -template class DeviceCommandStreamReceiver; -template class WddmCommandStreamReceiver; -template class CommandStreamReceiverWithAUBDump>; +template class DeviceCommandStreamReceiver; +template class WddmCommandStreamReceiver; +template class CommandStreamReceiverWithAUBDump>; } // namespace NEO diff --git a/shared/source/xe_hpc_core/windows/direct_submission_xe_hpc_core.cpp b/shared/source/xe_hpc_core/windows/direct_submission_xe_hpc_core.cpp index 41b3aaf69b..4fc740922c 100644 --- a/shared/source/xe_hpc_core/windows/direct_submission_xe_hpc_core.cpp +++ b/shared/source/xe_hpc_core/windows/direct_submission_xe_hpc_core.cpp @@ -16,7 +16,7 @@ #include "shared/source/xe_hpc_core/hw_cmds_xe_hpc_core_base.h" namespace NEO { -using GfxFamily = XE_HPC_COREFamily; +using GfxFamily = XeHpcCoreFamily; template class Dispatcher; template class BlitterDispatcher; diff --git a/shared/source/xe_hpc_core/windows/gmm_callbacks_xe_hpc_core.cpp b/shared/source/xe_hpc_core/windows/gmm_callbacks_xe_hpc_core.cpp index 8b114245e9..da94ae965a 100644 --- a/shared/source/xe_hpc_core/windows/gmm_callbacks_xe_hpc_core.cpp +++ b/shared/source/xe_hpc_core/windows/gmm_callbacks_xe_hpc_core.cpp @@ -10,7 +10,7 @@ namespace NEO { -template struct DeviceCallbacks; -template struct TTCallbacks; +template struct DeviceCallbacks; +template struct TTCallbacks; } // namespace NEO diff --git a/shared/source/xe_hpg_core/aub_command_stream_receiver_xe_hpg_core.cpp b/shared/source/xe_hpg_core/aub_command_stream_receiver_xe_hpg_core.cpp index 51d80e2025..9a238b5355 100644 --- a/shared/source/xe_hpg_core/aub_command_stream_receiver_xe_hpg_core.cpp +++ b/shared/source/xe_hpg_core/aub_command_stream_receiver_xe_hpg_core.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2021 Intel Corporation + * Copyright (C) 2021-2022 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -11,7 +11,7 @@ namespace NEO { -typedef XE_HPG_COREFamily Family; +typedef XeHpgCoreFamily Family; static auto gfxCore = IGFX_XE_HPG_CORE; template <> diff --git a/shared/source/xe_hpg_core/aub_mapper.h b/shared/source/xe_hpg_core/aub_mapper.h index 51c3b80089..100fc195a4 100644 --- a/shared/source/xe_hpg_core/aub_mapper.h +++ b/shared/source/xe_hpg_core/aub_mapper.h @@ -13,10 +13,10 @@ #include "engine_node.h" namespace NEO { -struct XE_HPG_COREFamily; +struct XeHpgCoreFamily; template <> -struct AUBFamilyMapper { +struct AUBFamilyMapper { enum { device = AubMemDump::DeviceValues::Dg2 }; using AubTraits = AubMemDump::Traits; diff --git a/shared/source/xe_hpg_core/aub_mem_dump_xe_hpg_core.cpp b/shared/source/xe_hpg_core/aub_mem_dump_xe_hpg_core.cpp index 600b0f0f20..16f7a446ed 100644 --- a/shared/source/xe_hpg_core/aub_mem_dump_xe_hpg_core.cpp +++ b/shared/source/xe_hpg_core/aub_mem_dump_xe_hpg_core.cpp @@ -10,8 +10,8 @@ #include "shared/source/xe_hpg_core/hw_cmds_xe_hpg_core_base.h" namespace NEO { -struct XE_HPG_COREFamily; -using Family = NEO::XE_HPG_COREFamily; +struct XeHpgCoreFamily; +using Family = NEO::XeHpgCoreFamily; constexpr static auto deviceValue = AubMemDump::DeviceValues::Dg2; template class AubHelperHw; 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 5e88f650e7..86aab16fa2 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 @@ -14,7 +14,7 @@ #include "shared/source/utilities/lookup_array.h" #include "shared/source/xe_hpg_core/hw_cmds_xe_hpg_core_base.h" -using Family = NEO::XE_HPG_COREFamily; +using Family = NEO::XeHpgCoreFamily; #include "shared/source/command_container/command_encoder_tgllp_and_later.inl" #include "shared/source/command_container/command_encoder_xe_hpg_core_and_later.inl" diff --git a/shared/source/xe_hpg_core/command_stream_receiver_hw_xe_hpg_core.cpp b/shared/source/xe_hpg_core/command_stream_receiver_hw_xe_hpg_core.cpp index 58e93595cb..14a1475f40 100644 --- a/shared/source/xe_hpg_core/command_stream_receiver_hw_xe_hpg_core.cpp +++ b/shared/source/xe_hpg_core/command_stream_receiver_hw_xe_hpg_core.cpp @@ -8,7 +8,7 @@ #include "shared/source/xe_hpg_core/hw_cmds_xe_hpg_core_base.h" #include "shared/source/xe_hpg_core/hw_info.h" -using Family = NEO::XE_HPG_COREFamily; +using Family = NEO::XeHpgCoreFamily; #include "shared/source/command_stream/command_stream_receiver_hw_dg2_and_later.inl" #include "shared/source/command_stream/command_stream_receiver_hw_xehp_and_later.inl" diff --git a/shared/source/xe_hpg_core/command_stream_receiver_simulated_common_hw_xe_hpg_core.cpp b/shared/source/xe_hpg_core/command_stream_receiver_simulated_common_hw_xe_hpg_core.cpp index 934a127a4b..bae4a69be0 100644 --- a/shared/source/xe_hpg_core/command_stream_receiver_simulated_common_hw_xe_hpg_core.cpp +++ b/shared/source/xe_hpg_core/command_stream_receiver_simulated_common_hw_xe_hpg_core.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2021 Intel Corporation + * Copyright (C) 2021-2022 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -8,7 +8,7 @@ #include "shared/source/command_stream/command_stream_receiver_simulated_common_hw_xehp_and_later.inl" namespace NEO { -typedef XE_HPG_COREFamily Family; +typedef XeHpgCoreFamily Family; template class CommandStreamReceiverSimulatedCommonHw; } // namespace NEO diff --git a/shared/source/xe_hpg_core/create_device_command_stream_receiver_xe_hpg_core.cpp b/shared/source/xe_hpg_core/create_device_command_stream_receiver_xe_hpg_core.cpp index 9cc4352aa9..b243a21c2e 100644 --- a/shared/source/xe_hpg_core/create_device_command_stream_receiver_xe_hpg_core.cpp +++ b/shared/source/xe_hpg_core/create_device_command_stream_receiver_xe_hpg_core.cpp @@ -13,11 +13,11 @@ namespace NEO { template <> -CommandStreamReceiver *createDeviceCommandStreamReceiver(bool withAubDump, - ExecutionEnvironment &executionEnvironment, - uint32_t rootDeviceIndex, - const DeviceBitfield deviceBitfield) { - return createCommandStreamReceiver(withAubDump, executionEnvironment, rootDeviceIndex, deviceBitfield); +CommandStreamReceiver *createDeviceCommandStreamReceiver(bool withAubDump, + ExecutionEnvironment &executionEnvironment, + uint32_t rootDeviceIndex, + const DeviceBitfield deviceBitfield) { + return createCommandStreamReceiver(withAubDump, executionEnvironment, rootDeviceIndex, deviceBitfield); } } // namespace NEO diff --git a/shared/source/xe_hpg_core/debugger_xe_hpg_core.cpp b/shared/source/xe_hpg_core/debugger_xe_hpg_core.cpp index ec92223497..b1706ed810 100644 --- a/shared/source/xe_hpg_core/debugger_xe_hpg_core.cpp +++ b/shared/source/xe_hpg_core/debugger_xe_hpg_core.cpp @@ -12,7 +12,7 @@ namespace NEO { -using GfxFamily = NEO::XE_HPG_COREFamily; +using GfxFamily = NEO::XeHpgCoreFamily; static auto coreFamily = IGFX_XE_HPG_CORE; diff --git a/shared/source/xe_hpg_core/dg2/os_agnostic_hw_info_config_dg2.inl b/shared/source/xe_hpg_core/dg2/os_agnostic_hw_info_config_dg2.inl index 6f3428a6c7..4e7a876a8b 100644 --- a/shared/source/xe_hpg_core/dg2/os_agnostic_hw_info_config_dg2.inl +++ b/shared/source/xe_hpg_core/dg2/os_agnostic_hw_info_config_dg2.inl @@ -9,7 +9,7 @@ template <> void HwInfoConfigHw::adjustSamplerState(void *sampler, const HardwareInfo &hwInfo) { - using SAMPLER_STATE = typename XE_HPG_COREFamily::SAMPLER_STATE; + using SAMPLER_STATE = typename XeHpgCoreFamily::SAMPLER_STATE; auto samplerState = reinterpret_cast(sampler); if (DebugManager.flags.ForceSamplerLowFilteringPrecision.get()) { samplerState->setLowQualityFilter(SAMPLER_STATE::LOW_QUALITY_FILTER_ENABLE); @@ -84,7 +84,7 @@ bool HwInfoConfigHw::isMaxThreadsForWorkgroupWARequired(const Hardwa template <> void HwInfoConfigHw::setForceNonCoherent(void *const statePtr, const StateComputeModeProperties &properties) { - using STATE_COMPUTE_MODE = typename XE_HPG_COREFamily::STATE_COMPUTE_MODE; + using STATE_COMPUTE_MODE = typename XeHpgCoreFamily::STATE_COMPUTE_MODE; using FORCE_NON_COHERENT = typename STATE_COMPUTE_MODE::FORCE_NON_COHERENT; STATE_COMPUTE_MODE &stateComputeMode = *static_cast(statePtr); @@ -93,7 +93,7 @@ void HwInfoConfigHw::setForceNonCoherent(void *const statePtr, const stateComputeMode.setForceNonCoherent(coherencyValue); auto mask = stateComputeMode.getMaskBits(); - mask |= XE_HPG_COREFamily::stateComputeModeForceNonCoherentMask; + mask |= XeHpgCoreFamily::stateComputeModeForceNonCoherentMask; stateComputeMode.setMaskBits(mask); } diff --git a/shared/source/xe_hpg_core/enable_family_full_core_xe_hpg_core.cpp b/shared/source/xe_hpg_core/enable_family_full_core_xe_hpg_core.cpp index 588ddae3fe..e68bc7f5bb 100644 --- a/shared/source/xe_hpg_core/enable_family_full_core_xe_hpg_core.cpp +++ b/shared/source/xe_hpg_core/enable_family_full_core_xe_hpg_core.cpp @@ -17,7 +17,7 @@ namespace NEO { extern HwHelper *hwHelperFactory[IGFX_MAX_CORE]; -using Family = XE_HPG_COREFamily; +using Family = XeHpgCoreFamily; static auto gfxFamily = IGFX_XE_HPG_CORE; struct EnableCoreXeHpgCore { diff --git a/shared/source/xe_hpg_core/experimental_command_buffer_xe_hpg_core.cpp b/shared/source/xe_hpg_core/experimental_command_buffer_xe_hpg_core.cpp index 98a8a07946..33e04ef8ed 100644 --- a/shared/source/xe_hpg_core/experimental_command_buffer_xe_hpg_core.cpp +++ b/shared/source/xe_hpg_core/experimental_command_buffer_xe_hpg_core.cpp @@ -9,7 +9,7 @@ #include "shared/source/xe_hpg_core/hw_cmds_xe_hpg_core_base.h" namespace NEO { -typedef XE_HPG_COREFamily GfxFamily; +typedef XeHpgCoreFamily GfxFamily; template void ExperimentalCommandBuffer::injectBufferStart(LinearStream &parentStream, size_t cmdBufferOffset); template size_t ExperimentalCommandBuffer::getRequiredInjectionSize() noexcept; diff --git a/shared/source/xe_hpg_core/hw_cmds_dg2.h b/shared/source/xe_hpg_core/hw_cmds_dg2.h index 6b9f68beca..5bc6b88323 100644 --- a/shared/source/xe_hpg_core/hw_cmds_dg2.h +++ b/shared/source/xe_hpg_core/hw_cmds_dg2.h @@ -14,7 +14,7 @@ namespace NEO { -struct DG2 : public XE_HPG_COREFamily { +struct DG2 : public XeHpgCoreFamily { static const PLATFORM platform; static const HardwareInfo hwInfo; static const uint64_t defaultHardwareInfoConfig; 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 8ceb4a9352..f4e1780630 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 @@ -20,7 +20,7 @@ struct CmdParse; namespace NEO { class LogicalStateHelper; -struct XE_HPG_CORE { +struct XeHpgCore { #include "shared/source/generated/xe_hpg_core/hw_cmds_generated_xe_hpg_core.inl" static constexpr uint32_t stateComputeModeZPassAsyncComputeThreadLimitMask = 0b111u; @@ -59,9 +59,9 @@ struct XE_HPG_CORE { static_assert(sizeof(DataPortBindlessSurfaceExtendedMessageDescriptor) == sizeof(DataPortBindlessSurfaceExtendedMessageDescriptor::packed), ""); }; -struct XE_HPG_COREFamily : public XE_HPG_CORE { - using PARSE = CmdParse; - using GfxFamily = XE_HPG_COREFamily; +struct XeHpgCoreFamily : public XeHpgCore { + using PARSE = CmdParse; + using GfxFamily = XeHpgCoreFamily; using WALKER_TYPE = COMPUTE_WALKER; using VFE_STATE_TYPE = CFE_STATE; using XY_BLOCK_COPY_BLT = typename GfxFamily::XY_BLOCK_COPY_BLT; diff --git a/shared/source/xe_hpg_core/hw_helper_xe_hpg_core.cpp b/shared/source/xe_hpg_core/hw_helper_xe_hpg_core.cpp index 63cc2c641e..7c6a6a08ee 100644 --- a/shared/source/xe_hpg_core/hw_helper_xe_hpg_core.cpp +++ b/shared/source/xe_hpg_core/hw_helper_xe_hpg_core.cpp @@ -8,7 +8,7 @@ #include "shared/source/xe_hpg_core/aub_mapper.h" #include "shared/source/xe_hpg_core/hw_cmds_xe_hpg_core_base.h" -using Family = NEO::XE_HPG_COREFamily; +using Family = NEO::XeHpgCoreFamily; #include "shared/source/helpers/constants.h" #include "shared/source/helpers/extra_allocation_data_xehp_and_later.inl" diff --git a/shared/source/xe_hpg_core/hw_info_xe_hpg_core.h b/shared/source/xe_hpg_core/hw_info_xe_hpg_core.h index 7a7084c331..8b5f719c51 100644 --- a/shared/source/xe_hpg_core/hw_info_xe_hpg_core.h +++ b/shared/source/xe_hpg_core/hw_info_xe_hpg_core.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2021 Intel Corporation + * Copyright (C) 2021-2022 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -10,11 +10,11 @@ namespace NEO { -struct XE_HPG_COREFamily; +struct XeHpgCoreFamily; template <> struct GfxFamilyMapper { - typedef XE_HPG_COREFamily GfxFamily; + typedef XeHpgCoreFamily GfxFamily; static const char *name; }; } // namespace NEO diff --git a/shared/source/xe_hpg_core/image_core_xe_hpg_core.cpp b/shared/source/xe_hpg_core/image_core_xe_hpg_core.cpp index 5fb41cd653..dcfe89632c 100644 --- a/shared/source/xe_hpg_core/image_core_xe_hpg_core.cpp +++ b/shared/source/xe_hpg_core/image_core_xe_hpg_core.cpp @@ -10,7 +10,7 @@ namespace NEO { -using Family = XE_HPG_COREFamily; +using Family = XeHpgCoreFamily; template <> void setFilterMode(Family::RENDER_SURFACE_STATE *surfaceState, const HardwareInfo *hwInfo) { diff --git a/shared/source/xe_hpg_core/implicit_scaling_xe_hpg_core.cpp b/shared/source/xe_hpg_core/implicit_scaling_xe_hpg_core.cpp index ccd567e806..7f8862e29e 100644 --- a/shared/source/xe_hpg_core/implicit_scaling_xe_hpg_core.cpp +++ b/shared/source/xe_hpg_core/implicit_scaling_xe_hpg_core.cpp @@ -11,7 +11,7 @@ namespace NEO { -using Family = XE_HPG_COREFamily; +using Family = XeHpgCoreFamily; template <> bool ImplicitScalingDispatch::pipeControlStallRequired = true; diff --git a/shared/source/xe_hpg_core/linux/command_stream_receiver_xe_hpg_core.cpp b/shared/source/xe_hpg_core/linux/command_stream_receiver_xe_hpg_core.cpp index ad5543f335..dff7092400 100644 --- a/shared/source/xe_hpg_core/linux/command_stream_receiver_xe_hpg_core.cpp +++ b/shared/source/xe_hpg_core/linux/command_stream_receiver_xe_hpg_core.cpp @@ -13,7 +13,7 @@ namespace NEO { -template class DeviceCommandStreamReceiver; -template class DrmCommandStreamReceiver; -template class CommandStreamReceiverWithAUBDump>; +template class DeviceCommandStreamReceiver; +template class DrmCommandStreamReceiver; +template class CommandStreamReceiverWithAUBDump>; } // namespace NEO diff --git a/shared/source/xe_hpg_core/linux/direct_submission_xe_hpg_core.cpp b/shared/source/xe_hpg_core/linux/direct_submission_xe_hpg_core.cpp index 511fa9500e..6120f5f04f 100644 --- a/shared/source/xe_hpg_core/linux/direct_submission_xe_hpg_core.cpp +++ b/shared/source/xe_hpg_core/linux/direct_submission_xe_hpg_core.cpp @@ -16,7 +16,7 @@ #include "shared/source/xe_hpg_core/hw_cmds_xe_hpg_core_base.h" namespace NEO { -using GfxFamily = XE_HPG_COREFamily; +using GfxFamily = XeHpgCoreFamily; template class Dispatcher; template class BlitterDispatcher; diff --git a/shared/source/xe_hpg_core/preamble_xe_hpg_core.cpp b/shared/source/xe_hpg_core/preamble_xe_hpg_core.cpp index 19b3506e9d..6b02d96986 100644 --- a/shared/source/xe_hpg_core/preamble_xe_hpg_core.cpp +++ b/shared/source/xe_hpg_core/preamble_xe_hpg_core.cpp @@ -8,8 +8,8 @@ #include "shared/source/xe_hpg_core/hw_cmds_xe_hpg_core_base.h" namespace NEO { -struct XE_HPG_COREFamily; -using Family = XE_HPG_COREFamily; +struct XeHpgCoreFamily; +using Family = XeHpgCoreFamily; } // namespace NEO #include "shared/source/helpers/preamble_xehp_and_later.inl" diff --git a/shared/source/xe_hpg_core/preemption_xe_hpg_core.cpp b/shared/source/xe_hpg_core/preemption_xe_hpg_core.cpp index 78284189d6..e90262ba5d 100644 --- a/shared/source/xe_hpg_core/preemption_xe_hpg_core.cpp +++ b/shared/source/xe_hpg_core/preemption_xe_hpg_core.cpp @@ -11,7 +11,7 @@ namespace NEO { -using GfxFamily = XE_HPG_COREFamily; +using GfxFamily = XeHpgCoreFamily; #include "shared/source/command_stream/preemption_xehp_and_later.inl" diff --git a/shared/source/xe_hpg_core/state_base_address_xe_hpg_core.cpp b/shared/source/xe_hpg_core/state_base_address_xe_hpg_core.cpp index 748e079adc..7e801fafa7 100644 --- a/shared/source/xe_hpg_core/state_base_address_xe_hpg_core.cpp +++ b/shared/source/xe_hpg_core/state_base_address_xe_hpg_core.cpp @@ -10,5 +10,5 @@ namespace NEO { #include "shared/source/helpers/state_base_address_xe_hpg_core_and_later.inl" -template struct StateBaseAddressHelper; +template struct StateBaseAddressHelper; } // namespace NEO diff --git a/shared/source/xe_hpg_core/tbx_command_stream_receiver_xe_hpg_core.cpp b/shared/source/xe_hpg_core/tbx_command_stream_receiver_xe_hpg_core.cpp index 60d6c483e5..5d41c99e9e 100644 --- a/shared/source/xe_hpg_core/tbx_command_stream_receiver_xe_hpg_core.cpp +++ b/shared/source/xe_hpg_core/tbx_command_stream_receiver_xe_hpg_core.cpp @@ -15,7 +15,7 @@ #include "shared/source/xe_hpg_core/hw_cmds_xe_hpg_core_base.h" namespace NEO { -typedef XE_HPG_COREFamily Family; +typedef XeHpgCoreFamily Family; static auto gfxCore = IGFX_XE_HPG_CORE; template <> diff --git a/shared/source/xe_hpg_core/windows/command_stream_receiver_xe_hpg_core.cpp b/shared/source/xe_hpg_core/windows/command_stream_receiver_xe_hpg_core.cpp index 66c8e9a901..133b5f63db 100644 --- a/shared/source/xe_hpg_core/windows/command_stream_receiver_xe_hpg_core.cpp +++ b/shared/source/xe_hpg_core/windows/command_stream_receiver_xe_hpg_core.cpp @@ -12,7 +12,7 @@ namespace NEO { -template class DeviceCommandStreamReceiver; -template class WddmCommandStreamReceiver; -template class CommandStreamReceiverWithAUBDump>; +template class DeviceCommandStreamReceiver; +template class WddmCommandStreamReceiver; +template class CommandStreamReceiverWithAUBDump>; } // namespace NEO diff --git a/shared/source/xe_hpg_core/windows/direct_submission_xe_hpg_core.cpp b/shared/source/xe_hpg_core/windows/direct_submission_xe_hpg_core.cpp index c700eaadc8..dd25a9fdf8 100644 --- a/shared/source/xe_hpg_core/windows/direct_submission_xe_hpg_core.cpp +++ b/shared/source/xe_hpg_core/windows/direct_submission_xe_hpg_core.cpp @@ -16,7 +16,7 @@ #include "shared/source/xe_hpg_core/hw_cmds_xe_hpg_core_base.h" namespace NEO { -using GfxFamily = XE_HPG_COREFamily; +using GfxFamily = XeHpgCoreFamily; template class Dispatcher; template class BlitterDispatcher; diff --git a/shared/source/xe_hpg_core/windows/gmm_callbacks_xe_hpg_core.cpp b/shared/source/xe_hpg_core/windows/gmm_callbacks_xe_hpg_core.cpp index b4b6dc6a06..b257baa835 100644 --- a/shared/source/xe_hpg_core/windows/gmm_callbacks_xe_hpg_core.cpp +++ b/shared/source/xe_hpg_core/windows/gmm_callbacks_xe_hpg_core.cpp @@ -10,7 +10,7 @@ namespace NEO { -template struct DeviceCallbacks; -template struct TTCallbacks; +template struct DeviceCallbacks; +template struct TTCallbacks; } // namespace NEO diff --git a/shared/test/common/gen11/cmd_parse_gen11.cpp b/shared/test/common/gen11/cmd_parse_gen11.cpp index f8b1d49ae0..b696915f0e 100644 --- a/shared/test/common/gen11/cmd_parse_gen11.cpp +++ b/shared/test/common/gen11/cmd_parse_gen11.cpp @@ -6,8 +6,8 @@ */ #include "shared/source/gen11/hw_cmds_base.h" -using GenStruct = NEO::GEN11; -using GenGfxFamily = NEO::ICLFamily; +using GenStruct = NEO::Gen11; +using GenGfxFamily = NEO::Gen11Family; #include "shared/test/common/cmd_parse/cmd_parse_base.inl" #include "shared/test/common/cmd_parse/cmd_parse_base_mi_arb.inl" @@ -83,8 +83,8 @@ const char *CmdParse::getCommandNameHwSpecific(void *cmd) { template struct CmdParse; namespace NEO { -template void HardwareParse::findHardwareCommands(); -template void HardwareParse::findHardwareCommands(IndirectHeap *); -template const void *HardwareParse::getStatelessArgumentPointer(const KernelInfo &kernelInfo, uint32_t indexArg, IndirectHeap &ioh, uint32_t rootDeviceIndex); -template const typename ICLFamily::RENDER_SURFACE_STATE *HardwareParse::getSurfaceState(IndirectHeap *ssh, uint32_t index); +template void HardwareParse::findHardwareCommands(); +template void HardwareParse::findHardwareCommands(IndirectHeap *); +template const void *HardwareParse::getStatelessArgumentPointer(const KernelInfo &kernelInfo, uint32_t indexArg, IndirectHeap &ioh, uint32_t rootDeviceIndex); +template const typename Gen11Family::RENDER_SURFACE_STATE *HardwareParse::getSurfaceState(IndirectHeap *ssh, uint32_t index); } // namespace NEO diff --git a/shared/test/common/gen11/unit_test_helper_gen11.cpp b/shared/test/common/gen11/unit_test_helper_gen11.cpp index 5cc9c483c5..8f74315c45 100644 --- a/shared/test/common/gen11/unit_test_helper_gen11.cpp +++ b/shared/test/common/gen11/unit_test_helper_gen11.cpp @@ -13,7 +13,7 @@ namespace NEO { -using Family = ICLFamily; +using Family = Gen11Family; template <> uint32_t UnitTestHelper::getDebugModeRegisterOffset() { @@ -35,5 +35,5 @@ uint32_t UnitTestHelper::getTdCtlRegisterValue() { return (1u << 7) | (1u << 4); } -template struct UnitTestHelper; +template struct UnitTestHelper; } // namespace NEO diff --git a/shared/test/common/gen12lp/cmd_parse_gen12lp.cpp b/shared/test/common/gen12lp/cmd_parse_gen12lp.cpp index ddb62080c9..84b61cf568 100644 --- a/shared/test/common/gen12lp/cmd_parse_gen12lp.cpp +++ b/shared/test/common/gen12lp/cmd_parse_gen12lp.cpp @@ -6,8 +6,8 @@ */ #include "shared/source/gen12lp/hw_cmds_base.h" -using GenStruct = NEO::GEN12LP; -using GenGfxFamily = NEO::TGLLPFamily; +using GenStruct = NEO::Gen12Lp; +using GenGfxFamily = NEO::Gen12LpFamily; #include "shared/test/common/cmd_parse/cmd_parse_base.inl" #include "shared/test/common/cmd_parse/cmd_parse_compute_mode.inl" @@ -126,8 +126,8 @@ const char *CmdParse::getCommandNameHwSpecific(void *cmd) { template struct CmdParse; namespace NEO { -template void HardwareParse::findHardwareCommands(); -template void HardwareParse::findHardwareCommands(IndirectHeap *); -template const void *HardwareParse::getStatelessArgumentPointer(const KernelInfo &kernelInfo, uint32_t indexArg, IndirectHeap &ioh, uint32_t rootDeviceIndex); -template const typename TGLLPFamily::RENDER_SURFACE_STATE *HardwareParse::getSurfaceState(IndirectHeap *ssh, uint32_t index); +template void HardwareParse::findHardwareCommands(); +template void HardwareParse::findHardwareCommands(IndirectHeap *); +template const void *HardwareParse::getStatelessArgumentPointer(const KernelInfo &kernelInfo, uint32_t indexArg, IndirectHeap &ioh, uint32_t rootDeviceIndex); +template const typename Gen12LpFamily::RENDER_SURFACE_STATE *HardwareParse::getSurfaceState(IndirectHeap *ssh, uint32_t index); } // namespace NEO diff --git a/shared/test/common/gen12lp/unit_test_helper_gen12lp.cpp b/shared/test/common/gen12lp/unit_test_helper_gen12lp.cpp index 470c6a3bad..791f2c166d 100644 --- a/shared/test/common/gen12lp/unit_test_helper_gen12lp.cpp +++ b/shared/test/common/gen12lp/unit_test_helper_gen12lp.cpp @@ -14,7 +14,7 @@ namespace NEO { -using Family = TGLLPFamily; +using Family = Gen12LpFamily; template <> bool UnitTestHelper::isL3ConfigProgrammable() { diff --git a/shared/test/common/gen8/cmd_parse_gen8.cpp b/shared/test/common/gen8/cmd_parse_gen8.cpp index 9dc553e51f..5232d4f549 100644 --- a/shared/test/common/gen8/cmd_parse_gen8.cpp +++ b/shared/test/common/gen8/cmd_parse_gen8.cpp @@ -6,8 +6,8 @@ */ #include "shared/source/gen8/hw_cmds_base.h" -using GenStruct = NEO::GEN8; -using GenGfxFamily = NEO::BDWFamily; +using GenStruct = NEO::Gen8; +using GenGfxFamily = NEO::Gen8Family; #include "shared/test/common/cmd_parse/cmd_parse_base.inl" #include "shared/test/common/cmd_parse/cmd_parse_base_mi_arb.inl" @@ -65,8 +65,8 @@ const char *CmdParse::getCommandNameHwSpecific(void *cmd) { template struct CmdParse; namespace NEO { -template void HardwareParse::findHardwareCommands(); -template void HardwareParse::findHardwareCommands(IndirectHeap *); -template const void *HardwareParse::getStatelessArgumentPointer(const KernelInfo &kernelInfo, uint32_t indexArg, IndirectHeap &ioh, uint32_t rootDeviceIndex); -template const typename BDWFamily::RENDER_SURFACE_STATE *HardwareParse::getSurfaceState(IndirectHeap *ssh, uint32_t index); +template void HardwareParse::findHardwareCommands(); +template void HardwareParse::findHardwareCommands(IndirectHeap *); +template const void *HardwareParse::getStatelessArgumentPointer(const KernelInfo &kernelInfo, uint32_t indexArg, IndirectHeap &ioh, uint32_t rootDeviceIndex); +template const typename Gen8Family::RENDER_SURFACE_STATE *HardwareParse::getSurfaceState(IndirectHeap *ssh, uint32_t index); } // namespace NEO diff --git a/shared/test/common/gen8/unit_test_helper_gen8.cpp b/shared/test/common/gen8/unit_test_helper_gen8.cpp index fbe6c7e738..d7f7bc0372 100644 --- a/shared/test/common/gen8/unit_test_helper_gen8.cpp +++ b/shared/test/common/gen8/unit_test_helper_gen8.cpp @@ -13,7 +13,7 @@ namespace NEO { -using Family = BDWFamily; +using Family = Gen8Family; template <> uint32_t UnitTestHelper::getDebugModeRegisterOffset() { @@ -35,5 +35,5 @@ uint32_t UnitTestHelper::getTdCtlRegisterValue() { return (1u << 7) | (1u << 4); } -template struct UnitTestHelper; +template struct UnitTestHelper; } // namespace NEO diff --git a/shared/test/common/gen9/cmd_parse_gen9.cpp b/shared/test/common/gen9/cmd_parse_gen9.cpp index 290970e8f7..c659642c19 100644 --- a/shared/test/common/gen9/cmd_parse_gen9.cpp +++ b/shared/test/common/gen9/cmd_parse_gen9.cpp @@ -6,8 +6,8 @@ */ #include "shared/source/gen9/hw_cmds_base.h" -using GenStruct = NEO::GEN9; -using GenGfxFamily = NEO::SKLFamily; +using GenStruct = NEO::Gen9; +using GenGfxFamily = NEO::Gen9Family; #include "shared/test/common/cmd_parse/cmd_parse_base.inl" #include "shared/test/common/cmd_parse/cmd_parse_base_mi_arb.inl" @@ -83,8 +83,8 @@ const char *CmdParse::getCommandNameHwSpecific(void *cmd) { template struct CmdParse; namespace NEO { -template void HardwareParse::findHardwareCommands(); -template void HardwareParse::findHardwareCommands(IndirectHeap *); -template const void *HardwareParse::getStatelessArgumentPointer(const KernelInfo &kernelInfo, uint32_t indexArg, IndirectHeap &ioh, uint32_t rootDeviceIndex); -template const typename SKLFamily::RENDER_SURFACE_STATE *HardwareParse::getSurfaceState(IndirectHeap *ssh, uint32_t index); +template void HardwareParse::findHardwareCommands(); +template void HardwareParse::findHardwareCommands(IndirectHeap *); +template const void *HardwareParse::getStatelessArgumentPointer(const KernelInfo &kernelInfo, uint32_t indexArg, IndirectHeap &ioh, uint32_t rootDeviceIndex); +template const typename Gen9Family::RENDER_SURFACE_STATE *HardwareParse::getSurfaceState(IndirectHeap *ssh, uint32_t index); } // namespace NEO diff --git a/shared/test/common/gen9/unit_test_helper_gen9.cpp b/shared/test/common/gen9/unit_test_helper_gen9.cpp index 07e6597a69..3ae6f9cadc 100644 --- a/shared/test/common/gen9/unit_test_helper_gen9.cpp +++ b/shared/test/common/gen9/unit_test_helper_gen9.cpp @@ -12,7 +12,7 @@ #include "shared/test/common/helpers/unit_test_helper_bdw_and_later.inl" namespace NEO { -using Family = SKLFamily; +using Family = Gen9Family; template <> bool UnitTestHelper::isPipeControlWArequired(const HardwareInfo &hwInfo) { diff --git a/shared/test/common/libult/gen11.cpp b/shared/test/common/libult/gen11.cpp index c7cf308408..569646295b 100644 --- a/shared/test/common/libult/gen11.cpp +++ b/shared/test/common/libult/gen11.cpp @@ -12,7 +12,7 @@ namespace NEO { -typedef ICLFamily Family; +typedef Gen11Family Family; constexpr auto gfxCore = IGFX_GEN11_CORE; @@ -33,5 +33,5 @@ static enableGen11 enable; static MockDebuggerL0HwPopulateFactory mockDebuggerGen11; -template class UltCommandStreamReceiver; +template class UltCommandStreamReceiver; } // namespace NEO diff --git a/shared/test/common/libult/gen12lp.cpp b/shared/test/common/libult/gen12lp.cpp index 441f2c0af8..82933ff44c 100644 --- a/shared/test/common/libult/gen12lp.cpp +++ b/shared/test/common/libult/gen12lp.cpp @@ -12,7 +12,7 @@ namespace NEO { -typedef TGLLPFamily Family; +typedef Gen12LpFamily Family; constexpr auto gfxCore = IGFX_GEN12LP_CORE; @@ -32,5 +32,5 @@ struct enableGen12LP { static enableGen12LP enable; static MockDebuggerL0HwPopulateFactory mockDebuggerGen12lp; -template class UltCommandStreamReceiver; +template class UltCommandStreamReceiver; } // namespace NEO diff --git a/shared/test/common/libult/gen8.cpp b/shared/test/common/libult/gen8.cpp index 19ca0e6612..b4c4bc9f2f 100644 --- a/shared/test/common/libult/gen8.cpp +++ b/shared/test/common/libult/gen8.cpp @@ -12,7 +12,7 @@ namespace NEO { -typedef BDWFamily Family; +typedef Gen8Family Family; constexpr auto gfxCore = IGFX_GEN8_CORE; @@ -32,5 +32,5 @@ struct enableGen8 { static enableGen8 enable; static MockDebuggerL0HwPopulateFactory mockDebuggerGen8; -template class UltCommandStreamReceiver; +template class UltCommandStreamReceiver; } // namespace NEO diff --git a/shared/test/common/libult/gen9.cpp b/shared/test/common/libult/gen9.cpp index cef24241e9..789e54c1fc 100644 --- a/shared/test/common/libult/gen9.cpp +++ b/shared/test/common/libult/gen9.cpp @@ -12,7 +12,7 @@ namespace NEO { -typedef SKLFamily Family; +typedef Gen9Family Family; constexpr auto gfxCore = IGFX_GEN9_CORE; @@ -33,5 +33,5 @@ static enableGen9 enable; static MockDebuggerL0HwPopulateFactory mockDebuggerGen9; -template class UltCommandStreamReceiver; +template class UltCommandStreamReceiver; } // namespace NEO diff --git a/shared/test/common/libult/xe_hpc_core.cpp b/shared/test/common/libult/xe_hpc_core.cpp index 18d9f606d6..2834986c25 100644 --- a/shared/test/common/libult/xe_hpc_core.cpp +++ b/shared/test/common/libult/xe_hpc_core.cpp @@ -12,7 +12,7 @@ namespace NEO { -typedef XE_HPC_COREFamily Family; +typedef XeHpcCoreFamily Family; constexpr auto gfxCore = IGFX_XE_HPC_CORE; @@ -32,5 +32,5 @@ struct enableXeHpcCore { static enableXeHpcCore enable; static MockDebuggerL0HwPopulateFactory mockDebuggerXeHpcCore; -template class UltCommandStreamReceiver; +template class UltCommandStreamReceiver; } // namespace NEO diff --git a/shared/test/common/libult/xe_hpg_core.cpp b/shared/test/common/libult/xe_hpg_core.cpp index 719e47470d..7585f442eb 100644 --- a/shared/test/common/libult/xe_hpg_core.cpp +++ b/shared/test/common/libult/xe_hpg_core.cpp @@ -12,7 +12,7 @@ namespace NEO { -typedef XE_HPG_COREFamily Family; +typedef XeHpgCoreFamily Family; constexpr auto gfxCore = IGFX_XE_HPG_CORE; @@ -32,5 +32,5 @@ struct enableXeHpgCore { static enableXeHpgCore enable; static MockDebuggerL0HwPopulateFactory mockDebuggerXeHpgCore; -template class UltCommandStreamReceiver; +template class UltCommandStreamReceiver; } // namespace NEO diff --git a/shared/test/common/test_configuration/aub_tests/gen11/aub_tests_configuration_gen11.cpp b/shared/test/common/test_configuration/aub_tests/gen11/aub_tests_configuration_gen11.cpp index 82692d2435..b4d19477e5 100644 --- a/shared/test/common/test_configuration/aub_tests/gen11/aub_tests_configuration_gen11.cpp +++ b/shared/test/common/test_configuration/aub_tests/gen11/aub_tests_configuration_gen11.cpp @@ -10,4 +10,4 @@ using namespace NEO; -template AubTestsConfig getAubTestsConfig(); +template AubTestsConfig getAubTestsConfig(); diff --git a/shared/test/common/test_configuration/aub_tests/gen12lp/aub_tests_configuration_gen12lp.cpp b/shared/test/common/test_configuration/aub_tests/gen12lp/aub_tests_configuration_gen12lp.cpp index eecda6c631..b0b5dc6fb2 100644 --- a/shared/test/common/test_configuration/aub_tests/gen12lp/aub_tests_configuration_gen12lp.cpp +++ b/shared/test/common/test_configuration/aub_tests/gen12lp/aub_tests_configuration_gen12lp.cpp @@ -11,7 +11,7 @@ using namespace NEO; template <> -AubTestsConfig getAubTestsConfig() { +AubTestsConfig getAubTestsConfig() { AubTestsConfig aubTestsConfig; aubTestsConfig.testCanonicalAddress = false; return aubTestsConfig; diff --git a/shared/test/common/test_configuration/aub_tests/gen8/aub_tests_configuration_gen8.cpp b/shared/test/common/test_configuration/aub_tests/gen8/aub_tests_configuration_gen8.cpp index 0f708629a3..5086fe0019 100644 --- a/shared/test/common/test_configuration/aub_tests/gen8/aub_tests_configuration_gen8.cpp +++ b/shared/test/common/test_configuration/aub_tests/gen8/aub_tests_configuration_gen8.cpp @@ -10,4 +10,4 @@ using namespace NEO; -template AubTestsConfig getAubTestsConfig(); +template AubTestsConfig getAubTestsConfig(); diff --git a/shared/test/common/test_configuration/aub_tests/gen9/aub_tests_configuration_gen9.cpp b/shared/test/common/test_configuration/aub_tests/gen9/aub_tests_configuration_gen9.cpp index 9349e03731..697900c9f6 100644 --- a/shared/test/common/test_configuration/aub_tests/gen9/aub_tests_configuration_gen9.cpp +++ b/shared/test/common/test_configuration/aub_tests/gen9/aub_tests_configuration_gen9.cpp @@ -10,4 +10,4 @@ using namespace NEO; -template AubTestsConfig getAubTestsConfig(); +template AubTestsConfig getAubTestsConfig(); diff --git a/shared/test/common/test_configuration/aub_tests/xe_hpc_core/aub_tests_configuration_xe_hpc_core.cpp b/shared/test/common/test_configuration/aub_tests/xe_hpc_core/aub_tests_configuration_xe_hpc_core.cpp index 9a40c4c13c..51aff95b41 100644 --- a/shared/test/common/test_configuration/aub_tests/xe_hpc_core/aub_tests_configuration_xe_hpc_core.cpp +++ b/shared/test/common/test_configuration/aub_tests/xe_hpc_core/aub_tests_configuration_xe_hpc_core.cpp @@ -11,7 +11,7 @@ using namespace NEO; template <> -AubTestsConfig getAubTestsConfig() { +AubTestsConfig getAubTestsConfig() { AubTestsConfig aubTestsConfig; aubTestsConfig.testCanonicalAddress = false; return aubTestsConfig; diff --git a/shared/test/common/test_configuration/aub_tests/xe_hpg_core/aub_tests_configuration_xe_hpg_core.cpp b/shared/test/common/test_configuration/aub_tests/xe_hpg_core/aub_tests_configuration_xe_hpg_core.cpp index 10628639c5..1ed5e27357 100644 --- a/shared/test/common/test_configuration/aub_tests/xe_hpg_core/aub_tests_configuration_xe_hpg_core.cpp +++ b/shared/test/common/test_configuration/aub_tests/xe_hpg_core/aub_tests_configuration_xe_hpg_core.cpp @@ -11,7 +11,7 @@ using namespace NEO; template <> -AubTestsConfig getAubTestsConfig() { +AubTestsConfig getAubTestsConfig() { AubTestsConfig aubTestsConfig; aubTestsConfig.testCanonicalAddress = true; return aubTestsConfig; diff --git a/shared/test/common/test_macros/hw_test.h b/shared/test/common/test_macros/hw_test.h index ad0b438895..918fc467d5 100644 --- a/shared/test/common/test_macros/hw_test.h +++ b/shared/test/common/test_macros/hw_test.h @@ -17,7 +17,7 @@ #include "test_mode.h" // Macros to provide template based testing. -// Test can use FamilyType in the test -- equivalent to SKLFamily +// Test can use FamilyType in the test -- equivalent to Gen9Family #define HWTEST_TEST_(test_suite_name, test_name, parent_class, parent_id, SetUpT_name, TearDownT_name) \ CHECK_TEST_NAME_LENGTH(test_suite_name, test_name) \ \ @@ -219,7 +219,7 @@ ::testing::internal::GetTypeId(), setUpT, tearDownT) // Macros to provide template based testing. -// Test can use FamilyType in the test -- equivalent to SKLFamily +// Test can use FamilyType in the test -- equivalent to Gen9Family #define HWCMDTEST_TEST_(cmdset_gen_base, test_suite_name, test_name, parent_class, parent_id) \ CHECK_TEST_NAME_LENGTH(test_suite_name, test_name) \ \ @@ -281,7 +281,7 @@ ::testing::internal::GetTypeId()) // Equivalent Hw specific macro for permuted tests -// Test can use FamilyType in the test -- equivalent to SKLFamily +// Test can use FamilyType in the test -- equivalent to Gen9Family #define HWTEST_P(test_suite_name, test_name) \ CHECK_TEST_NAME_LENGTH(test_suite_name, test_name) \ class GTEST_TEST_CLASS_NAME_(test_suite_name, test_name) : public test_suite_name { \ diff --git a/shared/test/common/xe_hpc_core/cmd_parse_xe_hpc_core.cpp b/shared/test/common/xe_hpc_core/cmd_parse_xe_hpc_core.cpp index 72a486846e..90b269f07c 100644 --- a/shared/test/common/xe_hpc_core/cmd_parse_xe_hpc_core.cpp +++ b/shared/test/common/xe_hpc_core/cmd_parse_xe_hpc_core.cpp @@ -6,8 +6,8 @@ */ #include "shared/source/xe_hpc_core/hw_cmds_xe_hpc_core_base.h" -using GenStruct = NEO::XE_HPC_CORE; -using GenGfxFamily = NEO::XE_HPC_COREFamily; +using GenStruct = NEO::XeHpcCore; +using GenGfxFamily = NEO::XeHpcCoreFamily; #include "shared/test/common/cmd_parse/gen_cmd_parse.h" diff --git a/shared/test/common/xe_hpc_core/test_preemption_xe_hpc_core.cpp b/shared/test/common/xe_hpc_core/test_preemption_xe_hpc_core.cpp index 6b840ce5b3..123dfd38c2 100644 --- a/shared/test/common/xe_hpc_core/test_preemption_xe_hpc_core.cpp +++ b/shared/test/common/xe_hpc_core/test_preemption_xe_hpc_core.cpp @@ -11,7 +11,7 @@ using namespace NEO; template <> -PreemptionTestHwDetails getPreemptionTestHwDetails() { +PreemptionTestHwDetails getPreemptionTestHwDetails() { PreemptionTestHwDetails ret; ret.modeToRegValueMap[PreemptionMode::ThreadGroup] = DwordBuilder::build(1, true) | DwordBuilder::build(2, true, false); ret.modeToRegValueMap[PreemptionMode::MidBatch] = DwordBuilder::build(2, true) | DwordBuilder::build(1, true, false); diff --git a/shared/test/common/xe_hpc_core/unit_test_helper_xe_hpc_core.cpp b/shared/test/common/xe_hpc_core/unit_test_helper_xe_hpc_core.cpp index 8d98dca234..6b0903ee2c 100644 --- a/shared/test/common/xe_hpc_core/unit_test_helper_xe_hpc_core.cpp +++ b/shared/test/common/xe_hpc_core/unit_test_helper_xe_hpc_core.cpp @@ -12,7 +12,7 @@ #include "shared/test/common/helpers/unit_test_helper.inl" #include "shared/test/common/helpers/unit_test_helper_xehp_and_later.inl" -using Family = NEO::XE_HPC_COREFamily; +using Family = NEO::XeHpcCoreFamily; #include "unit_test_helper_xe_hpc_core_extra.inl" diff --git a/shared/test/common/xe_hpg_core/cmd_parse_xe_hpg_core.cpp b/shared/test/common/xe_hpg_core/cmd_parse_xe_hpg_core.cpp index 431153faf3..6f262aa23b 100644 --- a/shared/test/common/xe_hpg_core/cmd_parse_xe_hpg_core.cpp +++ b/shared/test/common/xe_hpg_core/cmd_parse_xe_hpg_core.cpp @@ -6,8 +6,8 @@ */ #include "shared/source/xe_hpg_core/hw_cmds_xe_hpg_core_base.h" -using GenStruct = NEO::XE_HPG_CORE; -using GenGfxFamily = NEO::XE_HPG_COREFamily; +using GenStruct = NEO::XeHpgCore; +using GenGfxFamily = NEO::XeHpgCoreFamily; #include "shared/test/common/cmd_parse/cmd_parse_xehp_and_later.inl" -template const typename GenGfxFamily::RENDER_SURFACE_STATE *NEO::HardwareParse::getSurfaceState(IndirectHeap *ssh, uint32_t index); \ No newline at end of file +template const typename GenGfxFamily::RENDER_SURFACE_STATE *NEO::HardwareParse::getSurfaceState(IndirectHeap *ssh, uint32_t index); diff --git a/shared/test/common/xe_hpg_core/test_preemption_xe_hpg_core.cpp b/shared/test/common/xe_hpg_core/test_preemption_xe_hpg_core.cpp index d010b3f29a..a62773cb49 100644 --- a/shared/test/common/xe_hpg_core/test_preemption_xe_hpg_core.cpp +++ b/shared/test/common/xe_hpg_core/test_preemption_xe_hpg_core.cpp @@ -11,7 +11,7 @@ using namespace NEO; template <> -PreemptionTestHwDetails getPreemptionTestHwDetails() { +PreemptionTestHwDetails getPreemptionTestHwDetails() { PreemptionTestHwDetails ret; ret.modeToRegValueMap[PreemptionMode::ThreadGroup] = DwordBuilder::build(1, true) | DwordBuilder::build(2, true, false); ret.modeToRegValueMap[PreemptionMode::MidBatch] = DwordBuilder::build(2, true) | DwordBuilder::build(1, true, false); diff --git a/shared/test/common/xe_hpg_core/unit_test_helper_xe_hpg_core.cpp b/shared/test/common/xe_hpg_core/unit_test_helper_xe_hpg_core.cpp index bc2a94c41f..6e6fa583f7 100644 --- a/shared/test/common/xe_hpg_core/unit_test_helper_xe_hpg_core.cpp +++ b/shared/test/common/xe_hpg_core/unit_test_helper_xe_hpg_core.cpp @@ -10,7 +10,7 @@ #include "shared/test/common/helpers/unit_test_helper.h" #include "shared/test/common/helpers/unit_test_helper.inl" #include "shared/test/common/helpers/unit_test_helper_xehp_and_later.inl" -using Family = NEO::XE_HPG_COREFamily; +using Family = NEO::XeHpgCoreFamily; namespace NEO { template <> diff --git a/shared/test/unit_test/gen11/coherency_tests_gen11.cpp b/shared/test/unit_test/gen11/coherency_tests_gen11.cpp index 5f63445a2f..cd1aac2ca3 100644 --- a/shared/test/unit_test/gen11/coherency_tests_gen11.cpp +++ b/shared/test/unit_test/gen11/coherency_tests_gen11.cpp @@ -19,12 +19,12 @@ using namespace NEO; struct Gen11CoherencyRequirements : public ::testing::Test { - typedef typename ICLFamily::MI_LOAD_REGISTER_IMM MI_LOAD_REGISTER_IMM; + typedef typename Gen11Family::MI_LOAD_REGISTER_IMM MI_LOAD_REGISTER_IMM; - struct myCsr : public CommandStreamReceiverHw { + struct myCsr : public CommandStreamReceiverHw { using CommandStreamReceiver::commandStream; using CommandStreamReceiver::streamProperties; - myCsr(ExecutionEnvironment &executionEnvironment) : CommandStreamReceiverHw(executionEnvironment, 0, 1){}; + myCsr(ExecutionEnvironment &executionEnvironment) : CommandStreamReceiverHw(executionEnvironment, 0, 1){}; CsrSizeRequestFlags *getCsrRequestFlags() { return &csrSizeRequestFlags; } }; @@ -105,7 +105,7 @@ struct Gen11CoherencyProgramingTest : public Gen11CoherencyRequirements { void findMmio(bool expectToBeProgrammed, uint32_t registerAddress) { HardwareParse hwParser; - hwParser.parseCommands(csr->commandStream, startOffset); + hwParser.parseCommands(csr->commandStream, startOffset); bool foundOne = false; for (auto it = hwParser.cmdList.begin(); it != hwParser.cmdList.end(); it++) { diff --git a/shared/test/unit_test/gen11/icllp/test_program_media_sampler_icllp.cpp b/shared/test/unit_test/gen11/icllp/test_program_media_sampler_icllp.cpp index 5ede5b0a02..f970a86837 100644 --- a/shared/test/unit_test/gen11/icllp/test_program_media_sampler_icllp.cpp +++ b/shared/test/unit_test/gen11/icllp/test_program_media_sampler_icllp.cpp @@ -19,13 +19,13 @@ using namespace NEO; struct Gen11MediaSamplerProgramingTest : public ::testing::Test { - typedef typename ICLFamily::MI_LOAD_REGISTER_IMM MI_LOAD_REGISTER_IMM; - typedef typename ICLFamily::PIPE_CONTROL PIPE_CONTROL; + typedef typename Gen11Family::MI_LOAD_REGISTER_IMM MI_LOAD_REGISTER_IMM; + typedef typename Gen11Family::PIPE_CONTROL PIPE_CONTROL; - struct myCsr : public CommandStreamReceiverHw { + struct myCsr : public CommandStreamReceiverHw { using CommandStreamReceiver::commandStream; - using CommandStreamReceiverHw::programMediaSampler; - myCsr(ExecutionEnvironment &executionEnvironment) : CommandStreamReceiverHw(executionEnvironment, 0, 1){}; + using CommandStreamReceiverHw::programMediaSampler; + myCsr(ExecutionEnvironment &executionEnvironment) : CommandStreamReceiverHw(executionEnvironment, 0, 1){}; void overrideLastVmeSubliceConfig(bool value) { lastVmeSubslicesConfig = value; } diff --git a/shared/test/unit_test/gen11/preamble_tests_gen11.cpp b/shared/test/unit_test/gen11/preamble_tests_gen11.cpp index 567e718f7b..15bb9b9429 100644 --- a/shared/test/unit_test/gen11/preamble_tests_gen11.cpp +++ b/shared/test/unit_test/gen11/preamble_tests_gen11.cpp @@ -11,7 +11,7 @@ #include "gtest/gtest.h" using namespace NEO; -typedef ICLFamily GfxFamily; +typedef Gen11Family GfxFamily; #include "shared/test/unit_test/source_level_debugger/source_level_debugger_preamble_test.inl" diff --git a/shared/test/unit_test/gen11/test_preamble_gen11.cpp b/shared/test/unit_test/gen11/test_preamble_gen11.cpp index 031e64cc54..f34909164a 100644 --- a/shared/test/unit_test/gen11/test_preamble_gen11.cpp +++ b/shared/test/unit_test/gen11/test_preamble_gen11.cpp @@ -18,12 +18,12 @@ using namespace NEO; typedef PreambleFixture IclSlm; GEN11TEST_F(IclSlm, WhenL3ConfigIsDispatchedThenProperRegisterAddressAndValueAreProgrammed) { - typedef ICLFamily::MI_LOAD_REGISTER_IMM MI_LOAD_REGISTER_IMM; + typedef Gen11Family::MI_LOAD_REGISTER_IMM MI_LOAD_REGISTER_IMM; LinearStream &cs = linearStream; uint32_t l3Config = PreambleHelper::getL3Config(*defaultHwInfo, true); PreambleHelper::programL3(&cs, l3Config); - parseCommands(cs); + parseCommands(cs); auto itorLRI = find(cmdList.begin(), cmdList.end()); ASSERT_NE(cmdList.end(), itorLRI); @@ -57,14 +57,14 @@ GEN11TEST_F(Gen11UrbEntryAllocationSize, WhenPreambleRetrievesUrbEntryAllocation typedef PreambleVfeState Gen11PreambleVfeState; GEN11TEST_F(Gen11PreambleVfeState, GivenWaOffWhenProgrammingVfeStateThenProgrammingIsCorrect) { - typedef typename ICLFamily::PIPE_CONTROL PIPE_CONTROL; + typedef typename Gen11Family::PIPE_CONTROL PIPE_CONTROL; testWaTable->flags.waSendMIFLUSHBeforeVFE = 0; LinearStream &cs = linearStream; - auto pVfeCmd = PreambleHelper::getSpaceForVfeState(&linearStream, pDevice->getHardwareInfo(), EngineGroupType::RenderCompute); + auto pVfeCmd = PreambleHelper::getSpaceForVfeState(&linearStream, pDevice->getHardwareInfo(), EngineGroupType::RenderCompute); StreamProperties emptyProperties{}; - PreambleHelper::programVfeState(pVfeCmd, pDevice->getHardwareInfo(), 0u, 0, 168u, emptyProperties, nullptr); + PreambleHelper::programVfeState(pVfeCmd, pDevice->getHardwareInfo(), 0u, 0, 168u, emptyProperties, nullptr); - parseCommands(cs); + parseCommands(cs); auto itorPC = find(cmdList.begin(), cmdList.end()); ASSERT_NE(cmdList.end(), itorPC); @@ -77,14 +77,14 @@ GEN11TEST_F(Gen11PreambleVfeState, GivenWaOffWhenProgrammingVfeStateThenProgramm } GEN11TEST_F(Gen11PreambleVfeState, GivenWaOnWhenProgrammingVfeStateThenProgrammingIsCorrect) { - typedef typename ICLFamily::PIPE_CONTROL PIPE_CONTROL; + typedef typename Gen11Family::PIPE_CONTROL PIPE_CONTROL; testWaTable->flags.waSendMIFLUSHBeforeVFE = 1; LinearStream &cs = linearStream; - auto pVfeCmd = PreambleHelper::getSpaceForVfeState(&linearStream, pDevice->getHardwareInfo(), EngineGroupType::RenderCompute); + auto pVfeCmd = PreambleHelper::getSpaceForVfeState(&linearStream, pDevice->getHardwareInfo(), EngineGroupType::RenderCompute); StreamProperties emptyProperties{}; - PreambleHelper::programVfeState(pVfeCmd, pDevice->getHardwareInfo(), 0u, 0, 168u, emptyProperties, nullptr); + PreambleHelper::programVfeState(pVfeCmd, pDevice->getHardwareInfo(), 0u, 0, 168u, emptyProperties, nullptr); - parseCommands(cs); + parseCommands(cs); auto itorPC = find(cmdList.begin(), cmdList.end()); ASSERT_NE(cmdList.end(), itorPC); @@ -119,8 +119,8 @@ typedef PreambleFixture ThreadArbitrationGen11; GEN11TEST_F(ThreadArbitrationGen11, givenPreambleWhenItIsProgrammedThenThreadArbitrationIsNotSet) { DebugManagerStateRestore dbgRestore; DebugManager.flags.ForcePreemptionMode.set(static_cast(PreemptionMode::Disabled)); - typedef ICLFamily::MI_LOAD_REGISTER_IMM MI_LOAD_REGISTER_IMM; - typedef ICLFamily::PIPE_CONTROL PIPE_CONTROL; + typedef Gen11Family::MI_LOAD_REGISTER_IMM MI_LOAD_REGISTER_IMM; + typedef Gen11Family::PIPE_CONTROL PIPE_CONTROL; LinearStream &cs = linearStream; uint32_t l3Config = PreambleHelper::getL3Config(*defaultHwInfo, true); MockDevice mockDevice; @@ -136,14 +136,14 @@ GEN11TEST_F(ThreadArbitrationGen11, givenPreambleWhenItIsProgrammedThenThreadArb ASSERT_EQ(nullptr, cmd); MockDevice device; - EXPECT_EQ(0u, PreambleHelper::getAdditionalCommandsSize(device)); + EXPECT_EQ(0u, PreambleHelper::getAdditionalCommandsSize(device)); } GEN11TEST_F(ThreadArbitrationGen11, whenThreadArbitrationPolicyIsProgrammedThenCorrectValuesAreSet) { DebugManagerStateRestore dbgRestore; DebugManager.flags.ForcePreemptionMode.set(static_cast(PreemptionMode::Disabled)); - typedef ICLFamily::MI_LOAD_REGISTER_IMM MI_LOAD_REGISTER_IMM; - typedef ICLFamily::PIPE_CONTROL PIPE_CONTROL; + typedef Gen11Family::MI_LOAD_REGISTER_IMM MI_LOAD_REGISTER_IMM; + typedef Gen11Family::PIPE_CONTROL PIPE_CONTROL; LinearStream &cs = linearStream; MockDevice mockDevice; StreamProperties streamProperties{}; @@ -161,15 +161,15 @@ GEN11TEST_F(ThreadArbitrationGen11, whenThreadArbitrationPolicyIsProgrammedThenC EXPECT_EQ(RowChickenReg4::regDataForArbitrationPolicy[ThreadArbitrationPolicy::RoundRobin], cmd->getDataDword()); MockDevice device; - EXPECT_EQ(0u, PreambleHelper::getAdditionalCommandsSize(device)); + EXPECT_EQ(0u, PreambleHelper::getAdditionalCommandsSize(device)); } GEN11TEST_F(ThreadArbitrationGen11, GivenDefaultWhenProgrammingPreambleThenArbitrationPolicyIsRoundRobin) { - EXPECT_EQ(ThreadArbitrationPolicy::RoundRobinAfterDependency, HwHelperHw::get().getDefaultThreadArbitrationPolicy()); + EXPECT_EQ(ThreadArbitrationPolicy::RoundRobinAfterDependency, HwHelperHw::get().getDefaultThreadArbitrationPolicy()); } GEN11TEST_F(ThreadArbitrationGen11, whenGetSupportThreadArbitrationPoliciesIsCalledThenAllPoliciesAreReturned) { - auto supportedPolicies = PreambleHelper::getSupportedThreadArbitrationPolicies(); + auto supportedPolicies = PreambleHelper::getSupportedThreadArbitrationPolicies(); EXPECT_EQ(3u, supportedPolicies.size()); EXPECT_NE(supportedPolicies.end(), std::find(supportedPolicies.begin(), diff --git a/shared/test/unit_test/gen11/test_preemption_gen11.cpp b/shared/test/unit_test/gen11/test_preemption_gen11.cpp index 654be56976..62481c1d67 100644 --- a/shared/test/unit_test/gen11/test_preemption_gen11.cpp +++ b/shared/test/unit_test/gen11/test_preemption_gen11.cpp @@ -18,7 +18,7 @@ using namespace NEO; template <> -PreemptionTestHwDetails getPreemptionTestHwDetails() { +PreemptionTestHwDetails getPreemptionTestHwDetails() { PreemptionTestHwDetails ret; ret.modeToRegValueMap[PreemptionMode::ThreadGroup] = DwordBuilder::build(1, true) | DwordBuilder::build(2, true, false); ret.modeToRegValueMap[PreemptionMode::MidBatch] = DwordBuilder::build(2, true) | DwordBuilder::build(1, true, false); diff --git a/shared/test/unit_test/gen12lp/image_surface_state_tests_gen12lp.cpp b/shared/test/unit_test/gen12lp/image_surface_state_tests_gen12lp.cpp index f52f5bf161..c5f79eaf51 100644 --- a/shared/test/unit_test/gen12lp/image_surface_state_tests_gen12lp.cpp +++ b/shared/test/unit_test/gen12lp/image_surface_state_tests_gen12lp.cpp @@ -14,28 +14,28 @@ using namespace NEO; using ImageSurfaceStateTestsGen12LP = ImageSurfaceStateTests; GEN12LPTEST_F(ImageSurfaceStateTestsGen12LP, givenGmmWithMediaCompressedWhenSetFlagsForMediaCompressionThenAuxiliarySurfaceNoneIsSetAndMemoryCompressionEnable) { - auto size = sizeof(typename TGLLPFamily::RENDER_SURFACE_STATE); + auto size = sizeof(typename Gen12LpFamily::RENDER_SURFACE_STATE); auto surfaceState = std::make_unique(size); - auto castSurfaceState = reinterpret_cast(surfaceState.get()); - castSurfaceState->setAuxiliarySurfaceMode(TGLLPFamily::RENDER_SURFACE_STATE::AUXILIARY_SURFACE_MODE::AUXILIARY_SURFACE_MODE_AUX_CCS_E); + auto castSurfaceState = reinterpret_cast(surfaceState.get()); + castSurfaceState->setAuxiliarySurfaceMode(Gen12LpFamily::RENDER_SURFACE_STATE::AUXILIARY_SURFACE_MODE::AUXILIARY_SURFACE_MODE_AUX_CCS_E); mockGmm->gmmResourceInfo->getResourceFlags()->Info.MediaCompressed = false; EncodeSurfaceState::setFlagsForMediaCompression(castSurfaceState, mockGmm.get()); - EXPECT_EQ(castSurfaceState->getAuxiliarySurfaceMode(), TGLLPFamily::RENDER_SURFACE_STATE::AUXILIARY_SURFACE_MODE::AUXILIARY_SURFACE_MODE_AUX_CCS_E); + EXPECT_EQ(castSurfaceState->getAuxiliarySurfaceMode(), Gen12LpFamily::RENDER_SURFACE_STATE::AUXILIARY_SURFACE_MODE::AUXILIARY_SURFACE_MODE_AUX_CCS_E); EXPECT_EQ(castSurfaceState->getMemoryCompressionEnable(), false); mockGmm->gmmResourceInfo->getResourceFlags()->Info.MediaCompressed = true; EncodeSurfaceState::setFlagsForMediaCompression(castSurfaceState, mockGmm.get()); - EXPECT_EQ(castSurfaceState->getAuxiliarySurfaceMode(), TGLLPFamily::RENDER_SURFACE_STATE::AUXILIARY_SURFACE_MODE::AUXILIARY_SURFACE_MODE_AUX_NONE); + EXPECT_EQ(castSurfaceState->getAuxiliarySurfaceMode(), Gen12LpFamily::RENDER_SURFACE_STATE::AUXILIARY_SURFACE_MODE::AUXILIARY_SURFACE_MODE_AUX_NONE); EXPECT_EQ(castSurfaceState->getMemoryCompressionEnable(), true); } GEN12LPTEST_F(ImageSurfaceStateTestsGen12LP, givenGmmWhenSetClearColorParamsThenClearValueAddressEnable) { - auto size = sizeof(typename TGLLPFamily::RENDER_SURFACE_STATE); + auto size = sizeof(typename Gen12LpFamily::RENDER_SURFACE_STATE); auto surfaceState = std::make_unique(size); - auto castSurfaceState = reinterpret_cast(surfaceState.get()); + auto castSurfaceState = reinterpret_cast(surfaceState.get()); mockGmm->gmmResourceInfo->getResourceFlags()->Gpu.IndirectClearColor = true; - EncodeSurfaceState::setClearColorParams(castSurfaceState, mockGmm.get()); + EncodeSurfaceState::setClearColorParams(castSurfaceState, mockGmm.get()); EXPECT_EQ(castSurfaceState->getClearValueAddressEnable(), true); } diff --git a/shared/test/unit_test/gen12lp/test_preamble_gen12lp.cpp b/shared/test/unit_test/gen12lp/test_preamble_gen12lp.cpp index 33e6a638e3..9fed550570 100644 --- a/shared/test/unit_test/gen12lp/test_preamble_gen12lp.cpp +++ b/shared/test/unit_test/gen12lp/test_preamble_gen12lp.cpp @@ -19,14 +19,14 @@ typedef PreambleFixture TglLpSlm; HWTEST2_F(TglLpSlm, givenTglLpWhenPreambleIsBeingProgrammedThenThreadArbitrationPolicyIsIgnored, IsTGLLP) { DebugManagerStateRestore dbgRestore; DebugManager.flags.ForcePreemptionMode.set(static_cast(PreemptionMode::Disabled)); - typedef TGLLPFamily::MI_LOAD_REGISTER_IMM MI_LOAD_REGISTER_IMM; + typedef Gen12LpFamily::MI_LOAD_REGISTER_IMM MI_LOAD_REGISTER_IMM; LinearStream &cs = linearStream; - uint32_t l3Config = PreambleHelper::getL3Config(pDevice->getHardwareInfo(), true); + uint32_t l3Config = PreambleHelper::getL3Config(pDevice->getHardwareInfo(), true); MockDevice mockDevice; - PreambleHelper::programPreamble(&linearStream, mockDevice, l3Config, - nullptr, nullptr); + PreambleHelper::programPreamble(&linearStream, mockDevice, l3Config, + nullptr, nullptr); - parseCommands(cs); + parseCommands(cs); // parse through commands and ensure that 0xE404 is not being programmed EXPECT_EQ(0U, countMmio(cmdList.begin(), cmdList.end(), 0xE404)); @@ -34,18 +34,18 @@ HWTEST2_F(TglLpSlm, givenTglLpWhenPreambleIsBeingProgrammedThenThreadArbitration HWTEST2_F(TglLpSlm, WhenCheckingL3IsConfigurableThenExpectItToBeFalse, IsTGLLP) { bool isL3Programmable = - PreambleHelper::isL3Configurable(*defaultHwInfo); + PreambleHelper::isL3Configurable(*defaultHwInfo); EXPECT_FALSE(isL3Programmable); } HWTEST2_F(TglLpSlm, WhenPreambleIsCreatedThenSlmIsDisabled, IsTGLLP) { - typedef TGLLPFamily::MI_LOAD_REGISTER_IMM MI_LOAD_REGISTER_IMM; + typedef Gen12LpFamily::MI_LOAD_REGISTER_IMM MI_LOAD_REGISTER_IMM; LinearStream &cs = linearStream; uint32_t l3Config = PreambleHelper::getL3Config(pDevice->getHardwareInfo(), true); PreambleHelper::programL3(&cs, l3Config); - parseCommands(cs); + parseCommands(cs); auto itorLRI = find(cmdList.begin(), cmdList.end()); ASSERT_EQ(cmdList.end(), itorLRI); diff --git a/shared/test/unit_test/gen12lp/test_preemption_gen12lp.cpp b/shared/test/unit_test/gen12lp/test_preemption_gen12lp.cpp index 60aa894b92..99904167b1 100644 --- a/shared/test/unit_test/gen12lp/test_preemption_gen12lp.cpp +++ b/shared/test/unit_test/gen12lp/test_preemption_gen12lp.cpp @@ -14,7 +14,7 @@ using namespace NEO; template <> -PreemptionTestHwDetails getPreemptionTestHwDetails() { +PreemptionTestHwDetails getPreemptionTestHwDetails() { PreemptionTestHwDetails ret; ret.modeToRegValueMap[PreemptionMode::ThreadGroup] = DwordBuilder::build(1, true) | DwordBuilder::build(2, true, false); ret.modeToRegValueMap[PreemptionMode::MidBatch] = DwordBuilder::build(2, true) | DwordBuilder::build(1, true, false); diff --git a/shared/test/unit_test/gen8/test_preamble_gen8.cpp b/shared/test/unit_test/gen8/test_preamble_gen8.cpp index 4d1575ac67..e80e7006a3 100644 --- a/shared/test/unit_test/gen8/test_preamble_gen8.cpp +++ b/shared/test/unit_test/gen8/test_preamble_gen8.cpp @@ -17,18 +17,18 @@ using namespace NEO; typedef PreambleFixture BdwSlm; BDWTEST_F(BdwSlm, WhenL3ConfigIsDispatchedThenProperRegisterAddressAndValueAreProgrammed) { - typedef BDWFamily::MI_LOAD_REGISTER_IMM MI_LOAD_REGISTER_IMM; + typedef Gen8Family::MI_LOAD_REGISTER_IMM MI_LOAD_REGISTER_IMM; LinearStream &cs = linearStream; - uint32_t l3Config = PreambleHelper::getL3Config(*defaultHwInfo, true); - PreambleHelper::programL3(&cs, l3Config); + uint32_t l3Config = PreambleHelper::getL3Config(*defaultHwInfo, true); + PreambleHelper::programL3(&cs, l3Config); - parseCommands(cs); + parseCommands(cs); auto itorLRI = find(cmdList.begin(), cmdList.end()); ASSERT_NE(cmdList.end(), itorLRI); const auto &lri = *reinterpret_cast(*itorLRI); - auto registerOffset = L3CNTLRegisterOffset::registerOffset; + auto registerOffset = L3CNTLRegisterOffset::registerOffset; EXPECT_EQ(registerOffset, lri.getRegisterOffset()); EXPECT_EQ(1u, lri.getDataDword() & 1); } @@ -62,17 +62,17 @@ BDWTEST_F(Gen8L3Config, WhenPreambleIsCreatedThenL3ProgrammingIsCorrect) { bool isL3Programmable; l3ConfigDifference = - PreambleHelper::getL3Config(*defaultHwInfo, true) != - PreambleHelper::getL3Config(*defaultHwInfo, false); + PreambleHelper::getL3Config(*defaultHwInfo, true) != + PreambleHelper::getL3Config(*defaultHwInfo, false); isL3Programmable = - PreambleHelper::isL3Configurable(*defaultHwInfo); + PreambleHelper::isL3Configurable(*defaultHwInfo); EXPECT_EQ(l3ConfigDifference, isL3Programmable); } typedef PreambleFixture ThreadArbitrationGen8; BDWTEST_F(ThreadArbitrationGen8, givenPolicyWhenThreadArbitrationProgrammedThenDoNothing) { - typedef BDWFamily::MI_LOAD_REGISTER_IMM MI_LOAD_REGISTER_IMM; + typedef Gen8Family::MI_LOAD_REGISTER_IMM MI_LOAD_REGISTER_IMM; LinearStream &cs = linearStream; StreamProperties streamProperties{}; @@ -82,12 +82,12 @@ BDWTEST_F(ThreadArbitrationGen8, givenPolicyWhenThreadArbitrationProgrammedThenD EXPECT_EQ(0u, cs.getUsed()); MockDevice device; - EXPECT_EQ(0u, PreambleHelper::getAdditionalCommandsSize(device)); - EXPECT_EQ(ThreadArbitrationPolicy::AgeBased, HwHelperHw::get().getDefaultThreadArbitrationPolicy()); + EXPECT_EQ(0u, PreambleHelper::getAdditionalCommandsSize(device)); + EXPECT_EQ(ThreadArbitrationPolicy::AgeBased, HwHelperHw::get().getDefaultThreadArbitrationPolicy()); } BDWTEST_F(ThreadArbitrationGen8, whenGetSupportThreadArbitrationPoliciesIsCalledThenEmptyVectorIsReturned) { - auto supportedPolicies = PreambleHelper::getSupportedThreadArbitrationPolicies(); + auto supportedPolicies = PreambleHelper::getSupportedThreadArbitrationPolicies(); EXPECT_EQ(0u, supportedPolicies.size()); } @@ -99,14 +99,14 @@ BDWTEST_F(Gen8UrbEntryAllocationSize, WhenPreambleIsCreatedThenUrbEntryAllocatio } BDWTEST_F(PreambleVfeState, WhenProgrammingVfeStateThenProgrammingIsCorrect) { - typedef BDWFamily::PIPE_CONTROL PIPE_CONTROL; + typedef Gen8Family::PIPE_CONTROL PIPE_CONTROL; LinearStream &cs = linearStream; - auto pVfeCmd = PreambleHelper::getSpaceForVfeState(&linearStream, *defaultHwInfo, EngineGroupType::RenderCompute); + auto pVfeCmd = PreambleHelper::getSpaceForVfeState(&linearStream, *defaultHwInfo, EngineGroupType::RenderCompute); StreamProperties emptyProperties{}; - PreambleHelper::programVfeState(pVfeCmd, *defaultHwInfo, 0u, 0, 168u, emptyProperties, nullptr); + PreambleHelper::programVfeState(pVfeCmd, *defaultHwInfo, 0u, 0, 168u, emptyProperties, nullptr); - parseCommands(cs); + parseCommands(cs); auto itorPC = find(cmdList.begin(), cmdList.end()); ASSERT_NE(cmdList.end(), itorPC); diff --git a/shared/test/unit_test/gen8/test_preemption_gen8.cpp b/shared/test/unit_test/gen8/test_preemption_gen8.cpp index 7f1d14f1e5..5acf474fff 100644 --- a/shared/test/unit_test/gen8/test_preemption_gen8.cpp +++ b/shared/test/unit_test/gen8/test_preemption_gen8.cpp @@ -16,7 +16,7 @@ using namespace NEO; template <> -PreemptionTestHwDetails getPreemptionTestHwDetails() { +PreemptionTestHwDetails getPreemptionTestHwDetails() { PreemptionTestHwDetails ret; ret.modeToRegValueMap[PreemptionMode::ThreadGroup] = 0; ret.modeToRegValueMap[PreemptionMode::MidBatch] = (1 << 2); diff --git a/shared/test/unit_test/gen9/preamble_tests_gen9.cpp b/shared/test/unit_test/gen9/preamble_tests_gen9.cpp index 99dfbebee1..9bf8c026c8 100644 --- a/shared/test/unit_test/gen9/preamble_tests_gen9.cpp +++ b/shared/test/unit_test/gen9/preamble_tests_gen9.cpp @@ -13,7 +13,7 @@ #include "gtest/gtest.h" using namespace NEO; -typedef SKLFamily GfxFamily; +typedef Gen9Family GfxFamily; #include "shared/test/unit_test/source_level_debugger/source_level_debugger_preamble_test.inl" @@ -68,15 +68,15 @@ using ThreadArbitrationGen9 = PreambleFixture; GEN9TEST_F(ThreadArbitrationGen9, givenPreambleWhenItIsProgrammedThenThreadArbitrationIsNotSet) { DebugManagerStateRestore dbgRestore; DebugManager.flags.ForcePreemptionMode.set(static_cast(PreemptionMode::Disabled)); - typedef SKLFamily::MI_LOAD_REGISTER_IMM MI_LOAD_REGISTER_IMM; - typedef SKLFamily::PIPE_CONTROL PIPE_CONTROL; + typedef Gen9Family::MI_LOAD_REGISTER_IMM MI_LOAD_REGISTER_IMM; + typedef Gen9Family::PIPE_CONTROL PIPE_CONTROL; LinearStream &cs = linearStream; uint32_t l3Config = PreambleHelper::getL3Config(*defaultHwInfo, true); MockDevice mockDevice; - PreambleHelper::programPreamble(&linearStream, mockDevice, l3Config, - nullptr, nullptr); + PreambleHelper::programPreamble(&linearStream, mockDevice, l3Config, + nullptr, nullptr); - parseCommands(cs); + parseCommands(cs); auto ppC = find(cmdList.begin(), cmdList.end()); ASSERT_EQ(cmdList.end(), ppC); @@ -89,21 +89,21 @@ GEN9TEST_F(ThreadArbitrationGen9, givenPreambleWhenItIsProgrammedThenThreadArbit EXPECT_NE(0x100u, lri.getDataDword()); MockDevice device; - EXPECT_EQ(0u, PreambleHelper::getAdditionalCommandsSize(device)); + EXPECT_EQ(0u, PreambleHelper::getAdditionalCommandsSize(device)); } GEN9TEST_F(ThreadArbitrationGen9, whenThreadArbitrationPolicyIsProgrammedThenCorrectValuesAreSet) { DebugManagerStateRestore dbgRestore; DebugManager.flags.ForcePreemptionMode.set(static_cast(PreemptionMode::Disabled)); - typedef SKLFamily::MI_LOAD_REGISTER_IMM MI_LOAD_REGISTER_IMM; - typedef SKLFamily::PIPE_CONTROL PIPE_CONTROL; + typedef Gen9Family::MI_LOAD_REGISTER_IMM MI_LOAD_REGISTER_IMM; + typedef Gen9Family::PIPE_CONTROL PIPE_CONTROL; LinearStream &cs = linearStream; MockDevice mockDevice; StreamProperties streamProperties{}; streamProperties.stateComputeMode.threadArbitrationPolicy.set(ThreadArbitrationPolicy::RoundRobin); EncodeComputeMode::programComputeModeCommand(linearStream, streamProperties.stateComputeMode, *defaultHwInfo, nullptr); - parseCommands(cs); + parseCommands(cs); auto ppC = find(cmdList.begin(), cmdList.end()); ASSERT_NE(ppC, cmdList.end()); @@ -116,5 +116,5 @@ GEN9TEST_F(ThreadArbitrationGen9, whenThreadArbitrationPolicyIsProgrammedThenCor EXPECT_EQ(0x100u, lri.getDataDword()); MockDevice device; - EXPECT_EQ(0u, PreambleHelper::getAdditionalCommandsSize(device)); + EXPECT_EQ(0u, PreambleHelper::getAdditionalCommandsSize(device)); } diff --git a/shared/test/unit_test/gen9/test_preemption_gen9.cpp b/shared/test/unit_test/gen9/test_preemption_gen9.cpp index 420c35cfec..c0a47d4abb 100644 --- a/shared/test/unit_test/gen9/test_preemption_gen9.cpp +++ b/shared/test/unit_test/gen9/test_preemption_gen9.cpp @@ -20,7 +20,7 @@ using namespace NEO; template <> -PreemptionTestHwDetails getPreemptionTestHwDetails() { +PreemptionTestHwDetails getPreemptionTestHwDetails() { PreemptionTestHwDetails ret; ret.modeToRegValueMap[PreemptionMode::ThreadGroup] = DwordBuilder::build(1, true) | DwordBuilder::build(2, true, false); ret.modeToRegValueMap[PreemptionMode::MidBatch] = DwordBuilder::build(2, true) | DwordBuilder::build(1, true, false); diff --git a/shared/test/unit_test/xe_hpg_core/dg2/hw_info_config_tests_dg2.cpp b/shared/test/unit_test/xe_hpg_core/dg2/hw_info_config_tests_dg2.cpp index b3b90eed32..112a5948f9 100644 --- a/shared/test/unit_test/xe_hpg_core/dg2/hw_info_config_tests_dg2.cpp +++ b/shared/test/unit_test/xe_hpg_core/dg2/hw_info_config_tests_dg2.cpp @@ -342,12 +342,12 @@ DG2TEST_F(HwInfoConfigTestDg2, givenDg2WhenSetForceNonCoherentThenProperFlagSet) properties.isCoherencyRequired.set(false); hwInfoConfig->setForceNonCoherent(&stateComputeMode, properties); EXPECT_EQ(FORCE_NON_COHERENT::FORCE_NON_COHERENT_FORCE_GPU_NON_COHERENT, stateComputeMode.getForceNonCoherent()); - EXPECT_EQ(XE_HPG_COREFamily::stateComputeModeForceNonCoherentMask, stateComputeMode.getMaskBits()); + EXPECT_EQ(XeHpgCoreFamily::stateComputeModeForceNonCoherentMask, stateComputeMode.getMaskBits()); properties.isCoherencyRequired.set(true); hwInfoConfig->setForceNonCoherent(&stateComputeMode, properties); EXPECT_EQ(FORCE_NON_COHERENT::FORCE_NON_COHERENT_FORCE_DISABLED, stateComputeMode.getForceNonCoherent()); - EXPECT_EQ(XE_HPG_COREFamily::stateComputeModeForceNonCoherentMask, stateComputeMode.getMaskBits()); + EXPECT_EQ(XeHpgCoreFamily::stateComputeModeForceNonCoherentMask, stateComputeMode.getMaskBits()); } DG2TEST_F(HwInfoConfigTestDg2, givenEnabledSliceInNonStandardConfigWhenComputeUnitsUsedForScratchThenProperCalculationIsReturned) {