extend fiddle to allow custom lua splices in more places

docs/design/autodiff/ir-overview.md

@@ -393,7 +393,7 @@ OpModule
         {
             [OpPrimalInstDecoration]
             %a_primal = OpDifferentialPairGetPrimal %dpa : %dpfloat 
-            [OpPrimalInstDecorarion]
+            [OpPrimalInstDecoration]
             %b_primal = OpDifferentialPairGetPrimal %dpa : %dpfloat 
 
             [OpPrimalInstDecoration]
@@ -414,7 +414,7 @@ OpModule
         {
             [OpDifferentialInstDecoration]
             %a_diff = OpDifferentialPairGetDifferential %dpa : %dpfloat 
-            [OpDifferentialInstDecorarion]
+            [OpDifferentialInstDecoration]
             %b_diff = OpDifferentialPairGetDifferential %dpa : %dpfloat 
 
             [OpDifferentialInstDecoration]

source/slang/CMakeLists.txt

@@ -5,30 +5,36 @@
 set(SLANG_FIDDLE_INPUT_DIR "${CMAKE_CURRENT_SOURCE_DIR}")
 set(SLANG_FIDDLE_OUTPUT_DIR "${CMAKE_CURRENT_BINARY_DIR}/fiddle")
 
-file(GLOB SLANG_FIDDLE_INPUT_FILE_NAMES
+file(
+    GLOB SLANG_FIDDLE_INPUT_FILE_NAMES
     CONFIGURE_DEPENDS
     RELATIVE "${SLANG_FIDDLE_INPUT_DIR}"
     "*.h"
-    "*.cpp")
+    "*.cpp"
+)
 
-list(TRANSFORM SLANG_FIDDLE_INPUT_FILE_NAMES
+list(
+    TRANSFORM SLANG_FIDDLE_INPUT_FILE_NAMES
     PREPEND "${SLANG_FIDDLE_INPUT_DIR}/"
-    OUTPUT_VARIABLE SLANG_FIDDLE_INPUTS)
+    OUTPUT_VARIABLE SLANG_FIDDLE_INPUTS
+)
+glob_append(SLANG_FIDDLE_LUA_INPUTS "*.lua")
 
-list(TRANSFORM SLANG_FIDDLE_INPUT_FILE_NAMES
+list(
+    TRANSFORM SLANG_FIDDLE_INPUT_FILE_NAMES
     APPEND ".fiddle"
-    OUTPUT_VARIABLE SLANG_FIDDLE_OUTPUTS)
-list(TRANSFORM SLANG_FIDDLE_OUTPUTS
-    PREPEND "${SLANG_FIDDLE_OUTPUT_DIR}/")
+    OUTPUT_VARIABLE SLANG_FIDDLE_OUTPUTS
+)
+list(TRANSFORM SLANG_FIDDLE_OUTPUTS PREPEND "${SLANG_FIDDLE_OUTPUT_DIR}/")
 
 add_custom_command(
     OUTPUT ${SLANG_FIDDLE_OUTPUTS}
     COMMAND ${CMAKE_COMMAND} -E make_directory ${SLANG_FIDDLE_OUTPUT_DIR}
-    COMMAND slang-fiddle
-        -i "${SLANG_FIDDLE_INPUT_DIR}/"
-        -o "${SLANG_FIDDLE_OUTPUT_DIR}/"
-        ${SLANG_FIDDLE_INPUT_FILE_NAMES}
-    DEPENDS ${SLANG_FIDDLE_INPUTS} slang-fiddle
+    COMMAND
+        slang-fiddle -i "${SLANG_FIDDLE_INPUT_DIR}/" -o
+        "${SLANG_FIDDLE_OUTPUT_DIR}/" ${SLANG_FIDDLE_INPUT_FILE_NAMES}
+    DEPENDS ${SLANG_FIDDLE_INPUTS} ${SLANG_FIDDLE_LUA_INPUTS} slang-fiddle
+    WORKING_DIRECTORY ${slang_SOURCE_DIR}
     VERBATIM
 )
 add_library(
@@ -100,7 +106,11 @@ slang_add_target(
 # generated lookup tables
 #
 
-get_target_property(SLANG_SPIRV_HEADERS_INCLUDE_DIR SPIRV-Headers::SPIRV-Headers INTERFACE_INCLUDE_DIRECTORIES)
+get_target_property(
+    SLANG_SPIRV_HEADERS_INCLUDE_DIR
+    SPIRV-Headers::SPIRV-Headers
+    INTERFACE_INCLUDE_DIRECTORIES
+)
 
 set(SLANG_LOOKUP_GENERATOR_INPUT_JSON
     "${SLANG_SPIRV_HEADERS_INCLUDE_DIR}/spirv/unified1/extinst.glsl.std.450.grammar.json"

source/slang/core.meta.slang

@@ -1796,7 +1796,7 @@ struct NativeString
     property int length { [__unsafeForceInlineEarly] get{return getLength();} }
 
     __implicit_conversion($(kConversionCost_None))
-    __intrinsic_op($(kIROp_getNativeStr))
+    __intrinsic_op($(kIROp_GetNativeStr))
     __init(String value);
 
     __init() { this = NativeString(""); }
@@ -3358,7 +3358,7 @@ __prefix T operator ~(T v0);
 // IR level type traits.
 
 __generic<T>
-__intrinsic_op($(kIROp_undefined))
+__intrinsic_op($(kIROp_Undefined))
 T __declVal();
 
 __generic<T>

source/slang/slang-ast-base.h

@@ -2,11 +2,13 @@
 
 #pragma once
 
-#include "slang-ast-base.h.fiddle"
 #include "slang-ast-forward-declarations.h"
 #include "slang-ast-support-types.h"
 #include "slang-capability.h"
 
+//
+#include "slang-ast-base.h.fiddle"
+
 // This file defines the primary base classes for the hierarchy of
 // AST nodes and related objects. For example, this is where the
 // basic `Decl`, `Stmt`, `Expr`, `type`, etc. definitions come from.

source/slang/slang-ast-decl.h

@@ -3,9 +3,11 @@
 #pragma once
 
 #include "slang-ast-base.h"
-#include "slang-ast-decl.h.fiddle"
 #include "slang-fossil.h"
 
+//
+#include "slang-ast-decl.h.fiddle"
+
 FIDDLE()
 namespace Slang
 {
@@ -962,7 +964,8 @@ class SyntaxDecl : public Decl
 {
     FIDDLE(...)
     // What type of syntax node will be produced when parsing with this keyword?
-    FIDDLE() SyntaxClass<NodeBase> syntaxClass;
+    FIDDLE()
+    SyntaxClass<NodeBase> syntaxClass;
 
     // Callback to invoke in order to parse syntax with this keyword.
     SyntaxParseCallback parseCallback = nullptr;

source/slang/slang-ast-modifier.h

@@ -3,6 +3,7 @@
 
 #include "slang-ast-base.h"
 #include "slang-ast-modifier.h.fiddle"
+#include "slang-ir-insts-enum.h"
 
 FIDDLE()
 namespace Slang

source/slang/slang-ast-support-types.h

@@ -1,20 +1,21 @@
-#ifndef SLANG_AST_SUPPORT_TYPES_H
-#define SLANG_AST_SUPPORT_TYPES_H
+#pragma once
 
 #include "../compiler-core/slang-doc-extractor.h"
 #include "../compiler-core/slang-lexer.h"
 #include "../compiler-core/slang-name.h"
 #include "../core/slang-basic.h"
 #include "../core/slang-semantic-version.h"
 #include "slang-ast-forward-declarations.h"
-#include "slang-ast-support-types.h.fiddle"
 #include "slang-profile.h"
 #include "slang-type-system-shared.h"
 #include "slang.h"
 
 #include <assert.h>
 #include <type_traits>
 
+//
+#include "slang-ast-support-types.h.fiddle"
+
 FIDDLE(hidden class RefObject;)
 
 FIDDLE() namespace Slang
@@ -1731,5 +1732,3 @@ FIDDLE() namespace Slang
     };
 
 } // namespace Slang
-
-#endif

source/slang/slang-ast-type.h

@@ -2,6 +2,9 @@
 #pragma once
 
 #include "slang-ast-base.h"
+#include "slang-ast-decl.h"
+
+//
 #include "slang-ast-type.h.fiddle"
 
 FIDDLE()

source/slang/slang-emit-c-like.cpp

@@ -613,7 +613,7 @@ void CLikeSourceEmitter::defaultEmitInstStmt(IRInst* inst)
             m_writer->emit(");\n");
         }
         break;
-    case kIROp_discard:
+    case kIROp_Discard:
         m_writer->emit("discard;\n");
         break;
     default:
@@ -1471,7 +1471,7 @@ bool CLikeSourceEmitter::shouldFoldInstIntoUseSites(IRInst* inst)
     case kIROp_FieldAddress:
     case kIROp_GetElementPtr:
     case kIROp_Specialize:
-    case kIROp_LookupWitness:
+    case kIROp_LookupWitnessMethod:
     case kIROp_GetValueFromBoundInterface:
         return true;
 
@@ -1502,7 +1502,7 @@ bool CLikeSourceEmitter::shouldFoldInstIntoUseSites(IRInst* inst)
     //
     case kIROp_MakeStruct:
     case kIROp_MakeArray:
-    case kIROp_swizzleSet:
+    case kIROp_SwizzleSet:
     case kIROp_MakeArrayFromElement:
     case kIROp_MakeCoopVector:
 
@@ -1679,7 +1679,7 @@ bool CLikeSourceEmitter::shouldFoldInstIntoUseSites(IRInst* inst)
     // for GLSL), so we check this only after all those special cases are
     // considered.
     //
-    if (inst->getOp() == kIROp_undefined)
+    if (inst->getOp() == kIROp_Undefined)
         return false;
 
     // Okay, at this point we know our instruction must have a single use.
@@ -2244,7 +2244,7 @@ void CLikeSourceEmitter::emitCallExpr(IRCall* inst, EmitOpInfo outerPrec)
     handleRequiredCapabilities(funcValue);
 
     // Detect if this is a call into a COM interface method.
-    if (funcValue->getOp() == kIROp_LookupWitness)
+    if (funcValue->getOp() == kIROp_LookupWitnessMethod)
     {
         auto operand0Type = funcValue->getOperand(0)->getDataType();
         switch (operand0Type->getOp())
@@ -2388,7 +2388,7 @@ void CLikeSourceEmitter::defaultEmitInstExpr(IRInst* inst, const EmitOpInfo& inO
     case kIROp_RTTIPointerType:
         break;
 
-    case kIROp_undefined:
+    case kIROp_Undefined:
     case kIROp_DefaultConstruct:
         m_writer->emit(getName(inst));
         break;
@@ -2710,7 +2710,7 @@ void CLikeSourceEmitter::defaultEmitInstExpr(IRInst* inst, const EmitOpInfo& inO
             getInfo(EmitOp::General)); // Directly emit NonUniformResourceIndex Operand0;
         break;
 
-    case kIROp_getNativeStr:
+    case kIROp_GetNativeStr:
         {
             auto prec = getInfo(EmitOp::Postfix);
             needClose = maybeEmitParens(outerPrec, prec);
@@ -2828,7 +2828,7 @@ void CLikeSourceEmitter::defaultEmitInstExpr(IRInst* inst, const EmitOpInfo& inO
         }
         break;
 
-    case kIROp_swizzle:
+    case kIROp_Swizzle:
         {
             auto prec = getInfo(EmitOp::Postfix);
             needClose = maybeEmitParens(outerPrec, prec);
@@ -3242,7 +3242,7 @@ void CLikeSourceEmitter::_emitInst(IRInst* inst)
     case kIROp_LiveRangeEnd:
         emitLiveness(inst);
         break;
-    case kIROp_undefined:
+    case kIROp_Undefined:
     case kIROp_DefaultConstruct:
         {
             auto type = inst->getDataType();
@@ -3285,11 +3285,11 @@ void CLikeSourceEmitter::_emitInst(IRInst* inst)
         m_writer->emit(";\n");
         break;
 
-    case kIROp_discard:
+    case kIROp_Discard:
         emitInstStmt(inst);
         break;
 
-    case kIROp_swizzleSet:
+    case kIROp_SwizzleSet:
         {
             auto ii = (IRSwizzleSet*)inst;
             emitInstResultDecl(inst);
@@ -3606,7 +3606,7 @@ void CLikeSourceEmitter::emitRegion(Region* inRegion)
                     break;
 
                 case kIROp_Return:
-                case kIROp_discard:
+                case kIROp_Discard:
                     // For extremely simple terminators, we just handle
                     // them here, so that we don't have to allocate
                     // separate `Region`s for them.
@@ -4804,7 +4804,7 @@ void CLikeSourceEmitter::_emitInstAsVarInitializerImpl(IRInst* inst)
 
 bool _isFoldableValue(IRInst* val)
 {
-    if (val->getParent() && val->getParent()->getOp() == kIROp_Module)
+    if (val->getParent() && val->getParent()->getOp() == kIROp_ModuleInst)
         return true;
 
     switch (val->getOp())
@@ -5148,7 +5148,7 @@ void CLikeSourceEmitter::ensureInstOperandsRec(ComputeEmitActionsContext* ctx, I
     case kIROp_NativePtrType:
         requiredLevel = EmitAction::ForwardDeclaration;
         break;
-    case kIROp_LookupWitness:
+    case kIROp_LookupWitnessMethod:
     case kIROp_FieldExtract:
     case kIROp_FieldAddress:
         {

source/slang/slang-emit-cpp.cpp

@@ -1561,7 +1561,7 @@ bool CPPSourceEmitter::tryEmitInstExprImpl(IRInst* inst, const EmitOpInfo& inOut
             m_writer->emit("])");
             return true;
         }
-    case kIROp_swizzle:
+    case kIROp_Swizzle:
         {
             // For C++ we don't need to emit a swizzle function
             // For C we need a construction function
@@ -1677,7 +1677,7 @@ bool CPPSourceEmitter::tryEmitInstExprImpl(IRInst* inst, const EmitOpInfo& inOut
             // try doing automatically
             return false;
         }
-    case kIROp_LookupWitness:
+    case kIROp_LookupWitnessMethod:
         {
             emitInstExpr(inst->getOperand(0), inOuterPrec);
             m_writer->emit("->");
@@ -1697,7 +1697,7 @@ bool CPPSourceEmitter::tryEmitInstExprImpl(IRInst* inst, const EmitOpInfo& inOut
             m_writer->emit(")");
             return true;
         }
-    case kIROp_GetAddr:
+    case kIROp_GetAddress:
         {
             // Once we clean up the pointer emitting logic, we can
             // just use GetElementAddress instruction in place of

source/slang/slang-emit-metal.cpp

@@ -409,7 +409,7 @@ bool MetalSourceEmitter::tryEmitInstStmtImpl(IRInst* inst)
     };
     switch (inst->getOp())
     {
-    case kIROp_discard:
+    case kIROp_Discard:
         m_writer->emit("discard_fragment();\n");
         return true;
     case kIROp_MetalAtomicCast: