Draft: Add all extinst

Author: MarijnS95

autogen/src/main.rs

@@ -129,9 +129,12 @@ fn main() {
     };
 
     let extended_instruction_sets = [
-        ("GLSL.std.450", "GLOp", "https://www.khronos.org/registry/spir-v/specs/unified1/GLSL.std.450.html"),
-        ("OpenCL.std.100", "CLOp", "https://www.khronos.org/registry/spir-v/specs/unified1/OpenCL.ExtendedInstructionSet.100.html"),
-        ("NonSemantic.DebugPrintF", "DebugPrintFOp", "https://github.com/KhronosGroup/Vulkan-ValidationLayers/blob/master/docs/debug_printf.md"),
+        ("GLSL.std.450", "GLOp", "https://registry.khronos.org/SPIR-V/specs/unified1/GLSL.std.450.html"),
+        ("OpenCL.std.100", "CLOp", "https://registry.khronos.org/SPIR-V/specs/unified1/OpenCL.ExtendedInstructionSet.100.html"),
+        ("OpenCL.debuginfo.100", "CLDebugInfoOp", "https://registry.khronos.org/SPIR-V/specs/unified1/OpenCL.DebugInfo.100.html"),
+        ("NonSemantic.DebugPrintF", "DebugPrintFOp", "https://github.khronos.org/SPIRV-Registry/nonsemantic/NonSemantic.DebugPrintf.html"),
+        ("NonSemantic.DebugBreak", "DebugBreakOp", "https://github.khronos.org/SPIRV-Registry/nonsemantic/NonSemantic.DebugBreak.html"),
+        ("DebugInfo", "DebugInfoOp", "https://registry.khronos.org/SPIR-V/specs/unified1/DebugInfo.html"),
     ];
     let extended_instruction_sets = extended_instruction_sets.map(|(ext, op, url)| {
         let grammar: structs::ExtInstSetGrammar = serde_json::from_str(
@@ -172,14 +175,15 @@ fn main() {
         table::gen_grammar_inst_table_operand_kinds(&grammar),
     );
     // Extended instruction sets
-    for (ext, _, _, grammar) in extended_instruction_sets {
+    for (ext, spirv_op, _, grammar) in extended_instruction_sets {
         write_formatted(
             &autogen_src_dir.join(format!(
                 "../rspirv/grammar/autogen_{}.rs",
                 ext.replace(".", "_").to_lowercase()
             )),
             table::gen_instruction_table(
                 &grammar.instructions,
+                spirv_op,
                 &format!("{}_INSTRUCTION_TABLE", ext.replace(".", "_").to_uppercase()),
                 true,
             ),

autogen/src/table.rs

@@ -21,9 +21,11 @@ fn convert_quantifier(quantifier: structs::Quantifier) -> Ident {
 /// `is_ext` indicates whether the grammar is for an extended instruction set.
 pub(crate) fn gen_instruction_table(
     grammar: &[structs::Instruction],
+    spirv_op: &str,
     name: &str,
     is_ext: bool,
 ) -> TokenStream {
+    let spirv_op = as_ident(spirv_op);
     // Vector for strings for all instructions.
     let instructions = grammar.iter().map(|inst| {
         // Vector of strings for all operands.
@@ -36,9 +38,9 @@ pub(crate) fn gen_instruction_table(
         let exts = &inst.extensions;
         if is_ext {
             let opname = as_ident(&inst.opname);
-            let opcode = inst.opcode;
+            // let opcode = inst.opcode;
             quote! {
-                ext_inst!(#opname, #opcode, [#(#caps),*], [#(#exts),*], [#(#operands),*])
+                ext_inst!(#spirv_op, #opname, [#(#caps),*], [#(#exts),*], [#(#operands),*])
             }
         } else {
             let opname = as_ident(inst.opname.strip_prefix("Op").unwrap());
@@ -68,7 +70,7 @@ pub fn gen_grammar_inst_table_operand_kinds(grammar: &structs::Grammar) -> Token
         .map(|kind| as_ident(&kind.kind));
 
     // Instruction table.
-    let table = gen_instruction_table(&grammar.instructions, "INSTRUCTION_TABLE", false);
+    let table = gen_instruction_table(&grammar.instructions, "WIE", "INSTRUCTION_TABLE", false);
 
     quote! {
         #[doc = "All operand kinds in the SPIR-V grammar."]