From 924eb23c906bd573f3783c61a5cfa9d938fe7491 Mon Sep 17 00:00:00 2001
From: Kamil Kopryk <kamil.kopryk@intel.com>
Date: Mon, 12 Dec 2022 14:59:04 +0000
Subject: [PATCH] Split hwInfoConfig and CompilerProductHelper enablers

Related-To: NEO-6853
Signed-off-by: Kamil Kopryk <kamil.kopryk@intel.com>
---
 shared/offline_compiler/source/CMakeLists.txt |  3 ++-
 shared/source/enable_cores.cmake              |  4 ++++
 .../enable_compiler_product_helper_ehl.cpp    | 20 ++++++++++++++++++
 .../enable_compiler_product_helper_icllp.cpp  | 20 ++++++++++++++++++
 .../enable_compiler_product_helper_lkf.cpp    | 20 ++++++++++++++++++
 shared/source/gen11/enable_gen11.cpp          | 10 +++------
 .../enable_compiler_product_helper_adln.cpp   | 20 ++++++++++++++++++
 .../enable_compiler_product_helper_adlp.cpp   | 20 ++++++++++++++++++
 .../enable_compiler_product_helper_adls.cpp   | 19 +++++++++++++++++
 .../enable_compiler_product_helper_dg1.cpp    | 19 +++++++++++++++++
 .../enable_compiler_product_helper_rkl.cpp    | 20 ++++++++++++++++++
 .../enable_compiler_product_helper_tgllp.cpp  | 20 ++++++++++++++++++
 shared/source/gen12lp/enable_gen12lp.cpp      | 15 ++++---------
 .../enable_compiler_product_helper_bdw.cpp    | 21 +++++++++++++++++++
 shared/source/gen8/enable_gen8.cpp            |  7 -------
 .../enable_compiler_product_helper_bxt.cpp    | 20 ++++++++++++++++++
 .../enable_compiler_product_helper_cfl.cpp    | 20 ++++++++++++++++++
 .../enable_compiler_product_helper_glk.cpp    | 19 +++++++++++++++++
 .../enable_compiler_product_helper_kbl.cpp    | 19 +++++++++++++++++
 .../enable_compiler_product_helper_skl.cpp    | 20 ++++++++++++++++++
 shared/source/gen9/enable_gen9.cpp            |  9 --------
 ...able_compiler_product_helper_xe_hp_sdv.cpp | 20 ++++++++++++++++++
 .../source/xe_hp_core/enable_xe_hp_core.cpp   |  6 +-----
 .../enable_compiler_product_helper_pvc.cpp    | 20 ++++++++++++++++++
 .../source/xe_hpc_core/enable_xe_hpc_core.cpp |  6 +-----
 .../enable_compiler_product_helper_dg2.cpp    | 20 ++++++++++++++++++
 .../source/xe_hpg_core/enable_xe_hpg_core.cpp |  6 +-----
 shared/test/common/libult/CMakeLists.txt      |  4 ++++
 28 files changed, 377 insertions(+), 50 deletions(-)
 create mode 100644 shared/source/gen11/enable_compiler_product_helper_ehl.cpp
 create mode 100644 shared/source/gen11/enable_compiler_product_helper_icllp.cpp
 create mode 100644 shared/source/gen11/enable_compiler_product_helper_lkf.cpp
 create mode 100644 shared/source/gen12lp/enable_compiler_product_helper_adln.cpp
 create mode 100644 shared/source/gen12lp/enable_compiler_product_helper_adlp.cpp
 create mode 100644 shared/source/gen12lp/enable_compiler_product_helper_adls.cpp
 create mode 100644 shared/source/gen12lp/enable_compiler_product_helper_dg1.cpp
 create mode 100644 shared/source/gen12lp/enable_compiler_product_helper_rkl.cpp
 create mode 100644 shared/source/gen12lp/enable_compiler_product_helper_tgllp.cpp
 create mode 100644 shared/source/gen8/enable_compiler_product_helper_bdw.cpp
 create mode 100644 shared/source/gen9/enable_compiler_product_helper_bxt.cpp
 create mode 100644 shared/source/gen9/enable_compiler_product_helper_cfl.cpp
 create mode 100644 shared/source/gen9/enable_compiler_product_helper_glk.cpp
 create mode 100644 shared/source/gen9/enable_compiler_product_helper_kbl.cpp
 create mode 100644 shared/source/gen9/enable_compiler_product_helper_skl.cpp
 create mode 100644 shared/source/xe_hp_core/enable_compiler_product_helper_xe_hp_sdv.cpp
 create mode 100644 shared/source/xe_hpc_core/enable_compiler_product_helper_pvc.cpp
 create mode 100644 shared/source/xe_hpg_core/enable_compiler_product_helper_dg2.cpp

