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 <mateusz.jablonski@intel.com>

shared/source/gen11/ehl/os_agnostic_hw_info_config_ehl.inl

@@ -5,7 +5,9 @@
  *
  */
 
+namespace NEO {
 template <>
 AOT::PRODUCT_CONFIG HwInfoConfigHw<gfxProduct>::getProductConfigFromHwInfo(const HardwareInfo &hwInfo) const {
     return AOT::EHL;
-}
+}
+} // namespace NEO

shared/source/gen11/icllp/os_agnostic_hw_info_config_icllp.inl

@@ -5,6 +5,7 @@
  *
  */
 
+namespace NEO {
 template <>
 bool HwInfoConfigHw<gfxProduct>::isAdditionalMediaSamplerProgrammingRequired() const {
     return true;
@@ -23,4 +24,5 @@ bool HwInfoConfigHw<gfxProduct>::isReturnedCmdSizeForMediaSamplerAdjustmentRequi
 template <>
 AOT::PRODUCT_CONFIG HwInfoConfigHw<gfxProduct>::getProductConfigFromHwInfo(const HardwareInfo &hwInfo) const {
     return AOT::ICL;
-}
+}
+} // namespace NEO

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<gfxProduct>::configureHardwareCustom(HardwareInfo *hwInfo, OSInterface *osIface) const {

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<gfxProduct>::configureHardwareCustom(HardwareInfo *hwInfo, OSInterface *osIface) const {

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<gfxProduct>::configureHardwareCustom(HardwareInfo *hwInfo, OSInterface *osIface) const {

shared/source/gen11/lkf/os_agnostic_hw_info_config_lkf.inl

@@ -5,7 +5,9 @@
  *
  */
 
+namespace NEO {
 template <>
 AOT::PRODUCT_CONFIG HwInfoConfigHw<gfxProduct>::getProductConfigFromHwInfo(const HardwareInfo &hwInfo) const {
     return AOT::LKF;
-}
+}
+} // namespace NEO

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<gfxProduct>;
+template class NEO::HwInfoConfigHw<gfxProduct>;
-
-} // namespace NEO

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<gfxProduct>;
+template class NEO::HwInfoConfigHw<gfxProduct>;
-} // namespace NEO

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<gfxProduct>;
+template class NEO::HwInfoConfigHw<gfxProduct>;
-} // namespace NEO

shared/source/gen12lp/adln/os_agnostic_hw_info_config_adln.inl

@@ -5,6 +5,7 @@
  *
  */
 
+namespace NEO {
 template <>
 uint32_t HwInfoConfigHw<gfxProduct>::getHwRevIdFromStepping(uint32_t stepping, const HardwareInfo &hwInfo) const {
     switch (stepping) {
@@ -27,3 +28,4 @@ uint32_t HwInfoConfigHw<gfxProduct>::getSteppingFromHwRevId(const HardwareInfo &
     }
     return CommonConstants::invalidStepping;
 }
+} // namespace NEO

shared/source/gen12lp/adlp/os_agnostic_hw_info_config_adlp.inl

@@ -5,6 +5,7 @@
  *
  */
 
+namespace NEO {
 template <>
 uint32_t HwInfoConfigHw<gfxProduct>::getHwRevIdFromStepping(uint32_t stepping, const HardwareInfo &hwInfo) const {
     switch (stepping) {
@@ -31,3 +32,4 @@ uint32_t HwInfoConfigHw<gfxProduct>::getSteppingFromHwRevId(const HardwareInfo &
     }
     return CommonConstants::invalidStepping;
 }
+} // namespace NEO

shared/source/gen12lp/adls/os_agnostic_hw_info_config_adls.inl

@@ -5,6 +5,7 @@
  *
  */
 
+namespace NEO {
 template <>
 uint32_t HwInfoConfigHw<gfxProduct>::getHwRevIdFromStepping(uint32_t stepping, const HardwareInfo &hwInfo) const {
     switch (stepping) {
@@ -31,3 +32,4 @@ uint32_t HwInfoConfigHw<gfxProduct>::getSteppingFromHwRevId(const HardwareInfo &
     }
     return CommonConstants::invalidStepping;
 }
+} // namespace NEO

shared/source/gen12lp/dg1/os_agnostic_hw_info_config_dg1.inl

@@ -5,6 +5,7 @@
  *
  */
 
+namespace NEO {
 template <>
 uint32_t HwInfoConfigHw<gfxProduct>::getHwRevIdFromStepping(uint32_t stepping, const HardwareInfo &hwInfo) const {
     switch (stepping) {
@@ -66,3 +67,4 @@ template <>
 bool HwInfoConfigHw<gfxProduct>::overrideGfxPartitionLayoutForWsl() const {
     return true;
 }
+} // namespace NEO

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<gfxProduct>;
+template class NEO::HwInfoConfigHw<gfxProduct>;
-} // namespace NEO

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<gfxProduct>::configureHardwareCustom(HardwareInfo *hwInfo, OSInterface *osIface) const {

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<gfxProduct>;
+template class NEO::HwInfoConfigHw<gfxProduct>;
-} // namespace NEO

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<gfxProduct>::configureHardwareCustom(HardwareInfo *hwInfo, OSInterface *osIface) const {

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<gfxProduct>::configureHardwareCustom(HardwareInfo *hwInfo, OSInterface *osIface) const {

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<gfxProduct>::configureHardwareCustom(HardwareInfo *hwInfo, OSInterface *osIface) const {
     GT_SYSTEM_INFO *gtSystemInfo = &hwInfo->gtSystemInfo;

shared/source/gen12lp/os_agnostic_hw_info_config_gen12lp.inl

@@ -5,6 +5,7 @@
  *
  */
 
+namespace NEO {
 template <>
 void HwInfoConfigHw<gfxProduct>::adjustPlatformForProductFamily(HardwareInfo *hwInfo) {
     hwInfo->platform.eRenderCoreFamily = GFXCORE_FAMILY::IGFX_GEN12LP_CORE;
@@ -28,4 +29,5 @@ void HwInfoConfigHw<gfxProduct>::adjustSamplerState(void *sampler, const Hardwar
 template <>
 uint32_t HwInfoConfigHw<gfxProduct>::getMaxThreadsForWorkgroupInDSSOrSS(const HardwareInfo &hwInfo, uint32_t maxNumEUsPerSubSlice, uint32_t maxNumEUsPerDualSubSlice) const {
     return getMaxThreadsForWorkgroup(hwInfo, maxNumEUsPerDualSubSlice);
-}
+}
+} // namespace NEO

shared/source/gen12lp/rkl/os_agnostic_hw_info_config_rkl.inl

@@ -5,6 +5,7 @@
  *
  */
 
+namespace NEO {
 template <>
 uint32_t HwInfoConfigHw<gfxProduct>::getHwRevIdFromStepping(uint32_t stepping, const HardwareInfo &hwInfo) const {
     switch (stepping) {
@@ -45,3 +46,4 @@ template <>
 bool HwInfoConfigHw<gfxProduct>::is3DPipelineSelectWARequired() const {
     return true;
 }
+} // namespace NEO

shared/source/gen12lp/tgllp/os_agnostic_hw_info_config_tgllp.inl

@@ -5,6 +5,7 @@
  *
  */
 
+namespace NEO {
 template <>
 uint32_t HwInfoConfigHw<gfxProduct>::getHwRevIdFromStepping(uint32_t stepping, const HardwareInfo &hwInfo) const {
     switch (stepping) {
@@ -55,3 +56,4 @@ template <>
 bool HwInfoConfigHw<gfxProduct>::is3DPipelineSelectWARequired() const {
     return true;
 }
+} // namespace NEO

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<gfxProduct>;
+template class NEO::HwInfoConfigHw<gfxProduct>;
-} // namespace NEO

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<gfxProduct>;
+template class NEO::HwInfoConfigHw<gfxProduct>;
-} // namespace NEO

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<gfxProduct>;
+template class NEO::HwInfoConfigHw<gfxProduct>;
-} // namespace NEO

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<gfxProduct>::setCapabilityCoherencyFlag(const HardwareInfo &hwInfo, bool &coherencyFlag) {
     coherencyFlag = false;

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<gfxProduct>;
+template class NEO::HwInfoConfigHw<gfxProduct>;
-
-} // namespace NEO

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<gfxProduct>::setCapabilityCoherencyFlag(const HardwareInfo &hwInfo, bool &coherencyFlag) {
     coherencyFlag = true;

shared/source/gen8/bdw/os_agnostic_hw_info_config_bdw.inl

@@ -5,7 +5,9 @@
  *
  */
 
+namespace NEO {
 template <>
 AOT::PRODUCT_CONFIG HwInfoConfigHw<gfxProduct>::getProductConfigFromHwInfo(const HardwareInfo &hwInfo) const {
     return AOT::BDW;
-}
+}
+} // namespace NEO

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<gfxProduct>::configureHardwareCustom(HardwareInfo *hwInfo, OSInterface *osIface) const {
     if (nullptr == osIface) {

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<gfxProduct>;
+template class NEO::HwInfoConfigHw<gfxProduct>;
-
-} // namespace NEO

shared/source/gen9/bxt/os_agnostic_hw_info_config_bxt.inl

@@ -5,7 +5,9 @@
  *
  */
 
+namespace NEO {
 template <>
 AOT::PRODUCT_CONFIG HwInfoConfigHw<gfxProduct>::getProductConfigFromHwInfo(const HardwareInfo &hwInfo) const {
     return AOT::APL;
-}
+}
+} // namespace NEO

shared/source/gen9/glk/os_agnostic_hw_info_config_glk.inl

@@ -5,7 +5,9 @@
  *
  */
 
+namespace NEO {
 template <>
 AOT::PRODUCT_CONFIG HwInfoConfigHw<gfxProduct>::getProductConfigFromHwInfo(const HardwareInfo &hwInfo) const {
     return AOT::GLK;
-}
+}
+} // namespace NEO

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<gfxProduct>::configureHardwareCustom(HardwareInfo *hwInfo, OSInterface *osIface) const {
     if (nullptr == osIface) {

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 {

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<gfxProduct>::configureHardwareCustom(HardwareInfo *hwInfo, OSInterface *osIface) const {
     if (nullptr == osIface) {

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 {

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<gfxProduct>::configureHardwareCustom(HardwareInfo *hwInfo, OSInterface *osIface) const {
     if (nullptr == osIface) {

shared/source/gen9/skl/os_agnostic_hw_info_config_skl.inl

@@ -5,7 +5,9 @@
  *
  */
 
+namespace NEO {
 template <>
 AOT::PRODUCT_CONFIG HwInfoConfigHw<gfxProduct>::getProductConfigFromHwInfo(const HardwareInfo &hwInfo) const {
     return AOT::SKL;
-}
+}
+} // namespace NEO

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<gfxProduct>;
+template class NEO::HwInfoConfigHw<gfxProduct>;
-
-} // namespace NEO

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 NEO::HwInfoConfigHw<gfxProduct>;
-
-template class HwInfoConfigHw<gfxProduct>;
-
-} // namespace NEO

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<gfxProduct>;
+template class NEO::HwInfoConfigHw<gfxProduct>;
-
-} // namespace NEO

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 NEO::HwInfoConfigHw<gfxProduct>;
-template class HwInfoConfigHw<gfxProduct>;
-} // namespace NEO

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<gfxProduct>;
+template class NEO::HwInfoConfigHw<gfxProduct>;
-
-} // namespace NEO

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<std::string, std::pair<uint32_t, uint32_t>> 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<gfxProduct>::configureHardwareCustom(HardwareInfo *hwInfo, OSInterface *osIface) const {
     if (allowCompression(*hwInfo)) {

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<gfxProduct>::getHwRevIdFromStepping(uint32_t stepping, const HardwareInfo &hwInfo) const {
     switch (stepping) {
@@ -139,3 +138,4 @@ template <>
 bool HwInfoConfigHw<gfxProduct>::isImplicitScalingSupported(const HardwareInfo &hwInfo) const {
     return true;
 }
+} // namespace NEO

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<gfxProduct>::configureHardwareCustom(HardwareInfo *hwInfo, OSInterface *osIface) const {
     if (allowCompression(*hwInfo)) {

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<std::string, std::pair<uint32_t, uint32_t>> 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<gfxProduct>::getDeviceMemoryPhysicalSizeInBytes(const OSInterface *osIface, uint32_t subDeviceIndex) {
@@ -76,6 +78,4 @@ uint64_t HwInfoConfigHw<gfxProduct>::getDeviceMemoryMaxBandWidthInBytesPerSecond
 
 #include "shared/source/xe_hpc_core/linux/hw_info_config_xe_hpc_core.inl"
 
-namespace NEO {
+template class NEO::HwInfoConfigHw<gfxProduct>;
-template class HwInfoConfigHw<gfxProduct>;
-} // namespace NEO

shared/source/xe_hpc_core/os_agnostic_hw_info_config_xe_hpc_core.inl

@@ -5,6 +5,7 @@
  *
  */
 
+namespace NEO {
 template <>
 std::string HwInfoConfigHw<gfxProduct>::getDeviceMemoryName() const {
     return "HBM";
@@ -63,3 +64,4 @@ template <>
 bool HwInfoConfigHw<gfxProduct>::isPrefetcherDisablingInDirectSubmissionRequired() const {
     return false;
 }
+} // namespace NEO

shared/source/xe_hpc_core/pvc/os_agnostic_hw_info_config_pvc.inl

@@ -5,6 +5,7 @@
  *
  */
 
+namespace NEO {
 template <>
 bool HwInfoConfigHw<gfxProduct>::isMaxThreadsForWorkgroupWARequired(const HardwareInfo &hwInfo) const {
     return PVC::isXl(hwInfo);
@@ -208,4 +209,5 @@ void HwInfoConfigHw<gfxProduct>::adjustNumberOfCcs(HardwareInfo &hwInfo) const {
 template <>
 bool HwInfoConfigHw<gfxProduct>::isStatefulAddressingModeSupported() const {
     return false;
-}
+}
+} // namespace NEO

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<gfxProduct>::configureHardwareCustom(HardwareInfo *hwInfo, OSInterface *osIface) const {
     enableCompression(hwInfo);

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<gfxProduct>::getProductConfigFromHwInfo(const HardwareInfo &hwInfo) const {
     if (DG2::isG10(hwInfo)) {
@@ -31,4 +32,5 @@ AOT::PRODUCT_CONFIG HwInfoConfigHw<gfxProduct>::getProductConfigFromHwInfo(const
         return AOT::DG2_G12_A0;
     }
     return AOT::UNKNOWN_ISA;
-}
+}
+} // namespace NEO

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<gfxProduct>::adjustSamplerState(void *sampler, const HardwareInfo &hwInfo) {
     using SAMPLER_STATE = typename XeHpgCoreFamily::SAMPLER_STATE;
@@ -204,3 +205,4 @@ bool HwInfoConfigHw<gfxProduct>::isStorageInfoAdjustmentRequired() const {
         return false;
     }
 }
+} // namespace NEO

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<gfxProduct>::configureHardwareCustom(HardwareInfo *hwInfo, OSInterface *osIface) const {
     if (allowCompression(*hwInfo)) {

shared/source/xe_hpg_core/os_agnostic_hw_info_config_xe_hpg_core.inl

@@ -5,9 +5,11 @@
  *
  */
 
+namespace NEO {
 template <>
 void HwInfoConfigHw<gfxProduct>::getKernelExtendedProperties(uint32_t *fp16, uint32_t *fp32, uint32_t *fp64) {
     *fp16 = 0u;
     *fp32 = FP_ATOMIC_EXT_FLAG_GLOBAL_ADD;
     *fp64 = 0u;
-}
+}
+} // namespace NEO

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<gfxProduct>::configureHardwareCustom(HardwareInfo *hwInfo, OSInterface *osIface) const {
     if (allowCompression(*hwInfo)) {