Adjust PIPELINE_SELECT programming on tgllp

Signed-off-by: Sebastian Luzynski <[email protected]>

Author: SebastianLuzynski

level_zero/core/source/cmdlist/cmdlist_hw.inl

@@ -2181,11 +2181,11 @@ void CommandListCoreFamily<gfxCoreFamily>::updateStreamProperties(Kernel &kernel
     auto threadArbitrationPolicy = hwHelper.getDefaultThreadArbitrationPolicy();
     finalStreamState.stateComputeMode.setProperties(false, kernelAttributes.numGrfRequired, threadArbitrationPolicy);
 
-    NEO::EncodeWA<GfxFamily>::encodeAdditionalPipelineSelect(neoDevice, *commandContainer.getCommandStream(), true);
     if (finalStreamState.stateComputeMode.isDirty()) {
+        NEO::EncodeWA<GfxFamily>::encodeAdditionalPipelineSelect(neoDevice, *commandContainer.getCommandStream(), true);
         NEO::EncodeComputeMode<GfxFamily>::adjustComputeMode(*commandContainer.getCommandStream(), nullptr, finalStreamState.stateComputeMode, hwInfo);
+        NEO::EncodeWA<GfxFamily>::encodeAdditionalPipelineSelect(neoDevice, *commandContainer.getCommandStream(), false);
     }
-    NEO::EncodeWA<GfxFamily>::encodeAdditionalPipelineSelect(neoDevice, *commandContainer.getCommandStream(), false);
 }
 
 template <GFXCORE_FAMILY gfxCoreFamily>

shared/source/command_container/command_encoder_bdw_and_later.inl

@@ -360,7 +360,9 @@ void EncodeStateBaseAddress<Family>::encode(CommandContainer &container, STATE_B
 
 template <typename Family>
 void EncodeStateBaseAddress<Family>::encode(CommandContainer &container, STATE_BASE_ADDRESS &sbaCmd, uint32_t statelessMocsIndex, bool useGlobalAtomics) {
-    EncodeWA<Family>::encodeAdditionalPipelineSelect(*container.getDevice(), *container.getCommandStream(), true);
+    if (container.isAnyHeapDirty()) {
+        EncodeWA<Family>::encodeAdditionalPipelineSelect(*container.getDevice(), *container.getCommandStream(), true);
+    }
 
     auto gmmHelper = container.getDevice()->getGmmHelper();