Add umd control for allowing forceUniformBuffer and forceUniformSurf…

…aceSampler Add umd control for allowing forceUniformBuffer and forceUniformSurfaceSampler
intel · Sep 19, 2023 · 663698b · 663698b
1 parent 4dafd39
commit 663698b
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/IGC/Compiler/CISACodeGen/ShaderCodeGen.cpp b/IGC/Compiler/CISACodeGen/ShaderCodeGen.cpp
@@ -924,12 +924,16 @@ void AddLegalizationPasses(CodeGenContext& ctx, IGCPassManager& mpm, PSSignature
         mpm.add(createVectorBitCastOptPass());
     }
 
+    bool csForceUniformSurfaceSampler = ( ctx.type == ShaderType::COMPUTE_SHADER && ctx.getModuleMetaData()->csInfo.forceUniformSurfaceSampler );
+    bool csForceUniformBuffer = ( ctx.type == ShaderType::COMPUTE_SHADER && ctx.getModuleMetaData()->csInfo.forceUniformBuffer );
     if (ctx.m_instrTypes.hasUniformAssumptions ||
         IGC_IS_FLAG_ENABLED(ForceUniformSurfaceSampler) ||
-        IGC_IS_FLAG_ENABLED(ForceUniformBuffer)) {
+        csForceUniformSurfaceSampler ||
+        IGC_IS_FLAG_ENABLED(ForceUniformBuffer) ||
+        csForceUniformBuffer ) {
         mpm.add(new UniformAssumptions(
-                        IGC_IS_FLAG_ENABLED(ForceUniformSurfaceSampler),
-                        IGC_IS_FLAG_ENABLED(ForceUniformBuffer))
+                        IGC_IS_FLAG_ENABLED(ForceUniformSurfaceSampler) || csForceUniformSurfaceSampler,
+                        IGC_IS_FLAG_ENABLED(ForceUniformBuffer) || csForceUniformBuffer )
         );
     }
 

diff --git a/IGC/common/MDFrameWork.h b/IGC/common/MDFrameWork.h
@@ -470,6 +470,8 @@ namespace IGC
         bool disableSimd32Slicing = false;
         bool disableSplitOnSpill = false;
         bool forcedVISAPreRAScheduler = false;
+        bool forceUniformBuffer = false;
+        bool forceUniformSurfaceSampler = false;
         // disables dispatch along y and tiled order optimizations
         bool disableLocalIdOrderOptimizations = false;
         // force disables dispatch along y optimization