Make ForcePSBestSIMD RegKey only applicable to the first stage while staged compilation is on

Platforms: All

Change-Id: I553319a46f37e87bab9f6b22ecd86a8df272deba
Related-to: SCSP-19136
Resolves:

Author: houjenko

IGC/Compiler/CISACodeGen/EmitVISAPass.cpp

@@ -399,7 +399,7 @@ bool EmitPass::runOnFunction(llvm::Function& F)
 
     m_FGA = getAnalysisIfAvailable<GenXFunctionGroupAnalysis>();
 
-    if ((IGC_IS_FLAG_ENABLED(ForcePSBestSIMD) || IsStage1BestPerf(m_pCtx->m_CgFlag, m_pCtx->m_StagingCtx)) && m_SimdMode == SIMDMode::SIMD8)
+    if ((IsStage1BestPerf(m_pCtx->m_CgFlag, m_pCtx->m_StagingCtx)) && m_SimdMode == SIMDMode::SIMD8)
     {
         /* Don't do SIMD8 if SIMD16 has no spill */
         auto Iter = m_shaders.find(&F);

IGC/Compiler/CISACodeGen/PixelShaderCodeGen.cpp

@@ -1123,7 +1123,7 @@ namespace IGC
         }
         if (simdMode == SIMDMode::SIMD16 && EP.m_ShaderMode == ShaderDispatchMode::NOT_APPLICABLE)
         {
-            if (IGC_IS_FLAG_ENABLED(ForcePSBestSIMD) || IsStage1BestPerf(ctx->m_CgFlag, ctx->m_StagingCtx))
+            if (IsStage1BestPerf(ctx->m_CgFlag, ctx->m_StagingCtx))
             {
                 return true;
             }

IGC/Compiler/CISACodeGen/ShaderCodeGen.cpp

@@ -760,7 +760,7 @@ namespace IGC
     bool earlyExit =
         ctx->getCompilerOption().pixelShaderDoNotAbortOnSpill ? false : true;
 
-    if (IGC_IS_FLAG_ENABLED(ForcePSBestSIMD) || IsStage1BestPerf(ctx->m_CgFlag, ctx->m_StagingCtx))
+    if (IsStage1BestPerf(ctx->m_CgFlag, ctx->m_StagingCtx))
     {
         // don't retry SIMD16 for ForcePSBestSIMD
         if( SimdEarlyCheck( ctx ) && ( !ctx->m_retryManager.IsLastTry( ctx ) ) )

IGC/common/igc_flags.def

@@ -334,7 +334,7 @@ DECLARE_IGC_REGKEY(bool, PixelShaderDoNotAbortOnSpill, false,  "Do not abort on
 DECLARE_IGC_REGKEY(DWORD, ForcePixelShaderSIMDMode,  0, "Setting it to values def in igc.h will force SIMD mode compilation for pixel shaders. Note that only SIMD8 is compiled unless other ForcePixelShaderSIMD* are also selected", false)
 DECLARE_IGC_REGKEY(DWORD, StagedCompilationExperiments, 0,  "Experiment with staged compilation when != 0", false)
 DECLARE_IGC_REGKEY(bool, StagedCompilation,             false,  "Enable staged compilation", false)
-DECLARE_IGC_REGKEY(bool, ForcePSBestSIMD, false,  "Force Pixel shader to return the best SIMD, either SIMD16 or SIMD8", false)
+DECLARE_IGC_REGKEY(bool, ForcePSBestSIMD, false,  "Force Pixel shader to return the best SIMD, either SIMD16 or SIMD8. When StagedCompilation is on, this only affects to the first stage", false)
 DECLARE_IGC_REGKEY(bool, SkipTREarlyExitCheck, false, "Skip SIMD16 early exit check in ShaderCodeGen", false)
 DECLARE_IGC_REGKEY(bool, EnableTCSHWBarriers, false,  "Enable TCS pass with HW barriers support. Default TCS pass is TCS pass with multiple continuation functions.", false)
 DECLARE_IGC_REGKEY(bool, ForceMCFBarriers, false,  "Force TCS pass with MCF (SW) barriers support. Default TCS pass is TCS pass with multiple continuation functions.", false)