Changes in code.

Change-Id: Id7c88f7c9314c2b7dc6da6c4a4fe8bb58d9a4338

Author: fftzeng

IGC/Compiler/CISACodeGen/ShaderCodeGen.cpp

@@ -1012,8 +1012,7 @@ void CodeGen(ComputeShaderContext* ctx, CShaderProgram::KernelShaderMap& shaders
                 else
                     ctx->SetSIMDInfo(SIMD_SKIP_THGRPSIZE, SIMDMode::SIMD16, ShaderDispatchMode::NOT_APPLICABLE);
 
-                // if this is a retry already, don't bother trying simd32
-                if (cgSimd32 && !ctx->m_retryManager.IsLastTry())
+                if (cgSimd32)
                     AddCodeGenPasses(*ctx, shaders, PassMgr, SIMDMode::SIMD32, true);
                 else
                     ctx->SetSIMDInfo(SIMD_SKIP_THGRPSIZE, SIMDMode::SIMD16, ShaderDispatchMode::NOT_APPLICABLE);
@@ -1028,9 +1027,7 @@ void CodeGen(ComputeShaderContext* ctx, CShaderProgram::KernelShaderMap& shaders
         {
             AddCodeGenPasses(*ctx, shaders, PassMgr, SIMDMode::SIMD16,
                 !ctx->m_retryManager.IsLastTry());
-
-            // if this is a retry already, don't bother trying simd32
-            if (!ctx->m_enableSubroutine && !ctx->m_retryManager.IsLastTry() && maxSimdMode == SIMDMode::SIMD32)
+            if (!ctx->m_enableSubroutine && maxSimdMode == SIMDMode::SIMD32)
             {
                 AddCodeGenPasses(*ctx, shaders, PassMgr, SIMDMode::SIMD32, true);
             }

IGC/Compiler/CodeGenContext.cpp

@@ -279,7 +279,7 @@ namespace IGC
         {
             if (simd32NoSpill)
             {
-                if (occu32 >= occu16)
+                if (occu32 >= occu16 && occu32 >= occu8)
                 {
                     simdMode = SIMDMode::SIMD32;
                     return m_simdEntries[2];
@@ -291,7 +291,7 @@ namespace IGC
 
             if (simd16NoSpill)
             {
-                if (occu16 >= occu32)
+                if (occu16 >= occu8 && occu16 >= occu32)
                 {
                     simdMode = SIMDMode::SIMD16;
                     return m_simdEntries[1];