intel/compute-runtime
1
0
Fork 0
mirror of https://github.com/intel/compute-runtime.git synced 2025-12-28 16:48:45 +08:00
Code Issues Packages Projects Releases Wiki Activity

Set proper SliceCount on Gen9

Browse Source 
Change-Id: I8bf1078aeb3068e166bf7ecd6e06155edc08d172
This commit is contained in:
kamdiedrich
2020-04-08 11:27:28 +02:00
committed by sys_ocldev
parent f8b25f6dcc
commit 27f688ea83
2 changed files with 15 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -18,12 +18,6 @@ int HwInfoConfigHw<IGFX_SKYLAKE>::configureHardwareCustom(HardwareInfo *hwInfo,
}
GT_SYSTEM_INFO *gtSystemInfo = &hwInfo->gtSystemInfo;
if (gtSystemInfo->SubSliceCount > 3) {
gtSystemInfo->SliceCount = 2;
} else {
gtSystemInfo->SliceCount = 1;
}
gtSystemInfo->VEBoxInfo.Instances.Bits.VEBox0Enabled = 1;
gtSystemInfo->VDBoxInfo.Instances.Bits.VDBox0Enabled = 1;
gtSystemInfo->VEBoxInfo.IsValid = true;

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

@@ -115,7 +115,7 @@ SKLTEST_F(HwInfoConfigTestLinuxSkl, configureHwInfo) {
EXPECT_EQ((unsigned short)drm->StoredDeviceRevID, outHwInfo.platform.usRevId);
EXPECT_EQ((uint32_t)drm->StoredEUVal, outHwInfo.gtSystemInfo.EUCount);
EXPECT_EQ((uint32_t)drm->StoredSSVal, outHwInfo.gtSystemInfo.SubSliceCount);
EXPECT_EQ(2u, outHwInfo.gtSystemInfo.SliceCount);
EXPECT_EQ(1u, outHwInfo.gtSystemInfo.SliceCount);
EXPECT_EQ(aub_stream::ENGINE_RCS, outHwInfo.capabilityTable.defaultEngineType);
EXPECT_EQ(GTTYPE_GT4, outHwInfo.platform.eGTType);
@@ -272,3 +272,17 @@ TYPED_TEST(SklHwInfoTests, gtSetupIsCorrect) {
EXPECT_EQ(gtSystemInfo.CsrSizeInMb, 8u);
EXPECT_FALSE(gtSystemInfo.IsDynamicallyPopulated);
}
TYPED_TEST(SklHwInfoTests, givenGTSystemInfoTypeWhenConfigureHardwareCustomThenSliceCountDontChange) {
HardwareInfo hwInfo;
auto osInterface = std::unique_ptr<OSInterface>(new OSInterface());
GT_SYSTEM_INFO &gtSystemInfo = hwInfo.gtSystemInfo;
TypeParam::setupHardwareInfo(&hwInfo, false);
auto sliceCount = gtSystemInfo.SliceCount;
HwInfoConfig *hwConfig = HwInfoConfig::get(PRODUCT_FAMILY::IGFX_SKYLAKE);
hwConfig->configureHardwareCustom(&hwInfo, osInterface.get());
EXPECT_EQ(gtSystemInfo.SliceCount, sliceCount);
}