Skip to content

Commit 879bcd7

Browse files
johnkslangjohnkslang
authored
Merge pull request KhronosGroup#298 from MrSidims/update_intel_extensions
Update and add several Intel extensions
2 parents 47f2465 + e2f6e9a commit 879bcd7

File tree

10 files changed

+183
-10
lines changed

10 files changed

+183
-10
lines changed

‎include/spirv/unified1/spirv.bf

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -451,6 +451,7 @@ namespace Spv
451451
NoCapture = 5,
452452
NoWrite = 6,
453453
NoReadWrite = 7,
454+
RuntimeAlignedINTEL = 5940,
454455
}
455456

456457
[AllowDuplicates, CRepr] public enum Decoration
@@ -559,8 +560,12 @@ namespace Spv
559560
PrefetchINTEL = 5902,
560561
StallEnableINTEL = 5905,
561562
FuseLoopsInFunctionINTEL = 5907,
563+
MathOpDSPModeINTEL = 5909,
562564
AliasScopeINTEL = 5914,
563565
NoAliasINTEL = 5915,
566+
InitiationIntervalINTEL = 5917,
567+
MaxConcurrencyINTEL = 5918,
568+
PipelineEnableINTEL = 5919,
564569
BufferLocationINTEL = 5921,
565570
IOPipeStorageINTEL = 5944,
566571
FunctionFloatingPointModeINTEL = 6080,
@@ -736,6 +741,8 @@ namespace Spv
736741
MaxInterleavingINTEL = 21,
737742
SpeculatedIterationsINTEL = 22,
738743
NoFusionINTEL = 23,
744+
LoopCountINTEL = 24,
745+
MaxReinvocationDelayINTEL = 25,
739746
}
740747

741748
[AllowDuplicates, CRepr] public enum LoopControlMask
@@ -758,6 +765,8 @@ namespace Spv
758765
MaxInterleavingINTEL = 0x00200000,
759766
SpeculatedIterationsINTEL = 0x00400000,
760767
NoFusionINTEL = 0x00800000,
768+
LoopCountINTEL = 0x01000000,
769+
MaxReinvocationDelayINTEL = 0x02000000,
761770
}
762771

763772
[AllowDuplicates, CRepr] public enum FunctionControlShift
@@ -1097,10 +1106,13 @@ namespace Spv
10971106
FPGAMemoryAccessesINTEL = 5898,
10981107
FPGAClusterAttributesINTEL = 5904,
10991108
LoopFuseINTEL = 5906,
1109+
FPGADSPControlINTEL = 5908,
11001110
MemoryAccessAliasingINTEL = 5910,
1111+
FPGAInvocationPipeliningAttributesINTEL = 5916,
11011112
FPGABufferLocationINTEL = 5920,
11021113
ArbitraryPrecisionFixedPointINTEL = 5922,
11031114
USMStorageClassesINTEL = 5935,
1115+
RuntimeAlignedAttributeINTEL = 5939,
11041116
IOPipesINTEL = 5943,
11051117
BlockingPipesINTEL = 5945,
11061118
FPGARegINTEL = 5948,

‎include/spirv/unified1/spirv.core.grammar.json