diff --git a/shared/offline_compiler/source/CMakeLists.txt b/shared/offline_compiler/source/CMakeLists.txt
index b1ddf5d38b..bd31c4ed81 100644
--- a/shared/offline_compiler/source/CMakeLists.txt
+++ b/shared/offline_compiler/source/CMakeLists.txt
@@ -153,7 +153,8 @@ 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}/compiler_hw_info_config_${PLATFORM_IT_LOWER}.inl
+                ${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}enable_compiler_product_helper_${PLATFORM_IT_LOWER}.cpp
         )
         if(EXISTS ${SRC_FILE})
           list(APPEND CLOC_LIB_SRCS_LIB ${SRC_FILE})
diff --git a/shared/source/enable_cores.cmake b/shared/source/enable_cores.cmake
index b31f27f219..d6d5e0b7eb 100644
--- a/shared/source/enable_cores.cmake
+++ b/shared/source/enable_cores.cmake
@@ -101,6 +101,10 @@ macro(macro_for_each_platform)
       if(EXISTS ${SRC_FILE})
         list(APPEND ${CORE_TYPE}_SRC_LINK_BASE ${SRC_FILE})
       endif()
+      set(SRC_FILE ${PATH_TO_CORE}enable_compiler_product_helper_${PLATFORM_IT_LOWER}.cpp)
+      if(EXISTS ${SRC_FILE})
+        list(APPEND ${CORE_TYPE}_SRC_LINK_BASE ${SRC_FILE})
+      endif()
       set(SRC_FILE ${CMAKE_CURRENT_SOURCE_DIR}/os_interface/linux/local${BRANCH_DIR_SUFFIX}${PLATFORM_IT_LOWER}/enable_ioctl_helper_${PLATFORM_IT_LOWER}.cpp)
       if(EXISTS ${SRC_FILE})
         list(APPEND ${CORE_TYPE}_SRC_LINK_LINUX ${SRC_FILE})
