Add HardwareInfo argument to setupHardwareCapabilities method

HoppeMateusz · Compute-Runtime-Automation · commit 83537d55bfad · 2018-08-24T08:30:52.000+02:00
Change-Id: Iaf75459402d4f1ec3048646d646b130dcc710b2f
diff --git a/runtime/device/device.cpp b/runtime/device/device.cpp
@@ -93,7 +93,7 @@ Device::Device(const HardwareInfo &hwInfo, ExecutionEnvironment *executionEnviro
     }
     this->executionEnvironment->incRefInternal();
     auto &hwHelper = HwHelper::get(hwInfo.pPlatform->eRenderCoreFamily);
-    hwHelper.setupHardwareCapabilities(&this->hardwareCapabilities);
+    hwHelper.setupHardwareCapabilities(&this->hardwareCapabilities, hwInfo);
 }
 
 Device::~Device() {
diff --git a/runtime/gen8/hw_helper_gen8.cpp b/runtime/gen8/hw_helper_gen8.cpp
@@ -38,7 +38,7 @@ bool HwHelperHw<Family>::setupPreemptionRegisters(HardwareInfo *pHwInfo, bool en
 }
 
 template <>
-void HwHelperHw<Family>::setupHardwareCapabilities(HardwareCapabilities *caps) {
+void HwHelperHw<Family>::setupHardwareCapabilities(HardwareCapabilities *caps, const HardwareInfo &hwInfo) {
     caps->image3DMaxHeight = 2048;
     caps->image3DMaxWidth = 2048;
     caps->maxMemAllocSize = 2 * MemoryConstants::gigaByte - 8 * MemoryConstants::megaByte;
diff --git a/runtime/helpers/hw_helper.h b/runtime/helpers/hw_helper.h
@@ -43,7 +43,7 @@ class HwHelper {
     virtual void setCapabilityCoherencyFlag(const HardwareInfo *pHwInfo, bool &coherencyFlag) = 0;
     virtual bool setupPreemptionRegisters(HardwareInfo *pHwInfo, bool enable) = 0;
     virtual void adjustDefaultEngineType(HardwareInfo *pHwInfo) = 0;
-    virtual void setupHardwareCapabilities(HardwareCapabilities *caps) = 0;
+    virtual void setupHardwareCapabilities(HardwareCapabilities *caps, const HardwareInfo &hwInfo) = 0;
     virtual SipKernelType getSipKernelType(bool debuggingActive) = 0;
     virtual uint32_t getConfigureAddressSpaceMode() = 0;
 
@@ -91,7 +91,7 @@ class HwHelperHw : public HwHelper {
 
     void adjustDefaultEngineType(HardwareInfo *pHwInfo) override;
 
-    void setupHardwareCapabilities(HardwareCapabilities *caps) override;
+    void setupHardwareCapabilities(HardwareCapabilities *caps, const HardwareInfo &hwInfo) override;
 
     SipKernelType getSipKernelType(bool debuggingActive) override;
 
diff --git a/runtime/helpers/hw_helper.inl b/runtime/helpers/hw_helper.inl
@@ -35,7 +35,7 @@ void HwHelperHw<Family>::adjustDefaultEngineType(HardwareInfo *pHwInfo) {
 }
 
 template <typename Family>
-void HwHelperHw<Family>::setupHardwareCapabilities(HardwareCapabilities *caps) {
+void HwHelperHw<Family>::setupHardwareCapabilities(HardwareCapabilities *caps, const HardwareInfo &hwInfo) {
     caps->image3DMaxHeight = 16384;
     caps->image3DMaxWidth = 16384;
     //With statefull messages we have an allocation cap of 4GB
diff --git a/unit_tests/device/device_caps_tests.cpp b/unit_tests/device/device_caps_tests.cpp
@@ -355,7 +355,7 @@ TEST(Device_GetCaps, givenGlobalMemSizeWhenCalculatingMaxAllocSizeThenAdjustToHW
 
     HardwareCapabilities hwCaps = {0};
     auto &hwHelper = HwHelper::get(platformDevices[0]->pPlatform->eRenderCoreFamily);
-    hwHelper.setupHardwareCapabilities(&hwCaps);
+    hwHelper.setupHardwareCapabilities(&hwCaps, *platformDevices[0]);
 
     uint64_t expectedSize = std::max((caps.globalMemSize / 2), static_cast<uint64_t>(128ULL * MemoryConstants::megaByte));
     expectedSize = std::min(expectedSize, hwCaps.maxMemAllocSize);
diff --git a/unit_tests/gen10/hw_helper_tests_gen10.cpp b/unit_tests/gen10/hw_helper_tests_gen10.cpp
@@ -78,7 +78,7 @@ GEN10TEST_F(HwHelperTestCnl, givenGen10PlatformWhenSetupHardwareCapabilitiesIsCa
     auto &helper = HwHelper::get(renderCoreFamily);
 
     // Test default method implementation
-    testDefaultImplementationOfSetupHardwareCapabilities(helper);
+    testDefaultImplementationOfSetupHardwareCapabilities(helper, hwInfo);
 }
 
 GEN10TEST_F(HwHelperTestCnl, whenGetConfigureAddressSpaceModeThenReturnZero) {
diff --git a/unit_tests/gen8/hw_helper_tests_gen8.cpp b/unit_tests/gen8/hw_helper_tests_gen8.cpp
@@ -61,7 +61,7 @@ GEN8TEST_F(HwHelperTestBdw, adjustDefaultEngineType) {
 GEN8TEST_F(HwHelperTestBdw, givenGen8PlatformWhenSetupHardwareCapabilitiesIsCalledThenSpecificImplementationIsUsed) {
     auto &helper = HwHelper::get(renderCoreFamily);
     HardwareCapabilities hwCaps = {0};
-    helper.setupHardwareCapabilities(&hwCaps);
+    helper.setupHardwareCapabilities(&hwCaps, hwInfo);
 
     EXPECT_EQ(2048u, hwCaps.image3DMaxHeight);
     EXPECT_EQ(2048u, hwCaps.image3DMaxWidth);
diff --git a/unit_tests/gen9/hw_helper_tests_gen9.cpp b/unit_tests/gen9/hw_helper_tests_gen9.cpp
@@ -62,7 +62,7 @@ GEN9TEST_F(HwHelperTestSkl, givenGen9PlatformWhenSetupHardwareCapabilitiesIsCall
     auto &helper = HwHelper::get(renderCoreFamily);
 
     // Test default method implementation
-    testDefaultImplementationOfSetupHardwareCapabilities(helper);
+    testDefaultImplementationOfSetupHardwareCapabilities(helper, hwInfo);
 }
 
 GEN9TEST_F(HwHelperTestSkl, givenDebuggingActiveWhenSipKernelTypeIsQueriedThenDbgCsrLocalTypeIsReturned) {
diff --git a/unit_tests/helpers/hw_helper_default_tests.cpp b/unit_tests/helpers/hw_helper_default_tests.cpp
@@ -23,10 +23,10 @@
 #include "runtime/helpers/hw_info.h"
 #include "unit_tests/helpers/hw_helper_tests.h"
 
-void testDefaultImplementationOfSetupHardwareCapabilities(HwHelper &hwHelper) {
+void testDefaultImplementationOfSetupHardwareCapabilities(HwHelper &hwHelper, const HardwareInfo &hwInfo) {
     HardwareCapabilities hwCaps = {0};
 
-    hwHelper.setupHardwareCapabilities(&hwCaps);
+    hwHelper.setupHardwareCapabilities(&hwCaps, hwInfo);
 
     EXPECT_EQ(16384u, hwCaps.image3DMaxHeight);
     EXPECT_EQ(16384u, hwCaps.image3DMaxWidth);
diff --git a/unit_tests/helpers/hw_helper_tests.h b/unit_tests/helpers/hw_helper_tests.h
@@ -40,4 +40,4 @@ class HwHelperTest : public testing::Test {
     HardwareInfo hwInfo;
 };
 
-void testDefaultImplementationOfSetupHardwareCapabilities(HwHelper &hwHelper);
+void testDefaultImplementationOfSetupHardwareCapabilities(HwHelper &hwHelper, const HardwareInfo &hwInfo);
diff --git a/unit_tests/program/program_tests.cpp b/unit_tests/program/program_tests.cpp
@@ -2535,7 +2535,7 @@ TEST_F(ProgramTests, givenNewProgramTheStatelessToStatefulBufferOffsetOtimizatio
     auto it = internalOpts.find("-cl-intel-has-buffer-offset-arg ");
 
     HardwareCapabilities hwCaps = {0};
-    HwHelper::get(prog.getDevice(0).getHardwareInfo().pPlatform->eRenderCoreFamily).setupHardwareCapabilities(&hwCaps);
+    HwHelper::get(prog.getDevice(0).getHardwareInfo().pPlatform->eRenderCoreFamily).setupHardwareCapabilities(&hwCaps, prog.getDevice(0).getHardwareInfo());
     if (hwCaps.isStatelesToStatefullWithOffsetSupported) {
         EXPECT_NE(std::string::npos, it);
     } else {

Original file line number	Diff line number	Diff line change
`@@ -93,7 +93,7 @@ Device::Device(const HardwareInfo &hwInfo, ExecutionEnvironment *executionEnviro`
`93`	`93`	`}`
`94`	`94`	`this->executionEnvironment->incRefInternal();`
`95`	`95`	`auto &hwHelper = HwHelper::get(hwInfo.pPlatform->eRenderCoreFamily);`
`96`		`- hwHelper.setupHardwareCapabilities(&this->hardwareCapabilities);`
	`96`	`+ hwHelper.setupHardwareCapabilities(&this->hardwareCapabilities, hwInfo);`
`97`	`97`	`}`
`98`	`98`
`99`	`99`	`Device::~Device() {`
Original file line number	Diff line number	Diff line change
`@@ -38,7 +38,7 @@ bool HwHelperHw<Family>::setupPreemptionRegisters(HardwareInfo *pHwInfo, bool en`
`38`	`38`	`}`
`39`	`39`
`40`	`40`	`template <>`
`41`		`-void HwHelperHw<Family>::setupHardwareCapabilities(HardwareCapabilities *caps) {`
	`41`	`+void HwHelperHw<Family>::setupHardwareCapabilities(HardwareCapabilities *caps, const HardwareInfo &hwInfo) {`
`42`	`42`	`caps->image3DMaxHeight = 2048;`
`43`	`43`	`caps->image3DMaxWidth = 2048;`
`44`	`44`	`caps->maxMemAllocSize = 2 * MemoryConstants::gigaByte - 8 * MemoryConstants::megaByte;`
Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,7 @@ void HwHelperHw<Family>::adjustDefaultEngineType(HardwareInfo *pHwInfo) {`
`35`	`35`	`}`
`36`	`36`
`37`	`37`	`template <typename Family>`
`38`		`-void HwHelperHw<Family>::setupHardwareCapabilities(HardwareCapabilities *caps) {`
	`38`	`+void HwHelperHw<Family>::setupHardwareCapabilities(HardwareCapabilities *caps, const HardwareInfo &hwInfo) {`
`39`	`39`	`caps->image3DMaxHeight = 16384;`
`40`	`40`	`caps->image3DMaxWidth = 16384;`
`41`	`41`	`//With statefull messages we have an allocation cap of 4GB`
Original file line number	Diff line number	Diff line change
`@@ -78,7 +78,7 @@ GEN10TEST_F(HwHelperTestCnl, givenGen10PlatformWhenSetupHardwareCapabilitiesIsCa`
`78`	`78`	`auto &helper = HwHelper::get(renderCoreFamily);`
`79`	`79`
`80`	`80`	`// Test default method implementation`
`81`		`- testDefaultImplementationOfSetupHardwareCapabilities(helper);`
	`81`	`+ testDefaultImplementationOfSetupHardwareCapabilities(helper, hwInfo);`
`82`	`82`	`}`
`83`	`83`
`84`	`84`	`GEN10TEST_F(HwHelperTestCnl, whenGetConfigureAddressSpaceModeThenReturnZero) {`
Original file line number	Diff line number	Diff line change
`@@ -62,7 +62,7 @@ GEN9TEST_F(HwHelperTestSkl, givenGen9PlatformWhenSetupHardwareCapabilitiesIsCall`
`62`	`62`	`auto &helper = HwHelper::get(renderCoreFamily);`
`63`	`63`
`64`	`64`	`// Test default method implementation`
`65`		`- testDefaultImplementationOfSetupHardwareCapabilities(helper);`
	`65`	`+ testDefaultImplementationOfSetupHardwareCapabilities(helper, hwInfo);`
`66`	`66`	`}`
`67`	`67`
`68`	`68`	`GEN9TEST_F(HwHelperTestSkl, givenDebuggingActiveWhenSipKernelTypeIsQueriedThenDbgCsrLocalTypeIsReturned) {`