Media
/
compute-runtime
mirror of https://github.com/intel/compute-runtime.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Split hwInfoConfig and CompilerProductHelper enablers 

Related-To: NEO-6853
Signed-off-by: Kamil Kopryk <kamil.kopryk@intel.com>
This commit is contained in:
Kamil Kopryk 2022-12-12 14:59:04 +00:00 committed by Compute-Runtime-Automation
parent 5fd8275c68
commit 924eb23c90
28 changed files with 377 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
shared/offline_compiler/source/CMakeLists.txt
View File

@ -153,7 +153,8 @@ macro(macro_for_each_platform)
foreach(BRANCH ${BRANCH_DIR_LIST}) 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 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}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}) if(EXISTS ${SRC_FILE})
list(APPEND CLOC_LIB_SRCS_LIB ${SRC_FILE}) list(APPEND CLOC_LIB_SRCS_LIB ${SRC_FILE})

4
shared/source/enable_cores.cmake
View File

@ -101,6 +101,10 @@ macro(macro_for_each_platform)
if(EXISTS ${SRC_FILE}) if(EXISTS ${SRC_FILE})
list(APPEND ${CORE_TYPE}_SRC_LINK_BASE ${SRC_FILE}) list(APPEND ${CORE_TYPE}_SRC_LINK_BASE ${SRC_FILE})
endif() 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) 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}) if(EXISTS ${SRC_FILE})
list(APPEND ${CORE_TYPE}_SRC_LINK_LINUX ${SRC_FILE}) list(APPEND ${CORE_TYPE}_SRC_LINK_LINUX ${SRC_FILE})

20
shared/source/gen11/enable_compiler_product_helper_ehl.cpp Normal file
View File

@ -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

20
shared/source/gen11/enable_compiler_product_helper_icllp.cpp Normal file
View File

@ -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

20
shared/source/gen11/enable_compiler_product_helper_lkf.cpp Normal file
View File

@ -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

10
shared/source/gen11/enable_gen11.cpp
View File

@ -7,10 +7,6 @@
#include "shared/source/gen11/hw_cmds.h" #include "shared/source/gen11/hw_cmds.h"
#include "shared/source/helpers/cache_policy_bdw_and_later.inl" #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/helpers/enable_product.inl"
#include "shared/source/os_interface/hw_info_config.h" #include "shared/source/os_interface/hw_info_config.h"
@ -19,17 +15,17 @@ namespace NEO {
#ifdef SUPPORT_ICLLP #ifdef SUPPORT_ICLLP
template struct L1CachePolicyHelper<IGFX_ICELAKE_LP>; template struct L1CachePolicyHelper<IGFX_ICELAKE_LP>;
static EnableGfxProductHw<IGFX_ICELAKE_LP> enableGfxProductHwICLLP; static EnableGfxProductHw<IGFX_ICELAKE_LP> enableGfxProductHwICLLP;
static EnableCompilerProductHelper<IGFX_ICELAKE_LP> enableCompilerProductHelperICLLP;
#endif #endif
#ifdef SUPPORT_LKF #ifdef SUPPORT_LKF
template struct L1CachePolicyHelper<IGFX_LAKEFIELD>; template struct L1CachePolicyHelper<IGFX_LAKEFIELD>;
static EnableGfxProductHw<IGFX_LAKEFIELD> enableGfxProductHwLKF; static EnableGfxProductHw<IGFX_LAKEFIELD> enableGfxProductHwLKF;
static EnableCompilerProductHelper<IGFX_LAKEFIELD> enableCompilerProductHelperLKF;
#endif #endif
#ifdef SUPPORT_EHL #ifdef SUPPORT_EHL
template struct L1CachePolicyHelper<IGFX_ELKHARTLAKE>; template struct L1CachePolicyHelper<IGFX_ELKHARTLAKE>;
static EnableGfxProductHw<IGFX_ELKHARTLAKE> enableGfxProductHwEHL; static EnableGfxProductHw<IGFX_ELKHARTLAKE> enableGfxProductHwEHL;
static EnableCompilerProductHelper<IGFX_ELKHARTLAKE> enableCompilerProductHelperEHL;
#endif #endif
} // namespace NEO } // namespace NEO

20
shared/source/gen12lp/enable_compiler_product_helper_adln.cpp Normal file
View File

@ -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

20
shared/source/gen12lp/enable_compiler_product_helper_adlp.cpp Normal file
View File

@ -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

19
shared/source/gen12lp/enable_compiler_product_helper_adls.cpp Normal file
View File

@ -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

