Remove not needed hwHelper

Signed-off-by: Kamil Kopryk <kamil.kopryk@intel.com>

Author: KamilKoprykIntel

opencl/test/unit_test/aub_tests/command_stream/aub_command_stream_fixture.h

@@ -60,7 +60,6 @@ class AUBCommandStreamFixture : public CommandStreamFixture {
         if (testMode == TestMode::AubTestsWithTbx) {
             auto tbxCsr = static_cast<CommandStreamReceiverSimulatedCommonHw<FamilyType> *>(pCommandStreamReceiver);
             EXPECT_TRUE(tbxCsr->expectMemoryEqual(gfxAddress, srcAddress, length));
-
             csr = static_cast<CommandStreamReceiverWithAUBDump<TbxCommandStreamReceiverHw<FamilyType>> *>(pCommandStreamReceiver)->aubCSR.get();
         }
 
@@ -76,7 +75,6 @@ class AUBCommandStreamFixture : public CommandStreamFixture {
         if (testMode == TestMode::AubTestsWithTbx) {
             auto tbxCsr = static_cast<CommandStreamReceiverSimulatedCommonHw<FamilyType> *>(pCommandStreamReceiver);
             EXPECT_TRUE(tbxCsr->expectMemoryNotEqual(gfxAddress, srcAddress, length));
-
             csr = static_cast<CommandStreamReceiverWithAUBDump<TbxCommandStreamReceiverHw<FamilyType>> *>(pCommandStreamReceiver)->aubCSR.get();
         }
 

opencl/test/unit_test/gmm_helper/gmm_helper_tests.cpp

@@ -351,18 +351,9 @@ TEST_F(GmmTests, givenNonZeroRowPitchWhenQueryImgFromBufferParamsThenUseUserValu
     EXPECT_EQ(imgInfo.rowPitch, expectedRowPitch);
 }
 
-struct GmmTestsCanonize : public GmmTests {
-    void SetUp() override {
-        uint32_t addressWidth = 48u;
-        HwHelper::get(renderCoreFamily).adjustAddressWidthForCanonize(addressWidth);
-        if (addressWidth != 48u) {
-            GTEST_SKIP();
-        }
-        GmmTests::SetUp();
-    }
-};
+using GmmCanonizeTests = GmmTests;
 
-TEST_F(GmmTestsCanonize, WhenCanonizingThenCorrectAddressIsReturned) {
+TEST_F(GmmCanonizeTests, WhenCanonizingThenCorrectAddressIsReturned) {
     auto hwInfo = *defaultHwInfo;
 
     // 48 bit - canonize to 48 bit
@@ -385,7 +376,7 @@ TEST_F(GmmTestsCanonize, WhenCanonizingThenCorrectAddressIsReturned) {
     EXPECT_EQ(GmmHelper::canonize(testAddr2), goodAddr2);
 }
 
-TEST_F(GmmTestsCanonize, WhenDecanonizingThenCorrectAddressIsReturned) {
+TEST_F(GmmCanonizeTests, WhenDecanonizingThenCorrectAddressIsReturned) {
     auto hwInfo = *defaultHwInfo;
 
     // 48 bit - decanonize to 48 bit

opencl/test/unit_test/helpers/hw_helper_tests.cpp

@@ -1158,14 +1158,6 @@ HWTEST_F(HwHelperTest, givenHwHelperWhenAskingForIsaSystemMemoryPlacementThenRet
     EXPECT_NE(localMemoryEnabled, hwHelper.useSystemMemoryPlacementForISA(hardwareInfo));
 }
 
-HWTEST_F(HwHelperTest, givenHwHelperWhenAdjustAddressWidthForCanonizeThenAddressWidthDoesntChange) {
-    HwHelper &hwHelper = HwHelper::get(hardwareInfo.platform.eRenderCoreFamily);
-    uint32_t addressWidth = 48;
-
-    hwHelper.adjustAddressWidthForCanonize(addressWidth);
-    EXPECT_EQ(48u, addressWidth);
-}
-
 TEST_F(HwHelperTest, givenInvalidEngineTypeWhenGettingEngineGroupTypeThenThrow) {
     HwHelper &hwHelper = HwHelper::get(hardwareInfo.platform.eRenderCoreFamily);
     EXPECT_ANY_THROW(hwHelper.getEngineGroupType(aub_stream::EngineType::NUM_ENGINES, hardwareInfo));

shared/source/gmm_helper/gmm_helper.cpp

@@ -37,7 +37,6 @@ uint32_t GmmHelper::getMOCS(uint32_t type) const {
 
 GmmHelper::GmmHelper(OSInterface *osInterface, const HardwareInfo *pHwInfo) : hwInfo(pHwInfo) {
     auto hwInfoAddressWidth = Math::log2(hwInfo->capabilityTable.gpuAddressSpace + 1);
-    HwHelper::get(hwInfo->platform.eRenderCoreFamily).adjustAddressWidthForCanonize(hwInfoAddressWidth);
     GmmHelper::addressWidth = std::max(hwInfoAddressWidth, static_cast<uint32_t>(48));
 
     gmmClientContext = GmmHelper::createGmmContextWrapperFunc(osInterface, const_cast<HardwareInfo *>(pHwInfo));

shared/source/helpers/hw_helper.h

@@ -132,7 +132,6 @@ class HwHelper {
     virtual bool isCooperativeDispatchSupported(const EngineGroupType engineGroupType, const PRODUCT_FAMILY productFamily) const = 0;
     virtual size_t getMaxFillPaternSizeForCopyEngine() const = 0;
     virtual bool isCopyOnlyEngineType(EngineGroupType type) const = 0;
-    virtual void adjustAddressWidthForCanonize(uint32_t &addressWidth) const = 0;
     virtual bool isSipWANeeded(const HardwareInfo &hwInfo) const = 0;
     virtual bool isDisableOverdispatchAvailable(const HardwareInfo &hwInfo) const = 0;
     virtual bool isCpuImageTransferPreferred(const HardwareInfo &hwInfo) const = 0;
@@ -355,8 +354,6 @@ class HwHelperHw : public HwHelper {
 
     bool isCopyOnlyEngineType(EngineGroupType type) const override;
 
-    void adjustAddressWidthForCanonize(uint32_t &addressWidth) const override;
-
     bool isSipWANeeded(const HardwareInfo &hwInfo) const override;
 
     bool isDisableOverdispatchAvailable(const HardwareInfo &hwInfo) const override;

shared/source/helpers/hw_helper_base.inl

@@ -621,10 +621,6 @@ bool HwHelperHw<GfxFamily>::isCopyOnlyEngineType(EngineGroupType type) const {
     return NEO::EngineGroupType::Copy == type;
 }
 
-template <typename GfxFamily>
-void HwHelperHw<GfxFamily>::adjustAddressWidthForCanonize(uint32_t &addressWidth) const {
-}
-
 template <typename GfxFamily>
 bool HwHelperHw<GfxFamily>::isSipWANeeded(const HardwareInfo &hwInfo) const {
     return false;