Skip to content

Commit 6a1a28c

Browse files
wwoloszynCompute-Runtime-Automation
wwoloszyn
authored and
Compute-Runtime-Automation
committed
Add new CFL device IDs
Change-Id: I1846d4d76152467e257f684e68b5a8d12f7ac889 Signed-off-by: Woloszyn, Wojciech <wojciech.woloszyn@intel.com>
1 parent a99939b commit 6a1a28c

File tree

2 files changed

+40
-22
lines changed

2 files changed

+40
-22
lines changed

‎runtime/dll/linux/devices/devices_base.m‎

Lines changed: 23 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -106,22 +106,31 @@
106106

107107
#ifdef SUPPORT_CFL
108108
// GT1
109-
DEVICE( ICFL_GT1_DT_DEVICE_F0_ID, CFL_1x2x6, GTTYPE_GT1 )
110-
DEVICE( ICFL_GT1_S41_DT_DEVICE_F0_ID, CFL_1x2x6, GTTYPE_GT1 )
111-
DEVICE( ICFL_GT1_S61_DT_DEVICE_F0_ID, CFL_1x2x6, GTTYPE_GT1 )
109+
DEVICE( ICFL_GT1_DT_DEVICE_F0_ID, CFL_1x2x6, GTTYPE_GT1 )
110+
DEVICE( ICFL_GT1_S41_DT_DEVICE_F0_ID, CFL_1x2x6, GTTYPE_GT1 )
111+
DEVICE( ICFL_GT1_S61_DT_DEVICE_F0_ID, CFL_1x2x6, GTTYPE_GT1 )
112+
DEVICE( ICFL_GT1_41F_2F1F_ULT_DEVICE_F0_ID, CFL_1x2x6, GTTYPE_GT1 )
113+
DEVICE( ICFL_GT1_S6_S4_S2_F1F_DT_DEVICE_F0_ID, CFL_1x2x6, GTTYPE_GT1 )
114+
DEVICE( ICFL_GT1_U41F_U2F1F_ULT_DEVICE_F0_ID, CFL_1x2x6, GTTYPE_GT1 )
112115
// GT2
113-
DEVICE( ICFL_GT2_DT_DEVICE_F0_ID, CFL_1x3x6, GTTYPE_GT2 )
114-
DEVICE( ICFL_GT2_HALO_DEVICE_F0_ID, CFL_1x3x6, GTTYPE_GT2 )
115-
DEVICE( ICFL_GT2_HALO_WS_DEVICE_F0_ID, CFL_1x3x6, GTTYPE_GT2 )
116-
DEVICE( ICFL_GT2_S42_DT_DEVICE_F0_ID, CFL_1x3x6, GTTYPE_GT2 )
117-
DEVICE( ICFL_GT2_S62_DT_DEVICE_F0_ID, CFL_1x3x6, GTTYPE_GT2 )
118-
DEVICE( ICFL_GT2_SERV_DEVICE_F0_ID, CFL_1x3x6, GTTYPE_GT2 )
116+
DEVICE( ICFL_GT2_DT_DEVICE_F0_ID, CFL_1x3x8, GTTYPE_GT2 )
117+
DEVICE( ICFL_GT2_HALO_DEVICE_F0_ID, CFL_1x3x8, GTTYPE_GT2 )
118+
DEVICE( ICFL_GT2_HALO_WS_DEVICE_F0_ID, CFL_1x3x8, GTTYPE_GT2 )
119+
DEVICE( ICFL_GT2_S42_DT_DEVICE_F0_ID, CFL_1x3x8, GTTYPE_GT2 )
120+
DEVICE( ICFL_GT2_S62_DT_DEVICE_F0_ID, CFL_1x3x8, GTTYPE_GT2 )
121+
DEVICE( ICFL_GT2_SERV_DEVICE_F0_ID, CFL_1x3x8, GTTYPE_GT2 )
122+
DEVICE( ICFL_GT2_S82_S6F2_DT_DEVICE_F0_ID, CFL_1x3x8, GTTYPE_GT2 )
123+
DEVICE( ICFL_GT2_U42F_U2F1F_ULT_DEVICE_F0_ID, CFL_1x3x8, GTTYPE_GT2 )
124+
DEVICE( ICFL_GT2_U42F_U2F2F_ULT_DEVICE_F0_ID, CFL_1x3x8, GTTYPE_GT2 )
125+
DEVICE( ICFL_GT2_U42F_U2F2_ULT_DEVICE_F0_ID, CFL_1x3x8, GTTYPE_GT2 )
126+
DEVICE( ICFL_GT2_S8_S2_DT_DEVICE_F0_ID, CFL_1x3x8, GTTYPE_GT2 )
119127
// GT3
120-
DEVICE( ICFL_HALO_DEVICE_F0_ID, CFL_2x3x8, GTTYPE_GT3 )
121-
DEVICE( ICFL_GT3_ULT_15W_DEVICE_F0_ID, CFL_2x3x8, GTTYPE_GT3 )
122-
DEVICE( ICFL_GT3_ULT_15W_42EU_DEVICE_F0_ID, CFL_2x3x8, GTTYPE_GT3 )
123-
DEVICE( ICFL_GT3_ULT_28W_DEVICE_F0_ID, CFL_2x3x8, GTTYPE_GT3 )
124-
DEVICE( ICFL_GT3_ULT_DEVICE_F0_ID, CFL_2x3x8, GTTYPE_GT3 )
128+
DEVICE( ICFL_HALO_DEVICE_F0_ID, CFL_2x3x8, GTTYPE_GT3 )
129+
DEVICE( ICFL_GT3_ULT_15W_DEVICE_F0_ID, CFL_2x3x8, GTTYPE_GT3 )
130+
DEVICE( ICFL_GT3_ULT_15W_42EU_DEVICE_F0_ID, CFL_2x3x8, GTTYPE_GT3 )
131+
DEVICE( ICFL_GT3_ULT_28W_DEVICE_F0_ID, CFL_2x3x8, GTTYPE_GT3 )
132+
DEVICE( ICFL_GT3_ULT_DEVICE_F0_ID, CFL_2x3x8, GTTYPE_GT3 )
133+
DEVICE( ICFL_GT3_U43_ULT_DEVICE_F0_ID, CFL_2x3x8, GTTYPE_GT3 )
125134
#endif
126135

