Favor SIMD32 if CS has barriers.

Change-Id: I31711f65eae89300126e3646269c88522ce5bb1f

Author: pguo-igc

IGC/Compiler/CISACodeGen/CheckInstrTypes.cpp

@@ -76,6 +76,7 @@ CheckInstrTypes::CheckInstrTypes(IGC::SInstrTypes* instrList) : FunctionPass(ID)
     instrList->psHasSideEffect = false;
     instrList->hasDebugInfo = false;
     instrList->hasAtomics = false;
+    instrList->hasBarrier = false;
     instrList->hasDiscard = false;
     instrList->mayHaveIndirectOperands = false;
 	instrList->numSample = 0;
@@ -188,6 +189,9 @@ void CheckInstrTypes::visitCallInst(CallInst &C)
         case GenISAIntrinsic::GenISA_WaveShuffleIndex:
             g_InstrTypes->mayHaveIndirectOperands = true;
             break;
+        case GenISAIntrinsic::GenISA_threadgroupbarrier:
+            g_InstrTypes->hasBarrier = true;
+            break;
         default:
             break;
         }

IGC/Compiler/CISACodeGen/ComputeShaderCodeGen.cpp

@@ -610,7 +610,9 @@ bool CComputeShader::CompileSIMDSize(SIMDMode simdMode, EmitPass &EP, llvm::Func
 
             float occu16 = ctx->GetThreadOccupancy(SIMDMode::SIMD16);
             float occu32 = ctx->GetThreadOccupancy(SIMDMode::SIMD32);
-            if (occu32 > occu16 && !ctx->isSecondCompile)
+            if (!ctx->isSecondCompile &&
+                (occu32 > occu16 ||
+                (occu32 == occu16 && ctx->m_instrTypes.hasBarrier)))
             {
                 return true;
             }

IGC/Compiler/CodeGenPublic.h

@@ -142,6 +142,7 @@ namespace IGC
         bool hasGenericAddressSpacePointers;
         bool hasDebugInfo;        //<! true only if module contains debug info !llvm.dbg.cu
         bool hasAtomics;
+        bool hasBarrier;        //<! true if module has thread group barrier
         bool hasDiscard;
         bool mayHaveIndirectOperands;  //<! true if code may have indirect operands like r5[a0].
 		unsigned int numSample;