Skip to content

Commit b407e38

Browse files
author
devsh
committed
Merge branch 'main' of github.com:KhronosGroup/SPIRV-Headers into header_4_hlsl
2 parents 5b2ed7b + 54a521d commit b407e38

File tree

13 files changed

+2095
-7
lines changed

13 files changed

+2095
-7
lines changed

‎include/spirv/spir-v.xml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,8 @@
9797
<id value="44" vendor="Robert Konrad" tool="Kongruent" comment="Contact Robert Konrad, https://github.com/Kode/Kongruent"/>
9898
<id value="45" vendor="Kitsunebi Games" tool="Nuvk SPIR-V Emitter and DLSL compiler" comment="Contact Luna Nielsen, [email protected], https://github.com/Inochi2D/nuvk"/>
9999
<id value="46" vendor="Nintendo" comment="Contact Steve Urquhart, [email protected]"/>
100-
<unused start="47" end="0xFFFF" comment="Tool ID range reservable for future use by vendors"/>
100+
<id value="47" vendor="ARM" comment="Contact Christopher Gautier, [email protected]"/>
101+
<unused start="48" end="0xFFFF" comment="Tool ID range reservable for future use by vendors"/>
101102
</ids>
102103

103104
<!-- SECTION: SPIR-V Opcodes and Enumerants -->

‎include/spirv/unified1/spirv.bf‎

Lines changed: 114 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,7 @@ namespace Spv
7171
WGSL = 10,
7272
Slang = 11,
7373
Zig = 12,
74+
Rust = 13,
7475
Max = 0x7fffffff,
7576
}
7677

@@ -798,12 +799,19 @@ namespace Spv
798799
IncomingRayFlagsKHR = 5351,
799800
IncomingRayFlagsNV = 5351,
800801
RayGeometryIndexKHR = 5352,
802+
HitIsSphereNV = 5359,
803+
HitIsLSSNV = 5360,
804+
HitSpherePositionNV = 5361,
801805
WarpsPerSMNV = 5374,
802806
SMCountNV = 5375,
803807
WarpIDNV = 5376,
804808
SMIDNV = 5377,
809+
HitLSSPositionsNV = 5396,
805810
HitKindFrontFacingMicroTriangleNV = 5405,
806811
HitKindBackFacingMicroTriangleNV = 5406,
812+
HitSphereRadiusNV = 5420,
813+
HitLSSRadiiNV = 5421,
814+
ClusterIDNV = 5436,
807815
CullMaskKHR = 6021,
808816
Max = 0x7fffffff,
809817
}
@@ -1201,14 +1209,19 @@ namespace Spv
12011209
ShaderInvocationReorderNV = 5383,
12021210
BindlessTextureNV = 5390,
12031211
RayQueryPositionFetchKHR = 5391,
1212+
CooperativeVectorNV = 5394,
12041213
AtomicFloat16VectorNV = 5404,
12051214
RayTracingDisplacementMicromapNV = 5409,
12061215
RawAccessChainsNV = 5414,
1216+
RayTracingSpheresGeometryNV = 5418,
1217+
RayTracingLinearSweptSpheresGeometryNV = 5419,
12071218
CooperativeMatrixReductionsNV = 5430,
12081219
CooperativeMatrixConversionsNV = 5431,
12091220
CooperativeMatrixPerElementOperationsNV = 5432,
12101221
CooperativeMatrixTensorAddressingNV = 5433,
12111222
CooperativeMatrixBlockLoadsNV = 5434,
1223+
CooperativeVectorTrainingNV = 5435,
1224+
RayTracingClusterAccelerationStructureNV = 5437,
12121225
TensorAddressingNV = 5439,
12131226
SubgroupShuffleINTEL = 5568,
12141227
SubgroupBufferBlockIOINTEL = 5569,
@@ -1284,6 +1297,10 @@ namespace Spv
12841297
GlobalVariableHostAccessINTEL = 6187,
12851298
GlobalVariableFPGADecorationsINTEL = 6189,
12861299
SubgroupBufferPrefetchINTEL = 6220,
1300+
Subgroup2DBlockIOINTEL = 6228,
1301+
Subgroup2DBlockTransformINTEL = 6229,
1302+
Subgroup2DBlockTransposeINTEL = 6230,
1303+
SubgroupMatrixMultiplyAccumulateINTEL = 6236,
12871304
GroupUniformArithmeticKHR = 6400,
12881305
MaskedGatherScatterINTEL = 6427,
12891306
CacheControlsINTEL = 6441,
@@ -1301,6 +1318,7 @@ namespace Spv
13011318
CullFrontFacingTrianglesKHR = 5,
13021319
CullOpaqueKHR = 6,
13031320
CullNoOpaqueKHR = 7,
1321+
SkipBuiltinPrimitivesNV = 8,
13041322
SkipTrianglesKHR = 8,
13051323
SkipAABBsKHR = 9,
13061324
ForceOpacityMicromap2StateEXT = 10,
@@ -1318,6 +1336,7 @@ namespace Spv
13181336
CullFrontFacingTrianglesKHR = 0x00000020,
13191337
CullOpaqueKHR = 0x00000040,
13201338
CullNoOpaqueKHR = 0x00000080,
1339+
SkipBuiltinPrimitivesNV = 0x00000100,
13211340
SkipTrianglesKHR = 0x00000100,
13221341
SkipAABBsKHR = 0x00000200,
13231342
ForceOpacityMicromap2StateEXT = 0x00000400,
@@ -1524,6 +1543,44 @@ namespace Spv
15241543
Max = 0x7fffffff,
15251544
}
15261545

