intel/compute-runtime
1
0
Fork 0
mirror of https://github.com/intel/compute-runtime.git synced 2026-01-05 09:09:04 +08:00
Code Issues Packages Projects Releases Wiki Activity

Move setting of featureTable flags

Browse Source 
ftrL3IACoherency, ftrGpGpuMidBatchPreempt, ftrGpGpuThreadGroupLevelPreempt
from configureHardwareCustom to setupFeatureAndWorkaroundTable

Related-To: NEO-2755

Change-Id: I508ad321c60bfd88eef3654b3f418343fc5b6b31
Signed-off-by: Katarzyna Cencelewska <katarzyna.cencelewska@intel.com>
This commit is contained in:
Katarzyna Cencelewska
2019-04-25 15:14:36 +02:00
committed by sys_ocldev
parent 41ca0a0033
commit a6aac141d1
33 changed files with 42 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
unit_tests/gen10/linux/hw_info_config_tests_gen10.cpp
View File

@@ -42,13 +42,6 @@ CNLTEST_F(HwInfoConfigTestLinuxCnl, configureHwInfo) {
EXPECT_EQ(0u, outHwInfo.pSkuTable->ftrGTC);
EXPECT_EQ(0u, outHwInfo.pSkuTable->ftrGTX);
//constant sysInfo/ftr flags
EXPECT_EQ(1u, outHwInfo.pSkuTable->ftrGpGpuMidBatchPreempt);
EXPECT_EQ(1u, outHwInfo.pSkuTable->ftrGpGpuThreadGroupLevelPreempt);
EXPECT_EQ(1u, outHwInfo.pSkuTable->ftrGpGpuThreadGroupLevelPreempt);
EXPECT_EQ(1u, outHwInfo.pSkuTable->ftrSVM);
EXPECT_EQ(1u, outHwInfo.pSkuTable->ftrL3IACoherency);
ReleaseOutHwInfoStructs();
drm->StoredDeviceID = ICNL_3x8_ULT_DEVICE_F0_ID;

3
unit_tests/gen10/test_hw_info_config_cnl.cpp
View File

@@ -97,6 +97,9 @@ CNLTEST_F(CnlHwInfo, givenBoolWhenCallCnlHardwareInfoSetupThenFeatureTableAndWor
pPlatform.usRevId = 9;
hardwareInfoSetup[productFamily](&hwInfo, setParamBool, config);
EXPECT_EQ(setParamBool, pSkuTable.ftrL3IACoherency);
EXPECT_EQ(setParamBool, pSkuTable.ftrGpGpuMidBatchPreempt);
EXPECT_EQ(setParamBool, pSkuTable.ftrGpGpuThreadGroupLevelPreempt);
EXPECT_EQ(setParamBool, pSkuTable.ftrGpGpuMidThreadLevelPreempt);
EXPECT_EQ(setParamBool, pSkuTable.ftr3dMidBatchPreempt);
EXPECT_EQ(setParamBool, pSkuTable.ftr3dObjectLevelPreempt);

1
unit_tests/gen11/icllp/test_hw_info_config_icllp.cpp
View File

@@ -88,6 +88,7 @@ ICLLPTEST_F(IcllpHwInfo, givenBoolWhenCallIcllpHardwareInfoSetupThenFeatureTable
pWaTable = {};
hardwareInfoSetup[productFamily](&hwInfo, setParamBool, config);
EXPECT_EQ(setParamBool, pSkuTable.ftrL3IACoherency);
EXPECT_EQ(setParamBool, pSkuTable.ftrPPGTT);
EXPECT_EQ(setParamBool, pSkuTable.ftrSVM);
EXPECT_EQ(setParamBool, pSkuTable.ftrIA32eGfxPTEs);

1
unit_tests/gen11/lkf/test_hw_info_config_lkf.cpp
View File

@@ -62,6 +62,7 @@ LKFTEST_F(LkfHwInfo, givenBoolWhenCallLkfHardwareInfoSetupThenFeatureTableAndWor
pWaTable = {};
hardwareInfoSetup[productFamily](&hwInfo, setParamBool, strConfig);
EXPECT_EQ(setParamBool, pSkuTable.ftrL3IACoherency);
EXPECT_EQ(setParamBool, pSkuTable.ftrPPGTT);
EXPECT_EQ(setParamBool, pSkuTable.ftrSVM);
EXPECT_EQ(setParamBool, pSkuTable.ftrIA32eGfxPTEs);

1
unit_tests/gen8/bdw/test_hw_info_config_bdw.cpp
View File

@@ -88,6 +88,7 @@ BDWTEST_F(BdwHwInfo, givenBoolWhenCallBdwHardwareInfoSetupThenFeatureTableAndWor
pWaTable = {};
hardwareInfoSetup[productFamily](&hwInfo, setParamBool, config);
EXPECT_EQ(setParamBool, pSkuTable.ftrL3IACoherency);
EXPECT_EQ(setParamBool, pSkuTable.ftrPPGTT);
EXPECT_EQ(setParamBool, pSkuTable.ftrSVM);
EXPECT_EQ(setParamBool, pSkuTable.ftrIA32eGfxPTEs);

3
unit_tests/gen9/bxt/linux/hw_info_config_tests.cpp
View File

@@ -40,9 +40,6 @@ BXTTEST_F(HwInfoConfigTestLinuxBxt, configureHwInfo) {
//constant sysInfo/ftr flags
EXPECT_EQ(1u, outHwInfo.pSysInfo->VEBoxInfo.Instances.Bits.VEBox0Enabled);
EXPECT_TRUE(outHwInfo.pSysInfo->VEBoxInfo.IsValid);
EXPECT_EQ(1u, outHwInfo.pSkuTable->ftrGpGpuMidBatchPreempt);
EXPECT_EQ(1u, outHwInfo.pSkuTable->ftrGpGpuThreadGroupLevelPreempt);
EXPECT_EQ(1u, outHwInfo.pSkuTable->ftrL3IACoherency);
EXPECT_EQ(GTTYPE_GTA, outHwInfo.pPlatform->eGTType);
EXPECT_EQ(0u, outHwInfo.pSkuTable->ftrGT1);

3
unit_tests/gen9/bxt/test_hw_info_config_bxt.cpp
View File

@@ -72,6 +72,9 @@ BXTTEST_F(BxtHwInfo, givenBoolWhenCallBxtHardwareInfoSetupThenFeatureTableAndWor
pPlatform.usRevId = 9;
hardwareInfoSetup[productFamily](&hwInfo, setParamBool, config);
EXPECT_EQ(setParamBool, pSkuTable.ftrGpGpuMidBatchPreempt);
EXPECT_EQ(setParamBool, pSkuTable.ftrGpGpuThreadGroupLevelPreempt);
EXPECT_EQ(setParamBool, pSkuTable.ftrL3IACoherency);
EXPECT_EQ(setParamBool, pSkuTable.ftrVEBOX);
EXPECT_EQ(setParamBool, pSkuTable.ftrULT);
EXPECT_EQ(setParamBool, pSkuTable.ftrGpGpuMidThreadLevelPreempt);

5
unit_tests/gen9/cfl/linux/hw_info_config_tests_cfl.cpp
View File

@@ -42,11 +42,6 @@ CFLTEST_F(HwInfoConfigTestLinuxCfl, configureHwInfo) {
//constant sysInfo/ftr flags
EXPECT_EQ(1u, outHwInfo.pSysInfo->VEBoxInfo.Instances.Bits.VEBox0Enabled);
EXPECT_TRUE(outHwInfo.pSysInfo->VEBoxInfo.IsValid);
EXPECT_EQ(1u, outHwInfo.pSkuTable->ftrGpGpuMidBatchPreempt);
EXPECT_EQ(1u, outHwInfo.pSkuTable->ftrGpGpuThreadGroupLevelPreempt);
EXPECT_EQ(0u, outHwInfo.pSkuTable->ftrGpGpuMidThreadLevelPreempt);
EXPECT_EQ(1u, outHwInfo.pSkuTable->ftrSVM);
EXPECT_EQ(1u, outHwInfo.pSkuTable->ftrL3IACoherency);
ReleaseOutHwInfoStructs();

3
unit_tests/gen9/cfl/test_hw_info_config_cfl.cpp
View File

@@ -95,6 +95,9 @@ CFLTEST_F(CflHwInfo, givenBoolWhenCallCflHardwareInfoSetupThenFeatureTableAndWor
pWaTable = {};
hardwareInfoSetup[productFamily](&hwInfo, setParamBool, config);
EXPECT_EQ(setParamBool, pSkuTable.ftrGpGpuMidBatchPreempt);
EXPECT_EQ(setParamBool, pSkuTable.ftrGpGpuThreadGroupLevelPreempt);
EXPECT_EQ(setParamBool, pSkuTable.ftrL3IACoherency);
EXPECT_EQ(setParamBool, pSkuTable.ftrVEBOX);
EXPECT_EQ(false, pSkuTable.ftrGpGpuMidThreadLevelPreempt);
EXPECT_EQ(setParamBool, pSkuTable.ftr3dMidBatchPreempt);

3
unit_tests/gen9/glk/linux/hw_info_config_tests_glk.cpp
View File

@@ -47,9 +47,6 @@ GLKTEST_F(HwInfoConfigTestLinuxGlk, configureHwInfo) {
//constant sysInfo/ftr flags
EXPECT_EQ(1u, outHwInfo.pSysInfo->VEBoxInfo.Instances.Bits.VEBox0Enabled);
EXPECT_TRUE(outHwInfo.pSysInfo->VEBoxInfo.IsValid);
EXPECT_EQ(1u, outHwInfo.pSkuTable->ftrGpGpuMidBatchPreempt);
EXPECT_EQ(1u, outHwInfo.pSkuTable->ftrGpGpuThreadGroupLevelPreempt);
EXPECT_EQ(1u, outHwInfo.pSkuTable->ftrL3IACoherency);
ReleaseOutHwInfoStructs();

3
unit_tests/gen9/glk/test_hw_info_config_glk.cpp
View File

@@ -77,6 +77,9 @@ GLKTEST_F(GlkHwInfo, givenBoolWhenCallGlkHardwareInfoSetupThenFeatureTableAndWor
pWaTable = {};
hardwareInfoSetup[productFamily](&hwInfo, setParamBool, config);
EXPECT_EQ(setParamBool, pSkuTable.ftrGpGpuMidBatchPreempt);
EXPECT_EQ(setParamBool, pSkuTable.ftrGpGpuThreadGroupLevelPreempt);
EXPECT_EQ(setParamBool, pSkuTable.ftrL3IACoherency);
EXPECT_EQ(false, pSkuTable.ftrGpGpuMidThreadLevelPreempt);
EXPECT_EQ(setParamBool, pSkuTable.ftr3dMidBatchPreempt);
EXPECT_EQ(setParamBool, pSkuTable.ftr3dObjectLevelPreempt);

4
unit_tests/gen9/kbl/linux/hw_info_config_tests_kbl.cpp
View File

@@ -42,10 +42,6 @@ KBLTEST_F(HwInfoConfigTestLinuxKbl, configureHwInfo) {
//constant sysInfo/ftr flags
EXPECT_EQ(1u, outHwInfo.pSysInfo->VEBoxInfo.Instances.Bits.VEBox0Enabled);
EXPECT_TRUE(outHwInfo.pSysInfo->VEBoxInfo.IsValid);
EXPECT_EQ(1u, outHwInfo.pSkuTable->ftrGpGpuMidBatchPreempt);
EXPECT_EQ(1u, outHwInfo.pSkuTable->ftrGpGpuThreadGroupLevelPreempt);
EXPECT_EQ(1u, outHwInfo.pSkuTable->ftrSVM);
EXPECT_EQ(1u, outHwInfo.pSkuTable->ftrL3IACoherency);
ReleaseOutHwInfoStructs();

3
unit_tests/gen9/kbl/test_hw_info_config_kbl.cpp
View File

@@ -96,6 +96,9 @@ KBLTEST_F(KblHwInfo, givenBoolWhenCallKblHardwareInfoSetupThenFeatureTableAndWor
pPlatform.usRevId = 9;
hardwareInfoSetup[productFamily](&hwInfo, setParamBool, config);
EXPECT_EQ(setParamBool, pSkuTable.ftrGpGpuMidBatchPreempt);
EXPECT_EQ(setParamBool, pSkuTable.ftrGpGpuThreadGroupLevelPreempt);
EXPECT_EQ(setParamBool, pSkuTable.ftrL3IACoherency);
EXPECT_EQ(setParamBool, pSkuTable.ftrVEBOX);
EXPECT_EQ(setParamBool, pSkuTable.ftrGpGpuMidThreadLevelPreempt);
EXPECT_EQ(setParamBool, pSkuTable.ftr3dMidBatchPreempt);

3
unit_tests/gen9/skl/linux/hw_info_config_tests_skl.cpp
View File

@@ -44,9 +44,6 @@ SKLTEST_F(HwInfoConfigTestLinuxSkl, configureHwInfo) {
EXPECT_EQ(1u, outHwInfo.pSysInfo->VDBoxInfo.Instances.Bits.VDBox0Enabled);
EXPECT_TRUE(outHwInfo.pSysInfo->VEBoxInfo.IsValid);
EXPECT_TRUE(outHwInfo.pSysInfo->VDBoxInfo.IsValid);
EXPECT_EQ(1u, outHwInfo.pSkuTable->ftrGpGpuMidBatchPreempt);
EXPECT_EQ(1u, outHwInfo.pSkuTable->ftrGpGpuThreadGroupLevelPreempt);
EXPECT_EQ(1u, outHwInfo.pSkuTable->ftrL3IACoherency);
ReleaseOutHwInfoStructs();
drm->StoredDeviceID = ISKL_GT1_DT_DEVICE_F0_ID;

3
unit_tests/gen9/skl/test_hw_info_config_skl.cpp
View File

@@ -98,6 +98,9 @@ SKLTEST_F(SklHwInfo, givenBoolWhenCallSklHardwareInfoSetupThenFeatureTableAndWor
pPlatform.usRevId = 9;
hardwareInfoSetup[productFamily](&hwInfo, setParamBool, config);
EXPECT_EQ(setParamBool, pSkuTable.ftrGpGpuMidBatchPreempt);
EXPECT_EQ(setParamBool, pSkuTable.ftrGpGpuThreadGroupLevelPreempt);
EXPECT_EQ(setParamBool, pSkuTable.ftrL3IACoherency);
EXPECT_EQ(setParamBool, pSkuTable.ftrGpGpuMidThreadLevelPreempt);
EXPECT_EQ(setParamBool, pSkuTable.ftr3dMidBatchPreempt);
EXPECT_EQ(setParamBool, pSkuTable.ftr3dObjectLevelPreempt);