Make the 'getOutsideASM' function generic as well

shader-slang · Dec 5, 2024 · df2f492 · df2f492
1 parent 338aaf2
commit df2f492
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 22 deletions.
diff --git a/source/slang/slang-ir-legalize-global-values.cpp b/source/slang/slang-ir-legalize-global-values.cpp
@@ -3,26 +3,6 @@
 #include "slang-ir-clone.h"
 #include "slang-ir-util.h"
 
-namespace
-{
-using namespace Slang;
-void setInsertBeforeOutsideASM(
-    IRBuilder& builder, IRInst* beforeInst)
-{
-    auto parent = beforeInst->getParent();
-    while (parent)
-    {
-        if (as<IRSPIRVAsm>(parent))
-        {
-            builder.setInsertBefore(parent);
-            return;
-        }
-        parent = parent->getParent();
-    }
-    builder.setInsertBefore(beforeInst);
-}
-} // namespace
-
 namespace Slang
 {
 
@@ -46,7 +26,7 @@ void GlobalInstInliningContextGeneric::inlineGlobalValues(IRModule * module)
     {
         auto user = use->getUser();
         IRBuilder builder(user);
-        setInsertBeforeOutsideASM(builder, user);
+        builder.setInsertBefore(getOutsideASM(user));
         IRCloneEnv cloneEnv;
         auto val = maybeInlineGlobalValue(builder, use->getUser(), use->get(), cloneEnv);
         if (val != use->get())
@@ -176,7 +156,7 @@ IRInst* GlobalInstInliningContextGeneric::inlineInst(IRBuilder& builder, IRClone
     {
         auto operand = inst->getOperand(i);
         IRBuilder operandBuilder(builder);
-        setInsertBeforeOutsideASM(operandBuilder, builder.getInsertLoc().getInst());
+        operandBuilder.setInsertBefore(getOutsideASM(builder.getInsertLoc().getInst()));
         maybeInlineGlobalValue(operandBuilder, inst, operand, cloneEnv);
     }
     result = cloneInstAndOperands(&cloneEnv, &builder, inst);

diff --git a/source/slang/slang-ir-legalize-global-values.h b/source/slang/slang-ir-legalize-global-values.h
@@ -17,6 +17,7 @@ struct GlobalInstInliningContextGeneric
     virtual bool isLegalGlobalInstForTarget(IRInst* inst) =0;
     virtual bool isInlinableGlobalInstForTarget(IRInst* inst) =0;
     virtual bool shouldBeInlinedForTarget(IRInst* user) =0;
+    virtual IRInst* getOutsideASM(IRInst* beforeInst) =0;
 
     // Inline global values that can't represented by the target to their use sites.
     void inlineGlobalValues(IRModule * module);

diff --git a/source/slang/slang-ir-spirv-legalize.cpp b/source/slang/slang-ir-spirv-legalize.cpp
@@ -1624,6 +1624,19 @@ struct SPIRVLegalizationContext : public SourceEmitterBase
             return false;
         }
 
+        IRInst* getOutsideASM(IRInst* beforeInst)
+        {
+            auto parent = beforeInst->getParent();
+            while (parent)
+            {
+                if (as<IRSPIRVAsm>(parent))
+                {
+                    return parent;
+                }
+                parent = parent->getParent();
+            }
+            return beforeInst;
+        }
     };
 
     void processBranch(IRInst* branch) { addToWorkList(branch->getOperand(0)); }

diff --git a/source/slang/slang-ir-wgsl-legalize.cpp b/source/slang/slang-ir-wgsl-legalize.cpp
@@ -1609,6 +1609,12 @@ struct GlobalInstInliningContext: public GlobalInstInliningContextGeneric
         // WGSL doesn't do any extra inlining beyond what is generically done by default.
         return false;
     }
+
+    IRInst* getOutsideASM(IRInst* beforeInst) override
+    {
+        // Not needed for WGSL, check e.g. the SPIR-V case to see why this is used.
+        return beforeInst;
+    }
 };
 
 void legalizeIRForWGSL(IRModule* module, DiagnosticSink* sink)