Remove HardwareCapabilities struct

Signed-off-by: Bartosz Dunajski <bartosz.dunajski@intel.com>

level_zero/core/test/unit_tests/sources/device/test_device.cpp

@@ -810,12 +810,11 @@ TEST_F(DeviceTest, givenCallToDevicePropertiesThenMaximumMemoryToBeAllocatedIsCo
     deviceProperties.maxMemAllocSize = 0;
     device->getProperties(&deviceProperties);
     EXPECT_EQ(deviceProperties.maxMemAllocSize, this->neoDevice->getDeviceInfo().maxMemAllocSize);
-    HardwareCapabilities hwCaps = {0};
+
     auto &hwHelper = HwHelper::get(defaultHwInfo->platform.eRenderCoreFamily);
-    hwHelper.setupHardwareCapabilities(&hwCaps, *defaultHwInfo);
     auto expectedSize = this->neoDevice->getDeviceInfo().globalMemSize;
     if (!this->neoDevice->getDeviceInfo().sharedSystemAllocationsSupport) {
-        expectedSize = std::min(expectedSize, hwCaps.maxMemAllocSize);
+        expectedSize = std::min(expectedSize, hwHelper.getMaxMemAllocSize());
     }
     EXPECT_EQ(deviceProperties.maxMemAllocSize, expectedSize);
 }

opencl/source/cl_device/cl_device.cpp

@@ -162,7 +162,6 @@ Debugger *ClDevice::getDebugger() { return device.getDebugger(); }
 SourceLevelDebugger *ClDevice::getSourceLevelDebugger() { return device.getSourceLevelDebugger(); }
 ExecutionEnvironment *ClDevice::getExecutionEnvironment() const { return device.getExecutionEnvironment(); }
 const RootDeviceEnvironment &ClDevice::getRootDeviceEnvironment() const { return device.getRootDeviceEnvironment(); }
-const HardwareCapabilities &ClDevice::getHardwareCapabilities() const { return device.getHardwareCapabilities(); }
 bool ClDevice::isFullRangeSvm() const { return device.isFullRangeSvm(); }
 bool ClDevice::areSharedSystemAllocationsAllowed() const { return device.areSharedSystemAllocationsAllowed(); }
 uint32_t ClDevice::getRootDeviceIndex() const { return device.getRootDeviceIndex(); }

opencl/source/cl_device/cl_device.h

@@ -33,7 +33,6 @@ class Platform;
 class SourceLevelDebugger;
 struct DeviceInfo;
 struct EngineControl;
-struct HardwareCapabilities;
 struct HardwareInfo;
 struct RootDeviceEnvironment;
 struct SelectorCopyEngine;
