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/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;