From 508dc3a95de50de4a4d07d0a72a18e40d55b0e2e Mon Sep 17 00:00:00 2001 From: Ellie Hermaszewska Date: Tue, 29 Aug 2023 06:05:26 +0800 Subject: 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 --- source/slang/slang-options.cpp | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) (limited to 'source/slang/slang-options.cpp') diff --git a/source/slang/slang-options.cpp b/source/slang/slang-options.cpp index 5d3f7e015..545f222de 100644 --- a/source/slang/slang-options.cpp +++ b/source/slang/slang-options.cpp @@ -102,6 +102,7 @@ enum class OptionKind EmitSpirvViaGLSL, EmitSpirvDirectly, + SPIRVCoreGrammarJSON, // Downstream @@ -518,6 +519,8 @@ void initCommandOptions(CommandOptions& options) "Generate SPIR-V output by compiling generated GLSL with glslang (default)" }, { OptionKind::EmitSpirvDirectly, "-emit-spirv-directly", nullptr, "Generate SPIR-V output direclty rather than by compiling generated GLSL with glslang" }, + { OptionKind::SPIRVCoreGrammarJSON, "-spirv-core-grammar", nullptr, + "A path to a specific spirv.core.grammar.json to use when generating SPIR-V output" }, #endif }; @@ -889,6 +892,8 @@ struct OptionsParser slang::CompileStdLibFlags m_compileStdLibFlags = 0; bool m_hasLoadedRepro = false; + String m_spirvCoreGrammarJSONPath; + CommandLineReader m_reader; CommandOptionsWriter::Style m_helpStyle = CommandOptionsWriter::Style::Text; @@ -2300,6 +2305,13 @@ SlangResult OptionsParser::_parse( getCurrentTarget()->targetFlags |= SLANG_TARGET_FLAG_GENERATE_SPIRV_DIRECTLY; } break; + case OptionKind::SPIRVCoreGrammarJSON: + { + CommandLineArg path; + SLANG_RETURN_ON_FAIL(m_reader.expectArg(path)); + m_spirvCoreGrammarJSONPath = path.value; + } + break; case OptionKind::DefaultDownstreamCompiler: { @@ -2843,6 +2855,11 @@ SlangResult OptionsParser::_parse( m_compileRequest->setMatrixLayoutMode(m_defaultMatrixLayoutMode); } + if(m_spirvCoreGrammarJSONPath.getLength()) + { + m_session->setSPIRVCoreGrammar(m_spirvCoreGrammarJSONPath.getBuffer()); + } + // Next we need to sort out the output files specified with `-o`, and // figure out which entry point and/or target they apply to. // -- cgit v1.2.3