diff --git a/shared/source/gen11/linux/hw_info_config_ehl.cpp b/shared/source/gen11/linux/hw_info_config_ehl.cpp index 1140c50c53..a6e53586e1 100644 --- a/shared/source/gen11/linux/hw_info_config_ehl.cpp +++ b/shared/source/gen11/linux/hw_info_config_ehl.cpp @@ -9,7 +9,7 @@ #include "shared/source/helpers/hw_info.h" #include "shared/source/os_interface/hw_info_config.h" #include "shared/source/os_interface/hw_info_config.inl" -#include "shared/source/os_interface/hw_info_config_bdw_and_later.inl" +#include "shared/source/os_interface/product_helper_bdw_and_later.inl" #include "platforms.h" diff --git a/shared/source/gen11/linux/hw_info_config_icllp.cpp b/shared/source/gen11/linux/hw_info_config_icllp.cpp index 93f365f457..416d39261c 100644 --- a/shared/source/gen11/linux/hw_info_config_icllp.cpp +++ b/shared/source/gen11/linux/hw_info_config_icllp.cpp @@ -9,7 +9,7 @@ #include "shared/source/helpers/hw_info.h" #include "shared/source/os_interface/hw_info_config.h" #include "shared/source/os_interface/hw_info_config.inl" -#include "shared/source/os_interface/hw_info_config_bdw_and_later.inl" +#include "shared/source/os_interface/product_helper_bdw_and_later.inl" #include "platforms.h" diff --git a/shared/source/gen11/linux/hw_info_config_lkf.cpp b/shared/source/gen11/linux/hw_info_config_lkf.cpp index 8ad7f0cec4..c9af1a50d8 100644 --- a/shared/source/gen11/linux/hw_info_config_lkf.cpp +++ b/shared/source/gen11/linux/hw_info_config_lkf.cpp @@ -9,7 +9,7 @@ #include "shared/source/helpers/hw_info.h" #include "shared/source/os_interface/hw_info_config.h" #include "shared/source/os_interface/hw_info_config.inl" -#include "shared/source/os_interface/hw_info_config_bdw_and_later.inl" +#include "shared/source/os_interface/product_helper_bdw_and_later.inl" #include "platforms.h" diff --git a/shared/source/gen11/windows/hw_info_config_ehl.cpp b/shared/source/gen11/windows/hw_info_config_ehl.cpp index 7f3116b9fd..c55e40a880 100644 --- a/shared/source/gen11/windows/hw_info_config_ehl.cpp +++ b/shared/source/gen11/windows/hw_info_config_ehl.cpp @@ -8,7 +8,7 @@ #include "shared/source/gen11/hw_cmds_ehl.h" #include "shared/source/os_interface/hw_info_config.h" #include "shared/source/os_interface/hw_info_config.inl" -#include "shared/source/os_interface/hw_info_config_bdw_and_later.inl" +#include "shared/source/os_interface/product_helper_bdw_and_later.inl" #include "platforms.h" diff --git a/shared/source/gen11/windows/hw_info_config_icllp.cpp b/shared/source/gen11/windows/hw_info_config_icllp.cpp index a8e164ee41..2bf5430e0d 100644 --- a/shared/source/gen11/windows/hw_info_config_icllp.cpp +++ b/shared/source/gen11/windows/hw_info_config_icllp.cpp @@ -8,7 +8,7 @@ #include "shared/source/gen11/hw_cmds_icllp.h" #include "shared/source/os_interface/hw_info_config.h" #include "shared/source/os_interface/hw_info_config.inl" -#include "shared/source/os_interface/hw_info_config_bdw_and_later.inl" +#include "shared/source/os_interface/product_helper_bdw_and_later.inl" #include "platforms.h" diff --git a/shared/source/gen11/windows/hw_info_config_lkf.cpp b/shared/source/gen11/windows/hw_info_config_lkf.cpp index 13dba85866..2d65bcd27d 100644 --- a/shared/source/gen11/windows/hw_info_config_lkf.cpp +++ b/shared/source/gen11/windows/hw_info_config_lkf.cpp @@ -8,7 +8,7 @@ #include "shared/source/gen11/hw_cmds_lkf.h" #include "shared/source/os_interface/hw_info_config.h" #include "shared/source/os_interface/hw_info_config.inl" -#include "shared/source/os_interface/hw_info_config_bdw_and_later.inl" +#include "shared/source/os_interface/product_helper_bdw_and_later.inl" #include "platforms.h" diff --git a/shared/source/gen12lp/linux/hw_info_config_adln.cpp b/shared/source/gen12lp/linux/hw_info_config_adln.cpp index 9af59def42..ac846bfff1 100644 --- a/shared/source/gen12lp/linux/hw_info_config_adln.cpp +++ b/shared/source/gen12lp/linux/hw_info_config_adln.cpp @@ -10,7 +10,7 @@ #include "shared/source/helpers/hw_info.h" #include "shared/source/os_interface/hw_info_config.h" #include "shared/source/os_interface/hw_info_config.inl" -#include "shared/source/os_interface/hw_info_config_bdw_and_later.inl" +#include "shared/source/os_interface/product_helper_bdw_and_later.inl" #include "platforms.h" diff --git a/shared/source/gen12lp/linux/hw_info_config_adlp.cpp b/shared/source/gen12lp/linux/hw_info_config_adlp.cpp index d803b81eba..3faee7f713 100644 --- a/shared/source/gen12lp/linux/hw_info_config_adlp.cpp +++ b/shared/source/gen12lp/linux/hw_info_config_adlp.cpp @@ -12,7 +12,7 @@ #include "shared/source/helpers/pipeline_select_helper.h" #include "shared/source/os_interface/hw_info_config.h" #include "shared/source/os_interface/hw_info_config.inl" -#include "shared/source/os_interface/hw_info_config_bdw_and_later.inl" +#include "shared/source/os_interface/product_helper_bdw_and_later.inl" #include "platforms.h" diff --git a/shared/source/gen12lp/linux/hw_info_config_adls.cpp b/shared/source/gen12lp/linux/hw_info_config_adls.cpp index 1a1b595824..829b5a874c 100644 --- a/shared/source/gen12lp/linux/hw_info_config_adls.cpp +++ b/shared/source/gen12lp/linux/hw_info_config_adls.cpp @@ -10,7 +10,7 @@ #include "shared/source/helpers/hw_info.h" #include "shared/source/os_interface/hw_info_config.h" #include "shared/source/os_interface/hw_info_config.inl" -#include "shared/source/os_interface/hw_info_config_bdw_and_later.inl" +#include "shared/source/os_interface/product_helper_bdw_and_later.inl" #include "platforms.h" diff --git a/shared/source/gen12lp/linux/hw_info_config_dg1.cpp b/shared/source/gen12lp/linux/hw_info_config_dg1.cpp index 433fcdd0a2..7b75c4d0cc 100644 --- a/shared/source/gen12lp/linux/hw_info_config_dg1.cpp +++ b/shared/source/gen12lp/linux/hw_info_config_dg1.cpp @@ -10,7 +10,7 @@ #include "shared/source/helpers/hw_info.h" #include "shared/source/os_interface/hw_info_config.h" #include "shared/source/os_interface/hw_info_config.inl" -#include "shared/source/os_interface/hw_info_config_bdw_and_later.inl" +#include "shared/source/os_interface/product_helper_bdw_and_later.inl" #include "platforms.h" diff --git a/shared/source/gen12lp/linux/hw_info_config_rkl.cpp b/shared/source/gen12lp/linux/hw_info_config_rkl.cpp index b9e60d3c36..8215718ddf 100644 --- a/shared/source/gen12lp/linux/hw_info_config_rkl.cpp +++ b/shared/source/gen12lp/linux/hw_info_config_rkl.cpp @@ -10,7 +10,7 @@ #include "shared/source/helpers/hw_info.h" #include "shared/source/os_interface/hw_info_config.h" #include "shared/source/os_interface/hw_info_config.inl" -#include "shared/source/os_interface/hw_info_config_bdw_and_later.inl" +#include "shared/source/os_interface/product_helper_bdw_and_later.inl" #include "platforms.h" diff --git a/shared/source/gen12lp/linux/hw_info_config_tgllp.cpp b/shared/source/gen12lp/linux/hw_info_config_tgllp.cpp index c15d8e4401..57c5c2322f 100644 --- a/shared/source/gen12lp/linux/hw_info_config_tgllp.cpp +++ b/shared/source/gen12lp/linux/hw_info_config_tgllp.cpp @@ -10,7 +10,7 @@ #include "shared/source/helpers/hw_info.h" #include "shared/source/os_interface/hw_info_config.h" #include "shared/source/os_interface/hw_info_config.inl" -#include "shared/source/os_interface/hw_info_config_bdw_and_later.inl" +#include "shared/source/os_interface/product_helper_bdw_and_later.inl" #include "platforms.h" diff --git a/shared/source/gen12lp/windows/hw_info_config_adln.cpp b/shared/source/gen12lp/windows/hw_info_config_adln.cpp index 9af59def42..ac846bfff1 100644 --- a/shared/source/gen12lp/windows/hw_info_config_adln.cpp +++ b/shared/source/gen12lp/windows/hw_info_config_adln.cpp @@ -10,7 +10,7 @@ #include "shared/source/helpers/hw_info.h" #include "shared/source/os_interface/hw_info_config.h" #include "shared/source/os_interface/hw_info_config.inl" -#include "shared/source/os_interface/hw_info_config_bdw_and_later.inl" +#include "shared/source/os_interface/product_helper_bdw_and_later.inl" #include "platforms.h" diff --git a/shared/source/gen12lp/windows/hw_info_config_adlp.cpp b/shared/source/gen12lp/windows/hw_info_config_adlp.cpp index 99d62a0c99..0dff684974 100644 --- a/shared/source/gen12lp/windows/hw_info_config_adlp.cpp +++ b/shared/source/gen12lp/windows/hw_info_config_adlp.cpp @@ -12,7 +12,7 @@ #include "shared/source/helpers/pipeline_select_helper.h" #include "shared/source/os_interface/hw_info_config.h" #include "shared/source/os_interface/hw_info_config.inl" -#include "shared/source/os_interface/hw_info_config_bdw_and_later.inl" +#include "shared/source/os_interface/product_helper_bdw_and_later.inl" #include "platforms.h" diff --git a/shared/source/gen12lp/windows/hw_info_config_adls.cpp b/shared/source/gen12lp/windows/hw_info_config_adls.cpp index 1a1b595824..829b5a874c 100644 --- a/shared/source/gen12lp/windows/hw_info_config_adls.cpp +++ b/shared/source/gen12lp/windows/hw_info_config_adls.cpp @@ -10,7 +10,7 @@ #include "shared/source/helpers/hw_info.h" #include "shared/source/os_interface/hw_info_config.h" #include "shared/source/os_interface/hw_info_config.inl" -#include "shared/source/os_interface/hw_info_config_bdw_and_later.inl" +#include "shared/source/os_interface/product_helper_bdw_and_later.inl" #include "platforms.h" diff --git a/shared/source/gen12lp/windows/hw_info_config_dg1.cpp b/shared/source/gen12lp/windows/hw_info_config_dg1.cpp index 24bef3abbe..a6c0ed6708 100644 --- a/shared/source/gen12lp/windows/hw_info_config_dg1.cpp +++ b/shared/source/gen12lp/windows/hw_info_config_dg1.cpp @@ -10,7 +10,7 @@ #include "shared/source/helpers/hw_info.h" #include "shared/source/os_interface/hw_info_config.h" #include "shared/source/os_interface/hw_info_config.inl" -#include "shared/source/os_interface/hw_info_config_bdw_and_later.inl" +#include "shared/source/os_interface/product_helper_bdw_and_later.inl" #include "platforms.h" diff --git a/shared/source/gen12lp/windows/hw_info_config_rkl.cpp b/shared/source/gen12lp/windows/hw_info_config_rkl.cpp index 854895fa8e..86847e0505 100644 --- a/shared/source/gen12lp/windows/hw_info_config_rkl.cpp +++ b/shared/source/gen12lp/windows/hw_info_config_rkl.cpp @@ -10,7 +10,7 @@ #include "shared/source/helpers/hw_info.h" #include "shared/source/os_interface/hw_info_config.h" #include "shared/source/os_interface/hw_info_config.inl" -#include "shared/source/os_interface/hw_info_config_bdw_and_later.inl" +#include "shared/source/os_interface/product_helper_bdw_and_later.inl" #include "platforms.h" diff --git a/shared/source/gen12lp/windows/hw_info_config_tgllp.cpp b/shared/source/gen12lp/windows/hw_info_config_tgllp.cpp index 926f463ed1..4b0f099c92 100644 --- a/shared/source/gen12lp/windows/hw_info_config_tgllp.cpp +++ b/shared/source/gen12lp/windows/hw_info_config_tgllp.cpp @@ -10,7 +10,7 @@ #include "shared/source/helpers/hw_info.h" #include "shared/source/os_interface/hw_info_config.h" #include "shared/source/os_interface/hw_info_config.inl" -#include "shared/source/os_interface/hw_info_config_bdw_and_later.inl" +#include "shared/source/os_interface/product_helper_bdw_and_later.inl" #include "platforms.h" diff --git a/shared/source/gen8/linux/hw_info_config_bdw.cpp b/shared/source/gen8/linux/hw_info_config_bdw.cpp index e199f3b70b..faef20b1e3 100644 --- a/shared/source/gen8/linux/hw_info_config_bdw.cpp +++ b/shared/source/gen8/linux/hw_info_config_bdw.cpp @@ -9,7 +9,7 @@ #include "shared/source/helpers/hw_info.h" #include "shared/source/os_interface/hw_info_config.h" #include "shared/source/os_interface/hw_info_config.inl" -#include "shared/source/os_interface/hw_info_config_bdw_and_later.inl" +#include "shared/source/os_interface/product_helper_bdw_and_later.inl" #include "platforms.h" diff --git a/shared/source/gen8/windows/hw_info_config_bdw.cpp b/shared/source/gen8/windows/hw_info_config_bdw.cpp index e8b3c54857..a66c42d12b 100644 --- a/shared/source/gen8/windows/hw_info_config_bdw.cpp +++ b/shared/source/gen8/windows/hw_info_config_bdw.cpp @@ -9,7 +9,7 @@ #include "shared/source/helpers/hw_info.h" #include "shared/source/os_interface/hw_info_config.h" #include "shared/source/os_interface/hw_info_config.inl" -#include "shared/source/os_interface/hw_info_config_bdw_and_later.inl" +#include "shared/source/os_interface/product_helper_bdw_and_later.inl" #include "platforms.h" diff --git a/shared/source/gen9/linux/hw_info_config_bxt.cpp b/shared/source/gen9/linux/hw_info_config_bxt.cpp index c82cfafba5..f23f2e3591 100644 --- a/shared/source/gen9/linux/hw_info_config_bxt.cpp +++ b/shared/source/gen9/linux/hw_info_config_bxt.cpp @@ -9,9 +9,9 @@ #include "shared/source/helpers/hw_info.h" #include "shared/source/os_interface/hw_info_config.h" #include "shared/source/os_interface/hw_info_config.inl" -#include "shared/source/os_interface/hw_info_config_bdw_and_later.inl" #include "shared/source/os_interface/linux/drm_neo.h" #include "shared/source/os_interface/os_interface.h" +#include "shared/source/os_interface/product_helper_bdw_and_later.inl" #include "platforms.h" diff --git a/shared/source/gen9/linux/hw_info_config_cfl.cpp b/shared/source/gen9/linux/hw_info_config_cfl.cpp index b624f6ce62..ee9c4c9a07 100644 --- a/shared/source/gen9/linux/hw_info_config_cfl.cpp +++ b/shared/source/gen9/linux/hw_info_config_cfl.cpp @@ -9,7 +9,7 @@ #include "shared/source/helpers/hw_info.h" #include "shared/source/os_interface/hw_info_config.h" #include "shared/source/os_interface/hw_info_config.inl" -#include "shared/source/os_interface/hw_info_config_bdw_and_later.inl" +#include "shared/source/os_interface/product_helper_bdw_and_later.inl" constexpr static auto gfxProduct = IGFX_COFFEELAKE; diff --git a/shared/source/gen9/linux/hw_info_config_glk.cpp b/shared/source/gen9/linux/hw_info_config_glk.cpp index 928e4b2f50..385f0aec83 100644 --- a/shared/source/gen9/linux/hw_info_config_glk.cpp +++ b/shared/source/gen9/linux/hw_info_config_glk.cpp @@ -9,9 +9,9 @@ #include "shared/source/helpers/hw_info.h" #include "shared/source/os_interface/hw_info_config.h" #include "shared/source/os_interface/hw_info_config.inl" -#include "shared/source/os_interface/hw_info_config_bdw_and_later.inl" #include "shared/source/os_interface/linux/drm_neo.h" #include "shared/source/os_interface/os_interface.h" +#include "shared/source/os_interface/product_helper_bdw_and_later.inl" #include "platforms.h" diff --git a/shared/source/gen9/linux/hw_info_config_kbl.cpp b/shared/source/gen9/linux/hw_info_config_kbl.cpp index ab86e7a52e..d3caf95995 100644 --- a/shared/source/gen9/linux/hw_info_config_kbl.cpp +++ b/shared/source/gen9/linux/hw_info_config_kbl.cpp @@ -9,7 +9,7 @@ #include "shared/source/helpers/hw_info.h" #include "shared/source/os_interface/hw_info_config.h" #include "shared/source/os_interface/hw_info_config.inl" -#include "shared/source/os_interface/hw_info_config_bdw_and_later.inl" +#include "shared/source/os_interface/product_helper_bdw_and_later.inl" constexpr static auto gfxProduct = IGFX_KABYLAKE; diff --git a/shared/source/gen9/linux/hw_info_config_skl.cpp b/shared/source/gen9/linux/hw_info_config_skl.cpp index 3e021ef48f..1d2908577f 100644 --- a/shared/source/gen9/linux/hw_info_config_skl.cpp +++ b/shared/source/gen9/linux/hw_info_config_skl.cpp @@ -9,7 +9,7 @@ #include "shared/source/helpers/hw_info.h" #include "shared/source/os_interface/hw_info_config.h" #include "shared/source/os_interface/hw_info_config.inl" -#include "shared/source/os_interface/hw_info_config_bdw_and_later.inl" +#include "shared/source/os_interface/product_helper_bdw_and_later.inl" #include "platforms.h" diff --git a/shared/source/gen9/windows/hw_info_config_bxt.cpp b/shared/source/gen9/windows/hw_info_config_bxt.cpp index 8551bff858..266c154602 100644 --- a/shared/source/gen9/windows/hw_info_config_bxt.cpp +++ b/shared/source/gen9/windows/hw_info_config_bxt.cpp @@ -8,7 +8,7 @@ #include "shared/source/gen9/hw_cmds_bxt.h" #include "shared/source/os_interface/hw_info_config.h" #include "shared/source/os_interface/hw_info_config.inl" -#include "shared/source/os_interface/hw_info_config_bdw_and_later.inl" +#include "shared/source/os_interface/product_helper_bdw_and_later.inl" #include "platforms.h" diff --git a/shared/source/gen9/windows/hw_info_config_cfl.cpp b/shared/source/gen9/windows/hw_info_config_cfl.cpp index 6cf08f088e..8cf285b2f8 100644 --- a/shared/source/gen9/windows/hw_info_config_cfl.cpp +++ b/shared/source/gen9/windows/hw_info_config_cfl.cpp @@ -8,7 +8,7 @@ #include "shared/source/gen9/hw_cmds_cfl.h" #include "shared/source/os_interface/hw_info_config.h" #include "shared/source/os_interface/hw_info_config.inl" -#include "shared/source/os_interface/hw_info_config_bdw_and_later.inl" +#include "shared/source/os_interface/product_helper_bdw_and_later.inl" constexpr static auto gfxProduct = IGFX_COFFEELAKE; diff --git a/shared/source/gen9/windows/hw_info_config_glk.cpp b/shared/source/gen9/windows/hw_info_config_glk.cpp index 6f71f01773..0a6dd3c182 100644 --- a/shared/source/gen9/windows/hw_info_config_glk.cpp +++ b/shared/source/gen9/windows/hw_info_config_glk.cpp @@ -8,7 +8,7 @@ #include "shared/source/gen9/hw_cmds_glk.h" #include "shared/source/os_interface/hw_info_config.h" #include "shared/source/os_interface/hw_info_config.inl" -#include "shared/source/os_interface/hw_info_config_bdw_and_later.inl" +#include "shared/source/os_interface/product_helper_bdw_and_later.inl" #include "platforms.h" diff --git a/shared/source/gen9/windows/hw_info_config_kbl.cpp b/shared/source/gen9/windows/hw_info_config_kbl.cpp index 13f3e3b5a7..4f6ccf6079 100644 --- a/shared/source/gen9/windows/hw_info_config_kbl.cpp +++ b/shared/source/gen9/windows/hw_info_config_kbl.cpp @@ -8,7 +8,7 @@ #include "shared/source/gen9/hw_cmds_kbl.h" #include "shared/source/os_interface/hw_info_config.h" #include "shared/source/os_interface/hw_info_config.inl" -#include "shared/source/os_interface/hw_info_config_bdw_and_later.inl" +#include "shared/source/os_interface/product_helper_bdw_and_later.inl" constexpr static auto gfxProduct = IGFX_KABYLAKE; diff --git a/shared/source/gen9/windows/hw_info_config_skl.cpp b/shared/source/gen9/windows/hw_info_config_skl.cpp index 5fdbbcaeb4..3136bdc17e 100644 --- a/shared/source/gen9/windows/hw_info_config_skl.cpp +++ b/shared/source/gen9/windows/hw_info_config_skl.cpp @@ -8,7 +8,7 @@ #include "shared/source/gen9/hw_cmds_skl.h" #include "shared/source/os_interface/hw_info_config.h" #include "shared/source/os_interface/hw_info_config.inl" -#include "shared/source/os_interface/hw_info_config_bdw_and_later.inl" +#include "shared/source/os_interface/product_helper_bdw_and_later.inl" #include "platforms.h" diff --git a/shared/source/os_interface/CMakeLists.txt b/shared/source/os_interface/CMakeLists.txt index e96b9027af..ac1767cd7b 100644 --- a/shared/source/os_interface/CMakeLists.txt +++ b/shared/source/os_interface/CMakeLists.txt @@ -25,7 +25,7 @@ set(NEO_CORE_OS_INTERFACE ${CMAKE_CURRENT_SOURCE_DIR}/hw_info_config.cpp ${CMAKE_CURRENT_SOURCE_DIR}/hw_info_config.h ${CMAKE_CURRENT_SOURCE_DIR}/hw_info_config.inl - ${CMAKE_CURRENT_SOURCE_DIR}/hw_info_config_bdw_and_later.inl + ${CMAKE_CURRENT_SOURCE_DIR}/product_helper_bdw_and_later.inl ${CMAKE_CURRENT_SOURCE_DIR}/metrics_library.cpp ${CMAKE_CURRENT_SOURCE_DIR}/os_context.cpp ${CMAKE_CURRENT_SOURCE_DIR}/os_context.h diff --git a/shared/source/os_interface/hw_info_config_bdw_and_later.inl b/shared/source/os_interface/product_helper_bdw_and_later.inl similarity index 100% rename from shared/source/os_interface/hw_info_config_bdw_and_later.inl rename to shared/source/os_interface/product_helper_bdw_and_later.inl