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,16 +175,16 @@ 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,
+                Some(spirv_op),
                 &format!("{}_INSTRUCTION_TABLE", ext.replace(".", "_").to_uppercase()),
-                true,
             ),
         );
     }

autogen/src/table.rs

@@ -21,9 +21,10 @@ 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],
+    ext_op_name: Option<&str>,
     name: &str,
-    is_ext: bool,
 ) -> TokenStream {
+    let ext_op_name = ext_op_name.map(as_ident);
     // Vector for strings for all instructions.
     let instructions = grammar.iter().map(|inst| {
         // Vector of strings for all operands.
@@ -34,11 +35,10 @@ pub(crate) fn gen_instruction_table(
         });
         let caps = inst.capabilities.iter().map(|cap| as_ident(cap));
         let exts = &inst.extensions;
-        if is_ext {
+        if let Some(spirv_op) = &ext_op_name {
             let opname = as_ident(&inst.opname);
-            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());
@@ -48,7 +48,8 @@ pub(crate) fn gen_instruction_table(
         }
     });
     let name = as_ident(name);
-    let inst_type = as_ident(if is_ext {
+
+    let inst_type = as_ident(if ext_op_name.is_some() {
         "ExtendedInstruction"
     } else {
         "Instruction"
@@ -68,7 +69,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, None, "INSTRUCTION_TABLE");
 
     quote! {
         #[doc = "All operand kinds in the SPIR-V grammar."]