fixup! Adds SPV_KHR_relaxed_extended_instruction

fix order
KhronosGroup · May 30, 2024 · 1cbcdf0 · 1cbcdf0
1 parent f36e30a
commit 1cbcdf0
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 18 deletions.
diff --git a/include/spirv/unified1/spirv.core.grammar.json b/include/spirv/unified1/spirv.core.grammar.json
@@ -4539,6 +4539,20 @@
       "extensions" : [ "SPV_KHR_shader_ballot" ],
       "version" : "None"
     },
+    {
+      "opname" : "OpExtInstWithForwardRefs",
+      "class"  : "Extension",
+      "opcode" : 4433,
+      "operands" : [
+        { "kind" : "IdResultType" },
+        { "kind" : "IdResult" },
+        { "kind" : "IdRef",                                     "name" : "'Set'" },
+        { "kind" : "LiteralExtInstInteger",                     "name" : "'Instruction'" },
+        { "kind" : "IdRef",                 "quantifier" : "*", "name" : "'Operand 1', +\n'Operand 2', +\n..." }
+      ],
+      "extensions" : [ "SPV_KHR_relaxed_extended_instruction" ],
+      "version": "None"
+    },
     {
       "opname" : "OpTraceRayKHR",
       "class"  : "Reserved",
@@ -4561,20 +4575,6 @@
       "extensions" : [ "SPV_KHR_ray_tracing" ],
       "version" : "None"
     },
