Skip to content

Commit 63110f3

Browse files
svenvhvmaksimo
svenvh
authored and
vmaksimo
committed
Regenerate *Enum.h files after spirv.hpp sync
Regenerate SPIRVIsValidEnum.h and SPIRVNameMapEnum.h using tools/spirv-tool/gen_spirv.bash after syncing spirv.hpp and manually fix the following: - internal:: values are not handled, so they had to be added manually again. Move all internal values to the end of the generated enum/function, so that they are together. - NameMap entries for IOPipesINTEL and FuncParamIOKindINTEL do not follow the convention of the other values, so they had to be changed back to their original values. Original commit: KhronosGroup/SPIRV-LLVM-Translator@c4c9b0c
1 parent 2fba7e7 commit 63110f3

File tree

2 files changed

+88
-39
lines changed

2 files changed

+88
-39
lines changed

‎llvm-spirv/lib/SPIRV/libSPIRV/SPIRVIsValidEnum.h

Lines changed: 29 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -65,12 +65,12 @@ inline bool isValid(spv::ExecutionModel V) {
6565
case ExecutionModelKernel:
6666
case ExecutionModelTaskNV:
6767
case ExecutionModelMeshNV:
68-
case ExecutionModelRayGenerationNV:
69-
case ExecutionModelIntersectionNV:
70-
case ExecutionModelAnyHitNV:
71-
case ExecutionModelClosestHitNV:
72-
case ExecutionModelMissNV:
73-
case ExecutionModelCallableNV:
68+
case ExecutionModelRayGenerationKHR:
69+
case ExecutionModelIntersectionKHR:
70+
case ExecutionModelAnyHitKHR:
71+
case ExecutionModelClosestHitKHR:
72+
case ExecutionModelMissKHR:
73+
case ExecutionModelCallableKHR:
7474
return true;
7575
default:
7676
return false;
@@ -116,13 +116,14 @@ inline bool isValid(spv::StorageClass V) {
116116
case StorageClassAtomicCounter:
117117
case StorageClassImage:
118118
case StorageClassStorageBuffer:
119-
case StorageClassCallableDataNV:
120-
case StorageClassIncomingCallableDataNV:
121-
case StorageClassRayPayloadNV:
122-
case StorageClassHitAttributeNV:
123-
case StorageClassIncomingRayPayloadNV:
124-
case StorageClassShaderRecordBufferNV:
119+
case StorageClassCallableDataKHR:
120+
case StorageClassIncomingCallableDataKHR:
121+
case StorageClassRayPayloadKHR:
122+
case StorageClassHitAttributeKHR:
123+
case StorageClassIncomingRayPayloadKHR:
124+
case StorageClassShaderRecordBufferKHR:
125125
case StorageClassPhysicalStorageBuffer:
126+
case StorageClassCodeSectionINTEL:
126127
case StorageClassDeviceOnlyINTEL:
127128
case StorageClassHostOnlyINTEL:
128129
return true;
@@ -222,8 +223,10 @@ inline bool isValid(spv::BuiltIn V) {
222223
case BuiltInBaseVertex:
223224
case BuiltInBaseInstance:
224225
case BuiltInDrawIndex:
226+
case BuiltInPrimitiveShadingRateKHR:
225227
case BuiltInDeviceIndex:
226228
case BuiltInViewIndex:
229+
case BuiltInShadingRateKHR:
227230
case BuiltInBaryCoordNoPerspAMD:
228231
case BuiltInBaryCoordNoPerspCentroidAMD:
229232
case BuiltInBaryCoordNoPerspSampleAMD:
@@ -250,20 +253,21 @@ inline bool isValid(spv::BuiltIn V) {
250253
case BuiltInBaryCoordNoPerspNV:
251254
case BuiltInFragSizeEXT:
252255
case BuiltInFragInvocationCountEXT:
253-
case BuiltInLaunchIdNV:
254-
case BuiltInLaunchSizeNV:
255-
case BuiltInWorldRayOriginNV:
256-
case BuiltInWorldRayDirectionNV:
257-
case BuiltInObjectRayOriginNV:
258-
case BuiltInObjectRayDirectionNV:
259-
case BuiltInRayTminNV:
260-
case BuiltInRayTmaxNV:
261-
case BuiltInInstanceCustomIndexNV:
262-
case BuiltInObjectToWorldNV:
263-
case BuiltInWorldToObjectNV:
256+
case BuiltInLaunchIdKHR:
257+
case BuiltInLaunchSizeKHR:
258+
case BuiltInWorldRayOriginKHR:
259+
case BuiltInWorldRayDirectionKHR:
260+
case BuiltInObjectRayOriginKHR:
261+
case BuiltInObjectRayDirectionKHR:
262+
case BuiltInRayTminKHR:
263+
case BuiltInRayTmaxKHR:
264+
case BuiltInInstanceCustomIndexKHR:
265+
case BuiltInObjectToWorldKHR:
266+
case BuiltInWorldToObjectKHR:
264267
case BuiltInHitTNV:
265-
case BuiltInHitKindNV:
266-
case BuiltInIncomingRayFlagsNV:
268+
case BuiltInHitKindKHR:
269+
case BuiltInIncomingRayFlagsKHR:
270+
case BuiltInRayGeometryIndexKHR:
267271
case BuiltInWarpsPerSMNV:
268272
case BuiltInSMCountNV:
269273
case BuiltInWarpIDNV:

‎llvm-spirv/lib/SPIRV/libSPIRV/SPIRVNameMapEnum.h

Lines changed: 59 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -130,6 +130,7 @@ template <> inline void SPIRVMap<Decoration, std::string>::init() {
130130
add(DecorationAliasedPointerEXT, "AliasedPointerEXT");
131131
add(DecorationSIMTCallINTEL, "SIMTCallINTEL");
132132
add(DecorationReferencedIndirectlyINTEL, "ReferencedIndirectlyINTEL");
133+
add(DecorationClobberINTEL, "ClobberINTEL");
133134
add(DecorationSideEffectsINTEL, "SideEffectsINTEL");
134135
add(DecorationVectorComputeVariableINTEL, "VectorComputeVariableINTEL");
135136
add(DecorationFuncParamIOKindINTEL, "FuncParamIOKind");
@@ -161,20 +162,25 @@ template <> inline void SPIRVMap<Decoration, std::string>::init() {
161162
add(DecorationPrefetchINTEL, "PrefetchINTEL");
162163
add(DecorationFuncParamKindINTEL, "FuncParamKindINTEL");
163164
add(DecorationFuncParamDescINTEL, "FuncParamDescINTEL");
165+
add(DecorationStallEnableINTEL, "StallEnableINTEL");
166+
add(DecorationFuseLoopsInFunctionINTEL, "FuseLoopsInFunctionINTEL");
164167
add(DecorationBufferLocationINTEL, "BufferLocationINTEL");
165168
add(DecorationIOPipeStorageINTEL, "IOPipeStorageINTEL");
166169
add(DecorationFunctionFloatingPointModeINTEL,
167170
"FunctionFloatingPointModeINTEL");
168171
add(DecorationSingleElementVectorINTEL, "SingleElementVectorINTEL");
172+
add(DecorationVectorComputeCallableFunctionINTEL,
173+
"VectorComputeCallableFunctionINTEL");
174+
175+
// From spirv_internal.hpp
169176
add(internal::DecorationCallableFunctionINTEL, "CallableFunctionINTEL");
170-
add(DecorationStallEnableINTEL, "StallEnableINTEL");
171-
add(DecorationFuseLoopsInFunctionINTEL, "FuseLoopsInFunctionINTEL");
172177
add(internal::DecorationMathOpDSPModeINTEL, "MathOpDSPModeINTEL");
173178
add(internal::DecorationAliasScopeINTEL, "AliasScopeINTEL");
174179
add(internal::DecorationNoAliasINTEL, "NoAliasINTEL");
175180
add(internal::DecorationInitiationIntervalINTEL, "InitiationIntervalINTEL");
176181
add(internal::DecorationMaxConcurrencyINTEL, "MaxConcurrencyINTEL");
177182
add(internal::DecorationPipelineEnableINTEL, "PipelineEnableINTEL");
183+
178184
add(DecorationMax, "Max");
179185
}
180186
SPIRV_DEF_NAMEMAP(Decoration, SPIRVDecorationNameMap)
@@ -234,8 +240,10 @@ template <> inline void SPIRVMap<BuiltIn, std::string>::init() {
234240
add(BuiltInBaseVertex, "BuiltInBaseVertex");
235241
add(BuiltInBaseInstance, "BuiltInBaseInstance");
236242
add(BuiltInDrawIndex, "BuiltInDrawIndex");
243+
add(BuiltInPrimitiveShadingRateKHR, "BuiltInPrimitiveShadingRateKHR");
237244
add(BuiltInDeviceIndex, "BuiltInDeviceIndex");
238245
add(BuiltInViewIndex, "BuiltInViewIndex");
246+
add(BuiltInShadingRateKHR, "BuiltInShadingRateKHR");
239247
add(BuiltInBaryCoordNoPerspAMD, "BuiltInBaryCoordNoPerspAMD");
240248
add(BuiltInBaryCoordNoPerspCentroidAMD, "BuiltInBaryCoordNoPerspCentroidAMD");
241249
add(BuiltInBaryCoordNoPerspSampleAMD, "BuiltInBaryCoordNoPerspSampleAMD");
@@ -264,20 +272,34 @@ template <> inline void SPIRVMap<BuiltIn, std::string>::init() {
264272
add(BuiltInFragmentSizeNV, "BuiltInFragmentSizeNV");
265273
add(BuiltInFragInvocationCountEXT, "BuiltInFragInvocationCountEXT");
266274
add(BuiltInInvocationsPerPixelNV, "BuiltInInvocationsPerPixelNV");
275+
add(BuiltInLaunchIdKHR, "BuiltInLaunchIdKHR");
267276
add(BuiltInLaunchIdNV, "BuiltInLaunchIdNV");
277+
add(BuiltInLaunchSizeKHR, "BuiltInLaunchSizeKHR");
268278
add(BuiltInLaunchSizeNV, "BuiltInLaunchSizeNV");
279+
add(BuiltInWorldRayOriginKHR, "BuiltInWorldRayOriginKHR");
269280
add(BuiltInWorldRayOriginNV, "BuiltInWorldRayOriginNV");
281+
add(BuiltInWorldRayDirectionKHR, "BuiltInWorldRayDirectionKHR");
270282
add(BuiltInWorldRayDirectionNV, "BuiltInWorldRayDirectionNV");
283+
add(BuiltInObjectRayOriginKHR, "BuiltInObjectRayOriginKHR");
271284
add(BuiltInObjectRayOriginNV, "BuiltInObjectRayOriginNV");
285+
add(BuiltInObjectRayDirectionKHR, "BuiltInObjectRayDirectionKHR");
272286
add(BuiltInObjectRayDirectionNV, "BuiltInObjectRayDirectionNV");
287+
add(BuiltInRayTminKHR, "BuiltInRayTminKHR");
273288
add(BuiltInRayTminNV, "BuiltInRayTminNV");
289+
add(BuiltInRayTmaxKHR, "BuiltInRayTmaxKHR");
274290
add(BuiltInRayTmaxNV, "BuiltInRayTmaxNV");
291+
add(BuiltInInstanceCustomIndexKHR, "BuiltInInstanceCustomIndexKHR");
275292
add(BuiltInInstanceCustomIndexNV, "BuiltInInstanceCustomIndexNV");
293+
add(BuiltInObjectToWorldKHR, "BuiltInObjectToWorldKHR");
276294
add(BuiltInObjectToWorldNV, "BuiltInObjectToWorldNV");
295+
add(BuiltInWorldToObjectKHR, "BuiltInWorldToObjectKHR");
277296
add(BuiltInWorldToObjectNV, "BuiltInWorldToObjectNV");
278297
add(BuiltInHitTNV, "BuiltInHitTNV");
298+
add(BuiltInHitKindKHR, "BuiltInHitKindKHR");
279299
add(BuiltInHitKindNV, "BuiltInHitKindNV");
300+
add(BuiltInIncomingRayFlagsKHR, "BuiltInIncomingRayFlagsKHR");
280301
add(BuiltInIncomingRayFlagsNV, "BuiltInIncomingRayFlagsNV");
302+
add(BuiltInRayGeometryIndexKHR, "BuiltInRayGeometryIndexKHR");
281303
add(BuiltInWarpsPerSMNV, "BuiltInWarpsPerSMNV");
282304
add(BuiltInSMCountNV, "BuiltInSMCountNV");
283305
add(BuiltInWarpIDNV, "BuiltInWarpIDNV");
@@ -362,8 +384,15 @@ template <> inline void SPIRVMap<Capability, std::string>::init() {
362384
add(CapabilityGroupNonUniformQuad, "GroupNonUniformQuad");
363385
add(CapabilityShaderLayer, "ShaderLayer");
364386
add(CapabilityShaderViewportIndex, "ShaderViewportIndex");
387+
add(CapabilityFragmentShadingRateKHR, "FragmentShadingRateKHR");
365388
add(CapabilitySubgroupBallotKHR, "SubgroupBallotKHR");
366389
add(CapabilityDrawParameters, "DrawParameters");
390+
add(CapabilityWorkgroupMemoryExplicitLayoutKHR,
391+
"WorkgroupMemoryExplicitLayoutKHR");
392+
add(CapabilityWorkgroupMemoryExplicitLayout8BitAccessKHR,
393+
"WorkgroupMemoryExplicitLayout8BitAccessKHR");
394+
add(CapabilityWorkgroupMemoryExplicitLayout16BitAccessKHR,
395+
"WorkgroupMemoryExplicitLayout16BitAccessKHR");
367396
add(CapabilitySubgroupVoteKHR, "SubgroupVoteKHR");
368397
add(CapabilityStorageBuffer16BitAccess, "StorageBuffer16BitAccess");
369398
add(CapabilityStorageUniformBufferBlock16, "StorageUniformBufferBlock16");
@@ -387,11 +416,17 @@ template <> inline void SPIRVMap<Capability, std::string>::init() {
387416
add(CapabilitySignedZeroInfNanPreserve, "SignedZeroInfNanPreserve");
388417
add(CapabilityRoundingModeRTE, "RoundingModeRTE");
389418
add(CapabilityRoundingModeRTZ, "RoundingModeRTZ");
419+
add(CapabilityRayQueryProvisionalKHR, "RayQueryProvisionalKHR");
420+
add(CapabilityRayQueryKHR, "RayQueryKHR");
421+
add(CapabilityRayTraversalPrimitiveCullingKHR,
422+
"RayTraversalPrimitiveCullingKHR");
423+
add(CapabilityRayTracingKHR, "RayTracingKHR");
390424
add(CapabilityFloat16ImageAMD, "Float16ImageAMD");
391425
add(CapabilityImageGatherBiasLodAMD, "ImageGatherBiasLodAMD");
392426
add(CapabilityFragmentMaskAMD, "FragmentMaskAMD");
393427
add(CapabilityStencilExportEXT, "StencilExportEXT");
394428
add(CapabilityImageReadWriteLodAMD, "ImageReadWriteLodAMD");
429+
add(CapabilityInt64ImageEXT, "Int64ImageEXT");
395430
add(CapabilityShaderClockKHR, "ShaderClockKHR");
396431
add(CapabilitySampleMaskOverrideCoverageNV, "SampleMaskOverrideCoverageNV");
397432
add(CapabilityGeometryShaderPassthroughNV, "GeometryShaderPassthroughNV");
@@ -462,13 +497,9 @@ template <> inline void SPIRVMap<Capability, std::string>::init() {
462497
"PhysicalStorageBufferAddresses");
463498
add(CapabilityPhysicalStorageBufferAddressesEXT,
464499
"PhysicalStorageBufferAddressesEXT");
465-
add(CapabilityAtomicFloat32AddEXT, "AtomicFloat32AddEXT");
466-
add(CapabilityAtomicFloat64AddEXT, "AtomicFloat64AddEXT");
467-
add(CapabilityAtomicFloat32MinMaxEXT, "AtomicFloat32MinMaxEXT");
468-
add(CapabilityAtomicFloat64MinMaxEXT, "AtomicFloat64MinMaxEXT");
469-
add(CapabilityAtomicFloat16MinMaxEXT, "AtomicFloat16MinMaxEXT");
470500
add(CapabilityComputeDerivativeGroupLinearNV,
471501
"ComputeDerivativeGroupLinearNV");
502+
add(CapabilityRayTracingProvisionalKHR, "RayTracingProvisionalKHR");
472503
add(CapabilityCooperativeMatrixNV, "CooperativeMatrixNV");
473504
add(CapabilityFragmentShaderSampleInterlockEXT,
474505
"FragmentShaderSampleInterlockEXT");
@@ -489,6 +520,9 @@ template <> inline void SPIRVMap<Capability, std::string>::init() {
489520
add(CapabilityFunctionPointersINTEL, "FunctionPointersINTEL");
490521
add(CapabilityIndirectReferencesINTEL, "IndirectReferencesINTEL");
491522
add(CapabilityAsmINTEL, "AsmINTEL");
523+
add(CapabilityAtomicFloat32MinMaxEXT, "AtomicFloat32MinMaxEXT");
524+
add(CapabilityAtomicFloat64MinMaxEXT, "AtomicFloat64MinMaxEXT");
525+
add(CapabilityAtomicFloat16MinMaxEXT, "AtomicFloat16MinMaxEXT");
492526
add(CapabilityVectorComputeINTEL, "VectorComputeINTEL");
493527
add(CapabilityVectorAnyINTEL, "VectorAnyINTEL");
494528
add(internal::CapabilityOptimizationHintsINTEL, "OptimizationHintsINTEL");
@@ -508,28 +542,39 @@ template <> inline void SPIRVMap<Capability, std::string>::init() {
508542
"ArbitraryPrecisionFloatingPointINTEL");
509543
add(CapabilityUnstructuredLoopControlsINTEL, "UnstructuredLoopControlsINTEL");
510544
add(CapabilityFPGALoopControlsINTEL, "FPGALoopControlsINTEL");
511-
add(CapabilityBlockingPipesINTEL, "BlockingPipesINTEL");
512-
add(CapabilityFPGARegINTEL, "FPGARegINTEL");
513545
add(CapabilityKernelAttributesINTEL, "KernelAttributesINTEL");
514546
add(CapabilityFPGAKernelAttributesINTEL, "FPGAKernelAttributesINTEL");
547+
add(CapabilityFPGAMemoryAccessesINTEL, "FPGAMemoryAccessesINTEL");
548+
add(CapabilityFPGAClusterAttributesINTEL, "FPGAClusterAttributesINTEL");
549+
add(CapabilityLoopFuseINTEL, "LoopFuseINTEL");
515550
add(CapabilityFPGABufferLocationINTEL, "FPGABufferLocationINTEL");
516551
add(CapabilityArbitraryPrecisionFixedPointINTEL,
517552
"ArbitraryPrecisionFixedPointINTEL");
518553
add(CapabilityUSMStorageClassesINTEL, "USMStorageClassesINTEL");
519-
add(CapabilityFPGAMemoryAccessesINTEL, "FPGAMemoryAccessesINTEL");
520554
add(CapabilityIOPipesINTEL, "IOPipeINTEL");
521-
add(CapabilityFPGAClusterAttributesINTEL, "FPGAClusterAttributesINTEL");
522-
add(CapabilityLoopFuseINTEL, "LoopFuseINTEL");
523-
add(CapabilityMax, "Max");
524-
add(internal::CapabilityFPGADSPControlINTEL, "FPGADSPControlINTEL");
555+
add(CapabilityBlockingPipesINTEL, "BlockingPipesINTEL");
556+
add(CapabilityFPGARegINTEL, "FPGARegINTEL");
557+
add(CapabilityDotProductInputAllKHR, "DotProductInputAllKHR");
558+
add(CapabilityDotProductInput4x8BitKHR, "DotProductInput4x8BitKHR");
559+
add(CapabilityDotProductInput4x8BitPackedKHR,
560+
"DotProductInput4x8BitPackedKHR");
561+
add(CapabilityDotProductKHR, "DotProductKHR");
562+
add(CapabilityAtomicFloat32AddEXT, "AtomicFloat32AddEXT");
563+
add(CapabilityAtomicFloat64AddEXT, "AtomicFloat64AddEXT");
525564
add(CapabilityLongConstantCompositeINTEL, "LongConstantCompositeINTEL");
565+
add(CapabilityAtomicFloat16AddEXT, "AtomicFloat16AddEXT");
566+
567+
// From spirv_internal.hpp
568+
add(internal::CapabilityFPGADSPControlINTEL, "FPGADSPControlINTEL");
526569
add(internal::CapabilityFastCompositeINTEL, "FastCompositeINTEL");
527570
add(internal::CapabilityOptNoneINTEL, "OptNoneINTEL");
528571
add(internal::CapabilityMemoryAccessAliasingINTEL,
529572
"MemoryAccessAliasingINTEL");
530573
add(internal::CapabilityFPGAInvocationPipeliningAttributesINTEL,
531574
"FPGAInvocationPipeliningAttributesINTEL");
532575
add(internal::CapabilityTokenTypeINTEL, "TokenTypeINTEL");
576+
577+
add(CapabilityMax, "Max");
533578
}
534579
SPIRV_DEF_NAMEMAP(Capability, SPIRVCapabilityNameMap)
535580

0 commit comments

Comments
 (0)