19
shared/source/gen12lp/enable_compiler_product_helper_dg1.cpp Normal file
View File

@ -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

20
shared/source/gen12lp/enable_compiler_product_helper_rkl.cpp Normal file
View File

@ -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

20
shared/source/gen12lp/enable_compiler_product_helper_tgllp.cpp Normal file
View File

@ -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

15
shared/source/gen12lp/enable_gen12lp.cpp
View File

@ -7,10 +7,6 @@
#include "shared/source/gen12lp/hw_cmds.h" #include "shared/source/gen12lp/hw_cmds.h"
#include "shared/source/helpers/cache_policy_bdw_and_later.inl" #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/helpers/enable_product.inl"
#include "shared/source/os_interface/hw_info_config.h" #include "shared/source/os_interface/hw_info_config.h"
@ -19,33 +15,30 @@ namespace NEO {
#ifdef SUPPORT_TGLLP #ifdef SUPPORT_TGLLP
template struct L1CachePolicyHelper<IGFX_TIGERLAKE_LP>; template struct L1CachePolicyHelper<IGFX_TIGERLAKE_LP>;
static EnableGfxProductHw<IGFX_TIGERLAKE_LP> enableGfxProductHwTGLLP; static EnableGfxProductHw<IGFX_TIGERLAKE_LP> enableGfxProductHwTGLLP;
static EnableCompilerProductHelper<IGFX_TIGERLAKE_LP> enableCompilerProductHelperTGLLP;
#endif #endif
#ifdef SUPPORT_DG1 #ifdef SUPPORT_DG1
template struct L1CachePolicyHelper<IGFX_DG1>; template struct L1CachePolicyHelper<IGFX_DG1>;
static EnableGfxProductHw<IGFX_DG1> enableGfxProductHwDG1; static EnableGfxProductHw<IGFX_DG1> enableGfxProductHwDG1;
static EnableCompilerProductHelper<IGFX_DG1> enableCompilerProductHelperDG1;
#endif #endif
#ifdef SUPPORT_RKL #ifdef SUPPORT_RKL
template struct L1CachePolicyHelper<IGFX_ROCKETLAKE>; template struct L1CachePolicyHelper<IGFX_ROCKETLAKE>;
static EnableGfxProductHw<IGFX_ROCKETLAKE> enableGfxProductHwRKL; static EnableGfxProductHw<IGFX_ROCKETLAKE> enableGfxProductHwRKL;
#include "shared/source/gen12lp/compiler_hw_info_config_rkl.inl"
static EnableCompilerProductHelper<IGFX_ROCKETLAKE> enableCompilerProductHelperRKL;
#endif #endif
#ifdef SUPPORT_ADLS #ifdef SUPPORT_ADLS
template struct L1CachePolicyHelper<IGFX_ALDERLAKE_S>; template struct L1CachePolicyHelper<IGFX_ALDERLAKE_S>;
static EnableGfxProductHw<IGFX_ALDERLAKE_S> enableGfxProductHwADLS; static EnableGfxProductHw<IGFX_ALDERLAKE_S> enableGfxProductHwADLS;
static EnableCompilerProductHelper<IGFX_ALDERLAKE_S> enableCompilerProductHelperADLS;
#endif #endif
#ifdef SUPPORT_ADLP #ifdef SUPPORT_ADLP
template struct L1CachePolicyHelper<IGFX_ALDERLAKE_P>; template struct L1CachePolicyHelper<IGFX_ALDERLAKE_P>;
static EnableGfxProductHw<IGFX_ALDERLAKE_P> enableGfxProductHwADLP; static EnableGfxProductHw<IGFX_ALDERLAKE_P> enableGfxProductHwADLP;
static EnableCompilerProductHelper<IGFX_ALDERLAKE_P> enableCompilerProductHelperADLP;
#endif #endif
#ifdef SUPPORT_ADLN #ifdef SUPPORT_ADLN
template struct L1CachePolicyHelper<IGFX_ALDERLAKE_N>; template struct L1CachePolicyHelper<IGFX_ALDERLAKE_N>;
static EnableGfxProductHw<IGFX_ALDERLAKE_N> enableGfxProductHwADLN; static EnableGfxProductHw<IGFX_ALDERLAKE_N> enableGfxProductHwADLN;
static EnableCompilerProductHelper<IGFX_ALDERLAKE_N> enableCompilerProductHelperADLN;
#endif #endif
} // namespace NEO } // namespace NEO

21
shared/source/gen8/enable_compiler_product_helper_bdw.cpp Normal file
View File

@ -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

7
shared/source/gen8/enable_gen8.cpp
View File

