From 95e262634b918319ced928e94f9bcadf05e10676 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: Mon, 27 Nov 2023 22:28:13 -0800 Subject: [PATCH] Updated spirv-headers. --- .../spirv/unified1/spirv.core.grammar.json | 252 +++++++++--------- .../include/spirv/unified1/spirv.h | 10 +- .../include/spirv/unified1/spirv.hpp11 | 10 +- .../include/spirv/unified1/spirv.json | 10 +- 4 files changed, 141 insertions(+), 141 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 ed085811d..4dc955ef5 100644 --- a/3rdparty/spirv-headers/include/spirv/unified1/spirv.core.grammar.json +++ b/3rdparty/spirv-headers/include/spirv/unified1/spirv.core.grammar.json @@ -9922,32 +9922,32 @@ { "enumerant" : "None", "value" : "0x0000", - "version" : "1.0" + "version" : "1.0" }, { "enumerant" : "NotNaN", "value" : "0x0001", - "version" : "1.0" + "version" : "1.0" }, { "enumerant" : "NotInf", "value" : "0x0002", - "version" : "1.0" + "version" : "1.0" }, { "enumerant" : "NSZ", "value" : "0x0004", - "version" : "1.0" + "version" : "1.0" }, { "enumerant" : "AllowRecip", "value" : "0x0008", - "version" : "1.0" + "version" : "1.0" }, { "enumerant" : "Fast", "value" : "0x0010", - "version" : "1.0" + "version" : "1.0" }, { "enumerant" : "AllowContractFastINTEL", @@ -9970,17 +9970,17 @@ { "enumerant" : "None", "value" : "0x0000", - "version" : "1.0" + "version" : "1.0" }, { "enumerant" : "Flatten", "value" : "0x0001", - "version" : "1.0" + "version" : "1.0" }, { "enumerant" : "DontFlatten", "value" : "0x0002", - "version" : "1.0" + "version" : "1.0" } ] }, @@ -9991,17 +9991,17 @@ { "enumerant" : "None", "value" : "0x0000", - "version" : "1.0" + "version" : "1.0" }, { "enumerant" : "Unroll", "value" : "0x0001", - "version" : "1.0" + "version" : "1.0" }, { "enumerant" : "DontUnroll", "value" : "0x0002", - "version" : "1.0" + "version" : "1.0" }, { "enumerant" : "DependencyInfinite", @@ -10152,27 +10152,27 @@ { "enumerant" : "None", "value" : "0x0000", - "version" : "1.0" + "version" : "1.0" }, { "enumerant" : "Inline", "value" : "0x0001", - "version" : "1.0" + "version" : "1.0" }, { "enumerant" : "DontInline", "value" : "0x0002", - "version" : "1.0" + "version" : "1.0" }, { "enumerant" : "Pure", "value" : "0x0004", - "version" : "1.0" + "version" : "1.0" }, { "enumerant" : "Const", "value" : "0x0008", - "version" : "1.0" + "version" : "1.0" }, { "enumerant" : "OptNoneINTEL", @@ -10189,32 +10189,32 @@ { "enumerant" : "Relaxed", "value" : "0x0000", - "version" : "1.0" + "version" : "1.0" }, { "enumerant" : "None", "value" : "0x0000", - "version" : "1.0" + "version" : "1.0" }, { "enumerant" : "Acquire", "value" : "0x0002", - "version" : "1.0" + "version" : "1.0" }, { "enumerant" : "Release", "value" : "0x0004", - "version" : "1.0" + "version" : "1.0" }, { "enumerant" : "AcquireRelease", "value" : "0x0008", - "version" : "1.0" + "version" : "1.0" }, { "enumerant" : "SequentiallyConsistent", "value" : "0x0010", - "version" : "1.0" + "version" : "1.0" }, { "enumerant" : "UniformMemory", @@ -10225,17 +10225,17 @@ { "enumerant" : "SubgroupMemory", "value" : "0x0080", - "version" : "1.0" + "version" : "1.0" }, { "enumerant" : "WorkgroupMemory", "value" : "0x0100", - "version" : "1.0" + "version" : "1.0" }, { "enumerant" : "CrossWorkgroupMemory", "value" : "0x0200", - "version" : "1.0" + "version" : "1.0" }, { "enumerant" : "AtomicCounterMemory", @@ -10246,7 +10246,7 @@ { "enumerant" : "ImageMemory", "value" : "0x0800", - "version" : "1.0" + "version" : "1.0" }, { "enumerant" : "OutputMemory", @@ -10303,12 +10303,12 @@ { "enumerant" : "None", "value" : "0x0000", - "version" : "1.0" + "version" : "1.0" }, { "enumerant" : "Volatile", "value" : "0x0001", - "version" : "1.0" + "version" : "1.0" }, { "enumerant" : "Aligned", @@ -10316,12 +10316,12 @@ "parameters" : [ { "kind" : "LiteralInteger" } ], - "version" : "1.0" + "version" : "1.0" }, { "enumerant" : "Nontemporal", "value" : "0x0004", - "version" : "1.0" + "version" : "1.0" }, { "enumerant" : "MakePointerAvailable", @@ -10403,7 +10403,7 @@ { "enumerant" : "None", "value" : "0x0000", - "version" : "1.0" + "version" : "1.0" }, { "enumerant" : "CmdExecTime", @@ -10528,62 +10528,62 @@ { "enumerant" : "Unknown", "value" : 0, - "version" : "1.0" + "version" : "1.0" }, { "enumerant" : "ESSL", "value" : 1, - "version" : "1.0" + "version" : "1.0" }, { "enumerant" : "GLSL", "value" : 2, - "version" : "1.0" + "version" : "1.0" }, { "enumerant" : "OpenCL_C", "value" : 3, - "version" : "1.0" + "version" : "1.0" }, { "enumerant" : "OpenCL_CPP", "value" : 4, - "version" : "1.0" + "version" : "1.0" }, { "enumerant" : "HLSL", "value" : 5, - "version" : "1.0" + "version" : "1.0" }, { "enumerant" : "CPP_for_OpenCL", "value" : 6, - "version" : "1.0" + "version" : "1.0" }, { "enumerant" : "SYCL", "value" : 7, - "version" : "1.0" + "version" : "1.0" }, { "enumerant" : "HERO_C", "value" : 8, - "version" : "1.0" + "version" : "1.0" }, { "enumerant" : "NZSL", "value" : 9, - "version" : "1.0" + "version" : "1.0" }, { "enumerant" : "WGSL", "value" : 10, - "version" : "1.0" + "version" : "1.0" }, { "enumerant" : "Slang", "value" : 11, - "version" : "1.0" + "version" : "1.0" } ] }, @@ -10738,7 +10738,7 @@ { "enumerant" : "Logical", "value" : 0, - "version" : "1.0" + "version" : "1.0" }, { "enumerant" : "Physical32", @@ -11490,12 +11490,12 @@ { "enumerant" : "UniformConstant", "value" : 0, - "version" : "1.0" + "version" : "1.0" }, { "enumerant" : "Input", "value" : 1, - "version" : "1.0" + "version" : "1.0" }, { "enumerant" : "Uniform", @@ -11512,12 +11512,12 @@ { "enumerant" : "Workgroup", "value" : 4, - "version" : "1.0" + "version" : "1.0" }, { "enumerant" : "CrossWorkgroup", "value" : 5, - "version" : "1.0" + "version" : "1.0" }, { "enumerant" : "Private", @@ -11528,7 +11528,7 @@ { "enumerant" : "Function", "value" : 7, - "version" : "1.0" + "version" : "1.0" }, { "enumerant" : "Generic", @@ -11551,7 +11551,7 @@ { "enumerant" : "Image", "value" : 11, - "version" : "1.0" + "version" : "1.0" }, { "enumerant" : "StorageBuffer", @@ -11732,12 +11732,12 @@ { "enumerant" : "2D", "value" : 1, - "version" : "1.0" + "version" : "1.0" }, { "enumerant" : "3D", "value" : 2, - "version" : "1.0" + "version" : "1.0" }, { "enumerant" : "Cube", @@ -11825,7 +11825,7 @@ { "enumerant" : "Unknown", "value" : 0, - "version" : "1.0" + "version" : "1.0" }, { "enumerant" : "Rgba32f", @@ -12061,7 +12061,7 @@ "capabilities" : [ "StorageImageExtendedFormats" ], "version": "1.0" }, - { + { "enumerant" : "R64ui", "value" : 40, "capabilities" : [ "Int64ImageEXT" ], @@ -12328,22 +12328,22 @@ { "enumerant" : "RTE", "value" : 0, - "version" : "1.0" + "version" : "1.0" }, { "enumerant" : "RTZ", "value" : 1, - "version" : "1.0" + "version" : "1.0" }, { "enumerant" : "RTP", "value" : 2, - "version" : "1.0" + "version" : "1.0" }, { "enumerant" : "RTN", "value" : 3, - "version" : "1.0" + "version" : "1.0" } ] }, @@ -12362,7 +12362,7 @@ "value" : 1, "capabilities" : [ "FunctionFloatControlINTEL" ], "version" : "None" - } + } ] }, { @@ -12733,17 +12733,17 @@ { "enumerant" : "Restrict", "value" : 19, - "version" : "1.0" + "version" : "1.0" }, { "enumerant" : "Aliased", "value" : 20, - "version" : "1.0" + "version" : "1.0" }, { "enumerant" : "Volatile", "value" : 21, - "version" : "1.0" + "version" : "1.0" }, { "enumerant" : "Constant", @@ -13567,34 +13567,6 @@ "capabilities" : [ "VectorComputeINTEL" ], "version" : "None" }, - { - "enumerant" : "InitModeINTEL", - "value" : 6147, - "parameters": [ - { "kind" : "InitializationModeQualifier", "name" : "'Trigger'" } - ], - "capabilities" : [ "GlobalVariableFPGADecorationsINTEL" ], - "version" : "None" - }, - { - "enumerant" : "ImplementInRegisterMapINTEL", - "value" : 6148, - "parameters": [ - { "kind" : "LiteralInteger", "name" : "Value" } - ], - "capabilities" : [ "GlobalVariableFPGADecorationsINTEL" ], - "version" : "None" - }, - { - "enumerant" : "HostAccessINTEL", - "value" : 6168, - "parameters": [ - { "kind" : "HostAccessQualifier", "name" : "'Access'" }, - { "kind" : "LiteralString", "name" : "'Name'" } - ], - "capabilities" : [ "GlobalVariableHostAccessINTEL" ], - "version" : "None" - }, { "enumerant" : "FPMaxErrorDecorationINTEL", "value" : 6170, @@ -13696,6 +13668,34 @@ "capabilities" : [ "FPGAArgumentInterfacesINTEL" ], "version" : "None" }, + { + "enumerant" : "HostAccessINTEL", + "value" : 6188, + "parameters": [ + { "kind" : "HostAccessQualifier", "name" : "'Access'" }, + { "kind" : "LiteralString", "name" : "'Name'" } + ], + "capabilities" : [ "GlobalVariableHostAccessINTEL" ], + "version" : "None" + }, + { + "enumerant" : "InitModeINTEL", + "value" : 6190, + "parameters": [ + { "kind" : "InitializationModeQualifier", "name" : "'Trigger'" } + ], + "capabilities" : [ "GlobalVariableFPGADecorationsINTEL" ], + "version" : "None" + }, + { + "enumerant" : "ImplementInRegisterMapINTEL", + "value" : 6191, + "parameters": [ + { "kind" : "LiteralInteger", "name" : "Value" } + ], + "capabilities" : [ "GlobalVariableFPGADecorationsINTEL" ], + "version" : "None" + }, { "enumerant" : "CacheControlLoadINTEL", "value" : 6442, @@ -13857,32 +13857,32 @@ { "enumerant" : "NumWorkgroups", "value" : 24, - "version" : "1.0" + "version" : "1.0" }, { "enumerant" : "WorkgroupSize", "value" : 25, - "version" : "1.0" + "version" : "1.0" }, { "enumerant" : "WorkgroupId", "value" : 26, - "version" : "1.0" + "version" : "1.0" }, { "enumerant" : "LocalInvocationId", "value" : 27, - "version" : "1.0" + "version" : "1.0" }, { "enumerant" : "GlobalInvocationId", "value" : 28, - "version" : "1.0" + "version" : "1.0" }, { "enumerant" : "LocalInvocationIndex", "value" : 29, - "version" : "1.0" + "version" : "1.0" }, { "enumerant" : "WorkDim", @@ -14626,27 +14626,27 @@ { "enumerant" : "CrossDevice", "value" : 0, - "version" : "1.0" + "version" : "1.0" }, { "enumerant" : "Device", "value" : 1, - "version" : "1.0" + "version" : "1.0" }, { "enumerant" : "Workgroup", "value" : 2, - "version" : "1.0" + "version" : "1.0" }, { "enumerant" : "Subgroup", "value" : 3, - "version" : "1.0" + "version" : "1.0" }, { "enumerant" : "Invocation", "value" : 4, - "version" : "1.0" + "version" : "1.0" }, { "enumerant" : "QueueFamily", @@ -14750,7 +14750,7 @@ { "enumerant" : "Matrix", "value" : 0, - "version" : "1.0" + "version" : "1.0" }, { "enumerant" : "Shader", @@ -14773,17 +14773,17 @@ { "enumerant" : "Addresses", "value" : 4, - "version" : "1.0" + "version" : "1.0" }, { "enumerant" : "Linkage", "value" : 5, - "version" : "1.0" + "version" : "1.0" }, { "enumerant" : "Kernel", "value" : 6, - "version" : "1.0" + "version" : "1.0" }, { "enumerant" : "Vector16", @@ -14800,17 +14800,17 @@ { "enumerant" : "Float16", "value" : 9, - "version" : "1.0" + "version" : "1.0" }, { "enumerant" : "Float64", "value" : 10, - "version" : "1.0" + "version" : "1.0" }, { "enumerant" : "Int64", "value" : 11, - "version" : "1.0" + "version" : "1.0" }, { "enumerant" : "Int64Atomics", @@ -14869,7 +14869,7 @@ { "enumerant" : "Int16", "value" : 22, - "version" : "1.0" + "version" : "1.0" }, { "enumerant" : "TessellationPointSize", @@ -14964,7 +14964,7 @@ { "enumerant" : "Int8", "value" : 39, - "version" : "1.0" + "version" : "1.0" }, { "enumerant" : "InputAttachment", @@ -14987,7 +14987,7 @@ { "enumerant" : "Sampled1D", "value" : 43, - "version" : "1.0" + "version" : "1.0" }, { "enumerant" : "Image1D", @@ -15004,7 +15004,7 @@ { "enumerant" : "SampledBuffer", "value" : 46, - "version" : "1.0" + "version" : "1.0" }, { "enumerant" : "ImageBuffer", @@ -15213,7 +15213,7 @@ { "enumerant" : "WorkgroupMemoryExplicitLayout16BitAccessKHR", "value" : 4430, - "capabilities" : [ "Shader" ], + "capabilities" : [ "WorkgroupMemoryExplicitLayoutKHR" ], "extensions" : [ "SPV_KHR_workgroup_memory_explicit_layout" ], "version" : "None" }, @@ -16259,12 +16259,6 @@ "extensions" : [ "SPV_INTEL_split_barrier" ], "version" : "None" }, - { - "enumerant" : "GlobalVariableFPGADecorationsINTEL", - "value" : 6146, - "extensions": [ "SPV_INTEL_global_variable_fpga_decorations" ], - "version" : "None" - }, { "enumerant" : "FPGAKernelAttributesv2INTEL", "value" : 6161, @@ -16272,12 +16266,6 @@ "extensions" : [ "SPV_INTEL_kernel_attributes" ], "version" : "None" }, - { - "enumerant" : "GlobalVariableHostAccessINTEL", - "value" : 6167, - "extensions": [ "SPV_INTEL_global_variable_host_access" ], - "version" : "None" - }, { "enumerant" : "FPMaxErrorINTEL", "value" : 6169, @@ -16296,6 +16284,18 @@ "extensions" : [ "SPV_INTEL_fpga_argument_interfaces" ], "version" : "None" }, + { + "enumerant" : "GlobalVariableHostAccessINTEL", + "value" : 6187, + "extensions": [ "SPV_INTEL_global_variable_host_access" ], + "version" : "None" + }, + { + "enumerant" : "GlobalVariableFPGADecorationsINTEL", + "value" : 6189, + "extensions": [ "SPV_INTEL_global_variable_fpga_decorations" ], + "version" : "None" + }, { "enumerant" : "GroupUniformArithmeticKHR", "value" : 6400, diff --git a/3rdparty/spirv-headers/include/spirv/unified1/spirv.h b/3rdparty/spirv-headers/include/spirv/unified1/spirv.h index 5becba25d..a1718715d 100644 --- a/3rdparty/spirv-headers/include/spirv/unified1/spirv.h +++ b/3rdparty/spirv-headers/include/spirv/unified1/spirv.h @@ -608,9 +608,6 @@ typedef enum SpvDecoration_ { SpvDecorationSingleElementVectorINTEL = 6085, SpvDecorationVectorComputeCallableFunctionINTEL = 6087, SpvDecorationMediaBlockIOINTEL = 6140, - SpvDecorationInitModeINTEL = 6147, - SpvDecorationImplementInRegisterMapINTEL = 6148, - SpvDecorationHostAccessINTEL = 6168, SpvDecorationFPMaxErrorDecorationINTEL = 6170, SpvDecorationLatencyControlLabelINTEL = 6172, SpvDecorationLatencyControlConstraintINTEL = 6173, @@ -623,6 +620,9 @@ typedef enum SpvDecoration_ { SpvDecorationMMHostInterfaceMaxBurstINTEL = 6181, SpvDecorationMMHostInterfaceWaitRequestINTEL = 6182, SpvDecorationStableKernelArgumentINTEL = 6183, + SpvDecorationHostAccessINTEL = 6188, + SpvDecorationInitModeINTEL = 6190, + SpvDecorationImplementInRegisterMapINTEL = 6191, SpvDecorationCacheControlLoadINTEL = 6442, SpvDecorationCacheControlStoreINTEL = 6443, SpvDecorationMax = 0x7fffffff, @@ -1202,12 +1202,12 @@ typedef enum SpvCapability_ { SpvCapabilityDebugInfoModuleINTEL = 6114, SpvCapabilityBFloat16ConversionINTEL = 6115, SpvCapabilitySplitBarrierINTEL = 6141, - SpvCapabilityGlobalVariableFPGADecorationsINTEL = 6146, SpvCapabilityFPGAKernelAttributesv2INTEL = 6161, - SpvCapabilityGlobalVariableHostAccessINTEL = 6167, SpvCapabilityFPMaxErrorINTEL = 6169, SpvCapabilityFPGALatencyControlINTEL = 6171, SpvCapabilityFPGAArgumentInterfacesINTEL = 6174, + SpvCapabilityGlobalVariableHostAccessINTEL = 6187, + SpvCapabilityGlobalVariableFPGADecorationsINTEL = 6189, SpvCapabilityGroupUniformArithmeticKHR = 6400, SpvCapabilityCacheControlsINTEL = 6441, SpvCapabilityMax = 0x7fffffff, diff --git a/3rdparty/spirv-headers/include/spirv/unified1/spirv.hpp11 b/3rdparty/spirv-headers/include/spirv/unified1/spirv.hpp11 index f10a13507..e49e491e3 100644 --- a/3rdparty/spirv-headers/include/spirv/unified1/spirv.hpp11 +++ b/3rdparty/spirv-headers/include/spirv/unified1/spirv.hpp11 @@ -604,9 +604,6 @@ enum class Decoration : unsigned { SingleElementVectorINTEL = 6085, VectorComputeCallableFunctionINTEL = 6087, MediaBlockIOINTEL = 6140, - InitModeINTEL = 6147, - ImplementInRegisterMapINTEL = 6148, - HostAccessINTEL = 6168, FPMaxErrorDecorationINTEL = 6170, LatencyControlLabelINTEL = 6172, LatencyControlConstraintINTEL = 6173, @@ -619,6 +616,9 @@ enum class Decoration : unsigned { MMHostInterfaceMaxBurstINTEL = 6181, MMHostInterfaceWaitRequestINTEL = 6182, StableKernelArgumentINTEL = 6183, + HostAccessINTEL = 6188, + InitModeINTEL = 6190, + ImplementInRegisterMapINTEL = 6191, CacheControlLoadINTEL = 6442, CacheControlStoreINTEL = 6443, Max = 0x7fffffff, @@ -1198,12 +1198,12 @@ enum class Capability : unsigned { DebugInfoModuleINTEL = 6114, BFloat16ConversionINTEL = 6115, SplitBarrierINTEL = 6141, - GlobalVariableFPGADecorationsINTEL = 6146, FPGAKernelAttributesv2INTEL = 6161, - GlobalVariableHostAccessINTEL = 6167, FPMaxErrorINTEL = 6169, FPGALatencyControlINTEL = 6171, FPGAArgumentInterfacesINTEL = 6174, + GlobalVariableHostAccessINTEL = 6187, + GlobalVariableFPGADecorationsINTEL = 6189, GroupUniformArithmeticKHR = 6400, CacheControlsINTEL = 6441, Max = 0x7fffffff, diff --git a/3rdparty/spirv-headers/include/spirv/unified1/spirv.json b/3rdparty/spirv-headers/include/spirv/unified1/spirv.json index 44a30fa18..f1ad055aa 100644 --- a/3rdparty/spirv-headers/include/spirv/unified1/spirv.json +++ b/3rdparty/spirv-headers/include/spirv/unified1/spirv.json @@ -630,9 +630,6 @@ "SingleElementVectorINTEL": 6085, "VectorComputeCallableFunctionINTEL": 6087, "MediaBlockIOINTEL": 6140, - "InitModeINTEL": 6147, - "ImplementInRegisterMapINTEL": 6148, - "HostAccessINTEL": 6168, "FPMaxErrorDecorationINTEL": 6170, "LatencyControlLabelINTEL": 6172, "LatencyControlConstraintINTEL": 6173, @@ -645,6 +642,9 @@ "MMHostInterfaceMaxBurstINTEL": 6181, "MMHostInterfaceWaitRequestINTEL": 6182, "StableKernelArgumentINTEL": 6183, + "HostAccessINTEL": 6188, + "InitModeINTEL": 6190, + "ImplementInRegisterMapINTEL": 6191, "CacheControlLoadINTEL": 6442, "CacheControlStoreINTEL": 6443 } @@ -1178,12 +1178,12 @@ "DebugInfoModuleINTEL": 6114, "BFloat16ConversionINTEL": 6115, "SplitBarrierINTEL": 6141, - "GlobalVariableFPGADecorationsINTEL": 6146, "FPGAKernelAttributesv2INTEL": 6161, - "GlobalVariableHostAccessINTEL": 6167, "FPMaxErrorINTEL": 6169, "FPGALatencyControlINTEL": 6171, "FPGAArgumentInterfacesINTEL": 6174, + "GlobalVariableHostAccessINTEL": 6187, + "GlobalVariableFPGADecorationsINTEL": 6189, "GroupUniformArithmeticKHR": 6400, "CacheControlsINTEL": 6441 }