From 5120c1cd072548654c9ce79fa85426a5e48736c4 Mon Sep 17 00:00:00 2001
From: Ellie Hermaszewska <ellieh@nvidia.com>
Date: Wed, 2 Jul 2025 03:03:41 +0800
Subject: extend fiddle to allow custom lua splices in more places (#7559)

* Add fkYAML submodule

* Generate slang-ir-inst-defs.h from slang-ir-inst-defs.yaml

* generate ir-inst-defs.h

* neaten things

* neaten inst def parser

* add rapidyaml submodule

* remove fkyaml

* remove fkyaml submodule

* remove use of ir-inst-defs.h

* format and warnings

* fix wasm build

* tidy

* remove rapidyaml

* Extend fiddle to allow custom splices in more places

* Use lua to describe ir insts

* fix

* neaten

* neaten

* neaten

* spelling

* neaten

* comment comment out assert

* merge
---
 source/slang/slang-ir-validate.cpp | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

(limited to 'source/slang/slang-ir-validate.cpp')

diff --git a/source/slang/slang-ir-validate.cpp b/source/slang/slang-ir-validate.cpp
index b3d6504ab..bf5d8ed5d 100644
--- a/source/slang/slang-ir-validate.cpp
+++ b/source/slang/slang-ir-validate.cpp
@@ -220,7 +220,7 @@ void validateIRInstOperand(IRValidateContext* context, IRInst* inst, IRUse* oper
     }
 
     // We allow out-of-order def-use in global scope.
-    bool allInGlobalScope = inst->getParent() && inst->getParent()->getOp() == kIROp_Module;
+    bool allInGlobalScope = inst->getParent() && inst->getParent()->getOp() == kIROp_ModuleInst;
     if (allInGlobalScope)
     {
         for (UInt i = 0; i < inst->getOperandCount(); i++)
@@ -230,7 +230,7 @@ void validateIRInstOperand(IRValidateContext* context, IRInst* inst, IRUse* oper
                 continue;
             if (!op->getParent())
                 continue;
-            if (op->getParent()->getOp() != kIROp_Module)
+            if (op->getParent()->getOp() != kIROp_ModuleInst)
             {
                 allInGlobalScope = false;
                 break;
@@ -292,10 +292,10 @@ void validateIRInstOperands(IRInst* inst)
         return;
     switch (inst->getOp())
     {
-    case kIROp_loop:
-    case kIROp_ifElse:
-    case kIROp_unconditionalBranch:
-    case kIROp_conditionalBranch:
+    case kIROp_Loop:
+    case kIROp_IfElse:
+    case kIROp_UnconditionalBranch:
+    case kIROp_ConditionalBranch:
     case kIROp_Switch:
         return;
     default:
@@ -325,12 +325,12 @@ void validateCodeBody(IRValidateContext* context, IRGlobalValueWithCode* code)
         validate(context, terminator, block, "block must have valid terminator inst.");
         switch (terminator->getOp())
         {
-        case kIROp_conditionalBranch:
+        case kIROp_ConditionalBranch:
             validateBranchTarget(terminator, as<IRConditionalBranch>(terminator)->getTrueBlock());
             validateBranchTarget(terminator, as<IRConditionalBranch>(terminator)->getFalseBlock());
             break;
-        case kIROp_loop:
-        case kIROp_unconditionalBranch:
+        case kIROp_Loop:
+        case kIROp_UnconditionalBranch:
             validateBranchTarget(
                 terminator,
                 as<IRUnconditionalBranch>(terminator)->getTargetBlock());
-- 
cgit v1.2.3