diff --git a/shared/source/gen11/enable_compiler_product_helper_ehl.cpp b/shared/source/gen11/enable_compiler_product_helper_ehl.cpp
new file mode 100644
index 0000000000..3df9efdf97
--- /dev/null
+++ b/shared/source/gen11/enable_compiler_product_helper_ehl.cpp
@@ -0,0 +1,20 @@
+/*
+ * Copyright (C) 2022 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 "hw_info_ehl.h"
+
+namespace NEO {
+
+static EnableCompilerProductHelper<IGFX_ELKHARTLAKE> enableCompilerProductHelperEHL;
+
+} // namespace NEO
diff --git a/shared/source/gen11/enable_compiler_product_helper_icllp.cpp b/shared/source/gen11/enable_compiler_product_helper_icllp.cpp
new file mode 100644
index 0000000000..1b6d570f97
--- /dev/null
+++ b/shared/source/gen11/enable_compiler_product_helper_icllp.cpp
@@ -0,0 +1,20 @@
+/*
+ * Copyright (C) 2022 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 "hw_info_icllp.h"
+
+namespace NEO {
+
+static EnableCompilerProductHelper<IGFX_ICELAKE_LP> enableCompilerProductHelperICLLP;
+
+} // namespace NEO
diff --git a/shared/source/gen11/enable_compiler_product_helper_lkf.cpp b/shared/source/gen11/enable_compiler_product_helper_lkf.cpp
new file mode 100644
index 0000000000..d266d7dad4
--- /dev/null
+++ b/shared/source/gen11/enable_compiler_product_helper_lkf.cpp
@@ -0,0 +1,20 @@
+/*
+ * Copyright (C) 2022 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 "hw_info_lkf.h"
+
+namespace NEO {
+
+static EnableCompilerProductHelper<IGFX_LAKEFIELD> enableCompilerProductHelperLKF;
+
+} // namespace NEO
diff --git a/shared/source/gen11/enable_gen11.cpp b/shared/source/gen11/enable_gen11.cpp
index 1aa9ddedaa..d50becdd4e 100644
--- a/shared/source/gen11/enable_gen11.cpp
+++ b/shared/source/gen11/enable_gen11.cpp
@@ -7,10 +7,6 @@
 
 #include "shared/source/gen11/hw_cmds.h"
 #include "shared/source/helpers/cache_policy_bdw_and_later.inl"
-#include "shared/source/helpers/compiler_aot_config_bdw_and_later.inl"
-#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/enable_product.inl"
 #include "shared/source/os_interface/hw_info_config.h"
 
@@ -19,17 +15,17 @@ namespace NEO {
 #ifdef SUPPORT_ICLLP
 template struct L1CachePolicyHelper<IGFX_ICELAKE_LP>;
 static EnableGfxProductHw<IGFX_ICELAKE_LP> enableGfxProductHwICLLP;
-static EnableCompilerProductHelper<IGFX_ICELAKE_LP> enableCompilerProductHelperICLLP;
+
 #endif
 #ifdef SUPPORT_LKF
 template struct L1CachePolicyHelper<IGFX_LAKEFIELD>;
 static EnableGfxProductHw<IGFX_LAKEFIELD> enableGfxProductHwLKF;
-static EnableCompilerProductHelper<IGFX_LAKEFIELD> enableCompilerProductHelperLKF;
+
 #endif
 #ifdef SUPPORT_EHL
 template struct L1CachePolicyHelper<IGFX_ELKHARTLAKE>;
 static EnableGfxProductHw<IGFX_ELKHARTLAKE> enableGfxProductHwEHL;
-static EnableCompilerProductHelper<IGFX_ELKHARTLAKE> enableCompilerProductHelperEHL;
+
 #endif
 
 } // namespace NEO
diff --git a/shared/source/gen12lp/enable_compiler_product_helper_adln.cpp b/shared/source/gen12lp/enable_compiler_product_helper_adln.cpp
new file mode 100644
index 0000000000..bd81edcf85
--- /dev/null
+++ b/shared/source/gen12lp/enable_compiler_product_helper_adln.cpp
@@ -0,0 +1,20 @@
+/*
+ * Copyright (C) 2022 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 "hw_info_adln.h"
+
+namespace NEO {
+
+static EnableCompilerProductHelper<IGFX_ALDERLAKE_N> enableCompilerProductHelperADLN;
+
+} // namespace NEO
diff --git a/shared/source/gen12lp/enable_compiler_product_helper_adlp.cpp b/shared/source/gen12lp/enable_compiler_product_helper_adlp.cpp
new file mode 100644
index 0000000000..ee36012b95
--- /dev/null
+++ b/shared/source/gen12lp/enable_compiler_product_helper_adlp.cpp
@@ -0,0 +1,20 @@
+/*
+ * Copyright (C) 2022 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 "hw_info_adlp.h"
+
+namespace NEO {
+
+static EnableCompilerProductHelper<IGFX_ALDERLAKE_P> enableCompilerProductHelperADLP;
+
+} // namespace NEO
diff --git a/shared/source/gen12lp/enable_compiler_product_helper_adls.cpp b/shared/source/gen12lp/enable_compiler_product_helper_adls.cpp
new file mode 100644
index 0000000000..e12a35f56e
--- /dev/null
+++ b/shared/source/gen12lp/enable_compiler_product_helper_adls.cpp
@@ -0,0 +1,19 @@
+/*
+ * Copyright (C) 2022 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 "hw_info_adls.h"
+namespace NEO {
+
+static EnableCompilerProductHelper<IGFX_ALDERLAKE_S> enableCompilerProductHelperADLS;
+
+} // namespace NEO
diff --git a/shared/source/gen12lp/enable_compiler_product_helper_dg1.cpp b/shared/source/gen12lp/enable_compiler_product_helper_dg1.cpp
new file mode 100644
index 0000000000..e9c0ed16e7
--- /dev/null
+++ b/shared/source/gen12lp/enable_compiler_product_helper_dg1.cpp
@@ -0,0 +1,19 @@
+/*
+ * Copyright (C) 2022 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 "hw_info_dg1.h"
+namespace NEO {
+
+static EnableCompilerProductHelper<IGFX_DG1> enableCompilerProductHelperDG1;
+
+} // namespace NEO
diff --git a/shared/source/gen12lp/enable_compiler_product_helper_rkl.cpp b/shared/source/gen12lp/enable_compiler_product_helper_rkl.cpp
new file mode 100644
index 0000000000..57427af237
--- /dev/null
+++ b/shared/source/gen12lp/enable_compiler_product_helper_rkl.cpp
@@ -0,0 +1,20 @@
+/*
+ * Copyright (C) 2022 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 "hw_info_rkl.h"
+namespace NEO {
+
+#include "shared/source/gen12lp/compiler_hw_info_config_rkl.inl"
+static EnableCompilerProductHelper<IGFX_ROCKETLAKE> 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
new file mode 100644
index 0000000000..560ffd89c1
--- /dev/null
+++ b/shared/source/gen12lp/enable_compiler_product_helper_tgllp.cpp
@@ -0,0 +1,20 @@
+/*
+ * Copyright (C) 2022 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 "hw_info_tgllp.h"
+
+namespace NEO {
+
+static EnableCompilerProductHelper<IGFX_TIGERLAKE_LP> enableCompilerProductHelperTGLLP;
+
+} // namespace NEO
diff --git a/shared/source/gen12lp/enable_gen12lp.cpp b/shared/source/gen12lp/enable_gen12lp.cpp
index eb36990679..4ff0ba37bd 100644
--- a/shared/source/gen12lp/enable_gen12lp.cpp
+++ b/shared/source/gen12lp/enable_gen12lp.cpp
@@ -7,10 +7,6 @@
 
 #include "shared/source/gen12lp/hw_cmds.h"
 #include "shared/source/helpers/cache_policy_bdw_and_later.inl"
-#include "shared/source/helpers/compiler_aot_config_bdw_and_later.inl"
-#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/enable_product.inl"
 #include "shared/source/os_interface/hw_info_config.h"
 
@@ -19,33 +15,30 @@ namespace NEO {
 #ifdef SUPPORT_TGLLP
 template struct L1CachePolicyHelper<IGFX_TIGERLAKE_LP>;
 static EnableGfxProductHw<IGFX_TIGERLAKE_LP> enableGfxProductHwTGLLP;
-static EnableCompilerProductHelper<IGFX_TIGERLAKE_LP> enableCompilerProductHelperTGLLP;
+
 #endif
 #ifdef SUPPORT_DG1
 template struct L1CachePolicyHelper<IGFX_DG1>;
 static EnableGfxProductHw<IGFX_DG1> enableGfxProductHwDG1;
-static EnableCompilerProductHelper<IGFX_DG1> enableCompilerProductHelperDG1;
+
 #endif
 #ifdef SUPPORT_RKL
 template struct L1CachePolicyHelper<IGFX_ROCKETLAKE>;
 static EnableGfxProductHw<IGFX_ROCKETLAKE> enableGfxProductHwRKL;
 
-#include "shared/source/gen12lp/compiler_hw_info_config_rkl.inl"
-static EnableCompilerProductHelper<IGFX_ROCKETLAKE> enableCompilerProductHelperRKL;
 #endif
 #ifdef SUPPORT_ADLS
 template struct L1CachePolicyHelper<IGFX_ALDERLAKE_S>;
 static EnableGfxProductHw<IGFX_ALDERLAKE_S> enableGfxProductHwADLS;
-static EnableCompilerProductHelper<IGFX_ALDERLAKE_S> enableCompilerProductHelperADLS;
+
 #endif
 #ifdef SUPPORT_ADLP
 template struct L1CachePolicyHelper<IGFX_ALDERLAKE_P>;
 static EnableGfxProductHw<IGFX_ALDERLAKE_P> enableGfxProductHwADLP;
-static EnableCompilerProductHelper<IGFX_ALDERLAKE_P> enableCompilerProductHelperADLP;
+
 #endif
 #ifdef SUPPORT_ADLN
 template struct L1CachePolicyHelper<IGFX_ALDERLAKE_N>;
 static EnableGfxProductHw<IGFX_ALDERLAKE_N> enableGfxProductHwADLN;
-static EnableCompilerProductHelper<IGFX_ALDERLAKE_N> enableCompilerProductHelperADLN;
 #endif
 } // namespace NEO
diff --git a/shared/source/gen8/enable_compiler_product_helper_bdw.cpp b/shared/source/gen8/enable_compiler_product_helper_bdw.cpp
new file mode 100644
index 0000000000..c7397e33df
--- /dev/null
+++ b/shared/source/gen8/enable_compiler_product_helper_bdw.cpp
@@ -0,0 +1,21 @@
+/*
+ * Copyright (C) 2022 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 "hw_info_bdw.h"
+
+namespace NEO {
+
+#include "shared/source/gen8/compiler_hw_info_config_bdw.inl"
+static EnableCompilerProductHelper<IGFX_BROADWELL> enableCompilerProductHelperBDW;
+
+} // namespace NEO
diff --git a/shared/source/gen8/enable_gen8.cpp b/shared/source/gen8/enable_gen8.cpp
index 165696ccc8..0fb3ca21e7 100644
--- a/shared/source/gen8/enable_gen8.cpp
+++ b/shared/source/gen8/enable_gen8.cpp
@@ -7,10 +7,6 @@
 
 #include "shared/source/gen8/hw_cmds.h"
 #include "shared/source/helpers/cache_policy_bdw_and_later.inl"
-#include "shared/source/helpers/compiler_aot_config_bdw_and_later.inl"
-#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/enable_product.inl"
 #include "shared/source/os_interface/hw_info_config.h"
 
@@ -19,9 +15,6 @@ namespace NEO {
 #ifdef SUPPORT_BDW
 template struct L1CachePolicyHelper<IGFX_BROADWELL>;
 static EnableGfxProductHw<IGFX_BROADWELL> enableGfxProductHwBDW;
-
-#include "shared/source/gen8/compiler_hw_info_config_bdw.inl"
-static EnableCompilerProductHelper<IGFX_BROADWELL> enableCompilerProductHelperBDW;
 #endif
 
 } // namespace NEO
diff --git a/shared/source/gen9/enable_compiler_product_helper_bxt.cpp b/shared/source/gen9/enable_compiler_product_helper_bxt.cpp
new file mode 100644
index 0000000000..626f4c3be8
--- /dev/null
+++ b/shared/source/gen9/enable_compiler_product_helper_bxt.cpp
@@ -0,0 +1,20 @@
+/*
+ * Copyright (C) 2022 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 "hw_info_bxt.h"
+
+namespace NEO {
+
+static EnableCompilerProductHelper<IGFX_BROXTON> enableCompilerProductHelperBXT;
+
+} // namespace NEO
diff --git a/shared/source/gen9/enable_compiler_product_helper_cfl.cpp b/shared/source/gen9/enable_compiler_product_helper_cfl.cpp
new file mode 100644
index 0000000000..2d325acccc
--- /dev/null
+++ b/shared/source/gen9/enable_compiler_product_helper_cfl.cpp
@@ -0,0 +1,20 @@
+/*
+ * Copyright (C) 2022 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 "hw_info_cfl.h"
+
+namespace NEO {
+
+static EnableCompilerProductHelper<IGFX_COFFEELAKE> enableCompilerProductHelperCFL;
+
+} // namespace NEO
diff --git a/shared/source/gen9/enable_compiler_product_helper_glk.cpp b/shared/source/gen9/enable_compiler_product_helper_glk.cpp
new file mode 100644
index 0000000000..d548456eb3
--- /dev/null
+++ b/shared/source/gen9/enable_compiler_product_helper_glk.cpp
@@ -0,0 +1,19 @@
+/*
+ * Copyright (C) 2022 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 "hw_info_glk.h"
+
+namespace NEO {
+static EnableCompilerProductHelper<IGFX_GEMINILAKE> enableCompilerProductHelperGLK;
+
+} // namespace NEO
diff --git a/shared/source/gen9/enable_compiler_product_helper_kbl.cpp b/shared/source/gen9/enable_compiler_product_helper_kbl.cpp
new file mode 100644
index 0000000000..99aa8165fc
--- /dev/null
+++ b/shared/source/gen9/enable_compiler_product_helper_kbl.cpp
@@ -0,0 +1,19 @@
+/*
+ * Copyright (C) 2022 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 "hw_info_kbl.h"
+
+namespace NEO {
+static EnableCompilerProductHelper<IGFX_KABYLAKE> enableCompilerProductHelperKBL;
+
+} // namespace NEO
diff --git a/shared/source/gen9/enable_compiler_product_helper_skl.cpp b/shared/source/gen9/enable_compiler_product_helper_skl.cpp
new file mode 100644
index 0000000000..5d2a126255
--- /dev/null
+++ b/shared/source/gen9/enable_compiler_product_helper_skl.cpp
@@ -0,0 +1,20 @@
+/*
+ * Copyright (C) 2022 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 "hw_info_skl.h"
+
+namespace NEO {
+
+static EnableCompilerProductHelper<IGFX_SKYLAKE> enableCompilerProductHelperSKL;
+
+} // namespace NEO
diff --git a/shared/source/gen9/enable_gen9.cpp b/shared/source/gen9/enable_gen9.cpp
index a0409e99ec..72957eb3a2 100644
--- a/shared/source/gen9/enable_gen9.cpp
+++ b/shared/source/gen9/enable_gen9.cpp
@@ -7,10 +7,6 @@
 
 #include "shared/source/gen9/hw_cmds.h"
 #include "shared/source/helpers/cache_policy_bdw_and_later.inl"
-#include "shared/source/helpers/compiler_aot_config_bdw_and_later.inl"
-#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/enable_product.inl"
 #include "shared/source/os_interface/hw_info_config.h"
 
@@ -19,27 +15,22 @@ namespace NEO {
 #ifdef SUPPORT_BXT
 template struct L1CachePolicyHelper<IGFX_BROXTON>;
 static EnableGfxProductHw<IGFX_BROXTON> enableGfxProductHwBXT;
-static EnableCompilerProductHelper<IGFX_BROXTON> enableCompilerProductHelperBXT;
 #endif
 #ifdef SUPPORT_CFL
 template struct L1CachePolicyHelper<IGFX_COFFEELAKE>;
 static EnableGfxProductHw<IGFX_COFFEELAKE> enableGfxProductHwCFL;
-static EnableCompilerProductHelper<IGFX_COFFEELAKE> enableCompilerProductHelperCFL;
 #endif
 #ifdef SUPPORT_GLK
 template struct L1CachePolicyHelper<IGFX_GEMINILAKE>;
 static EnableGfxProductHw<IGFX_GEMINILAKE> enableGfxProductHwGLK;
-static EnableCompilerProductHelper<IGFX_GEMINILAKE> enableCompilerProductHelperGLK;
 #endif
 #ifdef SUPPORT_KBL
 template struct L1CachePolicyHelper<IGFX_KABYLAKE>;
 static EnableGfxProductHw<IGFX_KABYLAKE> enableGfxProductHwKBL;
-static EnableCompilerProductHelper<IGFX_KABYLAKE> enableCompilerProductHelperKBL;
 #endif
 #ifdef SUPPORT_SKL
 template struct L1CachePolicyHelper<IGFX_SKYLAKE>;
 static EnableGfxProductHw<IGFX_SKYLAKE> enableGfxProductHwSKL;
-static EnableCompilerProductHelper<IGFX_SKYLAKE> enableCompilerProductHelperSKL;
 #endif
 
 } // namespace NEO
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
new file mode 100644
index 0000000000..a7b1c5dcc2
--- /dev/null
+++ b/shared/source/xe_hp_core/enable_compiler_product_helper_xe_hp_sdv.cpp
@@ -0,0 +1,20 @@
+/*
+ * Copyright (C) 2022 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 "hw_info_xehp.h"
+
+namespace NEO {
+
+static EnableCompilerProductHelper<IGFX_XE_HP_SDV> enableCompilerProductHelperXEHP;
+
+} // namespace NEO
diff --git a/shared/source/xe_hp_core/enable_xe_hp_core.cpp b/shared/source/xe_hp_core/enable_xe_hp_core.cpp
index 82129b1d2b..6f715b25c2 100644
--- a/shared/source/xe_hp_core/enable_xe_hp_core.cpp
+++ b/shared/source/xe_hp_core/enable_xe_hp_core.cpp
@@ -6,10 +6,6 @@
  */
 
 #include "shared/source/helpers/cache_policy_bdw_and_later.inl"
