Check for undefined %id in spirv_asm block. (#5966)

shader-slang · Dec 31, 2024 · b7eb585 · b7eb585
1 parent 1f98bd6
commit b7eb585
Show file tree

Hide file tree

Showing 3 changed files with 83 additions and 1 deletion.
diff --git a/source/slang/slang-check-expr.cpp b/source/slang/slang-check-expr.cpp
@@ -5311,6 +5311,10 @@ Expr* SemanticsExprVisitor::visitSPIRVAsmExpr(SPIRVAsmExpr* expr)
     // We will iterate over all the operands in all the insts and check
     // them
     bool failed = false;
+
+    // Track %id's that have been defined in this asm block.
+    HashSet<Name*> definedIds;
+
     for (auto& inst : expr->insts)
     {
         // It's not automatically a failure to not have info, we just won't
@@ -5327,6 +5331,52 @@ Expr* SemanticsExprVisitor::visitSPIRVAsmExpr(SPIRVAsmExpr* expr)
                 0);
             continue;
         }
+        int resultIdIndex = -1;
+        if (opInfo)
+        {
+            resultIdIndex = opInfo->resultIdIndex;
+        }
+        else if (inst.opcode.flavor == SPIRVAsmOperand::TruncateMarker)
+        {
+            // If this is __truncate, register the result id in the third operand.
+            resultIdIndex = 1;
+        }
+        else
+        {
+            // If there is no opInfo, just register all Ids as defined.
+            for (auto& operand : inst.operands)
+            {
+                if (operand.flavor == SPIRVAsmOperand::Id)
+                {
+                    definedIds.add(operand.token.getName());
+                }
+            }
+        }
+
+        // Register result ID.
+        if (resultIdIndex != -1)
+        {
+            if (inst.operands.getCount() <= resultIdIndex)
+            {
+                failed = true;
+                getSink()->diagnose(
+                    inst.opcode.token,
+                    Diagnostics::spirvInstructionWithNotEnoughOperands,
+                    inst.opcode.token);
+                continue;
+            }
+            auto& resultIdOperand = inst.operands[resultIdIndex];
+
+            if (!definedIds.add(resultIdOperand.token.getName()))
+            {
+                failed = true;
+                getSink()->diagnose(
+                    inst.opcode.token,
+                    Diagnostics::spirvIdRedefinition,
+                    inst.opcode.token);
+                continue;
+            }
+        }
 
         const bool isLast = &inst == &expr->insts.getLast();
         for (Index operandIndex = 0; operandIndex < inst.operands.getCount(); ++operandIndex)
@@ -5438,6 +5488,18 @@ Expr* SemanticsExprVisitor::visitSPIRVAsmExpr(SPIRVAsmExpr* expr)
                     }
                     operand.knownValue = builtinVarKind.value();
                 }
+                else if (operand.flavor == SPIRVAsmOperand::Id)
+                {
+                    if (!definedIds.contains(operand.token.getName()))
+                    {
+                        failed = true;
+                        getSink()->diagnose(
+                            operand.token,
+                            Diagnostics::spirvUndefinedId,
+                            operand.token);
+                        return;
+                    }
+                }
                 if (operand.bitwiseOrWith.getCount() &&
                     operand.flavor != SPIRVAsmOperand::Literal &&
                     operand.flavor != SPIRVAsmOperand::NamedValue)

diff --git a/source/slang/slang-diagnostic-defs.h b/source/slang/slang-diagnostic-defs.h
@@ -541,7 +541,17 @@ DIAGNOSTIC(
     Error,
     spirvInvalidTruncate,
     "__truncate has been given a source smaller than its target")
-
+DIAGNOSTIC(29112, Error, spirvInstructionWithNotEnoughOperands, "not enough operands for $0")
+DIAGNOSTIC(
+    29113,
+    Error,
+    spirvIdRedefinition,
+    "SPIRV id '%$0' is already defined in the current assembly block")
+DIAGNOSTIC(
+    29114,
+    Error,
+    spirvUndefinedId,
+    "SPIRV id '%$0' is not defined in the current assembly block location")
 //
 // 3xxxx - Semantic analysis
 //

diff --git a/tests/diagnostics/invalid-spv-obj.slang b/tests/diagnostics/invalid-spv-obj.slang
@@ -0,0 +1,10 @@
+//TEST:SIMPLE(filecheck=CHECK): -target spirv
+
+[shader("compute")]
+[numthreads(1,1,1)]
+void main() {
+    int var2 = spirv_asm {
+        // CHECK: ([[# @LINE+1]]): error 29114
+        result: $$int = OpIMul $(15) %invalidId
+    };
+}