From 610480b5aab36309a3231e805b8007571cce3550 Mon Sep 17 00:00:00 2001 From: Mateusz Jablonski Date: Wed, 16 Nov 2022 12:14:49 +0000 Subject: [PATCH] Refactor: Dont include os_agnostic_hw_info_config_* files in namespace NEO use namespace NEO explicitly in these files Related-To: NEO-4446 Signed-off-by: Mateusz Jablonski --- .../gen11/ehl/os_agnostic_hw_info_config_ehl.inl | 4 +++- .../gen11/icllp/os_agnostic_hw_info_config_icllp.inl | 4 +++- shared/source/gen11/linux/hw_info_config_ehl.cpp | 2 +- shared/source/gen11/linux/hw_info_config_icllp.cpp | 3 +-- shared/source/gen11/linux/hw_info_config_lkf.cpp | 3 +-- .../gen11/lkf/os_agnostic_hw_info_config_lkf.inl | 4 +++- shared/source/gen11/windows/hw_info_config_ehl.cpp | 5 +---- shared/source/gen11/windows/hw_info_config_icllp.cpp | 4 +--- shared/source/gen11/windows/hw_info_config_lkf.cpp | 4 +--- .../gen12lp/adln/os_agnostic_hw_info_config_adln.inl | 2 ++ .../gen12lp/adlp/os_agnostic_hw_info_config_adlp.inl | 2 ++ .../gen12lp/adls/os_agnostic_hw_info_config_adls.inl | 2 ++ .../gen12lp/dg1/os_agnostic_hw_info_config_dg1.inl | 2 ++ shared/source/gen12lp/linux/hw_info_config_adln.cpp | 4 +--- shared/source/gen12lp/linux/hw_info_config_adlp.cpp | 2 +- shared/source/gen12lp/linux/hw_info_config_adls.cpp | 4 +--- shared/source/gen12lp/linux/hw_info_config_dg1.cpp | 2 +- shared/source/gen12lp/linux/hw_info_config_rkl.cpp | 2 +- shared/source/gen12lp/linux/hw_info_config_tgllp.cpp | 3 ++- .../gen12lp/os_agnostic_hw_info_config_gen12lp.inl | 4 +++- .../gen12lp/rkl/os_agnostic_hw_info_config_rkl.inl | 2 ++ .../gen12lp/tgllp/os_agnostic_hw_info_config_tgllp.inl | 2 ++ shared/source/gen12lp/windows/hw_info_config_adln.cpp | 4 +--- shared/source/gen12lp/windows/hw_info_config_adlp.cpp | 4 +--- shared/source/gen12lp/windows/hw_info_config_adls.cpp | 4 +--- shared/source/gen12lp/windows/hw_info_config_dg1.cpp | 3 ++- shared/source/gen12lp/windows/hw_info_config_rkl.cpp | 5 +---- shared/source/gen12lp/windows/hw_info_config_tgllp.cpp | 3 ++- .../source/gen8/bdw/os_agnostic_hw_info_config_bdw.inl | 4 +++- shared/source/gen8/linux/hw_info_config_bdw.cpp | 3 ++- shared/source/gen8/windows/hw_info_config_bdw.cpp | 5 +---- .../source/gen9/bxt/os_agnostic_hw_info_config_bxt.inl | 4 +++- .../source/gen9/glk/os_agnostic_hw_info_config_glk.inl | 4 +++- shared/source/gen9/linux/hw_info_config_bxt.cpp | 3 ++- shared/source/gen9/linux/hw_info_config_cfl.cpp | 1 + shared/source/gen9/linux/hw_info_config_glk.cpp | 3 ++- shared/source/gen9/linux/hw_info_config_kbl.cpp | 1 + shared/source/gen9/linux/hw_info_config_skl.cpp | 3 ++- .../source/gen9/skl/os_agnostic_hw_info_config_skl.inl | 4 +++- shared/source/gen9/windows/hw_info_config_bxt.cpp | 5 +---- shared/source/gen9/windows/hw_info_config_cfl.cpp | 7 ++----- shared/source/gen9/windows/hw_info_config_glk.cpp | 5 +---- shared/source/gen9/windows/hw_info_config_kbl.cpp | 5 ++--- shared/source/gen9/windows/hw_info_config_skl.cpp | 5 +---- .../xe_hp_core/linux/hw_info_config_xe_hp_sdv.cpp | 7 ++++++- .../os_agnostic_hw_info_config_xe_hp_core.inl | 4 ++-- .../xe_hp_core/windows/hw_info_config_xe_hp_sdv.cpp | 2 +- shared/source/xe_hpc_core/linux/hw_info_config_pvc.cpp | 10 +++++----- .../os_agnostic_hw_info_config_xe_hpc_core.inl | 2 ++ .../xe_hpc_core/pvc/os_agnostic_hw_info_config_pvc.inl | 4 +++- .../source/xe_hpc_core/windows/hw_info_config_pvc.cpp | 3 ++- .../os_agnostic_hw_info_config_dg2_extra.inl | 4 +++- .../xe_hpg_core/dg2/os_agnostic_hw_info_config_dg2.inl | 2 ++ shared/source/xe_hpg_core/linux/hw_info_config_dg2.cpp | 3 ++- .../os_agnostic_hw_info_config_xe_hpg_core.inl | 4 +++- .../source/xe_hpg_core/windows/hw_info_config_dg2.cpp | 2 +- 56 files changed, 107 insertions(+), 91 deletions(-) diff --git a/shared/source/gen11/ehl/os_agnostic_hw_info_config_ehl.inl b/shared/source/gen11/ehl/os_agnostic_hw_info_config_ehl.inl index b1145b955e..c1f32b479f 100644 --- a/shared/source/gen11/ehl/os_agnostic_hw_info_config_ehl.inl +++ b/shared/source/gen11/ehl/os_agnostic_hw_info_config_ehl.inl @@ -5,7 +5,9 @@ * */ +namespace NEO { template <> AOT::PRODUCT_CONFIG HwInfoConfigHw::getProductConfigFromHwInfo(const HardwareInfo &hwInfo) const { return AOT::EHL; -} \ No newline at end of file +} +} // namespace NEO diff --git a/shared/source/gen11/icllp/os_agnostic_hw_info_config_icllp.inl b/shared/source/gen11/icllp/os_agnostic_hw_info_config_icllp.inl index 3e8d9913ab..432a1c6532 100644 --- a/shared/source/gen11/icllp/os_agnostic_hw_info_config_icllp.inl +++ b/shared/source/gen11/icllp/os_agnostic_hw_info_config_icllp.inl @@ -5,6 +5,7 @@ * */ +namespace NEO { template <> bool HwInfoConfigHw::isAdditionalMediaSamplerProgrammingRequired() const { return true; @@ -23,4 +24,5 @@ bool HwInfoConfigHw::isReturnedCmdSizeForMediaSamplerAdjustmentRequi template <> AOT::PRODUCT_CONFIG HwInfoConfigHw::getProductConfigFromHwInfo(const HardwareInfo &hwInfo) const { return AOT::ICL; -} \ No newline at end of file +} +} // namespace NEO diff --git a/shared/source/gen11/linux/hw_info_config_ehl.cpp b/shared/source/gen11/linux/hw_info_config_ehl.cpp index 1878161347..f4175e3095 100644 --- a/shared/source/gen11/linux/hw_info_config_ehl.cpp +++ b/shared/source/gen11/linux/hw_info_config_ehl.cpp @@ -13,10 +13,10 @@ #include "platforms.h" -namespace NEO { constexpr static auto gfxProduct = IGFX_ELKHARTLAKE; #include "shared/source/gen11/ehl/os_agnostic_hw_info_config_ehl.inl" +namespace NEO { template <> int HwInfoConfigHw::configureHardwareCustom(HardwareInfo *hwInfo, OSInterface *osIface) const { diff --git a/shared/source/gen11/linux/hw_info_config_icllp.cpp b/shared/source/gen11/linux/hw_info_config_icllp.cpp index b384293bd7..2130dc08eb 100644 --- a/shared/source/gen11/linux/hw_info_config_icllp.cpp +++ b/shared/source/gen11/linux/hw_info_config_icllp.cpp @@ -13,10 +13,9 @@ #include "platforms.h" -namespace NEO { constexpr static auto gfxProduct = IGFX_ICELAKE_LP; - #include "shared/source/gen11/icllp/os_agnostic_hw_info_config_icllp.inl" +namespace NEO { template <> int HwInfoConfigHw::configureHardwareCustom(HardwareInfo *hwInfo, OSInterface *osIface) const { diff --git a/shared/source/gen11/linux/hw_info_config_lkf.cpp b/shared/source/gen11/linux/hw_info_config_lkf.cpp index 5e1e19b766..1e8e5d6b3f 100644 --- a/shared/source/gen11/linux/hw_info_config_lkf.cpp +++ b/shared/source/gen11/linux/hw_info_config_lkf.cpp @@ -13,10 +13,9 @@ #include "platforms.h" -namespace NEO { constexpr static auto gfxProduct = IGFX_LAKEFIELD; - #include "shared/source/gen11/lkf/os_agnostic_hw_info_config_lkf.inl" +namespace NEO { template <> int HwInfoConfigHw::configureHardwareCustom(HardwareInfo *hwInfo, OSInterface *osIface) const { diff --git a/shared/source/gen11/lkf/os_agnostic_hw_info_config_lkf.inl b/shared/source/gen11/lkf/os_agnostic_hw_info_config_lkf.inl index a9ed280afe..deba8e313e 100644 --- a/shared/source/gen11/lkf/os_agnostic_hw_info_config_lkf.inl +++ b/shared/source/gen11/lkf/os_agnostic_hw_info_config_lkf.inl @@ -5,7 +5,9 @@ * */ +namespace NEO { template <> AOT::PRODUCT_CONFIG HwInfoConfigHw::getProductConfigFromHwInfo(const HardwareInfo &hwInfo) const { return AOT::LKF; -} \ No newline at end of file +} +} // namespace NEO diff --git a/shared/source/gen11/windows/hw_info_config_ehl.cpp b/shared/source/gen11/windows/hw_info_config_ehl.cpp index 9e91fdc3bd..62cf793c76 100644 --- a/shared/source/gen11/windows/hw_info_config_ehl.cpp +++ b/shared/source/gen11/windows/hw_info_config_ehl.cpp @@ -12,11 +12,8 @@ #include "platforms.h" -namespace NEO { constexpr static auto gfxProduct = IGFX_ELKHARTLAKE; #include "shared/source/gen11/ehl/os_agnostic_hw_info_config_ehl.inl" -template class HwInfoConfigHw; - -} // namespace NEO +template class NEO::HwInfoConfigHw; diff --git a/shared/source/gen11/windows/hw_info_config_icllp.cpp b/shared/source/gen11/windows/hw_info_config_icllp.cpp index ea3e335c7e..57e8004ce5 100644 --- a/shared/source/gen11/windows/hw_info_config_icllp.cpp +++ b/shared/source/gen11/windows/hw_info_config_icllp.cpp @@ -12,10 +12,8 @@ #include "platforms.h" -namespace NEO { constexpr static auto gfxProduct = IGFX_ICELAKE_LP; #include "shared/source/gen11/icllp/os_agnostic_hw_info_config_icllp.inl" -template class HwInfoConfigHw; -} // namespace NEO +template class NEO::HwInfoConfigHw; diff --git a/shared/source/gen11/windows/hw_info_config_lkf.cpp b/shared/source/gen11/windows/hw_info_config_lkf.cpp index 96582bad5d..7d8b991655 100644 --- a/shared/source/gen11/windows/hw_info_config_lkf.cpp +++ b/shared/source/gen11/windows/hw_info_config_lkf.cpp @@ -12,10 +12,8 @@ #include "platforms.h" -namespace NEO { constexpr static auto gfxProduct = IGFX_LAKEFIELD; #include "shared/source/gen11/lkf/os_agnostic_hw_info_config_lkf.inl" -template class HwInfoConfigHw; -} // namespace NEO +template class NEO::HwInfoConfigHw; diff --git a/shared/source/gen12lp/adln/os_agnostic_hw_info_config_adln.inl b/shared/source/gen12lp/adln/os_agnostic_hw_info_config_adln.inl index cebf17d359..cecc8e0f84 100644 --- a/shared/source/gen12lp/adln/os_agnostic_hw_info_config_adln.inl +++ b/shared/source/gen12lp/adln/os_agnostic_hw_info_config_adln.inl @@ -5,6 +5,7 @@ * */ +namespace NEO { template <> uint32_t HwInfoConfigHw::getHwRevIdFromStepping(uint32_t stepping, const HardwareInfo &hwInfo) const { switch (stepping) { @@ -27,3 +28,4 @@ uint32_t HwInfoConfigHw::getSteppingFromHwRevId(const HardwareInfo & } return CommonConstants::invalidStepping; } +} // namespace NEO diff --git a/shared/source/gen12lp/adlp/os_agnostic_hw_info_config_adlp.inl b/shared/source/gen12lp/adlp/os_agnostic_hw_info_config_adlp.inl index e63d8f1b99..3897b78b8c 100644 --- a/shared/source/gen12lp/adlp/os_agnostic_hw_info_config_adlp.inl +++ b/shared/source/gen12lp/adlp/os_agnostic_hw_info_config_adlp.inl @@ -5,6 +5,7 @@ * */ +namespace NEO { template <> uint32_t HwInfoConfigHw::getHwRevIdFromStepping(uint32_t stepping, const HardwareInfo &hwInfo) const { switch (stepping) { @@ -31,3 +32,4 @@ uint32_t HwInfoConfigHw::getSteppingFromHwRevId(const HardwareInfo & } return CommonConstants::invalidStepping; } +} // namespace NEO diff --git a/shared/source/gen12lp/adls/os_agnostic_hw_info_config_adls.inl b/shared/source/gen12lp/adls/os_agnostic_hw_info_config_adls.inl index 91c88c1cd0..6857fb793f 100644 --- a/shared/source/gen12lp/adls/os_agnostic_hw_info_config_adls.inl +++ b/shared/source/gen12lp/adls/os_agnostic_hw_info_config_adls.inl @@ -5,6 +5,7 @@ * */ +namespace NEO { template <> uint32_t HwInfoConfigHw::getHwRevIdFromStepping(uint32_t stepping, const HardwareInfo &hwInfo) const { switch (stepping) { @@ -31,3 +32,4 @@ uint32_t HwInfoConfigHw::getSteppingFromHwRevId(const HardwareInfo & } return CommonConstants::invalidStepping; } +} // namespace NEO diff --git a/shared/source/gen12lp/dg1/os_agnostic_hw_info_config_dg1.inl b/shared/source/gen12lp/dg1/os_agnostic_hw_info_config_dg1.inl index 32d2cba750..aa3e622d01 100644 --- a/shared/source/gen12lp/dg1/os_agnostic_hw_info_config_dg1.inl +++ b/shared/source/gen12lp/dg1/os_agnostic_hw_info_config_dg1.inl @@ -5,6 +5,7 @@ * */ +namespace NEO { template <> uint32_t HwInfoConfigHw::getHwRevIdFromStepping(uint32_t stepping, const HardwareInfo &hwInfo) const { switch (stepping) { @@ -66,3 +67,4 @@ template <> bool HwInfoConfigHw::overrideGfxPartitionLayoutForWsl() const { return true; } +} // namespace NEO diff --git a/shared/source/gen12lp/linux/hw_info_config_adln.cpp b/shared/source/gen12lp/linux/hw_info_config_adln.cpp index d81710ef21..97ced671ac 100644 --- a/shared/source/gen12lp/linux/hw_info_config_adln.cpp +++ b/shared/source/gen12lp/linux/hw_info_config_adln.cpp @@ -13,11 +13,9 @@ #include "platforms.h" -namespace NEO { constexpr static auto gfxProduct = IGFX_ALDERLAKE_N; #include "shared/source/gen12lp/adln/os_agnostic_hw_info_config_adln.inl" #include "shared/source/gen12lp/os_agnostic_hw_info_config_gen12lp.inl" -template class HwInfoConfigHw; -} // namespace NEO +template class NEO::HwInfoConfigHw; diff --git a/shared/source/gen12lp/linux/hw_info_config_adlp.cpp b/shared/source/gen12lp/linux/hw_info_config_adlp.cpp index 762e02ad5c..64d41591fd 100644 --- a/shared/source/gen12lp/linux/hw_info_config_adlp.cpp +++ b/shared/source/gen12lp/linux/hw_info_config_adlp.cpp @@ -15,11 +15,11 @@ #include "platforms.h" -namespace NEO { constexpr static auto gfxProduct = IGFX_ALDERLAKE_P; #include "shared/source/gen12lp/adlp/os_agnostic_hw_info_config_adlp.inl" #include "shared/source/gen12lp/os_agnostic_hw_info_config_gen12lp.inl" +namespace NEO { template <> int HwInfoConfigHw::configureHardwareCustom(HardwareInfo *hwInfo, OSInterface *osIface) const { diff --git a/shared/source/gen12lp/linux/hw_info_config_adls.cpp b/shared/source/gen12lp/linux/hw_info_config_adls.cpp index d5311cc61a..06973fcb4c 100644 --- a/shared/source/gen12lp/linux/hw_info_config_adls.cpp +++ b/shared/source/gen12lp/linux/hw_info_config_adls.cpp @@ -13,11 +13,9 @@ #include "platforms.h" -namespace NEO { constexpr static auto gfxProduct = IGFX_ALDERLAKE_S; #include "shared/source/gen12lp/adls/os_agnostic_hw_info_config_adls.inl" #include "shared/source/gen12lp/os_agnostic_hw_info_config_gen12lp.inl" -template class HwInfoConfigHw; -} // namespace NEO +template class NEO::HwInfoConfigHw; diff --git a/shared/source/gen12lp/linux/hw_info_config_dg1.cpp b/shared/source/gen12lp/linux/hw_info_config_dg1.cpp index c228f836e0..4f15d77120 100644 --- a/shared/source/gen12lp/linux/hw_info_config_dg1.cpp +++ b/shared/source/gen12lp/linux/hw_info_config_dg1.cpp @@ -13,11 +13,11 @@ #include "platforms.h" -namespace NEO { constexpr static auto gfxProduct = IGFX_DG1; #include "shared/source/gen12lp/dg1/os_agnostic_hw_info_config_dg1.inl" #include "shared/source/gen12lp/os_agnostic_hw_info_config_gen12lp.inl" +namespace NEO { template <> int HwInfoConfigHw::configureHardwareCustom(HardwareInfo *hwInfo, OSInterface *osIface) const { diff --git a/shared/source/gen12lp/linux/hw_info_config_rkl.cpp b/shared/source/gen12lp/linux/hw_info_config_rkl.cpp index 94a09f3d3c..da2ea8b533 100644 --- a/shared/source/gen12lp/linux/hw_info_config_rkl.cpp +++ b/shared/source/gen12lp/linux/hw_info_config_rkl.cpp @@ -13,11 +13,11 @@ #include "platforms.h" -namespace NEO { constexpr static auto gfxProduct = IGFX_ROCKETLAKE; #include "shared/source/gen12lp/os_agnostic_hw_info_config_gen12lp.inl" #include "shared/source/gen12lp/rkl/os_agnostic_hw_info_config_rkl.inl" +namespace NEO { template <> int HwInfoConfigHw::configureHardwareCustom(HardwareInfo *hwInfo, OSInterface *osIface) const { diff --git a/shared/source/gen12lp/linux/hw_info_config_tgllp.cpp b/shared/source/gen12lp/linux/hw_info_config_tgllp.cpp index 24f4df5370..13ac10f15e 100644 --- a/shared/source/gen12lp/linux/hw_info_config_tgllp.cpp +++ b/shared/source/gen12lp/linux/hw_info_config_tgllp.cpp @@ -13,12 +13,13 @@ #include "platforms.h" -namespace NEO { constexpr static auto gfxProduct = IGFX_TIGERLAKE_LP; #include "shared/source/gen12lp/os_agnostic_hw_info_config_gen12lp.inl" #include "shared/source/gen12lp/tgllp/os_agnostic_hw_info_config_tgllp.inl" +namespace NEO { + template <> int HwInfoConfigHw::configureHardwareCustom(HardwareInfo *hwInfo, OSInterface *osIface) const { GT_SYSTEM_INFO *gtSystemInfo = &hwInfo->gtSystemInfo; diff --git a/shared/source/gen12lp/os_agnostic_hw_info_config_gen12lp.inl b/shared/source/gen12lp/os_agnostic_hw_info_config_gen12lp.inl index fabed73edc..ad6afb5221 100644 --- a/shared/source/gen12lp/os_agnostic_hw_info_config_gen12lp.inl +++ b/shared/source/gen12lp/os_agnostic_hw_info_config_gen12lp.inl @@ -5,6 +5,7 @@ * */ +namespace NEO { template <> void HwInfoConfigHw::adjustPlatformForProductFamily(HardwareInfo *hwInfo) { hwInfo->platform.eRenderCoreFamily = GFXCORE_FAMILY::IGFX_GEN12LP_CORE; @@ -28,4 +29,5 @@ void HwInfoConfigHw::adjustSamplerState(void *sampler, const Hardwar template <> uint32_t HwInfoConfigHw::getMaxThreadsForWorkgroupInDSSOrSS(const HardwareInfo &hwInfo, uint32_t maxNumEUsPerSubSlice, uint32_t maxNumEUsPerDualSubSlice) const { return getMaxThreadsForWorkgroup(hwInfo, maxNumEUsPerDualSubSlice); -} \ No newline at end of file +} +} // namespace NEO diff --git a/shared/source/gen12lp/rkl/os_agnostic_hw_info_config_rkl.inl b/shared/source/gen12lp/rkl/os_agnostic_hw_info_config_rkl.inl index 0d10b50fbb..8b72e3adf7 100644 --- a/shared/source/gen12lp/rkl/os_agnostic_hw_info_config_rkl.inl +++ b/shared/source/gen12lp/rkl/os_agnostic_hw_info_config_rkl.inl @@ -5,6 +5,7 @@ * */ +namespace NEO { template <> uint32_t HwInfoConfigHw::getHwRevIdFromStepping(uint32_t stepping, const HardwareInfo &hwInfo) const { switch (stepping) { @@ -45,3 +46,4 @@ template <> bool HwInfoConfigHw::is3DPipelineSelectWARequired() const { return true; } +} // namespace NEO diff --git a/shared/source/gen12lp/tgllp/os_agnostic_hw_info_config_tgllp.inl b/shared/source/gen12lp/tgllp/os_agnostic_hw_info_config_tgllp.inl index 2b1227c199..baaf8c4417 100644 --- a/shared/source/gen12lp/tgllp/os_agnostic_hw_info_config_tgllp.inl +++ b/shared/source/gen12lp/tgllp/os_agnostic_hw_info_config_tgllp.inl @@ -5,6 +5,7 @@ * */ +namespace NEO { template <> uint32_t HwInfoConfigHw::getHwRevIdFromStepping(uint32_t stepping, const HardwareInfo &hwInfo) const { switch (stepping) { @@ -55,3 +56,4 @@ template <> bool HwInfoConfigHw::is3DPipelineSelectWARequired() const { return true; } +} // namespace NEO diff --git a/shared/source/gen12lp/windows/hw_info_config_adln.cpp b/shared/source/gen12lp/windows/hw_info_config_adln.cpp index d81710ef21..97ced671ac 100644 --- a/shared/source/gen12lp/windows/hw_info_config_adln.cpp +++ b/shared/source/gen12lp/windows/hw_info_config_adln.cpp @@ -13,11 +13,9 @@ #include "platforms.h" -namespace NEO { constexpr static auto gfxProduct = IGFX_ALDERLAKE_N; #include "shared/source/gen12lp/adln/os_agnostic_hw_info_config_adln.inl" #include "shared/source/gen12lp/os_agnostic_hw_info_config_gen12lp.inl" -template class HwInfoConfigHw; -} // namespace NEO +template class NEO::HwInfoConfigHw; diff --git a/shared/source/gen12lp/windows/hw_info_config_adlp.cpp b/shared/source/gen12lp/windows/hw_info_config_adlp.cpp index efb103cb69..02ebcda85e 100644 --- a/shared/source/gen12lp/windows/hw_info_config_adlp.cpp +++ b/shared/source/gen12lp/windows/hw_info_config_adlp.cpp @@ -15,11 +15,9 @@ #include "platforms.h" -namespace NEO { constexpr static auto gfxProduct = IGFX_ALDERLAKE_P; #include "shared/source/gen12lp/adlp/os_agnostic_hw_info_config_adlp.inl" #include "shared/source/gen12lp/os_agnostic_hw_info_config_gen12lp.inl" -template class HwInfoConfigHw; -} // namespace NEO +template class NEO::HwInfoConfigHw; diff --git a/shared/source/gen12lp/windows/hw_info_config_adls.cpp b/shared/source/gen12lp/windows/hw_info_config_adls.cpp index d5311cc61a..06973fcb4c 100644 --- a/shared/source/gen12lp/windows/hw_info_config_adls.cpp +++ b/shared/source/gen12lp/windows/hw_info_config_adls.cpp @@ -13,11 +13,9 @@ #include "platforms.h" -namespace NEO { constexpr static auto gfxProduct = IGFX_ALDERLAKE_S; #include "shared/source/gen12lp/adls/os_agnostic_hw_info_config_adls.inl" #include "shared/source/gen12lp/os_agnostic_hw_info_config_gen12lp.inl" -template class HwInfoConfigHw; -} // namespace NEO +template class NEO::HwInfoConfigHw; diff --git a/shared/source/gen12lp/windows/hw_info_config_dg1.cpp b/shared/source/gen12lp/windows/hw_info_config_dg1.cpp index 5b783711b9..7f0523ea26 100644 --- a/shared/source/gen12lp/windows/hw_info_config_dg1.cpp +++ b/shared/source/gen12lp/windows/hw_info_config_dg1.cpp @@ -13,12 +13,13 @@ #include "platforms.h" -namespace NEO { constexpr static auto gfxProduct = IGFX_DG1; #include "shared/source/gen12lp/dg1/os_agnostic_hw_info_config_dg1.inl" #include "shared/source/gen12lp/os_agnostic_hw_info_config_gen12lp.inl" +namespace NEO { + template <> void HwInfoConfigHw::setCapabilityCoherencyFlag(const HardwareInfo &hwInfo, bool &coherencyFlag) { coherencyFlag = false; diff --git a/shared/source/gen12lp/windows/hw_info_config_rkl.cpp b/shared/source/gen12lp/windows/hw_info_config_rkl.cpp index f8eb2d6149..79c22a0169 100644 --- a/shared/source/gen12lp/windows/hw_info_config_rkl.cpp +++ b/shared/source/gen12lp/windows/hw_info_config_rkl.cpp @@ -13,12 +13,9 @@ #include "platforms.h" -namespace NEO { constexpr static auto gfxProduct = IGFX_ROCKETLAKE; #include "shared/source/gen12lp/os_agnostic_hw_info_config_gen12lp.inl" #include "shared/source/gen12lp/rkl/os_agnostic_hw_info_config_rkl.inl" -template class HwInfoConfigHw; - -} // namespace NEO +template class NEO::HwInfoConfigHw; diff --git a/shared/source/gen12lp/windows/hw_info_config_tgllp.cpp b/shared/source/gen12lp/windows/hw_info_config_tgllp.cpp index 4b25ee9dce..086526f458 100644 --- a/shared/source/gen12lp/windows/hw_info_config_tgllp.cpp +++ b/shared/source/gen12lp/windows/hw_info_config_tgllp.cpp @@ -13,12 +13,13 @@ #include "platforms.h" -namespace NEO { constexpr static auto gfxProduct = IGFX_TIGERLAKE_LP; #include "shared/source/gen12lp/os_agnostic_hw_info_config_gen12lp.inl" #include "shared/source/gen12lp/tgllp/os_agnostic_hw_info_config_tgllp.inl" +namespace NEO { + template <> void HwInfoConfigHw::setCapabilityCoherencyFlag(const HardwareInfo &hwInfo, bool &coherencyFlag) { coherencyFlag = true; diff --git a/shared/source/gen8/bdw/os_agnostic_hw_info_config_bdw.inl b/shared/source/gen8/bdw/os_agnostic_hw_info_config_bdw.inl index 6b7b4dc83c..ae9d1bad39 100644 --- a/shared/source/gen8/bdw/os_agnostic_hw_info_config_bdw.inl +++ b/shared/source/gen8/bdw/os_agnostic_hw_info_config_bdw.inl @@ -5,7 +5,9 @@ * */ +namespace NEO { template <> AOT::PRODUCT_CONFIG HwInfoConfigHw::getProductConfigFromHwInfo(const HardwareInfo &hwInfo) const { return AOT::BDW; -} \ No newline at end of file +} +} // namespace NEO diff --git a/shared/source/gen8/linux/hw_info_config_bdw.cpp b/shared/source/gen8/linux/hw_info_config_bdw.cpp index e669816cf0..82af2c6a52 100644 --- a/shared/source/gen8/linux/hw_info_config_bdw.cpp +++ b/shared/source/gen8/linux/hw_info_config_bdw.cpp @@ -13,11 +13,12 @@ #include "platforms.h" -namespace NEO { constexpr static auto gfxProduct = IGFX_BROADWELL; #include "shared/source/gen8/bdw/os_agnostic_hw_info_config_bdw.inl" +namespace NEO { + template <> int HwInfoConfigHw::configureHardwareCustom(HardwareInfo *hwInfo, OSInterface *osIface) const { if (nullptr == osIface) { diff --git a/shared/source/gen8/windows/hw_info_config_bdw.cpp b/shared/source/gen8/windows/hw_info_config_bdw.cpp index 3397c85d97..cac4064a96 100644 --- a/shared/source/gen8/windows/hw_info_config_bdw.cpp +++ b/shared/source/gen8/windows/hw_info_config_bdw.cpp @@ -13,11 +13,8 @@ #include "platforms.h" -namespace NEO { constexpr static auto gfxProduct = IGFX_BROADWELL; #include "shared/source/gen8/bdw/os_agnostic_hw_info_config_bdw.inl" -template class HwInfoConfigHw; - -} // namespace NEO +template class NEO::HwInfoConfigHw; diff --git a/shared/source/gen9/bxt/os_agnostic_hw_info_config_bxt.inl b/shared/source/gen9/bxt/os_agnostic_hw_info_config_bxt.inl index 322b89e36b..8019fe93b1 100644 --- a/shared/source/gen9/bxt/os_agnostic_hw_info_config_bxt.inl +++ b/shared/source/gen9/bxt/os_agnostic_hw_info_config_bxt.inl @@ -5,7 +5,9 @@ * */ +namespace NEO { template <> AOT::PRODUCT_CONFIG HwInfoConfigHw::getProductConfigFromHwInfo(const HardwareInfo &hwInfo) const { return AOT::APL; -} \ No newline at end of file +} +} // namespace NEO diff --git a/shared/source/gen9/glk/os_agnostic_hw_info_config_glk.inl b/shared/source/gen9/glk/os_agnostic_hw_info_config_glk.inl index cbf40c4cc5..515b89a35c 100644 --- a/shared/source/gen9/glk/os_agnostic_hw_info_config_glk.inl +++ b/shared/source/gen9/glk/os_agnostic_hw_info_config_glk.inl @@ -5,7 +5,9 @@ * */ +namespace NEO { template <> AOT::PRODUCT_CONFIG HwInfoConfigHw::getProductConfigFromHwInfo(const HardwareInfo &hwInfo) const { return AOT::GLK; -} \ No newline at end of file +} +} // namespace NEO diff --git a/shared/source/gen9/linux/hw_info_config_bxt.cpp b/shared/source/gen9/linux/hw_info_config_bxt.cpp index edd71e86a0..bfd9c934c8 100644 --- a/shared/source/gen9/linux/hw_info_config_bxt.cpp +++ b/shared/source/gen9/linux/hw_info_config_bxt.cpp @@ -15,11 +15,12 @@ #include "platforms.h" -namespace NEO { constexpr static auto gfxProduct = IGFX_BROXTON; #include "shared/source/gen9/bxt/os_agnostic_hw_info_config_bxt.inl" +namespace NEO { + template <> int HwInfoConfigHw::configureHardwareCustom(HardwareInfo *hwInfo, OSInterface *osIface) const { if (nullptr == osIface) { diff --git a/shared/source/gen9/linux/hw_info_config_cfl.cpp b/shared/source/gen9/linux/hw_info_config_cfl.cpp index 2e5753686d..bd0528d639 100644 --- a/shared/source/gen9/linux/hw_info_config_cfl.cpp +++ b/shared/source/gen9/linux/hw_info_config_cfl.cpp @@ -12,6 +12,7 @@ #include "shared/source/os_interface/hw_info_config_bdw_and_later.inl" constexpr static auto gfxProduct = IGFX_COFFEELAKE; + #include "shared/source/gen9/cfl/os_agnostic_hw_info_config_cfl.inl" namespace NEO { diff --git a/shared/source/gen9/linux/hw_info_config_glk.cpp b/shared/source/gen9/linux/hw_info_config_glk.cpp index b34e722e5e..0db86c79f5 100644 --- a/shared/source/gen9/linux/hw_info_config_glk.cpp +++ b/shared/source/gen9/linux/hw_info_config_glk.cpp @@ -15,11 +15,12 @@ #include "platforms.h" -namespace NEO { constexpr static auto gfxProduct = IGFX_GEMINILAKE; #include "shared/source/gen9/glk/os_agnostic_hw_info_config_glk.inl" +namespace NEO { + template <> int HwInfoConfigHw::configureHardwareCustom(HardwareInfo *hwInfo, OSInterface *osIface) const { if (nullptr == osIface) { diff --git a/shared/source/gen9/linux/hw_info_config_kbl.cpp b/shared/source/gen9/linux/hw_info_config_kbl.cpp index 58f58cec5a..f497b2102c 100644 --- a/shared/source/gen9/linux/hw_info_config_kbl.cpp +++ b/shared/source/gen9/linux/hw_info_config_kbl.cpp @@ -12,6 +12,7 @@ #include "shared/source/os_interface/hw_info_config_bdw_and_later.inl" constexpr static auto gfxProduct = IGFX_KABYLAKE; + #include "shared/source/gen9/kbl/os_agnostic_hw_info_config_kbl.inl" namespace NEO { diff --git a/shared/source/gen9/linux/hw_info_config_skl.cpp b/shared/source/gen9/linux/hw_info_config_skl.cpp index d82f6afe9a..24a7e643b6 100644 --- a/shared/source/gen9/linux/hw_info_config_skl.cpp +++ b/shared/source/gen9/linux/hw_info_config_skl.cpp @@ -13,11 +13,12 @@ #include "platforms.h" -namespace NEO { constexpr static auto gfxProduct = IGFX_SKYLAKE; #include "shared/source/gen9/skl/os_agnostic_hw_info_config_skl.inl" +namespace NEO { + template <> int HwInfoConfigHw::configureHardwareCustom(HardwareInfo *hwInfo, OSInterface *osIface) const { if (nullptr == osIface) { diff --git a/shared/source/gen9/skl/os_agnostic_hw_info_config_skl.inl b/shared/source/gen9/skl/os_agnostic_hw_info_config_skl.inl index 261a654226..d588eba3a5 100644 --- a/shared/source/gen9/skl/os_agnostic_hw_info_config_skl.inl +++ b/shared/source/gen9/skl/os_agnostic_hw_info_config_skl.inl @@ -5,7 +5,9 @@ * */ +namespace NEO { template <> AOT::PRODUCT_CONFIG HwInfoConfigHw::getProductConfigFromHwInfo(const HardwareInfo &hwInfo) const { return AOT::SKL; -} \ No newline at end of file +} +} // namespace NEO diff --git a/shared/source/gen9/windows/hw_info_config_bxt.cpp b/shared/source/gen9/windows/hw_info_config_bxt.cpp index 91e0852c1d..ba82486895 100644 --- a/shared/source/gen9/windows/hw_info_config_bxt.cpp +++ b/shared/source/gen9/windows/hw_info_config_bxt.cpp @@ -12,11 +12,8 @@ #include "platforms.h" -namespace NEO { constexpr static auto gfxProduct = IGFX_BROXTON; #include "shared/source/gen9/bxt/os_agnostic_hw_info_config_bxt.inl" -template class HwInfoConfigHw; - -} // namespace NEO +template class NEO::HwInfoConfigHw; diff --git a/shared/source/gen9/windows/hw_info_config_cfl.cpp b/shared/source/gen9/windows/hw_info_config_cfl.cpp index a4170fbf9b..2d894d81b2 100644 --- a/shared/source/gen9/windows/hw_info_config_cfl.cpp +++ b/shared/source/gen9/windows/hw_info_config_cfl.cpp @@ -11,10 +11,7 @@ #include "shared/source/os_interface/hw_info_config_bdw_and_later.inl" constexpr static auto gfxProduct = IGFX_COFFEELAKE; + #include "shared/source/gen9/cfl/os_agnostic_hw_info_config_cfl.inl" -namespace NEO { - -template class HwInfoConfigHw; - -} // namespace NEO +template class NEO::HwInfoConfigHw; diff --git a/shared/source/gen9/windows/hw_info_config_glk.cpp b/shared/source/gen9/windows/hw_info_config_glk.cpp index 1eeeb887ce..d64a031283 100644 --- a/shared/source/gen9/windows/hw_info_config_glk.cpp +++ b/shared/source/gen9/windows/hw_info_config_glk.cpp @@ -12,11 +12,8 @@ #include "platforms.h" -namespace NEO { constexpr static auto gfxProduct = IGFX_GEMINILAKE; #include "shared/source/gen9/glk/os_agnostic_hw_info_config_glk.inl" -template class HwInfoConfigHw; - -} // namespace NEO +template class NEO::HwInfoConfigHw; diff --git a/shared/source/gen9/windows/hw_info_config_kbl.cpp b/shared/source/gen9/windows/hw_info_config_kbl.cpp index 3f3cb2737d..20f334df3d 100644 --- a/shared/source/gen9/windows/hw_info_config_kbl.cpp +++ b/shared/source/gen9/windows/hw_info_config_kbl.cpp @@ -11,8 +11,7 @@ #include "shared/source/os_interface/hw_info_config_bdw_and_later.inl" constexpr static auto gfxProduct = IGFX_KABYLAKE; + #include "shared/source/gen9/kbl/os_agnostic_hw_info_config_kbl.inl" -namespace NEO { -template class HwInfoConfigHw; -} // namespace NEO +template class NEO::HwInfoConfigHw; diff --git a/shared/source/gen9/windows/hw_info_config_skl.cpp b/shared/source/gen9/windows/hw_info_config_skl.cpp index f378ae38fe..c9d75cad3f 100644 --- a/shared/source/gen9/windows/hw_info_config_skl.cpp +++ b/shared/source/gen9/windows/hw_info_config_skl.cpp @@ -12,11 +12,8 @@ #include "platforms.h" -namespace NEO { constexpr static auto gfxProduct = IGFX_SKYLAKE; #include "shared/source/gen9/skl/os_agnostic_hw_info_config_skl.inl" -template class HwInfoConfigHw; - -} // namespace NEO +template class NEO::HwInfoConfigHw; diff --git a/shared/source/xe_hp_core/linux/hw_info_config_xe_hp_sdv.cpp b/shared/source/xe_hp_core/linux/hw_info_config_xe_hp_sdv.cpp index f208947967..97e9545679 100644 --- a/shared/source/xe_hp_core/linux/hw_info_config_xe_hp_sdv.cpp +++ b/shared/source/xe_hp_core/linux/hw_info_config_xe_hp_sdv.cpp @@ -21,15 +21,20 @@ #include "platforms.h" -namespace NEO { constexpr static auto gfxProduct = IGFX_XE_HP_SDV; + +namespace NEO { const std::map> guidUuidOffsetMap = { // add new values for guid in the form of {"guid", {offset, size}} for each platform {"0xfdc76195", {64u, 8u}}}; #include "shared/source/os_interface/linux/hw_info_config_uuid_xehp_and_later.inl" +} // namespace NEO + #include "shared/source/xe_hp_core/os_agnostic_hw_info_config_xe_hp_core.inl" +namespace NEO { + template <> int HwInfoConfigHw::configureHardwareCustom(HardwareInfo *hwInfo, OSInterface *osIface) const { if (allowCompression(*hwInfo)) { diff --git a/shared/source/xe_hp_core/os_agnostic_hw_info_config_xe_hp_core.inl b/shared/source/xe_hp_core/os_agnostic_hw_info_config_xe_hp_core.inl index 45e832e991..411c241a9c 100644 --- a/shared/source/xe_hp_core/os_agnostic_hw_info_config_xe_hp_core.inl +++ b/shared/source/xe_hp_core/os_agnostic_hw_info_config_xe_hp_core.inl @@ -5,8 +5,7 @@ * */ -using namespace NEO; - +namespace NEO { template <> uint32_t HwInfoConfigHw::getHwRevIdFromStepping(uint32_t stepping, const HardwareInfo &hwInfo) const { switch (stepping) { @@ -139,3 +138,4 @@ template <> bool HwInfoConfigHw::isImplicitScalingSupported(const HardwareInfo &hwInfo) const { return true; } +} // namespace NEO diff --git a/shared/source/xe_hp_core/windows/hw_info_config_xe_hp_sdv.cpp b/shared/source/xe_hp_core/windows/hw_info_config_xe_hp_sdv.cpp index aa249f754a..684bac623c 100644 --- a/shared/source/xe_hp_core/windows/hw_info_config_xe_hp_sdv.cpp +++ b/shared/source/xe_hp_core/windows/hw_info_config_xe_hp_sdv.cpp @@ -15,11 +15,11 @@ #include "platforms.h" -namespace NEO { constexpr static auto gfxProduct = IGFX_XE_HP_SDV; #include "shared/source/xe_hp_core/os_agnostic_hw_info_config_xe_hp_core.inl" +namespace NEO { template <> int HwInfoConfigHw::configureHardwareCustom(HardwareInfo *hwInfo, OSInterface *osIface) const { if (allowCompression(*hwInfo)) { diff --git a/shared/source/xe_hpc_core/linux/hw_info_config_pvc.cpp b/shared/source/xe_hpc_core/linux/hw_info_config_pvc.cpp index c32ab5bc91..b4436571f7 100644 --- a/shared/source/xe_hpc_core/linux/hw_info_config_pvc.cpp +++ b/shared/source/xe_hpc_core/linux/hw_info_config_pvc.cpp @@ -22,16 +22,18 @@ #include "platforms.h" -namespace NEO { constexpr static auto gfxProduct = IGFX_PVC; + +namespace NEO { const std::map> guidUuidOffsetMap = { // add new values for guid in the form of {"guid", {offset, size}} for each platform {"0x41fe79a5", {64u, 8u}}}; - #include "shared/source/os_interface/linux/hw_info_config_uuid_xehp_and_later.inl" #include "shared/source/os_interface/linux/hw_info_config_xe_hpc_and_later.inl" +} // namespace NEO #include "shared/source/xe_hpc_core/os_agnostic_hw_info_config_xe_hpc_core.inl" #include "shared/source/xe_hpc_core/pvc/os_agnostic_hw_info_config_pvc.inl" +namespace NEO { template <> uint64_t HwInfoConfigHw::getDeviceMemoryPhysicalSizeInBytes(const OSInterface *osIface, uint32_t subDeviceIndex) { @@ -76,6 +78,4 @@ uint64_t HwInfoConfigHw::getDeviceMemoryMaxBandWidthInBytesPerSecond #include "shared/source/xe_hpc_core/linux/hw_info_config_xe_hpc_core.inl" -namespace NEO { -template class HwInfoConfigHw; -} // namespace NEO +template class NEO::HwInfoConfigHw; diff --git a/shared/source/xe_hpc_core/os_agnostic_hw_info_config_xe_hpc_core.inl b/shared/source/xe_hpc_core/os_agnostic_hw_info_config_xe_hpc_core.inl index 8f7eb90bcd..5a11e03802 100644 --- a/shared/source/xe_hpc_core/os_agnostic_hw_info_config_xe_hpc_core.inl +++ b/shared/source/xe_hpc_core/os_agnostic_hw_info_config_xe_hpc_core.inl @@ -5,6 +5,7 @@ * */ +namespace NEO { template <> std::string HwInfoConfigHw::getDeviceMemoryName() const { return "HBM"; @@ -63,3 +64,4 @@ template <> bool HwInfoConfigHw::isPrefetcherDisablingInDirectSubmissionRequired() const { return false; } +} // namespace NEO diff --git a/shared/source/xe_hpc_core/pvc/os_agnostic_hw_info_config_pvc.inl b/shared/source/xe_hpc_core/pvc/os_agnostic_hw_info_config_pvc.inl index a840828570..459112d2da 100644 --- a/shared/source/xe_hpc_core/pvc/os_agnostic_hw_info_config_pvc.inl +++ b/shared/source/xe_hpc_core/pvc/os_agnostic_hw_info_config_pvc.inl @@ -5,6 +5,7 @@ * */ +namespace NEO { template <> bool HwInfoConfigHw::isMaxThreadsForWorkgroupWARequired(const HardwareInfo &hwInfo) const { return PVC::isXl(hwInfo); @@ -208,4 +209,5 @@ void HwInfoConfigHw::adjustNumberOfCcs(HardwareInfo &hwInfo) const { template <> bool HwInfoConfigHw::isStatefulAddressingModeSupported() const { return false; -} \ No newline at end of file +} +} // namespace NEO diff --git a/shared/source/xe_hpc_core/windows/hw_info_config_pvc.cpp b/shared/source/xe_hpc_core/windows/hw_info_config_pvc.cpp index d5c8cd0440..4ea25ceead 100644 --- a/shared/source/xe_hpc_core/windows/hw_info_config_pvc.cpp +++ b/shared/source/xe_hpc_core/windows/hw_info_config_pvc.cpp @@ -14,12 +14,13 @@ #include "platforms.h" -namespace NEO { constexpr static auto gfxProduct = IGFX_PVC; #include "shared/source/xe_hpc_core/os_agnostic_hw_info_config_xe_hpc_core.inl" #include "shared/source/xe_hpc_core/pvc/os_agnostic_hw_info_config_pvc.inl" +namespace NEO { + template <> int HwInfoConfigHw::configureHardwareCustom(HardwareInfo *hwInfo, OSInterface *osIface) const { enableCompression(hwInfo); diff --git a/shared/source/xe_hpg_core/dg2/definitions/os_agnostic_hw_info_config_dg2_extra.inl b/shared/source/xe_hpg_core/dg2/definitions/os_agnostic_hw_info_config_dg2_extra.inl index 746d4f9c20..bd9b8880ca 100644 --- a/shared/source/xe_hpg_core/dg2/definitions/os_agnostic_hw_info_config_dg2_extra.inl +++ b/shared/source/xe_hpg_core/dg2/definitions/os_agnostic_hw_info_config_dg2_extra.inl @@ -5,6 +5,7 @@ * */ +namespace NEO { template <> AOT::PRODUCT_CONFIG HwInfoConfigHw::getProductConfigFromHwInfo(const HardwareInfo &hwInfo) const { if (DG2::isG10(hwInfo)) { @@ -31,4 +32,5 @@ AOT::PRODUCT_CONFIG HwInfoConfigHw::getProductConfigFromHwInfo(const return AOT::DG2_G12_A0; } return AOT::UNKNOWN_ISA; -} \ No newline at end of file +} +} // namespace NEO diff --git a/shared/source/xe_hpg_core/dg2/os_agnostic_hw_info_config_dg2.inl b/shared/source/xe_hpg_core/dg2/os_agnostic_hw_info_config_dg2.inl index 7aecd16690..5632034c12 100644 --- a/shared/source/xe_hpg_core/dg2/os_agnostic_hw_info_config_dg2.inl +++ b/shared/source/xe_hpg_core/dg2/os_agnostic_hw_info_config_dg2.inl @@ -7,6 +7,7 @@ #include "shared/source/memory_manager/memory_manager.h" +namespace NEO { template <> void HwInfoConfigHw::adjustSamplerState(void *sampler, const HardwareInfo &hwInfo) { using SAMPLER_STATE = typename XeHpgCoreFamily::SAMPLER_STATE; @@ -204,3 +205,4 @@ bool HwInfoConfigHw::isStorageInfoAdjustmentRequired() const { return false; } } +} // namespace NEO diff --git a/shared/source/xe_hpg_core/linux/hw_info_config_dg2.cpp b/shared/source/xe_hpg_core/linux/hw_info_config_dg2.cpp index 16b915188f..bba5e9a083 100644 --- a/shared/source/xe_hpg_core/linux/hw_info_config_dg2.cpp +++ b/shared/source/xe_hpg_core/linux/hw_info_config_dg2.cpp @@ -20,7 +20,6 @@ #include "platforms.h" -namespace NEO { constexpr static auto gfxProduct = IGFX_DG2; #include "shared/source/xe_hpg_core/dg2/os_agnostic_hw_info_config_dg2.inl" @@ -28,6 +27,8 @@ constexpr static auto gfxProduct = IGFX_DG2; #include "os_agnostic_hw_info_config_dg2_extra.inl" +namespace NEO { + template <> int HwInfoConfigHw::configureHardwareCustom(HardwareInfo *hwInfo, OSInterface *osIface) const { if (allowCompression(*hwInfo)) { diff --git a/shared/source/xe_hpg_core/os_agnostic_hw_info_config_xe_hpg_core.inl b/shared/source/xe_hpg_core/os_agnostic_hw_info_config_xe_hpg_core.inl index 727c0f05a3..c5b0ae632e 100644 --- a/shared/source/xe_hpg_core/os_agnostic_hw_info_config_xe_hpg_core.inl +++ b/shared/source/xe_hpg_core/os_agnostic_hw_info_config_xe_hpg_core.inl @@ -5,9 +5,11 @@ * */ +namespace NEO { template <> void HwInfoConfigHw::getKernelExtendedProperties(uint32_t *fp16, uint32_t *fp32, uint32_t *fp64) { *fp16 = 0u; *fp32 = FP_ATOMIC_EXT_FLAG_GLOBAL_ADD; *fp64 = 0u; -} \ No newline at end of file +} +} // namespace NEO diff --git a/shared/source/xe_hpg_core/windows/hw_info_config_dg2.cpp b/shared/source/xe_hpg_core/windows/hw_info_config_dg2.cpp index dada043dc3..ad022f89c5 100644 --- a/shared/source/xe_hpg_core/windows/hw_info_config_dg2.cpp +++ b/shared/source/xe_hpg_core/windows/hw_info_config_dg2.cpp @@ -17,7 +17,6 @@ #include "platforms.h" -namespace NEO { constexpr static auto gfxProduct = IGFX_DG2; #include "shared/source/xe_hpg_core/dg2/os_agnostic_hw_info_config_dg2.inl" @@ -25,6 +24,7 @@ constexpr static auto gfxProduct = IGFX_DG2; #include "os_agnostic_hw_info_config_dg2_extra.inl" +namespace NEO { template <> int HwInfoConfigHw::configureHardwareCustom(HardwareInfo *hwInfo, OSInterface *osIface) const { if (allowCompression(*hwInfo)) {