Lines changed: 75 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -9020,7 +9020,6 @@
90209020
{ "kind" : "LiteralInteger" }
90219021
],
90229022
"capabilities" : [ "FPGALoopControlsINTEL" ],
9023-
"extensions" : [ "SPV_INTEL_fpga_loop_controls" ],
90249023
"version" : "None"
90259024
},
90269025
{
@@ -9030,7 +9029,6 @@
90309029
{ "kind" : "LiteralInteger" }
90319030
],
90329031
"capabilities" : [ "FPGALoopControlsINTEL" ],
9033-
"extensions" : [ "SPV_INTEL_fpga_loop_controls" ],
90349032
"version" : "None"
90359033
},
90369034
{
@@ -9040,7 +9038,6 @@
90409038
{ "kind" : "LiteralInteger" }
90419039
],
90429040
"capabilities" : [ "FPGALoopControlsINTEL" ],
9043-
"extensions" : [ "SPV_INTEL_fpga_loop_controls" ],
90449041
"version" : "None"
90459042
},
90469043
{
@@ -9050,7 +9047,6 @@
90509047
{ "kind" : "LiteralInteger" }
90519048
],
90529049
"capabilities" : [ "FPGALoopControlsINTEL" ],
9053-
"extensions" : [ "SPV_INTEL_fpga_loop_controls" ],
90549050
"version" : "None"
90559051
},
90569052
{
@@ -9060,7 +9056,6 @@
90609056
{ "kind" : "LiteralInteger" }
90619057
],
90629058
"capabilities" : [ "FPGALoopControlsINTEL" ],
9063-
"extensions" : [ "SPV_INTEL_fpga_loop_controls" ],
90649059
"version" : "None"
90659060
},
90669061
{
@@ -9070,7 +9065,6 @@
90709065
{ "kind" : "LiteralInteger" }
90719066
],
90729067
"capabilities" : [ "FPGALoopControlsINTEL" ],
9073-
"extensions" : [ "SPV_INTEL_fpga_loop_controls" ],
90749068
"version" : "None"
90759069
},
90769070
{
@@ -9080,17 +9074,30 @@
90809074
{ "kind" : "LiteralInteger" }
90819075
],
90829076
"capabilities" : [ "FPGALoopControlsINTEL" ],
9083-
"extensions" : [ "SPV_INTEL_fpga_loop_controls" ],
90849077
"version" : "None"
90859078
},
90869079
{
90879080
"enumerant" : "NoFusionINTEL",
90889081
"value" : "0x800000",
9082+
"capabilities" : [ "FPGALoopControlsINTEL" ],
9083+
"version" : "None"
9084+
},
9085+
{
9086+
"enumerant" : "LoopCountINTEL",
9087+
"value" : "0x1000000",
9088+
"parameters" : [
9089+
{ "kind" : "LiteralInteger" }
9090+
],
9091+
"capabilities" : [ "FPGALoopControlsINTEL" ],
9092+
"version" : "None"
9093+
},
9094+
{
9095+
"enumerant" : "MaxReinvocationDelayINTEL",
9096+
"value" : "0x2000000",
90899097
"parameters" : [
90909098
{ "kind" : "LiteralInteger" }
90919099
],
90929100
"capabilities" : [ "FPGALoopControlsINTEL" ],
9093-
"extensions" : [ "SPV_INTEL_fpga_loop_controls" ],
90949101
"version" : "None"
90959102
}
90969103
]
@@ -11184,6 +11191,11 @@
1118411191
"enumerant" : "NoReadWrite",
1118511192
"value" : 7,
1118611193
"capabilities" : [ "Kernel" ]
11194+
},
11195+
{
11196+
"enumerant" : "RuntimeAlignedINTEL",
11197+
"value" : 5940,
11198+
"capabilities" : [ "RuntimeAlignedAttributeINTEL" ]
1118711199
}
1118811200
]
1118911201
},
@@ -11929,6 +11941,16 @@
1192911941
"capabilities" : [ "LoopFuseINTEL" ],
1193011942
"version" : "None"
1193111943
},
11944+
{
11945+
"enumerant" : "MathOpDSPModeINTEL",
11946+
"value" : 5909,
11947+
"parameters" : [
11948+
{ "kind" : "LiteralInteger", "name" : "'Mode'" },
11949+
{ "kind" : "LiteralInteger", "name" : "'Propagate'" }
11950+
],
11951+
"capabilities" : [ "FPGADSPControlINTEL" ],
11952+
"version" : "None"
11953+
},
1193211954
{
1193311955
"enumerant" : "AliasScopeINTEL",
1193411956
"value" : 5914,
@@ -11947,6 +11969,33 @@
1194711969
"capabilities" : [ "MemoryAccessAliasingINTEL" ],
1194811970
"version" : "None"
1194911971
},
11972+
{
11973+
"enumerant" : "InitiationIntervalINTEL",
11974+
"value" : 5917,
11975+
"parameters" : [
11976+
{ "kind" : "LiteralInteger", "name" : "'Cycles'" }
11977+
],
11978+
"capabilities" : [ "FPGAInvocationPipeliningAttributesINTEL" ],
11979+
"version" : "None"
11980+
},
11981+
{
11982+
"enumerant" : "MaxConcurrencyINTEL",
11983+
"value" : 5918,
11984+
"parameters" : [
11985+
{ "kind" : "LiteralInteger", "name" : "'Invocations'" }
11986+
],
11987+
"capabilities" : [ "FPGAInvocationPipeliningAttributesINTEL" ],
11988+
"version" : "None"
11989+
},
11990+
{
11991+
"enumerant" : "PipelineEnableINTEL",
11992+
"value" : 5919,
11993+
"parameters" : [
11994+
{ "kind" : "LiteralInteger", "name" : "'Enable'" }
11995+
],
11996+
"capabilities" : [ "FPGAInvocationPipeliningAttributesINTEL" ],
11997+
"version" : "None"
11998+
},
1195011999
{
1195112000
"enumerant" : "BufferLocationINTEL",
1195212001
"value" : 5921,
@@ -14124,12 +14173,24 @@
1412414173
"extensions" : [ "SPV_INTEL_loop_fuse" ],
1412514174
"version" : "None"
1412614175
},
14176+
{
14177+
"enumerant" : "FPGADSPControlINTEL",
14178+
"value" : 5908,
14179+
"extensions" : [ "SPV_INTEL_fpga_dsp_control" ],
14180+
"version" : "None"
14181+
},
1412714182
{
1412814183
"enumerant" : "MemoryAccessAliasingINTEL",
1412914184
"value" : 5910,
1413014185
"extensions" : [ "SPV_INTEL_memory_access_aliasing" ],
1413114186
"version" : "None"
1413214187
},
14188+
{
14189+
"enumerant" : "FPGAInvocationPipeliningAttributesINTEL",
14190+
"value" : 5916,
14191+
"extensions" : [ "SPV_INTEL_fpga_invocation_pipelining_attributes" ],
14192+
"version" : "None"
14193+
},
1413314194
{
1413414195
"enumerant" : "FPGABufferLocationINTEL",
1413514196
"value" : 5920,
@@ -14148,6 +14209,12 @@
1414814209
"extensions" : [ "SPV_INTEL_usm_storage_classes" ],
1414914210
"version" : "None"
1415014211
},
14212+
{
14213+
"enumerant" : "RuntimeAlignedAttributeINTEL",
14214+
"value" : 5939,
14215+
"extensions" : [ "SPV_INTEL_runtime_aligned" ],
14216+
"version" : "None"
14217+
},
1415114218
{
1415214219
"enumerant" : "IOPipesINTEL",
1415314220
"value" : 5943,

‎include/spirv/unified1/spirv.cs

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -450,6 +450,7 @@ public enum FunctionParameterAttribute
450450
NoCapture = 5,
451451
NoWrite = 6,
452452
NoReadWrite = 7,
453+
RuntimeAlignedINTEL = 5940,
453454
}
454455