@ -7,10 +7,6 @@
#include "shared/source/gen8/hw_cmds.h" #include "shared/source/gen8/hw_cmds.h"
#include "shared/source/helpers/cache_policy_bdw_and_later.inl" #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/helpers/enable_product.inl"
#include "shared/source/os_interface/hw_info_config.h" #include "shared/source/os_interface/hw_info_config.h"
@ -19,9 +15,6 @@ namespace NEO {
#ifdef SUPPORT_BDW #ifdef SUPPORT_BDW
template struct L1CachePolicyHelper<IGFX_BROADWELL>; template struct L1CachePolicyHelper<IGFX_BROADWELL>;
static EnableGfxProductHw<IGFX_BROADWELL> enableGfxProductHwBDW; static EnableGfxProductHw<IGFX_BROADWELL> enableGfxProductHwBDW;
#include "shared/source/gen8/compiler_hw_info_config_bdw.inl"
static EnableCompilerProductHelper<IGFX_BROADWELL> enableCompilerProductHelperBDW;
#endif #endif
} // namespace NEO } // namespace NEO

20
shared/source/gen9/enable_compiler_product_helper_bxt.cpp Normal file
View File

@ -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

20
shared/source/gen9/enable_compiler_product_helper_cfl.cpp Normal file
View File

@ -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

19
shared/source/gen9/enable_compiler_product_helper_glk.cpp Normal file
View File

@ -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

19
shared/source/gen9/enable_compiler_product_helper_kbl.cpp Normal file
View File

@ -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

20
shared/source/gen9/enable_compiler_product_helper_skl.cpp Normal file
View File

@ -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

9
shared/source/gen9/enable_gen9.cpp
View File

@ -7,10 +7,6 @@
#include "shared/source/gen9/hw_cmds.h" #include "shared/source/gen9/hw_cmds.h"
#include "shared/source/helpers/cache_policy_bdw_and_later.inl" #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/helpers/enable_product.inl"
#include "shared/source/os_interface/hw_info_config.h" #include "shared/source/os_interface/hw_info_config.h"
@ -19,27 +15,22 @@ namespace NEO {
#ifdef SUPPORT_BXT #ifdef SUPPORT_BXT
template struct L1CachePolicyHelper<IGFX_BROXTON>; template struct L1CachePolicyHelper<IGFX_BROXTON>;
static EnableGfxProductHw<IGFX_BROXTON> enableGfxProductHwBXT; static EnableGfxProductHw<IGFX_BROXTON> enableGfxProductHwBXT;
static EnableCompilerProductHelper<IGFX_BROXTON> enableCompilerProductHelperBXT;
#endif #endif
#ifdef SUPPORT_CFL #ifdef SUPPORT_CFL
template struct L1CachePolicyHelper<IGFX_COFFEELAKE>; template struct L1CachePolicyHelper<IGFX_COFFEELAKE>;
static EnableGfxProductHw<IGFX_COFFEELAKE> enableGfxProductHwCFL; static EnableGfxProductHw<IGFX_COFFEELAKE> enableGfxProductHwCFL;
static EnableCompilerProductHelper<IGFX_COFFEELAKE> enableCompilerProductHelperCFL;
#endif #endif
#ifdef SUPPORT_GLK #ifdef SUPPORT_GLK
template struct L1CachePolicyHelper<IGFX_GEMINILAKE>; template struct L1CachePolicyHelper<IGFX_GEMINILAKE>;
static EnableGfxProductHw<IGFX_GEMINILAKE> enableGfxProductHwGLK; static EnableGfxProductHw<IGFX_GEMINILAKE> enableGfxProductHwGLK;
static EnableCompilerProductHelper<IGFX_GEMINILAKE> enableCompilerProductHelperGLK;
#endif #endif
#ifdef SUPPORT_KBL #ifdef SUPPORT_KBL
template struct L1CachePolicyHelper<IGFX_KABYLAKE>; template struct L1CachePolicyHelper<IGFX_KABYLAKE>;
static EnableGfxProductHw<IGFX_KABYLAKE> enableGfxProductHwKBL; static EnableGfxProductHw<IGFX_KABYLAKE> enableGfxProductHwKBL;
static EnableCompilerProductHelper<IGFX_KABYLAKE> enableCompilerProductHelperKBL;
#endif #endif
#ifdef SUPPORT_SKL #ifdef SUPPORT_SKL
template struct L1CachePolicyHelper<IGFX_SKYLAKE>; template struct L1CachePolicyHelper<IGFX_SKYLAKE>;
static EnableGfxProductHw<IGFX_SKYLAKE> enableGfxProductHwSKL; static EnableGfxProductHw<IGFX_SKYLAKE> enableGfxProductHwSKL;
static EnableCompilerProductHelper<IGFX_SKYLAKE> enableCompilerProductHelperSKL;
#endif #endif
} // namespace NEO } // namespace NEO

