Google Git
Sign in
android/platform/external/deqp-deps/SPIRV-Headers/272be321ad6ccb8bc7533c325a5faf5806e6c06f^!/.
commit
272be321ad6ccb8bc7533c325a5faf5806e6c06f
[log]
author
Kevin Petit <[email protected]>
Wed Jul 26 16:56:29 2023 +0100
committer
Kevin Petit <[email protected]>
Wed Jul 26 16:59:40 2023 +0100
tree
a392f63f7155d04729d9b21178e36847853007cb
parent
51b106461707f46d962554efe1bf56dee28958a3 [diff]
Add KHR suffix to Cooperative Matrix Operands

Signed-off-by: Kevin Petit <[email protected]>
Change-Id: I0303c1b16e46e77f0e7e95999c606cc75f7f0d4c

diff --git a/include/spirv/unified1/spirv.bf b/include/spirv/unified1/spirv.bf
index 4baa260..8f4b43a 100644
--- a/include/spirv/unified1/spirv.bf
+++ b/include/spirv/unified1/spirv.bf

@@ -1288,21 +1288,21 @@
 
         [AllowDuplicates, CRepr] public enum CooperativeMatrixOperandsShift
         {
-            MatrixASignedComponents = 0,
-            MatrixBSignedComponents = 1,
-            MatrixCSignedComponents = 2,
-            MatrixResultSignedComponents = 3,
-            SaturatingAccumulation = 4,
+            MatrixASignedComponentsKHR = 0,
+            MatrixBSignedComponentsKHR = 1,
+            MatrixCSignedComponentsKHR = 2,
+            MatrixResultSignedComponentsKHR = 3,
+            SaturatingAccumulationKHR = 4,
         }
 
         [AllowDuplicates, CRepr] public enum CooperativeMatrixOperandsMask
         {
             MaskNone = 0,
-            MatrixASignedComponents = 0x00000001,
-            MatrixBSignedComponents = 0x00000002,
-            MatrixCSignedComponents = 0x00000004,
-            MatrixResultSignedComponents = 0x00000008,
-            SaturatingAccumulation = 0x00000010,
+            MatrixASignedComponentsKHR = 0x00000001,
+            MatrixBSignedComponentsKHR = 0x00000002,
+            MatrixCSignedComponentsKHR = 0x00000004,
+            MatrixResultSignedComponentsKHR = 0x00000008,
+            SaturatingAccumulationKHR = 0x00000010,
         }
 
         [AllowDuplicates, CRepr] public enum CooperativeMatrixLayout

diff --git a/include/spirv/unified1/spirv.core.grammar.json b/include/spirv/unified1/spirv.core.grammar.json
index e0599cb..10ced5b 100644
--- a/include/spirv/unified1/spirv.core.grammar.json
+++ b/include/spirv/unified1/spirv.core.grammar.json

