From ecbb0f611b1b10bc88f9e31728c8054d746f830c Mon Sep 17 00:00:00 2001 From: Adam Cetnerowski Date: Thu, 2 Jan 2020 10:08:22 +0100 Subject: [PATCH] Cleanup Device IDs Change-Id: Ib5411e783d36c211431989d564617285d4ec9797 Signed-off-by: Adam Cetnerowski --- runtime/dll/linux/devices/devices_base.inl | 3 +-- unit_tests/gen12lp/tgllp/linux/dll/device_id_tests_tgllp.cpp | 5 ++--- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/runtime/dll/linux/devices/devices_base.inl b/runtime/dll/linux/devices/devices_base.inl index 09947196e4..705077e9a5 100644 --- a/runtime/dll/linux/devices/devices_base.inl +++ b/runtime/dll/linux/devices/devices_base.inl @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2019 Intel Corporation + * Copyright (C) 2018-2020 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -15,7 +15,6 @@ 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 ) #endif #endif diff --git a/unit_tests/gen12lp/tgllp/linux/dll/device_id_tests_tgllp.cpp b/unit_tests/gen12lp/tgllp/linux/dll/device_id_tests_tgllp.cpp index a5c4067046..42b2553613 100644 --- a/unit_tests/gen12lp/tgllp/linux/dll/device_id_tests_tgllp.cpp +++ b/unit_tests/gen12lp/tgllp/linux/dll/device_id_tests_tgllp.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2019 Intel Corporation + * Copyright (C) 2019-2020 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -13,7 +13,7 @@ using namespace NEO; TEST(TglLpDeviceIdTest, supportedDeviceId) { - std::array expectedDescriptors = {{ + std::array 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}, @@ -21,7 +21,6 @@ TEST(TglLpDeviceIdTest, supportedDeviceId) { {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}, }}; auto compareStructs = [](const DeviceDescriptor *first, const DeviceDescriptor *second) {