mirror of
https://github.com/intel/compute-runtime.git
synced 2025-09-15 13:01:45 +08:00
Device ID Cleanup
Related-To: NEO-5252 Signed-off-by: Adam Cetnerowski <adam.cetnerowski@intel.com>
This commit is contained in:
Adam Cetnerowski
committed by
Compute-Runtime-Automation
Compute-Runtime-Automation
parent
ce9158ea1a
commit
e09c24be92
@ -74,7 +74,6 @@ DEVICE( 0x4E55, EHL_HW_CONFIG, GTTYPE_GT1 )
|
||||
#ifdef SUPPORT_GEN9
|
||||
#ifdef SUPPORT_SKL
|
||||
// GT1
|
||||
DEVICE( 0x0901, SKL_1x2x6, GTTYPE_GT1 )
|
||||
NAMEDDEVICE( 0x1902, SKL_1x2x6, GTTYPE_GT1, "Intel(R) HD Graphics 510" )
|
||||
NAMEDDEVICE( 0x190B, SKL_1x2x6, GTTYPE_GT1, "Intel(R) HD Graphics 510" )
|
||||
DEVICE( 0x190A, SKL_1x2x6, GTTYPE_GT1 )
|
||||
@ -85,7 +84,6 @@ DEVICE( 0x1917, SKL_1x3x6, GTTYPE_GT1_5 )
|
||||
DEVICE( 0x1913, SKL_1x3x6, GTTYPE_GT1_5 )
|
||||
DEVICE( 0X1915, SKL_1x3x6, GTTYPE_GT1_5 )
|
||||
// GT2
|
||||
DEVICE( 0x0902, SKL_1x3x8, GTTYPE_GT2 )
|
||||
NAMEDDEVICE( 0x1912, SKL_1x3x8, GTTYPE_GT2, "Intel(R) HD Graphics 530" )
|
||||
NAMEDDEVICE( 0x191B, SKL_1x3x8, GTTYPE_GT2, "Intel(R) HD Graphics 530" )
|
||||
DEVICE( 0x191A, SKL_1x3x8, GTTYPE_GT2 )
|
||||
@ -95,7 +93,6 @@ NAMEDDEVICE( 0x191D, SKL_1x3x8, GTTYPE_GT2, "Intel(R) HD Graphics P530" )
|
||||
NAMEDDEVICE( 0x1921, SKL_1x3x8, GTTYPE_GT2, "Intel(R) HD Graphics 520" )
|
||||
DEVICE( 0x9905, SKL_1x3x8, GTTYPE_GT2 )
|
||||
// GT3
|
||||
DEVICE( 0x0903, SKL_2x3x8, GTTYPE_GT3 )
|
||||
DEVICE( 0x192B, SKL_2x3x8, GTTYPE_GT3 )
|
||||
DEVICE( 0x192D, SKL_2x3x8, GTTYPE_GT3 )
|
||||
DEVICE( 0x192A, SKL_2x3x8, GTTYPE_GT3 )
|
||||
@ -103,7 +100,6 @@ NAMEDDEVICE( 0x1923, SKL_2x3x8, GTTYPE_GT3, "Intel(R) HD Graphics 535" )
|
||||
NAMEDDEVICE( 0x1926, SKL_2x3x8, GTTYPE_GT3, "Intel(R) Iris(R) Graphics 540" )
|
||||
NAMEDDEVICE( 0x1927, SKL_2x3x8, GTTYPE_GT3, "Intel(R) Iris(R) Graphics 550" )
|
||||
// GT4
|
||||
DEVICE( 0x0904, SKL_3x3x8, GTTYPE_GT4 )
|
||||
DEVICE( 0x1932, SKL_3x3x8, GTTYPE_GT4 )
|
||||
NAMEDDEVICE( 0x193B, SKL_3x3x8, GTTYPE_GT4, "Intel(R) Iris(R) Pro Graphics 580" )
|
||||
NAMEDDEVICE( 0x193A, SKL_3x3x8, GTTYPE_GT4, "Intel(R) Iris(R) Pro Graphics P580" )
|
||||
@ -214,21 +210,18 @@ DEVICE( 0x9908, BXT_1x3x6, GTTYPE_GTA)
|
||||
|
||||
#ifdef SUPPORT_GEN8
|
||||
// GT1
|
||||
DEVICE( 0x0BD1, BDW_1x2x6, GTTYPE_GT1 )
|
||||
DEVICE( 0x1602, BDW_1x2x6, GTTYPE_GT1 )
|
||||
DEVICE( 0x160A, BDW_1x2x6, GTTYPE_GT1 )
|
||||
DEVICE( 0x1606, BDW_1x2x6, GTTYPE_GT1 )
|
||||
DEVICE( 0x160E, BDW_1x2x6, GTTYPE_GT1 )
|
||||
DEVICE( 0x160D, BDW_1x2x6, GTTYPE_GT1 )
|
||||
// GT2
|
||||
DEVICE( 0x0BD2, BDW_1x3x8, GTTYPE_GT2 )
|
||||
DEVICE( 0x1612, BDW_1x3x8, GTTYPE_GT2 )
|
||||
DEVICE( 0x161A, BDW_1x3x8, GTTYPE_GT2 )
|
||||
DEVICE( 0x1616, BDW_1x3x8, GTTYPE_GT2 )
|
||||
DEVICE( 0x161E, BDW_1x3x8, GTTYPE_GT2 )
|
||||
DEVICE( 0x161D, BDW_1x3x8, GTTYPE_GT2 )
|
||||
// GT3
|
||||
DEVICE( 0x0BD3, BDW_2x3x8, GTTYPE_GT3 )
|
||||
DEVICE( 0x1622, BDW_2x3x8, GTTYPE_GT3 )
|
||||
DEVICE( 0x162A, BDW_2x3x8, GTTYPE_GT3 )
|
||||
DEVICE( 0x1626, BDW_2x3x8, GTTYPE_GT3 )
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright (C) 2018-2020 Intel Corporation
|
||||
* Copyright (C) 2018-2021 Intel Corporation
|
||||
*
|
||||
* SPDX-License-Identifier: MIT
|
||||
*
|
||||
@ -14,22 +14,19 @@
|
||||
using namespace NEO;
|
||||
|
||||
TEST(BdwDeviceIdTest, GivenSupportedDeviceIdThenHardwareInfoIsCorrect) {
|
||||
std::array<DeviceDescriptor, 19> expectedDescriptors = {{
|
||||
{0x0BD1, &BDW_1x2x6::hwInfo, &BDW_1x2x6::setupHardwareInfo, GTTYPE_GT1},
|
||||
std::array<DeviceDescriptor, 16> expectedDescriptors = {{
|
||||
{0x1602, &BDW_1x2x6::hwInfo, &BDW_1x2x6::setupHardwareInfo, GTTYPE_GT1},
|
||||
{0x160A, &BDW_1x2x6::hwInfo, &BDW_1x2x6::setupHardwareInfo, GTTYPE_GT1},
|
||||
{0x1606, &BDW_1x2x6::hwInfo, &BDW_1x2x6::setupHardwareInfo, GTTYPE_GT1},
|
||||
{0x160E, &BDW_1x2x6::hwInfo, &BDW_1x2x6::setupHardwareInfo, GTTYPE_GT1},
|
||||
{0x160D, &BDW_1x2x6::hwInfo, &BDW_1x2x6::setupHardwareInfo, GTTYPE_GT1},
|
||||
|
||||
{0x0BD2, &BDW_1x3x8::hwInfo, &BDW_1x3x8::setupHardwareInfo, GTTYPE_GT2},
|
||||
{0x1612, &BDW_1x3x8::hwInfo, &BDW_1x3x8::setupHardwareInfo, GTTYPE_GT2},
|
||||
{0x161A, &BDW_1x3x8::hwInfo, &BDW_1x3x8::setupHardwareInfo, GTTYPE_GT2},
|
||||
{0x1616, &BDW_1x3x8::hwInfo, &BDW_1x3x8::setupHardwareInfo, GTTYPE_GT2},
|
||||
{0x161E, &BDW_1x3x8::hwInfo, &BDW_1x3x8::setupHardwareInfo, GTTYPE_GT2},
|
||||
{0x161D, &BDW_1x3x8::hwInfo, &BDW_1x3x8::setupHardwareInfo, GTTYPE_GT2},
|
||||
|
||||
{0x0BD3, &BDW_2x3x8::hwInfo, &BDW_2x3x8::setupHardwareInfo, GTTYPE_GT3},
|
||||
{0x1622, &BDW_2x3x8::hwInfo, &BDW_2x3x8::setupHardwareInfo, GTTYPE_GT3},
|
||||
{0x162A, &BDW_2x3x8::hwInfo, &BDW_2x3x8::setupHardwareInfo, GTTYPE_GT3},
|
||||
{0x1626, &BDW_2x3x8::hwInfo, &BDW_2x3x8::setupHardwareInfo, GTTYPE_GT3},
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright (C) 2018-2020 Intel Corporation
|
||||
* Copyright (C) 2018-2021 Intel Corporation
|
||||
*
|
||||
* SPDX-License-Identifier: MIT
|
||||
*
|
||||
@ -14,8 +14,7 @@
|
||||
using namespace NEO;
|
||||
|
||||
TEST(SklDeviceIdTest, GivenSupportedDeviceIdThenHardwareInfoIsCorrect) {
|
||||
std::array<DeviceDescriptor, 30> expectedDescriptors = {{
|
||||
{0x0901, &SKL_1x2x6::hwInfo, &SKL_1x2x6::setupHardwareInfo, GTTYPE_GT1},
|
||||
std::array<DeviceDescriptor, 26> expectedDescriptors = {{
|
||||
{0x1902, &SKL_1x2x6::hwInfo, &SKL_1x2x6::setupHardwareInfo, GTTYPE_GT1},
|
||||
{0x190B, &SKL_1x2x6::hwInfo, &SKL_1x2x6::setupHardwareInfo, GTTYPE_GT1},
|
||||
{0x190A, &SKL_1x2x6::hwInfo, &SKL_1x2x6::setupHardwareInfo, GTTYPE_GT1},
|
||||
@ -26,7 +25,6 @@ TEST(SklDeviceIdTest, GivenSupportedDeviceIdThenHardwareInfoIsCorrect) {
|
||||
{0x1913, &SKL_1x3x6::hwInfo, &SKL_1x3x6::setupHardwareInfo, GTTYPE_GT1_5},
|
||||
{0x1915, &SKL_1x3x6::hwInfo, &SKL_1x3x6::setupHardwareInfo, GTTYPE_GT1_5},
|
||||
|
||||
{0x0902, &SKL_1x3x8::hwInfo, &SKL_1x3x8::setupHardwareInfo, GTTYPE_GT2},
|
||||
{0x1912, &SKL_1x3x8::hwInfo, &SKL_1x3x8::setupHardwareInfo, GTTYPE_GT2},
|
||||
{0x191B, &SKL_1x3x8::hwInfo, &SKL_1x3x8::setupHardwareInfo, GTTYPE_GT2},
|
||||
{0x191A, &SKL_1x3x8::hwInfo, &SKL_1x3x8::setupHardwareInfo, GTTYPE_GT2},
|
||||
@ -36,7 +34,6 @@ TEST(SklDeviceIdTest, GivenSupportedDeviceIdThenHardwareInfoIsCorrect) {
|
||||
{0x1921, &SKL_1x3x8::hwInfo, &SKL_1x3x8::setupHardwareInfo, GTTYPE_GT2},
|
||||
{0x9905, &SKL_1x3x8::hwInfo, &SKL_1x3x8::setupHardwareInfo, GTTYPE_GT2},
|
||||
|
||||
{0x0903, &SKL_2x3x8::hwInfo, &SKL_2x3x8::setupHardwareInfo, GTTYPE_GT3},
|
||||
{0x192B, &SKL_2x3x8::hwInfo, &SKL_2x3x8::setupHardwareInfo, GTTYPE_GT3},
|
||||
{0x192D, &SKL_2x3x8::hwInfo, &SKL_2x3x8::setupHardwareInfo, GTTYPE_GT3},
|
||||
{0x192A, &SKL_2x3x8::hwInfo, &SKL_2x3x8::setupHardwareInfo, GTTYPE_GT3},
|
||||
@ -44,7 +41,6 @@ TEST(SklDeviceIdTest, GivenSupportedDeviceIdThenHardwareInfoIsCorrect) {
|
||||
{0x1926, &SKL_2x3x8::hwInfo, &SKL_2x3x8::setupHardwareInfo, GTTYPE_GT3},
|
||||
{0x1927, &SKL_2x3x8::hwInfo, &SKL_2x3x8::setupHardwareInfo, GTTYPE_GT3},
|
||||
|
||||
{0x0904, &SKL_3x3x8::hwInfo, &SKL_3x3x8::setupHardwareInfo, GTTYPE_GT4},
|
||||
{0x1932, &SKL_3x3x8::hwInfo, &SKL_3x3x8::setupHardwareInfo, GTTYPE_GT4},
|
||||
{0x193B, &SKL_3x3x8::hwInfo, &SKL_3x3x8::setupHardwareInfo, GTTYPE_GT4},
|
||||
{0x193A, &SKL_3x3x8::hwInfo, &SKL_3x3x8::setupHardwareInfo, GTTYPE_GT4},
|
||||
|
||||
Reference in New Issue
Block a user