From d15c26db2a459d9377096bdf7357ac2faeaf28c3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=91=D1=80=D0=B0=D0=BD=D0=B8=D0=BC=D0=B8=D1=80=20=D0=9A?= =?UTF-8?q?=D0=B0=D1=80=D0=B0=D1=9F=D0=B8=D1=9B?= Date: Sun, 30 Jul 2023 16:28:34 -0700 Subject: [PATCH] Updated spirv-headers. --- .../spirv/unified1/spirv.core.grammar.json | 27 ++++++++++++++----- .../include/spirv/unified1/spirv.h | 22 ++++++++------- .../include/spirv/unified1/spirv.hpp11 | 22 ++++++++------- .../include/spirv/unified1/spirv.json | 12 +++++---- 4 files changed, 52 insertions(+), 31 deletions(-) diff --git a/3rdparty/spirv-headers/include/spirv/unified1/spirv.core.grammar.json b/3rdparty/spirv-headers/include/spirv/unified1/spirv.core.grammar.json index 693637a19..10ced5bb8 100644 --- a/3rdparty/spirv-headers/include/spirv/unified1/spirv.core.grammar.json +++ b/3rdparty/spirv-headers/include/spirv/unified1/spirv.core.grammar.json @@ -12800,6 +12800,15 @@ "capabilities" : [ "VectorComputeINTEL" ], "version" : "None" }, + { + "enumerant" : "FPMaxErrorDecorationINTEL", + "value" : 6170, + "parameters" : [ + { "kind" : "LiteralFloat", "name" : "'Max Error'" } + ], + "capabilities" : [ "FPMaxErrorINTEL" ], + "version" : "None" + }, { "enumerant" : "LatencyControlLabelINTEL", "value" : 6172, @@ -15271,6 +15280,12 @@ "extensions" : [ "SPV_INTEL_kernel_attributes" ], "version" : "None" }, + { + "enumerant" : "FPMaxErrorINTEL", + "value" : 6169, + "extensions" : [ "SPV_INTEL_fp_max_error" ], + "version" : "None" + }, { "enumerant" : "FPGALatencyControlINTEL", "value" : 6171, @@ -15373,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/3rdparty/spirv-headers/include/spirv/unified1/spirv.h b/3rdparty/spirv-headers/include/spirv/unified1/spirv.h index e478e3f08..bc1ef4cdd 100644 --- a/3rdparty/spirv-headers/include/spirv/unified1/spirv.h +++ b/3rdparty/spirv-headers/include/spirv/unified1/spirv.h @@ -593,6 +593,7 @@ typedef enum SpvDecoration_ { SpvDecorationSingleElementVectorINTEL = 6085, SpvDecorationVectorComputeCallableFunctionINTEL = 6087, SpvDecorationMediaBlockIOINTEL = 6140, + SpvDecorationFPMaxErrorDecorationINTEL = 6170, SpvDecorationLatencyControlLabelINTEL = 6172, SpvDecorationLatencyControlConstraintINTEL = 6173, SpvDecorationConduitKernelArgumentINTEL = 6175, @@ -1173,6 +1174,7 @@ typedef enum SpvCapability_ { SpvCapabilityBFloat16ConversionINTEL = 6115, SpvCapabilitySplitBarrierINTEL = 6141, SpvCapabilityFPGAKernelAttributesv2INTEL = 6161, + SpvCapabilityFPMaxErrorINTEL = 6169, SpvCapabilityFPGALatencyControlINTEL = 6171, SpvCapabilityFPGAArgumentInterfacesINTEL = 6174, SpvCapabilityGroupUniformArithmeticKHR = 6400, @@ -1283,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_ { diff --git a/3rdparty/spirv-headers/include/spirv/unified1/spirv.hpp11 b/3rdparty/spirv-headers/include/spirv/unified1/spirv.hpp11 index 2cfc7e0fd..f610092c7 100644 --- a/3rdparty/spirv-headers/include/spirv/unified1/spirv.hpp11 +++ b/3rdparty/spirv-headers/include/spirv/unified1/spirv.hpp11 @@ -589,6 +589,7 @@ enum class Decoration : unsigned { SingleElementVectorINTEL = 6085, VectorComputeCallableFunctionINTEL = 6087, MediaBlockIOINTEL = 6140, + FPMaxErrorDecorationINTEL = 6170, LatencyControlLabelINTEL = 6172, LatencyControlConstraintINTEL = 6173, ConduitKernelArgumentINTEL = 6175, @@ -1169,6 +1170,7 @@ enum class Capability : unsigned { BFloat16ConversionINTEL = 6115, SplitBarrierINTEL = 6141, FPGAKernelAttributesv2INTEL = 6161, + FPMaxErrorINTEL = 6169, FPGALatencyControlINTEL = 6171, FPGAArgumentInterfacesINTEL = 6174, GroupUniformArithmeticKHR = 6400, @@ -1279,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 { diff --git a/3rdparty/spirv-headers/include/spirv/unified1/spirv.json b/3rdparty/spirv-headers/include/spirv/unified1/spirv.json index 23eff593f..8c3c424e9 100644 --- a/3rdparty/spirv-headers/include/spirv/unified1/spirv.json +++ b/3rdparty/spirv-headers/include/spirv/unified1/spirv.json @@ -615,6 +615,7 @@ "SingleElementVectorINTEL": 6085, "VectorComputeCallableFunctionINTEL": 6087, "MediaBlockIOINTEL": 6140, + "FPMaxErrorDecorationINTEL": 6170, "LatencyControlLabelINTEL": 6172, "LatencyControlConstraintINTEL": 6173, "ConduitKernelArgumentINTEL": 6175, @@ -1149,6 +1150,7 @@ "BFloat16ConversionINTEL": 6115, "SplitBarrierINTEL": 6141, "FPGAKernelAttributesv2INTEL": 6161, + "FPMaxErrorINTEL": 6169, "FPGALatencyControlINTEL": 6171, "FPGAArgumentInterfacesINTEL": 6174, "GroupUniformArithmeticKHR": 6400 @@ -1269,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 } }, {