Skip to content

Commit c4c9b0c

Browse files
svenvhsvenvh
committed
[NFC] 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.
1 parent 6847551 commit c4c9b0c

File tree

2 files changed

+88
-39
lines changed

2 files changed

+88
-39
lines changed

‎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:

‎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");
@@ -159,20 +160,25 @@ template <> inline void SPIRVMap<Decoration, std::string>::init() {
159160
add(DecorationCacheSizeINTEL, "CacheSizeINTEL");
160161
add(DecorationDontStaticallyCoalesceINTEL, "DontStaticallyCoalesceINTEL");
161162
add(DecorationPrefetchINTEL, "PrefetchINTEL");
163+
add(DecorationStallEnableINTEL, "StallEnableINTEL");
164+
add(DecorationFuseLoopsInFunctionINTEL, "FuseLoopsInFunctionINTEL");
162165
add(DecorationBufferLocationINTEL, "BufferLocationINTEL");
163166
add(DecorationIOPipeStorageINTEL, "IOPipeStorageINTEL");
164167
add(DecorationFunctionFloatingPointModeINTEL,
165168
"FunctionFloatingPointModeINTEL");
166169
add(DecorationSingleElementVectorINTEL, "SingleElementVectorINTEL");
170+
add(DecorationVectorComputeCallableFunctionINTEL,
171+
"VectorComputeCallableFunctionINTEL");
172+
173+
// From spirv_internal.hpp
167174
add(internal::DecorationCallableFunctionINTEL, "CallableFunctionINTEL");
168-
add(DecorationStallEnableINTEL, "StallEnableINTEL");
169-
add(DecorationFuseLoopsInFunctionINTEL, "FuseLoopsInFunctionINTEL");
170175
add(internal::DecorationMathOpDSPModeINTEL, "MathOpDSPModeINTEL");
171176
add(internal::DecorationAliasScopeINTEL, "AliasScopeINTEL");
172177
add(internal::DecorationNoAliasINTEL, "NoAliasINTEL");
173178
add(internal::DecorationInitiationIntervalINTEL, "InitiationIntervalINTEL");
174179
add(internal::DecorationMaxConcurrencyINTEL, "MaxConcurrencyINTEL");
175180
add(internal::DecorationPipelineEnableINTEL, "PipelineEnableINTEL");
181+
176182
add(DecorationMax, "Max");
177183
}
178184
SPIRV_DEF_NAMEMAP(Decoration, SPIRVDecorationNameMap)
@@ -232,8 +238,10 @@ template <> inline void SPIRVMap<BuiltIn, std::string>::init() {
232238
add(BuiltInBaseVertex, "BuiltInBaseVertex");
233239
add(BuiltInBaseInstance, "BuiltInBaseInstance");
234240
add(BuiltInDrawIndex, "BuiltInDrawIndex");
241+
add(BuiltInPrimitiveShadingRateKHR, "BuiltInPrimitiveShadingRateKHR");
235242
add(BuiltInDeviceIndex, "BuiltInDeviceIndex");
236243
add(BuiltInViewIndex, "BuiltInViewIndex");
244+
add(BuiltInShadingRateKHR, "BuiltInShadingRateKHR");
237245
add(BuiltInBaryCoordNoPerspAMD, "BuiltInBaryCoordNoPerspAMD");
238246
add(BuiltInBaryCoordNoPerspCentroidAMD, "BuiltInBaryCoordNoPerspCentroidAMD");
239247
add(BuiltInBaryCoordNoPerspSampleAMD, "BuiltInBaryCoordNoPerspSampleAMD");
@@ -262,20 +270,34 @@ template <> inline void SPIRVMap<BuiltIn, std::string>::init() {
262270
add(BuiltInFragmentSizeNV, "BuiltInFragmentSizeNV");
263271
add(BuiltInFragInvocationCountEXT, "BuiltInFragInvocationCountEXT");
264272
add(BuiltInInvocationsPerPixelNV, "BuiltInInvocationsPerPixelNV");
273+
add(BuiltInLaunchIdKHR, "BuiltInLaunchIdKHR");
265274
add(BuiltInLaunchIdNV, "BuiltInLaunchIdNV");
275+
add(BuiltInLaunchSizeKHR, "BuiltInLaunchSizeKHR");
266276
add(BuiltInLaunchSizeNV, "BuiltInLaunchSizeNV");
277+
add(BuiltInWorldRayOriginKHR, "BuiltInWorldRayOriginKHR");
267278
add(BuiltInWorldRayOriginNV, "BuiltInWorldRayOriginNV");
279+
add(BuiltInWorldRayDirectionKHR, "BuiltInWorldRayDirectionKHR");
268280
add(BuiltInWorldRayDirectionNV, "BuiltInWorldRayDirectionNV");
281+
add(BuiltInObjectRayOriginKHR, "BuiltInObjectRayOriginKHR");
269282
add(BuiltInObjectRayOriginNV, "BuiltInObjectRayOriginNV");
283+
add(BuiltInObjectRayDirectionKHR, "BuiltInObjectRayDirectionKHR");
270284
add(BuiltInObjectRayDirectionNV, "BuiltInObjectRayDirectionNV");
285+
add(BuiltInRayTminKHR, "BuiltInRayTminKHR");
271286
add(BuiltInRayTminNV, "BuiltInRayTminNV");
287+
add(BuiltInRayTmaxKHR, "BuiltInRayTmaxKHR");
272288
add(BuiltInRayTmaxNV, "BuiltInRayTmaxNV");
289+
add(BuiltInInstanceCustomIndexKHR, "BuiltInInstanceCustomIndexKHR");
273290
add(BuiltInInstanceCustomIndexNV, "BuiltInInstanceCustomIndexNV");
291+
add(BuiltInObjectToWorldKHR, "BuiltInObjectToWorldKHR");
274292
add(BuiltInObjectToWorldNV, "BuiltInObjectToWorldNV");
293+
add(BuiltInWorldToObjectKHR, "BuiltInWorldToObjectKHR");
275294
add(BuiltInWorldToObjectNV, "BuiltInWorldToObjectNV");
276295
add(BuiltInHitTNV, "BuiltInHitTNV");
296+
add(BuiltInHitKindKHR, "BuiltInHitKindKHR");
277297
add(BuiltInHitKindNV, "BuiltInHitKindNV");
298+
add(BuiltInIncomingRayFlagsKHR, "BuiltInIncomingRayFlagsKHR");
278299
add(BuiltInIncomingRayFlagsNV, "BuiltInIncomingRayFlagsNV");
300+
add(BuiltInRayGeometryIndexKHR, "BuiltInRayGeometryIndexKHR");
279301
add(BuiltInWarpsPerSMNV, "BuiltInWarpsPerSMNV");
280302
add(BuiltInSMCountNV, "BuiltInSMCountNV");
281303
add(BuiltInWarpIDNV, "BuiltInWarpIDNV");
@@ -360,8 +382,15 @@ template <> inline void SPIRVMap<Capability, std::string>::init() {
360382
add(CapabilityGroupNonUniformQuad, "GroupNonUniformQuad");
361383
add(CapabilityShaderLayer, "ShaderLayer");
362384
add(CapabilityShaderViewportIndex, "ShaderViewportIndex");
385+
add(CapabilityFragmentShadingRateKHR, "FragmentShadingRateKHR");
363386
add(CapabilitySubgroupBallotKHR, "SubgroupBallotKHR");
364387
add(CapabilityDrawParameters, "DrawParameters");
388+
add(CapabilityWorkgroupMemoryExplicitLayoutKHR,
389+
"WorkgroupMemoryExplicitLayoutKHR");
390+
add(CapabilityWorkgroupMemoryExplicitLayout8BitAccessKHR,
391+
"WorkgroupMemoryExplicitLayout8BitAccessKHR");
392+
add(CapabilityWorkgroupMemoryExplicitLayout16BitAccessKHR,
393+
"WorkgroupMemoryExplicitLayout16BitAccessKHR");
365394
add(CapabilitySubgroupVoteKHR, "SubgroupVoteKHR");
366395
add(CapabilityStorageBuffer16BitAccess, "StorageBuffer16BitAccess");
367396
add(CapabilityStorageUniformBufferBlock16, "StorageUniformBufferBlock16");
@@ -385,11 +414,17 @@ template <> inline void SPIRVMap<Capability, std::string>::init() {
385414
add(CapabilitySignedZeroInfNanPreserve, "SignedZeroInfNanPreserve");
386415
add(CapabilityRoundingModeRTE, "RoundingModeRTE");
387416
add(CapabilityRoundingModeRTZ, "RoundingModeRTZ");
417+
add(CapabilityRayQueryProvisionalKHR, "RayQueryProvisionalKHR");
418+
add(CapabilityRayQueryKHR, "RayQueryKHR");
419+
add(CapabilityRayTraversalPrimitiveCullingKHR,
420+
"RayTraversalPrimitiveCullingKHR");
421+
add(CapabilityRayTracingKHR, "RayTracingKHR");
388422
add(CapabilityFloat16ImageAMD, "Float16ImageAMD");
389423
add(CapabilityImageGatherBiasLodAMD, "ImageGatherBiasLodAMD");
390424
add(CapabilityFragmentMaskAMD, "FragmentMaskAMD");
391425
add(CapabilityStencilExportEXT, "StencilExportEXT");
392426
add(CapabilityImageReadWriteLodAMD, "ImageReadWriteLodAMD");
427+
add(CapabilityInt64ImageEXT, "Int64ImageEXT");
393428
add(CapabilityShaderClockKHR, "ShaderClockKHR");
394429
add(CapabilitySampleMaskOverrideCoverageNV, "SampleMaskOverrideCoverageNV");
395430
add(CapabilityGeometryShaderPassthroughNV, "GeometryShaderPassthroughNV");
@@ -460,13 +495,9 @@ template <> inline void SPIRVMap<Capability, std::string>::init() {
460495
"PhysicalStorageBufferAddresses");
461496
add(CapabilityPhysicalStorageBufferAddressesEXT,
462497
"PhysicalStorageBufferAddressesEXT");
463-
add(CapabilityAtomicFloat32AddEXT, "AtomicFloat32AddEXT");
464-
add(CapabilityAtomicFloat64AddEXT, "AtomicFloat64AddEXT");
465-
add(CapabilityAtomicFloat32MinMaxEXT, "AtomicFloat32MinMaxEXT");
466-
add(CapabilityAtomicFloat64MinMaxEXT, "AtomicFloat64MinMaxEXT");
467-
add(CapabilityAtomicFloat16MinMaxEXT, "AtomicFloat16MinMaxEXT");
468498
add(CapabilityComputeDerivativeGroupLinearNV,
469499
"ComputeDerivativeGroupLinearNV");
500+
add(CapabilityRayTracingProvisionalKHR, "RayTracingProvisionalKHR");
470501
add(CapabilityCooperativeMatrixNV, "CooperativeMatrixNV");
471502
add(CapabilityFragmentShaderSampleInterlockEXT,
472503
"FragmentShaderSampleInterlockEXT");
@@ -487,6 +518,9 @@ template <> inline void SPIRVMap<Capability, std::string>::init() {
487518
add(CapabilityFunctionPointersINTEL, "FunctionPointersINTEL");
488519
add(CapabilityIndirectReferencesINTEL, "IndirectReferencesINTEL");
489520
add(CapabilityAsmINTEL, "AsmINTEL");
521+
add(CapabilityAtomicFloat32MinMaxEXT, "AtomicFloat32MinMaxEXT");
522+
add(CapabilityAtomicFloat64MinMaxEXT, "AtomicFloat64MinMaxEXT");
523+
add(CapabilityAtomicFloat16MinMaxEXT, "AtomicFloat16MinMaxEXT");
490524
add(CapabilityVectorComputeINTEL, "VectorComputeINTEL");
491525
add(CapabilityVectorAnyINTEL, "VectorAnyINTEL");
492526
add(CapabilityExpectAssumeKHR, "ExpectAssumeKHR");
@@ -506,28 +540,39 @@ template <> inline void SPIRVMap<Capability, std::string>::init() {
506540
"ArbitraryPrecisionFloatingPointINTEL");
507541
add(CapabilityUnstructuredLoopControlsINTEL, "UnstructuredLoopControlsINTEL");
508542
add(CapabilityFPGALoopControlsINTEL, "FPGALoopControlsINTEL");
509-
add(CapabilityBlockingPipesINTEL, "BlockingPipesINTEL");
510-
add(CapabilityFPGARegINTEL, "FPGARegINTEL");
511543
add(CapabilityKernelAttributesINTEL, "KernelAttributesINTEL");
512544
add(CapabilityFPGAKernelAttributesINTEL, "FPGAKernelAttributesINTEL");
545+
add(CapabilityFPGAMemoryAccessesINTEL, "FPGAMemoryAccessesINTEL");
546+
add(CapabilityFPGAClusterAttributesINTEL, "FPGAClusterAttributesINTEL");
547+
add(CapabilityLoopFuseINTEL, "LoopFuseINTEL");
513548
add(CapabilityFPGABufferLocationINTEL, "FPGABufferLocationINTEL");
514549
add(CapabilityArbitraryPrecisionFixedPointINTEL,
515550
"ArbitraryPrecisionFixedPointINTEL");
516551
add(CapabilityUSMStorageClassesINTEL, "USMStorageClassesINTEL");
517-
add(CapabilityFPGAMemoryAccessesINTEL, "FPGAMemoryAccessesINTEL");
518552
add(CapabilityIOPipesINTEL, "IOPipeINTEL");
519-
add(CapabilityFPGAClusterAttributesINTEL, "FPGAClusterAttributesINTEL");
520-
add(CapabilityLoopFuseINTEL, "LoopFuseINTEL");
521-
add(CapabilityMax, "Max");
522-
add(internal::CapabilityFPGADSPControlINTEL, "FPGADSPControlINTEL");
553+
add(CapabilityBlockingPipesINTEL, "BlockingPipesINTEL");
554+
add(CapabilityFPGARegINTEL, "FPGARegINTEL");
555+
add(CapabilityDotProductInputAllKHR, "DotProductInputAllKHR");
556+
add(CapabilityDotProductInput4x8BitKHR, "DotProductInput4x8BitKHR");
557+
add(CapabilityDotProductInput4x8BitPackedKHR,
558+
"DotProductInput4x8BitPackedKHR");
559+
add(CapabilityDotProductKHR, "DotProductKHR");
560+
add(CapabilityAtomicFloat32AddEXT, "AtomicFloat32AddEXT");
561+
add(CapabilityAtomicFloat64AddEXT, "AtomicFloat64AddEXT");
523562
add(CapabilityLongConstantCompositeINTEL, "LongConstantCompositeINTEL");
563+
add(CapabilityAtomicFloat16AddEXT, "AtomicFloat16AddEXT");
564+
565+
// From spirv_internal.hpp
566+
add(internal::CapabilityFPGADSPControlINTEL, "FPGADSPControlINTEL");
524567
add(internal::CapabilityFastCompositeINTEL, "FastCompositeINTEL");
525568
add(internal::CapabilityOptNoneINTEL, "OptNoneINTEL");
526569
add(internal::CapabilityMemoryAccessAliasingINTEL,
527570
"MemoryAccessAliasingINTEL");
528571
add(internal::CapabilityFPGAInvocationPipeliningAttributesINTEL,
529572
"FPGAInvocationPipeliningAttributesINTEL");
530573
add(internal::CapabilityTokenTypeINTEL, "TokenTypeINTEL");
574+
575+
add(CapabilityMax, "Max");
531576
}
532577
SPIRV_DEF_NAMEMAP(Capability, SPIRVCapabilityNameMap)
533578

0 commit comments

Comments
 (0)