455456
public enum Decoration
@@ -558,8 +559,12 @@ public enum Decoration
558559
PrefetchINTEL = 5902,
559560
StallEnableINTEL = 5905,
560561
FuseLoopsInFunctionINTEL = 5907,
562+
MathOpDSPModeINTEL = 5909,
561563
AliasScopeINTEL = 5914,
562564
NoAliasINTEL = 5915,
565+
InitiationIntervalINTEL = 5917,
566+
MaxConcurrencyINTEL = 5918,
567+
PipelineEnableINTEL = 5919,
563568
BufferLocationINTEL = 5921,
564569
IOPipeStorageINTEL = 5944,
565570
FunctionFloatingPointModeINTEL = 6080,
@@ -735,6 +740,8 @@ public enum LoopControlShift
735740
MaxInterleavingINTEL = 21,
736741
SpeculatedIterationsINTEL = 22,
737742
NoFusionINTEL = 23,
743+
LoopCountINTEL = 24,
744+
MaxReinvocationDelayINTEL = 25,
738745
}
739746

740747
public enum LoopControlMask
@@ -757,6 +764,8 @@ public enum LoopControlMask
757764
MaxInterleavingINTEL = 0x00200000,
758765
SpeculatedIterationsINTEL = 0x00400000,
759766
NoFusionINTEL = 0x00800000,
767+
LoopCountINTEL = 0x01000000,
768+
MaxReinvocationDelayINTEL = 0x02000000,
760769
}
761770

