Add HwInfoConfig methods preventing ICLLP platform enum usage in gen11 file

RafalMaziejukIntel · Compute-Runtime-Automation · commit 12e98faf341e · 2021-09-23T17:34:04.000+02:00
Signed-off-by: Rafal Maziejuk &lt;rafal.maziejuk@intel.com&gt;
Related-To: NEO-4541
diff --git a/opencl/test/unit_test/gen11/icllp/CMakeLists.txt b/opencl/test/unit_test/gen11/icllp/CMakeLists.txt
@@ -5,7 +5,13 @@
 #
 
 if(TESTS_ICLLP)
+  set(IGDRCL_SRCS_tests_gen11_icllp_excludes
+      ${CMAKE_CURRENT_SOURCE_DIR}/excludes_icllp.cpp
+  )
+  set_property(GLOBAL APPEND PROPERTY IGDRCL_SRCS_tests_excludes ${IGDRCL_SRCS_tests_gen11_icllp_excludes})
+
   set(IGDRCL_SRCS_tests_gen11_icllp
+      ${IGDRCL_SRCS_tests_gen11_icllp_excludes}
       ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
       ${CMAKE_CURRENT_SOURCE_DIR}/test_hw_info_config_icllp.cpp
       ${CMAKE_CURRENT_SOURCE_DIR}/test_device_caps_icllp.cpp
diff --git a/opencl/test/unit_test/gen11/icllp/excludes_icllp.cpp b/opencl/test/unit_test/gen11/icllp/excludes_icllp.cpp
@@ -0,0 +1,12 @@
+/*
+ * Copyright (C) 2021 Intel Corporation
+ *
+ * SPDX-License-Identifier: MIT
+ *
+ */
+
+#include "test.h"
+
+HWTEST_EXCLUDE_PRODUCT(HwInfoConfigTest, givenHwInfoConfigWhenAskedIfAdditionalMediaSamplerProgrammingIsRequiredThenFalseIsReturned, IGFX_ICELAKE_LP)
+HWTEST_EXCLUDE_PRODUCT(HwInfoConfigTest, givenHwInfoConfigWhenAskedIfInitialFlagsProgrammingIsRequiredThenFalseIsReturned, IGFX_ICELAKE_LP)
+HWTEST_EXCLUDE_PRODUCT(HwInfoConfigTest, givenHwInfoConfigWhenAskedIfReturnedCmdSizeForMediaSamplerAdjustmentIsRequiredThenFalseIsReturned, IGFX_ICELAKE_LP)
diff --git a/opencl/test/unit_test/gen11/icllp/test_hw_info_config_icllp.cpp b/opencl/test/unit_test/gen11/icllp/test_hw_info_config_icllp.cpp
@@ -5,18 +5,18 @@
  *
  */
 
+#include "shared/source/os_interface/hw_info_config.h"
 #include "shared/test/common/helpers/default_hw_info.h"
 
 #include "test.h"
+
 using namespace NEO;
 
-TEST(IcllpHwInfoConfig, givenInvalidSystemInfoWhenSettingHardwareInfoThenExpectThrow) {
-    if (IGFX_ICELAKE_LP != productFamily) {
-        return;
-    }
+using IcllpHwInfoConfig = ::testing::Test;
+
+ICLLPTEST_F(IcllpHwInfoConfig, givenInvalidSystemInfoWhenSettingHardwareInfoThenExpectThrow) {
     HardwareInfo hwInfo = *defaultHwInfo;
     GT_SYSTEM_INFO &gtSystemInfo = hwInfo.gtSystemInfo;
-    gtSystemInfo = {0};
 
     uint64_t config = 0xdeadbeef;
     gtSystemInfo = {0};
@@ -27,6 +27,21 @@ TEST(IcllpHwInfoConfig, givenInvalidSystemInfoWhenSettingHardwareInfoThenExpectT
     EXPECT_EQ(0u, gtSystemInfo.EUCount);
 }
 
+ICLLPTEST_F(IcllpHwInfoConfig, givenHwInfoConfigWhenAskedIfAdditionalMediaSamplerProgrammingIsRequiredThenTrueIsReturned) {
+    const auto &hwInfoConfig = *HwInfoConfig::get(defaultHwInfo->platform.eProductFamily);
+    EXPECT_TRUE(hwInfoConfig.isAdditionalMediaSamplerProgrammingRequired());
+}
+
+ICLLPTEST_F(IcllpHwInfoConfig, givenHwInfoConfigWhenAskedIfInitialFlagsProgrammingIsRequiredThenTrueIsReturned) {
+    const auto &hwInfoConfig = *HwInfoConfig::get(defaultHwInfo->platform.eProductFamily);
+    EXPECT_TRUE(hwInfoConfig.isInitialFlagsProgrammingRequired());
+}
+
+ICLLPTEST_F(IcllpHwInfoConfig, givenHwInfoConfigWhenAskedIfReturnedCmdSizeForMediaSamplerAdjustmentIsRequiredThenTrueIsReturned) {
+    const auto &hwInfoConfig = *HwInfoConfig::get(defaultHwInfo->platform.eProductFamily);
+    EXPECT_TRUE(hwInfoConfig.isReturnedCmdSizeForMediaSamplerAdjustmentRequired());
+}
+
 using IcllpHwInfo = ::testing::Test;
 
 ICLLPTEST_F(IcllpHwInfo, givenBoolWhenCallIcllpHardwareInfoSetupThenFeatureTableAndWorkaroundTableAreSetCorrect) {
diff --git a/opencl/test/unit_test/os_interface/hw_info_config_tests.cpp b/opencl/test/unit_test/os_interface/hw_info_config_tests.cpp
@@ -291,3 +291,18 @@ HWTEST2_F(HwInfoConfigTest, givenHwInfoConfigWhenSettingCapabilityCoherencyFlagT
     hwInfoConfig.setCapabilityCoherencyFlag(pInHwInfo, coherency);
     EXPECT_TRUE(coherency);
 }
+
+HWTEST_F(HwInfoConfigTest, givenHwInfoConfigWhenAskedIfAdditionalMediaSamplerProgrammingIsRequiredThenFalseIsReturned) {
+    const auto &hwInfoConfig = *HwInfoConfig::get(pInHwInfo.platform.eProductFamily);
+    EXPECT_FALSE(hwInfoConfig.isAdditionalMediaSamplerProgrammingRequired());
+}
+
+HWTEST_F(HwInfoConfigTest, givenHwInfoConfigWhenAskedIfInitialFlagsProgrammingIsRequiredThenFalseIsReturned) {
+    const auto &hwInfoConfig = *HwInfoConfig::get(pInHwInfo.platform.eProductFamily);
+    EXPECT_FALSE(hwInfoConfig.isInitialFlagsProgrammingRequired());
+}
+
+HWTEST_F(HwInfoConfigTest, givenHwInfoConfigWhenAskedIfReturnedCmdSizeForMediaSamplerAdjustmentIsRequiredThenFalseIsReturned) {
+    const auto &hwInfoConfig = *HwInfoConfig::get(pInHwInfo.platform.eProductFamily);
+    EXPECT_FALSE(hwInfoConfig.isReturnedCmdSizeForMediaSamplerAdjustmentRequired());
+}
diff --git a/shared/source/gen11/command_stream_receiver_hw_gen11.cpp b/shared/source/gen11/command_stream_receiver_hw_gen11.cpp
@@ -39,7 +39,7 @@ template <>
 void CommandStreamReceiverHw<Family>::programMediaSampler(LinearStream &stream, DispatchFlags &dispatchFlags) {
     using PWR_CLK_STATE_REGISTER = Family::PWR_CLK_STATE_REGISTER;
 
-    if (peekHwInfo().platform.eProductFamily == IGFX_ICELAKE_LP) {
+    if (HwInfoConfig::get(peekHwInfo().platform.eProductFamily)->isAdditionalMediaSamplerProgrammingRequired()) {
         if (dispatchFlags.pipelineSelectArgs.mediaSamplerRequired) {
             if (!lastVmeSubslicesConfig) {
                 PipeControlArgs args;
@@ -120,7 +120,7 @@ void CommandStreamReceiverHw<Family>::programMediaSampler(LinearStream &stream,
 template <>
 bool CommandStreamReceiverHw<Family>::detectInitProgrammingFlagsRequired(const DispatchFlags &dispatchFlags) const {
     bool flag = DebugManager.flags.ForceCsrReprogramming.get();
-    if (peekHwInfo().platform.eProductFamily == IGFX_ICELAKE_LP) {
+    if (HwInfoConfig::get(peekHwInfo().platform.eProductFamily)->isInitialFlagsProgrammingRequired()) {
         if (!dispatchFlags.pipelineSelectArgs.mediaSamplerRequired) {
             if (lastVmeSubslicesConfig) {
                 flag = true;
@@ -135,7 +135,7 @@ size_t CommandStreamReceiverHw<Family>::getCmdSizeForMediaSampler(bool mediaSamp
     typedef typename Family::MI_LOAD_REGISTER_IMM MI_LOAD_REGISTER_IMM;
     typedef typename Family::PIPE_CONTROL PIPE_CONTROL;
 
-    if (peekHwInfo().platform.eProductFamily == IGFX_ICELAKE_LP) {
+    if (HwInfoConfig::get(peekHwInfo().platform.eProductFamily)->isReturnedCmdSizeForMediaSamplerAdjustmentRequired()) {
         if (mediaSamplerRequired) {
             if (!lastVmeSubslicesConfig) {
                 return sizeof(MI_LOAD_REGISTER_IMM) + 2 * sizeof(PIPE_CONTROL);
diff --git a/shared/source/gen11/linux/hw_info_config_icllp.cpp b/shared/source/gen11/linux/hw_info_config_icllp.cpp
@@ -11,9 +11,12 @@
 #include "shared/source/os_interface/hw_info_config_bdw_and_later.inl"
 
 namespace NEO {
+constexpr static auto gfxProduct = IGFX_ICELAKE_LP;
+
+#include "shared/source/gen11/os_agnostic_hw_info_config_icllp.inl"
 
 template <>
-int HwInfoConfigHw<IGFX_ICELAKE_LP>::configureHardwareCustom(HardwareInfo *hwInfo, OSInterface *osIface) {
+int HwInfoConfigHw<gfxProduct>::configureHardwareCustom(HardwareInfo *hwInfo, OSInterface *osIface) {
     if (nullptr == osIface) {
         return 0;
     }
@@ -25,5 +28,5 @@ int HwInfoConfigHw<IGFX_ICELAKE_LP>::configureHardwareCustom(HardwareInfo *hwInf
     return 0;
 }
 
-template class HwInfoConfigHw<IGFX_ICELAKE_LP>;
+template class HwInfoConfigHw<gfxProduct>;
 } // namespace NEO
diff --git a/shared/source/gen11/os_agnostic_hw_info_config_icllp.inl b/shared/source/gen11/os_agnostic_hw_info_config_icllp.inl
@@ -0,0 +1,21 @@
+/*
+ * Copyright (C) 2021 Intel Corporation
+ *
+ * SPDX-License-Identifier: MIT
+ *
+ */
+
+template <>
+bool HwInfoConfigHw<gfxProduct>::isAdditionalMediaSamplerProgrammingRequired() const {
+    return true;
+}
+
+template <>
+bool HwInfoConfigHw<gfxProduct>::isInitialFlagsProgrammingRequired() const {
+    return true;
+}
+
+template <>
+bool HwInfoConfigHw<gfxProduct>::isReturnedCmdSizeForMediaSamplerAdjustmentRequired() const {
+    return true;
+}
diff --git a/shared/source/gen11/windows/hw_info_config_icllp.cpp b/shared/source/gen11/windows/hw_info_config_icllp.cpp
@@ -10,7 +10,9 @@
 #include "shared/source/os_interface/hw_info_config_bdw_and_later.inl"
 
 namespace NEO {
+constexpr static auto gfxProduct = IGFX_ICELAKE_LP;
 
-template class HwInfoConfigHw<IGFX_ICELAKE_LP>;
+#include "shared/source/gen11/os_agnostic_hw_info_config_icllp.inl"
 
+template class HwInfoConfigHw<gfxProduct>;
 } // namespace NEO
diff --git a/shared/source/os_interface/hw_info_config.h b/shared/source/os_interface/hw_info_config.h
@@ -65,6 +65,9 @@ class HwInfoConfig {
     virtual bool isPipeControlPriorToNonPipelinedStateCommandsWARequired(const HardwareInfo &hwInfo) const = 0;
     virtual bool heapInLocalMem(const HardwareInfo &hwInfo) const = 0;
     virtual void setCapabilityCoherencyFlag(const HardwareInfo &hwInfo, bool &coherencyFlag) = 0;
+    virtual bool isAdditionalMediaSamplerProgrammingRequired() const = 0;
+    virtual bool isInitialFlagsProgrammingRequired() const = 0;
+    virtual bool isReturnedCmdSizeForMediaSamplerAdjustmentRequired() const = 0;
 
   protected:
     virtual LocalMemoryAccessMode getDefaultLocalMemoryAccessMode(const HardwareInfo &hwInfo) const = 0;
@@ -115,6 +118,9 @@ class HwInfoConfigHw : public HwInfoConfig {
     bool isPipeControlPriorToNonPipelinedStateCommandsWARequired(const HardwareInfo &hwInfo) const override;
     bool heapInLocalMem(const HardwareInfo &hwInfo) const override;
     void setCapabilityCoherencyFlag(const HardwareInfo &hwInfo, bool &coherencyFlag) override;
+    bool isAdditionalMediaSamplerProgrammingRequired() const override;
+    bool isInitialFlagsProgrammingRequired() const override;
+    bool isReturnedCmdSizeForMediaSamplerAdjustmentRequired() const override;
 
   protected:
     HwInfoConfigHw() = default;
diff --git a/shared/source/os_interface/hw_info_config.inl b/shared/source/os_interface/hw_info_config.inl
@@ -206,4 +206,19 @@ bool HwInfoConfigHw<gfxProduct>::isPipeControlPriorToNonPipelinedStateCommandsWA
     return false;
 }
 
+template <PRODUCT_FAMILY gfxProduct>
+bool HwInfoConfigHw<gfxProduct>::isAdditionalMediaSamplerProgrammingRequired() const {
+    return false;
+}
+
+template <PRODUCT_FAMILY gfxProduct>
+bool HwInfoConfigHw<gfxProduct>::isInitialFlagsProgrammingRequired() const {
+    return false;
+}
+
+template <PRODUCT_FAMILY gfxProduct>
+bool HwInfoConfigHw<gfxProduct>::isReturnedCmdSizeForMediaSamplerAdjustmentRequired() const {
+    return false;
+}
+
 } // namespace NEO
diff --git a/shared/test/common/mocks/mock_hw_info_config.cpp b/shared/test/common/mocks/mock_hw_info_config.cpp
@@ -192,4 +192,19 @@ template <>
 void HwInfoConfigHw<IGFX_UNKNOWN>::setCapabilityCoherencyFlag(const HardwareInfo &hwInfo, bool &coherencyFlag) {
 }
 
+template <>
+bool HwInfoConfigHw<IGFX_UNKNOWN>::isAdditionalMediaSamplerProgrammingRequired() const {
+    return false;
+}
+
+template <>
+bool HwInfoConfigHw<IGFX_UNKNOWN>::isInitialFlagsProgrammingRequired() const {
+    return false;
+}
+
+template <>
+bool HwInfoConfigHw<IGFX_UNKNOWN>::isReturnedCmdSizeForMediaSamplerAdjustmentRequired() const {
+    return false;
+}
+
 } //namespace NEO
