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

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;