diff --git a/shared/source/execution_environment/root_device_environment.cpp b/shared/source/execution_environment/root_device_environment.cpp index 8a0d6a2258..fd935d4025 100644 --- a/shared/source/execution_environment/root_device_environment.cpp +++ b/shared/source/execution_environment/root_device_environment.cpp @@ -160,7 +160,6 @@ void RootDeviceEnvironment::initHelpers() { initGfxCoreHelper(); initApiGfxCoreHelper(); initCompilerProductHelper(); - productHelper->adjustIpVersionIfNeeded(*hwInfo); initReleaseHelper(); } diff --git a/shared/source/os_interface/product_helper.h b/shared/source/os_interface/product_helper.h index 16c3dc4535..8f142a960d 100644 --- a/shared/source/os_interface/product_helper.h +++ b/shared/source/os_interface/product_helper.h @@ -205,7 +205,6 @@ class ProductHelper { virtual bool isCalculationForDisablingEuFusionWithDpasNeeded(const HardwareInfo &hwInfo) const = 0; virtual uint32_t getNumberOfPartsInTileForConcurrentKernel() const = 0; virtual bool is48bResourceNeededForRayTracing() const = 0; - virtual void adjustIpVersionIfNeeded(HardwareInfo &hwInfo) const = 0; virtual ~ProductHelper() = default; diff --git a/shared/source/os_interface/product_helper.inl b/shared/source/os_interface/product_helper.inl index 8f1c95892f..cecac00ba6 100644 --- a/shared/source/os_interface/product_helper.inl +++ b/shared/source/os_interface/product_helper.inl @@ -295,9 +295,6 @@ std::pair ProductHelperHw::isPipeControlPriorToNonPipeli return {false, false}; } -template -void ProductHelperHw::adjustIpVersionIfNeeded(HardwareInfo &hwInfo) const {} - template bool ProductHelperHw::isAdditionalMediaSamplerProgrammingRequired() const { return false; diff --git a/shared/source/os_interface/product_helper_hw.h b/shared/source/os_interface/product_helper_hw.h index f1b91db74e..9739d3834e 100644 --- a/shared/source/os_interface/product_helper_hw.h +++ b/shared/source/os_interface/product_helper_hw.h @@ -158,7 +158,6 @@ class ProductHelperHw : public ProductHelper { bool isFusedEuDisabledForDpas(bool kernelHasDpasInstructions, const uint32_t *lws, const uint32_t *groupCount, const HardwareInfo &hwInfo) const override; bool isCalculationForDisablingEuFusionWithDpasNeeded(const HardwareInfo &hwInfo) const override; bool is48bResourceNeededForRayTracing() const override; - void adjustIpVersionIfNeeded(HardwareInfo &hwInfo) const override; ~ProductHelperHw() override = default; diff --git a/shared/source/os_interface/windows/wddm/wddm.cpp b/shared/source/os_interface/windows/wddm/wddm.cpp index 9534719a56..9486356fba 100644 --- a/shared/source/os_interface/windows/wddm/wddm.cpp +++ b/shared/source/os_interface/windows/wddm/wddm.cpp @@ -111,7 +111,6 @@ bool Wddm::init() { rootDeviceEnvironment.initGfxCoreHelper(); populateIpVersion(*hardwareInfo); - productHelper.adjustIpVersionIfNeeded(*rootDeviceEnvironment.getMutableHardwareInfo()); rootDeviceEnvironment.initReleaseHelper(); if (productHelper.configureHwInfoWddm(hardwareInfo, hardwareInfo, rootDeviceEnvironment)) { diff --git a/shared/source/xe_hpg_core/dg2/os_agnostic_product_helper_dg2.inl b/shared/source/xe_hpg_core/dg2/os_agnostic_product_helper_dg2.inl index 0b5db643c4..e33b0cce1a 100644 --- a/shared/source/xe_hpg_core/dg2/os_agnostic_product_helper_dg2.inl +++ b/shared/source/xe_hpg_core/dg2/os_agnostic_product_helper_dg2.inl @@ -138,15 +138,6 @@ bool ProductHelperHw::isAllocationSizeAdjustmentRequired(const Hardw return DG2::isG10(hwInfo) && GfxCoreHelper::isWorkaroundRequired(REVISION_A0, REVISION_B, hwInfo, *this); } -template <> -void ProductHelperHw::adjustIpVersionIfNeeded(HardwareInfo &hwInfo) const { - bool isIpVersionUninitialized = hwInfo.ipVersion.architecture == 0; - - if (isIpVersionUninitialized) { - hwInfo.ipVersion.value = getHwIpVersion(hwInfo); - } -} - template <> std::pair ProductHelperHw::isPipeControlPriorToNonPipelinedStateCommandsWARequired(const HardwareInfo &hwInfo, bool isRcs, const ReleaseHelper *releaseHelper) const { auto isAcm = DG2::isG10(hwInfo) || DG2::isG11(hwInfo) || DG2::isG12(hwInfo); diff --git a/shared/test/unit_test/xe_hpg_core/dg2/product_config_helper_tests_dg2.cpp b/shared/test/unit_test/xe_hpg_core/dg2/product_config_helper_tests_dg2.cpp index eb7294938e..b0430062f8 100644 --- a/shared/test/unit_test/xe_hpg_core/dg2/product_config_helper_tests_dg2.cpp +++ b/shared/test/unit_test/xe_hpg_core/dg2/product_config_helper_tests_dg2.cpp @@ -847,25 +847,3 @@ DG2TEST_F(ProductHelperTestDg2, givenDebugFlagWhenCheckingIsResolveDependenciesB DG2TEST_F(ProductHelperTestDg2, givenProductHelperWhenCheckingIsBufferPoolAllocatorSupportedThenCorrectValueIsReturned) { EXPECT_TRUE(productHelper->isBufferPoolAllocatorSupported()); } - -DG2TEST_F(ProductHelperTestDg2, givenDg2WhenAdjustIpVersionThenIpVersionIsCorrect) { - auto testIpVersion = [&](auto revId, auto deviceId, auto config) { - auto &hwInfo = *executionEnvironment->rootDeviceEnvironments[0]->getMutableHardwareInfo(); - hwInfo.platform.usDeviceID = deviceId; - hwInfo.platform.usRevId = revId; - hwInfo.ipVersion.value = 0; - - productHelper->adjustIpVersionIfNeeded(hwInfo); - auto ipVersion = hwInfo.ipVersion; - EXPECT_EQ(config, ipVersion.value); - }; - - testIpVersion(0, 0x4F80, AOT::DG2_G10_A0); - testIpVersion(1, 0x4F80, AOT::DG2_G10_A1); - testIpVersion(4, 0x4F80, AOT::DG2_G10_B0); - testIpVersion(8, 0x4F80, AOT::DG2_G10_C0); - testIpVersion(0, 0x4F87, AOT::DG2_G11_A0); - testIpVersion(4, 0x4F87, AOT::DG2_G11_B0); - testIpVersion(5, 0x4F87, AOT::DG2_G11_B1); - testIpVersion(0, 0x5696, AOT::DG2_G12_A0); -}