1546+
[AllowDuplicates, CRepr] public enum MatrixMultiplyAccumulateOperandsShift
1547+
{
1548+
MatrixASignedComponentsINTEL = 0,
1549+
MatrixBSignedComponentsINTEL = 1,
1550+
MatrixCBFloat16INTEL = 2,
1551+
MatrixResultBFloat16INTEL = 3,
1552+
MatrixAPackedInt8INTEL = 4,
1553+
MatrixBPackedInt8INTEL = 5,
1554+
MatrixAPackedInt4INTEL = 6,
1555+
MatrixBPackedInt4INTEL = 7,
1556+
MatrixATF32INTEL = 8,
1557+
MatrixBTF32INTEL = 9,
1558+
MatrixAPackedFloat16INTEL = 10,
1559+
MatrixBPackedFloat16INTEL = 11,
1560+
MatrixAPackedBFloat16INTEL = 12,
1561+
MatrixBPackedBFloat16INTEL = 13,
1562+
Max = 0x7fffffff,
1563+
}
1564+
1565+
[AllowDuplicates, CRepr] public enum MatrixMultiplyAccumulateOperandsMask
1566+
{
1567+
MaskNone = 0,
1568+
MatrixASignedComponentsINTEL = 0x00000001,
1569+
MatrixBSignedComponentsINTEL = 0x00000002,
1570+
MatrixCBFloat16INTEL = 0x00000004,
1571+
MatrixResultBFloat16INTEL = 0x00000008,
1572+
MatrixAPackedInt8INTEL = 0x00000010,
1573+
MatrixBPackedInt8INTEL = 0x00000020,
1574+
MatrixAPackedInt4INTEL = 0x00000040,
1575+
MatrixBPackedInt4INTEL = 0x00000080,
1576+
MatrixATF32INTEL = 0x00000100,
1577+
MatrixBTF32INTEL = 0x00000200,
1578+
MatrixAPackedFloat16INTEL = 0x00000400,
1579+
MatrixBPackedFloat16INTEL = 0x00000800,
1580+
MatrixAPackedBFloat16INTEL = 0x00001000,
1581+
MatrixBPackedBFloat16INTEL = 0x00002000,
1582+
}
1583+
15271584
[AllowDuplicates, CRepr] public enum RawAccessChainOperandsShift
15281585
{
15291586
RobustnessPerComponentNV = 0,
@@ -1543,6 +1600,35 @@ namespace Spv
15431600
Max = 0x7fffffff,
15441601
}
15451602

