[IGC Feature][IGC] Staged compilation TGL support

Change-Id: I3247a7970da3f7df3a5215c8a9aad58614b9146b

Author: houjenko

IGC/AdaptorCommon/API/igc.h

@@ -127,7 +127,7 @@ typedef enum {
      !(!IsRetry(stats) && !DoSimd16(stats))) || \
     ((IsStage1BestPerf(flag, prev_ctx_ptr)) && \
      ( IGC_IS_FLAG_ENABLED(ExtraRetrySIMD16) && !HasSimdSpill(8, stats)) || \
-     (!IGC_IS_FLAG_ENABLED(ExtraRetrySIMD16) && !HasSimd(8, stats)))) \
+     (!IGC_IS_FLAG_ENABLED(ExtraRetrySIMD16) && (!HasSimd(8, stats) || DoSimd32(stats))))) \
     )
 
 // Return true when simd MODE has been generated previously

IGC/Compiler/CISACodeGen/EmitVISAPass.cpp

@@ -825,6 +825,7 @@ bool EmitPass::runOnFunction(llvm::Function& F)
     }
 
     if (m_SimdMode == SIMDMode::SIMD16 &&
+        this->m_ShaderMode == ShaderDispatchMode::NOT_APPLICABLE &&
         IsStage1BestPerf(m_pCtx->m_CgFlag, m_pCtx->m_StagingCtx))
     {
         m_pCtx->m_doSimd32Stage2 = m_currShader->CompileSIMDSize(SIMDMode::SIMD32, *this, F);

IGC/Compiler/CISACodeGen/ShaderCodeGen.cpp

@@ -795,12 +795,26 @@ namespace IGC
         bool earlyExit =
             ctx->getCompilerOption().pixelShaderDoNotAbortOnSpill ? false : true;
 
+        // for versioned loop, in general SIMD16 with spill has better perf
+        bool earlyExit16 = psInfo.hasVersionedLoop ? false : earlyExit;
+        bool enableSimd32 = false;
+
+        if (psInfo.ForceEnableSimd32) // UMD forced compilation of simd32.
+        {
+            enableSimd32 = true;
+        }
+        // heuristic based on performance measures.
+        else if (SimdEarlyCheck(ctx))
+        {
+            enableSimd32 = true;
+        }
+
         if (IsStage1BestPerf(ctx->m_CgFlag, ctx->m_StagingCtx))
         {
             // don't retry SIMD16 for ForcePSBestSIMD
-            if( SimdEarlyCheck( ctx ) && ( !ctx->m_retryManager.IsLastTry() ) )
+            if (enableSimd32 || IGC_GET_FLAG_VALUE(SkipTREarlyExitCheck))
             {
-                AddCodeGenPasses(*ctx, shaders, PassMgr, SIMDMode::SIMD16, true, ShaderDispatchMode::NOT_APPLICABLE, pSignature);
+                AddCodeGenPasses(*ctx, shaders, PassMgr, SIMDMode::SIMD16, earlyExit16, ShaderDispatchMode::NOT_APPLICABLE, pSignature);
             }
             AddCodeGenPasses(*ctx, shaders, PassMgr, SIMDMode::SIMD8, !ctx->m_retryManager.IsLastTry(), ShaderDispatchMode::NOT_APPLICABLE, pSignature);
             useRegKeySimd = true;
@@ -838,20 +852,6 @@ namespace IGC
 
         if (!useRegKeySimd)
         {
-            bool enableSimd32 = false;
-
-            if (psInfo.ForceEnableSimd32) // UMD forced compilation of simd32.
-            {
-                enableSimd32 = true;
-            }
-            // heuristic based on performance measures.
-            else if (SimdEarlyCheck(ctx))
-            {
-                enableSimd32 = true;
-            }
-
-            // for versioned loop, in general SIMD16 with spill has better perf
-            bool earlyExit16 = psInfo.hasVersionedLoop ? false : earlyExit;
             AddCodeGenPasses(*ctx, shaders, PassMgr, SIMDMode::SIMD8, !ctx->m_retryManager.IsLastTry(), ShaderDispatchMode::NOT_APPLICABLE, pSignature);
 
             if (enableSimd32 || IGC_GET_FLAG_VALUE(SkipTREarlyExitCheck))