Skip to content

Commit 8529775

Browse files
Pass HardwareInfo to HwInfoConfig::getHostMemCapabilites() method
Resolves: NEO-4663 Change-Id: Ie87880cfc9de1d8950d59265db16e78464043ee6 Signed-off-by: Igor Venevtsev <igor.venevtsev@intel.com>
1 parent 0398342 commit 8529775

File tree

5 files changed

+6
-6
lines changed

5 files changed

+6
-6
lines changed

opencl/source/cl_device/cl_device_caps.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -341,7 +341,7 @@ void ClDevice::initializeCaps() {
341341
deviceInfo.preferredLocalAtomicAlignment = MemoryConstants::cacheLineSize;
342342
deviceInfo.preferredPlatformAtomicAlignment = MemoryConstants::cacheLineSize;
343343

344-
deviceInfo.hostMemCapabilities = hwInfoConfig->getHostMemCapabilities();
344+
deviceInfo.hostMemCapabilities = hwInfoConfig->getHostMemCapabilities(&hwInfo);
345345
deviceInfo.deviceMemCapabilities = hwInfoConfig->getDeviceMemCapabilities();
346346
deviceInfo.singleDeviceSharedMemCapabilities = hwInfoConfig->getSingleDeviceSharedMemCapabilities();
347347
deviceInfo.crossDeviceSharedMemCapabilities = hwInfoConfig->getCrossDeviceSharedMemCapabilities();

opencl/test/unit_test/os_interface/linux/hw_info_config_linux_tests.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ void HwInfoConfigHw<IGFX_UNKNOWN>::adjustPlatformForProductFamily(HardwareInfo *
4848
}
4949

5050
template <>
51-
cl_unified_shared_memory_capabilities_intel HwInfoConfigHw<IGFX_UNKNOWN>::getHostMemCapabilities() {
51+
cl_unified_shared_memory_capabilities_intel HwInfoConfigHw<IGFX_UNKNOWN>::getHostMemCapabilities(const HardwareInfo * /*hwInfo*/) {
5252
return 0;
5353
}
5454

opencl/test/unit_test/os_interface/windows/hw_info_config_win_tests.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
namespace NEO {
2020

2121
template <>
22-
uint64_t HwInfoConfigHw<IGFX_UNKNOWN>::getHostMemCapabilities() {
22+
uint64_t HwInfoConfigHw<IGFX_UNKNOWN>::getHostMemCapabilities(const HardwareInfo * /*hwInfo*/) {
2323
return 0;
2424
}
2525

shared/source/os_interface/hw_info_config.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ class HwInfoConfig {
2828
int configureHwInfo(const HardwareInfo *inHwInfo, HardwareInfo *outHwInfo, OSInterface *osIface);
2929
virtual int configureHardwareCustom(HardwareInfo *hwInfo, OSInterface *osIface) = 0;
3030
virtual void adjustPlatformForProductFamily(HardwareInfo *hwInfo) = 0;
31-
virtual uint64_t getHostMemCapabilities() = 0;
31+
virtual uint64_t getHostMemCapabilities(const HardwareInfo *hwInfo) = 0;
3232
virtual uint64_t getDeviceMemCapabilities() = 0;
3333
virtual uint64_t getSingleDeviceSharedMemCapabilities() = 0;
3434
virtual uint64_t getCrossDeviceSharedMemCapabilities() = 0;
@@ -45,7 +45,7 @@ class HwInfoConfigHw : public HwInfoConfig {
4545
}
4646
int configureHardwareCustom(HardwareInfo *hwInfo, OSInterface *osIface) override;
4747
void adjustPlatformForProductFamily(HardwareInfo *hwInfo) override;
48-
uint64_t getHostMemCapabilities() override;
48+
uint64_t getHostMemCapabilities(const HardwareInfo *hwInfo) override;
4949
uint64_t getDeviceMemCapabilities() override;
5050
uint64_t getSingleDeviceSharedMemCapabilities() override;
5151
uint64_t getCrossDeviceSharedMemCapabilities() override;

shared/source/os_interface/hw_info_config_bdw_plus.inl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99

1010
namespace NEO {
1111
template <PRODUCT_FAMILY gfxProduct>
12-
uint64_t HwInfoConfigHw<gfxProduct>::getHostMemCapabilities() {
12+
uint64_t HwInfoConfigHw<gfxProduct>::getHostMemCapabilities(const HardwareInfo * /*hwInfo*/) {
1313
return (UNIFIED_SHARED_MEMORY_ACCESS | UNIFIED_SHARED_MEMORY_ATOMIC_ACCESS);
1414
}
1515

0 commit comments

Comments
 (0)