Skip to content

Commit b846bb7

Browse files
committed
Cooperative matrix enums depend on the extension
This fixes basic parsing in SPIRV-Tools. An enum is considered invisible by SPIRV-Tools if: - it is not in any SPIR-V core version - it has no enabling capabilities - it has no enabling extensions So make the new cooperative matrix enums depend on the extension, since they are not in any core version of SPIR-V, and don't depend on any capabilities.
1 parent f14a663 commit b846bb7

File tree

1 file changed

+11
-0
lines changed

1 file changed

+11
-0
lines changed

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

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15390,31 +15390,37 @@
1539015390
{
1539115391
"enumerant" : "NoneKHR",
1539215392
"value" : "0x0000",
15393+
"extensions" : [ "SPV_KHR_cooperative_matrix" ],
1539315394
"version" : "None"
1539415395
},
1539515396
{
1539615397
"enumerant" : "MatrixASignedComponentsKHR",
1539715398
"value" : "0x0001",
15399+
"extensions" : [ "SPV_KHR_cooperative_matrix" ],
1539815400
"version" : "None"
1539915401
},
1540015402
{
1540115403
"enumerant" : "MatrixBSignedComponentsKHR",
1540215404
"value" : "0x0002",
15405+
"extensions" : [ "SPV_KHR_cooperative_matrix" ],
1540315406
"version" : "None"
1540415407
},
1540515408
{
1540615409
"enumerant" : "MatrixCSignedComponentsKHR",
1540715410
"value" : "0x0004",
15411+
"extensions" : [ "SPV_KHR_cooperative_matrix" ],
1540815412
"version" : "None"
1540915413
},
1541015414
{
1541115415
"enumerant" : "MatrixResultSignedComponentsKHR",
1541215416
"value" : "0x0008",
15417+
"extensions" : [ "SPV_KHR_cooperative_matrix" ],
1541315418
"version" : "None"
1541415419
},
1541515420
{
1541615421
"enumerant" : "SaturatingAccumulationKHR",
1541715422
"value" : "0x0010",
15423+
"extensions" : [ "SPV_KHR_cooperative_matrix" ],
1541815424
"version" : "None"
1541915425
}
1542015426
]
@@ -15426,11 +15432,13 @@
1542615432
{
1542715433
"enumerant" : "RowMajorKHR",
1542815434
"value" : 0,
15435+
"extensions" : [ "SPV_KHR_cooperative_matrix" ],
1542915436
"version" : "None"
1543015437
},
1543115438
{
1543215439
"enumerant" : "ColumnMajorKHR",
1543315440
"value" : 1,
15441+
"extensions" : [ "SPV_KHR_cooperative_matrix" ],
1543415442
"version" : "None"
1543515443
}
1543615444
]
@@ -15442,16 +15450,19 @@
1544215450
{
1544315451
"enumerant" : "MatrixAKHR",
1544415452
"value" : 0,
15453+
"extensions" : [ "SPV_KHR_cooperative_matrix" ],
1544515454
"version" : "None"
1544615455
},
1544715456
{
1544815457
"enumerant" : "MatrixBKHR",
1544915458
"value" : 1,
15459+
"extensions" : [ "SPV_KHR_cooperative_matrix" ],
1545015460
"version" : "None"
1545115461
},
1545215462
{
1545315463
"enumerant" : "MatrixAccumulatorKHR",
1545415464
"value" : 2,
15465+
"extensions" : [ "SPV_KHR_cooperative_matrix" ],
1545515466
"version" : "None"
1545615467
}
1545715468
]

0 commit comments

Comments
 (0)