From 1bee3c81a26c32253bd67d2916e74c85c4575219 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: Wed, 10 Mar 2021 21:33:03 -0800 Subject: [PATCH] Updated spirv-headers. --- .../spirv-headers/include/spirv/spir-v.xml | 3 +- .../include/spirv/unified1/DebugInfo.h | 1 + .../spirv/unified1/OpenCLDebugInfo100.h | 1 + .../unified1/extinst.debuginfo.grammar.json | 4 ++ .../extinst.opencl.debuginfo.100.grammar.json | 4 ++ .../spirv/unified1/spirv.core.grammar.json | 40 ++++++++++++++++++- .../include/spirv/unified1/spirv.cs | 4 ++ .../include/spirv/unified1/spirv.h | 6 +++ .../include/spirv/unified1/spirv.hpp | 6 +++ .../include/spirv/unified1/spirv.hpp11 | 6 +++ .../include/spirv/unified1/spirv.json | 6 ++- .../include/spirv/unified1/spirv.lua | 4 ++ .../include/spirv/unified1/spirv.py | 4 ++ .../include/spirv/unified1/spv.d | 4 ++ 14 files changed, 90 insertions(+), 3 deletions(-) diff --git a/3rdparty/spirv-headers/include/spirv/spir-v.xml b/3rdparty/spirv-headers/include/spirv/spir-v.xml index f4c8add85..c1c91ea43 100644 --- a/3rdparty/spirv-headers/include/spirv/spir-v.xml +++ b/3rdparty/spirv-headers/include/spirv/spir-v.xml @@ -78,7 +78,8 @@ - + + diff --git a/3rdparty/spirv-headers/include/spirv/unified1/DebugInfo.h b/3rdparty/spirv-headers/include/spirv/unified1/DebugInfo.h index c50a1318b..4657556bf 100644 --- a/3rdparty/spirv-headers/include/spirv/unified1/DebugInfo.h +++ b/3rdparty/spirv-headers/include/spirv/unified1/DebugInfo.h @@ -78,6 +78,7 @@ enum DebugInfoInstructions { enum DebugInfoDebugInfoFlags { + DebugInfoNone = 0x0000, DebugInfoFlagIsProtected = 0x01, DebugInfoFlagIsPrivate = 0x02, DebugInfoFlagIsPublic = 0x03, diff --git a/3rdparty/spirv-headers/include/spirv/unified1/OpenCLDebugInfo100.h b/3rdparty/spirv-headers/include/spirv/unified1/OpenCLDebugInfo100.h index 1149980ff..7285bd410 100644 --- a/3rdparty/spirv-headers/include/spirv/unified1/OpenCLDebugInfo100.h +++ b/3rdparty/spirv-headers/include/spirv/unified1/OpenCLDebugInfo100.h @@ -80,6 +80,7 @@ enum OpenCLDebugInfo100Instructions { enum OpenCLDebugInfo100DebugInfoFlags { + OpenCLDebugInfo100None = 0x0000, OpenCLDebugInfo100FlagIsProtected = 0x01, OpenCLDebugInfo100FlagIsPrivate = 0x02, OpenCLDebugInfo100FlagIsPublic = 0x03, diff --git a/3rdparty/spirv-headers/include/spirv/unified1/extinst.debuginfo.grammar.json b/3rdparty/spirv-headers/include/spirv/unified1/extinst.debuginfo.grammar.json index 9212f6f48..7d6e8e5b3 100644 --- a/3rdparty/spirv-headers/include/spirv/unified1/extinst.debuginfo.grammar.json +++ b/3rdparty/spirv-headers/include/spirv/unified1/extinst.debuginfo.grammar.json @@ -376,6 +376,10 @@ "category" : "BitEnum", "kind" : "DebugInfoFlags", "enumerants" : [ + { + "enumerant" : "None", + "value" : "0x0000" + }, { "enumerant" : "FlagIsProtected", "value" : "0x01" diff --git a/3rdparty/spirv-headers/include/spirv/unified1/extinst.opencl.debuginfo.100.grammar.json b/3rdparty/spirv-headers/include/spirv/unified1/extinst.opencl.debuginfo.100.grammar.json index 08062be4f..d4cfab215 100644 --- a/3rdparty/spirv-headers/include/spirv/unified1/extinst.opencl.debuginfo.100.grammar.json +++ b/3rdparty/spirv-headers/include/spirv/unified1/extinst.opencl.debuginfo.100.grammar.json @@ -402,6 +402,10 @@ "category" : "BitEnum", "kind" : "DebugInfoFlags", "enumerants" : [ + { + "enumerant" : "None", + "value" : "0x0000" + }, { "enumerant" : "FlagIsProtected", "value" : "0x01" 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 49f1bbc59..b6eeee227 100644 --- a/3rdparty/spirv-headers/include/spirv/unified1/spirv.core.grammar.json +++ b/3rdparty/spirv-headers/include/spirv/unified1/spirv.core.grammar.json @@ -4552,7 +4552,7 @@ "operands" : [ { "kind" : "IdResultType" }, { "kind" : "IdResult" }, - { "kind" : "IdScope", "name" : "'Execution'" } + { "kind" : "IdScope", "name" : "'Scope'" } ], "capabilities" : [ "ShaderClockKHR" ], "extensions" : [ "SPV_KHR_shader_clock" ], @@ -5218,6 +5218,31 @@ "capabilities" : [ "AtomicFloat16MinMaxEXT", "AtomicFloat32MinMaxEXT", "AtomicFloat64MinMaxEXT" ], "version" : "None" }, + { + "opname" : "OpAssumeTrueKHR", + "class" : "Miscellaneous", + "opcode" : 5630, + "operands" : [ + { "kind" : "IdRef", "name" : "'Condition'" } + ], + "capabilities" : [ "ExpectAssumeKHR" ], + "extensions" : [ "SPV_KHR_expect_assume" ], + "version" : "None" + }, + { + "opname" : "OpExpectKHR", + "class" : "Miscellaneous", + "opcode" : 5631, + "operands" : [ + { "kind" : "IdResultType" }, + { "kind" : "IdResult" }, + { "kind" : "IdRef", "name" : "'Value'" }, + { "kind" : "IdRef", "name" : "'ExpectedValue'" } + ], + "capabilities" : [ "ExpectAssumeKHR" ], + "extensions" : [ "SPV_KHR_expect_assume" ], + "version" : "None" + }, { "opname" : "OpDecorateString", "class" : "Annotation", @@ -9411,6 +9436,13 @@ "enumerant" : "Import", "value" : 1, "capabilities" : [ "Linkage" ] + }, + { + "enumerant" : "LinkOnceODR", + "value" : 2, + "capabilities" : [ "Linkage" ], + "extensions" : [ "SPV_KHR_linkonce_odr" ], + "version" : "None" } ] }, @@ -12123,6 +12155,12 @@ "extensions" : [ "SPV_INTEL_vector_compute" ], "version" : "None" }, + { + "enumerant" : "ExpectAssumeKHR", + "value" : 5629, + "extensions" : [ "SPV_KHR_expect_assume" ], + "version" : "None" + }, { "enumerant" : "SubgroupAvcMotionEstimationINTEL", "value" : 5696, diff --git a/3rdparty/spirv-headers/include/spirv/unified1/spirv.cs b/3rdparty/spirv-headers/include/spirv/unified1/spirv.cs index c83b731c1..a90996c6f 100644 --- a/3rdparty/spirv-headers/include/spirv/unified1/spirv.cs +++ b/3rdparty/spirv-headers/include/spirv/unified1/spirv.cs @@ -407,6 +407,7 @@ namespace Spv { Export = 0, Import = 1, + LinkOnceODR = 2, } public enum AccessQualifier @@ -1019,6 +1020,7 @@ namespace Spv AtomicFloat16MinMaxEXT = 5616, VectorComputeINTEL = 5617, VectorAnyINTEL = 5619, + ExpectAssumeKHR = 5629, SubgroupAvcMotionEstimationINTEL = 5696, SubgroupAvcMotionEstimationIntraINTEL = 5697, SubgroupAvcMotionEstimationChromaINTEL = 5698, @@ -1548,6 +1550,8 @@ namespace Spv OpAsmCallINTEL = 5611, OpAtomicFMinEXT = 5614, OpAtomicFMaxEXT = 5615, + OpAssumeTrueKHR = 5630, + OpExpectKHR = 5631, OpDecorateString = 5632, OpDecorateStringGOOGLE = 5632, OpMemberDecorateString = 5633, diff --git a/3rdparty/spirv-headers/include/spirv/unified1/spirv.h b/3rdparty/spirv-headers/include/spirv/unified1/spirv.h index fbdc76330..1bab0aaea 100644 --- a/3rdparty/spirv-headers/include/spirv/unified1/spirv.h +++ b/3rdparty/spirv-headers/include/spirv/unified1/spirv.h @@ -413,6 +413,7 @@ typedef enum SpvFPRoundingMode_ { typedef enum SpvLinkageType_ { SpvLinkageTypeExport = 0, SpvLinkageTypeImport = 1, + SpvLinkageTypeLinkOnceODR = 2, SpvLinkageTypeMax = 0x7fffffff, } SpvLinkageType; @@ -1019,6 +1020,7 @@ typedef enum SpvCapability_ { SpvCapabilityAtomicFloat16MinMaxEXT = 5616, SpvCapabilityVectorComputeINTEL = 5617, SpvCapabilityVectorAnyINTEL = 5619, + SpvCapabilityExpectAssumeKHR = 5629, SpvCapabilitySubgroupAvcMotionEstimationINTEL = 5696, SpvCapabilitySubgroupAvcMotionEstimationIntraINTEL = 5697, SpvCapabilitySubgroupAvcMotionEstimationChromaINTEL = 5698, @@ -1546,6 +1548,8 @@ typedef enum SpvOp_ { SpvOpAsmCallINTEL = 5611, SpvOpAtomicFMinEXT = 5614, SpvOpAtomicFMaxEXT = 5615, + SpvOpAssumeTrueKHR = 5630, + SpvOpExpectKHR = 5631, SpvOpDecorateString = 5632, SpvOpDecorateStringGOOGLE = 5632, SpvOpMemberDecorateString = 5633, @@ -2130,6 +2134,8 @@ inline void SpvHasResultAndType(SpvOp opcode, bool *hasResult, bool *hasResultTy case SpvOpAsmCallINTEL: *hasResult = true; *hasResultType = true; break; case SpvOpAtomicFMinEXT: *hasResult = true; *hasResultType = true; break; case SpvOpAtomicFMaxEXT: *hasResult = true; *hasResultType = true; break; + case SpvOpAssumeTrueKHR: *hasResult = false; *hasResultType = false; break; + case SpvOpExpectKHR: *hasResult = true; *hasResultType = true; break; case SpvOpDecorateString: *hasResult = false; *hasResultType = false; break; case SpvOpMemberDecorateString: *hasResult = false; *hasResultType = false; break; case SpvOpVmeImageINTEL: *hasResult = true; *hasResultType = true; break; diff --git a/3rdparty/spirv-headers/include/spirv/unified1/spirv.hpp b/3rdparty/spirv-headers/include/spirv/unified1/spirv.hpp index 19e28b8cb..5df8e472a 100644 --- a/3rdparty/spirv-headers/include/spirv/unified1/spirv.hpp +++ b/3rdparty/spirv-headers/include/spirv/unified1/spirv.hpp @@ -409,6 +409,7 @@ enum FPRoundingMode { enum LinkageType { LinkageTypeExport = 0, LinkageTypeImport = 1, + LinkageTypeLinkOnceODR = 2, LinkageTypeMax = 0x7fffffff, }; @@ -1015,6 +1016,7 @@ enum Capability { CapabilityAtomicFloat16MinMaxEXT = 5616, CapabilityVectorComputeINTEL = 5617, CapabilityVectorAnyINTEL = 5619, + CapabilityExpectAssumeKHR = 5629, CapabilitySubgroupAvcMotionEstimationINTEL = 5696, CapabilitySubgroupAvcMotionEstimationIntraINTEL = 5697, CapabilitySubgroupAvcMotionEstimationChromaINTEL = 5698, @@ -1542,6 +1544,8 @@ enum Op { OpAsmCallINTEL = 5611, OpAtomicFMinEXT = 5614, OpAtomicFMaxEXT = 5615, + OpAssumeTrueKHR = 5630, + OpExpectKHR = 5631, OpDecorateString = 5632, OpDecorateStringGOOGLE = 5632, OpMemberDecorateString = 5633, @@ -2126,6 +2130,8 @@ inline void HasResultAndType(Op opcode, bool *hasResult, bool *hasResultType) { case OpAsmCallINTEL: *hasResult = true; *hasResultType = true; break; case OpAtomicFMinEXT: *hasResult = true; *hasResultType = true; break; case OpAtomicFMaxEXT: *hasResult = true; *hasResultType = true; break; + case OpAssumeTrueKHR: *hasResult = false; *hasResultType = false; break; + case OpExpectKHR: *hasResult = true; *hasResultType = true; break; case OpDecorateString: *hasResult = false; *hasResultType = false; break; case OpMemberDecorateString: *hasResult = false; *hasResultType = false; break; case OpVmeImageINTEL: *hasResult = true; *hasResultType = true; break; diff --git a/3rdparty/spirv-headers/include/spirv/unified1/spirv.hpp11 b/3rdparty/spirv-headers/include/spirv/unified1/spirv.hpp11 index 26ee33add..539ddd659 100644 --- a/3rdparty/spirv-headers/include/spirv/unified1/spirv.hpp11 +++ b/3rdparty/spirv-headers/include/spirv/unified1/spirv.hpp11 @@ -409,6 +409,7 @@ enum class FPRoundingMode : unsigned { enum class LinkageType : unsigned { Export = 0, Import = 1, + LinkOnceODR = 2, Max = 0x7fffffff, }; @@ -1015,6 +1016,7 @@ enum class Capability : unsigned { AtomicFloat16MinMaxEXT = 5616, VectorComputeINTEL = 5617, VectorAnyINTEL = 5619, + ExpectAssumeKHR = 5629, SubgroupAvcMotionEstimationINTEL = 5696, SubgroupAvcMotionEstimationIntraINTEL = 5697, SubgroupAvcMotionEstimationChromaINTEL = 5698, @@ -1542,6 +1544,8 @@ enum class Op : unsigned { OpAsmCallINTEL = 5611, OpAtomicFMinEXT = 5614, OpAtomicFMaxEXT = 5615, + OpAssumeTrueKHR = 5630, + OpExpectKHR = 5631, OpDecorateString = 5632, OpDecorateStringGOOGLE = 5632, OpMemberDecorateString = 5633, @@ -2126,6 +2130,8 @@ inline void HasResultAndType(Op opcode, bool *hasResult, bool *hasResultType) { case Op::OpAsmCallINTEL: *hasResult = true; *hasResultType = true; break; case Op::OpAtomicFMinEXT: *hasResult = true; *hasResultType = true; break; case Op::OpAtomicFMaxEXT: *hasResult = true; *hasResultType = true; break; + case Op::OpAssumeTrueKHR: *hasResult = false; *hasResultType = false; break; + case Op::OpExpectKHR: *hasResult = true; *hasResultType = true; break; case Op::OpDecorateString: *hasResult = false; *hasResultType = false; break; case Op::OpMemberDecorateString: *hasResult = false; *hasResultType = false; break; case Op::OpVmeImageINTEL: *hasResult = true; *hasResultType = true; break; diff --git a/3rdparty/spirv-headers/include/spirv/unified1/spirv.json b/3rdparty/spirv-headers/include/spirv/unified1/spirv.json index d12eb68da..a03be06f4 100644 --- a/3rdparty/spirv-headers/include/spirv/unified1/spirv.json +++ b/3rdparty/spirv-headers/include/spirv/unified1/spirv.json @@ -427,7 +427,8 @@ "Values": { "Export": 0, - "Import": 1 + "Import": 1, + "LinkOnceODR": 2 } }, { @@ -1002,6 +1003,7 @@ "AtomicFloat16MinMaxEXT": 5616, "VectorComputeINTEL": 5617, "VectorAnyINTEL": 5619, + "ExpectAssumeKHR": 5629, "SubgroupAvcMotionEstimationINTEL": 5696, "SubgroupAvcMotionEstimationIntraINTEL": 5697, "SubgroupAvcMotionEstimationChromaINTEL": 5698, @@ -1531,6 +1533,8 @@ "OpAsmCallINTEL": 5611, "OpAtomicFMinEXT": 5614, "OpAtomicFMaxEXT": 5615, + "OpAssumeTrueKHR": 5630, + "OpExpectKHR": 5631, "OpDecorateString": 5632, "OpDecorateStringGOOGLE": 5632, "OpMemberDecorateString": 5633, diff --git a/3rdparty/spirv-headers/include/spirv/unified1/spirv.lua b/3rdparty/spirv-headers/include/spirv/unified1/spirv.lua index b9c8bc471..ed0549b20 100644 --- a/3rdparty/spirv-headers/include/spirv/unified1/spirv.lua +++ b/3rdparty/spirv-headers/include/spirv/unified1/spirv.lua @@ -385,6 +385,7 @@ spv = { LinkageType = { Export = 0, Import = 1, + LinkOnceODR = 2, }, AccessQualifier = { @@ -977,6 +978,7 @@ spv = { AtomicFloat16MinMaxEXT = 5616, VectorComputeINTEL = 5617, VectorAnyINTEL = 5619, + ExpectAssumeKHR = 5629, SubgroupAvcMotionEstimationINTEL = 5696, SubgroupAvcMotionEstimationIntraINTEL = 5697, SubgroupAvcMotionEstimationChromaINTEL = 5698, @@ -1496,6 +1498,8 @@ spv = { OpAsmCallINTEL = 5611, OpAtomicFMinEXT = 5614, OpAtomicFMaxEXT = 5615, + OpAssumeTrueKHR = 5630, + OpExpectKHR = 5631, OpDecorateString = 5632, OpDecorateStringGOOGLE = 5632, OpMemberDecorateString = 5633, diff --git a/3rdparty/spirv-headers/include/spirv/unified1/spirv.py b/3rdparty/spirv-headers/include/spirv/unified1/spirv.py index 0829dc1a5..90e71c4fd 100644 --- a/3rdparty/spirv-headers/include/spirv/unified1/spirv.py +++ b/3rdparty/spirv-headers/include/spirv/unified1/spirv.py @@ -385,6 +385,7 @@ spv = { 'LinkageType' : { 'Export' : 0, 'Import' : 1, + 'LinkOnceODR' : 2, }, 'AccessQualifier' : { @@ -977,6 +978,7 @@ spv = { 'AtomicFloat16MinMaxEXT' : 5616, 'VectorComputeINTEL' : 5617, 'VectorAnyINTEL' : 5619, + 'ExpectAssumeKHR' : 5629, 'SubgroupAvcMotionEstimationINTEL' : 5696, 'SubgroupAvcMotionEstimationIntraINTEL' : 5697, 'SubgroupAvcMotionEstimationChromaINTEL' : 5698, @@ -1496,6 +1498,8 @@ spv = { 'OpAsmCallINTEL' : 5611, 'OpAtomicFMinEXT' : 5614, 'OpAtomicFMaxEXT' : 5615, + 'OpAssumeTrueKHR' : 5630, + 'OpExpectKHR' : 5631, 'OpDecorateString' : 5632, 'OpDecorateStringGOOGLE' : 5632, 'OpMemberDecorateString' : 5633, diff --git a/3rdparty/spirv-headers/include/spirv/unified1/spv.d b/3rdparty/spirv-headers/include/spirv/unified1/spv.d index e1db29ba4..95c61c0d8 100644 --- a/3rdparty/spirv-headers/include/spirv/unified1/spv.d +++ b/3rdparty/spirv-headers/include/spirv/unified1/spv.d @@ -410,6 +410,7 @@ enum LinkageType : uint { Export = 0, Import = 1, + LinkOnceODR = 2, } enum AccessQualifier : uint @@ -1022,6 +1023,7 @@ enum Capability : uint AtomicFloat16MinMaxEXT = 5616, VectorComputeINTEL = 5617, VectorAnyINTEL = 5619, + ExpectAssumeKHR = 5629, SubgroupAvcMotionEstimationINTEL = 5696, SubgroupAvcMotionEstimationIntraINTEL = 5697, SubgroupAvcMotionEstimationChromaINTEL = 5698, @@ -1551,6 +1553,8 @@ enum Op : uint OpAsmCallINTEL = 5611, OpAtomicFMinEXT = 5614, OpAtomicFMaxEXT = 5615, + OpAssumeTrueKHR = 5630, + OpExpectKHR = 5631, OpDecorateString = 5632, OpDecorateStringGOOGLE = 5632, OpMemberDecorateString = 5633,