intel/compute-runtime
1
0
Fork 0
mirror of https://github.com/intel/compute-runtime.git synced 2025-12-18 22:08:53 +08:00
Code Issues Packages Projects Releases Wiki Activity

refactor: remove invalid device ids

Browse Source 
Signed-off-by: Mateusz Jablonski <mateusz.jablonski@intel.com>
This commit is contained in:
Mateusz Jablonski
2024-06-04 14:39:48 +00:00
committed by Compute-Runtime-Automation
parent c09d077621
commit d28ac15922
10 changed files with 7 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
opencl/test/unit_test/gen12lp/adlp/linux/dll/device_id_tests_adlp.cpp
View File

@@ -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},

5
opencl/test/unit_test/gen12lp/tgllp/linux/dll/device_id_tests_tgllp.cpp
View File

@@ -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},

7
opencl/test/unit_test/xe_hpg_core/mtl/linux/dll/device_id_tests_mtl.cpp
View File

@@ -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);
}

2
shared/offline_compiler/source/offline_compiler.cpp
View File

@@ -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

5
shared/source/dll/devices/devices_base.inl
View File

@@ -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")

3
shared/source/gen12lp/adlp/device_ids_configs_adlp.h
View File

@@ -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,

1
shared/source/gen12lp/tgllp/device_ids_configs_tgllp.h
View File

@@ -11,7 +11,6 @@
namespace NEO {
const std::vector<unsigned short> tgllpDeviceIds{
0xFF20,
0x9A49,
0x9A40,
0x9A59,

9
shared/source/xe_hpg_core/enable_compiler_product_helper_mtl.cpp
View File

@@ -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();
}

1
shared/source/xe_hpg_core/xe_lpg/device_ids_configs_xe_lpg.h
View File

@@ -13,7 +13,6 @@ namespace NEO {
const std::vector<unsigned short> mtlmDeviceIds{
0x7D40,
0x7D45,
0x7D60,
0x7D67,
0x7D41};
const std::vector<unsigned short> mtlpDeviceIds{

13
shared/test/unit_test/xe_hpg_core/mtl/product_helper_tests_mtl.cpp
View File

@@ -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}) {