From 4426d9d9711c0eea495d759d063382cfdeb574f3 Mon Sep 17 00:00:00 2001
From: Kamil Kopryk <kamil.kopryk@intel.com>
Date: Wed, 17 Nov 2021 15:37:03 +0000
Subject: [PATCH] Remove getSharedSystemMemCapabilities from hwInfoConfig
 helper

Signed-off-by: Kamil Kopryk <kamil.kopryk@intel.com>
Related-To: NEO-6075
---
 opencl/source/cl_device/cl_device_caps.cpp       | 2 +-
 shared/source/os_interface/hw_info_config.h      | 2 --
 shared/source/os_interface/hw_info_config.inl    | 5 -----
 shared/test/common/mocks/mock_hw_info_config.cpp | 5 -----
 4 files changed, 1 insertion(+), 13 deletions(-)

diff --git a/opencl/source/cl_device/cl_device_caps.cpp b/opencl/source/cl_device/cl_device_caps.cpp
index c5ac65fefd..be3033fb08 100644
--- a/opencl/source/cl_device/cl_device_caps.cpp
+++ b/opencl/source/cl_device/cl_device_caps.cpp
@@ -426,7 +426,7 @@ void ClDevice::initializeCaps() {
     deviceInfo.deviceMemCapabilities = hwInfoConfig->getDeviceMemCapabilities();
     deviceInfo.singleDeviceSharedMemCapabilities = hwInfoConfig->getSingleDeviceSharedMemCapabilities();
     deviceInfo.crossDeviceSharedMemCapabilities = hwInfoConfig->getCrossDeviceSharedMemCapabilities();
-    deviceInfo.sharedSystemMemCapabilities = hwInfoConfig->getSharedSystemMemCapabilities();
+    deviceInfo.sharedSystemMemCapabilities = hwInfo.capabilityTable.sharedSystemMemCapabilities;
     if (DebugManager.flags.EnableSharedSystemUsmSupport.get() != -1) {
         if (DebugManager.flags.EnableSharedSystemUsmSupport.get() == 0) {
             deviceInfo.sharedSystemMemCapabilities = 0u;
diff --git a/shared/source/os_interface/hw_info_config.h b/shared/source/os_interface/hw_info_config.h
index 8e994fa911..6609e50d19 100644
--- a/shared/source/os_interface/hw_info_config.h
+++ b/shared/source/os_interface/hw_info_config.h
@@ -39,7 +39,6 @@ class HwInfoConfig {
     virtual uint64_t getCrossDeviceSharedMemCapabilities() = 0;
     virtual void getKernelExtendedProperties(uint32_t *fp16, uint32_t *fp32, uint32_t *fp64) = 0;
     virtual std::vector<uint32_t> getKernelSupportedThreadArbitrationPolicies() = 0;
-    virtual uint64_t getSharedSystemMemCapabilities() = 0;
     virtual void convertTimestampsFromOaToCsDomain(uint64_t &timestampData) = 0;
     virtual uint32_t getDeviceMemoryMaxClkRate(const HardwareInfo *hwInfo) = 0;
     virtual bool isAdditionalStateBaseAddressWARequired(const HardwareInfo &hwInfo) const = 0;
@@ -101,7 +100,6 @@ class HwInfoConfigHw : public HwInfoConfig {
     uint64_t getCrossDeviceSharedMemCapabilities() override;
     void getKernelExtendedProperties(uint32_t *fp16, uint32_t *fp32, uint32_t *fp64) override;
     std::vector<uint32_t> getKernelSupportedThreadArbitrationPolicies() override;
-    uint64_t getSharedSystemMemCapabilities() override;
     void convertTimestampsFromOaToCsDomain(uint64_t &timestampData) override;
     uint32_t getDeviceMemoryMaxClkRate(const HardwareInfo *hwInfo) override;
     bool isAdditionalStateBaseAddressWARequired(const HardwareInfo &hwInfo) const override;
diff --git a/shared/source/os_interface/hw_info_config.inl b/shared/source/os_interface/hw_info_config.inl
index c7e1d51cf1..5031a74a19 100644
--- a/shared/source/os_interface/hw_info_config.inl
+++ b/shared/source/os_interface/hw_info_config.inl
@@ -34,11 +34,6 @@ std::vector<uint32_t> HwInfoConfigHw<gfxProduct>::getKernelSupportedThreadArbitr
     return PreambleHelper<GfxFamily>::getSupportedThreadArbitrationPolicies();
 }
 
-template <PRODUCT_FAMILY gfxProduct>
-uint64_t HwInfoConfigHw<gfxProduct>::getSharedSystemMemCapabilities() {
-    return 0;
-}
-
 template <PRODUCT_FAMILY gfxProduct>
 void HwInfoConfigHw<gfxProduct>::convertTimestampsFromOaToCsDomain(uint64_t &timestampData){};
 
diff --git a/shared/test/common/mocks/mock_hw_info_config.cpp b/shared/test/common/mocks/mock_hw_info_config.cpp
index cd6815e729..587d446fd0 100644
--- a/shared/test/common/mocks/mock_hw_info_config.cpp
+++ b/shared/test/common/mocks/mock_hw_info_config.cpp
@@ -37,11 +37,6 @@ template <>
 void HwInfoConfigHw<IGFX_UNKNOWN>::adjustPlatformForProductFamily(HardwareInfo *hwInfo) {
 }
 
-template <>
-uint64_t HwInfoConfigHw<IGFX_UNKNOWN>::getSharedSystemMemCapabilities() {
-    return 0;
-}
-
 template <>
 uint64_t HwInfoConfigHw<IGFX_UNKNOWN>::getHostMemCapabilities(const HardwareInfo *hwInfo) {
     return 0;