openharmony/third_party_spirv-headers
1
0
Fork 0
mirror of https://github.com/openharmony/third_party_spirv-headers.git synced 2026-07-19 14:53:32 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #200 from dneto0/public-spv-khr-linkonce-odr-spv-khr-expect-assume

Browse Source 
Support SPV_KHR_linkonce_odr and SPV_KHR_expect_assume
This commit is contained in:
Raun Krisch
2021-03-05 10:31:29 -06:00
committed by GitHub
parent 12ec562468 3f67a57875
commit 6d2a6517ea
9 changed files with 77 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/spirv/unified1/spirv.core.grammar.json
+38
View File
@@ -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,
include/spirv/unified1/spirv.cs
+4
View File
@@ -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,
include/spirv/unified1/spirv.h
+6
View File
@@ -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;
include/spirv/unified1/spirv.hpp
+6
View File
@@ -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;
include/spirv/unified1/spirv.hpp11
+6
View File
@@ -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;
include/spirv/unified1/spirv.json
+5 -1
View File
@@ -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,
include/spirv/unified1/spirv.lua
+4
View File
@@ -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,
include/spirv/unified1/spirv.py
+4
View File
@@ -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,
include/spirv/unified1/spv.d
+4
View File
@@ -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,