Skip to content

Commit 272be32

Browse files
kpetkpet
committed
Add KHR suffix to Cooperative Matrix Operands
Signed-off-by: Kevin Petit <[email protected]> Change-Id: I0303c1b16e46e77f0e7e95999c606cc75f7f0d4c
1 parent 51b1064 commit 272be32

File tree

10 files changed

+91
-91
lines changed

10 files changed

+91
-91
lines changed

‎include/spirv/unified1/spirv.bf

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1288,21 +1288,21 @@ namespace Spv
12881288

12891289
[AllowDuplicates, CRepr] public enum CooperativeMatrixOperandsShift
12901290
{
1291-
MatrixASignedComponents = 0,
1292-
MatrixBSignedComponents = 1,
1293-
MatrixCSignedComponents = 2,
1294-
MatrixResultSignedComponents = 3,
1295-
SaturatingAccumulation = 4,
1291+
MatrixASignedComponentsKHR = 0,
1292+
MatrixBSignedComponentsKHR = 1,
1293+
MatrixCSignedComponentsKHR = 2,
1294+
MatrixResultSignedComponentsKHR = 3,
1295+
SaturatingAccumulationKHR = 4,
12961296
}
12971297

12981298
[AllowDuplicates, CRepr] public enum CooperativeMatrixOperandsMask
12991299
{
13001300
MaskNone = 0,
1301-
MatrixASignedComponents = 0x00000001,
1302-
MatrixBSignedComponents = 0x00000002,
1303-
MatrixCSignedComponents = 0x00000004,
1304-
MatrixResultSignedComponents = 0x00000008,
1305-
SaturatingAccumulation = 0x00000010,
1301+
MatrixASignedComponentsKHR = 0x00000001,
1302+
MatrixBSignedComponentsKHR = 0x00000002,
1303+
MatrixCSignedComponentsKHR = 0x00000004,
1304+
MatrixResultSignedComponentsKHR = 0x00000008,
1305+
SaturatingAccumulationKHR = 0x00000010,
13061306
}
13071307

13081308
[AllowDuplicates, CRepr] public enum CooperativeMatrixLayout