@@ -85,7 +84,6 @@ class ClDevice : public BaseObject<_cl_device_id> {
     SourceLevelDebugger *getSourceLevelDebugger();
     ExecutionEnvironment *getExecutionEnvironment() const;
     const RootDeviceEnvironment &getRootDeviceEnvironment() const;
-    const HardwareCapabilities &getHardwareCapabilities() const;
     bool isFullRangeSvm() const;
     bool areSharedSystemAllocationsAllowed() const;
     uint32_t getRootDeviceIndex() const;

opencl/source/cl_device/cl_device_caps.cpp

@@ -331,8 +331,8 @@ void ClDevice::initializeCaps() {
 
     deviceInfo.localMemType = CL_LOCAL;
 
-    deviceInfo.image3DMaxWidth = this->getHardwareCapabilities().image3DMaxWidth;
+    deviceInfo.image3DMaxWidth = hwHelper.getMax3dImageWidthOrHeight();
-    deviceInfo.image3DMaxHeight = this->getHardwareCapabilities().image3DMaxHeight;
+    deviceInfo.image3DMaxHeight = hwHelper.getMax3dImageWidthOrHeight();
 
     // cl_khr_image2d_from_buffer
     deviceInfo.imagePitchAlignment = hwHelper.getPitchAlignmentForImage(&hwInfo);

opencl/source/program/program.cpp

@@ -83,7 +83,7 @@ void Program::initInternalOptions(std::string &internalOptions) const {
         CompilerOptions::concatenateAppend(internalOptions, CompilerOptions::bindlessMode);
     }
 
-    auto enableStatelessToStatefullWithOffset = pClDevice->getHardwareCapabilities().isStatelesToStatefullWithOffsetSupported;
+    auto enableStatelessToStatefullWithOffset = HwHelper::get(pClDevice->getHardwareInfo().platform.eRenderCoreFamily).isStatelesToStatefullWithOffsetSupported();
     if (DebugManager.flags.EnableStatelessToStatefulBufferOffsetOpt.get() != -1) {
         enableStatelessToStatefullWithOffset = DebugManager.flags.EnableStatelessToStatefulBufferOffsetOpt.get() != 0;
     }

opencl/test/unit_test/command_queue/command_enqueue_fixture.h

@@ -117,7 +117,7 @@ struct CommandQueueStateful : public CommandQueueHw<FamilyType> {
         auto &device = dispatchInfo.begin()->getClDevice();
         if (!device.areSharedSystemAllocationsAllowed()) {
             EXPECT_FALSE(kernel->getKernelInfo().kernelDescriptor.kernelAttributes.supportsBuffersBiggerThan4Gb());
-            if (device.getHardwareCapabilities().isStatelesToStatefullWithOffsetSupported) {
+            if (HwHelperHw<FamilyType>::get().isStatelesToStatefullWithOffsetSupported()) {
                 EXPECT_TRUE(kernel->allBufferArgsStateful);
             }
         } else {

opencl/test/unit_test/device/device_caps_tests.cpp

@@ -504,18 +504,14 @@ TEST_F(DeviceGetCapsTest, givenDeviceCapsWhenLocalMemoryIsEnabledThenCalculateGl
     EXPECT_EQ(sharedCaps.globalMemSize, expectedSize);
 }
 
-TEST_F(DeviceGetCapsTest, givenGlobalMemSizeAndSharedSystemAllocationsNotSupportedWhenCalculatingMaxAllocSizeThenAdjustToHWCap) {
+HWTEST_F(DeviceGetCapsTest, givenGlobalMemSizeAndSharedSystemAllocationsNotSupportedWhenCalculatingMaxAllocSizeThenAdjustToHWCap) {
     DebugManagerStateRestore dbgRestorer;
     DebugManager.flags.EnableSharedSystemUsmSupport.set(0);
     auto device = std::make_unique<MockClDevice>(MockDevice::createWithNewExecutionEnvironment<MockDevice>(defaultHwInfo.get()));
     const auto &caps = device->getSharedDeviceInfo();
 
-    HardwareCapabilities hwCaps = {0};
-    auto &hwHelper = HwHelper::get(defaultHwInfo->platform.eRenderCoreFamily);
-    hwHelper.setupHardwareCapabilities(&hwCaps, *defaultHwInfo);
-
     uint64_t expectedSize = std::max((caps.globalMemSize / 2), static_cast<uint64_t>(128ULL * MemoryConstants::megaByte));
-    expectedSize = std::min(expectedSize, hwCaps.maxMemAllocSize);
+    expectedSize = std::min(expectedSize, HwHelperHw<FamilyType>::get().getMaxMemAllocSize());
     EXPECT_EQ(caps.maxMemAllocSize, expectedSize);
 }
 

opencl/test/unit_test/gen11/hw_helper_tests_gen11.cpp

@@ -31,13 +31,6 @@ GEN11TEST_F(HwHelperTestGen11, WhenAdjustingDefaultEngineTypeThenEngineTypeIsSet
     EXPECT_EQ(engineType, hardwareInfo.capabilityTable.defaultEngineType);
 }
 
-GEN11TEST_F(HwHelperTestGen11, givenGen11PlatformWhenSetupHardwareCapabilitiesIsCalledThenDefaultImplementationIsUsed) {
-    auto &helper = HwHelper::get(renderCoreFamily);
-
-    // Test default method implementation
-    testDefaultImplementationOfSetupHardwareCapabilities(helper, hardwareInfo);
-}
-
 GEN11TEST_F(HwHelperTestGen11, whenGetGpgpuEnginesThenReturnThreeRcsEngines) {
     whenGetGpgpuEnginesThenReturnTwoRcsEngines<FamilyType>(pDevice->getHardwareInfo());
     EXPECT_EQ(3u, pDevice->engines.size());

opencl/test/unit_test/gen12lp/dg1/hw_helper_tests_dg1.cpp

@@ -14,18 +14,6 @@
 
 using HwHelperTestDg1 = HwHelperTest;
 
-DG1TEST_F(HwHelperTestDg1, givenDg1PlatformWhenSetupHardwareCapabilitiesIsCalledThenThenSpecificImplementationIsUsed) {
-    hardwareInfo.featureTable.ftrLocalMemory = true;
-
-    HardwareCapabilities hwCaps = {0};
-    auto &helper = HwHelper::get(renderCoreFamily);
-    helper.setupHardwareCapabilities(&hwCaps, hardwareInfo);
-
-    EXPECT_EQ(2048u, hwCaps.image3DMaxHeight);
-    EXPECT_EQ(2048u, hwCaps.image3DMaxWidth);
-    EXPECT_TRUE(hwCaps.isStatelesToStatefullWithOffsetSupported);
-}
-
 DG1TEST_F(HwHelperTestDg1, givenDg1A0WhenAdjustDefaultEngineTypeCalledThenRcsIsReturned) {
     auto &helper = HwHelper::get(renderCoreFamily);
     const auto &hwInfoConfig = *HwInfoConfig::get(productFamily);

opencl/test/unit_test/gen12lp/hw_helper_tests_gen12lp.inl

@@ -58,17 +58,6 @@ GEN12LPTEST_F(HwHelperTestGen12Lp, WhenAdjustingDefaultEngineTypeThenRcsIsSet) {
     EXPECT_EQ(aub_stream::ENGINE_RCS, hardwareInfo.capabilityTable.defaultEngineType);
 }
 
-GEN12LPTEST_F(HwHelperTestGen12Lp, givenGen12LpPlatformWhenSetupHardwareCapabilitiesIsCalledThenShouldSetCorrectValues) {
-    HardwareCapabilities hwCaps = {0};
-
-    auto &hwHelper = HwHelper::get(renderCoreFamily);
-    hwHelper.setupHardwareCapabilities(&hwCaps, hardwareInfo);
-
-    EXPECT_EQ(2048u, hwCaps.image3DMaxHeight);
-    EXPECT_EQ(2048u, hwCaps.image3DMaxWidth);
-    EXPECT_TRUE(hwCaps.isStatelesToStatefullWithOffsetSupported);
-}
-
 GEN12LPTEST_F(HwHelperTestGen12Lp, givenDifferentSizesOfAllocationWhenCheckingCompressionPreferenceThenReturnCorrectValue) {
     auto &helper = HwHelper::get(renderCoreFamily);
 

opencl/test/unit_test/gen8/hw_helper_tests_gen8.cpp

@@ -34,17 +34,6 @@ GEN8TEST_F(HwHelperTestGen8, WhenAdjustingDefaultEngineTypeThenEngineTypeIsSet)
     EXPECT_EQ(engineType, hardwareInfo.capabilityTable.defaultEngineType);
 }
 
-GEN8TEST_F(HwHelperTestGen8, givenGen8PlatformWhenSetupHardwareCapabilitiesIsCalledThenSpecificImplementationIsUsed) {
-    auto &helper = HwHelper::get(renderCoreFamily);
-    HardwareCapabilities hwCaps = {0};
-    helper.setupHardwareCapabilities(&hwCaps, hardwareInfo);
-
-    EXPECT_EQ(2048u, hwCaps.image3DMaxHeight);
-    EXPECT_EQ(2048u, hwCaps.image3DMaxWidth);
-    EXPECT_EQ(2 * MemoryConstants::gigaByte - 8 * MemoryConstants::megaByte, hwCaps.maxMemAllocSize);
-    EXPECT_FALSE(hwCaps.isStatelesToStatefullWithOffsetSupported);
-}
-
 GEN8TEST_F(HwHelperTestGen8, whenGetGpgpuEnginesThenReturnThreeEngines) {
     whenGetGpgpuEnginesThenReturnTwoRcsEngines<FamilyType>(pDevice->getHardwareInfo());
     EXPECT_EQ(3u, pDevice->engines.size());

opencl/test/unit_test/gen9/hw_helper_tests_gen9.cpp

@@ -36,13 +36,6 @@ GEN9TEST_F(HwHelperTestGen9, WhenAdjustingDefaultEngineTypeThenEngineTypeIsSet)
     EXPECT_EQ(engineType, hardwareInfo.capabilityTable.defaultEngineType);
 }
 
-GEN9TEST_F(HwHelperTestGen9, givenGen9PlatformWhenSetupHardwareCapabilitiesIsCalledThenDefaultImplementationIsUsed) {
-    auto &helper = HwHelper::get(renderCoreFamily);
-
-    // Test default method implementation
-    testDefaultImplementationOfSetupHardwareCapabilities(helper, hardwareInfo);
-}
-
 GEN9TEST_F(HwHelperTestGen9, givenDebuggingActiveWhenSipKernelTypeIsQueriedThenDbgCsrLocalTypeIsReturned) {
     auto &helper = HwHelper::get(renderCoreFamily);
 

opencl/test/unit_test/helpers/hw_helper_default_tests.cpp

@@ -9,16 +9,6 @@
 
 #include "opencl/test/unit_test/helpers/hw_helper_tests.h"
 
-void testDefaultImplementationOfSetupHardwareCapabilities(HwHelper &hwHelper, const HardwareInfo &hwInfo) {
-    HardwareCapabilities hwCaps = {0};
-
-    hwHelper.setupHardwareCapabilities(&hwCaps, hwInfo);
-
-    EXPECT_EQ(16384u, hwCaps.image3DMaxHeight);
-    EXPECT_EQ(16384u, hwCaps.image3DMaxWidth);
-    EXPECT_TRUE(hwCaps.isStatelesToStatefullWithOffsetSupported);
-}
-
 HWCMDTEST_F(IGFX_GEN8_CORE, HwHelperTest, givenHwHelperWhenAskedForHvAlign4RequiredThenReturnTrue) {
     auto &hwHelper = HwHelper::get(pDevice->getHardwareInfo().platform.eRenderCoreFamily);
     EXPECT_TRUE(hwHelper.hvAlign4Required());

opencl/test/unit_test/helpers/hw_helper_tests.h

@@ -18,8 +18,6 @@ using namespace NEO;
 
 using HwHelperTest = Test<ClDeviceFixture>;
 
-void testDefaultImplementationOfSetupHardwareCapabilities(HwHelper &hwHelper, const HardwareInfo &hwInfo);
-
 struct ComputeSlmTestInput {
     uint32_t expected;
     uint32_t slmSize;

opencl/test/unit_test/helpers/hw_helper_tests_xehp_and_later.cpp

@@ -57,18 +57,6 @@ HWCMDTEST_F(IGFX_XE_HP_CORE, HwHelperTestXeHPAndLater, GiveCcsNodeThenDefaultEng
     EXPECT_EQ(aub_stream::ENGINE_CCS, hardwareInfo.capabilityTable.defaultEngineType);
 }
 
-HWCMDTEST_F(IGFX_XE_HP_CORE, HwHelperTestXeHPAndLater, givenXeHPAndLaterPlatformWhenSetupHardwareCapabilitiesIsCalledThenThenSpecificImplementationIsUsed) {
-    hardwareInfo.featureTable.ftrLocalMemory = true;
-
-    HardwareCapabilities hwCaps = {0};
-    auto &helper = HwHelper::get(renderCoreFamily);
-    helper.setupHardwareCapabilities(&hwCaps, hardwareInfo);
-
-    EXPECT_EQ(16384u, hwCaps.image3DMaxHeight);
-    EXPECT_EQ(16384u, hwCaps.image3DMaxWidth);
-    EXPECT_TRUE(hwCaps.isStatelesToStatefullWithOffsetSupported);
-}
-
 HWCMDTEST_F(IGFX_XE_HP_CORE, HwHelperTestXeHPAndLater, givenXeHPAndLaterPlatformWithLocalMemoryFeatureWhenIsLocalMemoryEnabledIsCalledThenTrueIsReturned) {
     hardwareInfo.featureTable.ftrLocalMemory = true;
 

opencl/test/unit_test/program/program_tests.cpp

@@ -2210,13 +2210,11 @@ TEST_F(Program32BitTests, givenDeviceWithForce32BitAddressingOnWhenProgramIsCrea
     }
 }
 
-TEST_F(ProgramTests, givenNewProgramThenStatelessToStatefulBufferOffsetOptimizationIsMatchingThePlatformEnablingStatus) {
+HWTEST_F(ProgramTests, givenNewProgramThenStatelessToStatefulBufferOffsetOptimizationIsMatchingThePlatformEnablingStatus) {
     MockProgram program(pContext, false, toClDeviceVector(*pClDevice));
     auto internalOptions = program.getInitInternalOptions();
 
-    HardwareCapabilities hwCaps = {0};
+    if (HwHelperHw<FamilyType>::get().isStatelesToStatefullWithOffsetSupported()) {
-    HwHelper::get(pDevice->getHardwareInfo().platform.eRenderCoreFamily).setupHardwareCapabilities(&hwCaps, pDevice->getHardwareInfo());
-    if (hwCaps.isStatelesToStatefullWithOffsetSupported) {
         EXPECT_TRUE(CompilerOptions::contains(internalOptions, CompilerOptions::hasBufferOffsetArg));
     } else {
         EXPECT_FALSE(CompilerOptions::contains(internalOptions, CompilerOptions::hasBufferOffsetArg));

shared/source/device/device.cpp

@@ -204,8 +204,6 @@ bool Device::createDeviceImpl() {
     auto &hwInfo = getHardwareInfo();
     preemptionMode = PreemptionHelper::getDefaultPreemptionMode(hwInfo);
 
-    auto &hwHelper = HwHelper::get(hwInfo.platform.eRenderCoreFamily);
-    hwHelper.setupHardwareCapabilities(&this->hardwareCapabilities, hwInfo);
     executionEnvironment->rootDeviceEnvironments[getRootDeviceIndex()]->initGmm();
 
     if (!getDebugger()) {

shared/source/device/device.h

@@ -88,7 +88,6 @@ class Device : public ReferenceTrackedObject<Device> {
     ExecutionEnvironment *getExecutionEnvironment() const { return executionEnvironment; }
     const RootDeviceEnvironment &getRootDeviceEnvironment() const { return *executionEnvironment->rootDeviceEnvironments[getRootDeviceIndex()]; }
     RootDeviceEnvironment &getRootDeviceEnvironmentRef() const { return *executionEnvironment->rootDeviceEnvironments[getRootDeviceIndex()]; }
-    const HardwareCapabilities &getHardwareCapabilities() const { return hardwareCapabilities; }
     bool isFullRangeSvm() const {
         return getRootDeviceEnvironment().isFullRangeSvm();
     }
@@ -161,7 +160,6 @@ class Device : public ReferenceTrackedObject<Device> {
 
     DeviceInfo deviceInfo = {};
 
-    HardwareCapabilities hardwareCapabilities = {};
     std::unique_ptr<PerformanceCounters> performanceCounters;
     std::vector<std::unique_ptr<CommandStreamReceiver>> commandStreamReceivers;
     std::vector<EngineControl> engines;

shared/source/device/device_caps.cpp

@@ -74,7 +74,7 @@ void Device::initializeCaps() {
 
     if (!deviceInfo.sharedSystemAllocationsSupport) {
         deviceInfo.maxMemAllocSize = ApiSpecificConfig::getReducedMaxAllocSize(deviceInfo.maxMemAllocSize);
-        deviceInfo.maxMemAllocSize = std::min(deviceInfo.maxMemAllocSize, this->hardwareCapabilities.maxMemAllocSize);
+        deviceInfo.maxMemAllocSize = std::min(deviceInfo.maxMemAllocSize, hwHelper.getMaxMemAllocSize());
     }
 
     // Some specific driver model configurations may impose additional limitations

shared/source/gen12lp/hw_helper_gen12lp.cpp

@@ -21,13 +21,8 @@ using Family = NEO::TGLLPFamily;
 namespace NEO {
 
 template <>
-void HwHelperHw<Family>::setupHardwareCapabilities(HardwareCapabilities *caps, const HardwareInfo &hwInfo) {
+size_t HwHelperHw<Family>::getMax3dImageWidthOrHeight() const {
-    caps->image3DMaxHeight = 2048;
+    return 2048;
-    caps->image3DMaxWidth = 2048;
-    //With statefull messages we have an allocation cap of 4GB
-    //Reason to subtract 8KB is that driver may pad the buffer with addition pages for over fetching..
-    caps->maxMemAllocSize = (4ULL * MemoryConstants::gigaByte) - (8ULL * MemoryConstants::kiloByte);
-    caps->isStatelesToStatefullWithOffsetSupported = true;
 }
 
 template <>

shared/source/gen8/hw_helper_gen8.cpp

@@ -42,11 +42,18 @@ size_t HwHelperHw<Family>::getMaxBarrierRegisterPerSlice() const {
 }
 
 template <>
-void HwHelperHw<Family>::setupHardwareCapabilities(HardwareCapabilities *caps, const HardwareInfo &hwInfo) {
+size_t HwHelperHw<Family>::getMax3dImageWidthOrHeight() const {
-    caps->image3DMaxHeight = 2048;
+    return 2048;
-    caps->image3DMaxWidth = 2048;
+}
-    caps->maxMemAllocSize = 2 * MemoryConstants::gigaByte - 8 * MemoryConstants::megaByte;
+
-    caps->isStatelesToStatefullWithOffsetSupported = false;
+template <>
+uint64_t HwHelperHw<Family>::getMaxMemAllocSize() const {
+    return (2 * MemoryConstants::gigaByte) - (8 * MemoryConstants::kiloByte);
+}
+
+template <>
+bool HwHelperHw<Family>::isStatelesToStatefullWithOffsetSupported() const {
+    return false;
 }
 
 template <>

shared/source/helpers/hw_helper.h

@@ -32,7 +32,6 @@ class Gmm;
 struct AllocationData;
 struct AllocationProperties;
 struct EngineControl;
-struct HardwareCapabilities;
 struct RootDeviceEnvironment;
 struct PipeControlArgs;
 
@@ -49,7 +48,6 @@ class HwHelper {
     virtual uint32_t getPitchAlignmentForImage(const HardwareInfo *hwInfo) const = 0;
     virtual uint32_t getMaxNumSamplers() const = 0;
     virtual void adjustDefaultEngineType(HardwareInfo *pHwInfo) = 0;
-    virtual void setupHardwareCapabilities(HardwareCapabilities *caps, const HardwareInfo &hwInfo) = 0;
     virtual bool isL3Configurable(const HardwareInfo &hwInfo) = 0;
     virtual SipKernelType getSipKernelType(bool debuggingActive) const = 0;
     virtual bool isLocalMemoryEnabled(const HardwareInfo &hwInfo) const = 0;
@@ -147,6 +145,9 @@ class HwHelper {
 
     virtual bool isScratchSpaceSurfaceStateAccessible() const = 0;
     virtual uint64_t getRenderSurfaceStateBaseAddress(void *renderSurfaceState) const = 0;
+    virtual size_t getMax3dImageWidthOrHeight() const = 0;
+    virtual uint64_t getMaxMemAllocSize() const = 0;
+    virtual bool isStatelesToStatefullWithOffsetSupported() const = 0;
 
   protected:
     HwHelper() = default;
@@ -213,8 +214,6 @@ class HwHelperHw : public HwHelper {
 
     void adjustDefaultEngineType(HardwareInfo *pHwInfo) override;
 
-    void setupHardwareCapabilities(HardwareCapabilities *caps, const HardwareInfo &hwInfo) override;
-
     bool isL3Configurable(const HardwareInfo &hwInfo) override;
 
     SipKernelType getSipKernelType(bool debuggingActive) const override;
@@ -370,6 +369,10 @@ class HwHelperHw : public HwHelper {
     bool isScratchSpaceSurfaceStateAccessible() const override;
     uint64_t getRenderSurfaceStateBaseAddress(void *renderSurfaceState) const override;
 
+    size_t getMax3dImageWidthOrHeight() const override;
+    uint64_t getMaxMemAllocSize() const override;
+    bool isStatelesToStatefullWithOffsetSupported() const override;
+
   protected:
     static const AuxTranslationMode defaultAuxTranslationMode;
     HwHelperHw() = default;

shared/source/helpers/hw_helper_base.inl

@@ -38,13 +38,20 @@ bool HwHelperHw<Family>::isBufferSizeSuitableForRenderCompression(const size_t s
 }
 
 template <typename Family>
-void HwHelperHw<Family>::setupHardwareCapabilities(HardwareCapabilities *caps, const HardwareInfo &hwInfo) {
+size_t HwHelperHw<Family>::getMax3dImageWidthOrHeight() const {
-    caps->image3DMaxHeight = 16384;
+    return 16384;
-    caps->image3DMaxWidth = 16384;
+}
+
+template <typename Family>
+uint64_t HwHelperHw<Family>::getMaxMemAllocSize() const {
     //With statefull messages we have an allocation cap of 4GB
     //Reason to subtract 8KB is that driver may pad the buffer with addition pages for over fetching..
-    caps->maxMemAllocSize = (4ULL * MemoryConstants::gigaByte) - (8ULL * MemoryConstants::kiloByte);
+    return (4ULL * MemoryConstants::gigaByte) - (8ULL * MemoryConstants::kiloByte);
-    caps->isStatelesToStatefullWithOffsetSupported = true;
+}
+
+template <typename Family>
+bool HwHelperHw<Family>::isStatelesToStatefullWithOffsetSupported() const {
+    return true;
 }
 
 template <typename Family>

shared/source/helpers/hw_info.h

@@ -68,13 +68,6 @@ struct RuntimeCapabilityTable {
     bool fusedEuEnabled;
 };
 
-struct HardwareCapabilities {
-    size_t image3DMaxWidth;
-    size_t image3DMaxHeight;
-    uint64_t maxMemAllocSize;
-    bool isStatelesToStatefullWithOffsetSupported;
-};
-
 struct HardwareInfo {
     HardwareInfo() = default;
     HardwareInfo(const PLATFORM *platform, const FeatureTable *featureTable, const WorkaroundTable *workaroundTable,