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, 31 insertions, 0 deletions

diff --git a/source/slang/slang.cpp b/source/slang/slang.cpp
index da818984b..ae008cebb 100644
--- a/source/slang/slang.cpp
+++ b/source/slang/slang.cpp
@@ -220,6 +220,9 @@ void Session::init()
     m_languagePreludes[Index(SourceLanguage::CUDA)] = get_slang_cuda_prelude();
     m_languagePreludes[Index(SourceLanguage::CPP)] = get_slang_cpp_prelude();
     m_languagePreludes[Index(SourceLanguage::HLSL)] = get_slang_hlsl_prelude();
+
+    if(!spirvCoreGrammarInfo)
+        spirvCoreGrammarInfo = SPIRVCoreGrammarInfo::getEmbeddedVersion();
 }
 
 void Session::_initCodeGenTransitionMap()
@@ -805,6 +808,34 @@ IDownstreamCompiler* Session::getDownstreamCompiler(CodeGenTarget source, CodeGe
     return getOrLoadDownstreamCompiler(compilerType, nullptr);
 }
 
+SLANG_NO_THROW SlangResult SLANG_MCALL Session::setSPIRVCoreGrammar(char const* jsonPath)
+{
+    if(!jsonPath)
+    {
+        spirvCoreGrammarInfo = SPIRVCoreGrammarInfo::getEmbeddedVersion();
+        SLANG_ASSERT(spirvCoreGrammarInfo);
+    }
+    else
+    {
+        SourceManager* sourceManager = getBuiltinSourceManager();
+        SLANG_ASSERT(sourceManager);
+        DiagnosticSink sink(sourceManager, Lexer::sourceLocationLexer);
+
+        String contents;
+        const auto readRes = File::readAllText(jsonPath, contents);
+        if(SLANG_FAILED(readRes))
+        {
+            sink.diagnose(SourceLoc{}, Diagnostics::unableToReadFile, jsonPath);
+            return readRes;
+        }
+        const auto pathInfo = PathInfo::makeFromString(jsonPath);
+        const auto sourceFile = sourceManager->createSourceFileWithString(pathInfo, contents);
+        const auto sourceView = sourceManager->createSourceView(sourceFile, nullptr, SourceLoc());
+        spirvCoreGrammarInfo = SPIRVCoreGrammarInfo::loadFromJSON(*sourceView, sink);
+    }
+    return spirvCoreGrammarInfo ? SLANG_OK : SLANG_FAIL;
+}
+
 Profile getEffectiveProfile(EntryPoint* entryPoint, TargetRequest* target)
 {
     auto entryPointProfile = entryPoint->getProfile();