127136
#ifdef SUPPORT_GLK

‎unit_tests/gen9/cfl/linux/dll/device_id_tests_cfl.cpp‎

Lines changed: 17 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -14,23 +14,32 @@
1414
using namespace OCLRT;
1515

1616
TEST(CflDeviceIdTest, supportedDeviceId) {
17-
std::array<DeviceDescriptor, 14> expectedDescriptors = {{
17+
std::array<DeviceDescriptor, 23> expectedDescriptors = {{
1818
{ICFL_GT1_DT_DEVICE_F0_ID, &CFL_1x2x6::hwInfo, &CFL_1x2x6::setupHardwareInfo, GTTYPE_GT1},
1919
{ICFL_GT1_S41_DT_DEVICE_F0_ID, &CFL_1x2x6::hwInfo, &CFL_1x2x6::setupHardwareInfo, GTTYPE_GT1},
2020
{ICFL_GT1_S61_DT_DEVICE_F0_ID, &CFL_1x2x6::hwInfo, &CFL_1x2x6::setupHardwareInfo, GTTYPE_GT1},
21-
22-
{ICFL_GT2_DT_DEVICE_F0_ID, &CFL_1x3x6::hwInfo, &CFL_1x3x6::setupHardwareInfo, GTTYPE_GT2},
23-
{ICFL_GT2_HALO_DEVICE_F0_ID, &CFL_1x3x6::hwInfo, &CFL_1x3x6::setupHardwareInfo, GTTYPE_GT2},
24-
{ICFL_GT2_HALO_WS_DEVICE_F0_ID, &CFL_1x3x6::hwInfo, &CFL_1x3x6::setupHardwareInfo, GTTYPE_GT2},
25-
{ICFL_GT2_S42_DT_DEVICE_F0_ID, &CFL_1x3x6::hwInfo, &CFL_1x3x6::setupHardwareInfo, GTTYPE_GT2},
26-
{ICFL_GT2_S62_DT_DEVICE_F0_ID, &CFL_1x3x6::hwInfo, &CFL_1x3x6::setupHardwareInfo, GTTYPE_GT2},
27-
{ICFL_GT2_SERV_DEVICE_F0_ID, &CFL_1x3x6::hwInfo, &CFL_1x3x6::setupHardwareInfo, GTTYPE_GT2},
21+
{ICFL_GT1_41F_2F1F_ULT_DEVICE_F0_ID, &CFL_1x2x6::hwInfo, &CFL_1x2x6::setupHardwareInfo, GTTYPE_GT1},
22+
{ICFL_GT1_S6_S4_S2_F1F_DT_DEVICE_F0_ID, &CFL_1x2x6::hwInfo, &CFL_1x2x6::setupHardwareInfo, GTTYPE_GT1},
23+
{ICFL_GT1_U41F_U2F1F_ULT_DEVICE_F0_ID, &CFL_1x2x6::hwInfo, &CFL_1x2x6::setupHardwareInfo, GTTYPE_GT1},
24+
25+
{ICFL_GT2_DT_DEVICE_F0_ID, &CFL_1x3x8::hwInfo, &CFL_1x3x8::setupHardwareInfo, GTTYPE_GT2},
26+
{ICFL_GT2_HALO_DEVICE_F0_ID, &CFL_1x3x8::hwInfo, &CFL_1x3x8::setupHardwareInfo, GTTYPE_GT2},
27+
{ICFL_GT2_HALO_WS_DEVICE_F0_ID, &CFL_1x3x8::hwInfo, &CFL_1x3x8::setupHardwareInfo, GTTYPE_GT2},
28+
{ICFL_GT2_S42_DT_DEVICE_F0_ID, &CFL_1x3x8::hwInfo, &CFL_1x3x8::setupHardwareInfo, GTTYPE_GT2},
29+
{ICFL_GT2_S62_DT_DEVICE_F0_ID, &CFL_1x3x8::hwInfo, &CFL_1x3x8::setupHardwareInfo, GTTYPE_GT2},
30+
{ICFL_GT2_SERV_DEVICE_F0_ID, &CFL_1x3x8::hwInfo, &CFL_1x3x8::setupHardwareInfo, GTTYPE_GT2},
31+
{ICFL_GT2_S82_S6F2_DT_DEVICE_F0_ID, &CFL_1x3x8::hwInfo, &CFL_1x3x8::setupHardwareInfo, GTTYPE_GT2},
32+
{ICFL_GT2_U42F_U2F1F_ULT_DEVICE_F0_ID, &CFL_1x3x8::hwInfo, &CFL_1x3x8::setupHardwareInfo, GTTYPE_GT2},
33+
{ICFL_GT2_U42F_U2F2F_ULT_DEVICE_F0_ID, &CFL_1x3x8::hwInfo, &CFL_1x3x8::setupHardwareInfo, GTTYPE_GT2},
34+
{ICFL_GT2_U42F_U2F2_ULT_DEVICE_F0_ID, &CFL_1x3x8::hwInfo, &CFL_1x3x8::setupHardwareInfo, GTTYPE_GT2},
35+
{ICFL_GT2_S8_S2_DT_DEVICE_F0_ID, &CFL_1x3x8::hwInfo, &CFL_1x3x8::setupHardwareInfo, GTTYPE_GT2},
2836

2937
{ICFL_HALO_DEVICE_F0_ID, &CFL_2x3x8::hwInfo, &CFL_2x3x8::setupHardwareInfo, GTTYPE_GT3},
3038
{ICFL_GT3_ULT_15W_DEVICE_F0_ID, &CFL_2x3x8::hwInfo, &CFL_2x3x8::setupHardwareInfo, GTTYPE_GT3},
3139
{ICFL_GT3_ULT_15W_42EU_DEVICE_F0_ID, &CFL_2x3x8::hwInfo, &CFL_2x3x8::setupHardwareInfo, GTTYPE_GT3},
3240
{ICFL_GT3_ULT_28W_DEVICE_F0_ID, &CFL_2x3x8::hwInfo, &CFL_2x3x8::setupHardwareInfo, GTTYPE_GT3},
3341
{ICFL_GT3_ULT_DEVICE_F0_ID, &CFL_2x3x8::hwInfo, &CFL_2x3x8::setupHardwareInfo, GTTYPE_GT3},
42+
{ICFL_GT3_U43_ULT_DEVICE_F0_ID, &CFL_2x3x8::hwInfo, &CFL_2x3x8::setupHardwareInfo, GTTYPE_GT3},
3443
}};
3544

3645
auto compareStructs = [](const DeviceDescriptor *first, const DeviceDescriptor *second) {

0 commit comments

Comments
 (0)