-#include "shared/source/helpers/compiler_aot_config_bdw_and_later.inl"
-#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/enable_product.inl"
 #include "shared/source/os_interface/hw_info_config.h"
 #include "shared/source/xe_hp_core/hw_cmds.h"
@@ -19,6 +15,6 @@ namespace NEO {
 #ifdef SUPPORT_XE_HP_SDV
 template struct L1CachePolicyHelper<IGFX_XE_HP_SDV>;
 static EnableGfxProductHw<IGFX_XE_HP_SDV> enableGfxProductHwXEHP;
-static EnableCompilerProductHelper<IGFX_XE_HP_SDV> enableCompilerProductHelperXEHP;
+
 #endif
 } // namespace NEO
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
new file mode 100644
index 0000000000..eaa76eaaaa
--- /dev/null
+++ b/shared/source/xe_hpc_core/enable_compiler_product_helper_pvc.cpp
@@ -0,0 +1,20 @@
+/*
+ * Copyright (C) 2022 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 "hw_info_pvc.h"
+
+namespace NEO {
+
+static EnableCompilerProductHelper<IGFX_PVC> enableCompilerProductHelperPVC;
+
+} // namespace NEO
diff --git a/shared/source/xe_hpc_core/enable_xe_hpc_core.cpp b/shared/source/xe_hpc_core/enable_xe_hpc_core.cpp
index 88f3a6e0db..a5ef2a21b8 100644
--- a/shared/source/xe_hpc_core/enable_xe_hpc_core.cpp
+++ b/shared/source/xe_hpc_core/enable_xe_hpc_core.cpp
@@ -6,10 +6,6 @@
  */
 
 #include "shared/source/helpers/cache_policy_dg2_and_later.inl"
