From cab4b956eb61bb824fa501dc9a5c0d684c0afcfb Mon Sep 17 00:00:00 2001 From: Kamil Kopryk Date: Thu, 2 Feb 2023 14:25:08 +0000 Subject: [PATCH] refactor: rename compiler product helper files Related-To: NEO-6853 Signed-off-by: Kamil Kopryk --- level_zero/core/source/module/module_imp.cpp | 2 +- .../test/unit_tests/fixtures/device_fixture.cpp | 2 +- .../test/unit_tests/sources/module/test_module.cpp | 2 +- opencl/source/program/program.cpp | 2 +- opencl/test/unit_test/built_ins/built_in_tests.cpp | 2 +- .../command_queue/enqueue_kernel_1_tests.cpp | 2 +- .../enqueue_read_buffer_rect_tests.cpp | 2 +- .../enqueue_write_buffer_rect_tests.cpp | 2 +- opencl/test/unit_test/gtpin/gtpin_tests.cpp | 2 +- opencl/test/unit_test/mem_obj/buffer_tests.cpp | 2 +- .../unit_test/mem_obj/linux/buffer_linux_tests.cpp | 2 +- .../mem_obj/windows/buffer_windows_tests.cpp | 2 +- .../offline_compiler/ocloc_fatbinary_tests.cpp | 2 +- .../offline_compiler/offline_compiler_tests.cpp | 2 +- opencl/test/unit_test/program/program_tests.cpp | 2 +- ...e_read_write_buffer_scenarios_windows_tests.cpp | 2 +- shared/offline_compiler/source/CMakeLists.txt | 14 +++++++------- .../offline_compiler/source/ocloc_arg_helper.cpp | 2 +- .../offline_compiler/source/ocloc_igc_facade.cpp | 2 +- .../offline_compiler/source/offline_compiler.cpp | 2 +- shared/offline_compiler/source/offline_linker.cpp | 4 ++-- .../compiler_interface/compiler_interface.cpp | 2 +- .../device_binary_format/device_binary_formats.cpp | 2 +- shared/source/enable_cores.cmake | 2 +- .../root_device_environment.cpp | 2 +- .../gen11/enable_compiler_product_helper_ehl.cpp | 10 +++++----- .../gen11/enable_compiler_product_helper_icllp.cpp | 10 +++++----- .../gen11/enable_compiler_product_helper_lkf.cpp | 10 +++++----- ...fig_rkl.inl => compiler_product_helper_rkl.inl} | 2 +- .../enable_compiler_product_helper_adln.cpp | 10 +++++----- .../enable_compiler_product_helper_adlp.cpp | 10 +++++----- .../enable_compiler_product_helper_adls.cpp | 10 +++++----- .../gen12lp/enable_compiler_product_helper_dg1.cpp | 10 +++++----- .../gen12lp/enable_compiler_product_helper_rkl.cpp | 12 ++++++------ .../enable_compiler_product_helper_tgllp.cpp | 10 +++++----- ...fig_bdw.inl => compiler_product_helper_bdw.inl} | 2 +- .../gen8/enable_compiler_product_helper_bdw.cpp | 12 ++++++------ .../gen9/enable_compiler_product_helper_bxt.cpp | 10 +++++----- .../gen9/enable_compiler_product_helper_cfl.cpp | 10 +++++----- .../gen9/enable_compiler_product_helper_glk.cpp | 10 +++++----- .../gen9/enable_compiler_product_helper_kbl.cpp | 10 +++++----- .../gen9/enable_compiler_product_helper_skl.cpp | 10 +++++----- shared/source/helpers/CMakeLists.txt | 12 ++++++------ shared/source/helpers/addressing_mode_helper.cpp | 2 +- .../helpers/compiler_aot_config_bdw_and_later.inl | 2 +- .../helpers/compiler_aot_config_mtl_and_later.inl | 4 ++-- ...info_config.cpp => compiler_product_helper.cpp} | 2 +- ..._hw_info_config.h => compiler_product_helper.h} | 0 ...g_base.inl => compiler_product_helper_base.inl} | 2 +- ...l => compiler_product_helper_bdw_and_later.inl} | 4 ++-- ...l => compiler_product_helper_before_xe_hpc.inl} | 4 ++-- ...> compiler_product_helper_xe_hpc_and_later.inl} | 4 ++-- shared/source/os_interface/device_factory.cpp | 2 +- .../os_interface/linux/hw_info_config_drm.cpp | 2 +- .../os_interface/windows/hw_info_config_wddm.cpp | 2 +- .../enable_compiler_product_helper_xe_hp_sdv.cpp | 10 +++++----- .../enable_compiler_product_helper_pvc.cpp | 10 +++++----- .../enable_compiler_product_helper_dg2.cpp | 10 +++++----- .../enable_compiler_product_helper_mtl.cpp | 10 +++++----- .../device_binary_format/elf/elf_tests_data.h | 4 ++-- .../device_binary_format/patchtokens_tests.h | 4 ++-- shared/test/common/mocks/mock_modules_zebin.cpp | 2 +- .../unit_test/command_stream/get_devices_tests.cpp | 2 +- .../compiler_interface_tests.cpp | 2 +- .../patchtokens_dumper_tests.cpp | 4 ++-- .../device_binary_format/zebin_decoder_tests.cpp | 2 +- .../gen12lp/rkl/test_hw_info_config_rkl.cpp | 2 +- .../unit_test/gen8/bdw/test_hw_info_config_bdw.cpp | 2 +- shared/test/unit_test/helpers/CMakeLists.txt | 2 +- ...tests.cpp => compiler_product_helper_tests.cpp} | 2 +- .../test/unit_test/helpers/hw_aot_config_tests.cpp | 2 +- .../pvc/linux/hw_info_config_tests_pvc.cpp | 2 +- .../xe_hpg_core/dg2/test_hw_info_config_dg2.cpp | 2 +- .../xe_hpg_core/mtl/hw_info_config_tests_mtl.cpp | 2 +- 74 files changed, 170 insertions(+), 170 deletions(-) rename shared/source/gen12lp/{compiler_hw_info_config_rkl.inl => compiler_product_helper_rkl.inl} (78%) rename shared/source/gen8/{compiler_hw_info_config_bdw.inl => compiler_product_helper_bdw.inl} (79%) rename shared/source/helpers/{compiler_hw_info_config.cpp => compiler_product_helper.cpp} (79%) rename shared/source/helpers/{compiler_hw_info_config.h => compiler_product_helper.h} (100%) rename shared/source/helpers/{compiler_hw_info_config_base.inl => compiler_product_helper_base.inl} (92%) rename shared/source/helpers/{compiler_hw_info_config_bdw_and_later.inl => compiler_product_helper_bdw_and_later.inl} (77%) rename shared/source/helpers/{compiler_hw_info_config_before_xe_hpc.inl => compiler_product_helper_before_xe_hpc.inl} (69%) rename shared/source/helpers/{compiler_hw_info_config_xe_hpc_and_later.inl => compiler_product_helper_xe_hpc_and_later.inl} (78%) rename shared/test/unit_test/helpers/{compiler_hw_info_config_tests.cpp => compiler_product_helper_tests.cpp} (98%) diff --git a/level_zero/core/source/module/module_imp.cpp b/level_zero/core/source/module/module_imp.cpp index 1663fef162..97680db5ee 100644 --- a/level_zero/core/source/module/module_imp.cpp +++ b/level_zero/core/source/module/module_imp.cpp @@ -25,7 +25,7 @@ #include "shared/source/helpers/addressing_mode_helper.h" #include "shared/source/helpers/aligned_memory.h" #include "shared/source/helpers/api_specific_config.h" -#include "shared/source/helpers/compiler_hw_info_config.h" +#include "shared/source/helpers/compiler_product_helper.h" #include "shared/source/helpers/constants.h" #include "shared/source/helpers/kernel_helpers.h" #include "shared/source/helpers/string.h" diff --git a/level_zero/core/test/unit_tests/fixtures/device_fixture.cpp b/level_zero/core/test/unit_tests/fixtures/device_fixture.cpp index 8d56673933..77d2e2fa31 100644 --- a/level_zero/core/test/unit_tests/fixtures/device_fixture.cpp +++ b/level_zero/core/test/unit_tests/fixtures/device_fixture.cpp @@ -8,7 +8,7 @@ #include "level_zero/core/test/unit_tests/fixtures/device_fixture.h" #include "shared/source/built_ins/sip.h" -#include "shared/source/helpers/compiler_hw_info_config.h" +#include "shared/source/helpers/compiler_product_helper.h" #include "shared/source/os_interface/device_factory.h" #include "shared/test/common/mocks/mock_cpu_page_fault_manager.h" #include "shared/test/common/mocks/mock_memory_manager.h" diff --git a/level_zero/core/test/unit_tests/sources/module/test_module.cpp b/level_zero/core/test/unit_tests/sources/module/test_module.cpp index b1f85c61a5..f32371b002 100644 --- a/level_zero/core/test/unit_tests/sources/module/test_module.cpp +++ b/level_zero/core/test/unit_tests/sources/module/test_module.cpp @@ -18,7 +18,7 @@ #include "shared/source/helpers/addressing_mode_helper.h" #include "shared/source/helpers/blit_commands_helper.h" #include "shared/source/helpers/blit_helper.h" -#include "shared/source/helpers/compiler_hw_info_config.h" +#include "shared/source/helpers/compiler_product_helper.h" #include "shared/source/helpers/gfx_core_helper.h" #include "shared/source/kernel/implicit_args.h" #include "shared/source/os_interface/os_inc_base.h" diff --git a/opencl/source/program/program.cpp b/opencl/source/program/program.cpp index 33fa5a6dad..4aec80d6ea 100644 --- a/opencl/source/program/program.cpp +++ b/opencl/source/program/program.cpp @@ -18,8 +18,8 @@ #include "shared/source/execution_environment/execution_environment.h" #include "shared/source/execution_environment/root_device_environment.h" #include "shared/source/helpers/api_specific_config.h" -#include "shared/source/helpers/compiler_hw_info_config.h" #include "shared/source/helpers/compiler_options_parser.h" +#include "shared/source/helpers/compiler_product_helper.h" #include "shared/source/helpers/gfx_core_helper.h" #include "shared/source/memory_manager/memory_manager.h" #include "shared/source/memory_manager/unified_memory_manager.h" diff --git a/opencl/test/unit_test/built_ins/built_in_tests.cpp b/opencl/test/unit_test/built_ins/built_in_tests.cpp index 96bbe175e8..d036e98480 100644 --- a/opencl/test/unit_test/built_ins/built_in_tests.cpp +++ b/opencl/test/unit_test/built_ins/built_in_tests.cpp @@ -9,7 +9,7 @@ #include "shared/source/debug_settings/debug_settings_manager.h" #include "shared/source/gmm_helper/gmm.h" #include "shared/source/gmm_helper/gmm_helper.h" -#include "shared/source/helpers/compiler_hw_info_config.h" +#include "shared/source/helpers/compiler_product_helper.h" #include "shared/source/helpers/file_io.h" #include "shared/source/helpers/hash.h" #include "shared/source/helpers/string.h" diff --git a/opencl/test/unit_test/command_queue/enqueue_kernel_1_tests.cpp b/opencl/test/unit_test/command_queue/enqueue_kernel_1_tests.cpp index b931320b8d..8e2fd1d714 100644 --- a/opencl/test/unit_test/command_queue/enqueue_kernel_1_tests.cpp +++ b/opencl/test/unit_test/command_queue/enqueue_kernel_1_tests.cpp @@ -5,7 +5,7 @@ * */ -#include "shared/source/helpers/compiler_hw_info_config.h" +#include "shared/source/helpers/compiler_product_helper.h" #include "shared/source/helpers/gfx_core_helper.h" #include "shared/source/helpers/pause_on_gpu_properties.h" #include "shared/source/helpers/preamble.h" diff --git a/opencl/test/unit_test/command_queue/enqueue_read_buffer_rect_tests.cpp b/opencl/test/unit_test/command_queue/enqueue_read_buffer_rect_tests.cpp index 6cace30d91..294ccd3197 100644 --- a/opencl/test/unit_test/command_queue/enqueue_read_buffer_rect_tests.cpp +++ b/opencl/test/unit_test/command_queue/enqueue_read_buffer_rect_tests.cpp @@ -6,7 +6,7 @@ */ #include "shared/source/built_ins/built_ins.h" -#include "shared/source/helpers/compiler_hw_info_config.h" +#include "shared/source/helpers/compiler_product_helper.h" #include "shared/test/common/helpers/debug_manager_state_restore.h" #include "shared/test/common/test_macros/test.h" #include "shared/test/common/utilities/base_object_utils.h" diff --git a/opencl/test/unit_test/command_queue/enqueue_write_buffer_rect_tests.cpp b/opencl/test/unit_test/command_queue/enqueue_write_buffer_rect_tests.cpp index 3231015c8f..76bda46798 100644 --- a/opencl/test/unit_test/command_queue/enqueue_write_buffer_rect_tests.cpp +++ b/opencl/test/unit_test/command_queue/enqueue_write_buffer_rect_tests.cpp @@ -6,7 +6,7 @@ */ #include "shared/source/built_ins/built_ins.h" -#include "shared/source/helpers/compiler_hw_info_config.h" +#include "shared/source/helpers/compiler_product_helper.h" #include "shared/test/common/helpers/debug_manager_state_restore.h" #include "shared/test/common/test_macros/test.h" #include "shared/test/common/utilities/base_object_utils.h" diff --git a/opencl/test/unit_test/gtpin/gtpin_tests.cpp b/opencl/test/unit_test/gtpin/gtpin_tests.cpp index 8932a33281..0e19c0ebb9 100644 --- a/opencl/test/unit_test/gtpin/gtpin_tests.cpp +++ b/opencl/test/unit_test/gtpin/gtpin_tests.cpp @@ -8,7 +8,7 @@ #include "shared/source/device/device.h" #include "shared/source/device_binary_format/patchtokens_decoder.h" #include "shared/source/helpers/basic_math.h" -#include "shared/source/helpers/compiler_hw_info_config.h" +#include "shared/source/helpers/compiler_product_helper.h" #include "shared/source/helpers/file_io.h" #include "shared/source/helpers/hash.h" #include "shared/source/memory_manager/surface.h" diff --git a/opencl/test/unit_test/mem_obj/buffer_tests.cpp b/opencl/test/unit_test/mem_obj/buffer_tests.cpp index becaa4c45e..7da0c78ecd 100644 --- a/opencl/test/unit_test/mem_obj/buffer_tests.cpp +++ b/opencl/test/unit_test/mem_obj/buffer_tests.cpp @@ -8,7 +8,7 @@ #include "shared/source/command_container/encode_surface_state.h" #include "shared/source/gmm_helper/gmm_helper.h" #include "shared/source/helpers/array_count.h" -#include "shared/source/helpers/compiler_hw_info_config.h" +#include "shared/source/helpers/compiler_product_helper.h" #include "shared/source/helpers/gfx_core_helper.h" #include "shared/source/helpers/local_memory_access_modes.h" #include "shared/source/memory_manager/memory_operations_handler.h" diff --git a/opencl/test/unit_test/mem_obj/linux/buffer_linux_tests.cpp b/opencl/test/unit_test/mem_obj/linux/buffer_linux_tests.cpp index f4e98d25e3..ceb232d7ad 100644 --- a/opencl/test/unit_test/mem_obj/linux/buffer_linux_tests.cpp +++ b/opencl/test/unit_test/mem_obj/linux/buffer_linux_tests.cpp @@ -7,7 +7,7 @@ #include "shared/source/gmm_helper/gmm_helper.h" #include "shared/source/helpers/array_count.h" -#include "shared/source/helpers/compiler_hw_info_config.h" +#include "shared/source/helpers/compiler_product_helper.h" #include "shared/source/helpers/gfx_core_helper.h" #include "shared/source/helpers/local_memory_access_modes.h" #include "shared/source/memory_manager/memory_operations_handler.h" diff --git a/opencl/test/unit_test/mem_obj/windows/buffer_windows_tests.cpp b/opencl/test/unit_test/mem_obj/windows/buffer_windows_tests.cpp index 972ef88bfe..86cb85de90 100644 --- a/opencl/test/unit_test/mem_obj/windows/buffer_windows_tests.cpp +++ b/opencl/test/unit_test/mem_obj/windows/buffer_windows_tests.cpp @@ -7,7 +7,7 @@ #include "shared/source/gmm_helper/gmm_helper.h" #include "shared/source/helpers/array_count.h" -#include "shared/source/helpers/compiler_hw_info_config.h" +#include "shared/source/helpers/compiler_product_helper.h" #include "shared/source/helpers/gfx_core_helper.h" #include "shared/source/helpers/local_memory_access_modes.h" #include "shared/source/memory_manager/memory_operations_handler.h" diff --git a/opencl/test/unit_test/offline_compiler/ocloc_fatbinary_tests.cpp b/opencl/test/unit_test/offline_compiler/ocloc_fatbinary_tests.cpp index 9be73189aa..06d37f8761 100644 --- a/opencl/test/unit_test/offline_compiler/ocloc_fatbinary_tests.cpp +++ b/opencl/test/unit_test/offline_compiler/ocloc_fatbinary_tests.cpp @@ -14,7 +14,7 @@ #include "shared/source/device_binary_format/ar/ar_decoder.h" #include "shared/source/device_binary_format/elf/elf_decoder.h" #include "shared/source/device_binary_format/elf/ocl_elf.h" -#include "shared/source/helpers/compiler_hw_info_config.h" +#include "shared/source/helpers/compiler_product_helper.h" #include "shared/source/helpers/gfx_core_helper.h" #include "shared/source/helpers/product_config_helper.h" diff --git a/opencl/test/unit_test/offline_compiler/offline_compiler_tests.cpp b/opencl/test/unit_test/offline_compiler/offline_compiler_tests.cpp index 4f36284da7..4b5253cfc1 100644 --- a/opencl/test/unit_test/offline_compiler/offline_compiler_tests.cpp +++ b/opencl/test/unit_test/offline_compiler/offline_compiler_tests.cpp @@ -14,7 +14,7 @@ #include "shared/source/debug_settings/debug_settings_manager.h" #include "shared/source/device_binary_format/elf/elf_decoder.h" #include "shared/source/device_binary_format/elf/ocl_elf.h" -#include "shared/source/helpers/compiler_hw_info_config.h" +#include "shared/source/helpers/compiler_product_helper.h" #include "shared/source/helpers/file_io.h" #include "shared/source/helpers/hw_info.h" #include "shared/source/helpers/product_config_helper.h" diff --git a/opencl/test/unit_test/program/program_tests.cpp b/opencl/test/unit_test/program/program_tests.cpp index 2d34e97404..d96bfa8ad6 100644 --- a/opencl/test/unit_test/program/program_tests.cpp +++ b/opencl/test/unit_test/program/program_tests.cpp @@ -18,7 +18,7 @@ #include "shared/source/gmm_helper/gmm_helper.h" #include "shared/source/helpers/addressing_mode_helper.h" #include "shared/source/helpers/aligned_memory.h" -#include "shared/source/helpers/compiler_hw_info_config.h" +#include "shared/source/helpers/compiler_product_helper.h" #include "shared/source/helpers/gfx_core_helper.h" #include "shared/source/helpers/hash.h" #include "shared/source/helpers/ptr_math.h" diff --git a/opencl/test/unit_test/scenarios/windows/enqueue_read_write_buffer_scenarios_windows_tests.cpp b/opencl/test/unit_test/scenarios/windows/enqueue_read_write_buffer_scenarios_windows_tests.cpp index ca8f8bd3c2..2b5a900c15 100644 --- a/opencl/test/unit_test/scenarios/windows/enqueue_read_write_buffer_scenarios_windows_tests.cpp +++ b/opencl/test/unit_test/scenarios/windows/enqueue_read_write_buffer_scenarios_windows_tests.cpp @@ -5,7 +5,7 @@ * */ -#include "shared/source/helpers/compiler_hw_info_config.h" +#include "shared/source/helpers/compiler_product_helper.h" #include "shared/source/memory_manager/internal_allocation_storage.h" #include "shared/source/os_interface/os_interface.h" #include "shared/source/os_interface/windows/wddm_device_command_stream.h" diff --git a/shared/offline_compiler/source/CMakeLists.txt b/shared/offline_compiler/source/CMakeLists.txt index d68b225e41..436b487928 100644 --- a/shared/offline_compiler/source/CMakeLists.txt +++ b/shared/offline_compiler/source/CMakeLists.txt @@ -40,13 +40,13 @@ set(CLOC_LIB_SRCS_LIB ${NEO_SHARED_DIRECTORY}/dll/devices${BRANCH_DIR_SUFFIX}/product_config.inl ${NEO_SHARED_DIRECTORY}/dll/devices/product_config_base.inl ${NEO_SHARED_DIRECTORY}/helpers/abort.cpp - ${NEO_SHARED_DIRECTORY}/helpers/compiler_hw_info_config.h - ${NEO_SHARED_DIRECTORY}/helpers/compiler_hw_info_config.cpp - ${NEO_SHARED_DIRECTORY}/helpers/compiler_hw_info_config_base.inl + ${NEO_SHARED_DIRECTORY}/helpers/compiler_product_helper.h + ${NEO_SHARED_DIRECTORY}/helpers/compiler_product_helper.cpp + ${NEO_SHARED_DIRECTORY}/helpers/compiler_product_helper_base.inl ${NEO_SHARED_DIRECTORY}/helpers/compiler_aot_config_bdw_and_later.inl - ${NEO_SHARED_DIRECTORY}/helpers/compiler_hw_info_config_bdw_and_later.inl - ${NEO_SHARED_DIRECTORY}/helpers/compiler_hw_info_config_before_xe_hpc.inl - ${NEO_SHARED_DIRECTORY}/helpers/compiler_hw_info_config_xe_hpc_and_later.inl + ${NEO_SHARED_DIRECTORY}/helpers/compiler_product_helper_bdw_and_later.inl + ${NEO_SHARED_DIRECTORY}/helpers/compiler_product_helper_before_xe_hpc.inl + ${NEO_SHARED_DIRECTORY}/helpers/compiler_product_helper_xe_hpc_and_later.inl ${NEO_SHARED_DIRECTORY}/helpers/compiler_options_parser.cpp ${NEO_SHARED_DIRECTORY}/helpers/compiler_options_parser.h ${NEO_SHARED_DIRECTORY}/helpers/cache_policy.h @@ -154,7 +154,7 @@ macro(macro_for_each_platform) foreach(BRANCH ${BRANCH_DIR_LIST}) foreach(SRC_FILE ${NEO_SOURCE_DIR}/shared/source${BRANCH}${CORE_TYPE_LOWER}/definitions${BRANCH_DIR_SUFFIX}hw_info_setup_${PLATFORM_IT_LOWER}.inl ${NEO_SOURCE_DIR}/shared/source${BRANCH}${CORE_TYPE_LOWER}${BRANCH_DIR}hw_info_${PLATFORM_IT_LOWER}.cpp - ${NEO_SOURCE_DIR}/shared/source${BRANCH}${CORE_TYPE_LOWER}${BRANCH_DIR}compiler_hw_info_config_${PLATFORM_IT_LOWER}.inl + ${NEO_SOURCE_DIR}/shared/source${BRANCH}${CORE_TYPE_LOWER}${BRANCH_DIR}compiler_product_helper_${PLATFORM_IT_LOWER}.inl ${NEO_SOURCE_DIR}/shared/source${BRANCH}${CORE_TYPE_LOWER}${BRANCH_DIR}enable_compiler_product_helper_${PLATFORM_IT_LOWER}.cpp ) if(EXISTS ${SRC_FILE}) diff --git a/shared/offline_compiler/source/ocloc_arg_helper.cpp b/shared/offline_compiler/source/ocloc_arg_helper.cpp index d4ea2c7cee..6c9e25af01 100644 --- a/shared/offline_compiler/source/ocloc_arg_helper.cpp +++ b/shared/offline_compiler/source/ocloc_arg_helper.cpp @@ -7,7 +7,7 @@ #include "ocloc_arg_helper.h" -#include "shared/source/helpers/compiler_hw_info_config.h" +#include "shared/source/helpers/compiler_product_helper.h" #include "shared/source/helpers/file_io.h" #include "shared/source/helpers/hw_info.h" #include "shared/source/helpers/string.h" diff --git a/shared/offline_compiler/source/ocloc_igc_facade.cpp b/shared/offline_compiler/source/ocloc_igc_facade.cpp index 4c097c75d7..cb87dfda4c 100644 --- a/shared/offline_compiler/source/ocloc_igc_facade.cpp +++ b/shared/offline_compiler/source/ocloc_igc_facade.cpp @@ -10,7 +10,7 @@ #include "shared/offline_compiler/source/ocloc_arg_helper.h" #include "shared/offline_compiler/source/ocloc_error_code.h" #include "shared/source/compiler_interface/igc_platform_helper.h" -#include "shared/source/helpers/compiler_hw_info_config.h" +#include "shared/source/helpers/compiler_product_helper.h" #include "shared/source/helpers/debug_helpers.h" #include "shared/source/helpers/hw_info.h" #include "shared/source/os_interface/os_inc_base.h" diff --git a/shared/offline_compiler/source/offline_compiler.cpp b/shared/offline_compiler/source/offline_compiler.cpp index f33482275f..84fb88cfcf 100644 --- a/shared/offline_compiler/source/offline_compiler.cpp +++ b/shared/offline_compiler/source/offline_compiler.cpp @@ -17,8 +17,8 @@ #include "shared/source/device_binary_format/device_binary_formats.h" #include "shared/source/device_binary_format/elf/elf_encoder.h" #include "shared/source/device_binary_format/elf/ocl_elf.h" -#include "shared/source/helpers/compiler_hw_info_config.h" #include "shared/source/helpers/compiler_options_parser.h" +#include "shared/source/helpers/compiler_product_helper.h" #include "shared/source/helpers/debug_helpers.h" #include "shared/source/helpers/string.h" #include "shared/source/helpers/validators.h" diff --git a/shared/offline_compiler/source/offline_linker.cpp b/shared/offline_compiler/source/offline_linker.cpp index 763e67e769..85d71e9c29 100644 --- a/shared/offline_compiler/source/offline_linker.cpp +++ b/shared/offline_compiler/source/offline_linker.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2022 Intel Corporation + * Copyright (C) 2022-2023 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -12,7 +12,7 @@ #include "shared/source/compiler_interface/intermediate_representations.h" #include "shared/source/device_binary_format/elf/elf_encoder.h" #include "shared/source/device_binary_format/elf/ocl_elf.h" -#include "shared/source/helpers/compiler_hw_info_config.h" +#include "shared/source/helpers/compiler_product_helper.h" #include "shared/source/helpers/string.h" #include "cif/common/cif_main.h" diff --git a/shared/source/compiler_interface/compiler_interface.cpp b/shared/source/compiler_interface/compiler_interface.cpp index 69f2d48913..4153fe6631 100644 --- a/shared/source/compiler_interface/compiler_interface.cpp +++ b/shared/source/compiler_interface/compiler_interface.cpp @@ -13,7 +13,7 @@ #include "shared/source/compiler_interface/igc_platform_helper.h" #include "shared/source/debug_settings/debug_settings_manager.h" #include "shared/source/device/device.h" -#include "shared/source/helpers/compiler_hw_info_config.h" +#include "shared/source/helpers/compiler_product_helper.h" #include "shared/source/helpers/hw_info.h" #include "shared/source/os_interface/os_inc_base.h" diff --git a/shared/source/device_binary_format/device_binary_formats.cpp b/shared/source/device_binary_format/device_binary_formats.cpp index a16d4e8204..cd289c867a 100644 --- a/shared/source/device_binary_format/device_binary_formats.cpp +++ b/shared/source/device_binary_format/device_binary_formats.cpp @@ -8,7 +8,7 @@ #include "shared/source/device_binary_format/device_binary_formats.h" #include "shared/source/execution_environment/root_device_environment.h" -#include "shared/source/helpers/compiler_hw_info_config.h" +#include "shared/source/helpers/compiler_product_helper.h" #include "shared/source/helpers/gfx_core_helper.h" #include "shared/source/helpers/hw_info.h" #include "shared/source/os_interface/hw_info_config.h" diff --git a/shared/source/enable_cores.cmake b/shared/source/enable_cores.cmake index 042ccea315..92ab570907 100644 --- a/shared/source/enable_cores.cmake +++ b/shared/source/enable_cores.cmake @@ -97,7 +97,7 @@ macro(macro_for_each_platform) if(EXISTS ${SRC_FILE}) list(APPEND ${CORE_TYPE}_SRC_LINK_BASE ${SRC_FILE}) endif() - set(SRC_FILE ${CMAKE_CURRENT_SOURCE_DIR}${BRANCH_DIR}${CORE_TYPE_LOWER}/compiler_hw_info_config_${PLATFORM_IT_LOWER}.inl) + set(SRC_FILE ${CMAKE_CURRENT_SOURCE_DIR}${BRANCH_DIR}${CORE_TYPE_LOWER}/compiler_product_helper_${PLATFORM_IT_LOWER}.inl) if(EXISTS ${SRC_FILE}) list(APPEND ${CORE_TYPE}_SRC_LINK_BASE ${SRC_FILE}) endif() diff --git a/shared/source/execution_environment/root_device_environment.cpp b/shared/source/execution_environment/root_device_environment.cpp index cf1670ed45..d31dcb6063 100644 --- a/shared/source/execution_environment/root_device_environment.cpp +++ b/shared/source/execution_environment/root_device_environment.cpp @@ -22,7 +22,7 @@ #include "shared/source/helpers/api_gfx_core_helper.h" #include "shared/source/helpers/api_specific_config.h" #include "shared/source/helpers/bindless_heaps_helper.h" -#include "shared/source/helpers/compiler_hw_info_config.h" +#include "shared/source/helpers/compiler_product_helper.h" #include "shared/source/helpers/gfx_core_helper.h" #include "shared/source/helpers/hw_info.h" #include "shared/source/memory_manager/memory_manager.h" diff --git a/shared/source/gen11/enable_compiler_product_helper_ehl.cpp b/shared/source/gen11/enable_compiler_product_helper_ehl.cpp index 3df9efdf97..3deec8aaaa 100644 --- a/shared/source/gen11/enable_compiler_product_helper_ehl.cpp +++ b/shared/source/gen11/enable_compiler_product_helper_ehl.cpp @@ -1,15 +1,15 @@ /* - * Copyright (C) 2022 Intel Corporation + * Copyright (C) 2022-2023 Intel Corporation * * SPDX-License-Identifier: MIT * */ #include "shared/source/helpers/compiler_aot_config_bdw_and_later.inl" -#include "shared/source/helpers/compiler_hw_info_config.h" -#include "shared/source/helpers/compiler_hw_info_config_base.inl" -#include "shared/source/helpers/compiler_hw_info_config_bdw_and_later.inl" -#include "shared/source/helpers/compiler_hw_info_config_before_xe_hpc.inl" +#include "shared/source/helpers/compiler_product_helper.h" +#include "shared/source/helpers/compiler_product_helper_base.inl" +#include "shared/source/helpers/compiler_product_helper_bdw_and_later.inl" +#include "shared/source/helpers/compiler_product_helper_before_xe_hpc.inl" #include "hw_info_ehl.h" diff --git a/shared/source/gen11/enable_compiler_product_helper_icllp.cpp b/shared/source/gen11/enable_compiler_product_helper_icllp.cpp index 1b6d570f97..739267a755 100644 --- a/shared/source/gen11/enable_compiler_product_helper_icllp.cpp +++ b/shared/source/gen11/enable_compiler_product_helper_icllp.cpp @@ -1,15 +1,15 @@ /* - * Copyright (C) 2022 Intel Corporation + * Copyright (C) 2022-2023 Intel Corporation * * SPDX-License-Identifier: MIT * */ #include "shared/source/helpers/compiler_aot_config_bdw_and_later.inl" -#include "shared/source/helpers/compiler_hw_info_config.h" -#include "shared/source/helpers/compiler_hw_info_config_base.inl" -#include "shared/source/helpers/compiler_hw_info_config_bdw_and_later.inl" -#include "shared/source/helpers/compiler_hw_info_config_before_xe_hpc.inl" +#include "shared/source/helpers/compiler_product_helper.h" +#include "shared/source/helpers/compiler_product_helper_base.inl" +#include "shared/source/helpers/compiler_product_helper_bdw_and_later.inl" +#include "shared/source/helpers/compiler_product_helper_before_xe_hpc.inl" #include "hw_info_icllp.h" diff --git a/shared/source/gen11/enable_compiler_product_helper_lkf.cpp b/shared/source/gen11/enable_compiler_product_helper_lkf.cpp index d266d7dad4..dd3a67a997 100644 --- a/shared/source/gen11/enable_compiler_product_helper_lkf.cpp +++ b/shared/source/gen11/enable_compiler_product_helper_lkf.cpp @@ -1,15 +1,15 @@ /* - * Copyright (C) 2022 Intel Corporation + * Copyright (C) 2022-2023 Intel Corporation * * SPDX-License-Identifier: MIT * */ #include "shared/source/helpers/compiler_aot_config_bdw_and_later.inl" -#include "shared/source/helpers/compiler_hw_info_config.h" -#include "shared/source/helpers/compiler_hw_info_config_base.inl" -#include "shared/source/helpers/compiler_hw_info_config_bdw_and_later.inl" -#include "shared/source/helpers/compiler_hw_info_config_before_xe_hpc.inl" +#include "shared/source/helpers/compiler_product_helper.h" +#include "shared/source/helpers/compiler_product_helper_base.inl" +#include "shared/source/helpers/compiler_product_helper_bdw_and_later.inl" +#include "shared/source/helpers/compiler_product_helper_before_xe_hpc.inl" #include "hw_info_lkf.h" diff --git a/shared/source/gen12lp/compiler_hw_info_config_rkl.inl b/shared/source/gen12lp/compiler_product_helper_rkl.inl similarity index 78% rename from shared/source/gen12lp/compiler_hw_info_config_rkl.inl rename to shared/source/gen12lp/compiler_product_helper_rkl.inl index 42c3bb64ee..120cc2eacb 100644 --- a/shared/source/gen12lp/compiler_hw_info_config_rkl.inl +++ b/shared/source/gen12lp/compiler_product_helper_rkl.inl @@ -1,5 +1,5 @@ /* - * Copyright (C) 2021-2022 Intel Corporation + * Copyright (C) 2021-2023 Intel Corporation * * SPDX-License-Identifier: MIT * diff --git a/shared/source/gen12lp/enable_compiler_product_helper_adln.cpp b/shared/source/gen12lp/enable_compiler_product_helper_adln.cpp index bd81edcf85..bf8655eb20 100644 --- a/shared/source/gen12lp/enable_compiler_product_helper_adln.cpp +++ b/shared/source/gen12lp/enable_compiler_product_helper_adln.cpp @@ -1,15 +1,15 @@ /* - * Copyright (C) 2022 Intel Corporation + * Copyright (C) 2022-2023 Intel Corporation * * SPDX-License-Identifier: MIT * */ #include "shared/source/helpers/compiler_aot_config_bdw_and_later.inl" -#include "shared/source/helpers/compiler_hw_info_config.h" -#include "shared/source/helpers/compiler_hw_info_config_base.inl" -#include "shared/source/helpers/compiler_hw_info_config_bdw_and_later.inl" -#include "shared/source/helpers/compiler_hw_info_config_before_xe_hpc.inl" +#include "shared/source/helpers/compiler_product_helper.h" +#include "shared/source/helpers/compiler_product_helper_base.inl" +#include "shared/source/helpers/compiler_product_helper_bdw_and_later.inl" +#include "shared/source/helpers/compiler_product_helper_before_xe_hpc.inl" #include "hw_info_adln.h" diff --git a/shared/source/gen12lp/enable_compiler_product_helper_adlp.cpp b/shared/source/gen12lp/enable_compiler_product_helper_adlp.cpp index ee36012b95..e4a972c04d 100644 --- a/shared/source/gen12lp/enable_compiler_product_helper_adlp.cpp +++ b/shared/source/gen12lp/enable_compiler_product_helper_adlp.cpp @@ -1,15 +1,15 @@ /* - * Copyright (C) 2022 Intel Corporation + * Copyright (C) 2022-2023 Intel Corporation * * SPDX-License-Identifier: MIT * */ #include "shared/source/helpers/compiler_aot_config_bdw_and_later.inl" -#include "shared/source/helpers/compiler_hw_info_config.h" -#include "shared/source/helpers/compiler_hw_info_config_base.inl" -#include "shared/source/helpers/compiler_hw_info_config_bdw_and_later.inl" -#include "shared/source/helpers/compiler_hw_info_config_before_xe_hpc.inl" +#include "shared/source/helpers/compiler_product_helper.h" +#include "shared/source/helpers/compiler_product_helper_base.inl" +#include "shared/source/helpers/compiler_product_helper_bdw_and_later.inl" +#include "shared/source/helpers/compiler_product_helper_before_xe_hpc.inl" #include "hw_info_adlp.h" diff --git a/shared/source/gen12lp/enable_compiler_product_helper_adls.cpp b/shared/source/gen12lp/enable_compiler_product_helper_adls.cpp index e12a35f56e..9c7a7665aa 100644 --- a/shared/source/gen12lp/enable_compiler_product_helper_adls.cpp +++ b/shared/source/gen12lp/enable_compiler_product_helper_adls.cpp @@ -1,15 +1,15 @@ /* - * Copyright (C) 2022 Intel Corporation + * Copyright (C) 2022-2023 Intel Corporation * * SPDX-License-Identifier: MIT * */ #include "shared/source/helpers/compiler_aot_config_bdw_and_later.inl" -#include "shared/source/helpers/compiler_hw_info_config.h" -#include "shared/source/helpers/compiler_hw_info_config_base.inl" -#include "shared/source/helpers/compiler_hw_info_config_bdw_and_later.inl" -#include "shared/source/helpers/compiler_hw_info_config_before_xe_hpc.inl" +#include "shared/source/helpers/compiler_product_helper.h" +#include "shared/source/helpers/compiler_product_helper_base.inl" +#include "shared/source/helpers/compiler_product_helper_bdw_and_later.inl" +#include "shared/source/helpers/compiler_product_helper_before_xe_hpc.inl" #include "hw_info_adls.h" namespace NEO { diff --git a/shared/source/gen12lp/enable_compiler_product_helper_dg1.cpp b/shared/source/gen12lp/enable_compiler_product_helper_dg1.cpp index e9c0ed16e7..37842169a5 100644 --- a/shared/source/gen12lp/enable_compiler_product_helper_dg1.cpp +++ b/shared/source/gen12lp/enable_compiler_product_helper_dg1.cpp @@ -1,15 +1,15 @@ /* - * Copyright (C) 2022 Intel Corporation + * Copyright (C) 2022-2023 Intel Corporation * * SPDX-License-Identifier: MIT * */ #include "shared/source/helpers/compiler_aot_config_bdw_and_later.inl" -#include "shared/source/helpers/compiler_hw_info_config.h" -#include "shared/source/helpers/compiler_hw_info_config_base.inl" -#include "shared/source/helpers/compiler_hw_info_config_bdw_and_later.inl" -#include "shared/source/helpers/compiler_hw_info_config_before_xe_hpc.inl" +#include "shared/source/helpers/compiler_product_helper.h" +#include "shared/source/helpers/compiler_product_helper_base.inl" +#include "shared/source/helpers/compiler_product_helper_bdw_and_later.inl" +#include "shared/source/helpers/compiler_product_helper_before_xe_hpc.inl" #include "hw_info_dg1.h" namespace NEO { diff --git a/shared/source/gen12lp/enable_compiler_product_helper_rkl.cpp b/shared/source/gen12lp/enable_compiler_product_helper_rkl.cpp index 57427af237..8efa26b169 100644 --- a/shared/source/gen12lp/enable_compiler_product_helper_rkl.cpp +++ b/shared/source/gen12lp/enable_compiler_product_helper_rkl.cpp @@ -1,20 +1,20 @@ /* - * Copyright (C) 2022 Intel Corporation + * Copyright (C) 2022-2023 Intel Corporation * * SPDX-License-Identifier: MIT * */ #include "shared/source/helpers/compiler_aot_config_bdw_and_later.inl" -#include "shared/source/helpers/compiler_hw_info_config.h" -#include "shared/source/helpers/compiler_hw_info_config_base.inl" -#include "shared/source/helpers/compiler_hw_info_config_bdw_and_later.inl" -#include "shared/source/helpers/compiler_hw_info_config_before_xe_hpc.inl" +#include "shared/source/helpers/compiler_product_helper.h" +#include "shared/source/helpers/compiler_product_helper_base.inl" +#include "shared/source/helpers/compiler_product_helper_bdw_and_later.inl" +#include "shared/source/helpers/compiler_product_helper_before_xe_hpc.inl" #include "hw_info_rkl.h" namespace NEO { -#include "shared/source/gen12lp/compiler_hw_info_config_rkl.inl" +#include "shared/source/gen12lp/compiler_product_helper_rkl.inl" static EnableCompilerProductHelper enableCompilerProductHelperRKL; } // namespace NEO diff --git a/shared/source/gen12lp/enable_compiler_product_helper_tgllp.cpp b/shared/source/gen12lp/enable_compiler_product_helper_tgllp.cpp index 560ffd89c1..f010794cd1 100644 --- a/shared/source/gen12lp/enable_compiler_product_helper_tgllp.cpp +++ b/shared/source/gen12lp/enable_compiler_product_helper_tgllp.cpp @@ -1,15 +1,15 @@ /* - * Copyright (C) 2022 Intel Corporation + * Copyright (C) 2022-2023 Intel Corporation * * SPDX-License-Identifier: MIT * */ #include "shared/source/helpers/compiler_aot_config_bdw_and_later.inl" -#include "shared/source/helpers/compiler_hw_info_config.h" -#include "shared/source/helpers/compiler_hw_info_config_base.inl" -#include "shared/source/helpers/compiler_hw_info_config_bdw_and_later.inl" -#include "shared/source/helpers/compiler_hw_info_config_before_xe_hpc.inl" +#include "shared/source/helpers/compiler_product_helper.h" +#include "shared/source/helpers/compiler_product_helper_base.inl" +#include "shared/source/helpers/compiler_product_helper_bdw_and_later.inl" +#include "shared/source/helpers/compiler_product_helper_before_xe_hpc.inl" #include "hw_info_tgllp.h" diff --git a/shared/source/gen8/compiler_hw_info_config_bdw.inl b/shared/source/gen8/compiler_product_helper_bdw.inl similarity index 79% rename from shared/source/gen8/compiler_hw_info_config_bdw.inl rename to shared/source/gen8/compiler_product_helper_bdw.inl index 15722e4451..c54572711a 100644 --- a/shared/source/gen8/compiler_hw_info_config_bdw.inl +++ b/shared/source/gen8/compiler_product_helper_bdw.inl @@ -1,5 +1,5 @@ /* - * Copyright (C) 2021-2022 Intel Corporation + * Copyright (C) 2021-2023 Intel Corporation * * SPDX-License-Identifier: MIT * diff --git a/shared/source/gen8/enable_compiler_product_helper_bdw.cpp b/shared/source/gen8/enable_compiler_product_helper_bdw.cpp index c7397e33df..06033c892c 100644 --- a/shared/source/gen8/enable_compiler_product_helper_bdw.cpp +++ b/shared/source/gen8/enable_compiler_product_helper_bdw.cpp @@ -1,21 +1,21 @@ /* - * Copyright (C) 2022 Intel Corporation + * Copyright (C) 2022-2023 Intel Corporation * * SPDX-License-Identifier: MIT * */ #include "shared/source/helpers/compiler_aot_config_bdw_and_later.inl" -#include "shared/source/helpers/compiler_hw_info_config.h" -#include "shared/source/helpers/compiler_hw_info_config_base.inl" -#include "shared/source/helpers/compiler_hw_info_config_bdw_and_later.inl" -#include "shared/source/helpers/compiler_hw_info_config_before_xe_hpc.inl" +#include "shared/source/helpers/compiler_product_helper.h" +#include "shared/source/helpers/compiler_product_helper_base.inl" +#include "shared/source/helpers/compiler_product_helper_bdw_and_later.inl" +#include "shared/source/helpers/compiler_product_helper_before_xe_hpc.inl" #include "hw_info_bdw.h" namespace NEO { -#include "shared/source/gen8/compiler_hw_info_config_bdw.inl" +#include "shared/source/gen8/compiler_product_helper_bdw.inl" static EnableCompilerProductHelper enableCompilerProductHelperBDW; } // namespace NEO diff --git a/shared/source/gen9/enable_compiler_product_helper_bxt.cpp b/shared/source/gen9/enable_compiler_product_helper_bxt.cpp index 626f4c3be8..ab2106d0b2 100644 --- a/shared/source/gen9/enable_compiler_product_helper_bxt.cpp +++ b/shared/source/gen9/enable_compiler_product_helper_bxt.cpp @@ -1,15 +1,15 @@ /* - * Copyright (C) 2022 Intel Corporation + * Copyright (C) 2022-2023 Intel Corporation * * SPDX-License-Identifier: MIT * */ #include "shared/source/helpers/compiler_aot_config_bdw_and_later.inl" -#include "shared/source/helpers/compiler_hw_info_config.h" -#include "shared/source/helpers/compiler_hw_info_config_base.inl" -#include "shared/source/helpers/compiler_hw_info_config_bdw_and_later.inl" -#include "shared/source/helpers/compiler_hw_info_config_before_xe_hpc.inl" +#include "shared/source/helpers/compiler_product_helper.h" +#include "shared/source/helpers/compiler_product_helper_base.inl" +#include "shared/source/helpers/compiler_product_helper_bdw_and_later.inl" +#include "shared/source/helpers/compiler_product_helper_before_xe_hpc.inl" #include "hw_info_bxt.h" diff --git a/shared/source/gen9/enable_compiler_product_helper_cfl.cpp b/shared/source/gen9/enable_compiler_product_helper_cfl.cpp index 2d325acccc..9c839c8569 100644 --- a/shared/source/gen9/enable_compiler_product_helper_cfl.cpp +++ b/shared/source/gen9/enable_compiler_product_helper_cfl.cpp @@ -1,15 +1,15 @@ /* - * Copyright (C) 2022 Intel Corporation + * Copyright (C) 2022-2023 Intel Corporation * * SPDX-License-Identifier: MIT * */ #include "shared/source/helpers/compiler_aot_config_bdw_and_later.inl" -#include "shared/source/helpers/compiler_hw_info_config.h" -#include "shared/source/helpers/compiler_hw_info_config_base.inl" -#include "shared/source/helpers/compiler_hw_info_config_bdw_and_later.inl" -#include "shared/source/helpers/compiler_hw_info_config_before_xe_hpc.inl" +#include "shared/source/helpers/compiler_product_helper.h" +#include "shared/source/helpers/compiler_product_helper_base.inl" +#include "shared/source/helpers/compiler_product_helper_bdw_and_later.inl" +#include "shared/source/helpers/compiler_product_helper_before_xe_hpc.inl" #include "hw_info_cfl.h" diff --git a/shared/source/gen9/enable_compiler_product_helper_glk.cpp b/shared/source/gen9/enable_compiler_product_helper_glk.cpp index d548456eb3..5b4b05aae3 100644 --- a/shared/source/gen9/enable_compiler_product_helper_glk.cpp +++ b/shared/source/gen9/enable_compiler_product_helper_glk.cpp @@ -1,15 +1,15 @@ /* - * Copyright (C) 2022 Intel Corporation + * Copyright (C) 2022-2023 Intel Corporation * * SPDX-License-Identifier: MIT * */ #include "shared/source/helpers/compiler_aot_config_bdw_and_later.inl" -#include "shared/source/helpers/compiler_hw_info_config.h" -#include "shared/source/helpers/compiler_hw_info_config_base.inl" -#include "shared/source/helpers/compiler_hw_info_config_bdw_and_later.inl" -#include "shared/source/helpers/compiler_hw_info_config_before_xe_hpc.inl" +#include "shared/source/helpers/compiler_product_helper.h" +#include "shared/source/helpers/compiler_product_helper_base.inl" +#include "shared/source/helpers/compiler_product_helper_bdw_and_later.inl" +#include "shared/source/helpers/compiler_product_helper_before_xe_hpc.inl" #include "hw_info_glk.h" diff --git a/shared/source/gen9/enable_compiler_product_helper_kbl.cpp b/shared/source/gen9/enable_compiler_product_helper_kbl.cpp index 99aa8165fc..6320bc0eec 100644 --- a/shared/source/gen9/enable_compiler_product_helper_kbl.cpp +++ b/shared/source/gen9/enable_compiler_product_helper_kbl.cpp @@ -1,15 +1,15 @@ /* - * Copyright (C) 2022 Intel Corporation + * Copyright (C) 2022-2023 Intel Corporation * * SPDX-License-Identifier: MIT * */ #include "shared/source/helpers/compiler_aot_config_bdw_and_later.inl" -#include "shared/source/helpers/compiler_hw_info_config.h" -#include "shared/source/helpers/compiler_hw_info_config_base.inl" -#include "shared/source/helpers/compiler_hw_info_config_bdw_and_later.inl" -#include "shared/source/helpers/compiler_hw_info_config_before_xe_hpc.inl" +#include "shared/source/helpers/compiler_product_helper.h" +#include "shared/source/helpers/compiler_product_helper_base.inl" +#include "shared/source/helpers/compiler_product_helper_bdw_and_later.inl" +#include "shared/source/helpers/compiler_product_helper_before_xe_hpc.inl" #include "hw_info_kbl.h" diff --git a/shared/source/gen9/enable_compiler_product_helper_skl.cpp b/shared/source/gen9/enable_compiler_product_helper_skl.cpp index 5d2a126255..a086674b81 100644 --- a/shared/source/gen9/enable_compiler_product_helper_skl.cpp +++ b/shared/source/gen9/enable_compiler_product_helper_skl.cpp @@ -1,15 +1,15 @@ /* - * Copyright (C) 2022 Intel Corporation + * Copyright (C) 2022-2023 Intel Corporation * * SPDX-License-Identifier: MIT * */ #include "shared/source/helpers/compiler_aot_config_bdw_and_later.inl" -#include "shared/source/helpers/compiler_hw_info_config.h" -#include "shared/source/helpers/compiler_hw_info_config_base.inl" -#include "shared/source/helpers/compiler_hw_info_config_bdw_and_later.inl" -#include "shared/source/helpers/compiler_hw_info_config_before_xe_hpc.inl" +#include "shared/source/helpers/compiler_product_helper.h" +#include "shared/source/helpers/compiler_product_helper_base.inl" +#include "shared/source/helpers/compiler_product_helper_bdw_and_later.inl" +#include "shared/source/helpers/compiler_product_helper_before_xe_hpc.inl" #include "hw_info_skl.h" diff --git a/shared/source/helpers/CMakeLists.txt b/shared/source/helpers/CMakeLists.txt index 9932e483e0..98c18d354b 100644 --- a/shared/source/helpers/CMakeLists.txt +++ b/shared/source/helpers/CMakeLists.txt @@ -38,13 +38,13 @@ set(NEO_CORE_HELPERS ${CMAKE_CURRENT_SOURCE_DIR}/cache_policy_bdw_and_later.inl ${CMAKE_CURRENT_SOURCE_DIR}/casts.h ${CMAKE_CURRENT_SOURCE_DIR}/common_types.h - ${CMAKE_CURRENT_SOURCE_DIR}/compiler_hw_info_config.h - ${CMAKE_CURRENT_SOURCE_DIR}/compiler_hw_info_config.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/compiler_hw_info_config_base.inl + ${CMAKE_CURRENT_SOURCE_DIR}/compiler_product_helper.h + ${CMAKE_CURRENT_SOURCE_DIR}/compiler_product_helper.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/compiler_product_helper_base.inl ${CMAKE_CURRENT_SOURCE_DIR}/compiler_aot_config_bdw_and_later.inl - ${CMAKE_CURRENT_SOURCE_DIR}/compiler_hw_info_config_bdw_and_later.inl - ${CMAKE_CURRENT_SOURCE_DIR}/compiler_hw_info_config_before_xe_hpc.inl - ${CMAKE_CURRENT_SOURCE_DIR}/compiler_hw_info_config_xe_hpc_and_later.inl + ${CMAKE_CURRENT_SOURCE_DIR}/compiler_product_helper_bdw_and_later.inl + ${CMAKE_CURRENT_SOURCE_DIR}/compiler_product_helper_before_xe_hpc.inl + ${CMAKE_CURRENT_SOURCE_DIR}/compiler_product_helper_xe_hpc_and_later.inl ${CMAKE_CURRENT_SOURCE_DIR}/compiler_options_parser.cpp ${CMAKE_CURRENT_SOURCE_DIR}/compiler_options_parser.h ${CMAKE_CURRENT_SOURCE_DIR}/completion_stamp.h diff --git a/shared/source/helpers/addressing_mode_helper.cpp b/shared/source/helpers/addressing_mode_helper.cpp index 3688bb39aa..ec471bcb3b 100644 --- a/shared/source/helpers/addressing_mode_helper.cpp +++ b/shared/source/helpers/addressing_mode_helper.cpp @@ -9,7 +9,7 @@ #include "shared/source/debug_settings/debug_settings_manager.h" #include "shared/source/execution_environment/root_device_environment.h" -#include "shared/source/helpers/compiler_hw_info_config.h" +#include "shared/source/helpers/compiler_product_helper.h" #include "shared/source/program/kernel_info.h" namespace NEO::AddressingModeHelper { diff --git a/shared/source/helpers/compiler_aot_config_bdw_and_later.inl b/shared/source/helpers/compiler_aot_config_bdw_and_later.inl index 0912ab881a..8264bd06e8 100644 --- a/shared/source/helpers/compiler_aot_config_bdw_and_later.inl +++ b/shared/source/helpers/compiler_aot_config_bdw_and_later.inl @@ -5,7 +5,7 @@ * */ -#include "shared/source/helpers/compiler_hw_info_config.h" +#include "shared/source/helpers/compiler_product_helper.h" #include "shared/source/helpers/hw_info.h" namespace NEO { diff --git a/shared/source/helpers/compiler_aot_config_mtl_and_later.inl b/shared/source/helpers/compiler_aot_config_mtl_and_later.inl index 571f2bd572..a589ee5c06 100644 --- a/shared/source/helpers/compiler_aot_config_mtl_and_later.inl +++ b/shared/source/helpers/compiler_aot_config_mtl_and_later.inl @@ -1,11 +1,11 @@ /* - * Copyright (C) 2022 Intel Corporation + * Copyright (C) 2022-2023 Intel Corporation * * SPDX-License-Identifier: MIT * */ -#include "shared/source/helpers/compiler_hw_info_config.h" +#include "shared/source/helpers/compiler_product_helper.h" #include "shared/source/helpers/hw_info.h" namespace NEO { diff --git a/shared/source/helpers/compiler_hw_info_config.cpp b/shared/source/helpers/compiler_product_helper.cpp similarity index 79% rename from shared/source/helpers/compiler_hw_info_config.cpp rename to shared/source/helpers/compiler_product_helper.cpp index a685a33a01..0ff813134f 100644 --- a/shared/source/helpers/compiler_hw_info_config.cpp +++ b/shared/source/helpers/compiler_product_helper.cpp @@ -5,7 +5,7 @@ * */ -#include "shared/source/helpers/compiler_hw_info_config.h" +#include "shared/source/helpers/compiler_product_helper.h" namespace NEO { diff --git a/shared/source/helpers/compiler_hw_info_config.h b/shared/source/helpers/compiler_product_helper.h similarity index 100% rename from shared/source/helpers/compiler_hw_info_config.h rename to shared/source/helpers/compiler_product_helper.h diff --git a/shared/source/helpers/compiler_hw_info_config_base.inl b/shared/source/helpers/compiler_product_helper_base.inl similarity index 92% rename from shared/source/helpers/compiler_hw_info_config_base.inl rename to shared/source/helpers/compiler_product_helper_base.inl index 0ca8ca83e8..48e64d6d8b 100644 --- a/shared/source/helpers/compiler_hw_info_config_base.inl +++ b/shared/source/helpers/compiler_product_helper_base.inl @@ -8,7 +8,7 @@ #pragma once #include "shared/source/helpers/cache_policy.h" -#include "shared/source/helpers/compiler_hw_info_config.h" +#include "shared/source/helpers/compiler_product_helper.h" namespace NEO { diff --git a/shared/source/helpers/compiler_hw_info_config_bdw_and_later.inl b/shared/source/helpers/compiler_product_helper_bdw_and_later.inl similarity index 77% rename from shared/source/helpers/compiler_hw_info_config_bdw_and_later.inl rename to shared/source/helpers/compiler_product_helper_bdw_and_later.inl index a6f179d99a..3d5d9284f7 100644 --- a/shared/source/helpers/compiler_hw_info_config_bdw_and_later.inl +++ b/shared/source/helpers/compiler_product_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 @@ #pragma once -#include "shared/source/helpers/compiler_hw_info_config.h" +#include "shared/source/helpers/compiler_product_helper.h" #include "shared/source/helpers/hw_info.h" namespace NEO { diff --git a/shared/source/helpers/compiler_hw_info_config_before_xe_hpc.inl b/shared/source/helpers/compiler_product_helper_before_xe_hpc.inl similarity index 69% rename from shared/source/helpers/compiler_hw_info_config_before_xe_hpc.inl rename to shared/source/helpers/compiler_product_helper_before_xe_hpc.inl index a8ed453605..867ca5efda 100644 --- a/shared/source/helpers/compiler_hw_info_config_before_xe_hpc.inl +++ b/shared/source/helpers/compiler_product_helper_before_xe_hpc.inl @@ -1,5 +1,5 @@ /* - * Copyright (C) 2022 Intel Corporation + * Copyright (C) 2022-2023 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -7,7 +7,7 @@ #pragma once -#include "shared/source/helpers/compiler_hw_info_config.h" +#include "shared/source/helpers/compiler_product_helper.h" namespace NEO { diff --git a/shared/source/helpers/compiler_hw_info_config_xe_hpc_and_later.inl b/shared/source/helpers/compiler_product_helper_xe_hpc_and_later.inl similarity index 78% rename from shared/source/helpers/compiler_hw_info_config_xe_hpc_and_later.inl rename to shared/source/helpers/compiler_product_helper_xe_hpc_and_later.inl index d9488469f0..42fa0d9f2d 100644 --- a/shared/source/helpers/compiler_hw_info_config_xe_hpc_and_later.inl +++ b/shared/source/helpers/compiler_product_helper_xe_hpc_and_later.inl @@ -1,5 +1,5 @@ /* - * Copyright (C) 2022 Intel Corporation + * Copyright (C) 2022-2023 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -8,7 +8,7 @@ #pragma once #include "shared/source/debug_settings/debug_settings_manager.h" -#include "shared/source/helpers/compiler_hw_info_config.h" +#include "shared/source/helpers/compiler_product_helper.h" namespace NEO { diff --git a/shared/source/os_interface/device_factory.cpp b/shared/source/os_interface/device_factory.cpp index 07d8f59df7..5baead0242 100644 --- a/shared/source/os_interface/device_factory.cpp +++ b/shared/source/os_interface/device_factory.cpp @@ -12,7 +12,7 @@ #include "shared/source/device/root_device.h" #include "shared/source/execution_environment/execution_environment.h" #include "shared/source/execution_environment/root_device_environment.h" -#include "shared/source/helpers/compiler_hw_info_config.h" +#include "shared/source/helpers/compiler_product_helper.h" #include "shared/source/helpers/gfx_core_helper.h" #include "shared/source/helpers/product_config_helper.h" #include "shared/source/memory_manager/memory_manager.h" diff --git a/shared/source/os_interface/linux/hw_info_config_drm.cpp b/shared/source/os_interface/linux/hw_info_config_drm.cpp index 5e1b8fbe49..6434fe7a91 100644 --- a/shared/source/os_interface/linux/hw_info_config_drm.cpp +++ b/shared/source/os_interface/linux/hw_info_config_drm.cpp @@ -8,7 +8,7 @@ #include "shared/source/command_stream/preemption.h" #include "shared/source/debug_settings/debug_settings_manager.h" #include "shared/source/execution_environment/root_device_environment.h" -#include "shared/source/helpers/compiler_hw_info_config.h" +#include "shared/source/helpers/compiler_product_helper.h" #include "shared/source/helpers/constants.h" #include "shared/source/helpers/gfx_core_helper.h" #include "shared/source/helpers/hw_info.h" diff --git a/shared/source/os_interface/windows/hw_info_config_wddm.cpp b/shared/source/os_interface/windows/hw_info_config_wddm.cpp index 0f9bd6032e..0b9dadd621 100644 --- a/shared/source/os_interface/windows/hw_info_config_wddm.cpp +++ b/shared/source/os_interface/windows/hw_info_config_wddm.cpp @@ -8,7 +8,7 @@ #include "shared/source/command_stream/preemption.h" #include "shared/source/debug_settings/debug_settings_manager.h" #include "shared/source/execution_environment/root_device_environment.h" -#include "shared/source/helpers/compiler_hw_info_config.h" +#include "shared/source/helpers/compiler_product_helper.h" #include "shared/source/helpers/constants.h" #include "shared/source/helpers/gfx_core_helper.h" #include "shared/source/helpers/hw_info.h" diff --git a/shared/source/xe_hp_core/enable_compiler_product_helper_xe_hp_sdv.cpp b/shared/source/xe_hp_core/enable_compiler_product_helper_xe_hp_sdv.cpp index a7b1c5dcc2..5c64de421c 100644 --- a/shared/source/xe_hp_core/enable_compiler_product_helper_xe_hp_sdv.cpp +++ b/shared/source/xe_hp_core/enable_compiler_product_helper_xe_hp_sdv.cpp @@ -1,15 +1,15 @@ /* - * Copyright (C) 2022 Intel Corporation + * Copyright (C) 2022-2023 Intel Corporation * * SPDX-License-Identifier: MIT * */ #include "shared/source/helpers/compiler_aot_config_bdw_and_later.inl" -#include "shared/source/helpers/compiler_hw_info_config.h" -#include "shared/source/helpers/compiler_hw_info_config_base.inl" -#include "shared/source/helpers/compiler_hw_info_config_bdw_and_later.inl" -#include "shared/source/helpers/compiler_hw_info_config_before_xe_hpc.inl" +#include "shared/source/helpers/compiler_product_helper.h" +#include "shared/source/helpers/compiler_product_helper_base.inl" +#include "shared/source/helpers/compiler_product_helper_bdw_and_later.inl" +#include "shared/source/helpers/compiler_product_helper_before_xe_hpc.inl" #include "hw_info_xehp.h" diff --git a/shared/source/xe_hpc_core/enable_compiler_product_helper_pvc.cpp b/shared/source/xe_hpc_core/enable_compiler_product_helper_pvc.cpp index eaa76eaaaa..551b6843b2 100644 --- a/shared/source/xe_hpc_core/enable_compiler_product_helper_pvc.cpp +++ b/shared/source/xe_hpc_core/enable_compiler_product_helper_pvc.cpp @@ -1,15 +1,15 @@ /* - * Copyright (C) 2022 Intel Corporation + * Copyright (C) 2022-2023 Intel Corporation * * SPDX-License-Identifier: MIT * */ #include "shared/source/helpers/compiler_aot_config_bdw_and_later.inl" -#include "shared/source/helpers/compiler_hw_info_config.h" -#include "shared/source/helpers/compiler_hw_info_config_base.inl" -#include "shared/source/helpers/compiler_hw_info_config_bdw_and_later.inl" -#include "shared/source/helpers/compiler_hw_info_config_xe_hpc_and_later.inl" +#include "shared/source/helpers/compiler_product_helper.h" +#include "shared/source/helpers/compiler_product_helper_base.inl" +#include "shared/source/helpers/compiler_product_helper_bdw_and_later.inl" +#include "shared/source/helpers/compiler_product_helper_xe_hpc_and_later.inl" #include "hw_info_pvc.h" diff --git a/shared/source/xe_hpg_core/enable_compiler_product_helper_dg2.cpp b/shared/source/xe_hpg_core/enable_compiler_product_helper_dg2.cpp index 49bc9b11ab..a4b68b16eb 100644 --- a/shared/source/xe_hpg_core/enable_compiler_product_helper_dg2.cpp +++ b/shared/source/xe_hpg_core/enable_compiler_product_helper_dg2.cpp @@ -1,15 +1,15 @@ /* - * Copyright (C) 2022 Intel Corporation + * Copyright (C) 2022-2023 Intel Corporation * * SPDX-License-Identifier: MIT * */ #include "shared/source/helpers/compiler_aot_config_bdw_and_later.inl" -#include "shared/source/helpers/compiler_hw_info_config.h" -#include "shared/source/helpers/compiler_hw_info_config_base.inl" -#include "shared/source/helpers/compiler_hw_info_config_bdw_and_later.inl" -#include "shared/source/helpers/compiler_hw_info_config_before_xe_hpc.inl" +#include "shared/source/helpers/compiler_product_helper.h" +#include "shared/source/helpers/compiler_product_helper_base.inl" +#include "shared/source/helpers/compiler_product_helper_bdw_and_later.inl" +#include "shared/source/helpers/compiler_product_helper_before_xe_hpc.inl" #include "hw_info_dg2.h" diff --git a/shared/source/xe_hpg_core/enable_compiler_product_helper_mtl.cpp b/shared/source/xe_hpg_core/enable_compiler_product_helper_mtl.cpp index cc8b86613d..ff30a7d296 100644 --- a/shared/source/xe_hpg_core/enable_compiler_product_helper_mtl.cpp +++ b/shared/source/xe_hpg_core/enable_compiler_product_helper_mtl.cpp @@ -1,15 +1,15 @@ /* - * Copyright (C) 2022 Intel Corporation + * Copyright (C) 2022-2023 Intel Corporation * * SPDX-License-Identifier: MIT * */ #include "shared/source/helpers/compiler_aot_config_mtl_and_later.inl" -#include "shared/source/helpers/compiler_hw_info_config.h" -#include "shared/source/helpers/compiler_hw_info_config_base.inl" -#include "shared/source/helpers/compiler_hw_info_config_bdw_and_later.inl" -#include "shared/source/helpers/compiler_hw_info_config_before_xe_hpc.inl" +#include "shared/source/helpers/compiler_product_helper.h" +#include "shared/source/helpers/compiler_product_helper_base.inl" +#include "shared/source/helpers/compiler_product_helper_bdw_and_later.inl" +#include "shared/source/helpers/compiler_product_helper_before_xe_hpc.inl" #include "hw_info_mtl.h" diff --git a/shared/test/common/device_binary_format/elf/elf_tests_data.h b/shared/test/common/device_binary_format/elf/elf_tests_data.h index 630ef0e099..ea5a99a002 100644 --- a/shared/test/common/device_binary_format/elf/elf_tests_data.h +++ b/shared/test/common/device_binary_format/elf/elf_tests_data.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2022 Intel Corporation + * Copyright (C) 2022-2023 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -10,7 +10,7 @@ #include "shared/source/compiler_interface/intermediate_representations.h" #include "shared/source/device_binary_format/elf/elf_encoder.h" #include "shared/source/device_binary_format/elf/ocl_elf.h" -#include "shared/source/helpers/compiler_hw_info_config.h" +#include "shared/source/helpers/compiler_product_helper.h" #include "shared/source/helpers/string.h" #include "patch_list.h" diff --git a/shared/test/common/device_binary_format/patchtokens_tests.h b/shared/test/common/device_binary_format/patchtokens_tests.h index 45242c680d..4617fda417 100644 --- a/shared/test/common/device_binary_format/patchtokens_tests.h +++ b/shared/test/common/device_binary_format/patchtokens_tests.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2019-2022 Intel Corporation + * Copyright (C) 2019-2023 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -9,7 +9,7 @@ #include "shared/source/device_binary_format/patchtokens_decoder.h" #include "shared/source/helpers/api_specific_config.h" -#include "shared/source/helpers/compiler_hw_info_config.h" +#include "shared/source/helpers/compiler_product_helper.h" #include "shared/source/helpers/string.h" #include "shared/test/common/helpers/default_hw_info.h" diff --git a/shared/test/common/mocks/mock_modules_zebin.cpp b/shared/test/common/mocks/mock_modules_zebin.cpp index 7d6d404635..0d50e2a386 100644 --- a/shared/test/common/mocks/mock_modules_zebin.cpp +++ b/shared/test/common/mocks/mock_modules_zebin.cpp @@ -9,7 +9,7 @@ #include "shared/source/device_binary_format/elf/elf_decoder.h" #include "shared/source/device_binary_format/elf/elf_encoder.h" -#include "shared/source/helpers/compiler_hw_info_config.h" +#include "shared/source/helpers/compiler_product_helper.h" #include "shared/test/common/mocks/mock_elf.h" namespace ZebinTestData { diff --git a/shared/test/unit_test/command_stream/get_devices_tests.cpp b/shared/test/unit_test/command_stream/get_devices_tests.cpp index 4f5ff2d830..4cc127d738 100644 --- a/shared/test/unit_test/command_stream/get_devices_tests.cpp +++ b/shared/test/unit_test/command_stream/get_devices_tests.cpp @@ -6,7 +6,7 @@ */ #include "shared/source/command_stream/command_stream_receiver.h" -#include "shared/source/helpers/compiler_hw_info_config.h" +#include "shared/source/helpers/compiler_product_helper.h" #include "shared/source/helpers/product_config_helper.h" #include "shared/source/os_interface/device_factory.h" #include "shared/source/os_interface/hw_info_config.h" diff --git a/shared/test/unit_test/compiler_interface/compiler_interface_tests.cpp b/shared/test/unit_test/compiler_interface/compiler_interface_tests.cpp index 3801382042..7167141230 100644 --- a/shared/test/unit_test/compiler_interface/compiler_interface_tests.cpp +++ b/shared/test/unit_test/compiler_interface/compiler_interface_tests.cpp @@ -8,7 +8,7 @@ #include "shared/source/compiler_interface/compiler_cache.h" #include "shared/source/compiler_interface/compiler_interface.h" #include "shared/source/compiler_interface/compiler_interface.inl" -#include "shared/source/helpers/compiler_hw_info_config.h" +#include "shared/source/helpers/compiler_product_helper.h" #include "shared/source/helpers/file_io.h" #include "shared/source/helpers/hw_info.h" #include "shared/test/common/fixtures/device_fixture.h" diff --git a/shared/test/unit_test/device_binary_format/patchtokens_dumper_tests.cpp b/shared/test/unit_test/device_binary_format/patchtokens_dumper_tests.cpp index a4be7dce57..3650091504 100644 --- a/shared/test/unit_test/device_binary_format/patchtokens_dumper_tests.cpp +++ b/shared/test/unit_test/device_binary_format/patchtokens_dumper_tests.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2019-2022 Intel Corporation + * Copyright (C) 2019-2023 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -7,7 +7,7 @@ #include "shared/source/device_binary_format/patchtokens_decoder.h" #include "shared/source/device_binary_format/patchtokens_dumper.h" -#include "shared/source/helpers/compiler_hw_info_config.h" +#include "shared/source/helpers/compiler_product_helper.h" #include "shared/test/common/device_binary_format/patchtokens_tests.h" #include "shared/test/common/helpers/default_hw_info.h" #include "shared/test/common/test_macros/test.h" diff --git a/shared/test/unit_test/device_binary_format/zebin_decoder_tests.cpp b/shared/test/unit_test/device_binary_format/zebin_decoder_tests.cpp index af466a9b80..838d8b630b 100644 --- a/shared/test/unit_test/device_binary_format/zebin_decoder_tests.cpp +++ b/shared/test/unit_test/device_binary_format/zebin_decoder_tests.cpp @@ -11,7 +11,7 @@ #include "shared/source/device_binary_format/elf/zebin_elf.h" #include "shared/source/device_binary_format/elf/zeinfo_enum_lookup.h" #include "shared/source/device_binary_format/zebin_decoder.h" -#include "shared/source/helpers/compiler_hw_info_config.h" +#include "shared/source/helpers/compiler_product_helper.h" #include "shared/source/helpers/hw_info.h" #include "shared/source/helpers/ptr_math.h" #include "shared/source/helpers/string.h" diff --git a/shared/test/unit_test/gen12lp/rkl/test_hw_info_config_rkl.cpp b/shared/test/unit_test/gen12lp/rkl/test_hw_info_config_rkl.cpp index d568fdd1f0..83f747fc85 100644 --- a/shared/test/unit_test/gen12lp/rkl/test_hw_info_config_rkl.cpp +++ b/shared/test/unit_test/gen12lp/rkl/test_hw_info_config_rkl.cpp @@ -6,7 +6,7 @@ */ #include "shared/source/gen12lp/hw_cmds_rkl.h" -#include "shared/source/helpers/compiler_hw_info_config.h" +#include "shared/source/helpers/compiler_product_helper.h" #include "shared/source/helpers/gfx_core_helper.h" #include "shared/source/os_interface/hw_info_config.h" #include "shared/test/common/helpers/default_hw_info.h" diff --git a/shared/test/unit_test/gen8/bdw/test_hw_info_config_bdw.cpp b/shared/test/unit_test/gen8/bdw/test_hw_info_config_bdw.cpp index d48afd9f6c..5aa54be38c 100644 --- a/shared/test/unit_test/gen8/bdw/test_hw_info_config_bdw.cpp +++ b/shared/test/unit_test/gen8/bdw/test_hw_info_config_bdw.cpp @@ -6,7 +6,7 @@ */ #include "shared/source/gen8/hw_cmds_bdw.h" -#include "shared/source/helpers/compiler_hw_info_config.h" +#include "shared/source/helpers/compiler_product_helper.h" #include "shared/source/os_interface/hw_info_config.h" #include "shared/test/common/helpers/default_hw_info.h" #include "shared/test/common/mocks/mock_execution_environment.h" diff --git a/shared/test/unit_test/helpers/CMakeLists.txt b/shared/test/unit_test/helpers/CMakeLists.txt index 88d49a5182..6820c43ae4 100644 --- a/shared/test/unit_test/helpers/CMakeLists.txt +++ b/shared/test/unit_test/helpers/CMakeLists.txt @@ -16,7 +16,7 @@ target_sources(neo_shared_tests PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/blit_commands_helper_tests_gen12lp.cpp ${CMAKE_CURRENT_SOURCE_DIR}/cache_policy_tests.cpp ${CMAKE_CURRENT_SOURCE_DIR}/cmd_buffer_validator_tests.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/compiler_hw_info_config_tests.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/compiler_product_helper_tests.cpp ${CMAKE_CURRENT_SOURCE_DIR}/debug_helpers_tests.cpp ${CMAKE_CURRENT_SOURCE_DIR}/deferred_deleter_helpers_tests.cpp ${CMAKE_CURRENT_SOURCE_DIR}/dirty_state_helpers_tests.cpp diff --git a/shared/test/unit_test/helpers/compiler_hw_info_config_tests.cpp b/shared/test/unit_test/helpers/compiler_product_helper_tests.cpp similarity index 98% rename from shared/test/unit_test/helpers/compiler_hw_info_config_tests.cpp rename to shared/test/unit_test/helpers/compiler_product_helper_tests.cpp index 723209783c..c7d7861b77 100644 --- a/shared/test/unit_test/helpers/compiler_hw_info_config_tests.cpp +++ b/shared/test/unit_test/helpers/compiler_product_helper_tests.cpp @@ -5,7 +5,7 @@ * */ -#include "shared/source/helpers/compiler_hw_info_config.h" +#include "shared/source/helpers/compiler_product_helper.h" #include "shared/test/common/fixtures/device_fixture.h" #include "shared/test/common/helpers/debug_manager_state_restore.h" #include "shared/test/common/helpers/unit_test_helper.h" diff --git a/shared/test/unit_test/helpers/hw_aot_config_tests.cpp b/shared/test/unit_test/helpers/hw_aot_config_tests.cpp index 6ea937c0bc..014dd2be45 100644 --- a/shared/test/unit_test/helpers/hw_aot_config_tests.cpp +++ b/shared/test/unit_test/helpers/hw_aot_config_tests.cpp @@ -5,7 +5,7 @@ * */ -#include "shared/source/helpers/compiler_hw_info_config.h" +#include "shared/source/helpers/compiler_product_helper.h" #include "shared/test/common/mocks/mock_execution_environment.h" #include "shared/test/unit_test/fixtures/product_config_fixture.h" diff --git a/shared/test/unit_test/xe_hpc_core/pvc/linux/hw_info_config_tests_pvc.cpp b/shared/test/unit_test/xe_hpc_core/pvc/linux/hw_info_config_tests_pvc.cpp index a0d5918260..b8a85bedf7 100644 --- a/shared/test/unit_test/xe_hpc_core/pvc/linux/hw_info_config_tests_pvc.cpp +++ b/shared/test/unit_test/xe_hpc_core/pvc/linux/hw_info_config_tests_pvc.cpp @@ -5,7 +5,7 @@ * */ -#include "shared/source/helpers/compiler_hw_info_config.h" +#include "shared/source/helpers/compiler_product_helper.h" #include "shared/source/os_interface/os_interface.h" #include "shared/test/common/helpers/debug_manager_state_restore.h" #include "shared/test/common/helpers/default_hw_info.h" diff --git a/shared/test/unit_test/xe_hpg_core/dg2/test_hw_info_config_dg2.cpp b/shared/test/unit_test/xe_hpg_core/dg2/test_hw_info_config_dg2.cpp index 40d5a6be7a..19ba5cc38b 100644 --- a/shared/test/unit_test/xe_hpg_core/dg2/test_hw_info_config_dg2.cpp +++ b/shared/test/unit_test/xe_hpg_core/dg2/test_hw_info_config_dg2.cpp @@ -5,7 +5,7 @@ * */ -#include "shared/source/helpers/compiler_hw_info_config.h" +#include "shared/source/helpers/compiler_product_helper.h" #include "shared/source/helpers/local_memory_access_modes.h" #include "shared/source/os_interface/hw_info_config.h" #include "shared/source/xe_hpg_core/hw_cmds_dg2.h" diff --git a/shared/test/unit_test/xe_hpg_core/mtl/hw_info_config_tests_mtl.cpp b/shared/test/unit_test/xe_hpg_core/mtl/hw_info_config_tests_mtl.cpp index 03459b9156..010ffb8a28 100644 --- a/shared/test/unit_test/xe_hpg_core/mtl/hw_info_config_tests_mtl.cpp +++ b/shared/test/unit_test/xe_hpg_core/mtl/hw_info_config_tests_mtl.cpp @@ -8,7 +8,7 @@ #include "shared/source/command_stream/stream_properties.h" #include "shared/source/execution_environment/execution_environment.h" #include "shared/source/execution_environment/root_device_environment.h" -#include "shared/source/helpers/compiler_hw_info_config.h" +#include "shared/source/helpers/compiler_product_helper.h" #include "shared/source/os_interface/hw_info_config.h" #include "shared/source/xe_hpg_core/hw_cmds_mtl.h" #include "shared/test/common/fixtures/device_fixture.h"