762771
public enum FunctionControlShift
@@ -1096,10 +1105,13 @@ public enum Capability
10961105
FPGAMemoryAccessesINTEL = 5898,
10971106
FPGAClusterAttributesINTEL = 5904,
10981107
LoopFuseINTEL = 5906,
1108+
FPGADSPControlINTEL = 5908,
10991109
MemoryAccessAliasingINTEL = 5910,
1110+
FPGAInvocationPipeliningAttributesINTEL = 5916,
11001111
FPGABufferLocationINTEL = 5920,
11011112
ArbitraryPrecisionFixedPointINTEL = 5922,
11021113
USMStorageClassesINTEL = 5935,
1114+
RuntimeAlignedAttributeINTEL = 5939,
11031115
IOPipesINTEL = 5943,
11041116
BlockingPipesINTEL = 5945,
11051117
FPGARegINTEL = 5948,

‎include/spirv/unified1/spirv.h

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -456,6 +456,7 @@ typedef enum SpvFunctionParameterAttribute_ {
456456
SpvFunctionParameterAttributeNoCapture = 5,
457457
SpvFunctionParameterAttributeNoWrite = 6,
458458
SpvFunctionParameterAttributeNoReadWrite = 7,
459+
SpvFunctionParameterAttributeRuntimeAlignedINTEL = 5940,
459460
SpvFunctionParameterAttributeMax = 0x7fffffff,
460461
} SpvFunctionParameterAttribute;
461462

