Add program HDC pipeline flush prior to SBA

Change-Id: If1223f7dbc07b6a5275a642fac27a44b87a9f97c
Signed-off-by: Kamil Kopryk <[email protected]>
Related-To: NEO-3974

Author: KamilKoprykIntel

Jenkinsfile

@@ -1,5 +1,5 @@
 #!groovy
 dependenciesRevision='e3e18192ff06cf3be89b39aa76b0b3c8d8db6816-1353'
 strategy='EQUAL'
-allowedCD=257
+allowedCD=256
 allowedF=7

runtime/command_stream/command_stream_receiver_hw_base.inl

@@ -127,14 +127,6 @@ inline typename GfxFamily::PIPE_CONTROL *CommandStreamReceiverHw<GfxFamily>::add
     return pCmd;
 }
 
-template <typename GfxFamily>
-inline typename GfxFamily::PIPE_CONTROL *CommandStreamReceiverHw<GfxFamily>::addPipeControlBeforeStateBaseAddress(LinearStream &commandStream) {
-    auto pCmd = addPipeControlCmd(commandStream);
-    pCmd->setTextureCacheInvalidationEnable(true);
-    pCmd->setDcFlushEnable(true);
-    return pCmd;
-}
-
 template <typename GfxFamily>
 CompletionStamp CommandStreamReceiverHw<GfxFamily>::flushTask(
     LinearStream &commandStreamTask,

runtime/command_stream/command_stream_receiver_hw_bdw_plus.inl

@@ -76,4 +76,12 @@ bool CommandStreamReceiverHw<GfxFamily>::isMultiOsContextCapable() const {
     return false;
 }
 
+template <typename GfxFamily>
+inline typename GfxFamily::PIPE_CONTROL *CommandStreamReceiverHw<GfxFamily>::addPipeControlBeforeStateBaseAddress(LinearStream &commandStream) {
+    auto pCmd = addPipeControlCmd(commandStream);
+    pCmd->setTextureCacheInvalidationEnable(true);
+    pCmd->setDcFlushEnable(true);
+    return pCmd;
+}
+
 } // namespace NEO

runtime/command_stream/command_stream_receiver_hw_tgllp_plus.inl

@@ -6,6 +6,7 @@
  */
 
 #include "runtime/command_stream/command_stream_receiver_hw.h"
+#include "runtime/helpers/state_compute_mode_helper.h"
 
 namespace NEO {
 template <typename GfxFamily>
@@ -32,4 +33,13 @@ void CommandStreamReceiverHw<GfxFamily>::programComputeMode(LinearStream &stream
         adjustComputeMode(stream, dispatchFlags, stateComputeMode);
     }
 }
-} // namespace NEO
+
+template <>
+inline typename Family::PIPE_CONTROL *CommandStreamReceiverHw<Family>::addPipeControlBeforeStateBaseAddress(LinearStream &commandStream) {
+    auto pCmd = addPipeControlCmd(commandStream);
+    pCmd->setTextureCacheInvalidationEnable(true);
+    pCmd->setDcFlushEnable(true);
+    pCmd->setHdcPipelineFlush(true);
+    return pCmd;
+}
+} // namespace NEO

runtime/gen12lp/command_stream_receiver_hw_gen12lp.cpp

@@ -6,14 +6,16 @@
  */
 
 #include "core/gen12lp/hw_cmds.h"
