Device ID cleanup:

- Use commmon naming scheme
- Add missing ULTs
- Remove redundancies

Related-To: NEO-5250

Change-Id: Id6ed25c078b54f7d6ea43f2d3b71dc827ff2d088
Signed-off-by: Adam Cetnerowski <adam.cetnerowski@intel.com>
This commit is contained in:
Adam Cetnerowski
2020-11-02 18:55:30 +01:00
committed by sys_ocldev
parent 8e6be83fcc
commit 605629d89e
17 changed files with 319 additions and 349 deletions

3
FAQ.md
View File

@ -48,8 +48,7 @@ See [README.md](https://github.com/intel/compute-runtime/blob/master/README.md).
To check support for any device, you can follow these steps:
1. Go to [Ark]( https://ark.intel.com) and find your Device ID
1. Find the corresponding device ID label in [GMM]( https://github.com/intel/gmmlib/blob/master/Source/inc/common/igfxfmid.h)
1. Check if this device ID label is enumerated in the
1. Check if this Device ID is enumerated in the
[supported device list](https://github.com/intel/compute-runtime/blob/master/opencl/source/dll/linux/devices/devices_base.inl)
### When will support for platform X be added?

View File

@ -44,7 +44,6 @@ set(RUNTIME_SRCS_DLL_LINUX
${CMAKE_CURRENT_SOURCE_DIR}/linux/create_drm_memory_manager.cpp
${CMAKE_CURRENT_SOURCE_DIR}/linux/devices${BRANCH_DIR_SUFFIX}/devices.inl
${CMAKE_CURRENT_SOURCE_DIR}/linux/devices/devices_base.inl
${CMAKE_CURRENT_SOURCE_DIR}/linux/devices/device_ids.h
${CMAKE_CURRENT_SOURCE_DIR}/linux/drm_neo_create.cpp
${CMAKE_CURRENT_SOURCE_DIR}/linux/options_linux.cpp
${CMAKE_CURRENT_SOURCE_DIR}/linux/os_interface.cpp

View File

@ -1,19 +0,0 @@
/*
* Copyright (C) 2020 Intel Corporation
*
* SPDX-License-Identifier: MIT
*
*/
#pragma once
#define DEVICE_ID_4C80 0x4C80
#define DEVICE_ID_4C8A 0x4C8A
#define DEVICE_ID_4C8B 0x4C8B
#define DEVICE_ID_4C8C 0x4C8C
#define DEVICE_ID_4C90 0x4C90
#define DEVICE_ID_4C9A 0x4C9A
#define DEVICE_ID_4600 0x4600
#define DEVICE_ID_4680 0x4680
#define DEVICE_ID_46FF 0x46FF

View File

@ -5,19 +5,17 @@
*
*/
#include "opencl/source/dll/linux/devices/device_ids.h"
// clang-format off
#ifdef SUPPORT_GEN12LP
#ifdef SUPPORT_TGLLP
DEVICE( DEV_ID_FF20, TGLLP_1x6x16, GTTYPE_GT2 )
DEVICE( DEV_ID_9A49, TGLLP_1x6x16, GTTYPE_GT2 )
DEVICE( DEV_ID_9A40, TGLLP_1x6x16, GTTYPE_GT2 )
DEVICE( DEV_ID_9A59, TGLLP_1x6x16, GTTYPE_GT2 )
DEVICE( DEV_ID_9A60, TGLLP_1x2x16, GTTYPE_GT2 )
DEVICE( DEV_ID_9A68, TGLLP_1x2x16, GTTYPE_GT2 )
DEVICE( DEV_ID_9A70, TGLLP_1x2x16, GTTYPE_GT2 )
DEVICE( DEV_ID_9A78, TGLLP_1x2x16, GTTYPE_GT2 )
DEVICE( 0xFF20, TGLLP_1x6x16, GTTYPE_GT2 )
DEVICE( 0x9A49, TGLLP_1x6x16, GTTYPE_GT2 )
DEVICE( 0x9A40, TGLLP_1x6x16, GTTYPE_GT2 )
DEVICE( 0x9A59, TGLLP_1x6x16, GTTYPE_GT2 )
DEVICE( 0x9A60, TGLLP_1x2x16, GTTYPE_GT2 )
DEVICE( 0x9A68, TGLLP_1x2x16, GTTYPE_GT2 )
DEVICE( 0x9A70, TGLLP_1x2x16, GTTYPE_GT2 )
DEVICE( 0x9A78, TGLLP_1x2x16, GTTYPE_GT2 )
#endif
#ifdef SUPPORT_DG1
DEVICE( 0x4905, DG1_CONFIG, GTTYPE_GT2 )
@ -26,49 +24,49 @@ DEVICE( 0x4907, DG1_CONFIG, GTTYPE_GT2 )
DEVICE( 0x4908, DG1_CONFIG, GTTYPE_GT2 )
#endif
#ifdef SUPPORT_RKL
DEVICE( DEVICE_ID_4C80, RKL_HW_CONFIG, GTTYPE_GT1 )
DEVICE( DEVICE_ID_4C8A, RKL_HW_CONFIG, GTTYPE_GT1 )
DEVICE( DEVICE_ID_4C8B, RKL_HW_CONFIG, GTTYPE_GT1 )
DEVICE( DEVICE_ID_4C8C, RKL_HW_CONFIG, GTTYPE_GT0_5 )
DEVICE( DEVICE_ID_4C90, RKL_HW_CONFIG, GTTYPE_GT1 )
DEVICE( DEVICE_ID_4C9A, RKL_HW_CONFIG, GTTYPE_GT1 )
DEVICE( 0x4C80, RKL_HW_CONFIG, GTTYPE_GT1 )
DEVICE( 0x4C8A, RKL_HW_CONFIG, GTTYPE_GT1 )
DEVICE( 0x4C8B, RKL_HW_CONFIG, GTTYPE_GT1 )
DEVICE( 0x4C8C, RKL_HW_CONFIG, GTTYPE_GT0_5 )
DEVICE( 0x4C90, RKL_HW_CONFIG, GTTYPE_GT1 )
DEVICE( 0x4C9A, RKL_HW_CONFIG, GTTYPE_GT1 )
#endif
#ifdef SUPPORT_ADLS
DEVICE( DEVICE_ID_4680, ADLS_HW_CONFIG, GTTYPE_GT1 )
DEVICE( DEVICE_ID_46FF, ADLS_HW_CONFIG, GTTYPE_GT1 )
DEVICE( DEVICE_ID_4600, ADLS_HW_CONFIG, GTTYPE_GT1 )
DEVICE( 0x4680, ADLS_HW_CONFIG, GTTYPE_GT1 )
DEVICE( 0x46FF, ADLS_HW_CONFIG, GTTYPE_GT1 )
DEVICE( 0x4600, ADLS_HW_CONFIG, GTTYPE_GT1 )
#endif
#endif
#ifdef SUPPORT_GEN11
#ifdef SUPPORT_ICLLP
// GT1
DEVICE( IICL_LP_GT1_MOB_DEVICE_F0_ID, ICLLP_1x4x8, GTTYPE_GT1 )
DEVICE( IICL_LP_1x4x8_LOW_MEDIA_ULT_DEVICE_F0_ID, ICLLP_1x4x8, GTTYPE_GT1 )
DEVICE( IICL_LP_1x4x8_LOW_MEDIA_ULX_DEVICE_F0_ID, ICLLP_1x4x8, GTTYPE_GT1 )
DEVICE( IICL_LP_1x6x8_ULX_DEVICE_F0_ID, ICLLP_1x6x8, GTTYPE_GT1 )
DEVICE( IICL_LP_1x6x8_ULT_DEVICE_F0_ID, ICLLP_1x6x8, GTTYPE_GT1 )
DEVICE( 0xFF05, ICLLP_1x4x8, GTTYPE_GT1 )
DEVICE( 0x8A56, ICLLP_1x4x8, GTTYPE_GT1 )
DEVICE( 0x8A58, ICLLP_1x4x8, GTTYPE_GT1 )
DEVICE( 0x8A5C, ICLLP_1x6x8, GTTYPE_GT1 )
DEVICE( 0x8A5A, ICLLP_1x6x8, GTTYPE_GT1 )
// GT2
DEVICE( IICL_LP_1x8x8_SUPERSKU_DEVICE_F0_ID, ICLLP_1x8x8, GTTYPE_GT2 )
DEVICE( IICL_LP_1x8x8_ULT_DEVICE_F0_ID, ICLLP_1x8x8, GTTYPE_GT2 )
DEVICE( IICL_LP_1x8x8_ULX_DEVICE_F0_ID, ICLLP_1x8x8, GTTYPE_GT2 )
DEVICE( 0x8A50, ICLLP_1x8x8, GTTYPE_GT2 )
DEVICE( 0x8A52, ICLLP_1x8x8, GTTYPE_GT2 )
DEVICE( 0x8A51, ICLLP_1x8x8, GTTYPE_GT2 )
#endif
#ifdef SUPPORT_LKF
DEVICE( ILKF_1x8x8_DESK_DEVICE_F0_ID, LKF_1x8x8, GTTYPE_GT1 )
DEVICE( 0x9840, LKF_1x8x8, GTTYPE_GT1 )
#endif
#ifdef SUPPORT_EHL
DEVICE( DEV_ID_4500, EHL_HW_CONFIG, GTTYPE_GT1 )
DEVICE( DEV_ID_4541, EHL_HW_CONFIG, GTTYPE_GT1 )
DEVICE( DEV_ID_4551, EHL_HW_CONFIG, GTTYPE_GT1 )
DEVICE( DEV_ID_4571, EHL_HW_CONFIG, GTTYPE_GT1 )
DEVICE( DEV_ID_4555, EHL_HW_CONFIG, GTTYPE_GT1 )
DEVICE( DEV_ID_4E51, EHL_HW_CONFIG, GTTYPE_GT1 )
DEVICE( DEV_ID_4E61, EHL_HW_CONFIG, GTTYPE_GT1 )
DEVICE( DEV_ID_4E71, EHL_HW_CONFIG, GTTYPE_GT1 )
DEVICE( DEV_ID_4E55, EHL_HW_CONFIG, GTTYPE_GT1 )
DEVICE( 0x4500, EHL_HW_CONFIG, GTTYPE_GT1 )
DEVICE( 0x4541, EHL_HW_CONFIG, GTTYPE_GT1 )
DEVICE( 0x4551, EHL_HW_CONFIG, GTTYPE_GT1 )
DEVICE( 0x4571, EHL_HW_CONFIG, GTTYPE_GT1 )
DEVICE( 0x4555, EHL_HW_CONFIG, GTTYPE_GT1 )
DEVICE( 0x4E51, EHL_HW_CONFIG, GTTYPE_GT1 )
DEVICE( 0x4E61, EHL_HW_CONFIG, GTTYPE_GT1 )
DEVICE( 0x4E71, EHL_HW_CONFIG, GTTYPE_GT1 )
DEVICE( 0x4E55, EHL_HW_CONFIG, GTTYPE_GT1 )
#endif
#endif
@ -76,168 +74,166 @@ DEVICE( DEV_ID_4E55, EHL_HW_CONFIG, GTTYPE_GT1 )
#ifdef SUPPORT_GEN9
#ifdef SUPPORT_SKL
// GT1
DEVICE( ISKL_GT1_DESK_DEVICE_F0_ID, SKL_1x2x6, GTTYPE_GT1 )
DEVICE( ISKL_GT1_DT_DEVICE_F0_ID, SKL_1x2x6, GTTYPE_GT1 )
DEVICE( ISKL_GT1_HALO_MOBL_DEVICE_F0_ID, SKL_1x2x6, GTTYPE_GT1 )
DEVICE( ISKL_GT1_SERV_DEVICE_F0_ID, SKL_1x2x6, GTTYPE_GT1 )
DEVICE( ISKL_GT1_ULT_DEVICE_F0_ID, SKL_1x2x6, GTTYPE_GT1 )
DEVICE( ISKL_GT1_ULX_DEVICE_F0_ID, SKL_1x2x6, GTTYPE_GT1 )
DEVICE( 0x0901, SKL_1x2x6, GTTYPE_GT1 )
DEVICE( 0x1902, SKL_1x2x6, GTTYPE_GT1 )
DEVICE( 0x190B, SKL_1x2x6, GTTYPE_GT1 )
DEVICE( 0x190A, SKL_1x2x6, GTTYPE_GT1 )
DEVICE( 0x1906, SKL_1x2x6, GTTYPE_GT1 )
DEVICE( 0x190E, SKL_1x2x6, GTTYPE_GT1 )
// GT1_5
DEVICE( ISKL_GT1_5_DT_DEVICE_F0_ID, SKL_1x3x6, GTTYPE_GT1_5 )
DEVICE( ISKL_GT1_5_ULT_DEVICE_F0_ID, SKL_1x3x6, GTTYPE_GT1_5 )
DEVICE( ISKL_GT1_5_ULX_DEVICE_F0_ID, SKL_1x3x6, GTTYPE_GT1_5 )
DEVICE( 0x1917, SKL_1x3x6, GTTYPE_GT1_5 )
DEVICE( 0x1913, SKL_1x3x6, GTTYPE_GT1_5 )
DEVICE( 0X1915, SKL_1x3x6, GTTYPE_GT1_5 )
// GT2
DEVICE( ISKL_GT2_DESK_DEVICE_F0_ID, SKL_1x3x8, GTTYPE_GT2 )
DEVICE( ISKL_GT2_DT_DEVICE_F0_ID, SKL_1x3x8, GTTYPE_GT2 )
DEVICE( ISKL_GT2_HALO_MOBL_DEVICE_F0_ID, SKL_1x3x8, GTTYPE_GT2 )
DEVICE( ISKL_GT2_SERV_DEVICE_F0_ID, SKL_1x3x8, GTTYPE_GT2 )
DEVICE( ISKL_GT2_ULT_DEVICE_F0_ID, SKL_1x3x8, GTTYPE_GT2 )
DEVICE( ISKL_GT2_ULX_DEVICE_F0_ID, SKL_1x3x8, GTTYPE_GT2 )
DEVICE( ISKL_GT2_WRK_DEVICE_F0_ID, SKL_1x3x8, GTTYPE_GT2 )
DEVICE( ISKL_GT2F_ULT_DEVICE_F0_ID, SKL_1x3x8, GTTYPE_GT2 )
DEVICE( ISKL_LP_DEVICE_F0_ID, SKL_1x3x8, GTTYPE_GT2 )
DEVICE( 0x0902, SKL_1x3x8, GTTYPE_GT2 )
DEVICE( 0x1912, SKL_1x3x8, GTTYPE_GT2 )
DEVICE( 0x191B, SKL_1x3x8, GTTYPE_GT2 )
DEVICE( 0x191A, SKL_1x3x8, GTTYPE_GT2 )
DEVICE( 0x1916, SKL_1x3x8, GTTYPE_GT2 )
DEVICE( 0x191E, SKL_1x3x8, GTTYPE_GT2 )
DEVICE( 0x191D, SKL_1x3x8, GTTYPE_GT2 )
DEVICE( 0x1921, SKL_1x3x8, GTTYPE_GT2 )
DEVICE( 0x9905, SKL_1x3x8, GTTYPE_GT2 )
// GT3
DEVICE( ISKL_GT3_DESK_DEVICE_F0_ID, SKL_2x3x8, GTTYPE_GT3 )
DEVICE( ISKL_GT3_HALO_MOBL_DEVICE_F0_ID, SKL_2x3x8, GTTYPE_GT3 )
DEVICE( ISKL_GT3_MEDIA_SERV_DEVICE_F0_ID, SKL_2x3x8, GTTYPE_GT3 )
DEVICE( ISKL_GT3_SERV_DEVICE_F0_ID, SKL_2x3x8, GTTYPE_GT3 )
DEVICE( ISKL_GT3_ULT_DEVICE_F0_ID, SKL_2x3x8, GTTYPE_GT3 )
DEVICE( ISKL_GT3e_ULT_DEVICE_F0_ID_540, SKL_2x3x8, GTTYPE_GT3 )
DEVICE( ISKL_GT3e_ULT_DEVICE_F0_ID_550, SKL_2x3x8, GTTYPE_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 )
DEVICE( 0x1923, SKL_2x3x8, GTTYPE_GT3 )
DEVICE( 0x1926, SKL_2x3x8, GTTYPE_GT3 )
DEVICE( 0x1927, SKL_2x3x8, GTTYPE_GT3 )
// GT4
DEVICE( ISKL_GT4_DESK_DEVICE_F0_ID, SKL_3x3x8, GTTYPE_GT4 )
DEVICE( ISKL_GT4_DT_DEVICE_F0_ID, SKL_3x3x8, GTTYPE_GT4 )
DEVICE( ISKL_GT4_HALO_MOBL_DEVICE_F0_ID, SKL_3x3x8, GTTYPE_GT4 )
DEVICE( ISKL_GT4_SERV_DEVICE_F0_ID, SKL_3x3x8, GTTYPE_GT4 )
DEVICE( ISKL_GT4_WRK_DEVICE_F0_ID, SKL_3x3x8, GTTYPE_GT4 )
DEVICE( 0x0904, SKL_3x3x8, GTTYPE_GT4 )
DEVICE( 0x1932, SKL_3x3x8, GTTYPE_GT4 )
DEVICE( 0x193B, SKL_3x3x8, GTTYPE_GT4 )
DEVICE( 0x193A, SKL_3x3x8, GTTYPE_GT4 )
DEVICE( 0x193D, SKL_3x3x8, GTTYPE_GT4 )
#endif
#ifdef SUPPORT_KBL
// GT1
DEVICE( IKBL_GT1_DT_DEVICE_F0_ID, KBL_1x2x6, GTTYPE_GT1 )
DEVICE( IKBL_GT1_HALO_DEVICE_F0_ID, KBL_1x2x6, GTTYPE_GT1 )
DEVICE( IKBL_GT1_SERV_DEVICE_F0_ID, KBL_1x2x6, GTTYPE_GT1 )
DEVICE( IKBL_GT1_ULT_DEVICE_F0_ID, KBL_1x2x6, GTTYPE_GT1 )
DEVICE( IKBL_GT1_ULX_DEVICE_F0_ID, KBL_1x3x6, GTTYPE_GT1 )
DEVICE( IKBL_GT1F_HALO_DEVICE_F0_ID, KBL_1x2x6, GTTYPE_GT1 )
DEVICE( 0x5902, KBL_1x2x6, GTTYPE_GT1 )
DEVICE( 0x590B, KBL_1x2x6, GTTYPE_GT1 )
DEVICE( 0x590A, KBL_1x2x6, GTTYPE_GT1 )
DEVICE( 0x5906, KBL_1x2x6, GTTYPE_GT1 )
DEVICE( 0x590E, KBL_1x3x6, GTTYPE_GT1 )
DEVICE( 0x5908, KBL_1x2x6, GTTYPE_GT1 )
// GT1_5
DEVICE( IKBL_GT1_5_ULT_DEVICE_F0_ID, KBL_1x3x6, GTTYPE_GT1_5 )
DEVICE( IKBL_GT1_5_ULX_DEVICE_F0_ID, KBL_1x2x6, GTTYPE_GT1_5 )
DEVICE( 0x5913, KBL_1x3x6, GTTYPE_GT1_5 )
DEVICE( 0x5915, KBL_1x2x6, GTTYPE_GT1_5 )
// GT2
DEVICE( IKBL_GT2_DT_DEVICE_F0_ID, KBL_1x3x8, GTTYPE_GT2 )
DEVICE( IKBL_GT2_HALO_DEVICE_F0_ID, KBL_1x3x8, GTTYPE_GT2 )
DEVICE( IKBL_GT2_R_ULT_DEVICE_F0_ID, KBL_1x3x8, GTTYPE_GT2 )
DEVICE( IKBL_GT2_SERV_DEVICE_F0_ID, KBL_1x3x8, GTTYPE_GT2 )
DEVICE( IKBL_GT2_ULT_DEVICE_F0_ID, KBL_1x3x8, GTTYPE_GT2 )
DEVICE( IKBL_GT2_ULX_DEVICE_F0_ID, KBL_1x3x8, GTTYPE_GT2 )
DEVICE( IKBL_GT2_WRK_DEVICE_F0_ID, KBL_1x3x8, GTTYPE_GT2 )
DEVICE( IKBL_GT2_R_ULX_DEVICE_F0_ID, KBL_1x3x8, GTTYPE_GT2 )
DEVICE( IKBL_GT2F_ULT_DEVICE_F0_ID, KBL_1x3x8, GTTYPE_GT2 )
DEVICE( 0x5912, KBL_1x3x8, GTTYPE_GT2 )
DEVICE( 0x591B, KBL_1x3x8, GTTYPE_GT2 )
DEVICE( 0x5917, KBL_1x3x8, GTTYPE_GT2 )
DEVICE( 0x591A, KBL_1x3x8, GTTYPE_GT2 )
DEVICE( 0x5916, KBL_1x3x8, GTTYPE_GT2 )
DEVICE( 0x591E, KBL_1x3x8, GTTYPE_GT2 )
DEVICE( 0x591D, KBL_1x3x8, GTTYPE_GT2 )
DEVICE( 0x591C, KBL_1x3x8, GTTYPE_GT2 )
DEVICE( 0x5921, KBL_1x3x8, GTTYPE_GT2 )
// GT3
DEVICE( IKBL_GT3_15W_ULT_DEVICE_F0_ID, KBL_2x3x8, GTTYPE_GT3 )
DEVICE( IKBL_GT3_28W_ULT_DEVICE_F0_ID, KBL_2x3x8, GTTYPE_GT3 )
DEVICE( IKBL_GT3_HALO_DEVICE_F0_ID, KBL_2x3x8, GTTYPE_GT3 )
DEVICE( IKBL_GT3_SERV_DEVICE_F0_ID, KBL_2x3x8, GTTYPE_GT3 )
DEVICE( IKBL_GT3_ULT_DEVICE_F0_ID, KBL_2x3x8, GTTYPE_GT3 )
DEVICE( 0x5926, KBL_2x3x8, GTTYPE_GT3 )
DEVICE( 0x5927, KBL_2x3x8, GTTYPE_GT3 )
DEVICE( 0x592B, KBL_2x3x8, GTTYPE_GT3 )
DEVICE( 0x592A, KBL_2x3x8, GTTYPE_GT3 )
DEVICE( 0x5923, KBL_2x3x8, GTTYPE_GT3 )
// GT4
DEVICE( IKBL_GT4_DT_DEVICE_F0_ID, KBL_3x3x8, GTTYPE_GT4 )
DEVICE( IKBL_GT4_HALO_DEVICE_F0_ID, KBL_3x3x8, GTTYPE_GT4 )
DEVICE( IKBL_GT4_SERV_DEVICE_F0_ID, KBL_3x3x8, GTTYPE_GT4 )
DEVICE( IKBL_GT4_WRK_DEVICE_F0_ID, KBL_3x3x8, GTTYPE_GT4 )
DEVICE( 0x5932, KBL_3x3x8, GTTYPE_GT4 )
DEVICE( 0x593B, KBL_3x3x8, GTTYPE_GT4 )
DEVICE( 0x593A, KBL_3x3x8, GTTYPE_GT4 )
DEVICE( 0x593D, KBL_3x3x8, GTTYPE_GT4 )
#endif
#ifdef SUPPORT_CFL
// GT1
DEVICE( ICFL_GT1_DT_DEVICE_F0_ID, CFL_1x2x6, GTTYPE_GT1 )
DEVICE( ICFL_GT1_S41_DT_DEVICE_F0_ID, CFL_1x2x6, GTTYPE_GT1 )
DEVICE( ICFL_GT1_S61_DT_DEVICE_F0_ID, CFL_1x2x6, GTTYPE_GT1 )
DEVICE( ICFL_GT1_41F_2F1F_ULT_DEVICE_F0_ID, CFL_1x2x6, GTTYPE_GT1 )
DEVICE( ICFL_GT1_S6_S4_S2_F1F_DT_DEVICE_F0_ID, CFL_1x2x6, GTTYPE_GT1 )
DEVICE( ICFL_GT1_U41F_U2F1F_ULT_DEVICE_F0_ID, CFL_1x2x6, GTTYPE_GT1 )
DEVICE( 0x3E90, CFL_1x2x6, GTTYPE_GT1 )
DEVICE( 0x3E93, CFL_1x2x6, GTTYPE_GT1 )
DEVICE( 0x3EA4, CFL_1x2x6, GTTYPE_GT1 )
DEVICE( 0x3E99, CFL_1x2x6, GTTYPE_GT1 )
DEVICE( 0x3EA1, CFL_1x2x6, GTTYPE_GT1 )
// GT2
DEVICE( ICFL_GT2_DT_DEVICE_F0_ID, CFL_1x3x8, GTTYPE_GT2 )
DEVICE( ICFL_GT2_HALO_DEVICE_F0_ID, CFL_1x3x8, GTTYPE_GT2 )
DEVICE( ICFL_GT2_HALO_WS_DEVICE_F0_ID, CFL_1x3x8, GTTYPE_GT2 )
DEVICE( ICFL_GT2_S42_DT_DEVICE_F0_ID, CFL_1x3x8, GTTYPE_GT2 )
DEVICE( ICFL_GT2_S62_DT_DEVICE_F0_ID, CFL_1x3x8, GTTYPE_GT2 )
DEVICE( ICFL_GT2_SERV_DEVICE_F0_ID, CFL_1x3x8, GTTYPE_GT2 )
DEVICE( ICFL_GT2_S82_S6F2_DT_DEVICE_F0_ID, CFL_1x3x8, GTTYPE_GT2 )
DEVICE( ICFL_GT2_U42F_U2F1F_ULT_DEVICE_F0_ID, CFL_1x3x8, GTTYPE_GT2 )
DEVICE( ICFL_GT2_U42F_U2F2F_ULT_DEVICE_F0_ID, CFL_1x3x8, GTTYPE_GT2 )
DEVICE( ICFL_GT2_U42F_U2F2_ULT_DEVICE_F0_ID, CFL_1x3x8, GTTYPE_GT2 )
DEVICE( ICFL_GT2_S8_S2_DT_DEVICE_F0_ID, CFL_1x3x8, GTTYPE_GT2 )
DEVICE( 0x3E92, CFL_1x3x8, GTTYPE_GT2 )
DEVICE( 0x3E9B, CFL_1x3x8, GTTYPE_GT2 )
DEVICE( 0x3E94, CFL_1x3x8, GTTYPE_GT2 )
DEVICE( 0x3E91, CFL_1x3x8, GTTYPE_GT2 )
DEVICE( 0x3E96, CFL_1x3x8, GTTYPE_GT2 )
DEVICE( 0x3E9A, CFL_1x3x8, GTTYPE_GT2 )
DEVICE( 0x3EA3, CFL_1x3x8, GTTYPE_GT2 )
DEVICE( 0x3EA9, CFL_1x3x8, GTTYPE_GT2 )
DEVICE( 0x3EA0, CFL_1x3x8, GTTYPE_GT2 )
DEVICE( 0x3E98, CFL_1x3x8, GTTYPE_GT2 )
// GT3
DEVICE( ICFL_HALO_DEVICE_F0_ID, CFL_2x3x8, GTTYPE_GT3 )
DEVICE( ICFL_GT3_ULT_15W_DEVICE_F0_ID, CFL_2x3x8, GTTYPE_GT3 )
DEVICE( ICFL_GT3_ULT_15W_42EU_DEVICE_F0_ID, CFL_2x3x8, GTTYPE_GT3 )
DEVICE( ICFL_GT3_ULT_28W_DEVICE_F0_ID, CFL_2x3x8, GTTYPE_GT3 )
DEVICE( ICFL_GT3_ULT_DEVICE_F0_ID, CFL_2x3x8, GTTYPE_GT3 )
DEVICE( ICFL_GT3_U43_ULT_DEVICE_F0_ID, CFL_2x3x8, GTTYPE_GT3 )
DEVICE( 0x3E95, CFL_2x3x8, GTTYPE_GT3 )
DEVICE( 0x3EA6, CFL_2x3x8, GTTYPE_GT3 )
DEVICE( 0x3EA7, CFL_2x3x8, GTTYPE_GT3 )
DEVICE( 0x3EA8, CFL_2x3x8, GTTYPE_GT3 )
DEVICE( 0x3EA5, CFL_2x3x8, GTTYPE_GT3 )
DEVICE( 0x3EA2, CFL_2x3x8, GTTYPE_GT3 )
// CML GT1
DEVICE( ICFL_GT1_ULT_DEVICE_V0_ID, CFL_1x2x6, GTTYPE_GT1 )
DEVICE( ICFL_GT1_ULT_DEVICE_A0_ID, CFL_1x2x6, GTTYPE_GT1 )
DEVICE( ICFL_GT1_ULT_DEVICE_S0_ID, CFL_1x2x6, GTTYPE_GT1 )
DEVICE( ICFL_GT1_ULT_DEVICE_K0_ID, CFL_1x2x6, GTTYPE_GT1 )
DEVICE( ICFL_GT1_ULX_DEVICE_S0_ID, CFL_1x2x6, GTTYPE_GT1 )
DEVICE( ICFL_GT1_DT_DEVICE_P0_ID, CFL_1x2x6, GTTYPE_GT1 )
DEVICE( ICFL_GT1_DT_DEVICE_G0_ID, CFL_1x2x6, GTTYPE_GT1 )
DEVICE( ICFL_GT1_HALO_DEVICE_16_ID, CFL_1x2x6, GTTYPE_GT1 )
DEVICE( ICFL_GT1_HALO_DEVICE_18_ID, CFL_1x2x6, GTTYPE_GT1 )
DEVICE( 0x9B21, CFL_1x2x6, GTTYPE_GT1 )
DEVICE( 0x9BAA, CFL_1x2x6, GTTYPE_GT1 )
DEVICE( 0x9BAB, CFL_1x2x6, GTTYPE_GT1 )
DEVICE( 0x9BAC, CFL_1x2x6, GTTYPE_GT1 )
DEVICE( 0x9BA0, CFL_1x2x6, GTTYPE_GT1 )
DEVICE( 0x9BA5, CFL_1x2x6, GTTYPE_GT1 )
DEVICE( 0x9BA8, CFL_1x2x6, GTTYPE_GT1 )
DEVICE( 0x9BA4, CFL_1x2x6, GTTYPE_GT1 )
DEVICE( 0x9BA2, CFL_1x2x6, GTTYPE_GT1 )
// CML GT2
DEVICE( ICFL_GT2_ULT_DEVICE_V0_ID, CFL_1x3x8, GTTYPE_GT2 )
DEVICE( ICFL_GT2_ULT_DEVICE_A0_ID, CFL_1x3x8, GTTYPE_GT2 )
DEVICE( ICFL_GT2_ULT_DEVICE_S0_ID, CFL_1x3x8, GTTYPE_GT2 )
DEVICE( ICFL_GT2_ULT_DEVICE_K0_ID, CFL_1x3x8, GTTYPE_GT2 )
DEVICE( ICFL_GT2_ULX_DEVICE_S0_ID, CFL_1x3x8, GTTYPE_GT2 )
DEVICE( ICFL_GT2_DT_DEVICE_P0_ID, CFL_1x3x8, GTTYPE_GT2 )
DEVICE( ICFL_GT2_DT_DEVICE_G0_ID, CFL_1x3x8, GTTYPE_GT2 )
DEVICE( ICFL_GT2_HALO_DEVICE_15_ID, CFL_1x3x8, GTTYPE_GT2 )
DEVICE( ICFL_GT2_HALO_DEVICE_17_ID, CFL_1x3x8, GTTYPE_GT2 )
DEVICE( 0x9B41, CFL_1x3x8, GTTYPE_GT2 )
DEVICE( 0x9BCA, CFL_1x3x8, GTTYPE_GT2 )
DEVICE( 0x9BCB, CFL_1x3x8, GTTYPE_GT2 )
DEVICE( 0x9BCC, CFL_1x3x8, GTTYPE_GT2 )
DEVICE( 0x9BC0, CFL_1x3x8, GTTYPE_GT2 )
DEVICE( 0x9BC5, CFL_1x3x8, GTTYPE_GT2 )
DEVICE( 0x9BC8, CFL_1x3x8, GTTYPE_GT2 )
DEVICE( 0x9BC4, CFL_1x3x8, GTTYPE_GT2 )
DEVICE( 0x9BC2, CFL_1x3x8, GTTYPE_GT2 )
// CML WORKSTATION
DEVICE( ICFL_GT2_WKS_DEVICE_P0_ID, CFL_1x3x8, GTTYPE_GT2 )
DEVICE( ICFL_GT2_WKS_DEVICE_G0_ID, CFL_1x3x8, GTTYPE_GT2 )
DEVICE( 0x9BC6, CFL_1x3x8, GTTYPE_GT2 )
DEVICE( 0x9BE6, CFL_1x3x8, GTTYPE_GT2 )
#endif
#ifdef SUPPORT_GLK
DEVICE( IGLK_GT2_ULT_18EU_DEVICE_F0_ID, GLK_1x3x6, GTTYPE_GTA )
DEVICE( IGLK_GT2_ULT_12EU_DEVICE_F0_ID, GLK_1x2x6, GTTYPE_GTA )
DEVICE( 0x3184, GLK_1x3x6, GTTYPE_GTA )
DEVICE( 0x3185, GLK_1x2x6, GTTYPE_GTA )
#endif
#ifdef SUPPORT_BXT
DEVICE(IBXT_A_DEVICE_F0_ID, BXT_1x3x6, GTTYPE_GTA)
DEVICE(IBXT_C_DEVICE_F0_ID, BXT_1x3x6, GTTYPE_GTA)
DEVICE(IBXT_GT_3x6_DEVICE_ID, BXT_1x3x6, GTTYPE_GTA)
DEVICE(IBXT_P_3x6_DEVICE_ID, BXT_1x3x6, GTTYPE_GTA) //18EU APL
DEVICE(IBXT_P_12EU_3x6_DEVICE_ID, BXT_1x2x6, GTTYPE_GTA) //12EU APL
DEVICE(IBXT_PRO_12EU_3x6_DEVICE_ID, BXT_1x2x6, GTTYPE_GTA) //12EU APL
DEVICE(IBXT_PRO_3x6_DEVICE_ID, BXT_1x3x6, GTTYPE_GTA)
DEVICE(IBXT_X_DEVICE_F0_ID, BXT_1x3x6, GTTYPE_GTA)
DEVICE( 0x9906, BXT_1x3x6, GTTYPE_GTA)
DEVICE( 0x9907, BXT_1x3x6, GTTYPE_GTA)
DEVICE( 0x0A84, BXT_1x3x6, GTTYPE_GTA)
DEVICE( 0x5A84, BXT_1x3x6, GTTYPE_GTA) //18EU APL
DEVICE( 0x5A85, BXT_1x2x6, GTTYPE_GTA) //12EU APL
DEVICE( 0x1A85, BXT_1x2x6, GTTYPE_GTA) //12EU APL
DEVICE( 0x1A84, BXT_1x3x6, GTTYPE_GTA)
DEVICE( 0x9908, BXT_1x3x6, GTTYPE_GTA)
#endif
#endif
#ifdef SUPPORT_GEN8
// GT1
DEVICE( IBDW_GT1_DESK_DEVICE_F0_ID, BDW_1x2x6, GTTYPE_GT1 )
DEVICE( IBDW_GT1_HALO_MOBL_DEVICE_F0_ID, BDW_1x2x6, GTTYPE_GT1 )
DEVICE( IBDW_GT1_SERV_DEVICE_F0_ID, BDW_1x2x6, GTTYPE_GT1 )
DEVICE( IBDW_GT1_ULT_MOBL_DEVICE_F0_ID, BDW_1x2x6, GTTYPE_GT1 )
DEVICE( IBDW_GT1_ULX_DEVICE_F0_ID, BDW_1x2x6, GTTYPE_GT1 )
DEVICE( IBDW_GT1_WRK_DEVICE_F0_ID, BDW_1x2x6, GTTYPE_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( IBDW_GT2_DESK_DEVICE_F0_ID, BDW_1x3x8, GTTYPE_GT2 )
DEVICE( IBDW_GT2_HALO_MOBL_DEVICE_F0_ID, BDW_1x3x8, GTTYPE_GT2 )
DEVICE( IBDW_GT2_SERV_DEVICE_F0_ID, BDW_1x3x8, GTTYPE_GT2 )
DEVICE( IBDW_GT2_ULT_MOBL_DEVICE_F0_ID, BDW_1x3x8, GTTYPE_GT2 )
DEVICE( IBDW_GT2_ULX_DEVICE_F0_ID, BDW_1x3x8, GTTYPE_GT2 )
DEVICE( IBDW_GT2_WRK_DEVICE_F0_ID, BDW_1x3x8, GTTYPE_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( IBDW_GT3_DESK_DEVICE_F0_ID, BDW_2x3x8, GTTYPE_GT3 )
DEVICE( IBDW_GT3_HALO_MOBL_DEVICE_F0_ID, BDW_2x3x8, GTTYPE_GT3 )
DEVICE( IBDW_GT3_SERV_DEVICE_F0_ID, BDW_2x3x8, GTTYPE_GT3 )
DEVICE( IBDW_GT3_ULT_MOBL_DEVICE_F0_ID, BDW_2x3x8, GTTYPE_GT3 )
DEVICE( IBDW_GT3_ULT25W_MOBL_DEVICE_F0_ID, BDW_2x3x8, GTTYPE_GT3 )
DEVICE( IBDW_GT3_ULX_DEVICE_F0_ID, BDW_2x3x8, GTTYPE_GT3 )
DEVICE( IBDW_GT3_WRK_DEVICE_F0_ID, BDW_2x3x8, GTTYPE_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 )
DEVICE( 0x162B, BDW_2x3x8, GTTYPE_GT3 )
DEVICE( 0x162E, BDW_2x3x8, GTTYPE_GT3 )
DEVICE( 0x162D, BDW_2x3x8, GTTYPE_GT3 )
#endif
// clang-format on

View File

@ -15,15 +15,15 @@ using namespace NEO;
TEST(EhlDeviceIdTest, GivenSpportedDeviceIdWhenCheckingHwSetupThenItIsCorrect) {
std::array<DeviceDescriptor, 9> expectedDescriptors = {{
{DEV_ID_4500, &EHL_HW_CONFIG::hwInfo, &EHL_HW_CONFIG::setupHardwareInfo, GTTYPE_GT1},
{DEV_ID_4541, &EHL_HW_CONFIG::hwInfo, &EHL_HW_CONFIG::setupHardwareInfo, GTTYPE_GT1},
{DEV_ID_4551, &EHL_HW_CONFIG::hwInfo, &EHL_HW_CONFIG::setupHardwareInfo, GTTYPE_GT1},
{DEV_ID_4571, &EHL_HW_CONFIG::hwInfo, &EHL_HW_CONFIG::setupHardwareInfo, GTTYPE_GT1},
{DEV_ID_4555, &EHL_HW_CONFIG::hwInfo, &EHL_HW_CONFIG::setupHardwareInfo, GTTYPE_GT1},
{DEV_ID_4E51, &EHL_HW_CONFIG::hwInfo, &EHL_HW_CONFIG::setupHardwareInfo, GTTYPE_GT1},
{DEV_ID_4E61, &EHL_HW_CONFIG::hwInfo, &EHL_HW_CONFIG::setupHardwareInfo, GTTYPE_GT1},
{DEV_ID_4E71, &EHL_HW_CONFIG::hwInfo, &EHL_HW_CONFIG::setupHardwareInfo, GTTYPE_GT1},
{DEV_ID_4E55, &EHL_HW_CONFIG::hwInfo, &EHL_HW_CONFIG::setupHardwareInfo, GTTYPE_GT1},
{0x4500, &EHL_HW_CONFIG::hwInfo, &EHL_HW_CONFIG::setupHardwareInfo, GTTYPE_GT1},
{0x4541, &EHL_HW_CONFIG::hwInfo, &EHL_HW_CONFIG::setupHardwareInfo, GTTYPE_GT1},
{0x4551, &EHL_HW_CONFIG::hwInfo, &EHL_HW_CONFIG::setupHardwareInfo, GTTYPE_GT1},
{0x4571, &EHL_HW_CONFIG::hwInfo, &EHL_HW_CONFIG::setupHardwareInfo, GTTYPE_GT1},
{0x4555, &EHL_HW_CONFIG::hwInfo, &EHL_HW_CONFIG::setupHardwareInfo, GTTYPE_GT1},
{0x4E51, &EHL_HW_CONFIG::hwInfo, &EHL_HW_CONFIG::setupHardwareInfo, GTTYPE_GT1},
{0x4E61, &EHL_HW_CONFIG::hwInfo, &EHL_HW_CONFIG::setupHardwareInfo, GTTYPE_GT1},
{0x4E71, &EHL_HW_CONFIG::hwInfo, &EHL_HW_CONFIG::setupHardwareInfo, GTTYPE_GT1},
{0x4E55, &EHL_HW_CONFIG::hwInfo, &EHL_HW_CONFIG::setupHardwareInfo, GTTYPE_GT1},
}};
auto compareStructs = [](const DeviceDescriptor *first, const DeviceDescriptor *second) {

View File

@ -15,16 +15,16 @@ using namespace NEO;
TEST(IcllpDeviceIdTest, supportedDeviceId) {
std::array<DeviceDescriptor, 8> expectedDescriptors = {{
{IICL_LP_GT1_MOB_DEVICE_F0_ID, &ICLLP_1x4x8::hwInfo, &ICLLP_1x4x8::setupHardwareInfo, GTTYPE_GT1},
{IICL_LP_1x4x8_LOW_MEDIA_ULT_DEVICE_F0_ID, &ICLLP_1x4x8::hwInfo, &ICLLP_1x4x8::setupHardwareInfo, GTTYPE_GT1},
{IICL_LP_1x4x8_LOW_MEDIA_ULX_DEVICE_F0_ID, &ICLLP_1x4x8::hwInfo, &ICLLP_1x4x8::setupHardwareInfo, GTTYPE_GT1},
{0xFF05, &ICLLP_1x4x8::hwInfo, &ICLLP_1x4x8::setupHardwareInfo, GTTYPE_GT1},
{0x8A56, &ICLLP_1x4x8::hwInfo, &ICLLP_1x4x8::setupHardwareInfo, GTTYPE_GT1},
{0x8A58, &ICLLP_1x4x8::hwInfo, &ICLLP_1x4x8::setupHardwareInfo, GTTYPE_GT1},
{IICL_LP_1x6x8_ULX_DEVICE_F0_ID, &ICLLP_1x6x8::hwInfo, &ICLLP_1x6x8::setupHardwareInfo, GTTYPE_GT1},
{IICL_LP_1x6x8_ULT_DEVICE_F0_ID, &ICLLP_1x6x8::hwInfo, &ICLLP_1x6x8::setupHardwareInfo, GTTYPE_GT1},
{0x8A5C, &ICLLP_1x6x8::hwInfo, &ICLLP_1x6x8::setupHardwareInfo, GTTYPE_GT1},
{0x8A5A, &ICLLP_1x6x8::hwInfo, &ICLLP_1x6x8::setupHardwareInfo, GTTYPE_GT1},
{IICL_LP_1x8x8_SUPERSKU_DEVICE_F0_ID, &ICLLP_1x8x8::hwInfo, &ICLLP_1x8x8::setupHardwareInfo, GTTYPE_GT2},
{IICL_LP_1x8x8_ULT_DEVICE_F0_ID, &ICLLP_1x8x8::hwInfo, &ICLLP_1x8x8::setupHardwareInfo, GTTYPE_GT2},
{IICL_LP_1x8x8_ULX_DEVICE_F0_ID, &ICLLP_1x8x8::hwInfo, &ICLLP_1x8x8::setupHardwareInfo, GTTYPE_GT2},
{0x8A50, &ICLLP_1x8x8::hwInfo, &ICLLP_1x8x8::setupHardwareInfo, GTTYPE_GT2},
{0x8A52, &ICLLP_1x8x8::hwInfo, &ICLLP_1x8x8::setupHardwareInfo, GTTYPE_GT2},
{0x8A51, &ICLLP_1x8x8::hwInfo, &ICLLP_1x8x8::setupHardwareInfo, GTTYPE_GT2},
}};
auto compareStructs = [](const DeviceDescriptor *first, const DeviceDescriptor *second) {

View File

@ -15,7 +15,7 @@ using namespace NEO;
TEST(LkfDeviceIdTest, supportedDeviceId) {
std::array<DeviceDescriptor, 1> expectedDescriptors = {{
{ILKF_1x8x8_DESK_DEVICE_F0_ID, &LKF_1x8x8::hwInfo, &LKF_1x8x8::setupHardwareInfo, GTTYPE_GT1},
{0x9840, &LKF_1x8x8::hwInfo, &LKF_1x8x8::setupHardwareInfo, GTTYPE_GT1},
}};
auto compareStructs = [](const DeviceDescriptor *first, const DeviceDescriptor *second) {

View File

@ -8,7 +8,6 @@
#include "shared/source/gen12lp/hw_cmds_adls.h"
#include "shared/source/os_interface/linux/drm_neo.h"
#include "opencl/source/dll/linux/devices/device_ids.h"
#include "test.h"
#include <array>
@ -17,9 +16,9 @@ using namespace NEO;
TEST(AdlsDeviceIdTest, supportedDeviceId) {
std::array<DeviceDescriptor, 3> expectedDescriptors = {{
{DEVICE_ID_4680, &ADLS_HW_CONFIG::hwInfo, &ADLS_HW_CONFIG::setupHardwareInfo, GTTYPE_GT1},
{DEVICE_ID_46FF, &ADLS_HW_CONFIG::hwInfo, &ADLS_HW_CONFIG::setupHardwareInfo, GTTYPE_GT1},
{DEVICE_ID_4600, &ADLS_HW_CONFIG::hwInfo, &ADLS_HW_CONFIG::setupHardwareInfo, GTTYPE_GT1},
{0x4680, &ADLS_HW_CONFIG::hwInfo, &ADLS_HW_CONFIG::setupHardwareInfo, GTTYPE_GT1},
{0x46FF, &ADLS_HW_CONFIG::hwInfo, &ADLS_HW_CONFIG::setupHardwareInfo, GTTYPE_GT1},
{0x4600, &ADLS_HW_CONFIG::hwInfo, &ADLS_HW_CONFIG::setupHardwareInfo, GTTYPE_GT1},
}};
auto compareStructs = [](const DeviceDescriptor *first, const DeviceDescriptor *second) {

View File

@ -5,7 +5,6 @@
*
*/
#include "opencl/source/dll/linux/devices/device_ids.h"
#include "opencl/test/unit_test/fixtures/cl_device_fixture.h"
#include "test.h"
@ -15,7 +14,7 @@ using AdlsUsDeviceIdTest = Test<ClDeviceFixture>;
ADLSTEST_F(AdlsUsDeviceIdTest, WhenCheckingIsSimulationThenTrueReturnedOnlyForSimulationId) {
unsigned short adlsSimulationIds[2] = {
DEVICE_ID_4680,
0x4680,
0, // default, non-simulation
};
NEO::MockDevice *mockDevice = nullptr;

View File

@ -7,7 +7,6 @@
#include "shared/source/os_interface/linux/drm_neo.h"
#include "opencl/source/dll/linux/devices/device_ids.h"
#include "test.h"
#include <array>
@ -15,12 +14,12 @@
using namespace NEO;
TEST(RklDeviceIdTest, supportedDeviceId) {
std::array<DeviceDescriptor, 6> expectedDescriptors = {{{DEVICE_ID_4C80, &RKL_HW_CONFIG::hwInfo, &RKL_HW_CONFIG::setupHardwareInfo, GTTYPE_GT1},
{DEVICE_ID_4C8A, &RKL_HW_CONFIG::hwInfo, &RKL_HW_CONFIG::setupHardwareInfo, GTTYPE_GT1},
{DEVICE_ID_4C8B, &RKL_HW_CONFIG::hwInfo, &RKL_HW_CONFIG::setupHardwareInfo, GTTYPE_GT1},
{DEVICE_ID_4C8C, &RKL_HW_CONFIG::hwInfo, &RKL_HW_CONFIG::setupHardwareInfo, GTTYPE_GT0_5},
{DEVICE_ID_4C90, &RKL_HW_CONFIG::hwInfo, &RKL_HW_CONFIG::setupHardwareInfo, GTTYPE_GT1},
{DEVICE_ID_4C9A, &RKL_HW_CONFIG::hwInfo, &RKL_HW_CONFIG::setupHardwareInfo, GTTYPE_GT1}}};
std::array<DeviceDescriptor, 6> expectedDescriptors = {{{0x4C80, &RKL_HW_CONFIG::hwInfo, &RKL_HW_CONFIG::setupHardwareInfo, GTTYPE_GT1},
{0x4C8A, &RKL_HW_CONFIG::hwInfo, &RKL_HW_CONFIG::setupHardwareInfo, GTTYPE_GT1},
{0x4C8B, &RKL_HW_CONFIG::hwInfo, &RKL_HW_CONFIG::setupHardwareInfo, GTTYPE_GT1},
{0x4C8C, &RKL_HW_CONFIG::hwInfo, &RKL_HW_CONFIG::setupHardwareInfo, GTTYPE_GT0_5},
{0x4C90, &RKL_HW_CONFIG::hwInfo, &RKL_HW_CONFIG::setupHardwareInfo, GTTYPE_GT1},
{0x4C9A, &RKL_HW_CONFIG::hwInfo, &RKL_HW_CONFIG::setupHardwareInfo, GTTYPE_GT1}}};
auto compareStructs = [](const DeviceDescriptor *first, const DeviceDescriptor *second) {
return first->deviceId == second->deviceId && first->pHwInfo == second->pHwInfo &&

View File

@ -7,7 +7,6 @@
#include "shared/source/os_interface/linux/os_interface.h"
#include "opencl/source/dll/linux/devices/device_ids.h"
#include "opencl/test/unit_test/helpers/gtest_helpers.h"
#include "opencl/test/unit_test/os_interface/linux/drm_mock.h"
#include "opencl/test/unit_test/os_interface/linux/hw_info_config_linux_tests.h"
@ -21,7 +20,7 @@ struct HwInfoConfigTestLinuxRkl : HwInfoConfigTestLinux {
drm = new DrmMock(*executionEnvironment->rootDeviceEnvironments[0]);
osInterface->get()->setDrm(drm);
drm->StoredDeviceID = DEVICE_ID_4C8A;
drm->StoredDeviceID = 0x4C8A;
drm->setGtType(GTTYPE_GT1);
}
};

View File

@ -15,14 +15,14 @@ using namespace NEO;
TEST(TglLpDeviceIdTest, supportedDeviceId) {
std::array<DeviceDescriptor, 8> expectedDescriptors = {{
{DEV_ID_FF20, &TGLLP_1x6x16::hwInfo, &TGLLP_1x6x16::setupHardwareInfo, GTTYPE_GT2},
{DEV_ID_9A49, &TGLLP_1x6x16::hwInfo, &TGLLP_1x6x16::setupHardwareInfo, GTTYPE_GT2},
{DEV_ID_9A40, &TGLLP_1x6x16::hwInfo, &TGLLP_1x6x16::setupHardwareInfo, GTTYPE_GT2},
{DEV_ID_9A59, &TGLLP_1x6x16::hwInfo, &TGLLP_1x6x16::setupHardwareInfo, GTTYPE_GT2},
{DEV_ID_9A60, &TGLLP_1x2x16::hwInfo, &TGLLP_1x2x16::setupHardwareInfo, GTTYPE_GT2},
{DEV_ID_9A68, &TGLLP_1x2x16::hwInfo, &TGLLP_1x2x16::setupHardwareInfo, GTTYPE_GT2},
{DEV_ID_9A70, &TGLLP_1x2x16::hwInfo, &TGLLP_1x2x16::setupHardwareInfo, GTTYPE_GT2},
{DEV_ID_9A78, &TGLLP_1x2x16::hwInfo, &TGLLP_1x2x16::setupHardwareInfo, GTTYPE_GT2},
{0xFF20, &TGLLP_1x6x16::hwInfo, &TGLLP_1x6x16::setupHardwareInfo, GTTYPE_GT2},
{0x9A49, &TGLLP_1x6x16::hwInfo, &TGLLP_1x6x16::setupHardwareInfo, GTTYPE_GT2},
{0x9A40, &TGLLP_1x6x16::hwInfo, &TGLLP_1x6x16::setupHardwareInfo, GTTYPE_GT2},
{0x9A59, &TGLLP_1x6x16::hwInfo, &TGLLP_1x6x16::setupHardwareInfo, GTTYPE_GT2},
{0x9A60, &TGLLP_1x2x16::hwInfo, &TGLLP_1x2x16::setupHardwareInfo, GTTYPE_GT2},
{0x9A68, &TGLLP_1x2x16::hwInfo, &TGLLP_1x2x16::setupHardwareInfo, GTTYPE_GT2},
{0x9A70, &TGLLP_1x2x16::hwInfo, &TGLLP_1x2x16::setupHardwareInfo, GTTYPE_GT2},
{0x9A78, &TGLLP_1x2x16::hwInfo, &TGLLP_1x2x16::setupHardwareInfo, GTTYPE_GT2},
}};
auto compareStructs = [](const DeviceDescriptor *first, const DeviceDescriptor *second) {

View File

@ -15,27 +15,27 @@ using namespace NEO;
TEST(BdwDeviceIdTest, supportedDeviceId) {
std::array<DeviceDescriptor, 19> expectedDescriptors = {{
{IBDW_GT1_DESK_DEVICE_F0_ID, &BDW_1x2x6::hwInfo, &BDW_1x2x6::setupHardwareInfo, GTTYPE_GT1},
{IBDW_GT1_HALO_MOBL_DEVICE_F0_ID, &BDW_1x2x6::hwInfo, &BDW_1x2x6::setupHardwareInfo, GTTYPE_GT1},
{IBDW_GT1_SERV_DEVICE_F0_ID, &BDW_1x2x6::hwInfo, &BDW_1x2x6::setupHardwareInfo, GTTYPE_GT1},
{IBDW_GT1_ULT_MOBL_DEVICE_F0_ID, &BDW_1x2x6::hwInfo, &BDW_1x2x6::setupHardwareInfo, GTTYPE_GT1},
{IBDW_GT1_ULX_DEVICE_F0_ID, &BDW_1x2x6::hwInfo, &BDW_1x2x6::setupHardwareInfo, GTTYPE_GT1},
{IBDW_GT1_WRK_DEVICE_F0_ID, &BDW_1x2x6::hwInfo, &BDW_1x2x6::setupHardwareInfo, GTTYPE_GT1},
{0x0BD1, &BDW_1x2x6::hwInfo, &BDW_1x2x6::setupHardwareInfo, GTTYPE_GT1},
{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},
{IBDW_GT2_DESK_DEVICE_F0_ID, &BDW_1x3x8::hwInfo, &BDW_1x3x8::setupHardwareInfo, GTTYPE_GT2},
{IBDW_GT2_HALO_MOBL_DEVICE_F0_ID, &BDW_1x3x8::hwInfo, &BDW_1x3x8::setupHardwareInfo, GTTYPE_GT2},
{IBDW_GT2_SERV_DEVICE_F0_ID, &BDW_1x3x8::hwInfo, &BDW_1x3x8::setupHardwareInfo, GTTYPE_GT2},
{IBDW_GT2_ULT_MOBL_DEVICE_F0_ID, &BDW_1x3x8::hwInfo, &BDW_1x3x8::setupHardwareInfo, GTTYPE_GT2},
{IBDW_GT2_ULX_DEVICE_F0_ID, &BDW_1x3x8::hwInfo, &BDW_1x3x8::setupHardwareInfo, GTTYPE_GT2},
{IBDW_GT2_WRK_DEVICE_F0_ID, &BDW_1x3x8::hwInfo, &BDW_1x3x8::setupHardwareInfo, GTTYPE_GT2},
{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},
{IBDW_GT3_DESK_DEVICE_F0_ID, &BDW_2x3x8::hwInfo, &BDW_2x3x8::setupHardwareInfo, GTTYPE_GT3},
{IBDW_GT3_HALO_MOBL_DEVICE_F0_ID, &BDW_2x3x8::hwInfo, &BDW_2x3x8::setupHardwareInfo, GTTYPE_GT3},
{IBDW_GT3_SERV_DEVICE_F0_ID, &BDW_2x3x8::hwInfo, &BDW_2x3x8::setupHardwareInfo, GTTYPE_GT3},
{IBDW_GT3_ULT_MOBL_DEVICE_F0_ID, &BDW_2x3x8::hwInfo, &BDW_2x3x8::setupHardwareInfo, GTTYPE_GT3},
{IBDW_GT3_ULT25W_MOBL_DEVICE_F0_ID, &BDW_2x3x8::hwInfo, &BDW_2x3x8::setupHardwareInfo, GTTYPE_GT3},
{IBDW_GT3_ULX_DEVICE_F0_ID, &BDW_2x3x8::hwInfo, &BDW_2x3x8::setupHardwareInfo, GTTYPE_GT3},
{IBDW_GT3_WRK_DEVICE_F0_ID, &BDW_2x3x8::hwInfo, &BDW_2x3x8::setupHardwareInfo, GTTYPE_GT3},
{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},
{0x162B, &BDW_2x3x8::hwInfo, &BDW_2x3x8::setupHardwareInfo, GTTYPE_GT3},
{0x162E, &BDW_2x3x8::hwInfo, &BDW_2x3x8::setupHardwareInfo, GTTYPE_GT3},
{0x162D, &BDW_2x3x8::hwInfo, &BDW_2x3x8::setupHardwareInfo, GTTYPE_GT3},
}};
auto compareStructs = [](const DeviceDescriptor *first, const DeviceDescriptor *second) {

View File

@ -14,56 +14,54 @@
using namespace NEO;
TEST(CflDeviceIdTest, supportedDeviceId) {
std::array<DeviceDescriptor, 43> expectedDescriptors = {{
{ICFL_GT1_DT_DEVICE_F0_ID, &CFL_1x2x6::hwInfo, &CFL_1x2x6::setupHardwareInfo, GTTYPE_GT1},
{ICFL_GT1_S41_DT_DEVICE_F0_ID, &CFL_1x2x6::hwInfo, &CFL_1x2x6::setupHardwareInfo, GTTYPE_GT1},
{ICFL_GT1_S61_DT_DEVICE_F0_ID, &CFL_1x2x6::hwInfo, &CFL_1x2x6::setupHardwareInfo, GTTYPE_GT1},
{ICFL_GT1_41F_2F1F_ULT_DEVICE_F0_ID, &CFL_1x2x6::hwInfo, &CFL_1x2x6::setupHardwareInfo, GTTYPE_GT1},
{ICFL_GT1_S6_S4_S2_F1F_DT_DEVICE_F0_ID, &CFL_1x2x6::hwInfo, &CFL_1x2x6::setupHardwareInfo, GTTYPE_GT1},
{ICFL_GT1_U41F_U2F1F_ULT_DEVICE_F0_ID, &CFL_1x2x6::hwInfo, &CFL_1x2x6::setupHardwareInfo, GTTYPE_GT1},
std::array<DeviceDescriptor, 41> expectedDescriptors = {{
{0x3E90, &CFL_1x2x6::hwInfo, &CFL_1x2x6::setupHardwareInfo, GTTYPE_GT1},
{0x3E93, &CFL_1x2x6::hwInfo, &CFL_1x2x6::setupHardwareInfo, GTTYPE_GT1},
{0x3EA4, &CFL_1x2x6::hwInfo, &CFL_1x2x6::setupHardwareInfo, GTTYPE_GT1},
{0x3E99, &CFL_1x2x6::hwInfo, &CFL_1x2x6::setupHardwareInfo, GTTYPE_GT1},
{0x3EA1, &CFL_1x2x6::hwInfo, &CFL_1x2x6::setupHardwareInfo, GTTYPE_GT1},
{ICFL_GT2_DT_DEVICE_F0_ID, &CFL_1x3x8::hwInfo, &CFL_1x3x8::setupHardwareInfo, GTTYPE_GT2},
{ICFL_GT2_HALO_DEVICE_F0_ID, &CFL_1x3x8::hwInfo, &CFL_1x3x8::setupHardwareInfo, GTTYPE_GT2},
{ICFL_GT2_HALO_WS_DEVICE_F0_ID, &CFL_1x3x8::hwInfo, &CFL_1x3x8::setupHardwareInfo, GTTYPE_GT2},
{ICFL_GT2_S42_DT_DEVICE_F0_ID, &CFL_1x3x8::hwInfo, &CFL_1x3x8::setupHardwareInfo, GTTYPE_GT2},
{ICFL_GT2_S62_DT_DEVICE_F0_ID, &CFL_1x3x8::hwInfo, &CFL_1x3x8::setupHardwareInfo, GTTYPE_GT2},
{ICFL_GT2_SERV_DEVICE_F0_ID, &CFL_1x3x8::hwInfo, &CFL_1x3x8::setupHardwareInfo, GTTYPE_GT2},
{ICFL_GT2_S82_S6F2_DT_DEVICE_F0_ID, &CFL_1x3x8::hwInfo, &CFL_1x3x8::setupHardwareInfo, GTTYPE_GT2},
{ICFL_GT2_U42F_U2F1F_ULT_DEVICE_F0_ID, &CFL_1x3x8::hwInfo, &CFL_1x3x8::setupHardwareInfo, GTTYPE_GT2},
{ICFL_GT2_U42F_U2F2F_ULT_DEVICE_F0_ID, &CFL_1x3x8::hwInfo, &CFL_1x3x8::setupHardwareInfo, GTTYPE_GT2},
{ICFL_GT2_U42F_U2F2_ULT_DEVICE_F0_ID, &CFL_1x3x8::hwInfo, &CFL_1x3x8::setupHardwareInfo, GTTYPE_GT2},
{ICFL_GT2_S8_S2_DT_DEVICE_F0_ID, &CFL_1x3x8::hwInfo, &CFL_1x3x8::setupHardwareInfo, GTTYPE_GT2},
{0x3E92, &CFL_1x3x8::hwInfo, &CFL_1x3x8::setupHardwareInfo, GTTYPE_GT2},
{0x3E9B, &CFL_1x3x8::hwInfo, &CFL_1x3x8::setupHardwareInfo, GTTYPE_GT2},
{0x3E94, &CFL_1x3x8::hwInfo, &CFL_1x3x8::setupHardwareInfo, GTTYPE_GT2},
{0x3E91, &CFL_1x3x8::hwInfo, &CFL_1x3x8::setupHardwareInfo, GTTYPE_GT2},
{0x3E96, &CFL_1x3x8::hwInfo, &CFL_1x3x8::setupHardwareInfo, GTTYPE_GT2},
{0x3E9A, &CFL_1x3x8::hwInfo, &CFL_1x3x8::setupHardwareInfo, GTTYPE_GT2},
{0x3EA3, &CFL_1x3x8::hwInfo, &CFL_1x3x8::setupHardwareInfo, GTTYPE_GT2},
{0x3EA9, &CFL_1x3x8::hwInfo, &CFL_1x3x8::setupHardwareInfo, GTTYPE_GT2},
{0x3EA0, &CFL_1x3x8::hwInfo, &CFL_1x3x8::setupHardwareInfo, GTTYPE_GT2},
{0x3E98, &CFL_1x3x8::hwInfo, &CFL_1x3x8::setupHardwareInfo, GTTYPE_GT2},
{ICFL_HALO_DEVICE_F0_ID, &CFL_2x3x8::hwInfo, &CFL_2x3x8::setupHardwareInfo, GTTYPE_GT3},
{ICFL_GT3_ULT_15W_DEVICE_F0_ID, &CFL_2x3x8::hwInfo, &CFL_2x3x8::setupHardwareInfo, GTTYPE_GT3},
{ICFL_GT3_ULT_15W_42EU_DEVICE_F0_ID, &CFL_2x3x8::hwInfo, &CFL_2x3x8::setupHardwareInfo, GTTYPE_GT3},
{ICFL_GT3_ULT_28W_DEVICE_F0_ID, &CFL_2x3x8::hwInfo, &CFL_2x3x8::setupHardwareInfo, GTTYPE_GT3},
{ICFL_GT3_ULT_DEVICE_F0_ID, &CFL_2x3x8::hwInfo, &CFL_2x3x8::setupHardwareInfo, GTTYPE_GT3},
{ICFL_GT3_U43_ULT_DEVICE_F0_ID, &CFL_2x3x8::hwInfo, &CFL_2x3x8::setupHardwareInfo, GTTYPE_GT3},
{0x3E95, &CFL_2x3x8::hwInfo, &CFL_2x3x8::setupHardwareInfo, GTTYPE_GT3},
{0x3EA6, &CFL_2x3x8::hwInfo, &CFL_2x3x8::setupHardwareInfo, GTTYPE_GT3},
{0x3EA7, &CFL_2x3x8::hwInfo, &CFL_2x3x8::setupHardwareInfo, GTTYPE_GT3},
{0x3EA8, &CFL_2x3x8::hwInfo, &CFL_2x3x8::setupHardwareInfo, GTTYPE_GT3},
{0x3EA5, &CFL_2x3x8::hwInfo, &CFL_2x3x8::setupHardwareInfo, GTTYPE_GT3},
{0x3EA2, &CFL_2x3x8::hwInfo, &CFL_2x3x8::setupHardwareInfo, GTTYPE_GT3},
// CML GT1
{ICFL_GT1_ULT_DEVICE_V0_ID, &CFL_1x2x6::hwInfo, &CFL_1x2x6::setupHardwareInfo, GTTYPE_GT1},
{ICFL_GT1_ULT_DEVICE_A0_ID, &CFL_1x2x6::hwInfo, &CFL_1x2x6::setupHardwareInfo, GTTYPE_GT1},
{ICFL_GT1_ULT_DEVICE_S0_ID, &CFL_1x2x6::hwInfo, &CFL_1x2x6::setupHardwareInfo, GTTYPE_GT1},
{ICFL_GT1_ULT_DEVICE_K0_ID, &CFL_1x2x6::hwInfo, &CFL_1x2x6::setupHardwareInfo, GTTYPE_GT1},
{ICFL_GT1_ULX_DEVICE_S0_ID, &CFL_1x2x6::hwInfo, &CFL_1x2x6::setupHardwareInfo, GTTYPE_GT1},
{ICFL_GT1_DT_DEVICE_P0_ID, &CFL_1x2x6::hwInfo, &CFL_1x2x6::setupHardwareInfo, GTTYPE_GT1},
{ICFL_GT1_DT_DEVICE_G0_ID, &CFL_1x2x6::hwInfo, &CFL_1x2x6::setupHardwareInfo, GTTYPE_GT1},
{ICFL_GT1_HALO_DEVICE_16_ID, &CFL_1x2x6::hwInfo, &CFL_1x2x6::setupHardwareInfo, GTTYPE_GT1},
{ICFL_GT1_HALO_DEVICE_18_ID, &CFL_1x2x6::hwInfo, &CFL_1x2x6::setupHardwareInfo, GTTYPE_GT1},
{0x9B21, &CFL_1x2x6::hwInfo, &CFL_1x2x6::setupHardwareInfo, GTTYPE_GT1},
{0x9BAA, &CFL_1x2x6::hwInfo, &CFL_1x2x6::setupHardwareInfo, GTTYPE_GT1},
{0x9BAB, &CFL_1x2x6::hwInfo, &CFL_1x2x6::setupHardwareInfo, GTTYPE_GT1},
{0x9BAC, &CFL_1x2x6::hwInfo, &CFL_1x2x6::setupHardwareInfo, GTTYPE_GT1},
{0x9BA0, &CFL_1x2x6::hwInfo, &CFL_1x2x6::setupHardwareInfo, GTTYPE_GT1},
{0x9BA5, &CFL_1x2x6::hwInfo, &CFL_1x2x6::setupHardwareInfo, GTTYPE_GT1},
{0x9BA8, &CFL_1x2x6::hwInfo, &CFL_1x2x6::setupHardwareInfo, GTTYPE_GT1},
{0x9BA4, &CFL_1x2x6::hwInfo, &CFL_1x2x6::setupHardwareInfo, GTTYPE_GT1},
{0x9BA2, &CFL_1x2x6::hwInfo, &CFL_1x2x6::setupHardwareInfo, GTTYPE_GT1},
// CML GT2
{ICFL_GT2_ULT_DEVICE_V0_ID, &CFL_1x3x8::hwInfo, &CFL_1x3x8::setupHardwareInfo, GTTYPE_GT2},
{ICFL_GT2_ULT_DEVICE_A0_ID, &CFL_1x3x8::hwInfo, &CFL_1x3x8::setupHardwareInfo, GTTYPE_GT2},
{ICFL_GT2_ULT_DEVICE_S0_ID, &CFL_1x3x8::hwInfo, &CFL_1x3x8::setupHardwareInfo, GTTYPE_GT2},
{ICFL_GT2_ULT_DEVICE_K0_ID, &CFL_1x3x8::hwInfo, &CFL_1x3x8::setupHardwareInfo, GTTYPE_GT2},
{ICFL_GT2_ULX_DEVICE_S0_ID, &CFL_1x3x8::hwInfo, &CFL_1x3x8::setupHardwareInfo, GTTYPE_GT2},
{ICFL_GT2_DT_DEVICE_P0_ID, &CFL_1x3x8::hwInfo, &CFL_1x3x8::setupHardwareInfo, GTTYPE_GT2},
{ICFL_GT2_DT_DEVICE_G0_ID, &CFL_1x3x8::hwInfo, &CFL_1x3x8::setupHardwareInfo, GTTYPE_GT2},
{ICFL_GT2_HALO_DEVICE_15_ID, &CFL_1x3x8::hwInfo, &CFL_1x3x8::setupHardwareInfo, GTTYPE_GT2},
{ICFL_GT2_HALO_DEVICE_17_ID, &CFL_1x3x8::hwInfo, &CFL_1x3x8::setupHardwareInfo, GTTYPE_GT2},
{0x9B41, &CFL_1x3x8::hwInfo, &CFL_1x3x8::setupHardwareInfo, GTTYPE_GT2},
{0x9BCA, &CFL_1x3x8::hwInfo, &CFL_1x3x8::setupHardwareInfo, GTTYPE_GT2},
{0x9BCB, &CFL_1x3x8::hwInfo, &CFL_1x3x8::setupHardwareInfo, GTTYPE_GT2},
{0x9BCC, &CFL_1x3x8::hwInfo, &CFL_1x3x8::setupHardwareInfo, GTTYPE_GT2},
{0x9BC0, &CFL_1x3x8::hwInfo, &CFL_1x3x8::setupHardwareInfo, GTTYPE_GT2},
{0x9BC5, &CFL_1x3x8::hwInfo, &CFL_1x3x8::setupHardwareInfo, GTTYPE_GT2},
{0x9BC8, &CFL_1x3x8::hwInfo, &CFL_1x3x8::setupHardwareInfo, GTTYPE_GT2},
{0x9BC4, &CFL_1x3x8::hwInfo, &CFL_1x3x8::setupHardwareInfo, GTTYPE_GT2},
{0x9BC2, &CFL_1x3x8::hwInfo, &CFL_1x3x8::setupHardwareInfo, GTTYPE_GT2},
// CML WORKSTATION
{ICFL_GT2_WKS_DEVICE_P0_ID, &CFL_1x3x8::hwInfo, &CFL_1x3x8::setupHardwareInfo, GTTYPE_GT2},
{ICFL_GT2_WKS_DEVICE_G0_ID, &CFL_1x3x8::hwInfo, &CFL_1x3x8::setupHardwareInfo, GTTYPE_GT2},
{0x9BC6, &CFL_1x3x8::hwInfo, &CFL_1x3x8::setupHardwareInfo, GTTYPE_GT2},
{0x9BE6, &CFL_1x3x8::hwInfo, &CFL_1x3x8::setupHardwareInfo, GTTYPE_GT2},
}};
auto compareStructs = [](const DeviceDescriptor *first, const DeviceDescriptor *second) {

View File

@ -14,8 +14,9 @@
using namespace NEO;
TEST(GlkDeviceIdTest, supportedDeviceId) {
std::array<DeviceDescriptor, 1> expectedDescriptors = {{
{IGLK_GT2_ULT_18EU_DEVICE_F0_ID, &GLK_1x3x6::hwInfo, &GLK_1x3x6::setupHardwareInfo, GTTYPE_GTA},
std::array<DeviceDescriptor, 2> expectedDescriptors = {{
{0x3184, &GLK_1x3x6::hwInfo, &GLK_1x3x6::setupHardwareInfo, GTTYPE_GTA},
{0x3185, &GLK_1x2x6::hwInfo, &GLK_1x2x6::setupHardwareInfo, GTTYPE_GTA},
}};
auto compareStructs = [](const DeviceDescriptor *first, const DeviceDescriptor *second) {

View File

@ -15,36 +15,36 @@ using namespace NEO;
TEST(KblDeviceIdTest, supportedDeviceId) {
std::array<DeviceDescriptor, 26> expectedDescriptors = {{
{IKBL_GT1_DT_DEVICE_F0_ID, &KBL_1x2x6::hwInfo, &KBL_1x2x6::setupHardwareInfo, GTTYPE_GT1},
{IKBL_GT1_HALO_DEVICE_F0_ID, &KBL_1x2x6::hwInfo, &KBL_1x2x6::setupHardwareInfo, GTTYPE_GT1},
{IKBL_GT1_SERV_DEVICE_F0_ID, &KBL_1x2x6::hwInfo, &KBL_1x2x6::setupHardwareInfo, GTTYPE_GT1},
{IKBL_GT1_ULT_DEVICE_F0_ID, &KBL_1x2x6::hwInfo, &KBL_1x2x6::setupHardwareInfo, GTTYPE_GT1},
{IKBL_GT1_ULX_DEVICE_F0_ID, &KBL_1x3x6::hwInfo, &KBL_1x3x6::setupHardwareInfo, GTTYPE_GT1},
{IKBL_GT1F_HALO_DEVICE_F0_ID, &KBL_1x2x6::hwInfo, &KBL_1x2x6::setupHardwareInfo, GTTYPE_GT1},
{0x5902, &KBL_1x2x6::hwInfo, &KBL_1x2x6::setupHardwareInfo, GTTYPE_GT1},
{0x590B, &KBL_1x2x6::hwInfo, &KBL_1x2x6::setupHardwareInfo, GTTYPE_GT1},
{0x590A, &KBL_1x2x6::hwInfo, &KBL_1x2x6::setupHardwareInfo, GTTYPE_GT1},
{0x5906, &KBL_1x2x6::hwInfo, &KBL_1x2x6::setupHardwareInfo, GTTYPE_GT1},
{0x590E, &KBL_1x3x6::hwInfo, &KBL_1x3x6::setupHardwareInfo, GTTYPE_GT1},
{0x5908, &KBL_1x2x6::hwInfo, &KBL_1x2x6::setupHardwareInfo, GTTYPE_GT1},
{IKBL_GT1_5_ULT_DEVICE_F0_ID, &KBL_1x3x6::hwInfo, &KBL_1x3x6::setupHardwareInfo, GTTYPE_GT1_5},
{IKBL_GT1_5_ULX_DEVICE_F0_ID, &KBL_1x2x6::hwInfo, &KBL_1x2x6::setupHardwareInfo, GTTYPE_GT1_5},
{0x5913, &KBL_1x3x6::hwInfo, &KBL_1x3x6::setupHardwareInfo, GTTYPE_GT1_5},
{0x5915, &KBL_1x2x6::hwInfo, &KBL_1x2x6::setupHardwareInfo, GTTYPE_GT1_5},
{IKBL_GT2_DT_DEVICE_F0_ID, &KBL_1x3x8::hwInfo, &KBL_1x3x8::setupHardwareInfo, GTTYPE_GT2},
{IKBL_GT2_HALO_DEVICE_F0_ID, &KBL_1x3x8::hwInfo, &KBL_1x3x8::setupHardwareInfo, GTTYPE_GT2},
{IKBL_GT2_R_ULT_DEVICE_F0_ID, &KBL_1x3x8::hwInfo, &KBL_1x3x8::setupHardwareInfo, GTTYPE_GT2},
{IKBL_GT2_SERV_DEVICE_F0_ID, &KBL_1x3x8::hwInfo, &KBL_1x3x8::setupHardwareInfo, GTTYPE_GT2},
{IKBL_GT2_ULT_DEVICE_F0_ID, &KBL_1x3x8::hwInfo, &KBL_1x3x8::setupHardwareInfo, GTTYPE_GT2},
{IKBL_GT2_ULX_DEVICE_F0_ID, &KBL_1x3x8::hwInfo, &KBL_1x3x8::setupHardwareInfo, GTTYPE_GT2},
{IKBL_GT2_WRK_DEVICE_F0_ID, &KBL_1x3x8::hwInfo, &KBL_1x3x8::setupHardwareInfo, GTTYPE_GT2},
{IKBL_GT2_R_ULX_DEVICE_F0_ID, &KBL_1x3x8::hwInfo, &KBL_1x3x8::setupHardwareInfo, GTTYPE_GT2},
{IKBL_GT2F_ULT_DEVICE_F0_ID, &KBL_1x3x8::hwInfo, &KBL_1x3x8::setupHardwareInfo, GTTYPE_GT2},
{0x5912, &KBL_1x3x8::hwInfo, &KBL_1x3x8::setupHardwareInfo, GTTYPE_GT2},
{0x591B, &KBL_1x3x8::hwInfo, &KBL_1x3x8::setupHardwareInfo, GTTYPE_GT2},
{0x5917, &KBL_1x3x8::hwInfo, &KBL_1x3x8::setupHardwareInfo, GTTYPE_GT2},
{0x591A, &KBL_1x3x8::hwInfo, &KBL_1x3x8::setupHardwareInfo, GTTYPE_GT2},
{0x5916, &KBL_1x3x8::hwInfo, &KBL_1x3x8::setupHardwareInfo, GTTYPE_GT2},
{0x591E, &KBL_1x3x8::hwInfo, &KBL_1x3x8::setupHardwareInfo, GTTYPE_GT2},
{0x591D, &KBL_1x3x8::hwInfo, &KBL_1x3x8::setupHardwareInfo, GTTYPE_GT2},
{0x591C, &KBL_1x3x8::hwInfo, &KBL_1x3x8::setupHardwareInfo, GTTYPE_GT2},
{0x5921, &KBL_1x3x8::hwInfo, &KBL_1x3x8::setupHardwareInfo, GTTYPE_GT2},
{IKBL_GT3_15W_ULT_DEVICE_F0_ID, &KBL_2x3x8::hwInfo, &KBL_2x3x8::setupHardwareInfo, GTTYPE_GT3},
{IKBL_GT3_28W_ULT_DEVICE_F0_ID, &KBL_2x3x8::hwInfo, &KBL_2x3x8::setupHardwareInfo, GTTYPE_GT3},
{IKBL_GT3_HALO_DEVICE_F0_ID, &KBL_2x3x8::hwInfo, &KBL_2x3x8::setupHardwareInfo, GTTYPE_GT3},
{IKBL_GT3_SERV_DEVICE_F0_ID, &KBL_2x3x8::hwInfo, &KBL_2x3x8::setupHardwareInfo, GTTYPE_GT3},
{IKBL_GT3_ULT_DEVICE_F0_ID, &KBL_2x3x8::hwInfo, &KBL_2x3x8::setupHardwareInfo, GTTYPE_GT3},
{0x5926, &KBL_2x3x8::hwInfo, &KBL_2x3x8::setupHardwareInfo, GTTYPE_GT3},
{0x5927, &KBL_2x3x8::hwInfo, &KBL_2x3x8::setupHardwareInfo, GTTYPE_GT3},
{0x592B, &KBL_2x3x8::hwInfo, &KBL_2x3x8::setupHardwareInfo, GTTYPE_GT3},
{0x592A, &KBL_2x3x8::hwInfo, &KBL_2x3x8::setupHardwareInfo, GTTYPE_GT3},
{0x5923, &KBL_2x3x8::hwInfo, &KBL_2x3x8::setupHardwareInfo, GTTYPE_GT3},
{IKBL_GT4_DT_DEVICE_F0_ID, &KBL_3x3x8::hwInfo, &KBL_3x3x8::setupHardwareInfo, GTTYPE_GT4},
{IKBL_GT4_HALO_DEVICE_F0_ID, &KBL_3x3x8::hwInfo, &KBL_3x3x8::setupHardwareInfo, GTTYPE_GT4},
{IKBL_GT4_SERV_DEVICE_F0_ID, &KBL_3x3x8::hwInfo, &KBL_3x3x8::setupHardwareInfo, GTTYPE_GT4},
{IKBL_GT4_WRK_DEVICE_F0_ID, &KBL_3x3x8::hwInfo, &KBL_3x3x8::setupHardwareInfo, GTTYPE_GT4},
{0x5932, &KBL_3x3x8::hwInfo, &KBL_3x3x8::setupHardwareInfo, GTTYPE_GT4},
{0x593B, &KBL_3x3x8::hwInfo, &KBL_3x3x8::setupHardwareInfo, GTTYPE_GT4},
{0x593A, &KBL_3x3x8::hwInfo, &KBL_3x3x8::setupHardwareInfo, GTTYPE_GT4},
{0x593D, &KBL_3x3x8::hwInfo, &KBL_3x3x8::setupHardwareInfo, GTTYPE_GT4},
}};
auto compareStructs = [](const DeviceDescriptor *first, const DeviceDescriptor *second) {

View File

@ -15,40 +15,40 @@ using namespace NEO;
TEST(SklDeviceIdTest, supportedDeviceId) {
std::array<DeviceDescriptor, 30> expectedDescriptors = {{
{ISKL_GT1_DESK_DEVICE_F0_ID, &SKL_1x2x6::hwInfo, &SKL_1x2x6::setupHardwareInfo, GTTYPE_GT1},
{ISKL_GT1_DT_DEVICE_F0_ID, &SKL_1x2x6::hwInfo, &SKL_1x2x6::setupHardwareInfo, GTTYPE_GT1},
{ISKL_GT1_HALO_MOBL_DEVICE_F0_ID, &SKL_1x2x6::hwInfo, &SKL_1x2x6::setupHardwareInfo, GTTYPE_GT1},
{ISKL_GT1_SERV_DEVICE_F0_ID, &SKL_1x2x6::hwInfo, &SKL_1x2x6::setupHardwareInfo, GTTYPE_GT1},
{ISKL_GT1_ULT_DEVICE_F0_ID, &SKL_1x2x6::hwInfo, &SKL_1x2x6::setupHardwareInfo, GTTYPE_GT1},
{ISKL_GT1_ULX_DEVICE_F0_ID, &SKL_1x2x6::hwInfo, &SKL_1x2x6::setupHardwareInfo, GTTYPE_GT1},
{0x0901, &SKL_1x2x6::hwInfo, &SKL_1x2x6::setupHardwareInfo, GTTYPE_GT1},
{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},
{0x1906, &SKL_1x2x6::hwInfo, &SKL_1x2x6::setupHardwareInfo, GTTYPE_GT1},
{0x190E, &SKL_1x2x6::hwInfo, &SKL_1x2x6::setupHardwareInfo, GTTYPE_GT1},
{ISKL_GT1_5_DT_DEVICE_F0_ID, &SKL_1x3x6::hwInfo, &SKL_1x3x6::setupHardwareInfo, GTTYPE_GT1_5},
{ISKL_GT1_5_ULT_DEVICE_F0_ID, &SKL_1x3x6::hwInfo, &SKL_1x3x6::setupHardwareInfo, GTTYPE_GT1_5},
{ISKL_GT1_5_ULX_DEVICE_F0_ID, &SKL_1x3x6::hwInfo, &SKL_1x3x6::setupHardwareInfo, GTTYPE_GT1_5},
{0x1917, &SKL_1x3x6::hwInfo, &SKL_1x3x6::setupHardwareInfo, GTTYPE_GT1_5},
{0x1913, &SKL_1x3x6::hwInfo, &SKL_1x3x6::setupHardwareInfo, GTTYPE_GT1_5},
{0x1915, &SKL_1x3x6::hwInfo, &SKL_1x3x6::setupHardwareInfo, GTTYPE_GT1_5},
{ISKL_GT2_DESK_DEVICE_F0_ID, &SKL_1x3x8::hwInfo, &SKL_1x3x8::setupHardwareInfo, GTTYPE_GT2},
{ISKL_GT2_DT_DEVICE_F0_ID, &SKL_1x3x8::hwInfo, &SKL_1x3x8::setupHardwareInfo, GTTYPE_GT2},
{ISKL_GT2_HALO_MOBL_DEVICE_F0_ID, &SKL_1x3x8::hwInfo, &SKL_1x3x8::setupHardwareInfo, GTTYPE_GT2},
{ISKL_GT2_SERV_DEVICE_F0_ID, &SKL_1x3x8::hwInfo, &SKL_1x3x8::setupHardwareInfo, GTTYPE_GT2},
{ISKL_GT2_ULT_DEVICE_F0_ID, &SKL_1x3x8::hwInfo, &SKL_1x3x8::setupHardwareInfo, GTTYPE_GT2},
{ISKL_GT2_ULX_DEVICE_F0_ID, &SKL_1x3x8::hwInfo, &SKL_1x3x8::setupHardwareInfo, GTTYPE_GT2},
{ISKL_GT2_WRK_DEVICE_F0_ID, &SKL_1x3x8::hwInfo, &SKL_1x3x8::setupHardwareInfo, GTTYPE_GT2},
{ISKL_GT2F_ULT_DEVICE_F0_ID, &SKL_1x3x8::hwInfo, &SKL_1x3x8::setupHardwareInfo, GTTYPE_GT2},
{ISKL_LP_DEVICE_F0_ID, &SKL_1x3x8::hwInfo, &SKL_1x3x8::setupHardwareInfo, GTTYPE_GT2},
{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},
{0x1916, &SKL_1x3x8::hwInfo, &SKL_1x3x8::setupHardwareInfo, GTTYPE_GT2},
{0x191E, &SKL_1x3x8::hwInfo, &SKL_1x3x8::setupHardwareInfo, GTTYPE_GT2},
{0x191D, &SKL_1x3x8::hwInfo, &SKL_1x3x8::setupHardwareInfo, GTTYPE_GT2},
{0x1921, &SKL_1x3x8::hwInfo, &SKL_1x3x8::setupHardwareInfo, GTTYPE_GT2},
{0x9905, &SKL_1x3x8::hwInfo, &SKL_1x3x8::setupHardwareInfo, GTTYPE_GT2},
{ISKL_GT3_DESK_DEVICE_F0_ID, &SKL_2x3x8::hwInfo, &SKL_2x3x8::setupHardwareInfo, GTTYPE_GT3},
{ISKL_GT3_HALO_MOBL_DEVICE_F0_ID, &SKL_2x3x8::hwInfo, &SKL_2x3x8::setupHardwareInfo, GTTYPE_GT3},
{ISKL_GT3_MEDIA_SERV_DEVICE_F0_ID, &SKL_2x3x8::hwInfo, &SKL_2x3x8::setupHardwareInfo, GTTYPE_GT3},
{ISKL_GT3_SERV_DEVICE_F0_ID, &SKL_2x3x8::hwInfo, &SKL_2x3x8::setupHardwareInfo, GTTYPE_GT3},
{ISKL_GT3_ULT_DEVICE_F0_ID, &SKL_2x3x8::hwInfo, &SKL_2x3x8::setupHardwareInfo, GTTYPE_GT3},
{ISKL_GT3e_ULT_DEVICE_F0_ID_540, &SKL_2x3x8::hwInfo, &SKL_2x3x8::setupHardwareInfo, GTTYPE_GT3},
{ISKL_GT3e_ULT_DEVICE_F0_ID_550, &SKL_2x3x8::hwInfo, &SKL_2x3x8::setupHardwareInfo, GTTYPE_GT3},
{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},
{0x1923, &SKL_2x3x8::hwInfo, &SKL_2x3x8::setupHardwareInfo, GTTYPE_GT3},
{0x1926, &SKL_2x3x8::hwInfo, &SKL_2x3x8::setupHardwareInfo, GTTYPE_GT3},
{0x1927, &SKL_2x3x8::hwInfo, &SKL_2x3x8::setupHardwareInfo, GTTYPE_GT3},
{ISKL_GT4_DESK_DEVICE_F0_ID, &SKL_3x3x8::hwInfo, &SKL_3x3x8::setupHardwareInfo, GTTYPE_GT4},
{ISKL_GT4_DT_DEVICE_F0_ID, &SKL_3x3x8::hwInfo, &SKL_3x3x8::setupHardwareInfo, GTTYPE_GT4},
{ISKL_GT4_HALO_MOBL_DEVICE_F0_ID, &SKL_3x3x8::hwInfo, &SKL_3x3x8::setupHardwareInfo, GTTYPE_GT4},
{ISKL_GT4_SERV_DEVICE_F0_ID, &SKL_3x3x8::hwInfo, &SKL_3x3x8::setupHardwareInfo, GTTYPE_GT4},
{ISKL_GT4_WRK_DEVICE_F0_ID, &SKL_3x3x8::hwInfo, &SKL_3x3x8::setupHardwareInfo, GTTYPE_GT4},
{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},
{0x193D, &SKL_3x3x8::hwInfo, &SKL_3x3x8::setupHardwareInfo, GTTYPE_GT4},
}};
auto compareStructs = [](const DeviceDescriptor *first, const DeviceDescriptor *second) {