@@ -15388,37 +15388,37 @@
       "kind" : "CooperativeMatrixOperands",
       "enumerants" : [
         {
-          "enumerant" : "None",
+          "enumerant" : "NoneKHR",
           "value" : "0x0000",
           "capabilities" : [ "CooperativeMatrixKHR" ],
           "version" : "None"
         },
         {
-          "enumerant" : "MatrixASignedComponents",
+          "enumerant" : "MatrixASignedComponentsKHR",
           "value" : "0x0001",
           "capabilities" : [ "CooperativeMatrixKHR" ],
           "version" : "None"
         },
         {
-          "enumerant" : "MatrixBSignedComponents",
+          "enumerant" : "MatrixBSignedComponentsKHR",
           "value" : "0x0002",
           "capabilities" : [ "CooperativeMatrixKHR" ],
           "version" : "None"
         },
         {
-          "enumerant" : "MatrixCSignedComponents",
+          "enumerant" : "MatrixCSignedComponentsKHR",
           "value" : "0x0004",
           "capabilities" : [ "CooperativeMatrixKHR" ],
           "version" : "None"
         },
         {
-          "enumerant" : "MatrixResultSignedComponents",
+          "enumerant" : "MatrixResultSignedComponentsKHR",
           "value" : "0x0008",
           "capabilities" : [ "CooperativeMatrixKHR" ],
           "version" : "None"
         },
         {
-          "enumerant" : "SaturatingAccumulation",
+          "enumerant" : "SaturatingAccumulationKHR",
           "value" : "0x0010",
           "capabilities" : [ "CooperativeMatrixKHR" ],
           "version" : "None"

diff --git a/include/spirv/unified1/spirv.cs b/include/spirv/unified1/spirv.cs
index d8aab3a..222ac09 100644
--- a/include/spirv/unified1/spirv.cs
+++ b/include/spirv/unified1/spirv.cs

@@ -1287,21 +1287,21 @@
 
         public enum CooperativeMatrixOperandsShift
         {
-            MatrixASignedComponents = 0,
-            MatrixBSignedComponents = 1,
-            MatrixCSignedComponents = 2,
-            MatrixResultSignedComponents = 3,
-            SaturatingAccumulation = 4,
+            MatrixASignedComponentsKHR = 0,
+            MatrixBSignedComponentsKHR = 1,
+            MatrixCSignedComponentsKHR = 2,
+            MatrixResultSignedComponentsKHR = 3,
+            SaturatingAccumulationKHR = 4,
         }
 
         public enum CooperativeMatrixOperandsMask
         {
             MaskNone = 0,
-            MatrixASignedComponents = 0x00000001,
-            MatrixBSignedComponents = 0x00000002,
-            MatrixCSignedComponents = 0x00000004,
-            MatrixResultSignedComponents = 0x00000008,
-            SaturatingAccumulation = 0x00000010,
+            MatrixASignedComponentsKHR = 0x00000001,
+            MatrixBSignedComponentsKHR = 0x00000002,
+            MatrixCSignedComponentsKHR = 0x00000004,
+            MatrixResultSignedComponentsKHR = 0x00000008,
+            SaturatingAccumulationKHR = 0x00000010,
         }
 
         public enum CooperativeMatrixLayout

diff --git a/include/spirv/unified1/spirv.h b/include/spirv/unified1/spirv.h
index e719b00..bc1ef4c 100644
--- a/include/spirv/unified1/spirv.h
+++ b/include/spirv/unified1/spirv.h

@@ -1285,21 +1285,21 @@
 } SpvPackedVectorFormat;
 
 typedef enum SpvCooperativeMatrixOperandsShift_ {
-    SpvCooperativeMatrixOperandsMatrixASignedComponentsShift = 0,
-    SpvCooperativeMatrixOperandsMatrixBSignedComponentsShift = 1,
-    SpvCooperativeMatrixOperandsMatrixCSignedComponentsShift = 2,
-    SpvCooperativeMatrixOperandsMatrixResultSignedComponentsShift = 3,
-    SpvCooperativeMatrixOperandsSaturatingAccumulationShift = 4,
+    SpvCooperativeMatrixOperandsMatrixASignedComponentsKHRShift = 0,
+    SpvCooperativeMatrixOperandsMatrixBSignedComponentsKHRShift = 1,
+    SpvCooperativeMatrixOperandsMatrixCSignedComponentsKHRShift = 2,
+    SpvCooperativeMatrixOperandsMatrixResultSignedComponentsKHRShift = 3,
+    SpvCooperativeMatrixOperandsSaturatingAccumulationKHRShift = 4,
     SpvCooperativeMatrixOperandsMax = 0x7fffffff,
 } SpvCooperativeMatrixOperandsShift;
 
 typedef enum SpvCooperativeMatrixOperandsMask_ {
     SpvCooperativeMatrixOperandsMaskNone = 0,
-    SpvCooperativeMatrixOperandsMatrixASignedComponentsMask = 0x00000001,
-    SpvCooperativeMatrixOperandsMatrixBSignedComponentsMask = 0x00000002,
-    SpvCooperativeMatrixOperandsMatrixCSignedComponentsMask = 0x00000004,
-    SpvCooperativeMatrixOperandsMatrixResultSignedComponentsMask = 0x00000008,
-    SpvCooperativeMatrixOperandsSaturatingAccumulationMask = 0x00000010,
+    SpvCooperativeMatrixOperandsMatrixASignedComponentsKHRMask = 0x00000001,
+    SpvCooperativeMatrixOperandsMatrixBSignedComponentsKHRMask = 0x00000002,
+    SpvCooperativeMatrixOperandsMatrixCSignedComponentsKHRMask = 0x00000004,
+    SpvCooperativeMatrixOperandsMatrixResultSignedComponentsKHRMask = 0x00000008,
+    SpvCooperativeMatrixOperandsSaturatingAccumulationKHRMask = 0x00000010,
 } SpvCooperativeMatrixOperandsMask;
 
 typedef enum SpvCooperativeMatrixLayout_ {

diff --git a/include/spirv/unified1/spirv.hpp b/include/spirv/unified1/spirv.hpp
index 43ad062..0b9fa16 100644
--- a/include/spirv/unified1/spirv.hpp
+++ b/include/spirv/unified1/spirv.hpp

@@ -1281,21 +1281,21 @@
 };
 
 enum CooperativeMatrixOperandsShift {
-    CooperativeMatrixOperandsMatrixASignedComponentsShift = 0,
-    CooperativeMatrixOperandsMatrixBSignedComponentsShift = 1,
-    CooperativeMatrixOperandsMatrixCSignedComponentsShift = 2,
-    CooperativeMatrixOperandsMatrixResultSignedComponentsShift = 3,
-    CooperativeMatrixOperandsSaturatingAccumulationShift = 4,
+    CooperativeMatrixOperandsMatrixASignedComponentsKHRShift = 0,
+    CooperativeMatrixOperandsMatrixBSignedComponentsKHRShift = 1,
+    CooperativeMatrixOperandsMatrixCSignedComponentsKHRShift = 2,
+    CooperativeMatrixOperandsMatrixResultSignedComponentsKHRShift = 3,
+    CooperativeMatrixOperandsSaturatingAccumulationKHRShift = 4,
     CooperativeMatrixOperandsMax = 0x7fffffff,
 };
 
 enum CooperativeMatrixOperandsMask {
     CooperativeMatrixOperandsMaskNone = 0,
-    CooperativeMatrixOperandsMatrixASignedComponentsMask = 0x00000001,
-    CooperativeMatrixOperandsMatrixBSignedComponentsMask = 0x00000002,
-    CooperativeMatrixOperandsMatrixCSignedComponentsMask = 0x00000004,
-    CooperativeMatrixOperandsMatrixResultSignedComponentsMask = 0x00000008,
-    CooperativeMatrixOperandsSaturatingAccumulationMask = 0x00000010,
+    CooperativeMatrixOperandsMatrixASignedComponentsKHRMask = 0x00000001,
+    CooperativeMatrixOperandsMatrixBSignedComponentsKHRMask = 0x00000002,
+    CooperativeMatrixOperandsMatrixCSignedComponentsKHRMask = 0x00000004,
+    CooperativeMatrixOperandsMatrixResultSignedComponentsKHRMask = 0x00000008,
+    CooperativeMatrixOperandsSaturatingAccumulationKHRMask = 0x00000010,
 };
 
 enum CooperativeMatrixLayout {

diff --git a/include/spirv/unified1/spirv.hpp11 b/include/spirv/unified1/spirv.hpp11
index bdb6939..f610092 100644
--- a/include/spirv/unified1/spirv.hpp11
+++ b/include/spirv/unified1/spirv.hpp11

@@ -1281,21 +1281,21 @@
 };
 
 enum class CooperativeMatrixOperandsShift : unsigned {
-    MatrixASignedComponents = 0,
-    MatrixBSignedComponents = 1,
-    MatrixCSignedComponents = 2,
-    MatrixResultSignedComponents = 3,
-    SaturatingAccumulation = 4,
+    MatrixASignedComponentsKHR = 0,
+    MatrixBSignedComponentsKHR = 1,
+    MatrixCSignedComponentsKHR = 2,
+    MatrixResultSignedComponentsKHR = 3,
+    SaturatingAccumulationKHR = 4,
     Max = 0x7fffffff,
 };
 
 enum class CooperativeMatrixOperandsMask : unsigned {
     MaskNone = 0,
-    MatrixASignedComponents = 0x00000001,
-    MatrixBSignedComponents = 0x00000002,
-    MatrixCSignedComponents = 0x00000004,
-    MatrixResultSignedComponents = 0x00000008,
-    SaturatingAccumulation = 0x00000010,
+    MatrixASignedComponentsKHR = 0x00000001,
+    MatrixBSignedComponentsKHR = 0x00000002,
+    MatrixCSignedComponentsKHR = 0x00000004,
+    MatrixResultSignedComponentsKHR = 0x00000008,
+    SaturatingAccumulationKHR = 0x00000010,
 };
 
 enum class CooperativeMatrixLayout : unsigned {

diff --git a/include/spirv/unified1/spirv.json b/include/spirv/unified1/spirv.json
index 2d22863..8c3c424 100644
--- a/include/spirv/unified1/spirv.json
+++ b/include/spirv/unified1/spirv.json

@@ -1271,11 +1271,11 @@
                 "Type": "Bit",
                 "Values":
                 {
-                    "MatrixASignedComponents": 0,
-                    "MatrixBSignedComponents": 1,
-                    "MatrixCSignedComponents": 2,
-                    "MatrixResultSignedComponents": 3,
-                    "SaturatingAccumulation": 4
+                    "MatrixASignedComponentsKHR": 0,
+                    "MatrixBSignedComponentsKHR": 1,
+                    "MatrixCSignedComponentsKHR": 2,
+                    "MatrixResultSignedComponentsKHR": 3,
+                    "SaturatingAccumulationKHR": 4
                 }
             },
             {

diff --git a/include/spirv/unified1/spirv.lua b/include/spirv/unified1/spirv.lua
index 3ac24f2..1979b6b 100644
--- a/include/spirv/unified1/spirv.lua
+++ b/include/spirv/unified1/spirv.lua

@@ -1232,20 +1232,20 @@
     },
 
     CooperativeMatrixOperandsShift = {
-        MatrixASignedComponents = 0,
-        MatrixBSignedComponents = 1,
-        MatrixCSignedComponents = 2,
-        MatrixResultSignedComponents = 3,
-        SaturatingAccumulation = 4,
+        MatrixASignedComponentsKHR = 0,
+        MatrixBSignedComponentsKHR = 1,
+        MatrixCSignedComponentsKHR = 2,
+        MatrixResultSignedComponentsKHR = 3,
+        SaturatingAccumulationKHR = 4,
     },
 
     CooperativeMatrixOperandsMask = {
         MaskNone = 0,
-        MatrixASignedComponents = 0x00000001,
-        MatrixBSignedComponents = 0x00000002,
-        MatrixCSignedComponents = 0x00000004,
-        MatrixResultSignedComponents = 0x00000008,
-        SaturatingAccumulation = 0x00000010,
+        MatrixASignedComponentsKHR = 0x00000001,
+        MatrixBSignedComponentsKHR = 0x00000002,
+        MatrixCSignedComponentsKHR = 0x00000004,
+        MatrixResultSignedComponentsKHR = 0x00000008,
+        SaturatingAccumulationKHR = 0x00000010,
     },
 
     CooperativeMatrixLayout = {

diff --git a/include/spirv/unified1/spirv.py b/include/spirv/unified1/spirv.py
index 5540854..bdcdec1 100644
--- a/include/spirv/unified1/spirv.py
+++ b/include/spirv/unified1/spirv.py

@@ -1232,20 +1232,20 @@
     },
 
     'CooperativeMatrixOperandsShift' : {
-        'MatrixASignedComponents' : 0,
-        'MatrixBSignedComponents' : 1,
-        'MatrixCSignedComponents' : 2,
-        'MatrixResultSignedComponents' : 3,
-        'SaturatingAccumulation' : 4,
+        'MatrixASignedComponentsKHR' : 0,
+        'MatrixBSignedComponentsKHR' : 1,
+        'MatrixCSignedComponentsKHR' : 2,
+        'MatrixResultSignedComponentsKHR' : 3,
+        'SaturatingAccumulationKHR' : 4,
     },
 
     'CooperativeMatrixOperandsMask' : {
         'MaskNone' : 0,
-        'MatrixASignedComponents' : 0x00000001,
-        'MatrixBSignedComponents' : 0x00000002,
-        'MatrixCSignedComponents' : 0x00000004,
-        'MatrixResultSignedComponents' : 0x00000008,
-        'SaturatingAccumulation' : 0x00000010,
+        'MatrixASignedComponentsKHR' : 0x00000001,
+        'MatrixBSignedComponentsKHR' : 0x00000002,
+        'MatrixCSignedComponentsKHR' : 0x00000004,
+        'MatrixResultSignedComponentsKHR' : 0x00000008,
+        'SaturatingAccumulationKHR' : 0x00000010,
     },
 
     'CooperativeMatrixLayout' : {

diff --git a/include/spirv/unified1/spv.d b/include/spirv/unified1/spv.d
index 5013233..29cc69a 100644
--- a/include/spirv/unified1/spv.d
+++ b/include/spirv/unified1/spv.d

@@ -1290,21 +1290,21 @@
 
 enum CooperativeMatrixOperandsShift : uint
 {
-    MatrixASignedComponents = 0,
-    MatrixBSignedComponents = 1,
-    MatrixCSignedComponents = 2,
-    MatrixResultSignedComponents = 3,
-    SaturatingAccumulation = 4,
+    MatrixASignedComponentsKHR = 0,
+    MatrixBSignedComponentsKHR = 1,
+    MatrixCSignedComponentsKHR = 2,
+    MatrixResultSignedComponentsKHR = 3,
+    SaturatingAccumulationKHR = 4,
 }
 
 enum CooperativeMatrixOperandsMask : uint
 {
     MaskNone = 0,
-    MatrixASignedComponents = 0x00000001,
-    MatrixBSignedComponents = 0x00000002,
-    MatrixCSignedComponents = 0x00000004,
-    MatrixResultSignedComponents = 0x00000008,
-    SaturatingAccumulation = 0x00000010,
+    MatrixASignedComponentsKHR = 0x00000001,
+    MatrixBSignedComponentsKHR = 0x00000002,
+    MatrixCSignedComponentsKHR = 0x00000004,
+    MatrixResultSignedComponentsKHR = 0x00000008,
+    SaturatingAccumulationKHR = 0x00000010,
 }
 
 enum CooperativeMatrixLayout : uint