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, 13 insertions, 1 deletions

diff --git a/source/slang/slang-compiler.h b/source/slang/slang-compiler.h
index d87b755c7..6e4d7ff17 100755
--- a/source/slang/slang-compiler.h
+++ b/source/slang/slang-compiler.h
@@ -14,6 +14,8 @@
 
 #include "../compiler-core/slang-source-embed-util.h"
 
+#include "../compiler-core/slang-spirv-core-grammar.h"
+
 #include "../core/slang-std-writers.h"
 #include "../core/slang-command-options.h"
 
@@ -2995,7 +2997,9 @@ namespace Slang
             *outDownstreamTime = m_downstreamCompileTime;
             *outTotalTime = m_totalCompileTime;
         }
-        
+
+        SLANG_NO_THROW SlangResult SLANG_MCALL setSPIRVCoreGrammar(char const* jsonPath) override;
+
             /// Get the downstream compiler for a transition
         IDownstreamCompiler* getDownstreamCompiler(CodeGenTarget source, CodeGenTarget target);
         
@@ -3047,6 +3051,14 @@ namespace Slang
 
         RefPtr<SharedASTBuilder> m_sharedASTBuilder;
 
+        SPIRVCoreGrammarInfo& getSPIRVCoreGrammarInfo()
+        {
+            if(!spirvCoreGrammarInfo)
+                setSPIRVCoreGrammar(nullptr);
+            SLANG_ASSERT(spirvCoreGrammarInfo);
+            return *spirvCoreGrammarInfo;
+        }
+        RefPtr<SPIRVCoreGrammarInfo> spirvCoreGrammarInfo;
 
         //