Ocloc: setup hw info values from default config

Related-To: NEO-5287
Signed-off-by: Mateusz Jablonski <mateusz.jablonski@intel.com>

Author: JablonskiMateusz

opencl/test/unit_test/offline_compiler/offline_compiler_tests.cpp

@@ -1260,6 +1260,32 @@ TEST(OfflineCompilerTest, givenNoRevisionIdWhenCompilerIsInitializedThenHwInfoHa
     EXPECT_EQ(mockOfflineCompiler->hwInfo.platform.usRevId, revId);
 }
 
+TEST(OfflineCompilerTest, whenDeviceIsSpecifiedThenDefaultConfigFromTheDeviceIsUsed) {
+    auto mockOfflineCompiler = std::unique_ptr<MockOfflineCompiler>(new MockOfflineCompiler());
+    ASSERT_NE(nullptr, mockOfflineCompiler);
+
+    std::vector<std::string> argv = {
+        "ocloc",
+        "-q",
+        "-file",
+        "test_files/copybuffer.cl",
+        "-device",
+        gEnvironment->devicePrefix.c_str()};
+
+    int retVal = mockOfflineCompiler->initialize(argv.size(), argv);
+    EXPECT_EQ(SUCCESS, retVal);
+
+    auto actualHwInfo = mockOfflineCompiler->hwInfo;
+    auto expectedHwInfo = actualHwInfo;
+    auto hwInfoConfig = defaultHardwareInfoConfigTable[expectedHwInfo.platform.eProductFamily];
+
+    setHwInfoValuesFromConfig(hwInfoConfig, expectedHwInfo);
+
+    EXPECT_EQ(actualHwInfo.gtSystemInfo.SliceCount, expectedHwInfo.gtSystemInfo.SliceCount);
+    EXPECT_EQ(actualHwInfo.gtSystemInfo.SubSliceCount, expectedHwInfo.gtSystemInfo.SubSliceCount);
+    EXPECT_EQ(actualHwInfo.gtSystemInfo.EUCount, expectedHwInfo.gtSystemInfo.EUCount);
+}
+
 struct WorkaroundApplicableForDevice {
     const char *deviceName;
     bool applicable;

shared/offline_compiler/source/offline_compiler.cpp

@@ -274,7 +274,9 @@ int OfflineCompiler::getHardwareInfo(const char *pDeviceName) {
                 if (revisionId != -1) {
                     hwInfo.platform.usRevId = revisionId;
                 }
-                hardwareInfoSetup[hwInfo.platform.eProductFamily](&hwInfo, true, 0x0);
+                auto hwInfoConfig = defaultHardwareInfoConfigTable[hwInfo.platform.eProductFamily];
+                setHwInfoValuesFromConfig(hwInfoConfig, hwInfo);
+                hardwareInfoSetup[hwInfo.platform.eProductFamily](&hwInfo, true, hwInfoConfig);
                 familyNameWithType.clear();
                 familyNameWithType.append(familyName[hwInfo.platform.eRenderCoreFamily]);
                 familyNameWithType.append(hwInfo.capabilityTable.platformType);