-#include "shared/source/helpers/compiler_aot_config_bdw_and_later.inl"
-#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/enable_product.inl"
 #include "shared/source/os_interface/hw_info_config.h"
 #include "shared/source/xe_hpc_core/hw_cmds.h"
@@ -19,7 +15,7 @@ namespace NEO {
 #ifdef SUPPORT_PVC
 static EnableGfxProductHw<IGFX_PVC> enableGfxProductHwPVC;
 template struct L1CachePolicyHelper<IGFX_PVC>;
-static EnableCompilerProductHelper<IGFX_PVC> enableCompilerProductHelperPVC;
+
 #endif
 
 } // namespace NEO
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
new file mode 100644
index 0000000000..49bc9b11ab
--- /dev/null
+++ b/shared/source/xe_hpg_core/enable_compiler_product_helper_dg2.cpp
@@ -0,0 +1,20 @@
+/*
+ * Copyright (C) 2022 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 "hw_info_dg2.h"
+
+namespace NEO {
+
+static EnableCompilerProductHelper<IGFX_DG2> enableCompilerProductHelperDG2;
+
+} // namespace NEO
diff --git a/shared/source/xe_hpg_core/enable_xe_hpg_core.cpp b/shared/source/xe_hpg_core/enable_xe_hpg_core.cpp
index 4b5b23004e..55aa80c0ae 100644
--- a/shared/source/xe_hpg_core/enable_xe_hpg_core.cpp
+++ b/shared/source/xe_hpg_core/enable_xe_hpg_core.cpp
@@ -6,10 +6,6 @@
  */
 
 #include "shared/source/helpers/cache_policy_dg2_and_later.inl"