20
shared/source/xe_hp_core/enable_compiler_product_helper_xe_hp_sdv.cpp Normal file
View File

@ -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

6
shared/source/xe_hp_core/enable_xe_hp_core.cpp
View File

@ -6,10 +6,6 @@
*/ */
#include "shared/source/helpers/cache_policy_bdw_and_later.inl" #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/helpers/enable_product.inl"
#include "shared/source/os_interface/hw_info_config.h" #include "shared/source/os_interface/hw_info_config.h"
#include "shared/source/xe_hp_core/hw_cmds.h" #include "shared/source/xe_hp_core/hw_cmds.h"
@ -19,6 +15,6 @@ namespace NEO {
#ifdef SUPPORT_XE_HP_SDV #ifdef SUPPORT_XE_HP_SDV
template struct L1CachePolicyHelper<IGFX_XE_HP_SDV>; template struct L1CachePolicyHelper<IGFX_XE_HP_SDV>;
static EnableGfxProductHw<IGFX_XE_HP_SDV> enableGfxProductHwXEHP; static EnableGfxProductHw<IGFX_XE_HP_SDV> enableGfxProductHwXEHP;
static EnableCompilerProductHelper<IGFX_XE_HP_SDV> enableCompilerProductHelperXEHP;
#endif #endif
} // namespace NEO } // namespace NEO

20
shared/source/xe_hpc_core/enable_compiler_product_helper_pvc.cpp Normal file
View File

@ -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

6
shared/source/xe_hpc_core/enable_xe_hpc_core.cpp
View File

@ -6,10 +6,6 @@
*/ */
#include "shared/source/helpers/cache_policy_dg2_and_later.inl" #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/helpers/enable_product.inl"
#include "shared/source/os_interface/hw_info_config.h" #include "shared/source/os_interface/hw_info_config.h"
#include "shared/source/xe_hpc_core/hw_cmds.h" #include "shared/source/xe_hpc_core/hw_cmds.h"
@ -19,7 +15,7 @@ namespace NEO {
#ifdef SUPPORT_PVC #ifdef SUPPORT_PVC
static EnableGfxProductHw<IGFX_PVC> enableGfxProductHwPVC; static EnableGfxProductHw<IGFX_PVC> enableGfxProductHwPVC;
template struct L1CachePolicyHelper<IGFX_PVC>; template struct L1CachePolicyHelper<IGFX_PVC>;
static EnableCompilerProductHelper<IGFX_PVC> enableCompilerProductHelperPVC;
#endif #endif
} // namespace NEO } // namespace NEO

20
shared/source/xe_hpg_core/enable_compiler_product_helper_dg2.cpp Normal file
View File

@ -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

6
shared/source/xe_hpg_core/enable_xe_hpg_core.cpp
View File

@ -6,10 +6,6 @@
*/ */
#include "shared/source/helpers/cache_policy_dg2_and_later.inl" #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/helpers/enable_product.inl"
#include "shared/source/os_interface/hw_info_config.h" #include "shared/source/os_interface/hw_info_config.h"
#include "shared/source/xe_hpg_core/hw_cmds.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>; template struct L1CachePolicyHelper<IGFX_DG2>;
static EnableGfxProductHw<IGFX_DG2> enableGfxProductHwDG2; static EnableGfxProductHw<IGFX_DG2> enableGfxProductHwDG2;
static EnableCompilerProductHelper<IGFX_DG2> enableCompilerProductHelperDG2;
#endif #endif
} // namespace NEO } // namespace NEO

4
shared/test/common/libult/CMakeLists.txt
View File

@ -13,6 +13,10 @@ macro(macro_for_each_platform)
if(EXISTS ${SRC_FILE}) if(EXISTS ${SRC_FILE})
list(APPEND neo_libult_common_SRCS_ENABLE_TESTED_HW ${SRC_FILE}) list(APPEND neo_libult_common_SRCS_ENABLE_TESTED_HW ${SRC_FILE})
endif() 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) 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}) if(EXISTS ${SRC_FILE})
list(APPEND neo_libult_common_SRCS_ENABLE_TESTED_HW_LINUX ${SRC_FILE}) list(APPEND neo_libult_common_SRCS_ENABLE_TESTED_HW_LINUX ${SRC_FILE})