1603+
[AllowDuplicates, CRepr] public enum CooperativeVectorMatrixLayout
1604+
{
1605+
RowMajorNV = 0,
1606+
ColumnMajorNV = 1,
1607+
InferencingOptimalNV = 2,
1608+
TrainingOptimalNV = 3,
1609+
Max = 0x7fffffff,
1610+
}
1611+
1612+
[AllowDuplicates, CRepr] public enum ComponentType
1613+
{
1614+
Float16NV = 0,
1615+
Float32NV = 1,
1616+
Float64NV = 2,
1617+
SignedInt8NV = 3,
1618+
SignedInt16NV = 4,
1619+
SignedInt32NV = 5,
1620+
SignedInt64NV = 6,
1621+
UnsignedInt8NV = 7,
1622+
UnsignedInt16NV = 8,
1623+
UnsignedInt32NV = 9,
1624+
UnsignedInt64NV = 10,
1625+
SignedInt8PackedNV = 1000491000,
1626+
UnsignedInt8PackedNV = 1000491001,
1627+
FloatE4M3NV = 1000491002,
1628+
FloatE5M2NV = 1000491003,
1629+
Max = 0x7fffffff,
1630+
}
1631+
15461632
[AllowDuplicates, CRepr] public enum Op
15471633
{
15481634
OpNop = 0,
@@ -2004,13 +2090,20 @@ namespace Spv
20042090
OpReorderThreadWithHintNV = 5280,
20052091
OpTypeHitObjectNV = 5281,
20062092
OpImageSampleFootprintNV = 5283,
2093+
OpTypeCooperativeVectorNV = 5288,
2094+
OpCooperativeVectorMatrixMulNV = 5289,
2095+
OpCooperativeVectorOuterProductAccumulateNV = 5290,
2096+
OpCooperativeVectorReduceSumAccumulateNV = 5291,
2097+
OpCooperativeVectorMatrixMulAddNV = 5292,
20072098
OpCooperativeMatrixConvertNV = 5293,
20082099
OpEmitMeshTasksEXT = 5294,
20092100
OpSetMeshOutputsEXT = 5295,
20102101
OpGroupNonUniformPartitionNV = 5296,
20112102
OpWritePackedPrimitiveIndices4x8NV = 5299,
20122103
OpFetchMicroTriangleVertexPositionNV = 5300,
20132104
OpFetchMicroTriangleVertexBarycentricNV = 5301,
2105+
OpCooperativeVectorLoadNV = 5302,
2106+
OpCooperativeVectorStoreNV = 5303,
20142107
OpReportIntersectionKHR = 5334,
20152108
OpReportIntersectionNV = 5334,
20162109
OpIgnoreIntersectionNV = 5335,
@@ -2022,6 +2115,8 @@ namespace Spv
20222115
OpTypeAccelerationStructureKHR = 5341,
20232116
OpTypeAccelerationStructureNV = 5341,
20242117
OpExecuteCallableNV = 5344,
2118+
OpRayQueryGetClusterIdNV = 5345,
2119+
OpHitObjectGetClusterIdNV = 5346,
20252120
OpTypeCooperativeMatrixNV = 5358,
20262121
OpCooperativeMatrixLoadNV = 5359,
20272122
OpCooperativeMatrixStoreNV = 5360,
@@ -2057,6 +2152,19 @@ namespace Spv
20572152
OpConvertSampledImageToUNV = 5396,
20582153
OpSamplerImageAddressingModeNV = 5397,
20592154
OpRawAccessChainNV = 5398,
2155+
OpRayQueryGetIntersectionSpherePositionNV = 5427,
2156+
OpRayQueryGetIntersectionSphereRadiusNV = 5428,
2157+
OpRayQueryGetIntersectionLSSPositionsNV = 5429,
2158+
OpRayQueryGetIntersectionLSSRadiiNV = 5430,
2159+
OpRayQueryGetIntersectionLSSHitValueNV = 5431,
2160+
OpHitObjectGetSpherePositionNV = 5432,
2161+
OpHitObjectGetSphereRadiusNV = 5433,
2162+
OpHitObjectGetLSSPositionsNV = 5434,
2163+
OpHitObjectGetLSSRadiiNV = 5435,
2164+
OpHitObjectIsSphereHitNV = 5436,
2165+
OpHitObjectIsLSSHitNV = 5437,
2166+
OpRayQueryIsSphereHitNV = 5438,
2167+
OpRayQueryIsLSSHitNV = 5439,
20602168
OpSubgroupShuffleINTEL = 5571,
20612169
OpSubgroupShuffleDownINTEL = 5572,
20622170
OpSubgroupShuffleUpINTEL = 5573,
@@ -2305,6 +2413,12 @@ namespace Spv
23052413
OpControlBarrierWaitINTEL = 6143,
23062414
OpArithmeticFenceEXT = 6145,
23072415
OpSubgroupBlockPrefetchINTEL = 6221,
2416+
OpSubgroup2DBlockLoadINTEL = 6231,
2417+
OpSubgroup2DBlockLoadTransformINTEL = 6232,
2418+
OpSubgroup2DBlockLoadTransposeINTEL = 6233,
2419+
OpSubgroup2DBlockPrefetchINTEL = 6234,
2420+
OpSubgroup2DBlockStoreINTEL = 6235,
2421+
OpSubgroupMatrixMultiplyAccumulateINTEL = 6237,
23082422
OpGroupIMulKHR = 6401,
23092423
OpGroupFMulKHR = 6402,
23102424
OpGroupBitwiseAndKHR = 6403,

0 commit comments

Comments
 (0)