From 5900f32fff9970b4221ce7fb7e94133e387ff9de Mon Sep 17 00:00:00 2001 From: Tim Foley Date: Thu, 31 Aug 2017 12:47:39 -0700 Subject: Continue work on IR-based codegen This gets us far enough that we can convert a single test case to use the IR, under the new `-use-ir` flag. Getting this merged into mainline will at least ensure that we keep the IR path working in a minimal fashion, even when we have to add functionality the existing AST-based path There is definitely some clutter here from keeping both IR-based and AST-based translation around, but I don't want to have a long-lived branch for the IR that gets further and further away from the `master` branch that is actually getting used and tested. Summary of changes: - Add pointer types and basic `load` operation to be able to handle variable declarations - Add basic `call` instruction type - Add simple address math for field reference in l-value - Always add IR for referenced decls to global scope - Add notion of "intrinsic" type modifier, which maps a type declaration directly to an IR opcode (plus optional literal operands to handle things like texture/sampler flavor) - Improve printing of IR instructions, types, operands - Add constant-buffer type to IR - Allow any instruction to be detected as "should be folded into use sites" and use this to tag things of constant-buffer type - Also add logic for implicit base on member expressions, to handle references to `cbuffer` members - Add connection back to original decl to IR variables (including global shader parameters...) - Use reflection name instead of true name when emitting HLSL from IR (so that we can match HLSL output) - Make IR include decorations for type layout - Re-use existing emit logic for HLSL semantics to output `register` semantics for IR-based code - Make IR-based codegen be an option we can enable from the command line - It still isn't on by default (it can barely manage a trivial shader), but it seems better to enable it always instead of putting it under an `#ifdef` - Fix up how we check for intrinsic operations suring AST-based cross compilation so that adding new intrinsic ops for the IR won't break codegen. --- source/slang/modifier-defs.h | 14 ++++++++++++++ 1 file changed, 14 insertions(+) (limited to 'source/slang/modifier-defs.h') diff --git a/source/slang/modifier-defs.h b/source/slang/modifier-defs.h index 597d59d9a..d7d0391e4 100644 --- a/source/slang/modifier-defs.h +++ b/source/slang/modifier-defs.h @@ -209,6 +209,20 @@ SYNTAX_CLASS(MagicTypeModifier, Modifier) FIELD(uint32_t, tag) END_SYNTAX_CLASS() +// A modifier applied to declarations of builtin types to indicate how they +// should be lowered to the IR. +// +// TODO: This should really subsume `BuiltinTypeModifier` and +// `MagicTypeModifier` so that we don't have to apply all of them. +SYNTAX_CLASS(IntrinsicTypeModifier, Modifier) + // The IR opcode to use when constructing a type + FIELD(uint32_t, irOp) + + // Additional literal opreands to provide when creating instances. + // (e.g., for a texture type this passes in shape/mutability info) + FIELD(List, irOperands) +END_SYNTAX_CLASS() + // Modifiers that affect the storage layout for matrices SIMPLE_SYNTAX_CLASS(MatrixLayoutModifier, Modifier) -- cgit v1.2.3