From 1e95ed33f9f8b4ce8c15a2067257641a3457108a Mon Sep 17 00:00:00 2001 From: Mateusz Jablonski Date: Mon, 31 Jul 2023 12:48:31 +0000 Subject: [PATCH] refactor: remove redundant parameter from HardwareInfo ctor hw ip version is queried from KMD or set based on device id and rev id Signed-off-by: Mateusz Jablonski --- ...st_metric_ip_sampling_linux_pvc_prelim.cpp | 2 +- opencl/test/unit_test/device/device_tests.cpp | 4 ++-- shared/source/gen11/hw_info_ehl.cpp | 4 +--- shared/source/gen11/hw_info_icllp.cpp | 10 +++------ shared/source/gen11/hw_info_lkf.cpp | 5 ++--- shared/source/gen12lp/hw_info_adln.cpp | 4 +--- shared/source/gen12lp/hw_info_adlp.cpp | 4 +--- shared/source/gen12lp/hw_info_adls.cpp | 4 +--- shared/source/gen12lp/hw_info_dg1.cpp | 4 +--- shared/source/gen12lp/hw_info_rkl.cpp | 4 +--- shared/source/gen12lp/hw_info_tgllp.cpp | 7 ++----- shared/source/gen8/hw_info_bdw.cpp | 13 ++++-------- shared/source/gen9/hw_info_bxt.cpp | 7 ++----- shared/source/gen9/hw_info_cfl.cpp | 16 +++++--------- shared/source/gen9/hw_info_glk.cpp | 7 ++----- shared/source/gen9/hw_info_kbl.cpp | 20 ++++++++---------- shared/source/gen9/hw_info_skl.cpp | 21 +++++++++---------- shared/source/helpers/hw_info.cpp | 4 ++-- shared/source/helpers/hw_info.h | 2 +- shared/source/os_interface/device_factory.cpp | 4 +--- shared/source/xe_hpc_core/hw_info_pvc.cpp | 4 +--- shared/source/xe_hpg_core/hw_info_dg2.cpp | 5 ++--- shared/source/xe_hpg_core/hw_info_mtl.cpp | 4 +--- .../test/unit_test/aub/aub_helper_tests.cpp | 2 +- 24 files changed, 57 insertions(+), 104 deletions(-) diff --git a/level_zero/tools/test/unit_tests/sources/metrics/linux/test_metric_ip_sampling_linux_pvc_prelim.cpp b/level_zero/tools/test/unit_tests/sources/metrics/linux/test_metric_ip_sampling_linux_pvc_prelim.cpp index 57d5290dcc..74326469fb 100644 --- a/level_zero/tools/test/unit_tests/sources/metrics/linux/test_metric_ip_sampling_linux_pvc_prelim.cpp +++ b/level_zero/tools/test/unit_tests/sources/metrics/linux/test_metric_ip_sampling_linux_pvc_prelim.cpp @@ -44,7 +44,7 @@ class DrmPrelimMock : public DrmMock { DrmPrelimMock(RootDeviceEnvironment &rootDeviceEnvironment) : DrmPrelimMock(rootDeviceEnvironment, defaultHwInfo.get()) {} DrmPrelimMock(RootDeviceEnvironment &rootDeviceEnvironment, HardwareInfo *inputHwInfo, bool invokeQueryEngineInfo = true) : DrmMock(rootDeviceEnvironment) { customHwInfo = std::make_unique(&inputHwInfo->platform, &inputHwInfo->featureTable, - &inputHwInfo->workaroundTable, &inputHwInfo->gtSystemInfo, inputHwInfo->capabilityTable, 0u); + &inputHwInfo->workaroundTable, &inputHwInfo->gtSystemInfo, inputHwInfo->capabilityTable); customHwInfo->gtSystemInfo.MaxDualSubSlicesSupported = 64; rootDeviceEnvironment.setHwInfoAndInitHelpers(customHwInfo.get()); this->ioctlHelper = std::make_unique(*this); diff --git a/opencl/test/unit_test/device/device_tests.cpp b/opencl/test/unit_test/device/device_tests.cpp index c2d1a025bb..b950b0e7ca 100644 --- a/opencl/test/unit_test/device/device_tests.cpp +++ b/opencl/test/unit_test/device/device_tests.cpp @@ -732,7 +732,7 @@ TEST(ClDeviceHelperTest, givenNonZeroNumberOfTilesWhenPrepareDeviceEnvironmentsC sysInfo.MultiTileArchInfo.IsValid = true; sysInfo.MultiTileArchInfo.TileCount = 3; PLATFORM platform = {}; - HardwareInfo hwInfo{&platform, &skuTable, &waTable, &sysInfo, capTable, {}}; + HardwareInfo hwInfo{&platform, &skuTable, &waTable, &sysInfo, capTable}; DebugManager.flags.CreateMultipleSubDevices.set(0); uint32_t devicesCount = GfxCoreHelper::getSubDevicesCount(&hwInfo); @@ -748,7 +748,7 @@ TEST(ClDeviceHelperTest, givenZeroNumberOfTilesWhenPrepareDeviceEnvironmentsCoun sysInfo.MultiTileArchInfo.IsValid = true; sysInfo.MultiTileArchInfo.TileCount = 0; PLATFORM platform = {}; - HardwareInfo hwInfo{&platform, &skuTable, &waTable, &sysInfo, capTable, {}}; + HardwareInfo hwInfo{&platform, &skuTable, &waTable, &sysInfo, capTable}; DebugManager.flags.CreateMultipleSubDevices.set(0); uint32_t devicesCount = GfxCoreHelper::getSubDevicesCount(&hwInfo); diff --git a/shared/source/gen11/hw_info_ehl.cpp b/shared/source/gen11/hw_info_ehl.cpp index 92e00ba761..84f7b463bf 100644 --- a/shared/source/gen11/hw_info_ehl.cpp +++ b/shared/source/gen11/hw_info_ehl.cpp @@ -12,7 +12,6 @@ #include "shared/source/helpers/constants.h" #include "aubstream/engine_node.h" -#include "platforms.h" namespace NEO { @@ -138,8 +137,7 @@ const HardwareInfo EhlHwConfig::hwInfo = { &EHL::featureTable, &EHL::workaroundTable, &EhlHwConfig::gtSystemInfo, - EHL::capabilityTable, - AOT::EHL}; + EHL::capabilityTable}; GT_SYSTEM_INFO EhlHwConfig::gtSystemInfo = {0}; void EhlHwConfig::setupHardwareInfo(HardwareInfo *hwInfo, bool setupFeatureTableAndWorkaroundTable, const CompilerProductHelper &compilerProductHelper) { diff --git a/shared/source/gen11/hw_info_icllp.cpp b/shared/source/gen11/hw_info_icllp.cpp index 54048cbe2d..5474ffe509 100644 --- a/shared/source/gen11/hw_info_icllp.cpp +++ b/shared/source/gen11/hw_info_icllp.cpp @@ -12,7 +12,6 @@ #include "shared/source/helpers/constants.h" #include "aubstream/engine_node.h" -#include "platforms.h" namespace NEO { @@ -138,8 +137,7 @@ const HardwareInfo IcllpHw1x8x8::hwInfo = { &ICLLP::featureTable, &ICLLP::workaroundTable, &IcllpHw1x8x8::gtSystemInfo, - ICLLP::capabilityTable, - AOT::ICL}; + ICLLP::capabilityTable}; GT_SYSTEM_INFO IcllpHw1x8x8::gtSystemInfo = {0}; void IcllpHw1x8x8::setupHardwareInfo(HardwareInfo *hwInfo, bool setupFeatureTableAndWorkaroundTable, const CompilerProductHelper &compilerProductHelper) { @@ -160,8 +158,7 @@ const HardwareInfo IcllpHw1x4x8::hwInfo = { &ICLLP::featureTable, &ICLLP::workaroundTable, &IcllpHw1x4x8::gtSystemInfo, - ICLLP::capabilityTable, - AOT::ICL}; + ICLLP::capabilityTable}; GT_SYSTEM_INFO IcllpHw1x4x8::gtSystemInfo = {0}; void IcllpHw1x4x8::setupHardwareInfo(HardwareInfo *hwInfo, bool setupFeatureTableAndWorkaroundTable, const CompilerProductHelper &compilerProductHelper) { @@ -179,8 +176,7 @@ const HardwareInfo IcllpHw1x6x8::hwInfo = { &ICLLP::featureTable, &ICLLP::workaroundTable, &IcllpHw1x6x8::gtSystemInfo, - ICLLP::capabilityTable, - AOT::ICL}; + ICLLP::capabilityTable}; GT_SYSTEM_INFO IcllpHw1x6x8::gtSystemInfo = {0}; void IcllpHw1x6x8::setupHardwareInfo(HardwareInfo *hwInfo, bool setupFeatureTableAndWorkaroundTable, const CompilerProductHelper &compilerProductHelper) { diff --git a/shared/source/gen11/hw_info_lkf.cpp b/shared/source/gen11/hw_info_lkf.cpp index 277b4afd41..c00640a442 100644 --- a/shared/source/gen11/hw_info_lkf.cpp +++ b/shared/source/gen11/hw_info_lkf.cpp @@ -12,7 +12,6 @@ #include "shared/source/helpers/constants.h" #include "aubstream/engine_node.h" -#include "platforms.h" namespace NEO { @@ -138,8 +137,8 @@ const HardwareInfo LkfHw1x8x8::hwInfo = { &LKF::featureTable, &LKF::workaroundTable, &LkfHw1x8x8::gtSystemInfo, - LKF::capabilityTable, - AOT::LKF}; + LKF::capabilityTable}; + GT_SYSTEM_INFO LkfHw1x8x8::gtSystemInfo = {0}; void LkfHw1x8x8::setupHardwareInfo(HardwareInfo *hwInfo, bool setupFeatureTableAndWorkaroundTable, const CompilerProductHelper &compilerProductHelper) { LKF::setupHardwareInfoBase(hwInfo, setupFeatureTableAndWorkaroundTable, compilerProductHelper); diff --git a/shared/source/gen12lp/hw_info_adln.cpp b/shared/source/gen12lp/hw_info_adln.cpp index 3dd172e8bd..7cb99ed840 100644 --- a/shared/source/gen12lp/hw_info_adln.cpp +++ b/shared/source/gen12lp/hw_info_adln.cpp @@ -14,7 +14,6 @@ #include "shared/source/helpers/constants.h" #include "aubstream/engine_node.h" -#include "platforms.h" namespace NEO { @@ -137,8 +136,7 @@ const HardwareInfo AdlnHwConfig::hwInfo = { &ADLN::featureTable, &ADLN::workaroundTable, &AdlnHwConfig::gtSystemInfo, - ADLN::capabilityTable, - AOT::ADL_N}; + ADLN::capabilityTable}; GT_SYSTEM_INFO AdlnHwConfig::gtSystemInfo = {0}; void AdlnHwConfig::setupHardwareInfo(HardwareInfo *hwInfo, bool setupFeatureTableAndWorkaroundTable, const CompilerProductHelper &compilerProductHelper) { diff --git a/shared/source/gen12lp/hw_info_adlp.cpp b/shared/source/gen12lp/hw_info_adlp.cpp index 8dd947d1c7..347d56e08f 100644 --- a/shared/source/gen12lp/hw_info_adlp.cpp +++ b/shared/source/gen12lp/hw_info_adlp.cpp @@ -14,7 +14,6 @@ #include "shared/source/helpers/constants.h" #include "aubstream/engine_node.h" -#include "platforms.h" namespace NEO { @@ -137,8 +136,7 @@ const HardwareInfo AdlpHwConfig::hwInfo = { &ADLP::featureTable, &ADLP::workaroundTable, &AdlpHwConfig::gtSystemInfo, - ADLP::capabilityTable, - AOT::ADL_P}; + ADLP::capabilityTable}; GT_SYSTEM_INFO AdlpHwConfig::gtSystemInfo = {0}; void AdlpHwConfig::setupHardwareInfo(HardwareInfo *hwInfo, bool setupFeatureTableAndWorkaroundTable, const CompilerProductHelper &compilerProductHelper) { diff --git a/shared/source/gen12lp/hw_info_adls.cpp b/shared/source/gen12lp/hw_info_adls.cpp index 0000beef47..78310a8771 100644 --- a/shared/source/gen12lp/hw_info_adls.cpp +++ b/shared/source/gen12lp/hw_info_adls.cpp @@ -14,7 +14,6 @@ #include "shared/source/helpers/constants.h" #include "aubstream/engine_node.h" -#include "platforms.h" namespace NEO { @@ -137,8 +136,7 @@ const HardwareInfo AdlsHwConfig::hwInfo = { &ADLS::featureTable, &ADLS::workaroundTable, &AdlsHwConfig::gtSystemInfo, - ADLS::capabilityTable, - AOT::ADL_S}; + ADLS::capabilityTable}; GT_SYSTEM_INFO AdlsHwConfig::gtSystemInfo = {0}; void AdlsHwConfig::setupHardwareInfo(HardwareInfo *hwInfo, bool setupFeatureTableAndWorkaroundTable, const CompilerProductHelper &compilerProductHelper) { diff --git a/shared/source/gen12lp/hw_info_dg1.cpp b/shared/source/gen12lp/hw_info_dg1.cpp index b72a959179..657bdbca19 100644 --- a/shared/source/gen12lp/hw_info_dg1.cpp +++ b/shared/source/gen12lp/hw_info_dg1.cpp @@ -14,7 +14,6 @@ #include "shared/source/helpers/constants.h" #include "aubstream/engine_node.h" -#include "platforms.h" namespace NEO { @@ -142,8 +141,7 @@ const HardwareInfo Dg1HwConfig::hwInfo = { &DG1::featureTable, &DG1::workaroundTable, &Dg1HwConfig::gtSystemInfo, - DG1::capabilityTable, - AOT::DG1}; + DG1::capabilityTable}; GT_SYSTEM_INFO Dg1HwConfig::gtSystemInfo = {0}; void Dg1HwConfig::setupHardwareInfo(HardwareInfo *hwInfo, bool setupFeatureTableAndWorkaroundTable, const CompilerProductHelper &compilerProductHelper) { diff --git a/shared/source/gen12lp/hw_info_rkl.cpp b/shared/source/gen12lp/hw_info_rkl.cpp index f9197a1765..9338bde345 100644 --- a/shared/source/gen12lp/hw_info_rkl.cpp +++ b/shared/source/gen12lp/hw_info_rkl.cpp @@ -14,7 +14,6 @@ #include "shared/source/helpers/constants.h" #include "aubstream/engine_node.h" -#include "platforms.h" namespace NEO { @@ -140,8 +139,7 @@ const HardwareInfo RklHwConfig::hwInfo = { &RKL::featureTable, &RKL::workaroundTable, &RklHwConfig::gtSystemInfo, - RKL::capabilityTable, - AOT::RKL}; + RKL::capabilityTable}; GT_SYSTEM_INFO RklHwConfig::gtSystemInfo = {0}; void RklHwConfig::setupHardwareInfo(HardwareInfo *hwInfo, bool setupFeatureTableAndWorkaroundTable, const CompilerProductHelper &compilerProductHelper) { diff --git a/shared/source/gen12lp/hw_info_tgllp.cpp b/shared/source/gen12lp/hw_info_tgllp.cpp index f76b8cdfdb..7ffd0d7d21 100644 --- a/shared/source/gen12lp/hw_info_tgllp.cpp +++ b/shared/source/gen12lp/hw_info_tgllp.cpp @@ -14,7 +14,6 @@ #include "shared/source/helpers/constants.h" #include "aubstream/engine_node.h" -#include "platforms.h" namespace NEO { @@ -137,8 +136,7 @@ const HardwareInfo TgllpHw1x6x16::hwInfo = { &TGLLP::featureTable, &TGLLP::workaroundTable, &TgllpHw1x6x16::gtSystemInfo, - TGLLP::capabilityTable, - AOT::TGL}; + TGLLP::capabilityTable}; GT_SYSTEM_INFO TgllpHw1x6x16::gtSystemInfo = {0}; void TgllpHw1x6x16::setupHardwareInfo(HardwareInfo *hwInfo, bool setupFeatureTableAndWorkaroundTable, const CompilerProductHelper &compilerProductHelper) { @@ -165,8 +163,7 @@ const HardwareInfo TgllpHw1x2x16::hwInfo = { &TGLLP::featureTable, &TGLLP::workaroundTable, &TgllpHw1x2x16::gtSystemInfo, - TGLLP::capabilityTable, - AOT::TGL}; + TGLLP::capabilityTable}; GT_SYSTEM_INFO TgllpHw1x2x16::gtSystemInfo = {0}; void TgllpHw1x2x16::setupHardwareInfo(HardwareInfo *hwInfo, bool setupFeatureTableAndWorkaroundTable, const CompilerProductHelper &compilerProductHelper) { diff --git a/shared/source/gen8/hw_info_bdw.cpp b/shared/source/gen8/hw_info_bdw.cpp index 814117f283..7e2d50e256 100644 --- a/shared/source/gen8/hw_info_bdw.cpp +++ b/shared/source/gen8/hw_info_bdw.cpp @@ -12,7 +12,6 @@ #include "shared/source/helpers/constants.h" #include "aubstream/engine_node.h" -#include "platforms.h" namespace NEO { @@ -127,8 +126,7 @@ const HardwareInfo BdwHw1x2x6::hwInfo = { &BDW::featureTable, &BDW::workaroundTable, &BdwHw1x2x6::gtSystemInfo, - BDW::capabilityTable, - AOT::BDW}; + BDW::capabilityTable}; GT_SYSTEM_INFO BdwHw1x2x6::gtSystemInfo = {0}; void BdwHw1x2x6::setupHardwareInfo(HardwareInfo *hwInfo, bool setupFeatureTableAndWorkaroundTable, const CompilerProductHelper &compilerProductHelper) { @@ -146,8 +144,7 @@ const HardwareInfo BdwHw1x3x6::hwInfo = { &BDW::featureTable, &BDW::workaroundTable, &BdwHw1x3x6::gtSystemInfo, - BDW::capabilityTable, - AOT::BDW}; + BDW::capabilityTable}; GT_SYSTEM_INFO BdwHw1x3x6::gtSystemInfo = {0}; void BdwHw1x3x6::setupHardwareInfo(HardwareInfo *hwInfo, bool setupFeatureTableAndWorkaroundTable, const CompilerProductHelper &compilerProductHelper) { BDW::setupHardwareInfoBase(hwInfo, setupFeatureTableAndWorkaroundTable, compilerProductHelper); @@ -164,8 +161,7 @@ const HardwareInfo BdwHw1x3x8::hwInfo = { &BDW::featureTable, &BDW::workaroundTable, &BdwHw1x3x8::gtSystemInfo, - BDW::capabilityTable, - AOT::BDW}; + BDW::capabilityTable}; GT_SYSTEM_INFO BdwHw1x3x8::gtSystemInfo = {0}; void BdwHw1x3x8::setupHardwareInfo(HardwareInfo *hwInfo, bool setupFeatureTableAndWorkaroundTable, const CompilerProductHelper &compilerProductHelper) { BDW::setupHardwareInfoBase(hwInfo, setupFeatureTableAndWorkaroundTable, compilerProductHelper); @@ -182,8 +178,7 @@ const HardwareInfo BdwHw2x3x8::hwInfo = { &BDW::featureTable, &BDW::workaroundTable, &BdwHw2x3x8::gtSystemInfo, - BDW::capabilityTable, - AOT::BDW}; + BDW::capabilityTable}; GT_SYSTEM_INFO BdwHw2x3x8::gtSystemInfo = {0}; void BdwHw2x3x8::setupHardwareInfo(HardwareInfo *hwInfo, bool setupFeatureTableAndWorkaroundTable, const CompilerProductHelper &compilerProductHelper) { BDW::setupHardwareInfoBase(hwInfo, setupFeatureTableAndWorkaroundTable, compilerProductHelper); diff --git a/shared/source/gen9/hw_info_bxt.cpp b/shared/source/gen9/hw_info_bxt.cpp index 72771bd69b..c27c5e3457 100644 --- a/shared/source/gen9/hw_info_bxt.cpp +++ b/shared/source/gen9/hw_info_bxt.cpp @@ -12,7 +12,6 @@ #include "shared/source/helpers/constants.h" #include "aubstream/engine_node.h" -#include "platforms.h" namespace NEO { @@ -136,8 +135,7 @@ const HardwareInfo BxtHw1x2x6::hwInfo = { &BXT::featureTable, &BXT::workaroundTable, &BxtHw1x2x6::gtSystemInfo, - BXT::capabilityTable, - AOT::APL}; + BXT::capabilityTable}; GT_SYSTEM_INFO BxtHw1x2x6::gtSystemInfo = {0}; void BxtHw1x2x6::setupHardwareInfo(HardwareInfo *hwInfo, bool setupFeatureTableAndWorkaroundTable, const CompilerProductHelper &compilerProductHelper) { BXT::setupHardwareInfoBase(hwInfo, setupFeatureTableAndWorkaroundTable, compilerProductHelper); @@ -154,8 +152,7 @@ const HardwareInfo BxtHw1x3x6::hwInfo = { &BXT::featureTable, &BXT::workaroundTable, &BxtHw1x3x6::gtSystemInfo, - BXT::capabilityTable, - AOT::APL}; + BXT::capabilityTable}; GT_SYSTEM_INFO BxtHw1x3x6::gtSystemInfo = {0}; void BxtHw1x3x6::setupHardwareInfo(HardwareInfo *hwInfo, bool setupFeatureTableAndWorkaroundTable, const CompilerProductHelper &compilerProductHelper) { BXT::setupHardwareInfoBase(hwInfo, setupFeatureTableAndWorkaroundTable, compilerProductHelper); diff --git a/shared/source/gen9/hw_info_cfl.cpp b/shared/source/gen9/hw_info_cfl.cpp index 4a027ac675..9166a7e9e0 100644 --- a/shared/source/gen9/hw_info_cfl.cpp +++ b/shared/source/gen9/hw_info_cfl.cpp @@ -13,7 +13,6 @@ #include "shared/source/helpers/constants.h" #include "aubstream/engine_node.h" -#include "platforms.h" namespace NEO { @@ -136,8 +135,7 @@ const HardwareInfo CflHw1x2x6::hwInfo = { &CFL::featureTable, &CFL::workaroundTable, &CflHw1x2x6::gtSystemInfo, - CFL::capabilityTable, - AOT::CFL}; + CFL::capabilityTable}; GT_SYSTEM_INFO CflHw1x2x6::gtSystemInfo = {0}; void CflHw1x2x6::setupHardwareInfo(HardwareInfo *hwInfo, bool setupFeatureTableAndWorkaroundTable, const CompilerProductHelper &compilerProductHelper) { CFL::setupHardwareInfoBase(hwInfo, setupFeatureTableAndWorkaroundTable, compilerProductHelper); @@ -154,8 +152,7 @@ const HardwareInfo CflHw1x3x6::hwInfo = { &CFL::featureTable, &CFL::workaroundTable, &CflHw1x3x6::gtSystemInfo, - CFL::capabilityTable, - AOT::CFL}; + CFL::capabilityTable}; GT_SYSTEM_INFO CflHw1x3x6::gtSystemInfo = {0}; void CflHw1x3x6::setupHardwareInfo(HardwareInfo *hwInfo, bool setupFeatureTableAndWorkaroundTable, const CompilerProductHelper &compilerProductHelper) { @@ -173,8 +170,7 @@ const HardwareInfo CflHw1x3x8::hwInfo = { &CFL::featureTable, &CFL::workaroundTable, &CflHw1x3x8::gtSystemInfo, - CFL::capabilityTable, - AOT::CFL}; + CFL::capabilityTable}; GT_SYSTEM_INFO CflHw1x3x8::gtSystemInfo = {0}; void CflHw1x3x8::setupHardwareInfo(HardwareInfo *hwInfo, bool setupFeatureTableAndWorkaroundTable, const CompilerProductHelper &compilerProductHelper) { @@ -192,8 +188,7 @@ const HardwareInfo CflHw2x3x8::hwInfo = { &CFL::featureTable, &CFL::workaroundTable, &CflHw2x3x8::gtSystemInfo, - CFL::capabilityTable, - AOT::CFL}; + CFL::capabilityTable}; GT_SYSTEM_INFO CflHw2x3x8::gtSystemInfo = {0}; void CflHw2x3x8::setupHardwareInfo(HardwareInfo *hwInfo, bool setupFeatureTableAndWorkaroundTable, const CompilerProductHelper &compilerProductHelper) { CFL::setupHardwareInfoBase(hwInfo, setupFeatureTableAndWorkaroundTable, compilerProductHelper); @@ -210,8 +205,7 @@ const HardwareInfo CflHw3x3x8::hwInfo = { &CFL::featureTable, &CFL::workaroundTable, &CflHw3x3x8::gtSystemInfo, - CFL::capabilityTable, - AOT::CFL}; + CFL::capabilityTable}; GT_SYSTEM_INFO CflHw3x3x8::gtSystemInfo = {0}; void CflHw3x3x8::setupHardwareInfo(HardwareInfo *hwInfo, bool setupFeatureTableAndWorkaroundTable, const CompilerProductHelper &compilerProductHelper) { CFL::setupHardwareInfoBase(hwInfo, setupFeatureTableAndWorkaroundTable, compilerProductHelper); diff --git a/shared/source/gen9/hw_info_glk.cpp b/shared/source/gen9/hw_info_glk.cpp index 5af8cb8b64..03f1c1fdfc 100644 --- a/shared/source/gen9/hw_info_glk.cpp +++ b/shared/source/gen9/hw_info_glk.cpp @@ -12,7 +12,6 @@ #include "shared/source/helpers/constants.h" #include "aubstream/engine_node.h" -#include "platforms.h" namespace NEO { @@ -137,8 +136,7 @@ const HardwareInfo GlkHw1x3x6::hwInfo = { &GLK::featureTable, &GLK::workaroundTable, &GlkHw1x3x6::gtSystemInfo, - GLK::capabilityTable, - AOT::GLK}; + GLK::capabilityTable}; GT_SYSTEM_INFO GlkHw1x3x6::gtSystemInfo = {0}; void GlkHw1x3x6::setupHardwareInfo(HardwareInfo *hwInfo, bool setupFeatureTableAndWorkaroundTable, const CompilerProductHelper &compilerProductHelper) { @@ -156,8 +154,7 @@ const HardwareInfo GlkHw1x2x6::hwInfo = { &GLK::featureTable, &GLK::workaroundTable, &GlkHw1x2x6::gtSystemInfo, - GLK::capabilityTable, - AOT::GLK}; + GLK::capabilityTable}; GT_SYSTEM_INFO GlkHw1x2x6::gtSystemInfo = {0}; void GlkHw1x2x6::setupHardwareInfo(HardwareInfo *hwInfo, bool setupFeatureTableAndWorkaroundTable, const CompilerProductHelper &compilerProductHelper) { diff --git a/shared/source/gen9/hw_info_kbl.cpp b/shared/source/gen9/hw_info_kbl.cpp index e766a7b3f6..c90d56d485 100644 --- a/shared/source/gen9/hw_info_kbl.cpp +++ b/shared/source/gen9/hw_info_kbl.cpp @@ -13,7 +13,6 @@ #include "shared/source/helpers/constants.h" #include "aubstream/engine_node.h" -#include "platforms.h" namespace NEO { @@ -142,8 +141,8 @@ const HardwareInfo KblHw1x2x6::hwInfo = { &KBL::featureTable, &KBL::workaroundTable, &KblHw1x2x6::gtSystemInfo, - KBL::capabilityTable, - AOT::KBL}; + KBL::capabilityTable}; + GT_SYSTEM_INFO KblHw1x2x6::gtSystemInfo = {0}; void KblHw1x2x6::setupHardwareInfo(HardwareInfo *hwInfo, bool setupFeatureTableAndWorkaroundTable, const CompilerProductHelper &compilerProductHelper) { KBL::setupHardwareInfoBase(hwInfo, setupFeatureTableAndWorkaroundTable, compilerProductHelper); @@ -160,8 +159,7 @@ const HardwareInfo KblHw1x3x6::hwInfo = { &KBL::featureTable, &KBL::workaroundTable, &KblHw1x3x6::gtSystemInfo, - KBL::capabilityTable, - AOT::KBL}; + KBL::capabilityTable}; GT_SYSTEM_INFO KblHw1x3x6::gtSystemInfo = {0}; void KblHw1x3x6::setupHardwareInfo(HardwareInfo *hwInfo, bool setupFeatureTableAndWorkaroundTable, const CompilerProductHelper &compilerProductHelper) { @@ -179,8 +177,8 @@ const HardwareInfo KblHw1x3x8::hwInfo = { &KBL::featureTable, &KBL::workaroundTable, &KblHw1x3x8::gtSystemInfo, - KBL::capabilityTable, - AOT::KBL}; + KBL::capabilityTable}; + GT_SYSTEM_INFO KblHw1x3x8::gtSystemInfo = {0}; void KblHw1x3x8::setupHardwareInfo(HardwareInfo *hwInfo, bool setupFeatureTableAndWorkaroundTable, const CompilerProductHelper &compilerProductHelper) { KBL::setupHardwareInfoBase(hwInfo, setupFeatureTableAndWorkaroundTable, compilerProductHelper); @@ -197,8 +195,8 @@ const HardwareInfo KblHw2x3x8::hwInfo = { &KBL::featureTable, &KBL::workaroundTable, &KblHw2x3x8::gtSystemInfo, - KBL::capabilityTable, - AOT::KBL}; + KBL::capabilityTable}; + GT_SYSTEM_INFO KblHw2x3x8::gtSystemInfo = {0}; void KblHw2x3x8::setupHardwareInfo(HardwareInfo *hwInfo, bool setupFeatureTableAndWorkaroundTable, const CompilerProductHelper &compilerProductHelper) { KBL::setupHardwareInfoBase(hwInfo, setupFeatureTableAndWorkaroundTable, compilerProductHelper); @@ -215,8 +213,8 @@ const HardwareInfo KblHw3x3x8::hwInfo = { &KBL::featureTable, &KBL::workaroundTable, &KblHw3x3x8::gtSystemInfo, - KBL::capabilityTable, - AOT::KBL}; + KBL::capabilityTable}; + GT_SYSTEM_INFO KblHw3x3x8::gtSystemInfo = {0}; void KblHw3x3x8::setupHardwareInfo(HardwareInfo *hwInfo, bool setupFeatureTableAndWorkaroundTable, const CompilerProductHelper &compilerProductHelper) { KBL::setupHardwareInfoBase(hwInfo, setupFeatureTableAndWorkaroundTable, compilerProductHelper); diff --git a/shared/source/gen9/hw_info_skl.cpp b/shared/source/gen9/hw_info_skl.cpp index 7b799aba9a..2f921af90d 100644 --- a/shared/source/gen9/hw_info_skl.cpp +++ b/shared/source/gen9/hw_info_skl.cpp @@ -12,7 +12,6 @@ #include "shared/source/helpers/constants.h" #include "aubstream/engine_node.h" -#include "platforms.h" namespace NEO { @@ -148,8 +147,8 @@ const HardwareInfo SklHw1x2x6::hwInfo = { &SKL::featureTable, &SKL::workaroundTable, &SklHw1x2x6::gtSystemInfo, - SKL::capabilityTable, - AOT::SKL}; + SKL::capabilityTable}; + GT_SYSTEM_INFO SklHw1x2x6::gtSystemInfo = {0}; void SklHw1x2x6::setupHardwareInfo(HardwareInfo *hwInfo, bool setupFeatureTableAndWorkaroundTable, const CompilerProductHelper &compilerProductHelper) { setupHardwareInfoBase(hwInfo, setupFeatureTableAndWorkaroundTable, compilerProductHelper); @@ -166,8 +165,8 @@ const HardwareInfo SklHw1x3x6::hwInfo = { &SKL::featureTable, &SKL::workaroundTable, &SklHw1x3x6::gtSystemInfo, - SKL::capabilityTable, - AOT::SKL}; + SKL::capabilityTable}; + GT_SYSTEM_INFO SklHw1x3x6::gtSystemInfo = {0}; void SklHw1x3x6::setupHardwareInfo(HardwareInfo *hwInfo, bool setupFeatureTableAndWorkaroundTable, const CompilerProductHelper &compilerProductHelper) { setupHardwareInfoBase(hwInfo, setupFeatureTableAndWorkaroundTable, compilerProductHelper); @@ -184,8 +183,8 @@ const HardwareInfo SklHw1x3x8::hwInfo = { &SKL::featureTable, &SKL::workaroundTable, &SklHw1x3x8::gtSystemInfo, - SKL::capabilityTable, - AOT::SKL}; + SKL::capabilityTable}; + GT_SYSTEM_INFO SklHw1x3x8::gtSystemInfo = {0}; void SklHw1x3x8::setupHardwareInfo(HardwareInfo *hwInfo, bool setupFeatureTableAndWorkaroundTable, const CompilerProductHelper &compilerProductHelper) { setupHardwareInfoBase(hwInfo, setupFeatureTableAndWorkaroundTable, compilerProductHelper); @@ -202,8 +201,8 @@ const HardwareInfo SklHw2x3x8::hwInfo = { &SKL::featureTable, &SKL::workaroundTable, &SklHw2x3x8::gtSystemInfo, - SKL::capabilityTable, - AOT::SKL}; + SKL::capabilityTable}; + GT_SYSTEM_INFO SklHw2x3x8::gtSystemInfo = {0}; void SklHw2x3x8::setupHardwareInfo(HardwareInfo *hwInfo, bool setupFeatureTableAndWorkaroundTable, const CompilerProductHelper &compilerProductHelper) { setupHardwareInfoBase(hwInfo, setupFeatureTableAndWorkaroundTable, compilerProductHelper); @@ -220,8 +219,8 @@ const HardwareInfo SklHw3x3x8::hwInfo = { &SKL::featureTable, &SKL::workaroundTable, &SklHw3x3x8::gtSystemInfo, - SKL::capabilityTable, - AOT::SKL}; + SKL::capabilityTable}; + GT_SYSTEM_INFO SklHw3x3x8::gtSystemInfo = {0}; void SklHw3x3x8::setupHardwareInfo(HardwareInfo *hwInfo, bool setupFeatureTableAndWorkaroundTable, const CompilerProductHelper &compilerProductHelper) { setupHardwareInfoBase(hwInfo, setupFeatureTableAndWorkaroundTable, compilerProductHelper); diff --git a/shared/source/helpers/hw_info.cpp b/shared/source/helpers/hw_info.cpp index 337d9ee094..d4a2f94443 100644 --- a/shared/source/helpers/hw_info.cpp +++ b/shared/source/helpers/hw_info.cpp @@ -15,8 +15,8 @@ namespace NEO { HardwareInfo::HardwareInfo(const PLATFORM *platform, const FeatureTable *featureTable, const WorkaroundTable *workaroundTable, - const GT_SYSTEM_INFO *gtSystemInfo, const RuntimeCapabilityTable &capabilityTable, HardwareIpVersion ipVersion) - : platform(*platform), featureTable(*featureTable), workaroundTable(*workaroundTable), gtSystemInfo(*gtSystemInfo), capabilityTable(capabilityTable), ipVersion(ipVersion) { + const GT_SYSTEM_INFO *gtSystemInfo, const RuntimeCapabilityTable &capabilityTable) + : platform(*platform), featureTable(*featureTable), workaroundTable(*workaroundTable), gtSystemInfo(*gtSystemInfo), capabilityTable(capabilityTable) { } // Global table of hardware prefixes diff --git a/shared/source/helpers/hw_info.h b/shared/source/helpers/hw_info.h index dc3a5f15f7..e200b85e8b 100644 --- a/shared/source/helpers/hw_info.h +++ b/shared/source/helpers/hw_info.h @@ -140,7 +140,7 @@ inline bool operator==(const RuntimeCapabilityTable &lhs, const RuntimeCapabilit struct HardwareInfo { HardwareInfo() = default; HardwareInfo(const PLATFORM *platform, const FeatureTable *featureTable, const WorkaroundTable *workaroundTable, - const GT_SYSTEM_INFO *gtSystemInfo, const RuntimeCapabilityTable &capabilityTable, HardwareIpVersion ipVersion); + const GT_SYSTEM_INFO *gtSystemInfo, const RuntimeCapabilityTable &capabilityTable); PLATFORM platform{}; FeatureTable featureTable{}; diff --git a/shared/source/os_interface/device_factory.cpp b/shared/source/os_interface/device_factory.cpp index 322dd4c9f3..051dff28f1 100644 --- a/shared/source/os_interface/device_factory.cpp +++ b/shared/source/os_interface/device_factory.cpp @@ -94,9 +94,7 @@ bool DeviceFactory::prepareDeviceEnvironmentsForProductFamilyOverride(ExecutionE } } - if (DebugManager.flags.OverrideHwIpVersion.get() != -1) { - hardwareInfo->ipVersion = DebugManager.flags.OverrideHwIpVersion.get(); - } + hardwareInfo->ipVersion.value = compilerProductHelper.getHwIpVersion(*hardwareInfo); rootDeviceEnvironment.initReleaseHelper(); diff --git a/shared/source/xe_hpc_core/hw_info_pvc.cpp b/shared/source/xe_hpc_core/hw_info_pvc.cpp index 3ac085a1ea..ebef697158 100644 --- a/shared/source/xe_hpc_core/hw_info_pvc.cpp +++ b/shared/source/xe_hpc_core/hw_info_pvc.cpp @@ -15,7 +15,6 @@ #include "shared/source/xe_hpc_core/pvc/device_ids_configs_pvc.h" #include "aubstream/engine_node.h" -#include "platforms.h" namespace NEO { @@ -176,8 +175,7 @@ const HardwareInfo PvcHwConfig::hwInfo = { &PVC::featureTable, &PVC::workaroundTable, &PvcHwConfig::gtSystemInfo, - PVC::capabilityTable, - AOT::PVC_XT_C0}; + PVC::capabilityTable}; GT_SYSTEM_INFO PvcHwConfig::gtSystemInfo = {0}; void PvcHwConfig::setupHardwareInfo(HardwareInfo *hwInfo, bool setupFeatureTableAndWorkaroundTable, const CompilerProductHelper &compilerProductHelper) { diff --git a/shared/source/xe_hpg_core/hw_info_dg2.cpp b/shared/source/xe_hpg_core/hw_info_dg2.cpp index 776c43f808..aeecb05498 100644 --- a/shared/source/xe_hpg_core/hw_info_dg2.cpp +++ b/shared/source/xe_hpg_core/hw_info_dg2.cpp @@ -14,7 +14,6 @@ #include "aubstream/engine_node.h" #include "device_ids_configs_dg2.h" -#include "platforms.h" namespace NEO { @@ -150,8 +149,8 @@ const HardwareInfo Dg2HwConfig::hwInfo = { &DG2::featureTable, &DG2::workaroundTable, &Dg2HwConfig::gtSystemInfo, - DG2::capabilityTable, - AOT::DG2_G10_A0}; + DG2::capabilityTable}; + GT_SYSTEM_INFO Dg2HwConfig::gtSystemInfo = {0}; void Dg2HwConfig::setupHardwareInfo(HardwareInfo *hwInfo, bool setupFeatureTableAndWorkaroundTable, const CompilerProductHelper &compilerProductHelper) { GT_SYSTEM_INFO *gtSysInfo = &hwInfo->gtSystemInfo; diff --git a/shared/source/xe_hpg_core/hw_info_mtl.cpp b/shared/source/xe_hpg_core/hw_info_mtl.cpp index 4a5d58fdd5..cee927aba4 100644 --- a/shared/source/xe_hpg_core/hw_info_mtl.cpp +++ b/shared/source/xe_hpg_core/hw_info_mtl.cpp @@ -13,7 +13,6 @@ #include "shared/source/xe_hpg_core/hw_cmds_mtl.h" #include "aubstream/engine_node.h" -#include "platforms.h" namespace NEO { @@ -150,8 +149,7 @@ const HardwareInfo MtlHwConfig::hwInfo = { &MTL::featureTable, &MTL::workaroundTable, &MtlHwConfig::gtSystemInfo, - MTL::capabilityTable, - AOT::MTL_M_A0}; + MTL::capabilityTable}; GT_SYSTEM_INFO MtlHwConfig::gtSystemInfo = {0}; void MtlHwConfig::setupHardwareInfo(HardwareInfo *hwInfo, bool setupFeatureTableAndWorkaroundTable, const CompilerProductHelper &compilerProductHelper) { diff --git a/shared/test/unit_test/aub/aub_helper_tests.cpp b/shared/test/unit_test/aub/aub_helper_tests.cpp index ae7e8081cb..370ed1b6b0 100644 --- a/shared/test/unit_test/aub/aub_helper_tests.cpp +++ b/shared/test/unit_test/aub/aub_helper_tests.cpp @@ -40,7 +40,7 @@ TEST(AubHelper, GivenMultipleSubDevicesWhenGettingDeviceCountThenCorrectValueIsR RuntimeCapabilityTable capTable = {}; GT_SYSTEM_INFO sysInfo = {}; PLATFORM platform = {}; - HardwareInfo hwInfo{&platform, &featureTable, &workaroundTable, &sysInfo, capTable, {}}; + HardwareInfo hwInfo{&platform, &featureTable, &workaroundTable, &sysInfo, capTable}; DebugManager.flags.CreateMultipleSubDevices.set(2); uint32_t devicesCount = GfxCoreHelper::getSubDevicesCount(&hwInfo);