+
+using Family = NEO::TGLLPFamily;
+
 #include "runtime/command_stream/command_stream_receiver_hw_bdw_plus.inl"
 #include "runtime/command_stream/command_stream_receiver_hw_tgllp_plus.inl"
 #include "runtime/command_stream/device_command_stream.h"
 #include "runtime/gen12lp/helpers_gen12lp.h"
 #include "runtime/helpers/blit_commands_helper_bdw_plus.inl"
 
 namespace NEO {
-typedef TGLLPFamily Family;
 static auto gfxCore = IGFX_GEN12LP_CORE;
 
 template <>
@@ -52,18 +54,6 @@ void populateFactoryTable<CommandStreamReceiverHw<Family>>() {
     commandStreamReceiverFactory[gfxCore] = DeviceCommandStreamReceiver<Family>::create;
 }
 
-template <>
-inline typename Family::PIPE_CONTROL *CommandStreamReceiverHw<Family>::addPipeControlBeforeStateBaseAddress(LinearStream &commandStream) {
-    auto pCmd = addPipeControlCmd(commandStream);
-    pCmd->setTextureCacheInvalidationEnable(true);
-    pCmd->setDcFlushEnable(true);
-
-    if (Gen12LPHelpers::hdcFlushForPipeControlBeforeStateBaseAddressRequired(executionEnvironment.getHardwareInfo()->platform.eProductFamily)) {
-        pCmd->setHdcPipelineFlush(true);
-    }
-    return pCmd;
-}
-
 template class CommandStreamReceiverHw<Family>;
 template struct BlitCommandsHelper<Family>;
 

runtime/gen12lp/helpers_gen12lp.cpp

@@ -12,9 +12,6 @@
 
 namespace NEO {
 namespace Gen12LPHelpers {
-bool hdcFlushForPipeControlBeforeStateBaseAddressRequired(PRODUCT_FAMILY productFamily) {
-    return (productFamily == PRODUCT_FAMILY::IGFX_TIGERLAKE_LP);
-}
 
 bool pipeControlWaRequired(PRODUCT_FAMILY productFamily) {
     return (productFamily == PRODUCT_FAMILY::IGFX_TIGERLAKE_LP);

runtime/gen12lp/helpers_gen12lp.h

@@ -21,7 +21,6 @@ struct PipelineSelectArgs;
 class Image;
 
 namespace Gen12LPHelpers {
-bool hdcFlushForPipeControlBeforeStateBaseAddressRequired(PRODUCT_FAMILY productFamily);
 bool pipeControlWaRequired(PRODUCT_FAMILY productFamily);
 bool imagePitchAlignmentWaRequired(PRODUCT_FAMILY productFamily);
 void adjustCoherencyFlag(PRODUCT_FAMILY productFamily, bool &coherencyFlag);

unit_tests/gen12lp/command_stream_receiver_hw_tests_gen12lp.inl

@@ -69,7 +69,5 @@ GEN12LPTEST_F(UltCommandStreamReceiverTest, givenStateBaseAddressWhenItIsRequire
     auto pipeControlCmd = reinterpret_cast<typename FamilyType::PIPE_CONTROL *>(*pipeControlItor);
     EXPECT_TRUE(pipeControlCmd->getTextureCacheInvalidationEnable());
     EXPECT_TRUE(pipeControlCmd->getDcFlushEnable());
-
-    const bool expectedHdcFlushEnable = SpecialUltHelperGen12lp::shouldEnableHdcFlush(::productFamily);
-    EXPECT_EQ(expectedHdcFlushEnable, pipeControlCmd->getHdcPipelineFlush());
+    EXPECT_TRUE(pipeControlCmd->getHdcPipelineFlush());
 }

unit_tests/gen12lp/special_ult_helper_gen12lp.cpp

@@ -15,10 +15,6 @@ bool SpecialUltHelperGen12lp::shouldCompressionBeEnabledAfterConfigureHardwareCu
     return hwInfo.featureTable.ftrE2ECompression;
 }
 
-bool SpecialUltHelperGen12lp::shouldEnableHdcFlush(PRODUCT_FAMILY productFamily) {
-    return true;
-}
-
 bool SpecialUltHelperGen12lp::additionalCoherencyCheck(PRODUCT_FAMILY productFamily, bool coherency) {
     return false;
 }

unit_tests/gen12lp/special_ult_helper_gen12lp.h

@@ -16,7 +16,6 @@ struct HardwareInfo;
 
 struct SpecialUltHelperGen12lp {
     static bool shouldCompressionBeEnabledAfterConfigureHardwareCustom(const HardwareInfo &hwInfo);
-    static bool shouldEnableHdcFlush(PRODUCT_FAMILY productFamily);
     static bool additionalCoherencyCheck(PRODUCT_FAMILY productFamily, bool coherency);
     static bool shouldPerformimagePitchAlignment(PRODUCT_FAMILY productFamily);
     static bool shouldTestDefaultImplementationOfSetupHardwareCapabilities(PRODUCT_FAMILY productFamily);