From d28ac15922610b264bec15713954a2d645059d50 Mon Sep 17 00:00:00 2001
From: Mateusz Jablonski <mateusz.jablonski@intel.com>
Date: Tue, 4 Jun 2024 14:39:48 +0000
Subject: [PATCH] refactor: remove invalid device ids

Signed-off-by: Mateusz Jablonski <mateusz.jablonski@intel.com>
---
 .../gen12lp/adlp/linux/dll/device_id_tests_adlp.cpp |  5 +----
 .../tgllp/linux/dll/device_id_tests_tgllp.cpp       |  5 ++---
 .../mtl/linux/dll/device_id_tests_mtl.cpp           |  7 +++----
 shared/offline_compiler/source/offline_compiler.cpp |  2 +-
 shared/source/dll/devices/devices_base.inl          |  5 -----
 .../source/gen12lp/adlp/device_ids_configs_adlp.h   |  3 ---
 .../source/gen12lp/tgllp/device_ids_configs_tgllp.h |  1 -
 .../enable_compiler_product_helper_mtl.cpp          |  9 ---------
 .../xe_hpg_core/xe_lpg/device_ids_configs_xe_lpg.h  |  1 -
 .../xe_hpg_core/mtl/product_helper_tests_mtl.cpp    | 13 -------------
 10 files changed, 7 insertions(+), 44 deletions(-)

