Move setting of featureTable flags

kcencele · Compute-Runtime-Automation · commit a6aac141d14b · 2019-04-29T13:44:22.000+02:00
ftrL3IACoherency, ftrGpGpuMidBatchPreempt, ftrGpGpuThreadGroupLevelPreempt
from configureHardwareCustom to setupFeatureAndWorkaroundTable

Related-To: NEO-2755

Change-Id: I508ad321c60bfd88eef3654b3f418343fc5b6b31
Signed-off-by: Katarzyna Cencelewska &lt;katarzyna.cencelewska@intel.com&gt;
diff --git a/runtime/gen10/hw_info_cnl.inl b/runtime/gen10/hw_info_cnl.inl
@@ -78,6 +78,9 @@ void CNL::setupFeatureAndWorkaroundTable(HardwareInfo *hwInfo) {
     FeatureTable *pSkuTable = const_cast<FeatureTable *>(hwInfo->pSkuTable);
     WorkaroundTable *pWaTable = const_cast<WorkaroundTable *>(hwInfo->pWaTable);
 
+    pSkuTable->ftrL3IACoherency = true;
+    pSkuTable->ftrGpGpuMidBatchPreempt = true;
+    pSkuTable->ftrGpGpuThreadGroupLevelPreempt = true;
     pSkuTable->ftrGpGpuMidThreadLevelPreempt = true;
     pSkuTable->ftr3dMidBatchPreempt = true;
     pSkuTable->ftr3dObjectLevelPreempt = true;
diff --git a/runtime/gen10/linux/hw_info_config_cnl.inl b/runtime/gen10/linux/hw_info_config_cnl.inl
@@ -16,11 +16,6 @@ int HwInfoConfigHw<IGFX_CANNONLAKE>::configureHardwareCustom(HardwareInfo *hwInf
         return 0;
     }
     GT_SYSTEM_INFO *pSysInfo = const_cast<GT_SYSTEM_INFO *>(hwInfo->pSysInfo);
-    FeatureTable *pSkuTable = const_cast<FeatureTable *>(hwInfo->pSkuTable);
-
-    pSkuTable->ftrGpGpuMidBatchPreempt = true;
-    pSkuTable->ftrGpGpuThreadGroupLevelPreempt = true;
-    pSkuTable->ftrL3IACoherency = true;
 
     if (pSysInfo->SubSliceCount == 9) {
         pSysInfo->SliceCount = 4;
diff --git a/runtime/gen11/hw_info_icllp.inl b/runtime/gen11/hw_info_icllp.inl
@@ -75,6 +75,7 @@ void ICLLP::setupFeatureAndWorkaroundTable(HardwareInfo *hwInfo) {
     FeatureTable *pSkuTable = const_cast<FeatureTable *>(hwInfo->pSkuTable);
     WorkaroundTable *pWaTable = const_cast<WorkaroundTable *>(hwInfo->pWaTable);
 
+    pSkuTable->ftrL3IACoherency = true;
     pSkuTable->ftrPPGTT = true;
     pSkuTable->ftrSVM = true;
     pSkuTable->ftrIA32eGfxPTEs = true;
diff --git a/runtime/gen11/hw_info_lkf.inl b/runtime/gen11/hw_info_lkf.inl
@@ -74,6 +74,7 @@ void LKF::setupFeatureAndWorkaroundTable(HardwareInfo *hwInfo) {
     FeatureTable *pSkuTable = const_cast<FeatureTable *>(hwInfo->pSkuTable);
     WorkaroundTable *pWaTable = const_cast<WorkaroundTable *>(hwInfo->pWaTable);
 
+    pSkuTable->ftrL3IACoherency = true;
     pSkuTable->ftrPPGTT = true;
     pSkuTable->ftrSVM = true;
     pSkuTable->ftrIA32eGfxPTEs = true;
diff --git a/runtime/gen11/linux/hw_info_config_icllp.inl b/runtime/gen11/linux/hw_info_config_icllp.inl
@@ -16,11 +16,9 @@ int HwInfoConfigHw<IGFX_ICELAKE_LP>::configureHardwareCustom(HardwareInfo *hwInf
         return 0;
     }
 
-    FeatureTable *pSkuTable = const_cast<FeatureTable *>(hwInfo->pSkuTable);
     GT_SYSTEM_INFO *pSysInfo = const_cast<GT_SYSTEM_INFO *>(hwInfo->pSysInfo);
 
     pSysInfo->SliceCount = 1;
-    pSkuTable->ftrL3IACoherency = true;
 
     return 0;
 }
diff --git a/runtime/gen11/linux/hw_info_config_lkf.inl b/runtime/gen11/linux/hw_info_config_lkf.inl
@@ -16,11 +16,9 @@ int HwInfoConfigHw<IGFX_LAKEFIELD>::configureHardwareCustom(HardwareInfo *hwInfo
         return 0;
     }
 
-    FeatureTable *pSkuTable = const_cast<FeatureTable *>(hwInfo->pSkuTable);
     GT_SYSTEM_INFO *pSysInfo = const_cast<GT_SYSTEM_INFO *>(hwInfo->pSysInfo);
 
     pSysInfo->SliceCount = 1;
-    pSkuTable->ftrL3IACoherency = true;
 
     return 0;
 }
diff --git a/runtime/gen8/hw_info_bdw.inl b/runtime/gen8/hw_info_bdw.inl
@@ -79,6 +79,7 @@ void BDW::setupFeatureAndWorkaroundTable(HardwareInfo *hwInfo) {
     FeatureTable *pSkuTable = const_cast<FeatureTable *>(hwInfo->pSkuTable);
     WorkaroundTable *pWaTable = const_cast<WorkaroundTable *>(hwInfo->pWaTable);
 
+    pSkuTable->ftrL3IACoherency = true;
     pSkuTable->ftrPPGTT = true;
     pSkuTable->ftrSVM = true;
     pSkuTable->ftrIA32eGfxPTEs = true;
diff --git a/runtime/gen8/linux/hw_info_config_bdw.inl b/runtime/gen8/linux/hw_info_config_bdw.inl
@@ -16,9 +16,6 @@ int HwInfoConfigHw<IGFX_BROADWELL>::configureHardwareCustom(HardwareInfo *hwInfo
         return 0;
     }
     GT_SYSTEM_INFO *pSysInfo = const_cast<GT_SYSTEM_INFO *>(hwInfo->pSysInfo);
-    FeatureTable *pSkuTable = const_cast<FeatureTable *>(hwInfo->pSkuTable);
-
-    pSkuTable->ftrL3IACoherency = true;
 
     // There is no interface to read total slice count from drm/i915, so we
     // derive this from the number of EUs and subslices.
diff --git a/runtime/gen9/hw_info_bxt.inl b/runtime/gen9/hw_info_bxt.inl
@@ -77,6 +77,9 @@ void BXT::setupFeatureAndWorkaroundTable(HardwareInfo *hwInfo) {
     FeatureTable *pSkuTable = const_cast<FeatureTable *>(hwInfo->pSkuTable);
     WorkaroundTable *pWaTable = const_cast<WorkaroundTable *>(hwInfo->pWaTable);
 
+    pSkuTable->ftrGpGpuMidBatchPreempt = true;
+    pSkuTable->ftrGpGpuThreadGroupLevelPreempt = true;
+    pSkuTable->ftrL3IACoherency = true;
     pSkuTable->ftrVEBOX = true;
     pSkuTable->ftrULT = true;
     pSkuTable->ftrGpGpuMidThreadLevelPreempt = true;
diff --git a/runtime/gen9/hw_info_cfl.inl b/runtime/gen9/hw_info_cfl.inl
@@ -71,6 +71,9 @@ void CFL::setupFeatureAndWorkaroundTable(HardwareInfo *hwInfo) {
     FeatureTable *pSkuTable = const_cast<FeatureTable *>(hwInfo->pSkuTable);
     WorkaroundTable *pWaTable = const_cast<WorkaroundTable *>(hwInfo->pWaTable);
 
+    pSkuTable->ftrGpGpuMidBatchPreempt = true;
+    pSkuTable->ftrGpGpuThreadGroupLevelPreempt = true;
+    pSkuTable->ftrL3IACoherency = true;
     pSkuTable->ftrVEBOX = true;
     pSkuTable->ftrGpGpuMidThreadLevelPreempt = false;
     pSkuTable->ftr3dMidBatchPreempt = true;
diff --git a/runtime/gen9/hw_info_glk.inl b/runtime/gen9/hw_info_glk.inl
@@ -71,6 +71,9 @@ void GLK::setupFeatureAndWorkaroundTable(HardwareInfo *hwInfo) {
     FeatureTable *pSkuTable = const_cast<FeatureTable *>(hwInfo->pSkuTable);
     WorkaroundTable *pWaTable = const_cast<WorkaroundTable *>(hwInfo->pWaTable);
 
+    pSkuTable->ftrGpGpuMidBatchPreempt = true;
+    pSkuTable->ftrGpGpuThreadGroupLevelPreempt = true;
+    pSkuTable->ftrL3IACoherency = true;
     pSkuTable->ftrGpGpuMidThreadLevelPreempt = false;
     pSkuTable->ftr3dMidBatchPreempt = true;
     pSkuTable->ftr3dObjectLevelPreempt = true;
diff --git a/runtime/gen9/hw_info_kbl.inl b/runtime/gen9/hw_info_kbl.inl
@@ -72,6 +72,9 @@ void KBL::setupFeatureAndWorkaroundTable(HardwareInfo *hwInfo) {
     FeatureTable *pSkuTable = const_cast<FeatureTable *>(hwInfo->pSkuTable);
     WorkaroundTable *pWaTable = const_cast<WorkaroundTable *>(hwInfo->pWaTable);
 
+    pSkuTable->ftrGpGpuMidBatchPreempt = true;
+    pSkuTable->ftrGpGpuThreadGroupLevelPreempt = true;
+    pSkuTable->ftrL3IACoherency = true;
     pSkuTable->ftrVEBOX = true;
     pSkuTable->ftrGpGpuMidThreadLevelPreempt = true;
     pSkuTable->ftr3dMidBatchPreempt = true;
diff --git a/runtime/gen9/hw_info_skl.inl b/runtime/gen9/hw_info_skl.inl
@@ -77,6 +77,9 @@ void SKL::setupFeatureAndWorkaroundTable(HardwareInfo *hwInfo) {
     FeatureTable *pSkuTable = const_cast<FeatureTable *>(hwInfo->pSkuTable);
     WorkaroundTable *pWaTable = const_cast<WorkaroundTable *>(hwInfo->pWaTable);
 
+    pSkuTable->ftrGpGpuMidBatchPreempt = true;
+    pSkuTable->ftrGpGpuThreadGroupLevelPreempt = true;
+    pSkuTable->ftrL3IACoherency = true;
     pSkuTable->ftrGpGpuMidThreadLevelPreempt = true;
     pSkuTable->ftr3dMidBatchPreempt = true;
     pSkuTable->ftr3dObjectLevelPreempt = true;
diff --git a/runtime/gen9/linux/hw_info_config_bxt.inl b/runtime/gen9/linux/hw_info_config_bxt.inl
@@ -22,10 +22,6 @@ int HwInfoConfigHw<IGFX_BROXTON>::configureHardwareCustom(HardwareInfo *hwInfo,
     FeatureTable *pSkuTable = const_cast<FeatureTable *>(hwInfo->pSkuTable);
     GT_SYSTEM_INFO *pSysInfo = const_cast<GT_SYSTEM_INFO *>(hwInfo->pSysInfo);
 
-    pSkuTable->ftrGpGpuMidBatchPreempt = true;
-    pSkuTable->ftrGpGpuThreadGroupLevelPreempt = true;
-    pSkuTable->ftrL3IACoherency = true;
-
     pSysInfo->SliceCount = 1;
 
     pSysInfo->VEBoxInfo.Instances.Bits.VEBox0Enabled = 1;
diff --git a/runtime/gen9/linux/hw_info_config_cfl.inl b/runtime/gen9/linux/hw_info_config_cfl.inl
@@ -16,11 +16,6 @@ int HwInfoConfigHw<IGFX_COFFEELAKE>::configureHardwareCustom(HardwareInfo *hwInf
         return 0;
     }
     GT_SYSTEM_INFO *pSysInfo = const_cast<GT_SYSTEM_INFO *>(hwInfo->pSysInfo);
-    FeatureTable *pSkuTable = const_cast<FeatureTable *>(hwInfo->pSkuTable);
-
-    pSkuTable->ftrGpGpuMidBatchPreempt = true;
-    pSkuTable->ftrGpGpuThreadGroupLevelPreempt = true;
-    pSkuTable->ftrL3IACoherency = true;
 
     if (pSysInfo->SubSliceCount > 3) {
         pSysInfo->SliceCount = 2;
diff --git a/runtime/gen9/linux/hw_info_config_glk.inl b/runtime/gen9/linux/hw_info_config_glk.inl
@@ -22,10 +22,6 @@ int HwInfoConfigHw<IGFX_GEMINILAKE>::configureHardwareCustom(HardwareInfo *hwInf
     FeatureTable *pSkuTable = const_cast<FeatureTable *>(hwInfo->pSkuTable);
     GT_SYSTEM_INFO *pSysInfo = const_cast<GT_SYSTEM_INFO *>(hwInfo->pSysInfo);
 
-    pSkuTable->ftrGpGpuMidBatchPreempt = true;
-    pSkuTable->ftrGpGpuThreadGroupLevelPreempt = true;
-    pSkuTable->ftrL3IACoherency = true;
-
     pSysInfo->VEBoxInfo.Instances.Bits.VEBox0Enabled = 1;
     pSysInfo->VEBoxInfo.IsValid = true;
 
diff --git a/runtime/gen9/linux/hw_info_config_kbl.inl b/runtime/gen9/linux/hw_info_config_kbl.inl
@@ -16,11 +16,6 @@ int HwInfoConfigHw<IGFX_KABYLAKE>::configureHardwareCustom(HardwareInfo *hwInfo,
         return 0;
     }
     GT_SYSTEM_INFO *pSysInfo = const_cast<GT_SYSTEM_INFO *>(hwInfo->pSysInfo);
-    FeatureTable *pSkuTable = const_cast<FeatureTable *>(hwInfo->pSkuTable);
-
-    pSkuTable->ftrGpGpuMidBatchPreempt = true;
-    pSkuTable->ftrGpGpuThreadGroupLevelPreempt = true;
-    pSkuTable->ftrL3IACoherency = true;
 
     if (pSysInfo->SubSliceCount > 3) {
         pSysInfo->SliceCount = 2;
diff --git a/runtime/gen9/linux/hw_info_config_skl.inl b/runtime/gen9/linux/hw_info_config_skl.inl
@@ -17,11 +17,6 @@ int HwInfoConfigHw<IGFX_SKYLAKE>::configureHardwareCustom(HardwareInfo *hwInfo,
         return 0;
     }
     GT_SYSTEM_INFO *pSysInfo = const_cast<GT_SYSTEM_INFO *>(hwInfo->pSysInfo);
-    FeatureTable *pSkuTable = const_cast<FeatureTable *>(hwInfo->pSkuTable);
-
-    pSkuTable->ftrGpGpuMidBatchPreempt = true;
-    pSkuTable->ftrGpGpuThreadGroupLevelPreempt = true;
-    pSkuTable->ftrL3IACoherency = true;
 
     if (pSysInfo->SubSliceCount > 3) {
         pSysInfo->SliceCount = 2;
diff --git a/unit_tests/gen10/linux/hw_info_config_tests_gen10.cpp b/unit_tests/gen10/linux/hw_info_config_tests_gen10.cpp
@@ -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;
diff --git a/unit_tests/gen10/test_hw_info_config_cnl.cpp b/unit_tests/gen10/test_hw_info_config_cnl.cpp
@@ -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);
diff --git a/unit_tests/gen11/icllp/test_hw_info_config_icllp.cpp b/unit_tests/gen11/icllp/test_hw_info_config_icllp.cpp
@@ -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);
diff --git a/unit_tests/gen11/lkf/test_hw_info_config_lkf.cpp b/unit_tests/gen11/lkf/test_hw_info_config_lkf.cpp
@@ -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);
diff --git a/unit_tests/gen8/bdw/test_hw_info_config_bdw.cpp b/unit_tests/gen8/bdw/test_hw_info_config_bdw.cpp
@@ -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);
diff --git a/unit_tests/gen9/bxt/linux/hw_info_config_tests.cpp b/unit_tests/gen9/bxt/linux/hw_info_config_tests.cpp
@@ -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);
diff --git a/unit_tests/gen9/bxt/test_hw_info_config_bxt.cpp b/unit_tests/gen9/bxt/test_hw_info_config_bxt.cpp
@@ -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);
diff --git a/unit_tests/gen9/cfl/linux/hw_info_config_tests_cfl.cpp b/unit_tests/gen9/cfl/linux/hw_info_config_tests_cfl.cpp
@@ -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();
 
diff --git a/unit_tests/gen9/cfl/test_hw_info_config_cfl.cpp b/unit_tests/gen9/cfl/test_hw_info_config_cfl.cpp
@@ -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);
diff --git a/unit_tests/gen9/glk/linux/hw_info_config_tests_glk.cpp b/unit_tests/gen9/glk/linux/hw_info_config_tests_glk.cpp
@@ -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();
 
diff --git a/unit_tests/gen9/glk/test_hw_info_config_glk.cpp b/unit_tests/gen9/glk/test_hw_info_config_glk.cpp
@@ -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);
diff --git a/unit_tests/gen9/kbl/linux/hw_info_config_tests_kbl.cpp b/unit_tests/gen9/kbl/linux/hw_info_config_tests_kbl.cpp
@@ -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();
 
diff --git a/unit_tests/gen9/kbl/test_hw_info_config_kbl.cpp b/unit_tests/gen9/kbl/test_hw_info_config_kbl.cpp
@@ -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);
diff --git a/unit_tests/gen9/skl/linux/hw_info_config_tests_skl.cpp b/unit_tests/gen9/skl/linux/hw_info_config_tests_skl.cpp
@@ -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;
diff --git a/unit_tests/gen9/skl/test_hw_info_config_skl.cpp b/unit_tests/gen9/skl/test_hw_info_config_skl.cpp
@@ -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);

Original file line number	Diff line number	Diff line change
`@@ -16,11 +16,9 @@ int HwInfoConfigHw<IGFX_ICELAKE_LP>::configureHardwareCustom(HardwareInfo *hwInf`
`16`	`16`	`return 0;`
`17`	`17`	`}`
`18`	`18`
`19`		`- FeatureTable pSkuTable = const_cast<FeatureTable >(hwInfo->pSkuTable);`
`20`	`19`	`GT_SYSTEM_INFO pSysInfo = const_cast<GT_SYSTEM_INFO >(hwInfo->pSysInfo);`
`21`	`20`
`22`	`21`	`pSysInfo->SliceCount = 1;`
`23`		`- pSkuTable->ftrL3IACoherency = true;`
`24`	`22`
`25`	`23`	`return 0;`
`26`	`24`	`}`
Original file line number	Diff line number	Diff line change
`@@ -16,9 +16,6 @@ int HwInfoConfigHw<IGFX_BROADWELL>::configureHardwareCustom(HardwareInfo *hwInfo`
`16`	`16`	`return 0;`
`17`	`17`	`}`
`18`	`18`	`GT_SYSTEM_INFO pSysInfo = const_cast<GT_SYSTEM_INFO >(hwInfo->pSysInfo);`
`19`		`- FeatureTable pSkuTable = const_cast<FeatureTable >(hwInfo->pSkuTable);`
`20`		`-`
`21`		`- pSkuTable->ftrL3IACoherency = true;`
`22`	`19`
`23`	`20`	`// There is no interface to read total slice count from drm/i915, so we`
`24`	`21`	`// derive this from the number of EUs and subslices.`