fix: add setup ARL hw ip version when not available from KMD

Signed-off-by: Mateusz Jablonski <[email protected]>

Author: JablonskiMateusz

shared/source/xe_hpg_core/enable_compiler_product_helper_arl.cpp

@@ -11,4 +11,37 @@ constexpr auto gfxProduct = IGFX_ARROWLAKE;
 
 #include "shared/source/xe_hpg_core/xe_lpg/compiler_product_helper_xe_lpg.inl"
 
+namespace NEO {
+template <>
+uint32_t CompilerProductHelperHw<gfxProduct>::getProductConfigFromHwInfo(const HardwareInfo &hwInfo) const {
+    if (hwInfo.ipVersion.value) {
+        return hwInfo.ipVersion.value;
+    }
+    switch (hwInfo.platform.usDeviceID) {
+    case 0x7D67: {
+        switch (hwInfo.platform.usRevId) {
+        case 0x0:
+            return AOT::MTL_M_A0;
+        case 0x3:
+        case 0x6:
+            return AOT::MTL_M_B0;
+        }
+        break;
+    }
+    case 0x7D51:
+    case 0x7D41:
+    case 0X7DD1: {
+        switch (hwInfo.platform.usRevId) {
+        case 0x0:
+        case 0x3:
+            return AOT::XE_LPGPLUS_A0;
+        case 0x6:
+            return AOT::XE_LPGPLUS_B0;
+        }
+        break;
+    }
+    }
+    return getDefaultHwIpVersion();
+}
+} // namespace NEO
 static NEO::EnableCompilerProductHelper<gfxProduct> enableCompilerProductHelperARL;

shared/test/unit_test/xe_hpg_core/arl/CMakeLists.txt

@@ -12,6 +12,7 @@ if(TESTS_ARL)
                  ${NEO_CORE_tests_xe_hpg_core_arl_excludes}
                  ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
                  ${CMAKE_CURRENT_SOURCE_DIR}/hw_aot_config_tests_arl.cpp
+                 ${CMAKE_CURRENT_SOURCE_DIR}/product_helper_tests_arl.cpp
   )
 
   add_subdirectories()

shared/test/unit_test/xe_hpg_core/arl/product_helper_tests_arl.cpp

@@ -0,0 +1,66 @@
+/*
+ * Copyright (C) 2022-2023 Intel Corporation
+ *
+ * SPDX-License-Identifier: MIT
+ *
+ */
+
+#include "shared/source/helpers/compiler_product_helper.h"
+#include "shared/source/xe_hpg_core/hw_cmds_arl.h"
+#include "shared/test/common/helpers/default_hw_info.h"
+#include "shared/test/common/test_macros/header/per_product_test_definitions.h"
+#include "shared/test/common/test_macros/test.h"
+#include "shared/test/unit_test/os_interface/product_helper_tests.h"
+
+#include "platforms.h"
+
+using namespace NEO;
+
+using ArlProductHelper = ProductHelperTest;
+
+ARLTEST_F(ArlProductHelper, givenArlWithoutHwIpVersionInHwInfoWhenGettingIpVersionThenCorrectValueIsReturnedBasedOnDeviceIdAndRevId) {
+    auto hwInfo = *defaultHwInfo;
+    hwInfo.ipVersion = {};
+
+    auto arlSDeviceIds = {0x7D67};
+    auto arlHDeviceIds = {0x7D51, 0x7DD1, 0x7D41};
+
+    for (auto &deviceId : arlSDeviceIds) {
+        hwInfo.platform.usDeviceID = deviceId;
+        for (auto &revision : {0}) {
+            hwInfo.platform.usRevId = revision;
+
+            EXPECT_EQ(AOT::MTL_M_A0, compilerProductHelper->getHwIpVersion(hwInfo));
+        }
+        for (auto &revision : {3, 6}) {
+            hwInfo.platform.usRevId = revision;
+
+            EXPECT_EQ(AOT::MTL_M_B0, compilerProductHelper->getHwIpVersion(hwInfo));
+        }
+        hwInfo.platform.usRevId = 0xdead;
+
+        EXPECT_EQ(compilerProductHelper->getDefaultHwIpVersion(), compilerProductHelper->getHwIpVersion(hwInfo));
+    }
+
+    for (auto &deviceId : arlHDeviceIds) {
+        hwInfo.platform.usDeviceID = deviceId;
+        for (auto &revision : {0, 3}) {
+            hwInfo.platform.usRevId = revision;
+
+            EXPECT_EQ(AOT::XE_LPGPLUS_A0, compilerProductHelper->getHwIpVersion(hwInfo));
+        }
+        for (auto &revision : {6}) {
+            hwInfo.platform.usRevId = revision;
+
+            EXPECT_EQ(AOT::XE_LPGPLUS_B0, compilerProductHelper->getHwIpVersion(hwInfo));
+        }
+        hwInfo.platform.usRevId = 0xdead;
+
+        EXPECT_EQ(compilerProductHelper->getDefaultHwIpVersion(), compilerProductHelper->getHwIpVersion(hwInfo));
+    }
+
+    hwInfo.platform.usDeviceID = 0;
+    hwInfo.platform.usRevId = 0xdead;
+
+    EXPECT_EQ(compilerProductHelper->getDefaultHwIpVersion(), compilerProductHelper->getHwIpVersion(hwInfo));
+}