From 9c8b42b58a3dd2d05950a66884100411da3de629 Mon Sep 17 00:00:00 2001 From: Kamil Kopryk Date: Tue, 24 Jan 2023 14:29:15 +0000 Subject: [PATCH] refactor: rename gtpin_gfx_core_helper files Related-To: NEO-6853 Signed-off-by: Kamil Kopryk --- opencl/source/gen11/gtpin_setup_gen11.cpp | 6 +++--- opencl/source/gen12lp/gtpin_setup_gen12lp.cpp | 6 +++--- opencl/source/gen8/gtpin_setup_gen8.cpp | 6 +++--- opencl/source/gen9/gtpin_setup_gen9.cpp | 6 +++--- opencl/source/gtpin/CMakeLists.txt | 12 ++++++------ opencl/source/gtpin/gtpin_callbacks.cpp | 2 +- ...gtpin_hw_helper.cpp => gtpin_gfx_core_helper.cpp} | 4 ++-- .../{gtpin_hw_helper.h => gtpin_gfx_core_helper.h} | 2 +- ...gtpin_hw_helper.inl => gtpin_gfx_core_helper.inl} | 2 +- ...r.inl => gtpin_gfx_core_helper_bdw_and_later.inl} | 4 ++-- ....inl => gtpin_gfx_core_helper_xehp_and_later.inl} | 4 ++-- opencl/source/gtpin/gtpin_helpers.cpp | 4 ++-- opencl/source/xe_hp_core/gtpin_setup_xe_hp_core.cpp | 8 ++++---- .../source/xe_hpc_core/gtpin_setup_xe_hpc_core.cpp | 6 +++--- .../source/xe_hpg_core/gtpin_setup_xe_hpg_core.cpp | 6 +++--- opencl/test/unit_test/gtpin/gtpin_tests.cpp | 2 +- 16 files changed, 40 insertions(+), 40 deletions(-) rename opencl/source/gtpin/{gtpin_hw_helper.cpp => gtpin_gfx_core_helper.cpp} (72%) rename opencl/source/gtpin/{gtpin_hw_helper.h => gtpin_gfx_core_helper.h} (96%) rename opencl/source/gtpin/{gtpin_hw_helper.inl => gtpin_gfx_core_helper.inl} (97%) rename opencl/source/gtpin/{gtpin_hw_helper_bdw_and_later.inl => gtpin_gfx_core_helper_bdw_and_later.inl} (85%) rename opencl/source/gtpin/{gtpin_hw_helper_xehp_and_later.inl => gtpin_gfx_core_helper_xehp_and_later.inl} (84%) diff --git a/opencl/source/gen11/gtpin_setup_gen11.cpp b/opencl/source/gen11/gtpin_setup_gen11.cpp index da67d7f773..28687a07fb 100644 --- a/opencl/source/gen11/gtpin_setup_gen11.cpp +++ b/opencl/source/gen11/gtpin_setup_gen11.cpp @@ -10,9 +10,9 @@ #include "shared/source/gen11/hw_cmds_base.h" #include "shared/source/kernel/implicit_args.h" -#include "opencl/source/gtpin/gtpin_hw_helper.h" -#include "opencl/source/gtpin/gtpin_hw_helper.inl" -#include "opencl/source/gtpin/gtpin_hw_helper_bdw_and_later.inl" +#include "opencl/source/gtpin/gtpin_gfx_core_helper.h" +#include "opencl/source/gtpin/gtpin_gfx_core_helper.inl" +#include "opencl/source/gtpin/gtpin_gfx_core_helper_bdw_and_later.inl" #include "ocl_igc_shared/gtpin/gtpin_ocl_interface.h" diff --git a/opencl/source/gen12lp/gtpin_setup_gen12lp.cpp b/opencl/source/gen12lp/gtpin_setup_gen12lp.cpp index a06392e964..e9ebbfb99b 100644 --- a/opencl/source/gen12lp/gtpin_setup_gen12lp.cpp +++ b/opencl/source/gen12lp/gtpin_setup_gen12lp.cpp @@ -10,9 +10,9 @@ #include "shared/source/gen12lp/hw_cmds_base.h" #include "shared/source/kernel/implicit_args.h" -#include "opencl/source/gtpin/gtpin_hw_helper.h" -#include "opencl/source/gtpin/gtpin_hw_helper.inl" -#include "opencl/source/gtpin/gtpin_hw_helper_bdw_and_later.inl" +#include "opencl/source/gtpin/gtpin_gfx_core_helper.h" +#include "opencl/source/gtpin/gtpin_gfx_core_helper.inl" +#include "opencl/source/gtpin/gtpin_gfx_core_helper_bdw_and_later.inl" #include "ocl_igc_shared/gtpin/gtpin_ocl_interface.h" diff --git a/opencl/source/gen8/gtpin_setup_gen8.cpp b/opencl/source/gen8/gtpin_setup_gen8.cpp index 0a32dc23d4..4ff52e2da6 100644 --- a/opencl/source/gen8/gtpin_setup_gen8.cpp +++ b/opencl/source/gen8/gtpin_setup_gen8.cpp @@ -10,9 +10,9 @@ #include "shared/source/gen8/hw_cmds_base.h" #include "shared/source/kernel/implicit_args.h" -#include "opencl/source/gtpin/gtpin_hw_helper.h" -#include "opencl/source/gtpin/gtpin_hw_helper.inl" -#include "opencl/source/gtpin/gtpin_hw_helper_bdw_and_later.inl" +#include "opencl/source/gtpin/gtpin_gfx_core_helper.h" +#include "opencl/source/gtpin/gtpin_gfx_core_helper.inl" +#include "opencl/source/gtpin/gtpin_gfx_core_helper_bdw_and_later.inl" #include "ocl_igc_shared/gtpin/gtpin_ocl_interface.h" diff --git a/opencl/source/gen9/gtpin_setup_gen9.cpp b/opencl/source/gen9/gtpin_setup_gen9.cpp index 0506bd93b4..6cb7c242f9 100644 --- a/opencl/source/gen9/gtpin_setup_gen9.cpp +++ b/opencl/source/gen9/gtpin_setup_gen9.cpp @@ -10,9 +10,9 @@ #include "shared/source/gen9/hw_cmds_base.h" #include "shared/source/kernel/implicit_args.h" -#include "opencl/source/gtpin/gtpin_hw_helper.h" -#include "opencl/source/gtpin/gtpin_hw_helper.inl" -#include "opencl/source/gtpin/gtpin_hw_helper_bdw_and_later.inl" +#include "opencl/source/gtpin/gtpin_gfx_core_helper.h" +#include "opencl/source/gtpin/gtpin_gfx_core_helper.inl" +#include "opencl/source/gtpin/gtpin_gfx_core_helper_bdw_and_later.inl" #include "ocl_igc_shared/gtpin/gtpin_ocl_interface.h" diff --git a/opencl/source/gtpin/CMakeLists.txt b/opencl/source/gtpin/CMakeLists.txt index 2fadfca8ab..bfa81d9b09 100644 --- a/opencl/source/gtpin/CMakeLists.txt +++ b/opencl/source/gtpin/CMakeLists.txt @@ -1,5 +1,5 @@ # -# Copyright (C) 2018-2021 Intel Corporation +# Copyright (C) 2018-2023 Intel Corporation # # SPDX-License-Identifier: MIT # @@ -10,10 +10,10 @@ if(NOT DISABLED_GTPIN_SUPPORT) ${CMAKE_CURRENT_SOURCE_DIR}/gtpin_callbacks.cpp ${CMAKE_CURRENT_SOURCE_DIR}/gtpin_helpers.cpp ${CMAKE_CURRENT_SOURCE_DIR}/gtpin_helpers.h - ${CMAKE_CURRENT_SOURCE_DIR}/gtpin_hw_helper.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/gtpin_hw_helper.h - ${CMAKE_CURRENT_SOURCE_DIR}/gtpin_hw_helper.inl - ${CMAKE_CURRENT_SOURCE_DIR}/gtpin_hw_helper_bdw_and_later.inl + ${CMAKE_CURRENT_SOURCE_DIR}/gtpin_gfx_core_helper.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/gtpin_gfx_core_helper.h + ${CMAKE_CURRENT_SOURCE_DIR}/gtpin_gfx_core_helper.inl + ${CMAKE_CURRENT_SOURCE_DIR}/gtpin_gfx_core_helper_bdw_and_later.inl ${CMAKE_CURRENT_SOURCE_DIR}/gtpin_init.cpp ${CMAKE_CURRENT_SOURCE_DIR}/gtpin_init.h ${CMAKE_CURRENT_SOURCE_DIR}/gtpin_notify.h @@ -22,7 +22,7 @@ if(NOT DISABLED_GTPIN_SUPPORT) if(SUPPORT_XEHP_AND_LATER) list(APPEND RUNTIME_SRCS_GTPIN - ${CMAKE_CURRENT_SOURCE_DIR}/gtpin_hw_helper_xehp_and_later.inl + ${CMAKE_CURRENT_SOURCE_DIR}/gtpin_gfx_core_helper_xehp_and_later.inl ) endif() diff --git a/opencl/source/gtpin/gtpin_callbacks.cpp b/opencl/source/gtpin/gtpin_callbacks.cpp index 43e44b01c9..d4cbe55567 100644 --- a/opencl/source/gtpin/gtpin_callbacks.cpp +++ b/opencl/source/gtpin/gtpin_callbacks.cpp @@ -15,7 +15,7 @@ #include "opencl/source/command_queue/command_queue.h" #include "opencl/source/context/context.h" #include "opencl/source/gtpin/gtpin_defs.h" -#include "opencl/source/gtpin/gtpin_hw_helper.h" +#include "opencl/source/gtpin/gtpin_gfx_core_helper.h" #include "opencl/source/gtpin/gtpin_notify.h" #include "opencl/source/kernel/kernel.h" #include "opencl/source/kernel/multi_device_kernel.h" diff --git a/opencl/source/gtpin/gtpin_hw_helper.cpp b/opencl/source/gtpin/gtpin_gfx_core_helper.cpp similarity index 72% rename from opencl/source/gtpin/gtpin_hw_helper.cpp rename to opencl/source/gtpin/gtpin_gfx_core_helper.cpp index 0c530a624b..bc38c35027 100644 --- a/opencl/source/gtpin/gtpin_hw_helper.cpp +++ b/opencl/source/gtpin/gtpin_gfx_core_helper.cpp @@ -1,11 +1,11 @@ /* - * Copyright (C) 2018-2022 Intel Corporation + * Copyright (C) 2018-2023 Intel Corporation * * SPDX-License-Identifier: MIT * */ -#include "opencl/source/gtpin/gtpin_hw_helper.h" +#include "opencl/source/gtpin/gtpin_gfx_core_helper.h" namespace NEO { GTPinGfxCoreHelper *gtpinGfxCoreHelperFactory[IGFX_MAX_CORE] = {}; diff --git a/opencl/source/gtpin/gtpin_hw_helper.h b/opencl/source/gtpin/gtpin_gfx_core_helper.h similarity index 96% rename from opencl/source/gtpin/gtpin_hw_helper.h rename to opencl/source/gtpin/gtpin_gfx_core_helper.h index f59d5c815d..c47466e224 100644 --- a/opencl/source/gtpin/gtpin_hw_helper.h +++ b/opencl/source/gtpin/gtpin_gfx_core_helper.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2022 Intel Corporation + * Copyright (C) 2018-2023 Intel Corporation * * SPDX-License-Identifier: MIT * diff --git a/opencl/source/gtpin/gtpin_hw_helper.inl b/opencl/source/gtpin/gtpin_gfx_core_helper.inl similarity index 97% rename from opencl/source/gtpin/gtpin_hw_helper.inl rename to opencl/source/gtpin/gtpin_gfx_core_helper.inl index 0a96ae3a40..cbbcc381cd 100644 --- a/opencl/source/gtpin/gtpin_hw_helper.inl +++ b/opencl/source/gtpin/gtpin_gfx_core_helper.inl @@ -8,7 +8,7 @@ #include "shared/source/helpers/ptr_math.h" #include "shared/source/helpers/string.h" -#include "opencl/source/gtpin/gtpin_hw_helper.h" +#include "opencl/source/gtpin/gtpin_gfx_core_helper.h" #include "opencl/source/kernel/kernel.h" namespace NEO { diff --git a/opencl/source/gtpin/gtpin_hw_helper_bdw_and_later.inl b/opencl/source/gtpin/gtpin_gfx_core_helper_bdw_and_later.inl similarity index 85% rename from opencl/source/gtpin/gtpin_hw_helper_bdw_and_later.inl rename to opencl/source/gtpin/gtpin_gfx_core_helper_bdw_and_later.inl index f46018e065..fa88cfbeb1 100644 --- a/opencl/source/gtpin/gtpin_hw_helper_bdw_and_later.inl +++ b/opencl/source/gtpin/gtpin_gfx_core_helper_bdw_and_later.inl @@ -1,5 +1,5 @@ /* - * Copyright (C) 2021-2022 Intel Corporation + * Copyright (C) 2021-2023 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -7,7 +7,7 @@ #include "shared/source/debug_settings/debug_settings_manager.h" -#include "opencl/source/gtpin/gtpin_hw_helper.h" +#include "opencl/source/gtpin/gtpin_gfx_core_helper.h" namespace NEO { diff --git a/opencl/source/gtpin/gtpin_hw_helper_xehp_and_later.inl b/opencl/source/gtpin/gtpin_gfx_core_helper_xehp_and_later.inl similarity index 84% rename from opencl/source/gtpin/gtpin_hw_helper_xehp_and_later.inl rename to opencl/source/gtpin/gtpin_gfx_core_helper_xehp_and_later.inl index 21bed1cee9..3405ce8543 100644 --- a/opencl/source/gtpin/gtpin_hw_helper_xehp_and_later.inl +++ b/opencl/source/gtpin/gtpin_gfx_core_helper_xehp_and_later.inl @@ -1,5 +1,5 @@ /* - * Copyright (C) 2021-2022 Intel Corporation + * Copyright (C) 2021-2023 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -7,7 +7,7 @@ #include "shared/source/debug_settings/debug_settings_manager.h" -#include "opencl/source/gtpin/gtpin_hw_helper.h" +#include "opencl/source/gtpin/gtpin_gfx_core_helper.h" namespace NEO { diff --git a/opencl/source/gtpin/gtpin_helpers.cpp b/opencl/source/gtpin/gtpin_helpers.cpp index fa4682bde0..c7b9ff8d98 100644 --- a/opencl/source/gtpin/gtpin_helpers.cpp +++ b/opencl/source/gtpin/gtpin_helpers.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2022 Intel Corporation + * Copyright (C) 2018-2023 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -15,7 +15,7 @@ #include "opencl/source/api/api.h" #include "opencl/source/cl_device/cl_device.h" #include "opencl/source/context/context.h" -#include "opencl/source/gtpin/gtpin_hw_helper.h" +#include "opencl/source/gtpin/gtpin_gfx_core_helper.h" #include "opencl/source/helpers/cl_validators.h" #include "opencl/source/mem_obj/buffer.h" diff --git a/opencl/source/xe_hp_core/gtpin_setup_xe_hp_core.cpp b/opencl/source/xe_hp_core/gtpin_setup_xe_hp_core.cpp index ff28622521..7f81d60223 100644 --- a/opencl/source/xe_hp_core/gtpin_setup_xe_hp_core.cpp +++ b/opencl/source/xe_hp_core/gtpin_setup_xe_hp_core.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2021-2022 Intel Corporation + * Copyright (C) 2021-2023 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -7,9 +7,9 @@ #include "shared/source/xe_hp_core/hw_cmds_base.h" -#include "opencl/source/gtpin/gtpin_hw_helper.h" -#include "opencl/source/gtpin/gtpin_hw_helper.inl" -#include "opencl/source/gtpin/gtpin_hw_helper_xehp_and_later.inl" +#include "opencl/source/gtpin/gtpin_gfx_core_helper.h" +#include "opencl/source/gtpin/gtpin_gfx_core_helper.inl" +#include "opencl/source/gtpin/gtpin_gfx_core_helper_xehp_and_later.inl" #include "ocl_igc_shared/gtpin/gtpin_ocl_interface.h" 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 aa3bd1fd7d..ffed150cfa 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 @@ -9,9 +9,9 @@ #include "shared/source/compiler_interface/external_functions.h" #include "shared/source/kernel/implicit_args.h" -#include "opencl/source/gtpin/gtpin_hw_helper.h" -#include "opencl/source/gtpin/gtpin_hw_helper.inl" -#include "opencl/source/gtpin/gtpin_hw_helper_xehp_and_later.inl" +#include "opencl/source/gtpin/gtpin_gfx_core_helper.h" +#include "opencl/source/gtpin/gtpin_gfx_core_helper.inl" +#include "opencl/source/gtpin/gtpin_gfx_core_helper_xehp_and_later.inl" #include "hw_cmds_xe_hpc_core_base.h" #include "ocl_igc_shared/gtpin/gtpin_ocl_interface.h" 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 01e8c2c1d3..67bb8c2c40 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 @@ -9,9 +9,9 @@ #include "shared/source/compiler_interface/external_functions.h" #include "shared/source/kernel/implicit_args.h" -#include "opencl/source/gtpin/gtpin_hw_helper.h" -#include "opencl/source/gtpin/gtpin_hw_helper.inl" -#include "opencl/source/gtpin/gtpin_hw_helper_xehp_and_later.inl" +#include "opencl/source/gtpin/gtpin_gfx_core_helper.h" +#include "opencl/source/gtpin/gtpin_gfx_core_helper.inl" +#include "opencl/source/gtpin/gtpin_gfx_core_helper_xehp_and_later.inl" #include "hw_cmds_xe_hpg_core_base.h" #include "ocl_igc_shared/gtpin/gtpin_ocl_interface.h" diff --git a/opencl/test/unit_test/gtpin/gtpin_tests.cpp b/opencl/test/unit_test/gtpin/gtpin_tests.cpp index df7c3da23a..edbf092472 100644 --- a/opencl/test/unit_test/gtpin/gtpin_tests.cpp +++ b/opencl/test/unit_test/gtpin/gtpin_tests.cpp @@ -28,8 +28,8 @@ #include "opencl/source/api/api.h" #include "opencl/source/context/context.h" #include "opencl/source/gtpin/gtpin_defs.h" +#include "opencl/source/gtpin/gtpin_gfx_core_helper.h" #include "opencl/source/gtpin/gtpin_helpers.h" -#include "opencl/source/gtpin/gtpin_hw_helper.h" #include "opencl/source/gtpin/gtpin_init.h" #include "opencl/source/gtpin/gtpin_notify.h" #include "opencl/source/helpers/cl_validators.h"