Update SPIRV-Headers

Update the SHA-1 of the SPIRV-Headers dependency to 5a121866927.
Regenerate the header files using the newer spirv.hpp.  The generated
.h files had to be tweaked manually due to various internal additions.

Original commit:
KhronosGroup/SPIRV-LLVM-Translator@3f5e65d

Author: svenvh

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

@@ -250,8 +250,8 @@ inline bool isValid(spv::BuiltIn V) {
   case BuiltInLayerPerViewNV:
   case BuiltInMeshViewCountNV:
   case BuiltInMeshViewIndicesNV:
-  case BuiltInBaryCoordNV:
-  case BuiltInBaryCoordNoPerspNV:
+  case BuiltInBaryCoordKHR:
+  case BuiltInBaryCoordNoPerspKHR:
   case BuiltInFragSizeEXT:
   case BuiltInFragInvocationCountEXT:
   case BuiltInLaunchIdKHR:
@@ -267,12 +267,14 @@ inline bool isValid(spv::BuiltIn V) {
   case BuiltInWorldToObjectKHR:
   case BuiltInHitTNV:
   case BuiltInHitKindKHR:
+  case BuiltInCurrentRayTimeNV:
   case BuiltInIncomingRayFlagsKHR:
   case BuiltInRayGeometryIndexKHR:
   case BuiltInWarpsPerSMNV:
   case BuiltInSMCountNV:
   case BuiltInWarpIDNV:
   case BuiltInSMIDNV:
+  case BuiltInCullMaskKHR:
   case internal::BuiltInSubDeviceIDINTEL:
   case internal::BuiltInGlobalHWThreadIDINTEL:
     return true;

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

@@ -121,13 +121,18 @@ template <> inline void SPIRVMap<Decoration, std::string>::init() {
   add(DecorationPerPrimitiveNV, "PerPrimitiveNV");
   add(DecorationPerViewNV, "PerViewNV");
   add(DecorationPerTaskNV, "PerTaskNV");
+  add(DecorationPerVertexKHR, "PerVertexKHR");
   add(DecorationPerVertexNV, "PerVertexNV");
   add(DecorationNonUniform, "NonUniform");
   add(DecorationNonUniformEXT, "NonUniformEXT");
   add(DecorationRestrictPointer, "RestrictPointer");
   add(DecorationRestrictPointerEXT, "RestrictPointerEXT");
   add(DecorationAliasedPointer, "AliasedPointer");
   add(DecorationAliasedPointerEXT, "AliasedPointerEXT");
+  add(DecorationBindlessSamplerNV, "BindlessSamplerNV");
+  add(DecorationBindlessImageNV, "BindlessImageNV");
+  add(DecorationBoundSamplerNV, "BoundSamplerNV");
+  add(DecorationBoundImageNV, "BoundImageNV");
   add(DecorationSIMTCallINTEL, "SIMTCallINTEL");
   add(DecorationReferencedIndirectlyINTEL, "ReferencedIndirectlyINTEL");
   add(DecorationClobberINTEL, "ClobberINTEL");
@@ -162,6 +167,8 @@ template <> inline void SPIRVMap<Decoration, std::string>::init() {
   add(DecorationPrefetchINTEL, "PrefetchINTEL");
   add(DecorationStallEnableINTEL, "StallEnableINTEL");
   add(DecorationFuseLoopsInFunctionINTEL, "FuseLoopsInFunctionINTEL");
+  add(DecorationAliasScopeINTEL, "AliasScopeINTEL");
+  add(DecorationNoAliasINTEL, "NoAliasINTEL");
   add(DecorationBufferLocationINTEL, "BufferLocationINTEL");
   add(DecorationIOPipeStorageINTEL, "IOPipeStorageINTEL");
   add(DecorationFunctionFloatingPointModeINTEL,
@@ -272,7 +279,9 @@ template <> inline void SPIRVMap<BuiltIn, std::string>::init() {
   add(BuiltInLayerPerViewNV, "BuiltInLayerPerViewNV");
   add(BuiltInMeshViewCountNV, "BuiltInMeshViewCountNV");
   add(BuiltInMeshViewIndicesNV, "BuiltInMeshViewIndicesNV");
+  add(BuiltInBaryCoordKHR, "BuiltInBaryCoordKHR");
   add(BuiltInBaryCoordNV, "BuiltInBaryCoordNV");
+  add(BuiltInBaryCoordNoPerspKHR, "BuiltInBaryCoordNoPerspKHR");
   add(BuiltInBaryCoordNoPerspNV, "BuiltInBaryCoordNoPerspNV");
   add(BuiltInFragSizeEXT, "BuiltInFragSizeEXT");
   add(BuiltInFragmentSizeNV, "BuiltInFragmentSizeNV");
@@ -303,13 +312,15 @@ template <> inline void SPIRVMap<BuiltIn, std::string>::init() {
   add(BuiltInHitTNV, "BuiltInHitTNV");
   add(BuiltInHitKindKHR, "BuiltInHitKindKHR");
   add(BuiltInHitKindNV, "BuiltInHitKindNV");
+  add(BuiltInCurrentRayTimeNV, "BuiltInCurrentRayTimeNV");
   add(BuiltInIncomingRayFlagsKHR, "BuiltInIncomingRayFlagsKHR");
   add(BuiltInIncomingRayFlagsNV, "BuiltInIncomingRayFlagsNV");
   add(BuiltInRayGeometryIndexKHR, "BuiltInRayGeometryIndexKHR");
   add(BuiltInWarpsPerSMNV, "BuiltInWarpsPerSMNV");
   add(BuiltInSMCountNV, "BuiltInSMCountNV");
   add(BuiltInWarpIDNV, "BuiltInWarpIDNV");
   add(BuiltInSMIDNV, "BuiltInSMIDNV");
+  add(BuiltInCullMaskKHR, "BuiltInCullMaskKHR");
   add(BuiltInMax, "BuiltInMax");
   add(internal::BuiltInSubDeviceIDINTEL, "BuiltInSubDeviceIDINTEL");
   add(internal::BuiltInGlobalHWThreadIDINTEL, "BuiltInGlobalHWThreadIDINTEL");
@@ -392,6 +403,7 @@ template <> inline void SPIRVMap<Capability, std::string>::init() {
   add(CapabilityGroupNonUniformQuad, "GroupNonUniformQuad");
   add(CapabilityShaderLayer, "ShaderLayer");
   add(CapabilityShaderViewportIndex, "ShaderViewportIndex");
+  add(CapabilityUniformDecoration, "UniformDecoration");
   add(CapabilityFragmentShadingRateKHR, "FragmentShadingRateKHR");
   add(CapabilitySubgroupBallotKHR, "SubgroupBallotKHR");
   add(CapabilityDrawParameters, "DrawParameters");
@@ -446,6 +458,7 @@ template <> inline void SPIRVMap<Capability, std::string>::init() {
   add(CapabilityFragmentFullyCoveredEXT, "FragmentFullyCoveredEXT");
   add(CapabilityMeshShadingNV, "MeshShadingNV");
   add(CapabilityImageFootprintNV, "ImageFootprintNV");
+  add(CapabilityFragmentBarycentricKHR, "FragmentBarycentricKHR");
   add(CapabilityFragmentBarycentricNV, "FragmentBarycentricNV");
   add(CapabilityComputeDerivativeGroupQuadsNV, "ComputeDerivativeGroupQuadsNV");
   add(CapabilityFragmentDensityEXT, "FragmentDensityEXT");
@@ -496,6 +509,7 @@ template <> inline void SPIRVMap<Capability, std::string>::init() {
   add(CapabilityStorageTexelBufferArrayNonUniformIndexingEXT,
       "StorageTexelBufferArrayNonUniformIndexingEXT");
   add(CapabilityRayTracingNV, "RayTracingNV");
+  add(CapabilityRayTracingMotionBlurNV, "RayTracingMotionBlurNV");
   add(CapabilityVulkanMemoryModel, "VulkanMemoryModel");
   add(CapabilityVulkanMemoryModelKHR, "VulkanMemoryModelKHR");
   add(CapabilityVulkanMemoryModelDeviceScope, "VulkanMemoryModelDeviceScope");
@@ -516,7 +530,9 @@ template <> inline void SPIRVMap<Capability, std::string>::init() {
   add(CapabilityShaderSMBuiltinsNV, "ShaderSMBuiltinsNV");
   add(CapabilityFragmentShaderPixelInterlockEXT,
       "FragmentShaderPixelInterlockEXT");
+  add(CapabilityDemoteToHelperInvocation, "DemoteToHelperInvocation");
   add(CapabilityDemoteToHelperInvocationEXT, "DemoteToHelperInvocationEXT");
+  add(CapabilityBindlessTextureNV, "BindlessTextureNV");
   add(CapabilitySubgroupShuffleINTEL, "SubgroupShuffleINTEL");
   add(CapabilitySubgroupBufferBlockIOINTEL, "SubgroupBufferBlockIOINTEL");
   add(CapabilitySubgroupImageBlockIOINTEL, "SubgroupImageBlockIOINTEL");
@@ -555,25 +571,33 @@ template <> inline void SPIRVMap<Capability, std::string>::init() {
   add(CapabilityFPGAMemoryAccessesINTEL, "FPGAMemoryAccessesINTEL");
   add(CapabilityFPGAClusterAttributesINTEL, "FPGAClusterAttributesINTEL");
   add(CapabilityLoopFuseINTEL, "LoopFuseINTEL");
+  add(CapabilityMemoryAccessAliasingINTEL, "MemoryAccessAliasingINTEL");
   add(CapabilityFPGABufferLocationINTEL, "FPGABufferLocationINTEL");
   add(CapabilityArbitraryPrecisionFixedPointINTEL,
       "ArbitraryPrecisionFixedPointINTEL");
   add(CapabilityUSMStorageClassesINTEL, "USMStorageClassesINTEL");
   add(CapabilityIOPipesINTEL, "IOPipeINTEL");
   add(CapabilityBlockingPipesINTEL, "BlockingPipesINTEL");
   add(CapabilityFPGARegINTEL, "FPGARegINTEL");
+  add(CapabilityDotProductInputAll, "DotProductInputAll");
   add(CapabilityDotProductInputAllKHR, "DotProductInputAllKHR");
+  add(CapabilityDotProductInput4x8Bit, "DotProductInput4x8Bit");
   add(CapabilityDotProductInput4x8BitKHR, "DotProductInput4x8BitKHR");
+  add(CapabilityDotProductInput4x8BitPacked, "DotProductInput4x8BitPacked");
   add(CapabilityDotProductInput4x8BitPackedKHR,
       "DotProductInput4x8BitPackedKHR");
+  add(CapabilityDotProduct, "DotProduct");
   add(CapabilityDotProductKHR, "DotProductKHR");
+  add(CapabilityRayCullMaskKHR, "RayCullMaskKHR");
   add(CapabilityBitInstructions, "BitInstructions");
+  add(CapabilityGroupNonUniformRotateKHR, "GroupNonUniformRotateKHR");
   add(CapabilityAtomicFloat32AddEXT, "AtomicFloat32AddEXT");
   add(CapabilityAtomicFloat64AddEXT, "AtomicFloat64AddEXT");
   add(CapabilityLongConstantCompositeINTEL, "LongConstantCompositeINTEL");
+  add(CapabilityOptNoneINTEL, "OptNoneINTEL");
   add(CapabilityAtomicFloat16AddEXT, "AtomicFloat16AddEXT");
   add(CapabilityDebugInfoModuleINTEL, "DebugInfoModuleINTEL");
-  add(CapabilityMemoryAccessAliasingINTEL, "MemoryAccessAliasingINTEL");
+  add(CapabilitySplitBarrierINTEL, "SplitBarrierINTEL");
   add(CapabilityGroupUniformArithmeticKHR, "GroupUniformArithmeticKHR");
 
   // From spirv_internal.hpp

llvm-spirv/spirv-headers-tag.conf

@@ -1 +1 @@
-4995a2f2723c401eb0ea3e10c81298906bf1422b
+5a121866927a16ab9d49bed4788b532c7fcea766

llvm-spirv/tools/spirv-tool/gen_spirv.bash

@@ -163,7 +163,7 @@ genFile() {
 #define ${includeGuard}
 
 #include \"SPIRVEnum.h\"
-#include \"spirv.hpp\"
+#include \"spirv/unified1/spirv.hpp\"
 #include \"spirv_internal.hpp\"
 
 using namespace spv;