CS SIMD mode flag priority

Flags like ForceCSSIMD32 should have priority over all other methods of forcing simd modes in compute shaders.
intel · Sep 21, 2023 · 35c81de · 35c81de
1 parent e41de38
commit 35c81de
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 10 deletions.
diff --git a/IGC/AdaptorCommon/DivergentBarrierPass.cpp b/IGC/AdaptorCommon/DivergentBarrierPass.cpp
@@ -493,18 +493,22 @@ bool DivergentBarrierPass::processShader(Function* F)
     // so no need to add the divergent barrier WA.
     bool skipTGbarriers = false;
     unsigned forcedSimdSize = 0;
-    if (IGC_IS_FLAG_ENABLED(ForceCSSIMD32) ||
-        m_CGCtx->getModuleMetaData()->csInfo.waveSize == 32 ||
-        m_CGCtx->getModuleMetaData()->csInfo.forcedSIMDSize == 32)
+    if (IGC_IS_FLAG_ENABLED(ForceCSSIMD32))
     {
         forcedSimdSize = 32;
     }
-    else if (IGC_IS_FLAG_ENABLED(ForceCSSIMD16) ||
-        m_CGCtx->getModuleMetaData()->csInfo.waveSize == 16 ||
-        m_CGCtx->getModuleMetaData()->csInfo.forcedSIMDSize == 16)
+    else if (IGC_IS_FLAG_ENABLED(ForceCSSIMD16))
     {
         forcedSimdSize = 16;
     }
+    else if (m_CGCtx->getModuleMetaData()->csInfo.forcedSIMDSize >= 16)
+    {
+        forcedSimdSize = m_CGCtx->getModuleMetaData()->csInfo.forcedSIMDSize;
+    }
+    else if (m_CGCtx->getModuleMetaData()->csInfo.waveSize >= 16)
+    {
+        forcedSimdSize = m_CGCtx->getModuleMetaData()->csInfo.waveSize;
+    }
     ConstantInt* groupSize = dyn_cast<ConstantInt>(getGroupSize(*F));
     if (groupSize &&
         forcedSimdSize >= groupSize->getValue().getZExtValue())

diff --git a/IGC/AdaptorCommon/RayTracing/TraceRayInlineLoweringPass.cpp b/IGC/AdaptorCommon/RayTracing/TraceRayInlineLoweringPass.cpp
@@ -967,10 +967,16 @@ bool RTGlobalsPointerLoweringPass::needsSplitting(const CodeGenContext* Ctx)
 
     auto& csInfo = Ctx->getModuleMetaData()->csInfo;
 
-    if (IGC_IS_FLAG_ENABLED(ForceCSSIMD32)           ||
-        IGC_GET_FLAG_VALUE(ForceCSSimdSize4RQ) == 32 ||
-        csInfo.waveSize == 32                        ||
-        csInfo.forcedSIMDSize == 32)
+    if (IGC_IS_FLAG_ENABLED(ForceCSSIMD32) ||
+        IGC_GET_FLAG_VALUE(ForceCSSimdSize4RQ) == 32)
+        return true;
+    if (IGC_IS_FLAG_ENABLED(ForceCSSIMD16))
+        return false;
+    if (csInfo.forcedSIMDSize == 32)
+        return true;
+    if (csInfo.forcedSIMDSize == 16)
+        return false;
+    if (csInfo.waveSize == 32)
         return true;
 
     return false;