fix: remove not needed adjustIpVersionIfNeeded function
Related-To: NEO-7786 Signed-off-by: Kamil Kopryk <kamil.kopryk@intel.com>
This commit is contained in:
parent
7d82b690e4
commit
f32d62970d
|
@ -160,7 +160,6 @@ void RootDeviceEnvironment::initHelpers() {
|
||||||
initGfxCoreHelper();
|
initGfxCoreHelper();
|
||||||
initApiGfxCoreHelper();
|
initApiGfxCoreHelper();
|
||||||
initCompilerProductHelper();
|
initCompilerProductHelper();
|
||||||
productHelper->adjustIpVersionIfNeeded(*hwInfo);
|
|
||||||
initReleaseHelper();
|
initReleaseHelper();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -205,7 +205,6 @@ class ProductHelper {
|
||||||
virtual bool isCalculationForDisablingEuFusionWithDpasNeeded(const HardwareInfo &hwInfo) const = 0;
|
virtual bool isCalculationForDisablingEuFusionWithDpasNeeded(const HardwareInfo &hwInfo) const = 0;
|
||||||
virtual uint32_t getNumberOfPartsInTileForConcurrentKernel() const = 0;
|
virtual uint32_t getNumberOfPartsInTileForConcurrentKernel() const = 0;
|
||||||
virtual bool is48bResourceNeededForRayTracing() const = 0;
|
virtual bool is48bResourceNeededForRayTracing() const = 0;
|
||||||
virtual void adjustIpVersionIfNeeded(HardwareInfo &hwInfo) const = 0;
|
|
||||||
|
|
||||||
virtual ~ProductHelper() = default;
|
virtual ~ProductHelper() = default;
|
||||||
|
|
||||||
|
|
|
@ -295,9 +295,6 @@ std::pair<bool, bool> ProductHelperHw<gfxProduct>::isPipeControlPriorToNonPipeli
|
||||||
return {false, false};
|
return {false, false};
|
||||||
}
|
}
|
||||||
|
|
||||||
template <PRODUCT_FAMILY gfxProduct>
|
|
||||||
void ProductHelperHw<gfxProduct>::adjustIpVersionIfNeeded(HardwareInfo &hwInfo) const {}
|
|
||||||
|
|
||||||
template <PRODUCT_FAMILY gfxProduct>
|
template <PRODUCT_FAMILY gfxProduct>
|
||||||
bool ProductHelperHw<gfxProduct>::isAdditionalMediaSamplerProgrammingRequired() const {
|
bool ProductHelperHw<gfxProduct>::isAdditionalMediaSamplerProgrammingRequired() const {
|
||||||
return false;
|
return false;
|
||||||
|
|
|
@ -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 isFusedEuDisabledForDpas(bool kernelHasDpasInstructions, const uint32_t *lws, const uint32_t *groupCount, const HardwareInfo &hwInfo) const override;
|
||||||
bool isCalculationForDisablingEuFusionWithDpasNeeded(const HardwareInfo &hwInfo) const override;
|
bool isCalculationForDisablingEuFusionWithDpasNeeded(const HardwareInfo &hwInfo) const override;
|
||||||
bool is48bResourceNeededForRayTracing() const override;
|
bool is48bResourceNeededForRayTracing() const override;
|
||||||
void adjustIpVersionIfNeeded(HardwareInfo &hwInfo) const override;
|
|
||||||
|
|
||||||
~ProductHelperHw() override = default;
|
~ProductHelperHw() override = default;
|
||||||
|
|
||||||
|
|
|
@ -111,7 +111,6 @@ bool Wddm::init() {
|
||||||
rootDeviceEnvironment.initGfxCoreHelper();
|
rootDeviceEnvironment.initGfxCoreHelper();
|
||||||
|
|
||||||
populateIpVersion(*hardwareInfo);
|
populateIpVersion(*hardwareInfo);
|
||||||
productHelper.adjustIpVersionIfNeeded(*rootDeviceEnvironment.getMutableHardwareInfo());
|
|
||||||
rootDeviceEnvironment.initReleaseHelper();
|
rootDeviceEnvironment.initReleaseHelper();
|
||||||
|
|
||||||
if (productHelper.configureHwInfoWddm(hardwareInfo, hardwareInfo, rootDeviceEnvironment)) {
|
if (productHelper.configureHwInfoWddm(hardwareInfo, hardwareInfo, rootDeviceEnvironment)) {
|
||||||
|
|
|
@ -138,15 +138,6 @@ bool ProductHelperHw<gfxProduct>::isAllocationSizeAdjustmentRequired(const Hardw
|
||||||
return DG2::isG10(hwInfo) && GfxCoreHelper::isWorkaroundRequired(REVISION_A0, REVISION_B, hwInfo, *this);
|
return DG2::isG10(hwInfo) && GfxCoreHelper::isWorkaroundRequired(REVISION_A0, REVISION_B, hwInfo, *this);
|
||||||
}
|
}
|
||||||
|
|
||||||
template <>
|
|
||||||
void ProductHelperHw<gfxProduct>::adjustIpVersionIfNeeded(HardwareInfo &hwInfo) const {
|
|
||||||
bool isIpVersionUninitialized = hwInfo.ipVersion.architecture == 0;
|
|
||||||
|
|
||||||
if (isIpVersionUninitialized) {
|
|
||||||
hwInfo.ipVersion.value = getHwIpVersion(hwInfo);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
template <>
|
template <>
|
||||||
std::pair<bool, bool> ProductHelperHw<gfxProduct>::isPipeControlPriorToNonPipelinedStateCommandsWARequired(const HardwareInfo &hwInfo, bool isRcs, const ReleaseHelper *releaseHelper) const {
|
std::pair<bool, bool> ProductHelperHw<gfxProduct>::isPipeControlPriorToNonPipelinedStateCommandsWARequired(const HardwareInfo &hwInfo, bool isRcs, const ReleaseHelper *releaseHelper) const {
|
||||||
auto isAcm = DG2::isG10(hwInfo) || DG2::isG11(hwInfo) || DG2::isG12(hwInfo);
|
auto isAcm = DG2::isG10(hwInfo) || DG2::isG11(hwInfo) || DG2::isG12(hwInfo);
|
||||||
|
|
|
@ -847,25 +847,3 @@ DG2TEST_F(ProductHelperTestDg2, givenDebugFlagWhenCheckingIsResolveDependenciesB
|
||||||
DG2TEST_F(ProductHelperTestDg2, givenProductHelperWhenCheckingIsBufferPoolAllocatorSupportedThenCorrectValueIsReturned) {
|
DG2TEST_F(ProductHelperTestDg2, givenProductHelperWhenCheckingIsBufferPoolAllocatorSupportedThenCorrectValueIsReturned) {
|
||||||
EXPECT_TRUE(productHelper->isBufferPoolAllocatorSupported());
|
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);
|
|
||||||
}
|
|
||||||
|
|
Loading…
Reference in New Issue