Media/compute-runtime
1
0
Fork 0
mirror of https://github.com/intel/compute-runtime.git synced 2025-09-15 13:01:45 +08:00
Code Issues Packages Projects Releases Wiki Activity

Device ID Cleanup

Browse Source 
Resolves: NEO-4912

Change-Id: I14ca1320bb516c6e9895f6c34b8a675ffaaced7c
Signed-off-by: Adam Cetnerowski <adam.cetnerowski@intel.com>
This commit is contained in:
Adam Cetnerowski
2020-07-30 11:15:51 +02:00
committed by sys_ocldev
parent 0931801830
commit 68294a0d68
4 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
opencl/source/dll/linux/devices/devices_base.inl
View File

@ -8,14 +8,14 @@
// clang-format off
#ifdef SUPPORT_GEN12LP
#ifdef SUPPORT_TGLLP
DEVICE( IGEN12LP_GT1_MOB_DEVICE_F0_ID, TGLLP_1x6x16, GTTYPE_GT2 )
DEVICE( ITGL_LP_1x6x16_ULT_15W_DEVICE_F0_ID, TGLLP_1x6x16, GTTYPE_GT2 )
DEVICE( ITGL_LP_1x6x16_ULX_5_2W_DEVICE_F0_ID, TGLLP_1x6x16, GTTYPE_GT2 )
DEVICE( ITGL_LP_1x6x16_ULT_12W_DEVICE_F0_ID, TGLLP_1x6x16, GTTYPE_GT2 )
DEVICE( ITGL_LP_1x2x16_HALO_45W_DEVICE_F0_ID, TGLLP_1x2x16, GTTYPE_GT2 )
DEVICE( ITGL_LP_1x2x16_DESK_65W_DEVICE_F0_ID, TGLLP_1x2x16, GTTYPE_GT2 )
DEVICE( ITGL_LP_1x2x16_HALO_WS_45W_DEVICE_F0_ID, TGLLP_1x2x16, GTTYPE_GT2 )
DEVICE( ITGL_LP_1x2x16_DESK_WS_65W_DEVICE_F0_ID, TGLLP_1x2x16, GTTYPE_GT2 )
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 )
#endif
#ifdef SUPPORT_DG1
DEVICE( DEV_ID_4905, DG1_CONFIG, GTTYPE_GT2 )

2
opencl/source/gen12lp/hw_info_tgllp.inl
View File

@ -18,7 +18,7 @@ const char *HwMapper<IGFX_TIGERLAKE_LP>::abbreviation = "tgllp";
bool isSimulationTGLLP(unsigned short deviceId) {
switch (deviceId) {
case IGEN12LP_GT1_MOB_DEVICE_F0_ID:
case DEV_ID_FF20:
return true;
}
return false;

2
opencl/test/unit_test/gen12lp/test_device_caps_gen12lp.inl
View File

@ -116,7 +116,7 @@ using TglLpUsDeviceIdTest = Test<ClDeviceFixture>;
HWTEST2_F(TglLpUsDeviceIdTest, isSimulationCap, IsTGLLP) {
unsigned short tglLpSimulationIds[2] = {
IGEN12LP_GT1_MOB_DEVICE_F0_ID,
DEV_ID_FF20,
0, // default, non-simulation
};
NEO::MockDevice *mockDevice = nullptr;

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

@ -15,14 +15,14 @@ using namespace NEO;
TEST(TglLpDeviceIdTest, supportedDeviceId) {
std::array<DeviceDescriptor, 8> expectedDescriptors = {{
{IGEN12LP_GT1_MOB_DEVICE_F0_ID, &TGLLP_1x6x16::hwInfo, &TGLLP_1x6x16::setupHardwareInfo, GTTYPE_GT2},
{ITGL_LP_1x6x16_ULT_15W_DEVICE_F0_ID, &TGLLP_1x6x16::hwInfo, &TGLLP_1x6x16::setupHardwareInfo, GTTYPE_GT2},
{ITGL_LP_1x6x16_ULX_5_2W_DEVICE_F0_ID, &TGLLP_1x6x16::hwInfo, &TGLLP_1x6x16::setupHardwareInfo, GTTYPE_GT2},
{ITGL_LP_1x6x16_ULT_12W_DEVICE_F0_ID, &TGLLP_1x6x16::hwInfo, &TGLLP_1x6x16::setupHardwareInfo, GTTYPE_GT2},
{ITGL_LP_1x2x16_HALO_45W_DEVICE_F0_ID, &TGLLP_1x2x16::hwInfo, &TGLLP_1x2x16::setupHardwareInfo, GTTYPE_GT2},
{ITGL_LP_1x2x16_DESK_65W_DEVICE_F0_ID, &TGLLP_1x2x16::hwInfo, &TGLLP_1x2x16::setupHardwareInfo, GTTYPE_GT2},
{ITGL_LP_1x2x16_HALO_WS_45W_DEVICE_F0_ID, &TGLLP_1x2x16::hwInfo, &TGLLP_1x2x16::setupHardwareInfo, GTTYPE_GT2},
{ITGL_LP_1x2x16_DESK_WS_65W_DEVICE_F0_ID, &TGLLP_1x2x16::hwInfo, &TGLLP_1x2x16::setupHardwareInfo, GTTYPE_GT2},
{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},
}};
auto compareStructs = [](const DeviceDescriptor *first, const DeviceDescriptor *second) {