From 6bd69fd91dd9a1109fa9c6a7224fb381d34ac02d Mon Sep 17 00:00:00 2001 From: Kamil Kopryk Date: Thu, 9 Mar 2023 18:04:12 +0000 Subject: [PATCH] refactor: rename mock product helper files Related-To: NEO-7703 Signed-off-by: Kamil Kopryk --- ...{mock_hw_info_config_ehl.cpp => mock_product_helper_ehl.cpp} | 0 ...k_hw_info_config_icllp.cpp => mock_product_helper_icllp.cpp} | 0 ...{mock_hw_info_config_lkf.cpp => mock_product_helper_lkf.cpp} | 0 ...ock_hw_info_config_adln.cpp => mock_product_helper_adln.cpp} | 0 ...ock_hw_info_config_adlp.cpp => mock_product_helper_adlp.cpp} | 0 ...ock_hw_info_config_adls.cpp => mock_product_helper_adls.cpp} | 0 ...{mock_hw_info_config_dg1.cpp => mock_product_helper_dg1.cpp} | 0 ...{mock_hw_info_config_rkl.cpp => mock_product_helper_rkl.cpp} | 0 ...{mock_hw_info_config_ryf.cpp => mock_product_helper_ryf.cpp} | 2 +- ...k_hw_info_config_tgllp.cpp => mock_product_helper_tgllp.cpp} | 0 ...{mock_hw_info_config_bdw.cpp => mock_product_helper_bdw.cpp} | 0 ...{mock_hw_info_config_bxt.cpp => mock_product_helper_bxt.cpp} | 0 ...{mock_hw_info_config_cfl.cpp => mock_product_helper_cfl.cpp} | 0 ...{mock_hw_info_config_glk.cpp => mock_product_helper_glk.cpp} | 0 ...{mock_hw_info_config_kbl.cpp => mock_product_helper_kbl.cpp} | 0 ...{mock_hw_info_config_skl.cpp => mock_product_helper_skl.cpp} | 0 shared/test/common/libult/CMakeLists.txt | 2 +- shared/test/common/mocks/CMakeLists.txt | 2 +- .../mocks/{mock_hw_info_config.cpp => mock_product_helper.cpp} | 0 ...o_config_xe_hp_sdv.cpp => mock_product_helper_xe_hp_sdv.cpp} | 0 ...{mock_hw_info_config_pvc.cpp => mock_product_helper_pvc.cpp} | 0 ...{mock_hw_info_config_dg2.cpp => mock_product_helper_dg2.cpp} | 0 ...{mock_hw_info_config_mtl.cpp => mock_product_helper_mtl.cpp} | 0 23 files changed, 3 insertions(+), 3 deletions(-) rename shared/test/common/gen11/ehl/{mock_hw_info_config_ehl.cpp => mock_product_helper_ehl.cpp} (100%) rename shared/test/common/gen11/icllp/{mock_hw_info_config_icllp.cpp => mock_product_helper_icllp.cpp} (100%) rename shared/test/common/gen11/lkf/{mock_hw_info_config_lkf.cpp => mock_product_helper_lkf.cpp} (100%) rename shared/test/common/gen12lp/adln/{mock_hw_info_config_adln.cpp => mock_product_helper_adln.cpp} (100%) rename shared/test/common/gen12lp/adlp/{mock_hw_info_config_adlp.cpp => mock_product_helper_adlp.cpp} (100%) rename shared/test/common/gen12lp/adls/{mock_hw_info_config_adls.cpp => mock_product_helper_adls.cpp} (100%) rename shared/test/common/gen12lp/dg1/{mock_hw_info_config_dg1.cpp => mock_product_helper_dg1.cpp} (100%) rename shared/test/common/gen12lp/rkl/{mock_hw_info_config_rkl.cpp => mock_product_helper_rkl.cpp} (100%) rename shared/test/common/gen12lp/ryf/{mock_hw_info_config_ryf.cpp => mock_product_helper_ryf.cpp} (79%) rename shared/test/common/gen12lp/tgllp/{mock_hw_info_config_tgllp.cpp => mock_product_helper_tgllp.cpp} (100%) rename shared/test/common/gen8/bdw/{mock_hw_info_config_bdw.cpp => mock_product_helper_bdw.cpp} (100%) rename shared/test/common/gen9/bxt/{mock_hw_info_config_bxt.cpp => mock_product_helper_bxt.cpp} (100%) rename shared/test/common/gen9/cfl/{mock_hw_info_config_cfl.cpp => mock_product_helper_cfl.cpp} (100%) rename shared/test/common/gen9/glk/{mock_hw_info_config_glk.cpp => mock_product_helper_glk.cpp} (100%) rename shared/test/common/gen9/kbl/{mock_hw_info_config_kbl.cpp => mock_product_helper_kbl.cpp} (100%) rename shared/test/common/gen9/skl/{mock_hw_info_config_skl.cpp => mock_product_helper_skl.cpp} (100%) rename shared/test/common/mocks/{mock_hw_info_config.cpp => mock_product_helper.cpp} (100%) rename shared/test/common/xe_hp_core/xe_hp_sdv/{mock_hw_info_config_xe_hp_sdv.cpp => mock_product_helper_xe_hp_sdv.cpp} (100%) rename shared/test/common/xe_hpc_core/pvc/{mock_hw_info_config_pvc.cpp => mock_product_helper_pvc.cpp} (100%) rename shared/test/common/xe_hpg_core/dg2/{mock_hw_info_config_dg2.cpp => mock_product_helper_dg2.cpp} (100%) rename shared/test/common/xe_hpg_core/mtl/{mock_hw_info_config_mtl.cpp => mock_product_helper_mtl.cpp} (100%) diff --git a/shared/test/common/gen11/ehl/mock_hw_info_config_ehl.cpp b/shared/test/common/gen11/ehl/mock_product_helper_ehl.cpp similarity index 100% rename from shared/test/common/gen11/ehl/mock_hw_info_config_ehl.cpp rename to shared/test/common/gen11/ehl/mock_product_helper_ehl.cpp diff --git a/shared/test/common/gen11/icllp/mock_hw_info_config_icllp.cpp b/shared/test/common/gen11/icllp/mock_product_helper_icllp.cpp similarity index 100% rename from shared/test/common/gen11/icllp/mock_hw_info_config_icllp.cpp rename to shared/test/common/gen11/icllp/mock_product_helper_icllp.cpp diff --git a/shared/test/common/gen11/lkf/mock_hw_info_config_lkf.cpp b/shared/test/common/gen11/lkf/mock_product_helper_lkf.cpp similarity index 100% rename from shared/test/common/gen11/lkf/mock_hw_info_config_lkf.cpp rename to shared/test/common/gen11/lkf/mock_product_helper_lkf.cpp diff --git a/shared/test/common/gen12lp/adln/mock_hw_info_config_adln.cpp b/shared/test/common/gen12lp/adln/mock_product_helper_adln.cpp similarity index 100% rename from shared/test/common/gen12lp/adln/mock_hw_info_config_adln.cpp rename to shared/test/common/gen12lp/adln/mock_product_helper_adln.cpp diff --git a/shared/test/common/gen12lp/adlp/mock_hw_info_config_adlp.cpp b/shared/test/common/gen12lp/adlp/mock_product_helper_adlp.cpp similarity index 100% rename from shared/test/common/gen12lp/adlp/mock_hw_info_config_adlp.cpp rename to shared/test/common/gen12lp/adlp/mock_product_helper_adlp.cpp diff --git a/shared/test/common/gen12lp/adls/mock_hw_info_config_adls.cpp b/shared/test/common/gen12lp/adls/mock_product_helper_adls.cpp similarity index 100% rename from shared/test/common/gen12lp/adls/mock_hw_info_config_adls.cpp rename to shared/test/common/gen12lp/adls/mock_product_helper_adls.cpp diff --git a/shared/test/common/gen12lp/dg1/mock_hw_info_config_dg1.cpp b/shared/test/common/gen12lp/dg1/mock_product_helper_dg1.cpp similarity index 100% rename from shared/test/common/gen12lp/dg1/mock_hw_info_config_dg1.cpp rename to shared/test/common/gen12lp/dg1/mock_product_helper_dg1.cpp diff --git a/shared/test/common/gen12lp/rkl/mock_hw_info_config_rkl.cpp b/shared/test/common/gen12lp/rkl/mock_product_helper_rkl.cpp similarity index 100% rename from shared/test/common/gen12lp/rkl/mock_hw_info_config_rkl.cpp rename to shared/test/common/gen12lp/rkl/mock_product_helper_rkl.cpp diff --git a/shared/test/common/gen12lp/ryf/mock_hw_info_config_ryf.cpp b/shared/test/common/gen12lp/ryf/mock_product_helper_ryf.cpp similarity index 79% rename from shared/test/common/gen12lp/ryf/mock_hw_info_config_ryf.cpp rename to shared/test/common/gen12lp/ryf/mock_product_helper_ryf.cpp index e84aac2f0c..8e1130313f 100644 --- a/shared/test/common/gen12lp/ryf/mock_hw_info_config_ryf.cpp +++ b/shared/test/common/gen12lp/ryf/mock_product_helper_ryf.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2022 Intel Corporation + * Copyright (C) 2022-2023 Intel Corporation * * SPDX-License-Identifier: MIT * diff --git a/shared/test/common/gen12lp/tgllp/mock_hw_info_config_tgllp.cpp b/shared/test/common/gen12lp/tgllp/mock_product_helper_tgllp.cpp similarity index 100% rename from shared/test/common/gen12lp/tgllp/mock_hw_info_config_tgllp.cpp rename to shared/test/common/gen12lp/tgllp/mock_product_helper_tgllp.cpp diff --git a/shared/test/common/gen8/bdw/mock_hw_info_config_bdw.cpp b/shared/test/common/gen8/bdw/mock_product_helper_bdw.cpp similarity index 100% rename from shared/test/common/gen8/bdw/mock_hw_info_config_bdw.cpp rename to shared/test/common/gen8/bdw/mock_product_helper_bdw.cpp diff --git a/shared/test/common/gen9/bxt/mock_hw_info_config_bxt.cpp b/shared/test/common/gen9/bxt/mock_product_helper_bxt.cpp similarity index 100% rename from shared/test/common/gen9/bxt/mock_hw_info_config_bxt.cpp rename to shared/test/common/gen9/bxt/mock_product_helper_bxt.cpp diff --git a/shared/test/common/gen9/cfl/mock_hw_info_config_cfl.cpp b/shared/test/common/gen9/cfl/mock_product_helper_cfl.cpp similarity index 100% rename from shared/test/common/gen9/cfl/mock_hw_info_config_cfl.cpp rename to shared/test/common/gen9/cfl/mock_product_helper_cfl.cpp diff --git a/shared/test/common/gen9/glk/mock_hw_info_config_glk.cpp b/shared/test/common/gen9/glk/mock_product_helper_glk.cpp similarity index 100% rename from shared/test/common/gen9/glk/mock_hw_info_config_glk.cpp rename to shared/test/common/gen9/glk/mock_product_helper_glk.cpp diff --git a/shared/test/common/gen9/kbl/mock_hw_info_config_kbl.cpp b/shared/test/common/gen9/kbl/mock_product_helper_kbl.cpp similarity index 100% rename from shared/test/common/gen9/kbl/mock_hw_info_config_kbl.cpp rename to shared/test/common/gen9/kbl/mock_product_helper_kbl.cpp diff --git a/shared/test/common/gen9/skl/mock_hw_info_config_skl.cpp b/shared/test/common/gen9/skl/mock_product_helper_skl.cpp similarity index 100% rename from shared/test/common/gen9/skl/mock_hw_info_config_skl.cpp rename to shared/test/common/gen9/skl/mock_product_helper_skl.cpp diff --git a/shared/test/common/libult/CMakeLists.txt b/shared/test/common/libult/CMakeLists.txt index 4039bf3b77..f1bdb71e7d 100644 --- a/shared/test/common/libult/CMakeLists.txt +++ b/shared/test/common/libult/CMakeLists.txt @@ -25,7 +25,7 @@ macro(macro_for_each_platform) if(EXISTS ${SRC_FILE}) list(APPEND neo_libult_common_SRCS_ENABLE_TESTED_HW ${SRC_FILE}) endif() - set(SRC_FILE ${NEO_SHARED_TEST_DIRECTORY}/common${BRANCH_DIR}${CORE_TYPE_LOWER}${BRANCH}${PLATFORM_IT_LOWER}/mock_hw_info_config_${PLATFORM_IT_LOWER}.cpp) + set(SRC_FILE ${NEO_SHARED_TEST_DIRECTORY}/common${BRANCH_DIR}${CORE_TYPE_LOWER}${BRANCH}${PLATFORM_IT_LOWER}/mock_product_helper_${PLATFORM_IT_LOWER}.cpp) if(EXISTS ${SRC_FILE}) list(APPEND neo_libult_common_SRCS_ENABLE_TESTED_HW ${SRC_FILE}) endif() diff --git a/shared/test/common/mocks/CMakeLists.txt b/shared/test/common/mocks/CMakeLists.txt index 6d8f561a6a..f7be9f795f 100644 --- a/shared/test/common/mocks/CMakeLists.txt +++ b/shared/test/common/mocks/CMakeLists.txt @@ -62,7 +62,7 @@ set(NEO_CORE_tests_mocks ${CMAKE_CURRENT_SOURCE_DIR}/mock_graphics_allocation.h ${CMAKE_CURRENT_SOURCE_DIR}/mock_host_ptr_manager.h ${CMAKE_CURRENT_SOURCE_DIR}/mock_gfx_core_helper.h - ${CMAKE_CURRENT_SOURCE_DIR}/mock_hw_info_config.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/mock_product_helper.cpp ${CMAKE_CURRENT_SOURCE_DIR}/mock_internal_allocation_storage.h ${CMAKE_CURRENT_SOURCE_DIR}/mock_io_functions.h ${CMAKE_CURRENT_SOURCE_DIR}/mock_kernel_info.cpp diff --git a/shared/test/common/mocks/mock_hw_info_config.cpp b/shared/test/common/mocks/mock_product_helper.cpp similarity index 100% rename from shared/test/common/mocks/mock_hw_info_config.cpp rename to shared/test/common/mocks/mock_product_helper.cpp diff --git a/shared/test/common/xe_hp_core/xe_hp_sdv/mock_hw_info_config_xe_hp_sdv.cpp b/shared/test/common/xe_hp_core/xe_hp_sdv/mock_product_helper_xe_hp_sdv.cpp similarity index 100% rename from shared/test/common/xe_hp_core/xe_hp_sdv/mock_hw_info_config_xe_hp_sdv.cpp rename to shared/test/common/xe_hp_core/xe_hp_sdv/mock_product_helper_xe_hp_sdv.cpp diff --git a/shared/test/common/xe_hpc_core/pvc/mock_hw_info_config_pvc.cpp b/shared/test/common/xe_hpc_core/pvc/mock_product_helper_pvc.cpp similarity index 100% rename from shared/test/common/xe_hpc_core/pvc/mock_hw_info_config_pvc.cpp rename to shared/test/common/xe_hpc_core/pvc/mock_product_helper_pvc.cpp diff --git a/shared/test/common/xe_hpg_core/dg2/mock_hw_info_config_dg2.cpp b/shared/test/common/xe_hpg_core/dg2/mock_product_helper_dg2.cpp similarity index 100% rename from shared/test/common/xe_hpg_core/dg2/mock_hw_info_config_dg2.cpp rename to shared/test/common/xe_hpg_core/dg2/mock_product_helper_dg2.cpp diff --git a/shared/test/common/xe_hpg_core/mtl/mock_hw_info_config_mtl.cpp b/shared/test/common/xe_hpg_core/mtl/mock_product_helper_mtl.cpp similarity index 100% rename from shared/test/common/xe_hpg_core/mtl/mock_hw_info_config_mtl.cpp rename to shared/test/common/xe_hpg_core/mtl/mock_product_helper_mtl.cpp