-    {
-      "opname" : "OpExtInstWithForwardRefs",
-      "class"  : "Extension",
-      "opcode" : 4433,
-      "operands" : [
-        { "kind" : "IdResultType" },
-        { "kind" : "IdResult" },
-        { "kind" : "IdRef",                                     "name" : "'Set'" },
-        { "kind" : "LiteralExtInstInteger",                     "name" : "'Instruction'" },
-        { "kind" : "IdRef",                 "quantifier" : "*", "name" : "'Operand 1', +\n'Operand 2', +\n..." }
-      ],
-      "extensions" : [ "SPV_KHR_relaxed_extended_instruction" ],
-      "version": "None"
-    },
     {
       "opname" : "OpExecuteCallableKHR",
       "class"  : "Reserved",

diff --git a/include/spirv/unified1/spirv.h b/include/spirv/unified1/spirv.h
@@ -2177,7 +2177,6 @@ inline void SpvHasResultAndType(SpvOp opcode, bool *hasResult, bool *hasResultTy
     case SpvOpExtension: *hasResult = false; *hasResultType = false; break;
     case SpvOpExtInstImport: *hasResult = true; *hasResultType = false; break;
     case SpvOpExtInst: *hasResult = true; *hasResultType = true; break;
-    case SpvOpExtInstWithForwardRefs: *hasResult = true; *hasResultType = true; break;
     case SpvOpMemoryModel: *hasResult = false; *hasResultType = false; break;
     case SpvOpEntryPoint: *hasResult = false; *hasResultType = false; break;
     case SpvOpExecutionMode: *hasResult = false; *hasResultType = false; break;
@@ -2521,6 +2520,7 @@ inline void SpvHasResultAndType(SpvOp opcode, bool *hasResult, bool *hasResultTy
     case SpvOpSubgroupAllEqualKHR: *hasResult = true; *hasResultType = true; break;
     case SpvOpGroupNonUniformRotateKHR: *hasResult = true; *hasResultType = true; break;
     case SpvOpSubgroupReadInvocationKHR: *hasResult = true; *hasResultType = true; break;
+    case SpvOpExtInstWithForwardRefs: *hasResult = true; *hasResultType = true; break;
     case SpvOpTraceRayKHR: *hasResult = false; *hasResultType = false; break;
     case SpvOpExecuteCallableKHR: *hasResult = false; *hasResultType = false; break;
     case SpvOpConvertUToAccelerationStructureKHR: *hasResult = true; *hasResultType = true; break;
@@ -4292,6 +4292,7 @@ inline const char* SpvOpToString(SpvOp value) {
     case SpvOpSubgroupAllEqualKHR: return "OpSubgroupAllEqualKHR";
     case SpvOpGroupNonUniformRotateKHR: return "OpGroupNonUniformRotateKHR";
     case SpvOpSubgroupReadInvocationKHR: return "OpSubgroupReadInvocationKHR";
+    case SpvOpExtInstWithForwardRefs: return "OpExtInstWithForwardRefs";
     case SpvOpTraceRayKHR: return "OpTraceRayKHR";
     case SpvOpExecuteCallableKHR: return "OpExecuteCallableKHR";
     case SpvOpConvertUToAccelerationStructureKHR: return "OpConvertUToAccelerationStructureKHR";

diff --git a/include/spirv/unified1/spirv.hpp b/include/spirv/unified1/spirv.hpp
@@ -2173,7 +2173,6 @@ inline void HasResultAndType(Op opcode, bool *hasResult, bool *hasResultType) {
     case OpExtension: *hasResult = false; *hasResultType = false; break;
     case OpExtInstImport: *hasResult = true; *hasResultType = false; break;
     case OpExtInst: *hasResult = true; *hasResultType = true; break;
-    case OpExtInstWithForwardRefs: *hasResult = true; *hasResultType = true; break;
     case OpMemoryModel: *hasResult = false; *hasResultType = false; break;
     case OpEntryPoint: *hasResult = false; *hasResultType = false; break;
     case OpExecutionMode: *hasResult = false; *hasResultType = false; break;
@@ -2517,6 +2516,7 @@ inline void HasResultAndType(Op opcode, bool *hasResult, bool *hasResultType) {
     case OpSubgroupAllEqualKHR: *hasResult = true; *hasResultType = true; break;
     case OpGroupNonUniformRotateKHR: *hasResult = true; *hasResultType = true; break;
     case OpSubgroupReadInvocationKHR: *hasResult = true; *hasResultType = true; break;
+    case OpExtInstWithForwardRefs: *hasResult = true; *hasResultType = true; break;
     case OpTraceRayKHR: *hasResult = false; *hasResultType = false; break;
     case OpExecuteCallableKHR: *hasResult = false; *hasResultType = false; break;
     case OpConvertUToAccelerationStructureKHR: *hasResult = true; *hasResultType = true; break;
@@ -4288,6 +4288,7 @@ inline const char* OpToString(Op value) {
     case OpSubgroupAllEqualKHR: return "OpSubgroupAllEqualKHR";
     case OpGroupNonUniformRotateKHR: return "OpGroupNonUniformRotateKHR";
     case OpSubgroupReadInvocationKHR: return "OpSubgroupReadInvocationKHR";
+    case OpExtInstWithForwardRefs: return "OpExtInstWithForwardRefs";
     case OpTraceRayKHR: return "OpTraceRayKHR";
     case OpExecuteCallableKHR: return "OpExecuteCallableKHR";
     case OpConvertUToAccelerationStructureKHR: return "OpConvertUToAccelerationStructureKHR";

diff --git a/include/spirv/unified1/spirv.hpp11 b/include/spirv/unified1/spirv.hpp11
@@ -2173,7 +2173,6 @@ inline void HasResultAndType(Op opcode, bool *hasResult, bool *hasResultType) {
     case Op::OpExtension: *hasResult = false; *hasResultType = false; break;
     case Op::OpExtInstImport: *hasResult = true; *hasResultType = false; break;
     case Op::OpExtInst: *hasResult = true; *hasResultType = true; break;
-    case Op::OpExtInstWithForwardRefs: *hasResult = true; *hasResultType = true; break;
     case Op::OpMemoryModel: *hasResult = false; *hasResultType = false; break;
     case Op::OpEntryPoint: *hasResult = false; *hasResultType = false; break;
     case Op::OpExecutionMode: *hasResult = false; *hasResultType = false; break;
@@ -2517,6 +2516,7 @@ inline void HasResultAndType(Op opcode, bool *hasResult, bool *hasResultType) {
     case Op::OpSubgroupAllEqualKHR: *hasResult = true; *hasResultType = true; break;
     case Op::OpGroupNonUniformRotateKHR: *hasResult = true; *hasResultType = true; break;
     case Op::OpSubgroupReadInvocationKHR: *hasResult = true; *hasResultType = true; break;
+    case Op::OpExtInstWithForwardRefs: *hasResult = true; *hasResultType = true; break;
     case Op::OpTraceRayKHR: *hasResult = false; *hasResultType = false; break;
     case Op::OpExecuteCallableKHR: *hasResult = false; *hasResultType = false; break;
     case Op::OpConvertUToAccelerationStructureKHR: *hasResult = true; *hasResultType = true; break;
@@ -4288,6 +4288,7 @@ inline const char* OpToString(Op value) {
     case OpSubgroupAllEqualKHR: return "OpSubgroupAllEqualKHR";
     case OpGroupNonUniformRotateKHR: return "OpGroupNonUniformRotateKHR";
     case OpSubgroupReadInvocationKHR: return "OpSubgroupReadInvocationKHR";
+    case OpExtInstWithForwardRefs: return "OpExtInstWithForwardRefs";
     case OpTraceRayKHR: return "OpTraceRayKHR";
     case OpExecuteCallableKHR: return "OpExecuteCallableKHR";
     case OpConvertUToAccelerationStructureKHR: return "OpConvertUToAccelerationStructureKHR";

diff --git a/include/spirv/unified1/spirv.json b/include/spirv/unified1/spirv.json
@@ -1770,7 +1770,7 @@
                     "OpSubgroupAllEqualKHR": 4430,
                     "OpGroupNonUniformRotateKHR": 4431,
                     "OpSubgroupReadInvocationKHR": 4432,
-                    "OpExtInstWithForwardRefs" : 4433,
+                    "OpExtInstWithForwardRefs": 4433,
                     "OpTraceRayKHR": 4445,
                     "OpExecuteCallableKHR": 4446,
                     "OpConvertUToAccelerationStructureKHR": 4447,