Allow bitwise or expressions and numeric literals in spirv_asm blocks (#3157)

* Add -spirv-core-grammar option to load alternate spirv defs

Also embed a version to use by default

* Use perfect hash for spv op lookup

* Neaten perfect hash embedding

* Refactor spirv grammar lookup in preperation for more kinds of lookups

* Load spirv capability list from spec

* Add all SPIR-V enums to lookup table

* regenerate vs projects

* appease msvc

* Use string slices for spir-v core grammar lookups

* wiggle

* comment

* Add OpInfo for spv ops

* regenerate vs projects

* Embed op names

* Add min/max operand counts and enum categories to spirv info

* neaten

* Operand kinds for spirv ops

* Store and embed all information relating to spirv enums and qualifiers

* Use SPIR-V spec to position instructions in spirv_asm blocks

* Neaten spir-v info embedding

* Neaten perfect hash embedding

* Add assignment syntax to spirv_asm snippets

* Better errors for spirv_asm parser

* Add warning for too many operands in spirv asm

* squash warnings

* neaten

* test wiggle

* Lookup enums for spirv

* Put OpCapability and OpExtension in the correct place for spirv_asm blocks

* Tests for OpCapability and OpExtension

* ci wiggle

* Add expected failure

* Allow raising immediate values to constant ids where necessary in spirv_asm blocks

* Allow bitwise or expressions and numeric literals in spirv_asm blocks

* test numeric literals

* Fix memory issues.

* fix.

---------

Co-authored-by: Yong He <yonghe@outlook.com>

1 files changed, 11 insertions, 5 deletions

diff --git a/source/slang/slang-lower-to-ir.cpp b/source/slang/slang-lower-to-ir.cpp
index 854485185..1b97414fb 100644
--- a/source/slang/slang-lower-to-ir.cpp
+++ b/source/slang/slang-lower-to-ir.cpp
@@ -3263,11 +3263,10 @@ struct ExprLoweringVisitorBase : ExprVisitor<Derived, LoweredValInfo>
                 {
                     if(operand.token.type == TokenType::IntegerLiteral)
                     {
-                        const auto v = getIntegerLiteralValue(operand.token);
                         // TODO: we should sign-extend these where appropriate,
                         // difficult because it requires information on usage...
                         return builder->emitSPIRVAsmOperandLiteral(
-                            builder->getIntValue(builder->getUIntType(), v));
+                            builder->getIntValue(builder->getUIntType(), operand.knownValue));
                     }
                     else if(operand.token.type == TokenType::StringLiteral)
                     {
@@ -3283,11 +3282,18 @@ struct ExprLoweringVisitorBase : ExprVisitor<Derived, LoweredValInfo>
                     return builder->emitSPIRVAsmOperandId(
                         builder->getStringValue(id));
                 }
+            case SPIRVAsmOperand::ResultMarker:
+                {
+                    return builder->emitSPIRVAsmOperandResult();
+                }
             case SPIRVAsmOperand::NamedValue:
                 {
-                    const auto id = operand.token.getContent();
-                    return builder->emitSPIRVAsmOperandEnum(
-                        builder->getStringValue(id));
+                    const auto v = operand.knownValue;
+                    const auto i = builder->getIntValue(builder->getIntType(), v);
+                    if(operand.wrapInId)
+                        return builder->emitSPIRVAsmOperandEnum(i, builder->getIntType());
+                    else
+                        return builder->emitSPIRVAsmOperandEnum(i);
                 }
             case SPIRVAsmOperand::SlangValue:
                 {