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-5250

Signed-off-by: Adam Cetnerowski <adam.cetnerowski@intel.com>
This commit is contained in:
Adam Cetnerowski
2020-11-05 15:01:58 +00:00
committed by Compute-Runtime-Automation
parent 152f89f2f2
commit 8c0a97a618
16 changed files with 70 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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

4
opencl/source/gen9/linux/hw_info_config_cfl.inl
View File

@ -26,8 +26,8 @@ int HwInfoConfigHw<IGFX_COFFEELAKE>::configureHardwareCustom(HardwareInfo *hwInf
gtSystemInfo->VEBoxInfo.Instances.Bits.VEBox0Enabled = true;
gtSystemInfo->VEBoxInfo.IsValid = true;
if (hwInfo->platform.usDeviceID == ICFL_GT3_ULT_28W_DEVICE_F0_ID ||
hwInfo->platform.usDeviceID == ICFL_GT3_ULT_15W_DEVICE_F0_ID) {
if (hwInfo->platform.usDeviceID == 0x3EA8 ||
hwInfo->platform.usDeviceID == 0x3EA6) {
gtSystemInfo->EdramSizeInKb = 64 * 1024;
}

4
opencl/source/gen9/linux/hw_info_config_kbl.inl
View File

@ -26,8 +26,8 @@ int HwInfoConfigHw<IGFX_KABYLAKE>::configureHardwareCustom(HardwareInfo *hwInfo,
gtSystemInfo->VEBoxInfo.Instances.Bits.VEBox0Enabled = 1;
gtSystemInfo->VEBoxInfo.IsValid = true;
if (hwInfo->platform.usDeviceID == IKBL_GT3_28W_ULT_DEVICE_F0_ID ||
hwInfo->platform.usDeviceID == IKBL_GT3_15W_ULT_DEVICE_F0_ID) {
if (hwInfo->platform.usDeviceID == 0x5927 ||
hwInfo->platform.usDeviceID == 0x5926) {
gtSystemInfo->EdramSizeInKb = 64 * 1024;
}

10
opencl/source/gen9/linux/hw_info_config_skl.inl
View File

@ -24,14 +24,14 @@ int HwInfoConfigHw<IGFX_SKYLAKE>::configureHardwareCustom(HardwareInfo *hwInfo,
gtSystemInfo->VEBoxInfo.IsValid = true;
gtSystemInfo->VDBoxInfo.IsValid = true;
if (hwInfo->platform.usDeviceID == ISKL_GT3e_ULT_DEVICE_F0_ID_540 ||
hwInfo->platform.usDeviceID == ISKL_GT3e_ULT_DEVICE_F0_ID_550 ||
hwInfo->platform.usDeviceID == ISKL_GT3_MEDIA_SERV_DEVICE_F0_ID) {
if (hwInfo->platform.usDeviceID == 0x1926 ||
hwInfo->platform.usDeviceID == 0x1927 ||
hwInfo->platform.usDeviceID == 0x192D) {
gtSystemInfo->EdramSizeInKb = 64 * 1024;
}
if (hwInfo->platform.usDeviceID == ISKL_GT4_HALO_MOBL_DEVICE_F0_ID ||
hwInfo->platform.usDeviceID == ISKL_GT4_WRK_DEVICE_F0_ID) {
if (hwInfo->platform.usDeviceID == 0x193B ||
hwInfo->platform.usDeviceID == 0x193D) {
gtSystemInfo->EdramSizeInKb = 128 * 1024;
}

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

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

10
opencl/test/unit_test/gen8/bdw/linux/hw_info_config_tests_bdw.cpp
View File

@ -13,7 +13,7 @@ using namespace NEO;
struct HwInfoConfigTestLinuxBdw : HwInfoConfigTestLinux {
void SetUp() override {
HwInfoConfigTestLinux::SetUp();
drm->StoredDeviceID = IBDW_GT2_ULT_MOBL_DEVICE_F0_ID;
drm->StoredDeviceID = 0x1616;
drm->setGtType(GTTYPE_GT2);
}
};
@ -40,7 +40,7 @@ BDWTEST_F(HwInfoConfigTestLinuxBdw, configureHwInfo) {
EXPECT_EQ(0u, outHwInfo.featureTable.ftrGTC);
EXPECT_EQ(0u, outHwInfo.featureTable.ftrGTX);
drm->StoredDeviceID = IBDW_GT1_HALO_MOBL_DEVICE_F0_ID;
drm->StoredDeviceID = 0x1602;
drm->setGtType(GTTYPE_GT1);
ret = hwInfoConfig->configureHwInfo(&pInHwInfo, &outHwInfo, osInterface);
EXPECT_EQ(0, ret);
@ -60,7 +60,7 @@ BDWTEST_F(HwInfoConfigTestLinuxBdw, configureHwInfo) {
EXPECT_EQ(0u, outHwInfo.featureTable.ftrGTC);
EXPECT_EQ(0u, outHwInfo.featureTable.ftrGTX);
drm->StoredDeviceID = IBDW_GT3_ULT_MOBL_DEVICE_F0_ID;
drm->StoredDeviceID = 0x1626;
drm->setGtType(GTTYPE_GT3);
drm->StoredSSVal = 6;
ret = hwInfoConfig->configureHwInfo(&pInHwInfo, &outHwInfo, osInterface);
@ -136,14 +136,14 @@ BDWTEST_F(HwInfoConfigTestLinuxBdw, configureHwInfoEdram) {
EXPECT_EQ_VAL(0u, outHwInfo.gtSystemInfo.EdramSizeInKb);
EXPECT_EQ(0u, outHwInfo.featureTable.ftrEDram);
drm->StoredDeviceID = IBDW_GT3_HALO_MOBL_DEVICE_F0_ID;
drm->StoredDeviceID = 0x1622;
drm->setGtType(GTTYPE_GT3);
ret = hwInfoConfig->configureHwInfo(&pInHwInfo, &outHwInfo, osInterface);
EXPECT_EQ(0, ret);
EXPECT_EQ_VAL((128u * 1024u), outHwInfo.gtSystemInfo.EdramSizeInKb);
EXPECT_EQ(1u, outHwInfo.featureTable.ftrEDram);
drm->StoredDeviceID = IBDW_GT3_SERV_DEVICE_F0_ID;
drm->StoredDeviceID = 0x162A;
ret = hwInfoConfig->configureHwInfo(&pInHwInfo, &outHwInfo, osInterface);
EXPECT_EQ(0, ret);
EXPECT_EQ_VAL((128u * 1024u), outHwInfo.gtSystemInfo.EdramSizeInKb);

10
opencl/test/unit_test/gen8/bdw/test_device_caps_bdw.cpp
View File

@ -57,11 +57,11 @@ typedef Test<ClDeviceFixture> BdwUsDeviceIdTest;
BDWTEST_F(BdwUsDeviceIdTest, WhenCheckingIsSimulationThenTrueReturnedOnlyForSimulationId) {
unsigned short bdwSimulationIds[6] = {
IBDW_GT0_DESK_DEVICE_F0_ID,
IBDW_GT1_DESK_DEVICE_F0_ID,
IBDW_GT2_DESK_DEVICE_F0_ID,
IBDW_GT3_DESK_DEVICE_F0_ID,
IBDW_GT4_DESK_DEVICE_F0_ID,
0x0BD0,
0x0BD1,
0x0BD2,
0x0BD3,
0x0BD4,
0, // default, non-simulation
};
NEO::MockDevice *mockDevice = nullptr;

16
opencl/test/unit_test/gen9/bxt/linux/dll/device_id_tests.cpp
View File

@ -15,14 +15,14 @@ using namespace NEO;
TEST(BxtDeviceIdTest, supportedDeviceId) {
std::array<DeviceDescriptor, 8> expectedDescriptors = {{
{IBXT_A_DEVICE_F0_ID, &BXT_1x3x6::hwInfo, &BXT_1x3x6::setupHardwareInfo, GTTYPE_GTA},
{IBXT_C_DEVICE_F0_ID, &BXT_1x3x6::hwInfo, &BXT_1x3x6::setupHardwareInfo, GTTYPE_GTA},
{IBXT_GT_3x6_DEVICE_ID, &BXT_1x3x6::hwInfo, &BXT_1x3x6::setupHardwareInfo, GTTYPE_GTA},
{IBXT_P_3x6_DEVICE_ID, &BXT_1x3x6::hwInfo, &BXT_1x3x6::setupHardwareInfo, GTTYPE_GTA},
{IBXT_P_12EU_3x6_DEVICE_ID, &BXT_1x2x6::hwInfo, &BXT_1x2x6::setupHardwareInfo, GTTYPE_GTA},
{IBXT_PRO_12EU_3x6_DEVICE_ID, &BXT_1x2x6::hwInfo, &BXT_1x2x6::setupHardwareInfo, GTTYPE_GTA},
{IBXT_PRO_3x6_DEVICE_ID, &BXT_1x3x6::hwInfo, &BXT_1x3x6::setupHardwareInfo, GTTYPE_GTA},
{IBXT_X_DEVICE_F0_ID, &BXT_1x3x6::hwInfo, &BXT_1x3x6::setupHardwareInfo, GTTYPE_GTA},
{0x9906, &BXT_1x3x6::hwInfo, &BXT_1x3x6::setupHardwareInfo, GTTYPE_GTA},
{0x9907, &BXT_1x3x6::hwInfo, &BXT_1x3x6::setupHardwareInfo, GTTYPE_GTA},
{0x0A84, &BXT_1x3x6::hwInfo, &BXT_1x3x6::setupHardwareInfo, GTTYPE_GTA},
{0x5A84, &BXT_1x3x6::hwInfo, &BXT_1x3x6::setupHardwareInfo, GTTYPE_GTA},
{0x5A85, &BXT_1x2x6::hwInfo, &BXT_1x2x6::setupHardwareInfo, GTTYPE_GTA},
{0x1A85, &BXT_1x2x6::hwInfo, &BXT_1x2x6::setupHardwareInfo, GTTYPE_GTA},
{0x1A84, &BXT_1x3x6::hwInfo, &BXT_1x3x6::setupHardwareInfo, GTTYPE_GTA},
{0x9908, &BXT_1x3x6::hwInfo, &BXT_1x3x6::setupHardwareInfo, GTTYPE_GTA},
}};
auto compareStructs = [](const DeviceDescriptor *first, const DeviceDescriptor *second) {

10
opencl/test/unit_test/gen9/bxt/linux/hw_info_config_tests.cpp
View File

@ -13,7 +13,7 @@ using namespace NEO;
struct HwInfoConfigTestLinuxBxt : HwInfoConfigTestLinux {
void SetUp() override {
HwInfoConfigTestLinux::SetUp();
drm->StoredDeviceID = IBXT_P_3x6_DEVICE_ID;
drm->StoredDeviceID = 0x5A84;
drm->setGtType(GTTYPE_GTA);
drm->StoredEUVal = 18;
drm->StoredHasPooledEU = 1;
@ -50,8 +50,8 @@ BXTTEST_F(HwInfoConfigTestLinuxBxt, configureHwInfo) {
EXPECT_EQ(0u, outHwInfo.featureTable.ftrGTC);
EXPECT_EQ(0u, outHwInfo.featureTable.ftrGTX);
drm->StoredDeviceID = IBXT_P_12EU_3x6_DEVICE_ID;
drm->setGtType(GTTYPE_GTC); //IBXT_P_12EU_3x6_DEVICE_ID is GTA, but fot test sake make it GTC
drm->StoredDeviceID = 0x5A85;
drm->setGtType(GTTYPE_GTC); //0x5A85 is GTA, but for test make it GTC
drm->StoredMinEUinPool = 6;
drm->StoredDeviceRevID = 4;
ret = hwInfoConfig->configureHwInfo(&pInHwInfo, &outHwInfo, osInterface);
@ -75,8 +75,8 @@ BXTTEST_F(HwInfoConfigTestLinuxBxt, configureHwInfo) {
EXPECT_EQ(1u, outHwInfo.featureTable.ftrGTC);
EXPECT_EQ(0u, outHwInfo.featureTable.ftrGTX);
drm->StoredDeviceID = IBXT_P_12EU_3x6_DEVICE_ID;
drm->setGtType(GTTYPE_GTX); //IBXT_P_12EU_3x6_DEVICE_ID is GTA, but fot test sake make it GTX
drm->StoredDeviceID = 0x5A85;
drm->setGtType(GTTYPE_GTX); //0x5A85 is GTA, but for test make it GTX
drm->StoredMinEUinPool = 9;
ret = hwInfoConfig->configureHwInfo(&pInHwInfo, &outHwInfo, osInterface);
EXPECT_EQ(0, ret);

4
opencl/test/unit_test/gen9/bxt/test_device_caps_bxt.cpp
View File

@ -46,8 +46,8 @@ typedef Test<ClDeviceFixture> BxtUsDeviceIdTest;
BXTTEST_F(BxtUsDeviceIdTest, WhenCheckingIsSimulationThenTrueReturnedOnlyForSimulationId) {
unsigned short bxtSimulationIds[3] = {
IBXT_A_DEVICE_F0_ID,
IBXT_C_DEVICE_F0_ID,
0x9906,
0x9907,
0, // default, non-simulation
};
NEO::MockDevice *mockDevice = nullptr;

10
opencl/test/unit_test/gen9/cfl/linux/hw_info_config_tests_cfl.cpp
View File

@ -15,7 +15,7 @@ using namespace NEO;
struct HwInfoConfigTestLinuxCfl : HwInfoConfigTestLinux {
void SetUp() override {
HwInfoConfigTestLinux::SetUp();
drm->StoredDeviceID = ICFL_GT2_DT_DEVICE_F0_ID;
drm->StoredDeviceID = 0x3E92;
drm->setGtType(GTTYPE_GT2);
}
};
@ -44,7 +44,7 @@ CFLTEST_F(HwInfoConfigTestLinuxCfl, configureHwInfo) {
EXPECT_EQ(1u, outHwInfo.gtSystemInfo.VEBoxInfo.Instances.Bits.VEBox0Enabled);
EXPECT_TRUE(outHwInfo.gtSystemInfo.VEBoxInfo.IsValid);
drm->StoredDeviceID = ICFL_GT1_DT_DEVICE_F0_ID;
drm->StoredDeviceID = 0x3E90;
drm->StoredSSVal = 3;
drm->setGtType(GTTYPE_GT1);
ret = hwInfoConfig->configureHwInfo(&pInHwInfo, &outHwInfo, osInterface);
@ -66,7 +66,7 @@ CFLTEST_F(HwInfoConfigTestLinuxCfl, configureHwInfo) {
EXPECT_EQ(0u, outHwInfo.featureTable.ftrGTC);
EXPECT_EQ(0u, outHwInfo.featureTable.ftrGTX);
drm->StoredDeviceID = ICFL_GT3_ULT_DEVICE_F0_ID;
drm->StoredDeviceID = 0x3EA5;
drm->StoredSSVal = 6;
drm->setGtType(GTTYPE_GT3);
ret = hwInfoConfig->configureHwInfo(&pInHwInfo, &outHwInfo, osInterface);
@ -150,14 +150,14 @@ CFLTEST_F(HwInfoConfigTestLinuxCfl, configureHwInfoEdram) {
EXPECT_EQ_VAL(0u, outHwInfo.gtSystemInfo.EdramSizeInKb);
EXPECT_EQ(0u, outHwInfo.featureTable.ftrEDram);
drm->StoredDeviceID = ICFL_GT3_ULT_28W_DEVICE_F0_ID;
drm->StoredDeviceID = 0x3EA8;
drm->setGtType(GTTYPE_GT3);
ret = hwInfoConfig->configureHwInfo(&pInHwInfo, &outHwInfo, osInterface);
EXPECT_EQ(0, ret);
EXPECT_EQ_VAL((64u * 1024u), outHwInfo.gtSystemInfo.EdramSizeInKb);
EXPECT_EQ(1u, outHwInfo.featureTable.ftrEDram);
drm->StoredDeviceID = ICFL_GT3_ULT_15W_DEVICE_F0_ID;
drm->StoredDeviceID = 0x3EA6;
ret = hwInfoConfig->configureHwInfo(&pInHwInfo, &outHwInfo, osInterface);
EXPECT_EQ(0, ret);
EXPECT_EQ_VAL((64u * 1024u), outHwInfo.gtSystemInfo.EdramSizeInKb);

10
opencl/test/unit_test/gen9/glk/linux/hw_info_config_tests_glk.cpp
View File

@ -14,7 +14,7 @@ struct HwInfoConfigTestLinuxGlk : HwInfoConfigTestLinux {
void SetUp() override {
HwInfoConfigTestLinux::SetUp();
drm->StoredDeviceID = IGLK_GT2_ULT_12EU_DEVICE_F0_ID;
drm->StoredDeviceID = 0x3185;
drm->setGtType(GTTYPE_GTA);
drm->StoredEUVal = 18;
drm->StoredHasPooledEU = 1;
@ -47,8 +47,8 @@ GLKTEST_F(HwInfoConfigTestLinuxGlk, configureHwInfo) {
EXPECT_EQ(1u, outHwInfo.gtSystemInfo.VEBoxInfo.Instances.Bits.VEBox0Enabled);
EXPECT_TRUE(outHwInfo.gtSystemInfo.VEBoxInfo.IsValid);
drm->StoredDeviceID = IGLK_GT2_ULT_18EU_DEVICE_F0_ID;
drm->setGtType(GTTYPE_GTC); //IGLK_GT2_ULT_18EU_DEVICE_F0_ID is GTA, but fot test sake make it GTC
drm->StoredDeviceID = 0x3184;
drm->setGtType(GTTYPE_GTC); //0x3184 is GTA, but for test make it GTC
drm->StoredMinEUinPool = 6;
ret = hwInfoConfig->configureHwInfo(&pInHwInfo, &outHwInfo, osInterface);
EXPECT_EQ(0, ret);
@ -71,8 +71,8 @@ GLKTEST_F(HwInfoConfigTestLinuxGlk, configureHwInfo) {
EXPECT_EQ(1u, outHwInfo.featureTable.ftrGTC);
EXPECT_EQ(0u, outHwInfo.featureTable.ftrGTX);
drm->StoredDeviceID = IGLK_GT2_ULT_12EU_DEVICE_F0_ID;
drm->setGtType(GTTYPE_GTX); //IGLK_GT2_ULT_18EU_DEVICE_F0_ID is GTA, but fot test sake make it GTX
drm->StoredDeviceID = 0x3185;
drm->setGtType(GTTYPE_GTX); //0x3185 is GTA, but for test make it GTX
drm->StoredMinEUinPool = 9;
ret = hwInfoConfig->configureHwInfo(&pInHwInfo, &outHwInfo, osInterface);
EXPECT_EQ(0, ret);

4
opencl/test/unit_test/gen9/glk/test_device_caps_glk.cpp
View File

@ -37,8 +37,8 @@ typedef Test<ClDeviceFixture> GlkUsDeviceIdTest;
GLKTEST_F(GlkUsDeviceIdTest, WhenCheckingIsSimulationThenTrueReturnedOnlyForSimulationId) {
unsigned short glkSimulationIds[3] = {
IGLK_GT2_ULT_18EU_DEVICE_F0_ID,
IGLK_GT2_ULT_12EU_DEVICE_F0_ID,
0x3184,
0x3185,
0, // default, non-simulation
};
NEO::MockDevice *mockDevice = nullptr;

14
opencl/test/unit_test/gen9/kbl/linux/hw_info_config_tests_kbl.cpp
View File

@ -15,7 +15,7 @@ using namespace NEO;
struct HwInfoConfigTestLinuxKbl : HwInfoConfigTestLinux {
void SetUp() override {
HwInfoConfigTestLinux::SetUp();
drm->StoredDeviceID = IKBL_GT2_DT_DEVICE_F0_ID;
drm->StoredDeviceID = 0x5912;
drm->setGtType(GTTYPE_GT2);
}
};
@ -44,7 +44,7 @@ KBLTEST_F(HwInfoConfigTestLinuxKbl, configureHwInfo) {
EXPECT_EQ(1u, outHwInfo.gtSystemInfo.VEBoxInfo.Instances.Bits.VEBox0Enabled);
EXPECT_TRUE(outHwInfo.gtSystemInfo.VEBoxInfo.IsValid);
drm->StoredDeviceID = IKBL_GT1_ULT_DEVICE_F0_ID;
drm->StoredDeviceID = 0x5906;
drm->StoredSSVal = 3;
drm->setGtType(GTTYPE_GT1);
ret = hwInfoConfig->configureHwInfo(&pInHwInfo, &outHwInfo, osInterface);
@ -66,7 +66,7 @@ KBLTEST_F(HwInfoConfigTestLinuxKbl, configureHwInfo) {
EXPECT_EQ(0u, outHwInfo.featureTable.ftrGTC);
EXPECT_EQ(0u, outHwInfo.featureTable.ftrGTX);
drm->StoredDeviceID = IKBL_GT1_5_ULX_DEVICE_F0_ID;
drm->StoredDeviceID = 0x5915;
drm->setGtType(GTTYPE_GT1_5);
ret = hwInfoConfig->configureHwInfo(&pInHwInfo, &outHwInfo, osInterface);
EXPECT_EQ(0, ret);
@ -86,7 +86,7 @@ KBLTEST_F(HwInfoConfigTestLinuxKbl, configureHwInfo) {
EXPECT_EQ(0u, outHwInfo.featureTable.ftrGTC);
EXPECT_EQ(0u, outHwInfo.featureTable.ftrGTX);
drm->StoredDeviceID = IKBL_GT3_ULT_DEVICE_F0_ID;
drm->StoredDeviceID = 0x5923;
drm->StoredSSVal = 6;
drm->setGtType(GTTYPE_GT3);
ret = hwInfoConfig->configureHwInfo(&pInHwInfo, &outHwInfo, osInterface);
@ -108,7 +108,7 @@ KBLTEST_F(HwInfoConfigTestLinuxKbl, configureHwInfo) {
EXPECT_EQ(0u, outHwInfo.featureTable.ftrGTC);
EXPECT_EQ(0u, outHwInfo.featureTable.ftrGTX);
drm->StoredDeviceID = IKBL_GT4_HALO_DEVICE_F0_ID;
drm->StoredDeviceID = 0x593B;
drm->StoredSSVal = 6;
drm->setGtType(GTTYPE_GT4);
ret = hwInfoConfig->configureHwInfo(&pInHwInfo, &outHwInfo, osInterface);
@ -205,14 +205,14 @@ KBLTEST_F(HwInfoConfigTestLinuxKbl, configureHwInfoEdram) {
EXPECT_EQ_VAL(0u, outHwInfo.gtSystemInfo.EdramSizeInKb);
EXPECT_EQ(0u, outHwInfo.featureTable.ftrEDram);
drm->StoredDeviceID = IKBL_GT3_28W_ULT_DEVICE_F0_ID;
drm->StoredDeviceID = 0x5927;
drm->setGtType(GTTYPE_GT3);
ret = hwInfoConfig->configureHwInfo(&pInHwInfo, &outHwInfo, osInterface);
EXPECT_EQ(0, ret);
EXPECT_EQ_VAL((64u * 1024u), outHwInfo.gtSystemInfo.EdramSizeInKb);
EXPECT_EQ(1u, outHwInfo.featureTable.ftrEDram);
drm->StoredDeviceID = IKBL_GT3_15W_ULT_DEVICE_F0_ID;
drm->StoredDeviceID = 0x5926;
ret = hwInfoConfig->configureHwInfo(&pInHwInfo, &outHwInfo, osInterface);
EXPECT_EQ(0, ret);
EXPECT_EQ_VAL((64u * 1024u), outHwInfo.gtSystemInfo.EdramSizeInKb);

20
opencl/test/unit_test/gen9/skl/linux/hw_info_config_tests_skl.cpp
View File

@ -13,7 +13,7 @@ using namespace NEO;
struct HwInfoConfigTestLinuxSkl : HwInfoConfigTestLinux {
void SetUp() override {
HwInfoConfigTestLinux::SetUp();
drm->StoredDeviceID = ISKL_GT2_DESK_DEVICE_F0_ID;
drm->StoredDeviceID = 0x0902;
drm->setGtType(GTTYPE_GT2);
}
};
@ -44,7 +44,7 @@ SKLTEST_F(HwInfoConfigTestLinuxSkl, configureHwInfo) {
EXPECT_TRUE(outHwInfo.gtSystemInfo.VEBoxInfo.IsValid);
EXPECT_TRUE(outHwInfo.gtSystemInfo.VDBoxInfo.IsValid);
drm->StoredDeviceID = ISKL_GT1_DT_DEVICE_F0_ID;
drm->StoredDeviceID = 0x1902;
drm->setGtType(GTTYPE_GT1);
drm->StoredSSVal = 3;
ret = hwInfoConfig->configureHwInfo(&pInHwInfo, &outHwInfo, osInterface);
@ -66,7 +66,7 @@ SKLTEST_F(HwInfoConfigTestLinuxSkl, configureHwInfo) {
EXPECT_EQ(0u, outHwInfo.featureTable.ftrGTC);
EXPECT_EQ(0u, outHwInfo.featureTable.ftrGTX);
drm->StoredDeviceID = ISKL_GT1_5_DT_DEVICE_F0_ID;
drm->StoredDeviceID = 0x1917;
drm->setGtType(GTTYPE_GT1_5);
ret = hwInfoConfig->configureHwInfo(&pInHwInfo, &outHwInfo, osInterface);
EXPECT_EQ(0, ret);
@ -86,7 +86,7 @@ SKLTEST_F(HwInfoConfigTestLinuxSkl, configureHwInfo) {
EXPECT_EQ(0u, outHwInfo.featureTable.ftrGTC);
EXPECT_EQ(0u, outHwInfo.featureTable.ftrGTX);
drm->StoredDeviceID = ISKL_GT3_DESK_DEVICE_F0_ID;
drm->StoredDeviceID = 0x0903;
drm->setGtType(GTTYPE_GT3);
ret = hwInfoConfig->configureHwInfo(&pInHwInfo, &outHwInfo, osInterface);
EXPECT_EQ(0, ret);
@ -106,7 +106,7 @@ SKLTEST_F(HwInfoConfigTestLinuxSkl, configureHwInfo) {
EXPECT_EQ(0u, outHwInfo.featureTable.ftrGTC);
EXPECT_EQ(0u, outHwInfo.featureTable.ftrGTX);
drm->StoredDeviceID = ISKL_GT4_DESK_DEVICE_F0_ID;
drm->StoredDeviceID = 0x0904;
drm->setGtType(GTTYPE_GT4);
drm->StoredSSVal = 6;
ret = hwInfoConfig->configureHwInfo(&pInHwInfo, &outHwInfo, osInterface);
@ -210,33 +210,33 @@ SKLTEST_F(HwInfoConfigTestLinuxSkl, configureHwInfoEdram) {
EXPECT_EQ_VAL(0u, outHwInfo.gtSystemInfo.EdramSizeInKb);
EXPECT_EQ(0u, outHwInfo.featureTable.ftrEDram);
drm->StoredDeviceID = ISKL_GT3e_ULT_DEVICE_F0_ID_540;
drm->StoredDeviceID = 0x1926;
drm->setGtType(GTTYPE_GT3);
ret = hwInfoConfig->configureHwInfo(&pInHwInfo, &outHwInfo, osInterface);
EXPECT_EQ(0, ret);
EXPECT_EQ_VAL((64u * 1024u), outHwInfo.gtSystemInfo.EdramSizeInKb);
EXPECT_EQ(1u, outHwInfo.featureTable.ftrEDram);
drm->StoredDeviceID = ISKL_GT3e_ULT_DEVICE_F0_ID_550;
drm->StoredDeviceID = 0x1927;
ret = hwInfoConfig->configureHwInfo(&pInHwInfo, &outHwInfo, osInterface);
EXPECT_EQ(0, ret);
EXPECT_EQ_VAL((64u * 1024u), outHwInfo.gtSystemInfo.EdramSizeInKb);
EXPECT_EQ(1u, outHwInfo.featureTable.ftrEDram);
drm->StoredDeviceID = ISKL_GT3_MEDIA_SERV_DEVICE_F0_ID;
drm->StoredDeviceID = 0x192D;
ret = hwInfoConfig->configureHwInfo(&pInHwInfo, &outHwInfo, osInterface);
EXPECT_EQ(0, ret);
EXPECT_EQ_VAL((64u * 1024u), outHwInfo.gtSystemInfo.EdramSizeInKb);
EXPECT_EQ(1u, outHwInfo.featureTable.ftrEDram);
drm->StoredDeviceID = ISKL_GT4_HALO_MOBL_DEVICE_F0_ID;
drm->StoredDeviceID = 0x193B;
drm->setGtType(GTTYPE_GT4);
ret = hwInfoConfig->configureHwInfo(&pInHwInfo, &outHwInfo, osInterface);
EXPECT_EQ(0, ret);
EXPECT_EQ_VAL((128u * 1024u), outHwInfo.gtSystemInfo.EdramSizeInKb);
EXPECT_EQ(1u, outHwInfo.featureTable.ftrEDram);
drm->StoredDeviceID = ISKL_GT4_WRK_DEVICE_F0_ID;
drm->StoredDeviceID = 0x193D;
ret = hwInfoConfig->configureHwInfo(&pInHwInfo, &outHwInfo, osInterface);
EXPECT_EQ(0, ret);
EXPECT_EQ_VAL((128u * 1024u), outHwInfo.gtSystemInfo.EdramSizeInKb);

10
opencl/test/unit_test/gen9/skl/test_device_caps_skl.cpp
View File

@ -36,11 +36,11 @@ typedef Test<ClDeviceFixture> SklUsDeviceIdTest;
SKLTEST_F(SklUsDeviceIdTest, WhenCheckingIsSimulationThenTrueReturnedOnlyForSimulationId) {
unsigned short sklSimulationIds[6] = {
ISKL_GT0_DESK_DEVICE_F0_ID,
ISKL_GT1_DESK_DEVICE_F0_ID,
ISKL_GT2_DESK_DEVICE_F0_ID,
ISKL_GT3_DESK_DEVICE_F0_ID,
ISKL_GT4_DESK_DEVICE_F0_ID,
0x0900,
0x0901,
0x0902,
0x0903,
0x0904,
0, // default, non-simulation
};
NEO::MockDevice *mockDevice = nullptr;