-#include "shared/source/helpers/compiler_aot_config_bdw_and_later.inl"
-#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/enable_product.inl"
 #include "shared/source/os_interface/hw_info_config.h"
 #include "shared/source/xe_hpg_core/hw_cmds.h"
@@ -28,6 +24,6 @@ uint32_t L1CachePolicyHelper<IGFX_DG2>::getDefaultL1CachePolicy(bool isDebuggerA
 
 template struct L1CachePolicyHelper<IGFX_DG2>;
 static EnableGfxProductHw<IGFX_DG2> enableGfxProductHwDG2;
-static EnableCompilerProductHelper<IGFX_DG2> enableCompilerProductHelperDG2;
+
 #endif
 } // namespace NEO
diff --git a/shared/test/common/libult/CMakeLists.txt b/shared/test/common/libult/CMakeLists.txt
index f1fdabf675..b36670448c 100644
--- a/shared/test/common/libult/CMakeLists.txt
+++ b/shared/test/common/libult/CMakeLists.txt
@@ -13,6 +13,10 @@ 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_DIRECTORY}${BRANCH_DIR}${CORE_TYPE_LOWER}${BRANCH}enable_compiler_product_helper_${PLATFORM_IT_LOWER}.cpp)
+      if(EXISTS ${SRC_FILE})
+        list(APPEND neo_libult_common_SRCS_ENABLE_TESTED_HW ${SRC_FILE})
+      endif()
       set(SRC_FILE ${NEO_SHARED_DIRECTORY}/os_interface/linux/local${BRANCH_DIR_SUFFIX}${PLATFORM_IT_LOWER}/enable_ioctl_helper_${PLATFORM_IT_LOWER}.cpp)
       if(EXISTS ${SRC_FILE})
         list(APPEND neo_libult_common_SRCS_ENABLE_TESTED_HW_LINUX ${SRC_FILE})