Skip to content

Commit

Permalink
Add KHR suffix to Cooperative Matrix Operands
Browse files Browse the repository at this point in the history 
Signed-off-by: Kevin Petit <[email protected]>
Change-Id: I0303c1b16e46e77f0e7e95999c606cc75f7f0d4c
  • Loading branch information
@kpet
kpet committed Jul 26, 2023
1 parent 51b1064 commit 272be32
Show file tree
Hide file tree
Showing 10 changed files with 91 additions and 91 deletions.
20 changes: 10 additions & 10 deletions include/spirv/unified1/spirv.bf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1288,21 +1288,21 @@ namespace Spv

[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
Expand Down
12 changes: 6 additions & 6 deletions include/spirv/unified1/spirv.core.grammar.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
20 changes: 10 additions & 10 deletions include/spirv/unified1/spirv.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1287,21 +1287,21 @@ public enum PackedVectorFormat

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
Expand Down
20 changes: 10 additions & 10 deletions include/spirv/unified1/spirv.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1285,21 +1285,21 @@ typedef enum SpvPackedVectorFormat_ {
} 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_ {
Expand Down
20 changes: 10 additions & 10 deletions include/spirv/unified1/spirv.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1281,21 +1281,21 @@ enum PackedVectorFormat {
};

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 {
Expand Down
20 changes: 10 additions & 10 deletions include/spirv/unified1/spirv.hpp11
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1281,21 +1281,21 @@ enum class PackedVectorFormat : unsigned {
};

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 {
Expand Down
10 changes: 5 additions & 5 deletions include/spirv/unified1/spirv.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
},
{
Expand Down
20 changes: 10 additions & 10 deletions include/spirv/unified1/spirv.lua
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1232,20 +1232,20 @@ spv = {
},

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 = {
Expand Down
20 changes: 10 additions & 10 deletions include/spirv/unified1/spirv.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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' : {
Expand Down
20 changes: 10 additions & 10 deletions include/spirv/unified1/spv.d
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1290,21 +1290,21 @@ enum PackedVectorFormat : uint

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
Expand Down

1 comment on commit 272be32

@romanl-g
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This commit broke Vulkan-ValidationLayers compile:
https://github.com/KhronosGroup/Vulkan-ValidationLayers/blob/c320ff46b5a914dafe7e0512a6395ecd643de457/layers/core_checks/cc_spirv.cpp#L1000

Please sign in to comment.