@@ -564,8 +565,12 @@ typedef enum SpvDecoration_ {
564565
SpvDecorationPrefetchINTEL = 5902,
565566
SpvDecorationStallEnableINTEL = 5905,
566567
SpvDecorationFuseLoopsInFunctionINTEL = 5907,
568+
SpvDecorationMathOpDSPModeINTEL = 5909,
567569
SpvDecorationAliasScopeINTEL = 5914,
568570
SpvDecorationNoAliasINTEL = 5915,
571+
SpvDecorationInitiationIntervalINTEL = 5917,
572+
SpvDecorationMaxConcurrencyINTEL = 5918,
573+
SpvDecorationPipelineEnableINTEL = 5919,
569574
SpvDecorationBufferLocationINTEL = 5921,
570575
SpvDecorationIOPipeStorageINTEL = 5944,
571576
SpvDecorationFunctionFloatingPointModeINTEL = 6080,
@@ -740,6 +745,8 @@ typedef enum SpvLoopControlShift_ {
740745
SpvLoopControlMaxInterleavingINTELShift = 21,
741746
SpvLoopControlSpeculatedIterationsINTELShift = 22,
742747
SpvLoopControlNoFusionINTELShift = 23,
748+
SpvLoopControlLoopCountINTELShift = 24,
749+
SpvLoopControlMaxReinvocationDelayINTELShift = 25,
743750
SpvLoopControlMax = 0x7fffffff,
744751
} SpvLoopControlShift;
745752

@@ -762,6 +769,8 @@ typedef enum SpvLoopControlMask_ {
762769
SpvLoopControlMaxInterleavingINTELMask = 0x00200000,
763770
SpvLoopControlSpeculatedIterationsINTELMask = 0x00400000,
764771
SpvLoopControlNoFusionINTELMask = 0x00800000,
772+
SpvLoopControlLoopCountINTELMask = 0x01000000,
773+
SpvLoopControlMaxReinvocationDelayINTELMask = 0x02000000,
765774
} SpvLoopControlMask;
766775

767776
typedef enum SpvFunctionControlShift_ {
@@ -1096,10 +1105,13 @@ typedef enum SpvCapability_ {
10961105
SpvCapabilityFPGAMemoryAccessesINTEL = 5898,
10971106
SpvCapabilityFPGAClusterAttributesINTEL = 5904,
10981107
SpvCapabilityLoopFuseINTEL = 5906,
1108+
SpvCapabilityFPGADSPControlINTEL = 5908,
10991109
SpvCapabilityMemoryAccessAliasingINTEL = 5910,
1110+
SpvCapabilityFPGAInvocationPipeliningAttributesINTEL = 5916,
11001111
SpvCapabilityFPGABufferLocationINTEL = 5920,
11011112
SpvCapabilityArbitraryPrecisionFixedPointINTEL = 5922,
11021113
SpvCapabilityUSMStorageClassesINTEL = 5935,
1114+
SpvCapabilityRuntimeAlignedAttributeINTEL = 5939,
11031115
SpvCapabilityIOPipesINTEL = 5943,
11041116
SpvCapabilityBlockingPipesINTEL = 5945,
11051117
SpvCapabilityFPGARegINTEL = 5948,

‎include/spirv/unified1/spirv.hpp

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -452,6 +452,7 @@ enum FunctionParameterAttribute {
452452
FunctionParameterAttributeNoCapture = 5,
453453
FunctionParameterAttributeNoWrite = 6,
454454
FunctionParameterAttributeNoReadWrite = 7,
455+
FunctionParameterAttributeRuntimeAlignedINTEL = 5940,
455456
FunctionParameterAttributeMax = 0x7fffffff,
456457
};
457458

@@ -560,8 +561,12 @@ enum Decoration {
560561
DecorationPrefetchINTEL = 5902,
561562
DecorationStallEnableINTEL = 5905,
562563
DecorationFuseLoopsInFunctionINTEL = 5907,
564+
DecorationMathOpDSPModeINTEL = 5909,
563565
DecorationAliasScopeINTEL = 5914,
564566
DecorationNoAliasINTEL = 5915,
567+
DecorationInitiationIntervalINTEL = 5917,
568+
DecorationMaxConcurrencyINTEL = 5918,
569+
DecorationPipelineEnableINTEL = 5919,
565570
DecorationBufferLocationINTEL = 5921,
566571
DecorationIOPipeStorageINTEL = 5944,
567572
DecorationFunctionFloatingPointModeINTEL = 6080,
@@ -736,6 +741,8 @@ enum LoopControlShift {
736741
LoopControlMaxInterleavingINTELShift = 21,
737742
LoopControlSpeculatedIterationsINTELShift = 22,
738743
LoopControlNoFusionINTELShift = 23,
744+
LoopControlLoopCountINTELShift = 24,
745+
LoopControlMaxReinvocationDelayINTELShift = 25,
739746
LoopControlMax = 0x7fffffff,
740747
};
741748

@@ -758,6 +765,8 @@ enum LoopControlMask {
758765
LoopControlMaxInterleavingINTELMask = 0x00200000,
759766
LoopControlSpeculatedIterationsINTELMask = 0x00400000,
760767
LoopControlNoFusionINTELMask = 0x00800000,
768+
LoopControlLoopCountINTELMask = 0x01000000,
769+
LoopControlMaxReinvocationDelayINTELMask = 0x02000000,
761770
};
762771

763772
enum FunctionControlShift {
@@ -1092,10 +1101,13 @@ enum Capability {
10921101
CapabilityFPGAMemoryAccessesINTEL = 5898,
10931102
CapabilityFPGAClusterAttributesINTEL = 5904,
10941103
CapabilityLoopFuseINTEL = 5906,
1104+
CapabilityFPGADSPControlINTEL = 5908,
10951105
CapabilityMemoryAccessAliasingINTEL = 5910,
1106+
CapabilityFPGAInvocationPipeliningAttributesINTEL = 5916,
10961107
CapabilityFPGABufferLocationINTEL = 5920,
10971108
CapabilityArbitraryPrecisionFixedPointINTEL = 5922,
10981109
CapabilityUSMStorageClassesINTEL = 5935,
1110+
CapabilityRuntimeAlignedAttributeINTEL = 5939,
10991111
CapabilityIOPipesINTEL = 5943,
11001112
CapabilityBlockingPipesINTEL = 5945,
11011113
CapabilityFPGARegINTEL = 5948,

0 commit comments

Comments
 (0)