diff --git a/opencl/test/unit_test/gen12lp/adlp/linux/dll/device_id_tests_adlp.cpp b/opencl/test/unit_test/gen12lp/adlp/linux/dll/device_id_tests_adlp.cpp
index 4c8c4141e2..b045464e9b 100644
--- a/opencl/test/unit_test/gen12lp/adlp/linux/dll/device_id_tests_adlp.cpp
+++ b/opencl/test/unit_test/gen12lp/adlp/linux/dll/device_id_tests_adlp.cpp
@@ -10,11 +10,10 @@
 using namespace NEO;
 
 TEST_F(DeviceIdTests, GivenAdlpSupportedDeviceIdThenDeviceDescriptorTableExists) {
-    std::array<DeviceDescriptor, 28> expectedDescriptors = {{
+    std::array<DeviceDescriptor, 25> expectedDescriptors = {{
         {0x46A0, &AdlpHwConfig::hwInfo, &AdlpHwConfig::setupHardwareInfo},
         {0x46B0, &AdlpHwConfig::hwInfo, &AdlpHwConfig::setupHardwareInfo},
         {0x46A1, &AdlpHwConfig::hwInfo, &AdlpHwConfig::setupHardwareInfo},
-        {0x46A2, &AdlpHwConfig::hwInfo, &AdlpHwConfig::setupHardwareInfo},
         {0x46A3, &AdlpHwConfig::hwInfo, &AdlpHwConfig::setupHardwareInfo},
         {0x46A6, &AdlpHwConfig::hwInfo, &AdlpHwConfig::setupHardwareInfo},
         {0x46A8, &AdlpHwConfig::hwInfo, &AdlpHwConfig::setupHardwareInfo},
@@ -23,11 +22,9 @@ TEST_F(DeviceIdTests, GivenAdlpSupportedDeviceIdThenDeviceDescriptorTableExists)
         {0x4626, &AdlpHwConfig::hwInfo, &AdlpHwConfig::setupHardwareInfo},
         {0x4628, &AdlpHwConfig::hwInfo, &AdlpHwConfig::setupHardwareInfo},
         {0x46B1, &AdlpHwConfig::hwInfo, &AdlpHwConfig::setupHardwareInfo},
-        {0x46B2, &AdlpHwConfig::hwInfo, &AdlpHwConfig::setupHardwareInfo},
         {0x46B3, &AdlpHwConfig::hwInfo, &AdlpHwConfig::setupHardwareInfo},
         {0x46C0, &AdlpHwConfig::hwInfo, &AdlpHwConfig::setupHardwareInfo},
         {0x46C1, &AdlpHwConfig::hwInfo, &AdlpHwConfig::setupHardwareInfo},
-        {0x46C2, &AdlpHwConfig::hwInfo, &AdlpHwConfig::setupHardwareInfo},
         {0x46C3, &AdlpHwConfig::hwInfo, &AdlpHwConfig::setupHardwareInfo},
         {0xA7A0, &AdlpHwConfig::hwInfo, &AdlpHwConfig::setupHardwareInfo},
         {0xA720, &AdlpHwConfig::hwInfo, &AdlpHwConfig::setupHardwareInfo},
diff --git a/opencl/test/unit_test/gen12lp/tgllp/linux/dll/device_id_tests_tgllp.cpp b/opencl/test/unit_test/gen12lp/tgllp/linux/dll/device_id_tests_tgllp.cpp
index e3db2db322..a0575089ea 100644
--- a/opencl/test/unit_test/gen12lp/tgllp/linux/dll/device_id_tests_tgllp.cpp
+++ b/opencl/test/unit_test/gen12lp/tgllp/linux/dll/device_id_tests_tgllp.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2019-2022 Intel Corporation
+ * Copyright (C) 2019-2024 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -10,8 +10,7 @@
 using namespace NEO;
 
 TEST_F(DeviceIdTests, GivenTgllpSupportedDeviceIdThenHardwareInfoIsCorrect) {
-    std::array<DeviceDescriptor, 8> expectedDescriptors = {{
-        {0xFF20, &TgllpHw1x6x16::hwInfo, &TgllpHw1x6x16::setupHardwareInfo},
+    std::array<DeviceDescriptor, 7> expectedDescriptors = {{
         {0x9A49, &TgllpHw1x6x16::hwInfo, &TgllpHw1x6x16::setupHardwareInfo},
         {0x9A40, &TgllpHw1x6x16::hwInfo, &TgllpHw1x6x16::setupHardwareInfo},
         {0x9A59, &TgllpHw1x6x16::hwInfo, &TgllpHw1x6x16::setupHardwareInfo},
diff --git a/opencl/test/unit_test/xe_hpg_core/mtl/linux/dll/device_id_tests_mtl.cpp b/opencl/test/unit_test/xe_hpg_core/mtl/linux/dll/device_id_tests_mtl.cpp
index c050f48950..3861f4cf26 100644
--- a/opencl/test/unit_test/xe_hpg_core/mtl/linux/dll/device_id_tests_mtl.cpp
+++ b/opencl/test/unit_test/xe_hpg_core/mtl/linux/dll/device_id_tests_mtl.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2022 Intel Corporation
+ * Copyright (C) 2022-2024 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -10,11 +10,10 @@
 using namespace NEO;
 
 TEST_F(DeviceIdTests, givenMtlSupportedDeviceIdThenDeviceDescriptorTableExists) {
-    std::array<DeviceDescriptor, 5> expectedDescriptors = {{{0x7D40, &MtlHwConfig::hwInfo, &MtlHwConfig::setupHardwareInfo},
+    std::array<DeviceDescriptor, 4> expectedDescriptors = {{{0x7D40, &MtlHwConfig::hwInfo, &MtlHwConfig::setupHardwareInfo},
                                                             {0x7D55, &MtlHwConfig::hwInfo, &MtlHwConfig::setupHardwareInfo},
                                                             {0x7DD5, &MtlHwConfig::hwInfo, &MtlHwConfig::setupHardwareInfo},
-                                                            {0x7D45, &MtlHwConfig::hwInfo, &MtlHwConfig::setupHardwareInfo},
-                                                            {0x7D60, &MtlHwConfig::hwInfo, &MtlHwConfig::setupHardwareInfo}}};
+                                                            {0x7D45, &MtlHwConfig::hwInfo, &MtlHwConfig::setupHardwareInfo}}};
 
     testImpl(expectedDescriptors);
 }
diff --git a/shared/offline_compiler/source/offline_compiler.cpp b/shared/offline_compiler/source/offline_compiler.cpp
index 1825aba91e..116f210fe7 100644
--- a/shared/offline_compiler/source/offline_compiler.cpp
+++ b/shared/offline_compiler/source/offline_compiler.cpp
@@ -1224,7 +1224,7 @@ Usage: ocloc [compile] -file <filename> -device <device_type> [-output <filename
                                             The hexadecimal value represents device ID.
                                             If such value is provided, ocloc will try to
                                             match it with corresponding device type.
-                                            For example, 0xFF20 device ID will be translated
+                                            For example, 0x9A49 device ID will be translated
                                             to tgllp.
                                             If multiple target devices are provided, ocloc
                                             will compile for each of these targets and will
diff --git a/shared/source/dll/devices/devices_base.inl b/shared/source/dll/devices/devices_base.inl
index cb088a8462..6a7a104aa0 100644
--- a/shared/source/dll/devices/devices_base.inl
+++ b/shared/source/dll/devices/devices_base.inl
@@ -66,7 +66,6 @@ DEVICE(0x7D40, MtlHwConfig)
 NAMEDDEVICE(0x7D55, MtlHwConfig, "Intel(R) Arc(TM) Graphics")
 NAMEDDEVICE(0x7DD5, MtlHwConfig, "Intel(R) Graphics")
 NAMEDDEVICE(0x7D45, MtlHwConfig, "Intel(R) Graphics")
-DEVICE(0x7D60, MtlHwConfig)
 #endif
 #ifdef SUPPORT_ARL
 DEVICE(0x7D67, ArlHwConfig)
@@ -79,7 +78,6 @@ DEVICE(0x7D41, ArlHwConfig)
 #ifdef SUPPORT_GEN12LP
 
 #ifdef SUPPORT_TGLLP
-DEVICE(0xFF20, TgllpHw1x6x16)
 NAMEDDEVICE(0x9A49, TgllpHw1x6x16, "Intel(R) Iris(R) Xe Graphics")
 NAMEDDEVICE(0x9A40, TgllpHw1x6x16, "Intel(R) Iris(R) Xe Graphics")
 DEVICE(0x9A59, TgllpHw1x6x16)
@@ -137,7 +135,6 @@ NAMEDDEVICE(0x46D4, AdlnHwConfig, "Intel(R) Graphics")
 DEVICE(0x46A0, AdlpHwConfig)
 DEVICE(0x46B0, AdlpHwConfig)
 DEVICE(0x46A1, AdlpHwConfig)
-DEVICE(0x46A2, AdlpHwConfig)
 NAMEDDEVICE(0x46A3, AdlpHwConfig, "Intel(R) UHD Graphics")
 NAMEDDEVICE(0x46A6, AdlpHwConfig, "Intel(R) Iris(R) Xe Graphics")
 NAMEDDEVICE(0x46A8, AdlpHwConfig, "Intel(R) Iris(R) Xe Graphics")
@@ -146,11 +143,9 @@ NAMEDDEVICE(0x462A, AdlpHwConfig, "Intel(R) UHD Graphics")
 NAMEDDEVICE(0x4626, AdlpHwConfig, "Intel(R) UHD Graphics")
 NAMEDDEVICE(0x4628, AdlpHwConfig, "Intel(R) UHD Graphics")
 DEVICE(0x46B1, AdlpHwConfig)
-DEVICE(0x46B2, AdlpHwConfig)
 NAMEDDEVICE(0x46B3, AdlpHwConfig, "Intel(R) UHD Graphics")
 DEVICE(0x46C0, AdlpHwConfig)
 DEVICE(0x46C1, AdlpHwConfig)
-DEVICE(0x46C2, AdlpHwConfig)
 NAMEDDEVICE(0x46C3, AdlpHwConfig, "Intel(R) UHD Graphics")
 // RPL-P
 NAMEDDEVICE(0xA7A0, AdlpHwConfig, "Intel(R) Iris(R) Xe Graphics")
diff --git a/shared/source/gen12lp/adlp/device_ids_configs_adlp.h b/shared/source/gen12lp/adlp/device_ids_configs_adlp.h
index 47a0a60d80..01031e1a56 100644
--- a/shared/source/gen12lp/adlp/device_ids_configs_adlp.h
+++ b/shared/source/gen12lp/adlp/device_ids_configs_adlp.h
@@ -14,7 +14,6 @@ const std::vector<unsigned short> adlpDeviceIds{
     0x46A0,
     0x46B0,
     0x46A1,
-    0x46A2,
     0x46A3,
     0x46A6,
     0x46A8,
@@ -23,11 +22,9 @@ const std::vector<unsigned short> adlpDeviceIds{
     0x4626,
     0x4628,
     0x46B1,
-    0x46B2,
     0x46B3,
     0x46C0,
     0x46C1,
-    0x46C2,
     0x46C3,
     0xA7A0,
     0xA720,
diff --git a/shared/source/gen12lp/tgllp/device_ids_configs_tgllp.h b/shared/source/gen12lp/tgllp/device_ids_configs_tgllp.h
index ab2249597a..5429f308fd 100644
--- a/shared/source/gen12lp/tgllp/device_ids_configs_tgllp.h
+++ b/shared/source/gen12lp/tgllp/device_ids_configs_tgllp.h
@@ -11,7 +11,6 @@
 
 namespace NEO {
 const std::vector<unsigned short> tgllpDeviceIds{
-    0xFF20,
     0x9A49,
     0x9A40,
     0x9A59,
diff --git a/shared/source/xe_hpg_core/enable_compiler_product_helper_mtl.cpp b/shared/source/xe_hpg_core/enable_compiler_product_helper_mtl.cpp
index 440aaad4df..adeed3a510 100644
--- a/shared/source/xe_hpg_core/enable_compiler_product_helper_mtl.cpp
+++ b/shared/source/xe_hpg_core/enable_compiler_product_helper_mtl.cpp
@@ -47,15 +47,6 @@ uint32_t CompilerProductHelperHw<gfxProduct>::getProductConfigFromHwInfo(const H
         }
         break;
     }
-    case 0x7D60: {
-        switch (hwInfo.platform.usRevId) {
-        case 0x0:
-            return AOT::MTL_U_A0;
-        case 0x2:
-            return AOT::MTL_U_B0;
-        }
-        break;
-    }
     }
     return getDefaultHwIpVersion();
 }
diff --git a/shared/source/xe_hpg_core/xe_lpg/device_ids_configs_xe_lpg.h b/shared/source/xe_hpg_core/xe_lpg/device_ids_configs_xe_lpg.h
index c7a7093ee4..81b1bfb506 100644
--- a/shared/source/xe_hpg_core/xe_lpg/device_ids_configs_xe_lpg.h
+++ b/shared/source/xe_hpg_core/xe_lpg/device_ids_configs_xe_lpg.h
@@ -13,7 +13,6 @@ namespace NEO {
 const std::vector<unsigned short> mtlmDeviceIds{
     0x7D40,
     0x7D45,
-    0x7D60,
     0x7D67,
     0x7D41};
 const std::vector<unsigned short> mtlpDeviceIds{
diff --git a/shared/test/unit_test/xe_hpg_core/mtl/product_helper_tests_mtl.cpp b/shared/test/unit_test/xe_hpg_core/mtl/product_helper_tests_mtl.cpp
index 889ca516e1..f1c3e94aa2 100644
--- a/shared/test/unit_test/xe_hpg_core/mtl/product_helper_tests_mtl.cpp
+++ b/shared/test/unit_test/xe_hpg_core/mtl/product_helper_tests_mtl.cpp
@@ -32,19 +32,6 @@ MTLTEST_F(MtlProductHelper, givenMtlWithoutHwIpVersionInHwInfoWhenGettingIpVersi
     auto mtlMDeviceIds = {0x7D40, 0x7D45};
     auto mtlPDeviceIds = {0x7D55, 0X7DD5};
 
-    hwInfo.platform.usDeviceID = 0x7D60;
-    hwInfo.platform.usRevId = 0;
-
-    EXPECT_EQ(AOT::MTL_U_A0, compilerProductHelper->getHwIpVersion(hwInfo));
-
-    hwInfo.platform.usRevId = 2;
-
-    EXPECT_EQ(AOT::MTL_U_B0, compilerProductHelper->getHwIpVersion(hwInfo));
-
-    hwInfo.platform.usRevId = 0xdead;
-
-    EXPECT_EQ(compilerProductHelper->getDefaultHwIpVersion(), compilerProductHelper->getHwIpVersion(hwInfo));
-
     for (auto &deviceId : mtlMDeviceIds) {
         hwInfo.platform.usDeviceID = deviceId;
         for (auto &revision : {0, 2}) {