‎include/spirv/unified1/spirv.core.grammar.json

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15388,37 +15388,37 @@
1538815388
"kind" : "CooperativeMatrixOperands",
1538915389
"enumerants" : [
1539015390
{
15391-
"enumerant" : "None",
15391+
"enumerant" : "NoneKHR",
1539215392
"value" : "0x0000",
1539315393
"capabilities" : [ "CooperativeMatrixKHR" ],
1539415394
"version" : "None"
1539515395
},
1539615396
{
15397-
"enumerant" : "MatrixASignedComponents",
15397+
"enumerant" : "MatrixASignedComponentsKHR",
1539815398
"value" : "0x0001",
1539915399
"capabilities" : [ "CooperativeMatrixKHR" ],
1540015400
"version" : "None"
1540115401
},
1540215402
{
15403-
"enumerant" : "MatrixBSignedComponents",
15403+
"enumerant" : "MatrixBSignedComponentsKHR",
1540415404
"value" : "0x0002",
1540515405
"capabilities" : [ "CooperativeMatrixKHR" ],
1540615406
"version" : "None"
1540715407
},
1540815408
{
15409-
"enumerant" : "MatrixCSignedComponents",
15409+
"enumerant" : "MatrixCSignedComponentsKHR",
1541015410
"value" : "0x0004",
1541115411
"capabilities" : [ "CooperativeMatrixKHR" ],
1541215412
"version" : "None"
1541315413
},
1541415414
{
15415-
"enumerant" : "MatrixResultSignedComponents",
15415+
"enumerant" : "MatrixResultSignedComponentsKHR",
1541615416
"value" : "0x0008",
1541715417
"capabilities" : [ "CooperativeMatrixKHR" ],
1541815418
"version" : "None"
1541915419
},
1542015420
{
15421-
"enumerant" : "SaturatingAccumulation",
15421+
"enumerant" : "SaturatingAccumulationKHR",
1542215422
"value" : "0x0010",
1542315423
"capabilities" : [ "CooperativeMatrixKHR" ],
1542415424
"version" : "None"

‎include/spirv/unified1/spirv.cs

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1287,21 +1287,21 @@ public enum PackedVectorFormat
12871287

12881288
public enum CooperativeMatrixOperandsShift
12891289
{
1290-
MatrixASignedComponents = 0,
1291-
MatrixBSignedComponents = 1,
1292-
MatrixCSignedComponents = 2,
1293-
MatrixResultSignedComponents = 3,
1294-
SaturatingAccumulation = 4,
1290+
MatrixASignedComponentsKHR = 0,
1291+
MatrixBSignedComponentsKHR = 1,
1292+
MatrixCSignedComponentsKHR = 2,
1293+
MatrixResultSignedComponentsKHR = 3,
1294+
SaturatingAccumulationKHR = 4,
12951295
}
12961296

12971297
public enum CooperativeMatrixOperandsMask
12981298
{
12991299
MaskNone = 0,
1300-
MatrixASignedComponents = 0x00000001,
1301-
MatrixBSignedComponents = 0x00000002,
1302-
MatrixCSignedComponents = 0x00000004,
1303-
MatrixResultSignedComponents = 0x00000008,
1304-
SaturatingAccumulation = 0x00000010,
1300+
MatrixASignedComponentsKHR = 0x00000001,
1301+
MatrixBSignedComponentsKHR = 0x00000002,
1302+
MatrixCSignedComponentsKHR = 0x00000004,
1303+
MatrixResultSignedComponentsKHR = 0x00000008,
1304+
SaturatingAccumulationKHR = 0x00000010,
13051305
}
13061306

13071307
public enum CooperativeMatrixLayout

‎include/spirv/unified1/spirv.h

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1285,21 +1285,21 @@ typedef enum SpvPackedVectorFormat_ {
12851285
} SpvPackedVectorFormat;
12861286

12871287
typedef enum SpvCooperativeMatrixOperandsShift_ {
1288-
SpvCooperativeMatrixOperandsMatrixASignedComponentsShift = 0,
1289-
SpvCooperativeMatrixOperandsMatrixBSignedComponentsShift = 1,
1290-
SpvCooperativeMatrixOperandsMatrixCSignedComponentsShift = 2,
1291-
SpvCooperativeMatrixOperandsMatrixResultSignedComponentsShift = 3,
1292-
SpvCooperativeMatrixOperandsSaturatingAccumulationShift = 4,
1288+
SpvCooperativeMatrixOperandsMatrixASignedComponentsKHRShift = 0,
1289+
SpvCooperativeMatrixOperandsMatrixBSignedComponentsKHRShift = 1,
1290+
SpvCooperativeMatrixOperandsMatrixCSignedComponentsKHRShift = 2,
1291+
SpvCooperativeMatrixOperandsMatrixResultSignedComponentsKHRShift = 3,
1292+
SpvCooperativeMatrixOperandsSaturatingAccumulationKHRShift = 4,
12931293
SpvCooperativeMatrixOperandsMax = 0x7fffffff,
12941294
} SpvCooperativeMatrixOperandsShift;
12951295

12961296
typedef enum SpvCooperativeMatrixOperandsMask_ {
12971297
SpvCooperativeMatrixOperandsMaskNone = 0,
1298-
SpvCooperativeMatrixOperandsMatrixASignedComponentsMask = 0x00000001,
1299-
SpvCooperativeMatrixOperandsMatrixBSignedComponentsMask = 0x00000002,
1300-
SpvCooperativeMatrixOperandsMatrixCSignedComponentsMask = 0x00000004,
1301-
SpvCooperativeMatrixOperandsMatrixResultSignedComponentsMask = 0x00000008,
1302-
SpvCooperativeMatrixOperandsSaturatingAccumulationMask = 0x00000010,
1298+
SpvCooperativeMatrixOperandsMatrixASignedComponentsKHRMask = 0x00000001,
1299+
SpvCooperativeMatrixOperandsMatrixBSignedComponentsKHRMask = 0x00000002,
1300+
SpvCooperativeMatrixOperandsMatrixCSignedComponentsKHRMask = 0x00000004,
1301+
SpvCooperativeMatrixOperandsMatrixResultSignedComponentsKHRMask = 0x00000008,
1302+
SpvCooperativeMatrixOperandsSaturatingAccumulationKHRMask = 0x00000010,
13031303
} SpvCooperativeMatrixOperandsMask;
13041304

13051305
typedef enum SpvCooperativeMatrixLayout_ {

‎include/spirv/unified1/spirv.hpp

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1281,21 +1281,21 @@ enum PackedVectorFormat {
12811281
};
12821282

12831283
enum CooperativeMatrixOperandsShift {
1284-
CooperativeMatrixOperandsMatrixASignedComponentsShift = 0,
1285-
CooperativeMatrixOperandsMatrixBSignedComponentsShift = 1,
1286-
CooperativeMatrixOperandsMatrixCSignedComponentsShift = 2,
1287-
CooperativeMatrixOperandsMatrixResultSignedComponentsShift = 3,
1288-
CooperativeMatrixOperandsSaturatingAccumulationShift = 4,
1284+
CooperativeMatrixOperandsMatrixASignedComponentsKHRShift = 0,
1285+
CooperativeMatrixOperandsMatrixBSignedComponentsKHRShift = 1,
1286+
CooperativeMatrixOperandsMatrixCSignedComponentsKHRShift = 2,
1287+
CooperativeMatrixOperandsMatrixResultSignedComponentsKHRShift = 3,
1288+
CooperativeMatrixOperandsSaturatingAccumulationKHRShift = 4,
12891289
CooperativeMatrixOperandsMax = 0x7fffffff,
12901290
};
12911291

12921292
enum CooperativeMatrixOperandsMask {
12931293
CooperativeMatrixOperandsMaskNone = 0,
1294-
CooperativeMatrixOperandsMatrixASignedComponentsMask = 0x00000001,
1295-
CooperativeMatrixOperandsMatrixBSignedComponentsMask = 0x00000002,
1296-
CooperativeMatrixOperandsMatrixCSignedComponentsMask = 0x00000004,
1297-
CooperativeMatrixOperandsMatrixResultSignedComponentsMask = 0x00000008,
1298-
CooperativeMatrixOperandsSaturatingAccumulationMask = 0x00000010,
1294+
CooperativeMatrixOperandsMatrixASignedComponentsKHRMask = 0x00000001,
1295+
CooperativeMatrixOperandsMatrixBSignedComponentsKHRMask = 0x00000002,
1296+
CooperativeMatrixOperandsMatrixCSignedComponentsKHRMask = 0x00000004,
1297+
CooperativeMatrixOperandsMatrixResultSignedComponentsKHRMask = 0x00000008,
1298+
CooperativeMatrixOperandsSaturatingAccumulationKHRMask = 0x00000010,
12991299
};
13001300

13011301
enum CooperativeMatrixLayout {

‎include/spirv/unified1/spirv.hpp11

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1281,21 +1281,21 @@ enum class PackedVectorFormat : unsigned {
12811281
};
12821282

12831283
enum class CooperativeMatrixOperandsShift : unsigned {
1284-
MatrixASignedComponents = 0,
1285-
MatrixBSignedComponents = 1,
1286-
MatrixCSignedComponents = 2,
1287-
MatrixResultSignedComponents = 3,
1288-
SaturatingAccumulation = 4,
1284+
MatrixASignedComponentsKHR = 0,
1285+
MatrixBSignedComponentsKHR = 1,
1286+
MatrixCSignedComponentsKHR = 2,
1287+
MatrixResultSignedComponentsKHR = 3,
1288+
SaturatingAccumulationKHR = 4,
12891289
Max = 0x7fffffff,
12901290
};
12911291

12921292
enum class CooperativeMatrixOperandsMask : unsigned {
12931293
MaskNone = 0,
1294-
MatrixASignedComponents = 0x00000001,
1295-
MatrixBSignedComponents = 0x00000002,
1296-
MatrixCSignedComponents = 0x00000004,
1297-
MatrixResultSignedComponents = 0x00000008,
1298-
SaturatingAccumulation = 0x00000010,
1294+
MatrixASignedComponentsKHR = 0x00000001,
1295+
MatrixBSignedComponentsKHR = 0x00000002,
1296+
MatrixCSignedComponentsKHR = 0x00000004,
1297+
MatrixResultSignedComponentsKHR = 0x00000008,
1298+
SaturatingAccumulationKHR = 0x00000010,
12991299
};
13001300

13011301
enum class CooperativeMatrixLayout : unsigned {

‎include/spirv/unified1/spirv.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1271,11 +1271,11 @@
12711271
"Type": "Bit",
12721272
"Values":
12731273
{
1274-
"MatrixASignedComponents": 0,
1275-
"MatrixBSignedComponents": 1,
1276-
"MatrixCSignedComponents": 2,
1277-
"MatrixResultSignedComponents": 3,
1278-
"SaturatingAccumulation": 4
1274+
"MatrixASignedComponentsKHR": 0,
1275+
"MatrixBSignedComponentsKHR": 1,
1276+
"MatrixCSignedComponentsKHR": 2,
1277+
"MatrixResultSignedComponentsKHR": 3,
1278+
"SaturatingAccumulationKHR": 4
12791279
}
12801280
},
12811281
{

‎include/spirv/unified1/spirv.lua

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1232,20 +1232,20 @@ spv = {
12321232
},
12331233

12341234
CooperativeMatrixOperandsShift = {
1235-
MatrixASignedComponents = 0,
1236-
MatrixBSignedComponents = 1,
1237-
MatrixCSignedComponents = 2,
1238-
MatrixResultSignedComponents = 3,
1239-
SaturatingAccumulation = 4,
1235+
MatrixASignedComponentsKHR = 0,
1236+
MatrixBSignedComponentsKHR = 1,
1237+
MatrixCSignedComponentsKHR = 2,
1238+
MatrixResultSignedComponentsKHR = 3,
1239+
SaturatingAccumulationKHR = 4,
12401240
},
12411241

12421242
CooperativeMatrixOperandsMask = {
12431243
MaskNone = 0,
1244-
MatrixASignedComponents = 0x00000001,
1245-
MatrixBSignedComponents = 0x00000002,
1246-
MatrixCSignedComponents = 0x00000004,
1247-
MatrixResultSignedComponents = 0x00000008,
1248-
SaturatingAccumulation = 0x00000010,
1244+
MatrixASignedComponentsKHR = 0x00000001,
1245+
MatrixBSignedComponentsKHR = 0x00000002,
1246+
MatrixCSignedComponentsKHR = 0x00000004,
1247+
MatrixResultSignedComponentsKHR = 0x00000008,
1248+
SaturatingAccumulationKHR = 0x00000010,
12491249
},
12501250

12511251
CooperativeMatrixLayout = {

‎include/spirv/unified1/spirv.py

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1232,20 +1232,20 @@
12321232
},
12331233

12341234
'CooperativeMatrixOperandsShift' : {
1235-
'MatrixASignedComponents' : 0,
1236-
'MatrixBSignedComponents' : 1,
1237-
'MatrixCSignedComponents' : 2,
1238-
'MatrixResultSignedComponents' : 3,
1239-
'SaturatingAccumulation' : 4,
1235+
'MatrixASignedComponentsKHR' : 0,
1236+
'MatrixBSignedComponentsKHR' : 1,
1237+
'MatrixCSignedComponentsKHR' : 2,
1238+
'MatrixResultSignedComponentsKHR' : 3,
1239+
'SaturatingAccumulationKHR' : 4,
12401240
},
12411241

12421242
'CooperativeMatrixOperandsMask' : {
12431243
'MaskNone' : 0,
1244-
'MatrixASignedComponents' : 0x00000001,
1245-
'MatrixBSignedComponents' : 0x00000002,
1246-
'MatrixCSignedComponents' : 0x00000004,
1247-
'MatrixResultSignedComponents' : 0x00000008,
1248-
'SaturatingAccumulation' : 0x00000010,
1244+
'MatrixASignedComponentsKHR' : 0x00000001,
1245+
'MatrixBSignedComponentsKHR' : 0x00000002,
1246+
'MatrixCSignedComponentsKHR' : 0x00000004,
1247+
'MatrixResultSignedComponentsKHR' : 0x00000008,
1248+
'SaturatingAccumulationKHR' : 0x00000010,
12491249
},
12501250

12511251
'CooperativeMatrixLayout' : {

‎include/spirv/unified1/spv.d

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1290,21 +1290,21 @@ enum PackedVectorFormat : uint
12901290

12911291
enum CooperativeMatrixOperandsShift : uint
12921292
{
1293-
MatrixASignedComponents = 0,
1294-
MatrixBSignedComponents = 1,
1295-
MatrixCSignedComponents = 2,
1296-
MatrixResultSignedComponents = 3,
1297-
SaturatingAccumulation = 4,
1293+
MatrixASignedComponentsKHR = 0,
1294+
MatrixBSignedComponentsKHR = 1,
1295+
MatrixCSignedComponentsKHR = 2,
1296+
MatrixResultSignedComponentsKHR = 3,
1297+
SaturatingAccumulationKHR = 4,
12981298
}
12991299

13001300
enum CooperativeMatrixOperandsMask : uint
13011301
{
13021302
MaskNone = 0,
1303-
MatrixASignedComponents = 0x00000001,
1304-
MatrixBSignedComponents = 0x00000002,
1305-
MatrixCSignedComponents = 0x00000004,
1306-
MatrixResultSignedComponents = 0x00000008,
1307-
SaturatingAccumulation = 0x00000010,
1303+
MatrixASignedComponentsKHR = 0x00000001,
1304+
MatrixBSignedComponentsKHR = 0x00000002,
1305+
MatrixCSignedComponentsKHR = 0x00000004,
1306+
MatrixResultSignedComponentsKHR = 0x00000008,
1307+
SaturatingAccumulationKHR = 0x00000010,
13081308
}
13091309

13101310
enum CooperativeMatrixLayout : uint

0 commit comments

Comments
 (0)