[llvm] b25b507 - [SPIRV] use tablegen to create SPIRVBaseInfo*

Ilia Diachkov via llvm-commits llvm-commits at lists.llvm.org
Mon Aug 1 15:15:06 PDT 2022


Author: Ilia Diachkov
Date: 2022-08-02T01:57:23+03:00
New Revision: b25b507c779747697eb8ca35509b84451226e27b

URL: https://github.com/llvm/llvm-project/commit/b25b507c779747697eb8ca35509b84451226e27b
DIFF: https://github.com/llvm/llvm-project/commit/b25b507c779747697eb8ca35509b84451226e27b.diff

LOG: [SPIRV] use tablegen to create SPIRVBaseInfo*

The patch replaces SPIRVBaseInfo.* previously created using macros by
the tablegen approach. There are many small changes in other files due to
differences in namespaces. Also, functions in SPIRVUtils are moved to
the llvm namespace.

Differential Revision: https://reviews.llvm.org/D130518

Co-authored-by: Aleksandr Bezzubikov <zuban32s at gmail.com>
Co-authored-by: Michal Paszkowski <michal.paszkowski at outlook.com>
Co-authored-by: Andrey Tretyakov <andrey1.tretyakov at intel.com>
Co-authored-by: Konrad Trifunovic <konrad.trifunovic at intel.com>

Added: 
    llvm/lib/Target/SPIRV/SPIRVSymbolicOperands.td

Modified: 
    llvm/lib/Target/SPIRV/CMakeLists.txt
    llvm/lib/Target/SPIRV/MCTargetDesc/SPIRVBaseInfo.cpp
    llvm/lib/Target/SPIRV/MCTargetDesc/SPIRVBaseInfo.h
    llvm/lib/Target/SPIRV/MCTargetDesc/SPIRVInstPrinter.cpp
    llvm/lib/Target/SPIRV/MCTargetDesc/SPIRVInstPrinter.h
    llvm/lib/Target/SPIRV/SPIRVAsmPrinter.cpp
    llvm/lib/Target/SPIRV/SPIRVCallLowering.cpp
    llvm/lib/Target/SPIRV/SPIRVGlobalRegistry.cpp
    llvm/lib/Target/SPIRV/SPIRVGlobalRegistry.h
    llvm/lib/Target/SPIRV/SPIRVInstrInfo.td
    llvm/lib/Target/SPIRV/SPIRVInstructionSelector.cpp
    llvm/lib/Target/SPIRV/SPIRVModuleAnalysis.cpp
    llvm/lib/Target/SPIRV/SPIRVModuleAnalysis.h
    llvm/lib/Target/SPIRV/SPIRVUtils.cpp
    llvm/lib/Target/SPIRV/SPIRVUtils.h

Removed: 
    llvm/lib/Target/SPIRV/SPIRVEnums.td


################################################################################
diff  --git a/llvm/lib/Target/SPIRV/CMakeLists.txt b/llvm/lib/Target/SPIRV/CMakeLists.txt
index 4f73f6bbae903..237816b878f9b 100644
--- a/llvm/lib/Target/SPIRV/CMakeLists.txt
+++ b/llvm/lib/Target/SPIRV/CMakeLists.txt
@@ -9,6 +9,7 @@ tablegen(LLVM SPIRVGenMCCodeEmitter.inc -gen-emitter)
 tablegen(LLVM SPIRVGenRegisterBank.inc -gen-register-bank)
 tablegen(LLVM SPIRVGenRegisterInfo.inc -gen-register-info)
 tablegen(LLVM SPIRVGenSubtargetInfo.inc -gen-subtarget)
+tablegen(LLVM SPIRVGenTables.inc -gen-searchable-tables)
 
 add_public_tablegen_target(SPIRVCommonTableGen)
 

diff  --git a/llvm/lib/Target/SPIRV/MCTargetDesc/SPIRVBaseInfo.cpp b/llvm/lib/Target/SPIRV/MCTargetDesc/SPIRVBaseInfo.cpp
index 220fd76305aac..91c0396c142f2 100644
--- a/llvm/lib/Target/SPIRV/MCTargetDesc/SPIRVBaseInfo.cpp
+++ b/llvm/lib/Target/SPIRV/MCTargetDesc/SPIRVBaseInfo.cpp
@@ -1,4 +1,4 @@
-//===-- SPIRVBaseInfo.cpp -  Top level definitions for SPIRV ----*- C++ -*-===//
+//===-- SPIRVBaseInfo.cpp - Top level SPIRV definitions ---------*- C++ -*-===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.
@@ -6,1077 +6,183 @@
 //
 //===----------------------------------------------------------------------===//
 //
-// This file contains small standalone helper functions and enum definitions for
-// the SPIRV target useful for the compiler back-end and the MC libraries.
-// As such, it deliberately does not include references to LLVM core
-// code gen types, passes, etc..
+// This file contains the implementation for helper mnemonic lookup functions,
+// versioning/capabilities/extensions getters for symbolic/named operands used
+// in various SPIR-V instructions.
 //
 //===----------------------------------------------------------------------===//
 
 #include "SPIRVBaseInfo.h"
-#include "llvm/Support/ErrorHandling.h"
+#include "llvm/ADT/ArrayRef.h"
+#include "llvm/ADT/StringRef.h"
 
 namespace llvm {
 namespace SPIRV {
+struct SymbolicOperand {
+  OperandCategory::OperandCategory Category;
+  uint32_t Value;
+  StringRef Mnemonic;
+  uint32_t MinVersion;
+  uint32_t MaxVersion;
+};
+
+struct ExtensionEntry {
+  OperandCategory::OperandCategory Category;
+  uint32_t Value;
+  Extension::Extension ReqExtension;
+};
+
+struct CapabilityEntry {
+  OperandCategory::OperandCategory Category;
+  uint32_t Value;
+  Capability::Capability ReqCapability;
+};
+
+using namespace OperandCategory;
+using namespace Extension;
+using namespace Capability;
+#define GET_SymbolicOperands_DECL
+#define GET_SymbolicOperands_IMPL
+#define GET_ExtensionEntries_DECL
+#define GET_ExtensionEntries_IMPL
+#define GET_CapabilityEntries_DECL
+#define GET_CapabilityEntries_IMPL
+#define GET_ExtendedBuiltins_DECL
+#define GET_ExtendedBuiltins_IMPL
+#include "SPIRVGenTables.inc"
 
 #define CASE(CLASS, ATTR)                                                      \
   case CLASS::ATTR:                                                            \
     return #ATTR;
-#define CASE_SUF(CLASS, SF, ATTR)                                              \
-  case CLASS::SF##_##ATTR:                                                     \
-    return #ATTR;
-
-// Implement getEnumName(Enum e) helper functions.
-// TODO: re-implement all the functions using TableGen.
-StringRef getCapabilityName(Capability e) {
-  switch (e) {
-    CASE(Capability, Matrix)
-    CASE(Capability, Shader)
-    CASE(Capability, Geometry)
-    CASE(Capability, Tessellation)
-    CASE(Capability, Addresses)
-    CASE(Capability, Linkage)
-    CASE(Capability, Kernel)
-    CASE(Capability, Vector16)
-    CASE(Capability, Float16Buffer)
-    CASE(Capability, Float16)
-    CASE(Capability, Float64)
-    CASE(Capability, Int64)
-    CASE(Capability, Int64Atomics)
-    CASE(Capability, ImageBasic)
-    CASE(Capability, ImageReadWrite)
-    CASE(Capability, ImageMipmap)
-    CASE(Capability, Pipes)
-    CASE(Capability, Groups)
-    CASE(Capability, DeviceEnqueue)
-    CASE(Capability, LiteralSampler)
-    CASE(Capability, AtomicStorage)
-    CASE(Capability, Int16)
-    CASE(Capability, TessellationPointSize)
-    CASE(Capability, GeometryPointSize)
-    CASE(Capability, ImageGatherExtended)
-    CASE(Capability, StorageImageMultisample)
-    CASE(Capability, UniformBufferArrayDynamicIndexing)
-    CASE(Capability, SampledImageArrayDymnamicIndexing)
-    CASE(Capability, ClipDistance)
-    CASE(Capability, CullDistance)
-    CASE(Capability, ImageCubeArray)
-    CASE(Capability, SampleRateShading)
-    CASE(Capability, ImageRect)
-    CASE(Capability, SampledRect)
-    CASE(Capability, GenericPointer)
-    CASE(Capability, Int8)
-    CASE(Capability, InputAttachment)
-    CASE(Capability, SparseResidency)
-    CASE(Capability, MinLod)
-    CASE(Capability, Sampled1D)
-    CASE(Capability, Image1D)
-    CASE(Capability, SampledCubeArray)
-    CASE(Capability, SampledBuffer)
-    CASE(Capability, ImageBuffer)
-    CASE(Capability, ImageMSArray)
-    CASE(Capability, StorageImageExtendedFormats)
-    CASE(Capability, ImageQuery)
-    CASE(Capability, DerivativeControl)
-    CASE(Capability, InterpolationFunction)
-    CASE(Capability, TransformFeedback)
-    CASE(Capability, GeometryStreams)
-    CASE(Capability, StorageImageReadWithoutFormat)
-    CASE(Capability, StorageImageWriteWithoutFormat)
-    CASE(Capability, MultiViewport)
-    CASE(Capability, SubgroupDispatch)
-    CASE(Capability, NamedBarrier)
-    CASE(Capability, PipeStorage)
-    CASE(Capability, GroupNonUniform)
-    CASE(Capability, GroupNonUniformVote)
-    CASE(Capability, GroupNonUniformArithmetic)
-    CASE(Capability, GroupNonUniformBallot)
-    CASE(Capability, GroupNonUniformShuffle)
-    CASE(Capability, GroupNonUniformShuffleRelative)
-    CASE(Capability, GroupNonUniformClustered)
-    CASE(Capability, GroupNonUniformQuad)
-    CASE(Capability, SubgroupBallotKHR)
-    CASE(Capability, DrawParameters)
-    CASE(Capability, SubgroupVoteKHR)
-    CASE(Capability, StorageBuffer16BitAccess)
-    CASE(Capability, StorageUniform16)
-    CASE(Capability, StoragePushConstant16)
-    CASE(Capability, StorageInputOutput16)
-    CASE(Capability, DeviceGroup)
-    CASE(Capability, MultiView)
-    CASE(Capability, VariablePointersStorageBuffer)
-    CASE(Capability, VariablePointers)
-    CASE(Capability, AtomicStorageOps)
-    CASE(Capability, SampleMaskPostDepthCoverage)
-    CASE(Capability, StorageBuffer8BitAccess)
-    CASE(Capability, UniformAndStorageBuffer8BitAccess)
-    CASE(Capability, StoragePushConstant8)
-    CASE(Capability, DenormPreserve)
-    CASE(Capability, DenormFlushToZero)
-    CASE(Capability, SignedZeroInfNanPreserve)
-    CASE(Capability, RoundingModeRTE)
-    CASE(Capability, RoundingModeRTZ)
-    CASE(Capability, Float16ImageAMD)
-    CASE(Capability, ImageGatherBiasLodAMD)
-    CASE(Capability, FragmentMaskAMD)
-    CASE(Capability, StencilExportEXT)
-    CASE(Capability, ImageReadWriteLodAMD)
-    CASE(Capability, SampleMaskOverrideCoverageNV)
-    CASE(Capability, GeometryShaderPassthroughNV)
-    CASE(Capability, ShaderViewportIndexLayerEXT)
-    CASE(Capability, ShaderViewportMaskNV)
-    CASE(Capability, ShaderStereoViewNV)
-    CASE(Capability, PerViewAttributesNV)
-    CASE(Capability, FragmentFullyCoveredEXT)
-    CASE(Capability, MeshShadingNV)
-    CASE(Capability, ShaderNonUniformEXT)
-    CASE(Capability, RuntimeDescriptorArrayEXT)
-    CASE(Capability, InputAttachmentArrayDynamicIndexingEXT)
-    CASE(Capability, UniformTexelBufferArrayDynamicIndexingEXT)
-    CASE(Capability, StorageTexelBufferArrayDynamicIndexingEXT)
-    CASE(Capability, UniformBufferArrayNonUniformIndexingEXT)
-    CASE(Capability, SampledImageArrayNonUniformIndexingEXT)
-    CASE(Capability, StorageBufferArrayNonUniformIndexingEXT)
-    CASE(Capability, StorageImageArrayNonUniformIndexingEXT)
-    CASE(Capability, InputAttachmentArrayNonUniformIndexingEXT)
-    CASE(Capability, UniformTexelBufferArrayNonUniformIndexingEXT)
-    CASE(Capability, StorageTexelBufferArrayNonUniformIndexingEXT)
-    CASE(Capability, RayTracingNV)
-    CASE(Capability, SubgroupShuffleINTEL)
-    CASE(Capability, SubgroupBufferBlockIOINTEL)
-    CASE(Capability, SubgroupImageBlockIOINTEL)
-    CASE(Capability, SubgroupImageMediaBlockIOINTEL)
-    CASE(Capability, SubgroupAvcMotionEstimationINTEL)
-    CASE(Capability, SubgroupAvcMotionEstimationIntraINTEL)
-    CASE(Capability, SubgroupAvcMotionEstimationChromaINTEL)
-    CASE(Capability, GroupNonUniformPartitionedNV)
-    CASE(Capability, VulkanMemoryModelKHR)
-    CASE(Capability, VulkanMemoryModelDeviceScopeKHR)
-    CASE(Capability, ImageFootprintNV)
-    CASE(Capability, FragmentBarycentricNV)
-    CASE(Capability, ComputeDerivativeGroupQuadsNV)
-    CASE(Capability, ComputeDerivativeGroupLinearNV)
-    CASE(Capability, FragmentDensityEXT)
-    CASE(Capability, PhysicalStorageBufferAddressesEXT)
-    CASE(Capability, CooperativeMatrixNV)
-    break;
-  }
-  llvm_unreachable("Unexpected operand");
-}
-
-StringRef getSourceLanguageName(SourceLanguage e) {
-  switch (e) {
-    CASE(SourceLanguage, Unknown)
-    CASE(SourceLanguage, ESSL)
-    CASE(SourceLanguage, GLSL)
-    CASE(SourceLanguage, OpenCL_C)
-    CASE(SourceLanguage, OpenCL_CPP)
-    CASE(SourceLanguage, HLSL)
-    break;
-  }
-  llvm_unreachable("Unexpected operand");
-}
-
-StringRef getExecutionModelName(ExecutionModel e) {
-  switch (e) {
-    CASE(ExecutionModel, Vertex)
-    CASE(ExecutionModel, TessellationControl)
-    CASE(ExecutionModel, TessellationEvaluation)
-    CASE(ExecutionModel, Geometry)
-    CASE(ExecutionModel, Fragment)
-    CASE(ExecutionModel, GLCompute)
-    CASE(ExecutionModel, Kernel)
-    CASE(ExecutionModel, TaskNV)
-    CASE(ExecutionModel, MeshNV)
-    CASE(ExecutionModel, RayGenerationNV)
-    CASE(ExecutionModel, IntersectionNV)
-    CASE(ExecutionModel, AnyHitNV)
-    CASE(ExecutionModel, ClosestHitNV)
-    CASE(ExecutionModel, MissNV)
-    CASE(ExecutionModel, CallableNV)
-    break;
-  }
-  llvm_unreachable("Unexpected operand");
-}
-
-StringRef getAddressingModelName(AddressingModel e) {
-  switch (e) {
-    CASE(AddressingModel, Logical)
-    CASE(AddressingModel, Physical32)
-    CASE(AddressingModel, Physical64)
-    CASE(AddressingModel, PhysicalStorageBuffer64EXT)
-    break;
-  }
-  llvm_unreachable("Unexpected operand");
-}
-
-StringRef getMemoryModelName(MemoryModel e) {
-  switch (e) {
-    CASE(MemoryModel, Simple)
-    CASE(MemoryModel, GLSL450)
-    CASE(MemoryModel, OpenCL)
-    CASE(MemoryModel, VulkanKHR)
-    break;
-  }
-  llvm_unreachable("Unexpected operand");
-}
-
-StringRef getExecutionModeName(ExecutionMode e) {
-  switch (e) {
-    CASE(ExecutionMode, Invocations)
-    CASE(ExecutionMode, SpacingEqual)
-    CASE(ExecutionMode, SpacingFractionalEven)
-    CASE(ExecutionMode, SpacingFractionalOdd)
-    CASE(ExecutionMode, VertexOrderCw)
-    CASE(ExecutionMode, VertexOrderCcw)
-    CASE(ExecutionMode, PixelCenterInteger)
-    CASE(ExecutionMode, OriginUpperLeft)
-    CASE(ExecutionMode, OriginLowerLeft)
-    CASE(ExecutionMode, EarlyFragmentTests)
-    CASE(ExecutionMode, PointMode)
-    CASE(ExecutionMode, Xfb)
-    CASE(ExecutionMode, DepthReplacing)
-    CASE(ExecutionMode, DepthGreater)
-    CASE(ExecutionMode, DepthLess)
-    CASE(ExecutionMode, DepthUnchanged)
-    CASE(ExecutionMode, LocalSize)
-    CASE(ExecutionMode, LocalSizeHint)
-    CASE(ExecutionMode, InputPoints)
-    CASE(ExecutionMode, InputLines)
-    CASE(ExecutionMode, InputLinesAdjacency)
-    CASE(ExecutionMode, Triangles)
-    CASE(ExecutionMode, InputTrianglesAdjacency)
-    CASE(ExecutionMode, Quads)
-    CASE(ExecutionMode, Isolines)
-    CASE(ExecutionMode, OutputVertices)
-    CASE(ExecutionMode, OutputPoints)
-    CASE(ExecutionMode, OutputLineStrip)
-    CASE(ExecutionMode, OutputTriangleStrip)
-    CASE(ExecutionMode, VecTypeHint)
-    CASE(ExecutionMode, ContractionOff)
-    CASE(ExecutionMode, Initializer)
-    CASE(ExecutionMode, Finalizer)
-    CASE(ExecutionMode, SubgroupSize)
-    CASE(ExecutionMode, SubgroupsPerWorkgroup)
-    CASE(ExecutionMode, SubgroupsPerWorkgroupId)
-    CASE(ExecutionMode, LocalSizeId)
-    CASE(ExecutionMode, LocalSizeHintId)
-    CASE(ExecutionMode, PostDepthCoverage)
-    CASE(ExecutionMode, DenormPreserve)
-    CASE(ExecutionMode, DenormFlushToZero)
-    CASE(ExecutionMode, SignedZeroInfNanPreserve)
-    CASE(ExecutionMode, RoundingModeRTE)
-    CASE(ExecutionMode, RoundingModeRTZ)
-    CASE(ExecutionMode, StencilRefReplacingEXT)
-    CASE(ExecutionMode, OutputLinesNV)
-    CASE(ExecutionMode, DerivativeGroupQuadsNV)
-    CASE(ExecutionMode, DerivativeGroupLinearNV)
-    CASE(ExecutionMode, OutputTrianglesNV)
-    break;
-  }
-  llvm_unreachable("Unexpected operand");
-}
-
-StringRef getStorageClassName(StorageClass e) {
-  switch (e) {
-    CASE(StorageClass, UniformConstant)
-    CASE(StorageClass, Input)
-    CASE(StorageClass, Uniform)
-    CASE(StorageClass, Output)
-    CASE(StorageClass, Workgroup)
-    CASE(StorageClass, CrossWorkgroup)
-    CASE(StorageClass, Private)
-    CASE(StorageClass, Function)
-    CASE(StorageClass, Generic)
-    CASE(StorageClass, PushConstant)
-    CASE(StorageClass, AtomicCounter)
-    CASE(StorageClass, Image)
-    CASE(StorageClass, StorageBuffer)
-    CASE(StorageClass, CallableDataNV)
-    CASE(StorageClass, IncomingCallableDataNV)
-    CASE(StorageClass, RayPayloadNV)
-    CASE(StorageClass, HitAttributeNV)
-    CASE(StorageClass, IncomingRayPayloadNV)
-    CASE(StorageClass, ShaderRecordBufferNV)
-    CASE(StorageClass, PhysicalStorageBufferEXT)
-    break;
-  }
-  llvm_unreachable("Unexpected operand");
-}
-
-StringRef getDimName(Dim dim) {
-  switch (dim) {
-    CASE_SUF(Dim, DIM, 1D)
-    CASE_SUF(Dim, DIM, 2D)
-    CASE_SUF(Dim, DIM, 3D)
-    CASE_SUF(Dim, DIM, Cube)
-    CASE_SUF(Dim, DIM, Rect)
-    CASE_SUF(Dim, DIM, Buffer)
-    CASE_SUF(Dim, DIM, SubpassData)
-    break;
-  }
-  llvm_unreachable("Unexpected operand");
-}
-
-StringRef getSamplerAddressingModeName(SamplerAddressingMode e) {
-  switch (e) {
-    CASE(SamplerAddressingMode, None)
-    CASE(SamplerAddressingMode, ClampToEdge)
-    CASE(SamplerAddressingMode, Clamp)
-    CASE(SamplerAddressingMode, Repeat)
-    CASE(SamplerAddressingMode, RepeatMirrored)
-    break;
-  }
-  llvm_unreachable("Unexpected operand");
-}
-
-StringRef getSamplerFilterModeName(SamplerFilterMode e) {
+std::string getExtInstSetName(InstructionSet e) {
   switch (e) {
-    CASE(SamplerFilterMode, Nearest)
-    CASE(SamplerFilterMode, Linear)
+    CASE(InstructionSet, OpenCL_std)
+    CASE(InstructionSet, GLSL_std_450)
+    CASE(InstructionSet, SPV_AMD_shader_trinary_minmax)
     break;
   }
   llvm_unreachable("Unexpected operand");
 }
+} // namespace SPIRV
 
-StringRef getImageFormatName(ImageFormat e) {
-  switch (e) {
-    CASE(ImageFormat, Unknown)
-    CASE(ImageFormat, Rgba32f)
-    CASE(ImageFormat, Rgba16f)
-    CASE(ImageFormat, R32f)
-    CASE(ImageFormat, Rgba8)
-    CASE(ImageFormat, Rgba8Snorm)
-    CASE(ImageFormat, Rg32f)
-    CASE(ImageFormat, Rg16f)
-    CASE(ImageFormat, R11fG11fB10f)
-    CASE(ImageFormat, R16f)
-    CASE(ImageFormat, Rgba16)
-    CASE(ImageFormat, Rgb10A2)
-    CASE(ImageFormat, Rg16)
-    CASE(ImageFormat, Rg8)
-    CASE(ImageFormat, R16)
-    CASE(ImageFormat, R8)
-    CASE(ImageFormat, Rgba16Snorm)
-    CASE(ImageFormat, Rg16Snorm)
-    CASE(ImageFormat, Rg8Snorm)
-    CASE(ImageFormat, R16Snorm)
-    CASE(ImageFormat, R8Snorm)
-    CASE(ImageFormat, Rgba32i)
-    CASE(ImageFormat, Rgba16i)
-    CASE(ImageFormat, Rgba8i)
-    CASE(ImageFormat, R32i)
-    CASE(ImageFormat, Rg32i)
-    CASE(ImageFormat, Rg16i)
-    CASE(ImageFormat, Rg8i)
-    CASE(ImageFormat, R16i)
-    CASE(ImageFormat, R8i)
-    CASE(ImageFormat, Rgba32ui)
-    CASE(ImageFormat, Rgba16ui)
-    CASE(ImageFormat, Rgba8ui)
-    CASE(ImageFormat, R32ui)
-    CASE(ImageFormat, Rgb10a2ui)
-    CASE(ImageFormat, Rg32ui)
-    CASE(ImageFormat, Rg16ui)
-    CASE(ImageFormat, Rg8ui)
-    CASE(ImageFormat, R16ui)
-    CASE(ImageFormat, R8ui)
-    break;
-  }
-  llvm_unreachable("Unexpected operand");
-}
+std::string
+getSymbolicOperandMnemonic(SPIRV::OperandCategory::OperandCategory Category,
+                           int32_t Value) {
+  const SPIRV::SymbolicOperand *Lookup =
+      SPIRV::lookupSymbolicOperandByCategoryAndValue(Category, Value);
+  // Value that encodes just one enum value.
+  if (Lookup)
+    return Lookup->Mnemonic.str();
+  if (Category != SPIRV::OperandCategory::ImageOperandOperand &&
+      Category != SPIRV::OperandCategory::FPFastMathModeOperand &&
+      Category != SPIRV::OperandCategory::SelectionControlOperand &&
+      Category != SPIRV::OperandCategory::LoopControlOperand &&
+      Category != SPIRV::OperandCategory::FunctionControlOperand &&
+      Category != SPIRV::OperandCategory::MemorySemanticsOperand &&
+      Category != SPIRV::OperandCategory::MemoryOperandOperand &&
+      Category != SPIRV::OperandCategory::KernelProfilingInfoOperand)
+    return "UNKNOWN";
+  // Value that encodes many enum values (one bit per enum value).
+  std::string Name;
+  std::string Separator;
+  const SPIRV::SymbolicOperand *EnumValueInCategory =
+      SPIRV::lookupSymbolicOperandByCategory(Category);
 
-StringRef getImageChannelOrderName(ImageChannelOrder e) {
-  switch (e) {
-    CASE(ImageChannelOrder, R)
-    CASE(ImageChannelOrder, A)
-    CASE(ImageChannelOrder, RG)
-    CASE(ImageChannelOrder, RA)
-    CASE(ImageChannelOrder, RGB)
-    CASE(ImageChannelOrder, RGBA)
-    CASE(ImageChannelOrder, BGRA)
-    CASE(ImageChannelOrder, ARGB)
-    CASE(ImageChannelOrder, Intensity)
-    CASE(ImageChannelOrder, Luminance)
-    CASE(ImageChannelOrder, Rx)
-    CASE(ImageChannelOrder, RGx)
-    CASE(ImageChannelOrder, RGBx)
-    CASE(ImageChannelOrder, Depth)
-    CASE(ImageChannelOrder, DepthStencil)
-    CASE(ImageChannelOrder, sRGB)
-    CASE(ImageChannelOrder, sRGBx)
-    CASE(ImageChannelOrder, sRGBA)
-    CASE(ImageChannelOrder, sBGRA)
-    CASE(ImageChannelOrder, ABGR)
-    break;
+  while (EnumValueInCategory && EnumValueInCategory->Category == Category) {
+    if ((EnumValueInCategory->Value != 0) &&
+        (Value & EnumValueInCategory->Value)) {
+      Name += Separator + EnumValueInCategory->Mnemonic.str();
+      Separator = "|";
+    }
+    ++EnumValueInCategory;
   }
-  llvm_unreachable("Unexpected operand");
-}
 
-StringRef getImageChannelDataTypeName(ImageChannelDataType e) {
-  switch (e) {
-    CASE(ImageChannelDataType, SnormInt8)
-    CASE(ImageChannelDataType, SnormInt16)
-    CASE(ImageChannelDataType, UnormInt8)
-    CASE(ImageChannelDataType, UnormInt16)
-    CASE(ImageChannelDataType, UnormShort565)
-    CASE(ImageChannelDataType, UnormShort555)
-    CASE(ImageChannelDataType, UnormInt101010)
-    CASE(ImageChannelDataType, SignedInt8)
-    CASE(ImageChannelDataType, SignedInt16)
-    CASE(ImageChannelDataType, SignedInt32)
-    CASE(ImageChannelDataType, UnsignedInt8)
-    CASE(ImageChannelDataType, UnsignedInt16)
-    CASE(ImageChannelDataType, UnsigendInt32)
-    CASE(ImageChannelDataType, HalfFloat)
-    CASE(ImageChannelDataType, Float)
-    CASE(ImageChannelDataType, UnormInt24)
-    CASE(ImageChannelDataType, UnormInt101010_2)
-    break;
-  }
-  llvm_unreachable("Unexpected operand");
+  return Name;
 }
 
-std::string getImageOperandName(uint32_t e) {
-  std::string nameString = "";
-  std::string sep = "";
-  if (e == static_cast<uint32_t>(ImageOperand::None))
-    return "None";
-  if (e == static_cast<uint32_t>(ImageOperand::Bias))
-    return "Bias";
-  if (e & static_cast<uint32_t>(ImageOperand::Bias)) {
-    nameString += sep + "Bias";
-    sep = "|";
-  }
-  if (e == static_cast<uint32_t>(ImageOperand::Lod))
-    return "Lod";
-  if (e & static_cast<uint32_t>(ImageOperand::Lod)) {
-    nameString += sep + "Lod";
-    sep = "|";
-  }
-  if (e == static_cast<uint32_t>(ImageOperand::Grad))
-    return "Grad";
-  if (e & static_cast<uint32_t>(ImageOperand::Grad)) {
-    nameString += sep + "Grad";
-    sep = "|";
-  }
-  if (e == static_cast<uint32_t>(ImageOperand::ConstOffset))
-    return "ConstOffset";
-  if (e & static_cast<uint32_t>(ImageOperand::ConstOffset)) {
-    nameString += sep + "ConstOffset";
-    sep = "|";
-  }
-  if (e == static_cast<uint32_t>(ImageOperand::Offset))
-    return "Offset";
-  if (e & static_cast<uint32_t>(ImageOperand::Offset)) {
-    nameString += sep + "Offset";
-    sep = "|";
-  }
-  if (e == static_cast<uint32_t>(ImageOperand::ConstOffsets))
-    return "ConstOffsets";
-  if (e & static_cast<uint32_t>(ImageOperand::ConstOffsets)) {
-    nameString += sep + "ConstOffsets";
-    sep = "|";
-  }
-  if (e == static_cast<uint32_t>(ImageOperand::Sample))
-    return "Sample";
-  if (e & static_cast<uint32_t>(ImageOperand::Sample)) {
-    nameString += sep + "Sample";
-    sep = "|";
-  }
-  if (e == static_cast<uint32_t>(ImageOperand::MinLod))
-    return "MinLod";
-  if (e & static_cast<uint32_t>(ImageOperand::MinLod)) {
-    nameString += sep + "MinLod";
-    sep = "|";
-  }
-  if (e == static_cast<uint32_t>(ImageOperand::MakeTexelAvailableKHR))
-    return "MakeTexelAvailableKHR";
-  if (e & static_cast<uint32_t>(ImageOperand::MakeTexelAvailableKHR)) {
-    nameString += sep + "MakeTexelAvailableKHR";
-    sep = "|";
-  }
-  if (e == static_cast<uint32_t>(ImageOperand::MakeTexelVisibleKHR))
-    return "MakeTexelVisibleKHR";
-  if (e & static_cast<uint32_t>(ImageOperand::MakeTexelVisibleKHR)) {
-    nameString += sep + "MakeTexelVisibleKHR";
-    sep = "|";
-  }
-  if (e == static_cast<uint32_t>(ImageOperand::NonPrivateTexelKHR))
-    return "NonPrivateTexelKHR";
-  if (e & static_cast<uint32_t>(ImageOperand::NonPrivateTexelKHR)) {
-    nameString += sep + "NonPrivateTexelKHR";
-    sep = "|";
-  }
-  if (e == static_cast<uint32_t>(ImageOperand::VolatileTexelKHR))
-    return "VolatileTexelKHR";
-  if (e & static_cast<uint32_t>(ImageOperand::VolatileTexelKHR)) {
-    nameString += sep + "VolatileTexelKHR";
-    sep = "|";
-  }
-  if (e == static_cast<uint32_t>(ImageOperand::SignExtend))
-    return "SignExtend";
-  if (e & static_cast<uint32_t>(ImageOperand::SignExtend)) {
-    nameString += sep + "SignExtend";
-    sep = "|";
-  }
-  if (e == static_cast<uint32_t>(ImageOperand::ZeroExtend))
-    return "ZeroExtend";
-  if (e & static_cast<uint32_t>(ImageOperand::ZeroExtend)) {
-    nameString += sep + "ZeroExtend";
-    sep = "|";
-  };
-  return nameString;
-}
+uint32_t
+getSymbolicOperandMinVersion(SPIRV::OperandCategory::OperandCategory Category,
+                             uint32_t Value) {
+  const SPIRV::SymbolicOperand *Lookup =
+      SPIRV::lookupSymbolicOperandByCategoryAndValue(Category, Value);
 
-std::string getFPFastMathModeName(uint32_t e) {
-  std::string nameString = "";
-  std::string sep = "";
-  if (e == static_cast<uint32_t>(FPFastMathMode::None))
-    return "None";
-  if (e == static_cast<uint32_t>(FPFastMathMode::NotNaN))
-    return "NotNaN";
-  if (e & static_cast<uint32_t>(FPFastMathMode::NotNaN)) {
-    nameString += sep + "NotNaN";
-    sep = "|";
-  }
-  if (e == static_cast<uint32_t>(FPFastMathMode::NotInf))
-    return "NotInf";
-  if (e & static_cast<uint32_t>(FPFastMathMode::NotInf)) {
-    nameString += sep + "NotInf";
-    sep = "|";
-  }
-  if (e == static_cast<uint32_t>(FPFastMathMode::NSZ))
-    return "NSZ";
-  if (e & static_cast<uint32_t>(FPFastMathMode::NSZ)) {
-    nameString += sep + "NSZ";
-    sep = "|";
-  }
-  if (e == static_cast<uint32_t>(FPFastMathMode::AllowRecip))
-    return "AllowRecip";
-  if (e & static_cast<uint32_t>(FPFastMathMode::AllowRecip)) {
-    nameString += sep + "AllowRecip";
-    sep = "|";
-  }
-  if (e == static_cast<uint32_t>(FPFastMathMode::Fast))
-    return "Fast";
-  if (e & static_cast<uint32_t>(FPFastMathMode::Fast)) {
-    nameString += sep + "Fast";
-    sep = "|";
-  };
-  return nameString;
-}
+  if (Lookup)
+    return Lookup->MinVersion;
 
-StringRef getFPRoundingModeName(FPRoundingMode e) {
-  switch (e) {
-    CASE(FPRoundingMode, RTE)
-    CASE(FPRoundingMode, RTZ)
-    CASE(FPRoundingMode, RTP)
-    CASE(FPRoundingMode, RTN)
-    break;
-  }
-  llvm_unreachable("Unexpected operand");
+  return 0;
 }
 
-StringRef getLinkageTypeName(LinkageType e) {
-  switch (e) {
-    CASE(LinkageType, Export)
-    CASE(LinkageType, Import)
-    break;
-  }
-  llvm_unreachable("Unexpected operand");
-}
+uint32_t
+getSymbolicOperandMaxVersion(SPIRV::OperandCategory::OperandCategory Category,
+                             uint32_t Value) {
+  const SPIRV::SymbolicOperand *Lookup =
+      SPIRV::lookupSymbolicOperandByCategoryAndValue(Category, Value);
 
-StringRef getAccessQualifierName(AccessQualifier e) {
-  switch (e) {
-    CASE(AccessQualifier, ReadOnly)
-    CASE(AccessQualifier, WriteOnly)
-    CASE(AccessQualifier, ReadWrite)
-    break;
-  }
-  llvm_unreachable("Unexpected operand");
-}
+  if (Lookup)
+    return Lookup->MaxVersion;
 
-StringRef getFunctionParameterAttributeName(FunctionParameterAttribute e) {
-  switch (e) {
-    CASE(FunctionParameterAttribute, Zext)
-    CASE(FunctionParameterAttribute, Sext)
-    CASE(FunctionParameterAttribute, ByVal)
-    CASE(FunctionParameterAttribute, Sret)
-    CASE(FunctionParameterAttribute, NoAlias)
-    CASE(FunctionParameterAttribute, NoCapture)
-    CASE(FunctionParameterAttribute, NoWrite)
-    CASE(FunctionParameterAttribute, NoReadWrite)
-    break;
-  }
-  llvm_unreachable("Unexpected operand");
+  return 0;
 }
 
-StringRef getDecorationName(Decoration e) {
-  switch (e) {
-    CASE(Decoration, RelaxedPrecision)
-    CASE(Decoration, SpecId)
-    CASE(Decoration, Block)
-    CASE(Decoration, BufferBlock)
-    CASE(Decoration, RowMajor)
-    CASE(Decoration, ColMajor)
-    CASE(Decoration, ArrayStride)
-    CASE(Decoration, MatrixStride)
-    CASE(Decoration, GLSLShared)
-    CASE(Decoration, GLSLPacked)
-    CASE(Decoration, CPacked)
-    CASE(Decoration, BuiltIn)
-    CASE(Decoration, NoPerspective)
-    CASE(Decoration, Flat)
-    CASE(Decoration, Patch)
-    CASE(Decoration, Centroid)
-    CASE(Decoration, Sample)
-    CASE(Decoration, Invariant)
-    CASE(Decoration, Restrict)
-    CASE(Decoration, Aliased)
-    CASE(Decoration, Volatile)
-    CASE(Decoration, Constant)
-    CASE(Decoration, Coherent)
-    CASE(Decoration, NonWritable)
-    CASE(Decoration, NonReadable)
-    CASE(Decoration, Uniform)
-    CASE(Decoration, UniformId)
-    CASE(Decoration, SaturatedConversion)
-    CASE(Decoration, Stream)
-    CASE(Decoration, Location)
-    CASE(Decoration, Component)
-    CASE(Decoration, Index)
-    CASE(Decoration, Binding)
-    CASE(Decoration, DescriptorSet)
-    CASE(Decoration, Offset)
-    CASE(Decoration, XfbBuffer)
-    CASE(Decoration, XfbStride)
-    CASE(Decoration, FuncParamAttr)
-    CASE(Decoration, FPRoundingMode)
-    CASE(Decoration, FPFastMathMode)
-    CASE(Decoration, LinkageAttributes)
-    CASE(Decoration, NoContraction)
-    CASE(Decoration, InputAttachmentIndex)
-    CASE(Decoration, Alignment)
-    CASE(Decoration, MaxByteOffset)
-    CASE(Decoration, AlignmentId)
-    CASE(Decoration, MaxByteOffsetId)
-    CASE(Decoration, NoSignedWrap)
-    CASE(Decoration, NoUnsignedWrap)
-    CASE(Decoration, ExplicitInterpAMD)
-    CASE(Decoration, OverrideCoverageNV)
-    CASE(Decoration, PassthroughNV)
-    CASE(Decoration, ViewportRelativeNV)
-    CASE(Decoration, SecondaryViewportRelativeNV)
-    CASE(Decoration, PerPrimitiveNV)
-    CASE(Decoration, PerViewNV)
-    CASE(Decoration, PerVertexNV)
-    CASE(Decoration, NonUniformEXT)
-    CASE(Decoration, CountBuffer)
-    CASE(Decoration, UserSemantic)
-    CASE(Decoration, RestrictPointerEXT)
-    CASE(Decoration, AliasedPointerEXT)
-    break;
-  }
-  llvm_unreachable("Unexpected operand");
-}
+CapabilityList
+getSymbolicOperandCapabilities(SPIRV::OperandCategory::OperandCategory Category,
+                               uint32_t Value) {
+  const SPIRV::CapabilityEntry *Capability =
+      SPIRV::lookupCapabilityByCategoryAndValue(Category, Value);
 
-StringRef getBuiltInName(BuiltIn e) {
-  switch (e) {
-    CASE(BuiltIn, Position)
-    CASE(BuiltIn, PointSize)
-    CASE(BuiltIn, ClipDistance)
-    CASE(BuiltIn, CullDistance)
-    CASE(BuiltIn, VertexId)
-    CASE(BuiltIn, InstanceId)
-    CASE(BuiltIn, PrimitiveId)
-    CASE(BuiltIn, InvocationId)
-    CASE(BuiltIn, Layer)
-    CASE(BuiltIn, ViewportIndex)
-    CASE(BuiltIn, TessLevelOuter)
-    CASE(BuiltIn, TessLevelInner)
-    CASE(BuiltIn, TessCoord)
-    CASE(BuiltIn, PatchVertices)
-    CASE(BuiltIn, FragCoord)
-    CASE(BuiltIn, PointCoord)
-    CASE(BuiltIn, FrontFacing)
-    CASE(BuiltIn, SampleId)
-    CASE(BuiltIn, SamplePosition)
-    CASE(BuiltIn, SampleMask)
-    CASE(BuiltIn, FragDepth)
-    CASE(BuiltIn, HelperInvocation)
-    CASE(BuiltIn, NumWorkgroups)
-    CASE(BuiltIn, WorkgroupSize)
-    CASE(BuiltIn, WorkgroupId)
-    CASE(BuiltIn, LocalInvocationId)
-    CASE(BuiltIn, GlobalInvocationId)
-    CASE(BuiltIn, LocalInvocationIndex)
-    CASE(BuiltIn, WorkDim)
-    CASE(BuiltIn, GlobalSize)
-    CASE(BuiltIn, EnqueuedWorkgroupSize)
-    CASE(BuiltIn, GlobalOffset)
-    CASE(BuiltIn, GlobalLinearId)
-    CASE(BuiltIn, SubgroupSize)
-    CASE(BuiltIn, SubgroupMaxSize)
-    CASE(BuiltIn, NumSubgroups)
-    CASE(BuiltIn, NumEnqueuedSubgroups)
-    CASE(BuiltIn, SubgroupId)
-    CASE(BuiltIn, SubgroupLocalInvocationId)
-    CASE(BuiltIn, VertexIndex)
-    CASE(BuiltIn, InstanceIndex)
-    CASE(BuiltIn, SubgroupEqMask)
-    CASE(BuiltIn, SubgroupGeMask)
-    CASE(BuiltIn, SubgroupGtMask)
-    CASE(BuiltIn, SubgroupLeMask)
-    CASE(BuiltIn, SubgroupLtMask)
-    CASE(BuiltIn, BaseVertex)
-    CASE(BuiltIn, BaseInstance)
-    CASE(BuiltIn, DrawIndex)
-    CASE(BuiltIn, DeviceIndex)
-    CASE(BuiltIn, ViewIndex)
-    CASE(BuiltIn, BaryCoordNoPerspAMD)
-    CASE(BuiltIn, BaryCoordNoPerspCentroidAMD)
-    CASE(BuiltIn, BaryCoordNoPerspSampleAMD)
-    CASE(BuiltIn, BaryCoordSmoothAMD)
-    CASE(BuiltIn, BaryCoordSmoothCentroid)
-    CASE(BuiltIn, BaryCoordSmoothSample)
-    CASE(BuiltIn, BaryCoordPullModel)
-    CASE(BuiltIn, FragStencilRefEXT)
-    CASE(BuiltIn, ViewportMaskNV)
-    CASE(BuiltIn, SecondaryPositionNV)
-    CASE(BuiltIn, SecondaryViewportMaskNV)
-    CASE(BuiltIn, PositionPerViewNV)
-    CASE(BuiltIn, ViewportMaskPerViewNV)
-    CASE(BuiltIn, FullyCoveredEXT)
-    CASE(BuiltIn, TaskCountNV)
-    CASE(BuiltIn, PrimitiveCountNV)
-    CASE(BuiltIn, PrimitiveIndicesNV)
-    CASE(BuiltIn, ClipDistancePerViewNV)
-    CASE(BuiltIn, CullDistancePerViewNV)
-    CASE(BuiltIn, LayerPerViewNV)
-    CASE(BuiltIn, MeshViewCountNV)
-    CASE(BuiltIn, MeshViewIndices)
-    CASE(BuiltIn, BaryCoordNV)
-    CASE(BuiltIn, BaryCoordNoPerspNV)
-    CASE(BuiltIn, FragSizeEXT)
-    CASE(BuiltIn, FragInvocationCountEXT)
-    CASE(BuiltIn, LaunchIdNV)
-    CASE(BuiltIn, LaunchSizeNV)
-    CASE(BuiltIn, WorldRayOriginNV)
-    CASE(BuiltIn, WorldRayDirectionNV)
-    CASE(BuiltIn, ObjectRayOriginNV)
-    CASE(BuiltIn, ObjectRayDirectionNV)
-    CASE(BuiltIn, RayTminNV)
-    CASE(BuiltIn, RayTmaxNV)
-    CASE(BuiltIn, InstanceCustomIndexNV)
-    CASE(BuiltIn, ObjectToWorldNV)
-    CASE(BuiltIn, WorldToObjectNV)
-    CASE(BuiltIn, HitTNV)
-    CASE(BuiltIn, HitKindNV)
-    CASE(BuiltIn, IncomingRayFlagsNV)
-    break;
+  CapabilityList Capabilities;
+  while (Capability && Capability->Category == Category &&
+         Capability->Value == Value) {
+    Capabilities.push_back(
+        static_cast<SPIRV::Capability::Capability>(Capability->ReqCapability));
+    ++Capability;
   }
-  llvm_unreachable("Unexpected operand");
-}
 
-std::string getSelectionControlName(uint32_t e) {
-  std::string nameString = "";
-  std::string sep = "";
-  if (e == static_cast<uint32_t>(SelectionControl::None))
-    return "None";
-  if (e == static_cast<uint32_t>(SelectionControl::Flatten))
-    return "Flatten";
-  if (e & static_cast<uint32_t>(SelectionControl::Flatten)) {
-    nameString += sep + "Flatten";
-    sep = "|";
-  }
-  if (e == static_cast<uint32_t>(SelectionControl::DontFlatten))
-    return "DontFlatten";
-  if (e & static_cast<uint32_t>(SelectionControl::DontFlatten)) {
-    nameString += sep + "DontFlatten";
-    sep = "|";
-  };
-  return nameString;
+  return Capabilities;
 }
 
-std::string getLoopControlName(uint32_t e) {
-  std::string nameString = "";
-  std::string sep = "";
-  if (e == static_cast<uint32_t>(LoopControl::None))
-    return "None";
-  if (e == static_cast<uint32_t>(LoopControl::Unroll))
-    return "Unroll";
-  if (e & static_cast<uint32_t>(LoopControl::Unroll)) {
-    nameString += sep + "Unroll";
-    sep = "|";
-  }
-  if (e == static_cast<uint32_t>(LoopControl::DontUnroll))
-    return "DontUnroll";
-  if (e & static_cast<uint32_t>(LoopControl::DontUnroll)) {
-    nameString += sep + "DontUnroll";
-    sep = "|";
-  }
-  if (e == static_cast<uint32_t>(LoopControl::DependencyInfinite))
-    return "DependencyInfinite";
-  if (e & static_cast<uint32_t>(LoopControl::DependencyInfinite)) {
-    nameString += sep + "DependencyInfinite";
-    sep = "|";
-  }
-  if (e == static_cast<uint32_t>(LoopControl::DependencyLength))
-    return "DependencyLength";
-  if (e & static_cast<uint32_t>(LoopControl::DependencyLength)) {
-    nameString += sep + "DependencyLength";
-    sep = "|";
-  }
-  if (e == static_cast<uint32_t>(LoopControl::MinIterations))
-    return "MinIterations";
-  if (e & static_cast<uint32_t>(LoopControl::MinIterations)) {
-    nameString += sep + "MinIterations";
-    sep = "|";
-  }
-  if (e == static_cast<uint32_t>(LoopControl::MaxIterations))
-    return "MaxIterations";
-  if (e & static_cast<uint32_t>(LoopControl::MaxIterations)) {
-    nameString += sep + "MaxIterations";
-    sep = "|";
-  }
-  if (e == static_cast<uint32_t>(LoopControl::IterationMultiple))
-    return "IterationMultiple";
-  if (e & static_cast<uint32_t>(LoopControl::IterationMultiple)) {
-    nameString += sep + "IterationMultiple";
-    sep = "|";
-  }
-  if (e == static_cast<uint32_t>(LoopControl::PeelCount))
-    return "PeelCount";
-  if (e & static_cast<uint32_t>(LoopControl::PeelCount)) {
-    nameString += sep + "PeelCount";
-    sep = "|";
-  }
-  if (e == static_cast<uint32_t>(LoopControl::PartialCount))
-    return "PartialCount";
-  if (e & static_cast<uint32_t>(LoopControl::PartialCount)) {
-    nameString += sep + "PartialCount";
-    sep = "|";
-  };
-  return nameString;
-}
+ExtensionList
+getSymbolicOperandExtensions(SPIRV::OperandCategory::OperandCategory Category,
+                             uint32_t Value) {
+  const SPIRV::ExtensionEntry *Extension =
+      SPIRV::lookupExtensionByCategoryAndValue(Category, Value);
 
-std::string getFunctionControlName(uint32_t e) {
-  std::string nameString = "";
-  std::string sep = "";
-  if (e == static_cast<uint32_t>(FunctionControl::None))
-    return "None";
-  if (e == static_cast<uint32_t>(FunctionControl::Inline))
-    return "Inline";
-  if (e & static_cast<uint32_t>(FunctionControl::Inline)) {
-    nameString += sep + "Inline";
-    sep = "|";
+  ExtensionList Extensions;
+  while (Extension && Extension->Category == Category &&
+         Extension->Value == Value) {
+    Extensions.push_back(
+        static_cast<SPIRV::Extension::Extension>(Extension->ReqExtension));
+    ++Extension;
   }
-  if (e == static_cast<uint32_t>(FunctionControl::DontInline))
-    return "DontInline";
-  if (e & static_cast<uint32_t>(FunctionControl::DontInline)) {
-    nameString += sep + "DontInline";
-    sep = "|";
-  }
-  if (e == static_cast<uint32_t>(FunctionControl::Pure))
-    return "Pure";
-  if (e & static_cast<uint32_t>(FunctionControl::Pure)) {
-    nameString += sep + "Pure";
-    sep = "|";
-  }
-  if (e == static_cast<uint32_t>(FunctionControl::Const))
-    return "Const";
-  if (e & static_cast<uint32_t>(FunctionControl::Const)) {
-    nameString += sep + "Const";
-    sep = "|";
-  };
-  return nameString;
-}
 
-std::string getMemorySemanticsName(uint32_t e) {
-  std::string nameString = "";
-  std::string sep = "";
-  if (e == static_cast<uint32_t>(MemorySemantics::None))
-    return "None";
-  if (e == static_cast<uint32_t>(MemorySemantics::Acquire))
-    return "Acquire";
-  if (e & static_cast<uint32_t>(MemorySemantics::Acquire)) {
-    nameString += sep + "Acquire";
-    sep = "|";
-  }
-  if (e == static_cast<uint32_t>(MemorySemantics::Release))
-    return "Release";
-  if (e & static_cast<uint32_t>(MemorySemantics::Release)) {
-    nameString += sep + "Release";
-    sep = "|";
-  }
-  if (e == static_cast<uint32_t>(MemorySemantics::AcquireRelease))
-    return "AcquireRelease";
-  if (e & static_cast<uint32_t>(MemorySemantics::AcquireRelease)) {
-    nameString += sep + "AcquireRelease";
-    sep = "|";
-  }
-  if (e == static_cast<uint32_t>(MemorySemantics::SequentiallyConsistent))
-    return "SequentiallyConsistent";
-  if (e & static_cast<uint32_t>(MemorySemantics::SequentiallyConsistent)) {
-    nameString += sep + "SequentiallyConsistent";
-    sep = "|";
-  }
-  if (e == static_cast<uint32_t>(MemorySemantics::UniformMemory))
-    return "UniformMemory";
-  if (e & static_cast<uint32_t>(MemorySemantics::UniformMemory)) {
-    nameString += sep + "UniformMemory";
-    sep = "|";
-  }
-  if (e == static_cast<uint32_t>(MemorySemantics::SubgroupMemory))
-    return "SubgroupMemory";
-  if (e & static_cast<uint32_t>(MemorySemantics::SubgroupMemory)) {
-    nameString += sep + "SubgroupMemory";
-    sep = "|";
-  }
-  if (e == static_cast<uint32_t>(MemorySemantics::WorkgroupMemory))
-    return "WorkgroupMemory";
-  if (e & static_cast<uint32_t>(MemorySemantics::WorkgroupMemory)) {
-    nameString += sep + "WorkgroupMemory";
-    sep = "|";
-  }
-  if (e == static_cast<uint32_t>(MemorySemantics::CrossWorkgroupMemory))
-    return "CrossWorkgroupMemory";
-  if (e & static_cast<uint32_t>(MemorySemantics::CrossWorkgroupMemory)) {
-    nameString += sep + "CrossWorkgroupMemory";
-    sep = "|";
-  }
-  if (e == static_cast<uint32_t>(MemorySemantics::AtomicCounterMemory))
-    return "AtomicCounterMemory";
-  if (e & static_cast<uint32_t>(MemorySemantics::AtomicCounterMemory)) {
-    nameString += sep + "AtomicCounterMemory";
-    sep = "|";
-  }
-  if (e == static_cast<uint32_t>(MemorySemantics::ImageMemory))
-    return "ImageMemory";
-  if (e & static_cast<uint32_t>(MemorySemantics::ImageMemory)) {
-    nameString += sep + "ImageMemory";
-    sep = "|";
-  }
-  if (e == static_cast<uint32_t>(MemorySemantics::OutputMemoryKHR))
-    return "OutputMemoryKHR";
-  if (e & static_cast<uint32_t>(MemorySemantics::OutputMemoryKHR)) {
-    nameString += sep + "OutputMemoryKHR";
-    sep = "|";
-  }
-  if (e == static_cast<uint32_t>(MemorySemantics::MakeAvailableKHR))
-    return "MakeAvailableKHR";
-  if (e & static_cast<uint32_t>(MemorySemantics::MakeAvailableKHR)) {
-    nameString += sep + "MakeAvailableKHR";
-    sep = "|";
-  }
-  if (e == static_cast<uint32_t>(MemorySemantics::MakeVisibleKHR))
-    return "MakeVisibleKHR";
-  if (e & static_cast<uint32_t>(MemorySemantics::MakeVisibleKHR)) {
-    nameString += sep + "MakeVisibleKHR";
-    sep = "|";
-  };
-  return nameString;
+  return Extensions;
 }
 
-std::string getMemoryOperandName(uint32_t e) {
-  std::string nameString = "";
-  std::string sep = "";
-  if (e == static_cast<uint32_t>(MemoryOperand::None))
-    return "None";
-  if (e == static_cast<uint32_t>(MemoryOperand::Volatile))
-    return "Volatile";
-  if (e & static_cast<uint32_t>(MemoryOperand::Volatile)) {
-    nameString += sep + "Volatile";
-    sep = "|";
-  }
-  if (e == static_cast<uint32_t>(MemoryOperand::Aligned))
-    return "Aligned";
-  if (e & static_cast<uint32_t>(MemoryOperand::Aligned)) {
-    nameString += sep + "Aligned";
-    sep = "|";
-  }
-  if (e == static_cast<uint32_t>(MemoryOperand::Nontemporal))
-    return "Nontemporal";
-  if (e & static_cast<uint32_t>(MemoryOperand::Nontemporal)) {
-    nameString += sep + "Nontemporal";
-    sep = "|";
-  }
-  if (e == static_cast<uint32_t>(MemoryOperand::MakePointerAvailableKHR))
-    return "MakePointerAvailableKHR";
-  if (e & static_cast<uint32_t>(MemoryOperand::MakePointerAvailableKHR)) {
-    nameString += sep + "MakePointerAvailableKHR";
-    sep = "|";
-  }
-  if (e == static_cast<uint32_t>(MemoryOperand::MakePointerVisibleKHR))
-    return "MakePointerVisibleKHR";
-  if (e & static_cast<uint32_t>(MemoryOperand::MakePointerVisibleKHR)) {
-    nameString += sep + "MakePointerVisibleKHR";
-    sep = "|";
-  }
-  if (e == static_cast<uint32_t>(MemoryOperand::NonPrivatePointerKHR))
-    return "NonPrivatePointerKHR";
-  if (e & static_cast<uint32_t>(MemoryOperand::NonPrivatePointerKHR)) {
-    nameString += sep + "NonPrivatePointerKHR";
-    sep = "|";
-  };
-  return nameString;
-}
+std::string getLinkStringForBuiltIn(SPIRV::BuiltIn::BuiltIn BuiltInValue) {
+  const SPIRV::SymbolicOperand *Lookup =
+      SPIRV::lookupSymbolicOperandByCategoryAndValue(
+          SPIRV::OperandCategory::BuiltInOperand, BuiltInValue);
 
-StringRef getScopeName(Scope e) {
-  switch (e) {
-    CASE(Scope, CrossDevice)
-    CASE(Scope, Device)
-    CASE(Scope, Workgroup)
-    CASE(Scope, Subgroup)
-    CASE(Scope, Invocation)
-    CASE(Scope, QueueFamilyKHR)
-    break;
-  }
-  llvm_unreachable("Unexpected operand");
+  if (Lookup)
+    return "__spirv_BuiltIn" + Lookup->Mnemonic.str();
+  return "UNKNOWN_BUILTIN";
 }
 
-StringRef getGroupOperationName(GroupOperation e) {
-  switch (e) {
-    CASE(GroupOperation, Reduce)
-    CASE(GroupOperation, InclusiveScan)
-    CASE(GroupOperation, ExclusiveScan)
-    CASE(GroupOperation, ClusteredReduce)
-    CASE(GroupOperation, PartitionedReduceNV)
-    CASE(GroupOperation, PartitionedInclusiveScanNV)
-    CASE(GroupOperation, PartitionedExclusiveScanNV)
-    break;
-  }
-  llvm_unreachable("Unexpected operand");
-}
+bool getSpirvBuiltInIdByName(llvm::StringRef Name,
+                             SPIRV::BuiltIn::BuiltIn &BI) {
+  const std::string Prefix = "__spirv_BuiltIn";
+  if (!Name.startswith(Prefix))
+    return false;
 
-StringRef getKernelEnqueueFlagsName(KernelEnqueueFlags e) {
-  switch (e) {
-    CASE(KernelEnqueueFlags, NoWait)
-    CASE(KernelEnqueueFlags, WaitKernel)
-    CASE(KernelEnqueueFlags, WaitWorkGroup)
-    break;
-  }
-  llvm_unreachable("Unexpected operand");
-}
+  const SPIRV::SymbolicOperand *Lookup =
+      SPIRV::lookupSymbolicOperandByCategoryAndMnemonic(
+          SPIRV::OperandCategory::BuiltInOperand,
+          Name.drop_front(Prefix.length()));
 
-StringRef getKernelProfilingInfoName(KernelProfilingInfo e) {
-  switch (e) {
-    CASE(KernelProfilingInfo, None)
-    CASE(KernelProfilingInfo, CmdExecTime)
-    break;
-  }
-  llvm_unreachable("Unexpected operand");
-}
+  if (!Lookup)
+    return false;
 
-std::string getExtInstSetName(InstructionSet e) {
-  switch (e) {
-    CASE(InstructionSet, OpenCL_std)
-    CASE(InstructionSet, GLSL_std_450)
-    CASE(InstructionSet, SPV_AMD_shader_trinary_minmax)
-    break;
-  }
-  llvm_unreachable("Unexpected operand");
+  BI = static_cast<SPIRV::BuiltIn::BuiltIn>(Lookup->Value);
+  return true;
 }
-} // namespace SPIRV
 } // namespace llvm

diff  --git a/llvm/lib/Target/SPIRV/MCTargetDesc/SPIRVBaseInfo.h b/llvm/lib/Target/SPIRV/MCTargetDesc/SPIRVBaseInfo.h
index 9482723993a2a..8af52e0de3ae8 100644
--- a/llvm/lib/Target/SPIRV/MCTargetDesc/SPIRVBaseInfo.h
+++ b/llvm/lib/Target/SPIRV/MCTargetDesc/SPIRVBaseInfo.h
@@ -1,4 +1,4 @@
-//===-- SPIRVBaseInfo.h -  Top level definitions for SPIRV ------*- C++ -*-===//
+//===-- SPIRVBaseInfo.h - Top level SPIRV definitions -----------*- C++ -*-===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.
@@ -6,706 +6,195 @@
 //
 //===----------------------------------------------------------------------===//
 //
-// This file contains small standalone helper functions and enum definitions for
-// the SPIRV target useful for the compiler back-end and the MC libraries.
-// As such, it deliberately does not include references to LLVM core
-// code gen types, passes, etc..
+// This file contains TableGen generated enum definitions, mnemonic lookup
+// functions, versioning/capabilities/extensions getters for symbolic/named
+// operands for various SPIR-V instructions.
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef LLVM_LIB_TARGET_SPIRV_MCTARGETDESC_SPIRVBASEINFO_H
-#define LLVM_LIB_TARGET_SPIRV_MCTARGETDESC_SPIRVBASEINFO_H
+#ifndef LLVM_LIB_TARGET_SPIRV_SPIRVSYMBOLICOPERANDS_H
+#define LLVM_LIB_TARGET_SPIRV_SPIRVSYMBOLICOPERANDS_H
 
+#include "llvm/ADT/SmallVector.h"
 #include "llvm/ADT/StringRef.h"
 #include <string>
 
 namespace llvm {
 namespace SPIRV {
-enum class Capability : uint32_t {
-  Matrix = 0,
-  Shader = 1,
-  Geometry = 2,
-  Tessellation = 3,
-  Addresses = 4,
-  Linkage = 5,
-  Kernel = 6,
-  Vector16 = 7,
-  Float16Buffer = 8,
-  Float16 = 9,
-  Float64 = 10,
-  Int64 = 11,
-  Int64Atomics = 12,
-  ImageBasic = 13,
-  ImageReadWrite = 14,
-  ImageMipmap = 15,
-  Pipes = 17,
-  Groups = 18,
-  DeviceEnqueue = 19,
-  LiteralSampler = 20,
-  AtomicStorage = 21,
-  Int16 = 22,
-  TessellationPointSize = 23,
-  GeometryPointSize = 24,
-  ImageGatherExtended = 25,
-  StorageImageMultisample = 27,
-  UniformBufferArrayDynamicIndexing = 28,
-  SampledImageArrayDymnamicIndexing = 29,
-  ClipDistance = 32,
-  CullDistance = 33,
-  ImageCubeArray = 34,
-  SampleRateShading = 35,
-  ImageRect = 36,
-  SampledRect = 37,
-  GenericPointer = 38,
-  Int8 = 39,
-  InputAttachment = 40,
-  SparseResidency = 41,
-  MinLod = 42,
-  Sampled1D = 43,
-  Image1D = 44,
-  SampledCubeArray = 45,
-  SampledBuffer = 46,
-  ImageBuffer = 47,
-  ImageMSArray = 48,
-  StorageImageExtendedFormats = 49,
-  ImageQuery = 50,
-  DerivativeControl = 51,
-  InterpolationFunction = 52,
-  TransformFeedback = 53,
-  GeometryStreams = 54,
-  StorageImageReadWithoutFormat = 55,
-  StorageImageWriteWithoutFormat = 56,
-  MultiViewport = 57,
-  SubgroupDispatch = 58,
-  NamedBarrier = 59,
-  PipeStorage = 60,
-  GroupNonUniform = 61,
-  GroupNonUniformVote = 62,
-  GroupNonUniformArithmetic = 63,
-  GroupNonUniformBallot = 64,
-  GroupNonUniformShuffle = 65,
-  GroupNonUniformShuffleRelative = 66,
-  GroupNonUniformClustered = 67,
-  GroupNonUniformQuad = 68,
-  SubgroupBallotKHR = 4423,
-  DrawParameters = 4427,
-  SubgroupVoteKHR = 4431,
-  StorageBuffer16BitAccess = 4433,
-  StorageUniform16 = 4434,
-  StoragePushConstant16 = 4435,
-  StorageInputOutput16 = 4436,
-  DeviceGroup = 4437,
-  MultiView = 4439,
-  VariablePointersStorageBuffer = 4441,
-  VariablePointers = 4442,
-  AtomicStorageOps = 4445,
-  SampleMaskPostDepthCoverage = 4447,
-  StorageBuffer8BitAccess = 4448,
-  UniformAndStorageBuffer8BitAccess = 4449,
-  StoragePushConstant8 = 4450,
-  DenormPreserve = 4464,
-  DenormFlushToZero = 4465,
-  SignedZeroInfNanPreserve = 4466,
-  RoundingModeRTE = 4467,
-  RoundingModeRTZ = 4468,
-  Float16ImageAMD = 5008,
-  ImageGatherBiasLodAMD = 5009,
-  FragmentMaskAMD = 5010,
-  StencilExportEXT = 5013,
-  ImageReadWriteLodAMD = 5015,
-  SampleMaskOverrideCoverageNV = 5249,
-  GeometryShaderPassthroughNV = 5251,
-  ShaderViewportIndexLayerEXT = 5254,
-  ShaderViewportMaskNV = 5255,
-  ShaderStereoViewNV = 5259,
-  PerViewAttributesNV = 5260,
-  FragmentFullyCoveredEXT = 5265,
-  MeshShadingNV = 5266,
-  ShaderNonUniformEXT = 5301,
-  RuntimeDescriptorArrayEXT = 5302,
-  InputAttachmentArrayDynamicIndexingEXT = 5303,
-  UniformTexelBufferArrayDynamicIndexingEXT = 5304,
-  StorageTexelBufferArrayDynamicIndexingEXT = 5305,
-  UniformBufferArrayNonUniformIndexingEXT = 5306,
-  SampledImageArrayNonUniformIndexingEXT = 5307,
-  StorageBufferArrayNonUniformIndexingEXT = 5308,
-  StorageImageArrayNonUniformIndexingEXT = 5309,
-  InputAttachmentArrayNonUniformIndexingEXT = 5310,
-  UniformTexelBufferArrayNonUniformIndexingEXT = 5311,
-  StorageTexelBufferArrayNonUniformIndexingEXT = 5312,
-  RayTracingNV = 5340,
-  SubgroupShuffleINTEL = 5568,
-  SubgroupBufferBlockIOINTEL = 5569,
-  SubgroupImageBlockIOINTEL = 5570,
-  SubgroupImageMediaBlockIOINTEL = 5579,
-  SubgroupAvcMotionEstimationINTEL = 5696,
-  SubgroupAvcMotionEstimationIntraINTEL = 5697,
-  SubgroupAvcMotionEstimationChromaINTEL = 5698,
-  GroupNonUniformPartitionedNV = 5297,
-  VulkanMemoryModelKHR = 5345,
-  VulkanMemoryModelDeviceScopeKHR = 5346,
-  ImageFootprintNV = 5282,
-  FragmentBarycentricNV = 5284,
-  ComputeDerivativeGroupQuadsNV = 5288,
-  ComputeDerivativeGroupLinearNV = 5350,
-  FragmentDensityEXT = 5291,
-  PhysicalStorageBufferAddressesEXT = 5347,
-  CooperativeMatrixNV = 5357,
-};
-StringRef getCapabilityName(Capability e);
-
-enum class SourceLanguage : uint32_t {
-  Unknown = 0,
-  ESSL = 1,
-  GLSL = 2,
-  OpenCL_C = 3,
-  OpenCL_CPP = 4,
-  HLSL = 5,
-};
-StringRef getSourceLanguageName(SourceLanguage e);
-
-enum class AddressingModel : uint32_t {
-  Logical = 0,
-  Physical32 = 1,
-  Physical64 = 2,
-  PhysicalStorageBuffer64EXT = 5348,
-};
-StringRef getAddressingModelName(AddressingModel e);
-
-enum class ExecutionModel : uint32_t {
-  Vertex = 0,
-  TessellationControl = 1,
-  TessellationEvaluation = 2,
-  Geometry = 3,
-  Fragment = 4,
-  GLCompute = 5,
-  Kernel = 6,
-  TaskNV = 5267,
-  MeshNV = 5268,
-  RayGenerationNV = 5313,
-  IntersectionNV = 5314,
-  AnyHitNV = 5315,
-  ClosestHitNV = 5316,
-  MissNV = 5317,
-  CallableNV = 5318,
-};
-StringRef getExecutionModelName(ExecutionModel e);
-
-enum class MemoryModel : uint32_t {
-  Simple = 0,
-  GLSL450 = 1,
-  OpenCL = 2,
-  VulkanKHR = 3,
-};
-StringRef getMemoryModelName(MemoryModel e);
-
-enum class ExecutionMode : uint32_t {
-  Invocations = 0,
-  SpacingEqual = 1,
-  SpacingFractionalEven = 2,
-  SpacingFractionalOdd = 3,
-  VertexOrderCw = 4,
-  VertexOrderCcw = 5,
-  PixelCenterInteger = 6,
-  OriginUpperLeft = 7,
-  OriginLowerLeft = 8,
-  EarlyFragmentTests = 9,
-  PointMode = 10,
-  Xfb = 11,
-  DepthReplacing = 12,
-  DepthGreater = 14,
-  DepthLess = 15,
-  DepthUnchanged = 16,
-  LocalSize = 17,
-  LocalSizeHint = 18,
-  InputPoints = 19,
-  InputLines = 20,
-  InputLinesAdjacency = 21,
-  Triangles = 22,
-  InputTrianglesAdjacency = 23,
-  Quads = 24,
-  Isolines = 25,
-  OutputVertices = 26,
-  OutputPoints = 27,
-  OutputLineStrip = 28,
-  OutputTriangleStrip = 29,
-  VecTypeHint = 30,
-  ContractionOff = 31,
-  Initializer = 33,
-  Finalizer = 34,
-  SubgroupSize = 35,
-  SubgroupsPerWorkgroup = 36,
-  SubgroupsPerWorkgroupId = 37,
-  LocalSizeId = 38,
-  LocalSizeHintId = 39,
-  PostDepthCoverage = 4446,
-  DenormPreserve = 4459,
-  DenormFlushToZero = 4460,
-  SignedZeroInfNanPreserve = 4461,
-  RoundingModeRTE = 4462,
-  RoundingModeRTZ = 4463,
-  StencilRefReplacingEXT = 5027,
-  OutputLinesNV = 5269,
-  DerivativeGroupQuadsNV = 5289,
-  DerivativeGroupLinearNV = 5290,
-  OutputTrianglesNV = 5298,
-};
-StringRef getExecutionModeName(ExecutionMode e);
-
-enum class StorageClass : uint32_t {
-  UniformConstant = 0,
-  Input = 1,
-  Uniform = 2,
-  Output = 3,
-  Workgroup = 4,
-  CrossWorkgroup = 5,
-  Private = 6,
-  Function = 7,
-  Generic = 8,
-  PushConstant = 9,
-  AtomicCounter = 10,
-  Image = 11,
-  StorageBuffer = 12,
-  CallableDataNV = 5328,
-  IncomingCallableDataNV = 5329,
-  RayPayloadNV = 5338,
-  HitAttributeNV = 5339,
-  IncomingRayPayloadNV = 5342,
-  ShaderRecordBufferNV = 5343,
-  PhysicalStorageBufferEXT = 5349,
-};
-StringRef getStorageClassName(StorageClass e);
-
-enum class Dim : uint32_t {
-  DIM_1D = 0,
-  DIM_2D = 1,
-  DIM_3D = 2,
-  DIM_Cube = 3,
-  DIM_Rect = 4,
-  DIM_Buffer = 5,
-  DIM_SubpassData = 6,
-};
-StringRef getDimName(Dim e);
-
-enum class SamplerAddressingMode : uint32_t {
-  None = 0,
-  ClampToEdge = 1,
-  Clamp = 2,
-  Repeat = 3,
-  RepeatMirrored = 4,
-};
-StringRef getSamplerAddressingModeName(SamplerAddressingMode e);
-
-enum class SamplerFilterMode : uint32_t {
-  Nearest = 0,
-  Linear = 1,
-};
-StringRef getSamplerFilterModeName(SamplerFilterMode e);
-
-enum class ImageFormat : uint32_t {
-  Unknown = 0,
-  Rgba32f = 1,
-  Rgba16f = 2,
-  R32f = 3,
-  Rgba8 = 4,
-  Rgba8Snorm = 5,
-  Rg32f = 6,
-  Rg16f = 7,
-  R11fG11fB10f = 8,
-  R16f = 9,
-  Rgba16 = 10,
-  Rgb10A2 = 11,
-  Rg16 = 12,
-  Rg8 = 13,
-  R16 = 14,
-  R8 = 15,
-  Rgba16Snorm = 16,
-  Rg16Snorm = 17,
-  Rg8Snorm = 18,
-  R16Snorm = 19,
-  R8Snorm = 20,
-  Rgba32i = 21,
-  Rgba16i = 22,
-  Rgba8i = 23,
-  R32i = 24,
-  Rg32i = 25,
-  Rg16i = 26,
-  Rg8i = 27,
-  R16i = 28,
-  R8i = 29,
-  Rgba32ui = 30,
-  Rgba16ui = 31,
-  Rgba8ui = 32,
-  R32ui = 33,
-  Rgb10a2ui = 34,
-  Rg32ui = 35,
-  Rg16ui = 36,
-  Rg8ui = 37,
-  R16ui = 38,
-  R8ui = 39,
-};
-StringRef getImageFormatName(ImageFormat e);
-
-enum class ImageChannelOrder : uint32_t {
-  R = 0,
-  A = 1,
-  RG = 2,
-  RA = 3,
-  RGB = 4,
-  RGBA = 5,
-  BGRA = 6,
-  ARGB = 7,
-  Intensity = 8,
-  Luminance = 9,
-  Rx = 10,
-  RGx = 11,
-  RGBx = 12,
-  Depth = 13,
-  DepthStencil = 14,
-  sRGB = 15,
-  sRGBx = 16,
-  sRGBA = 17,
-  sBGRA = 18,
-  ABGR = 19,
-};
-StringRef getImageChannelOrderName(ImageChannelOrder e);
-
-enum class ImageChannelDataType : uint32_t {
-  SnormInt8 = 0,
-  SnormInt16 = 1,
-  UnormInt8 = 2,
-  UnormInt16 = 3,
-  UnormShort565 = 4,
-  UnormShort555 = 5,
-  UnormInt101010 = 6,
-  SignedInt8 = 7,
-  SignedInt16 = 8,
-  SignedInt32 = 9,
-  UnsignedInt8 = 10,
-  UnsignedInt16 = 11,
-  UnsigendInt32 = 12,
-  HalfFloat = 13,
-  Float = 14,
-  UnormInt24 = 15,
-  UnormInt101010_2 = 16,
-};
-StringRef getImageChannelDataTypeName(ImageChannelDataType e);
-
-enum class ImageOperand : uint32_t {
-  None = 0x0,
-  Bias = 0x1,
-  Lod = 0x2,
-  Grad = 0x4,
-  ConstOffset = 0x8,
-  Offset = 0x10,
-  ConstOffsets = 0x20,
-  Sample = 0x40,
-  MinLod = 0x80,
-  MakeTexelAvailableKHR = 0x100,
-  MakeTexelVisibleKHR = 0x200,
-  NonPrivateTexelKHR = 0x400,
-  VolatileTexelKHR = 0x800,
-  SignExtend = 0x1000,
-  ZeroExtend = 0x2000,
-};
-std::string getImageOperandName(uint32_t e);
-
-enum class FPFastMathMode : uint32_t {
-  None = 0x0,
-  NotNaN = 0x1,
-  NotInf = 0x2,
-  NSZ = 0x4,
-  AllowRecip = 0x8,
-  Fast = 0x10,
-};
-std::string getFPFastMathModeName(uint32_t e);
-
-enum class FPRoundingMode : uint32_t {
-  RTE = 0,
-  RTZ = 1,
-  RTP = 2,
-  RTN = 3,
-};
-StringRef getFPRoundingModeName(FPRoundingMode e);
-
-enum class LinkageType : uint32_t {
-  Export = 0,
-  Import = 1,
-};
-StringRef getLinkageTypeName(LinkageType e);
-
-enum class AccessQualifier : uint32_t {
-  ReadOnly = 0,
-  WriteOnly = 1,
-  ReadWrite = 2,
-};
-StringRef getAccessQualifierName(AccessQualifier e);
-
-enum class FunctionParameterAttribute : uint32_t {
-  Zext = 0,
-  Sext = 1,
-  ByVal = 2,
-  Sret = 3,
-  NoAlias = 4,
-  NoCapture = 5,
-  NoWrite = 6,
-  NoReadWrite = 7,
-};
-StringRef getFunctionParameterAttributeName(FunctionParameterAttribute e);
-
-enum class Decoration : uint32_t {
-  RelaxedPrecision = 0,
-  SpecId = 1,
-  Block = 2,
-  BufferBlock = 3,
-  RowMajor = 4,
-  ColMajor = 5,
-  ArrayStride = 6,
-  MatrixStride = 7,
-  GLSLShared = 8,
-  GLSLPacked = 9,
-  CPacked = 10,
-  BuiltIn = 11,
-  NoPerspective = 13,
-  Flat = 14,
-  Patch = 15,
-  Centroid = 16,
-  Sample = 17,
-  Invariant = 18,
-  Restrict = 19,
-  Aliased = 20,
-  Volatile = 21,
-  Constant = 22,
-  Coherent = 23,
-  NonWritable = 24,
-  NonReadable = 25,
-  Uniform = 26,
-  UniformId = 27,
-  SaturatedConversion = 28,
-  Stream = 29,
-  Location = 30,
-  Component = 31,
-  Index = 32,
-  Binding = 33,
-  DescriptorSet = 34,
-  Offset = 35,
-  XfbBuffer = 36,
-  XfbStride = 37,
-  FuncParamAttr = 38,
-  FPRoundingMode = 39,
-  FPFastMathMode = 40,
-  LinkageAttributes = 41,
-  NoContraction = 42,
-  InputAttachmentIndex = 43,
-  Alignment = 44,
-  MaxByteOffset = 45,
-  AlignmentId = 46,
-  MaxByteOffsetId = 47,
-  NoSignedWrap = 4469,
-  NoUnsignedWrap = 4470,
-  ExplicitInterpAMD = 4999,
-  OverrideCoverageNV = 5248,
-  PassthroughNV = 5250,
-  ViewportRelativeNV = 5252,
-  SecondaryViewportRelativeNV = 5256,
-  PerPrimitiveNV = 5271,
-  PerViewNV = 5272,
-  PerVertexNV = 5273,
-  NonUniformEXT = 5300,
-  CountBuffer = 5634,
-  UserSemantic = 5635,
-  RestrictPointerEXT = 5355,
-  AliasedPointerEXT = 5356,
-};
-StringRef getDecorationName(Decoration e);
-
-enum class BuiltIn : uint32_t {
-  Position = 0,
-  PointSize = 1,
-  ClipDistance = 3,
-  CullDistance = 4,
-  VertexId = 5,
-  InstanceId = 6,
-  PrimitiveId = 7,
-  InvocationId = 8,
-  Layer = 9,
-  ViewportIndex = 10,
-  TessLevelOuter = 11,
-  TessLevelInner = 12,
-  TessCoord = 13,
-  PatchVertices = 14,
-  FragCoord = 15,
-  PointCoord = 16,
-  FrontFacing = 17,
-  SampleId = 18,
-  SamplePosition = 19,
-  SampleMask = 20,
-  FragDepth = 22,
-  HelperInvocation = 23,
-  NumWorkgroups = 24,
-  WorkgroupSize = 25,
-  WorkgroupId = 26,
-  LocalInvocationId = 27,
-  GlobalInvocationId = 28,
-  LocalInvocationIndex = 29,
-  WorkDim = 30,
-  GlobalSize = 31,
-  EnqueuedWorkgroupSize = 32,
-  GlobalOffset = 33,
-  GlobalLinearId = 34,
-  SubgroupSize = 36,
-  SubgroupMaxSize = 37,
-  NumSubgroups = 38,
-  NumEnqueuedSubgroups = 39,
-  SubgroupId = 40,
-  SubgroupLocalInvocationId = 41,
-  VertexIndex = 42,
-  InstanceIndex = 43,
-  SubgroupEqMask = 4416,
-  SubgroupGeMask = 4417,
-  SubgroupGtMask = 4418,
-  SubgroupLeMask = 4419,
-  SubgroupLtMask = 4420,
-  BaseVertex = 4424,
-  BaseInstance = 4425,
-  DrawIndex = 4426,
-  DeviceIndex = 4438,
-  ViewIndex = 4440,
-  BaryCoordNoPerspAMD = 4492,
-  BaryCoordNoPerspCentroidAMD = 4493,
-  BaryCoordNoPerspSampleAMD = 4494,
-  BaryCoordSmoothAMD = 4495,
-  BaryCoordSmoothCentroid = 4496,
-  BaryCoordSmoothSample = 4497,
-  BaryCoordPullModel = 4498,
-  FragStencilRefEXT = 5014,
-  ViewportMaskNV = 5253,
-  SecondaryPositionNV = 5257,
-  SecondaryViewportMaskNV = 5258,
-  PositionPerViewNV = 5261,
-  ViewportMaskPerViewNV = 5262,
-  FullyCoveredEXT = 5264,
-  TaskCountNV = 5274,
-  PrimitiveCountNV = 5275,
-  PrimitiveIndicesNV = 5276,
-  ClipDistancePerViewNV = 5277,
-  CullDistancePerViewNV = 5278,
-  LayerPerViewNV = 5279,
-  MeshViewCountNV = 5280,
-  MeshViewIndices = 5281,
-  BaryCoordNV = 5286,
-  BaryCoordNoPerspNV = 5287,
-  FragSizeEXT = 5292,
-  FragInvocationCountEXT = 5293,
-  LaunchIdNV = 5319,
-  LaunchSizeNV = 5320,
-  WorldRayOriginNV = 5321,
-  WorldRayDirectionNV = 5322,
-  ObjectRayOriginNV = 5323,
-  ObjectRayDirectionNV = 5324,
-  RayTminNV = 5325,
-  RayTmaxNV = 5326,
-  InstanceCustomIndexNV = 5327,
-  ObjectToWorldNV = 5330,
-  WorldToObjectNV = 5331,
-  HitTNV = 5332,
-  HitKindNV = 5333,
-  IncomingRayFlagsNV = 5351,
-};
-StringRef getBuiltInName(BuiltIn e);
-
-enum class SelectionControl : uint32_t {
-  None = 0x0,
-  Flatten = 0x1,
-  DontFlatten = 0x2,
-};
-std::string getSelectionControlName(uint32_t e);
-
-enum class LoopControl : uint32_t {
-  None = 0x0,
-  Unroll = 0x1,
-  DontUnroll = 0x2,
-  DependencyInfinite = 0x4,
-  DependencyLength = 0x8,
-  MinIterations = 0x10,
-  MaxIterations = 0x20,
-  IterationMultiple = 0x40,
-  PeelCount = 0x80,
-  PartialCount = 0x100,
-};
-std::string getLoopControlName(uint32_t e);
-
-enum class FunctionControl : uint32_t {
-  None = 0x0,
-  Inline = 0x1,
-  DontInline = 0x2,
-  Pure = 0x4,
-  Const = 0x8,
-};
-std::string getFunctionControlName(uint32_t e);
-
-enum class MemorySemantics : uint32_t {
-  None = 0x0,
-  Acquire = 0x2,
-  Release = 0x4,
-  AcquireRelease = 0x8,
-  SequentiallyConsistent = 0x10,
-  UniformMemory = 0x40,
-  SubgroupMemory = 0x80,
-  WorkgroupMemory = 0x100,
-  CrossWorkgroupMemory = 0x200,
-  AtomicCounterMemory = 0x400,
-  ImageMemory = 0x800,
-  OutputMemoryKHR = 0x1000,
-  MakeAvailableKHR = 0x2000,
-  MakeVisibleKHR = 0x4000,
-};
-std::string getMemorySemanticsName(uint32_t e);
-
-enum class MemoryOperand : uint32_t {
-  None = 0x0,
-  Volatile = 0x1,
-  Aligned = 0x2,
-  Nontemporal = 0x4,
-  MakePointerAvailableKHR = 0x8,
-  MakePointerVisibleKHR = 0x10,
-  NonPrivatePointerKHR = 0x20,
-};
-std::string getMemoryOperandName(uint32_t e);
-
-enum class Scope : uint32_t {
-  CrossDevice = 0,
-  Device = 1,
-  Workgroup = 2,
-  Subgroup = 3,
-  Invocation = 4,
-  QueueFamilyKHR = 5,
-};
-StringRef getScopeName(Scope e);
-
-enum class GroupOperation : uint32_t {
-  Reduce = 0,
-  InclusiveScan = 1,
-  ExclusiveScan = 2,
-  ClusteredReduce = 3,
-  PartitionedReduceNV = 6,
-  PartitionedInclusiveScanNV = 7,
-  PartitionedExclusiveScanNV = 8,
-};
-StringRef getGroupOperationName(GroupOperation e);
-
-enum class KernelEnqueueFlags : uint32_t {
-  NoWait = 0,
-  WaitKernel = 1,
-  WaitWorkGroup = 2,
-};
-StringRef getKernelEnqueueFlagsName(KernelEnqueueFlags e);
-
-enum class KernelProfilingInfo : uint32_t {
-  None = 0x0,
-  CmdExecTime = 0x1,
-};
-StringRef getKernelProfilingInfoName(KernelProfilingInfo e);
+namespace OperandCategory {
+#define GET_OperandCategory_DECL
+#include "SPIRVGenTables.inc"
+} // namespace OperandCategory
+
+namespace Extension {
+#define GET_Extension_DECL
+#include "SPIRVGenTables.inc"
+} // namespace Extension
+
+namespace Capability {
+#define GET_Capability_DECL
+#include "SPIRVGenTables.inc"
+} // namespace Capability
+
+namespace SourceLanguage {
+#define GET_SourceLanguage_DECL
+#include "SPIRVGenTables.inc"
+} // namespace SourceLanguage
+
+namespace AddressingModel {
+#define GET_AddressingModel_DECL
+#include "SPIRVGenTables.inc"
+} // namespace AddressingModel
+
+namespace ExecutionModel {
+#define GET_ExecutionModel_DECL
+#include "SPIRVGenTables.inc"
+} // namespace ExecutionModel
+
+namespace MemoryModel {
+#define GET_MemoryModel_DECL
+#include "SPIRVGenTables.inc"
+} // namespace MemoryModel
+
+namespace ExecutionMode {
+#define GET_ExecutionMode_DECL
+#include "SPIRVGenTables.inc"
+} // namespace ExecutionMode
+
+namespace StorageClass {
+#define GET_StorageClass_DECL
+#include "SPIRVGenTables.inc"
+} // namespace StorageClass
+
+namespace Dim {
+#define GET_Dim_DECL
+#include "SPIRVGenTables.inc"
+} // namespace Dim
+
+namespace SamplerAddressingMode {
+#define GET_SamplerAddressingMode_DECL
+#include "SPIRVGenTables.inc"
+} // namespace SamplerAddressingMode
+
+namespace SamplerFilterMode {
+#define GET_SamplerFilterMode_DECL
+#include "SPIRVGenTables.inc"
+} // namespace SamplerFilterMode
+
+namespace ImageFormat {
+#define GET_ImageFormat_DECL
+#include "SPIRVGenTables.inc"
+} // namespace ImageFormat
+
+namespace ImageChannelOrder {
+#define GET_ImageChannelOrder_DECL
+#include "SPIRVGenTables.inc"
+} // namespace ImageChannelOrder
+
+namespace ImageChannelDataType {
+#define GET_ImageChannelDataType_DECL
+#include "SPIRVGenTables.inc"
+} // namespace ImageChannelDataType
+
+namespace ImageOperand {
+#define GET_ImageOperand_DECL
+#include "SPIRVGenTables.inc"
+} // namespace ImageOperand
+
+namespace FPFastMathMode {
+#define GET_FPFastMathMode_DECL
+#include "SPIRVGenTables.inc"
+} // namespace FPFastMathMode
+
+namespace FPRoundingMode {
+#define GET_FPRoundingMode_DECL
+#include "SPIRVGenTables.inc"
+} // namespace FPRoundingMode
+
+namespace LinkageType {
+#define GET_LinkageType_DECL
+#include "SPIRVGenTables.inc"
+} // namespace LinkageType
+
+namespace AccessQualifier {
+#define GET_AccessQualifier_DECL
+#include "SPIRVGenTables.inc"
+} // namespace AccessQualifier
+
+namespace FunctionParameterAttribute {
+#define GET_FunctionParameterAttribute_DECL
+#include "SPIRVGenTables.inc"
+} // namespace FunctionParameterAttribute
+
+namespace Decoration {
+#define GET_Decoration_DECL
+#include "SPIRVGenTables.inc"
+} // namespace Decoration
+
+namespace BuiltIn {
+#define GET_BuiltIn_DECL
+#include "SPIRVGenTables.inc"
+} // namespace BuiltIn
+
+namespace SelectionControl {
+#define GET_SelectionControl_DECL
+#include "SPIRVGenTables.inc"
+} // namespace SelectionControl
+
+namespace LoopControl {
+#define GET_LoopControl_DECL
+#include "SPIRVGenTables.inc"
+} // namespace LoopControl
+
+namespace FunctionControl {
+#define GET_FunctionControl_DECL
+#include "SPIRVGenTables.inc"
+} // namespace FunctionControl
+
+namespace MemorySemantics {
+#define GET_MemorySemantics_DECL
+#include "SPIRVGenTables.inc"
+} // namespace MemorySemantics
+
+namespace MemoryOperand {
+#define GET_MemoryOperand_DECL
+#include "SPIRVGenTables.inc"
+} // namespace MemoryOperand
+
+namespace Scope {
+#define GET_Scope_DECL
+#include "SPIRVGenTables.inc"
+} // namespace Scope
+
+namespace GroupOperation {
+#define GET_GroupOperation_DECL
+#include "SPIRVGenTables.inc"
+} // namespace GroupOperation
+
+namespace KernelEnqueueFlags {
+#define GET_KernelEnqueueFlags_DECL
+#include "SPIRVGenTables.inc"
+} // namespace KernelEnqueueFlags
+
+namespace KernelProfilingInfo {
+#define GET_KernelProfilingInfo_DECL
+#include "SPIRVGenTables.inc"
+} // namespace KernelProfilingInfo
+
+namespace OpenCLExtInst {
+#define GET_OpenCLExtInst_DECL
+#include "SPIRVGenTables.inc"
+} // namespace OpenCLExtInst
+
+namespace GLSLExtInst {
+#define GET_GLSLExtInst_DECL
+#include "SPIRVGenTables.inc"
+} // namespace GLSLExtInst
+
+namespace Opcode {
+#define GET_Opcode_DECL
+#include "SPIRVGenTables.inc"
+} // namespace Opcode
 
 enum class InstructionSet : uint32_t {
   OpenCL_std = 0,
@@ -713,14 +202,29 @@ enum class InstructionSet : uint32_t {
   SPV_AMD_shader_trinary_minmax = 2,
 };
 std::string getExtInstSetName(InstructionSet e);
-
-// TODO: implement other mnemonics.
-enum class Opcode : uint32_t {
-  InBoundsPtrAccessChain = 70,
-  PtrCastToGeneric = 121,
-};
 } // namespace SPIRV
-} // namespace llvm
+
+using CapabilityList = SmallVector<SPIRV::Capability::Capability, 8>;
+using ExtensionList = SmallVector<SPIRV::Extension::Extension, 8>;
+
+std::string
+getSymbolicOperandMnemonic(SPIRV::OperandCategory::OperandCategory Category,
+                           int32_t Value);
+uint32_t
+getSymbolicOperandMinVersion(SPIRV::OperandCategory::OperandCategory Category,
+                             uint32_t Value);
+uint32_t
+getSymbolicOperandMaxVersion(SPIRV::OperandCategory::OperandCategory Category,
+                             uint32_t Value);
+CapabilityList
+getSymbolicOperandCapabilities(SPIRV::OperandCategory::OperandCategory Category,
+                               uint32_t Value);
+ExtensionList
+getSymbolicOperandExtensions(SPIRV::OperandCategory::OperandCategory Category,
+                             uint32_t Value);
+std::string getLinkStringForBuiltIn(SPIRV::BuiltIn::BuiltIn BuiltInValue);
+
+bool getSpirvBuiltInIdByName(StringRef Name, SPIRV::BuiltIn::BuiltIn &BI);
 
 // Return a string representation of the operands from startIndex onwards.
 // Templated to allow both MachineInstr and MCInst to use the same logic.
@@ -741,12 +245,11 @@ std::string getSPIRVStringOperand(const InstType &MI, unsigned StartIndex) {
       if (c == 0) { // Stop if we hit a null-terminator character.
         IsFinished = true;
         break;
-      } else {
-        s += c; // Otherwise, append the character to the result string.
       }
+      s += c; // Otherwise, append the character to the result string.
     }
   }
   return s;
 }
-
-#endif // LLVM_LIB_TARGET_SPIRV_MCTARGETDESC_SPIRVBASEINFO_H
+} // namespace llvm
+#endif // LLVM_LIB_TARGET_SPIRV_SPIRVSYMBOLICOPERANDS_H

diff  --git a/llvm/lib/Target/SPIRV/MCTargetDesc/SPIRVInstPrinter.cpp b/llvm/lib/Target/SPIRV/MCTargetDesc/SPIRVInstPrinter.cpp
index d60e61f36270e..fa286d3c06339 100644
--- a/llvm/lib/Target/SPIRV/MCTargetDesc/SPIRVInstPrinter.cpp
+++ b/llvm/lib/Target/SPIRV/MCTargetDesc/SPIRVInstPrinter.cpp
@@ -24,6 +24,7 @@
 #include "llvm/Support/FormattedStream.h"
 
 using namespace llvm;
+using namespace llvm::SPIRV;
 
 #define DEBUG_TYPE "asm-printer"
 
@@ -89,7 +90,8 @@ void SPIRVInstPrinter::printInst(const MCInst *MI, uint64_t Address,
         switch (OpCode) {
         case SPIRV::OpTypeImage:
           OS << ' ';
-          printAccessQualifier(MI, FirstVariableIndex, OS);
+          printSymbolicOperand<OperandCategory::AccessQualifierOperand>(
+              MI, FirstVariableIndex, OS);
           break;
         case SPIRV::OpVariable:
           OS << ' ';
@@ -109,7 +111,7 @@ void SPIRVInstPrinter::printInst(const MCInst *MI, uint64_t Address,
           break;
         }
         default:
-          break; // printStringImm has already been handled
+          break; // printStringImm has already been handled.
         }
       } else {
         // For instructions with no fixed ops or a reg/immediate as the final
@@ -119,7 +121,8 @@ void SPIRVInstPrinter::printInst(const MCInst *MI, uint64_t Address,
         case SPIRV::OpLoad:
         case SPIRV::OpStore:
           OS << ' ';
-          printMemoryOperand(MI, FirstVariableIndex, OS);
+          printSymbolicOperand<OperandCategory::MemoryOperandOperand>(
+              MI, FirstVariableIndex, OS);
           printRemainingVariableOps(MI, FirstVariableIndex + 1, OS);
           break;
         case SPIRV::OpImageSampleImplicitLod:
@@ -141,7 +144,8 @@ void SPIRVInstPrinter::printInst(const MCInst *MI, uint64_t Address,
         case SPIRV::OpImageSparseRead:
         case SPIRV::OpImageSampleFootprintNV:
           OS << ' ';
-          printImageOperand(MI, FirstVariableIndex, OS);
+          printSymbolicOperand<OperandCategory::ImageOperandOperand>(
+              MI, FirstVariableIndex, OS);
           printRemainingVariableOps(MI, NumFixedOps + 1, OS);
           break;
         case SPIRV::OpCopyMemory:
@@ -149,9 +153,9 @@ void SPIRVInstPrinter::printInst(const MCInst *MI, uint64_t Address,
           const unsigned NumOps = MI->getNumOperands();
           for (unsigned i = NumFixedOps; i < NumOps; ++i) {
             OS << ' ';
-            printMemoryOperand(MI, i, OS);
-            if (MI->getOperand(i).getImm() &
-                static_cast<unsigned>(SPIRV::MemoryOperand::Aligned)) {
+            printSymbolicOperand<OperandCategory::MemoryOperandOperand>(MI, i,
+                                                                        OS);
+            if (MI->getOperand(i).getImm() & MemoryOperand::Aligned) {
               assert(i + 1 < NumOps && "Missing alignment operand");
               OS << ' ';
               printOperand(MI, i + 1, OS);
@@ -198,28 +202,31 @@ void SPIRVInstPrinter::printOpDecorate(const MCInst *MI, raw_ostream &O) {
 
   if (NumFixedOps != MI->getNumOperands()) {
     auto DecOp = MI->getOperand(NumFixedOps - 1);
-    auto Dec = static_cast<SPIRV::Decoration>(DecOp.getImm());
+    auto Dec = static_cast<Decoration::Decoration>(DecOp.getImm());
 
     O << ' ';
 
     switch (Dec) {
-    case SPIRV::Decoration::BuiltIn:
-      printBuiltIn(MI, NumFixedOps, O);
+    case Decoration::BuiltIn:
+      printSymbolicOperand<OperandCategory::BuiltInOperand>(MI, NumFixedOps, O);
       break;
-    case SPIRV::Decoration::UniformId:
-      printScope(MI, NumFixedOps, O);
+    case Decoration::UniformId:
+      printSymbolicOperand<OperandCategory::ScopeOperand>(MI, NumFixedOps, O);
       break;
-    case SPIRV::Decoration::FuncParamAttr:
-      printFunctionParameterAttribute(MI, NumFixedOps, O);
+    case Decoration::FuncParamAttr:
+      printSymbolicOperand<OperandCategory::FunctionParameterAttributeOperand>(
+          MI, NumFixedOps, O);
       break;
-    case SPIRV::Decoration::FPRoundingMode:
-      printFPRoundingMode(MI, NumFixedOps, O);
+    case Decoration::FPRoundingMode:
+      printSymbolicOperand<OperandCategory::FPRoundingModeOperand>(
+          MI, NumFixedOps, O);
       break;
-    case SPIRV::Decoration::FPFastMathMode:
-      printFPFastMathMode(MI, NumFixedOps, O);
+    case Decoration::FPFastMathMode:
+      printSymbolicOperand<OperandCategory::FPFastMathModeOperand>(
+          MI, NumFixedOps, O);
       break;
-    case SPIRV::Decoration::LinkageAttributes:
-    case SPIRV::Decoration::UserSemantic:
+    case Decoration::LinkageAttributes:
+    case Decoration::UserSemantic:
       printStringImm(MI, NumFixedOps, O);
       break;
     default:
@@ -288,280 +295,24 @@ void SPIRVInstPrinter::printStringImm(const MCInst *MI, unsigned OpNo,
     // Check for final Op of "OpDecorate %x %stringImm %linkageAttribute".
     if (MI->getOpcode() == SPIRV::OpDecorate &&
         MI->getOperand(1).getImm() ==
-            static_cast<unsigned>(SPIRV::Decoration::LinkageAttributes)) {
+            static_cast<unsigned>(Decoration::LinkageAttributes)) {
       O << ' ';
-      printLinkageType(MI, StrStartIndex, O);
+      printSymbolicOperand<OperandCategory::LinkageTypeOperand>(
+          MI, StrStartIndex, O);
       break;
     }
   }
 }
 
-void SPIRVInstPrinter::printExtInst(const MCInst *MI, unsigned OpNo,
-                                    raw_ostream &O) {
-  llvm_unreachable("Unimplemented printExtInst");
-}
-
-void SPIRVInstPrinter::printCapability(const MCInst *MI, unsigned OpNo,
-                                       raw_ostream &O) {
-  if (OpNo < MI->getNumOperands()) {
-    SPIRV::Capability e =
-        static_cast<SPIRV::Capability>(MI->getOperand(OpNo).getImm());
-    O << SPIRV::getCapabilityName(e);
-  }
-}
-
-void SPIRVInstPrinter::printSourceLanguage(const MCInst *MI, unsigned OpNo,
-                                           raw_ostream &O) {
-  if (OpNo < MI->getNumOperands()) {
-    SPIRV::SourceLanguage e =
-        static_cast<SPIRV::SourceLanguage>(MI->getOperand(OpNo).getImm());
-    O << SPIRV::getSourceLanguageName(e);
-  }
-}
-
-void SPIRVInstPrinter::printExecutionModel(const MCInst *MI, unsigned OpNo,
-                                           raw_ostream &O) {
-  if (OpNo < MI->getNumOperands()) {
-    SPIRV::ExecutionModel e =
-        static_cast<SPIRV::ExecutionModel>(MI->getOperand(OpNo).getImm());
-    O << SPIRV::getExecutionModelName(e);
-  }
-}
-
-void SPIRVInstPrinter::printAddressingModel(const MCInst *MI, unsigned OpNo,
-                                            raw_ostream &O) {
-  if (OpNo < MI->getNumOperands()) {
-    SPIRV::AddressingModel e =
-        static_cast<SPIRV::AddressingModel>(MI->getOperand(OpNo).getImm());
-    O << SPIRV::getAddressingModelName(e);
-  }
-}
-
-void SPIRVInstPrinter::printMemoryModel(const MCInst *MI, unsigned OpNo,
-                                        raw_ostream &O) {
-  if (OpNo < MI->getNumOperands()) {
-    SPIRV::MemoryModel e =
-        static_cast<SPIRV::MemoryModel>(MI->getOperand(OpNo).getImm());
-    O << SPIRV::getMemoryModelName(e);
-  }
-}
-
-void SPIRVInstPrinter::printExecutionMode(const MCInst *MI, unsigned OpNo,
-                                          raw_ostream &O) {
-  if (OpNo < MI->getNumOperands()) {
-    SPIRV::ExecutionMode e =
-        static_cast<SPIRV::ExecutionMode>(MI->getOperand(OpNo).getImm());
-    O << SPIRV::getExecutionModeName(e);
-  }
-}
-
-void SPIRVInstPrinter::printStorageClass(const MCInst *MI, unsigned OpNo,
-                                         raw_ostream &O) {
-  if (OpNo < MI->getNumOperands()) {
-    SPIRV::StorageClass e =
-        static_cast<SPIRV::StorageClass>(MI->getOperand(OpNo).getImm());
-    O << SPIRV::getStorageClassName(e);
-  }
-}
-
-void SPIRVInstPrinter::printDim(const MCInst *MI, unsigned OpNo,
-                                raw_ostream &O) {
-  if (OpNo < MI->getNumOperands()) {
-    SPIRV::Dim e = static_cast<SPIRV::Dim>(MI->getOperand(OpNo).getImm());
-    O << SPIRV::getDimName(e);
-  }
-}
-
-void SPIRVInstPrinter::printSamplerAddressingMode(const MCInst *MI,
-                                                  unsigned OpNo,
-                                                  raw_ostream &O) {
-  if (OpNo < MI->getNumOperands()) {
-    SPIRV::SamplerAddressingMode e = static_cast<SPIRV::SamplerAddressingMode>(
-        MI->getOperand(OpNo).getImm());
-    O << SPIRV::getSamplerAddressingModeName(e);
-  }
-}
-
-void SPIRVInstPrinter::printSamplerFilterMode(const MCInst *MI, unsigned OpNo,
-                                              raw_ostream &O) {
-  if (OpNo < MI->getNumOperands()) {
-    SPIRV::SamplerFilterMode e =
-        static_cast<SPIRV::SamplerFilterMode>(MI->getOperand(OpNo).getImm());
-    O << SPIRV::getSamplerFilterModeName(e);
-  }
-}
-
-void SPIRVInstPrinter::printImageFormat(const MCInst *MI, unsigned OpNo,
-                                        raw_ostream &O) {
-  if (OpNo < MI->getNumOperands()) {
-    SPIRV::ImageFormat e =
-        static_cast<SPIRV::ImageFormat>(MI->getOperand(OpNo).getImm());
-    O << SPIRV::getImageFormatName(e);
-  }
-}
-
-void SPIRVInstPrinter::printImageChannelOrder(const MCInst *MI, unsigned OpNo,
-                                              raw_ostream &O) {
-  if (OpNo < MI->getNumOperands()) {
-    SPIRV::ImageChannelOrder e =
-        static_cast<SPIRV::ImageChannelOrder>(MI->getOperand(OpNo).getImm());
-    O << SPIRV::getImageChannelOrderName(e);
-  }
-}
-
-void SPIRVInstPrinter::printImageChannelDataType(const MCInst *MI,
-                                                 unsigned OpNo,
-                                                 raw_ostream &O) {
-  if (OpNo < MI->getNumOperands()) {
-    SPIRV::ImageChannelDataType e =
-        static_cast<SPIRV::ImageChannelDataType>(MI->getOperand(OpNo).getImm());
-    O << SPIRV::getImageChannelDataTypeName(e);
-  }
-}
-
-void SPIRVInstPrinter::printImageOperand(const MCInst *MI, unsigned OpNo,
-                                         raw_ostream &O) {
-  if (OpNo < MI->getNumOperands()) {
-    unsigned e = static_cast<unsigned>(MI->getOperand(OpNo).getImm());
-    O << SPIRV::getImageOperandName(e);
-  }
-}
-
-void SPIRVInstPrinter::printFPFastMathMode(const MCInst *MI, unsigned OpNo,
-                                           raw_ostream &O) {
-  if (OpNo < MI->getNumOperands()) {
-    unsigned e = static_cast<unsigned>(MI->getOperand(OpNo).getImm());
-    O << SPIRV::getFPFastMathModeName(e);
-  }
-}
-
-void SPIRVInstPrinter::printFPRoundingMode(const MCInst *MI, unsigned OpNo,
-                                           raw_ostream &O) {
-  if (OpNo < MI->getNumOperands()) {
-    SPIRV::FPRoundingMode e =
-        static_cast<SPIRV::FPRoundingMode>(MI->getOperand(OpNo).getImm());
-    O << SPIRV::getFPRoundingModeName(e);
-  }
-}
-
-void SPIRVInstPrinter::printLinkageType(const MCInst *MI, unsigned OpNo,
-                                        raw_ostream &O) {
-  if (OpNo < MI->getNumOperands()) {
-    SPIRV::LinkageType e =
-        static_cast<SPIRV::LinkageType>(MI->getOperand(OpNo).getImm());
-    O << SPIRV::getLinkageTypeName(e);
-  }
-}
-
-void SPIRVInstPrinter::printAccessQualifier(const MCInst *MI, unsigned OpNo,
-                                            raw_ostream &O) {
-  if (OpNo < MI->getNumOperands()) {
-    SPIRV::AccessQualifier e =
-        static_cast<SPIRV::AccessQualifier>(MI->getOperand(OpNo).getImm());
-    O << SPIRV::getAccessQualifierName(e);
-  }
-}
-
-void SPIRVInstPrinter::printFunctionParameterAttribute(const MCInst *MI,
-                                                       unsigned OpNo,
-                                                       raw_ostream &O) {
-  if (OpNo < MI->getNumOperands()) {
-    SPIRV::FunctionParameterAttribute e =
-        static_cast<SPIRV::FunctionParameterAttribute>(
-            MI->getOperand(OpNo).getImm());
-    O << SPIRV::getFunctionParameterAttributeName(e);
-  }
-}
-
-void SPIRVInstPrinter::printDecoration(const MCInst *MI, unsigned OpNo,
-                                       raw_ostream &O) {
-  if (OpNo < MI->getNumOperands()) {
-    SPIRV::Decoration e =
-        static_cast<SPIRV::Decoration>(MI->getOperand(OpNo).getImm());
-    O << SPIRV::getDecorationName(e);
-  }
-}
-
-void SPIRVInstPrinter::printBuiltIn(const MCInst *MI, unsigned OpNo,
-                                    raw_ostream &O) {
-  if (OpNo < MI->getNumOperands()) {
-    SPIRV::BuiltIn e =
-        static_cast<SPIRV::BuiltIn>(MI->getOperand(OpNo).getImm());
-    O << SPIRV::getBuiltInName(e);
-  }
-}
-
-void SPIRVInstPrinter::printSelectionControl(const MCInst *MI, unsigned OpNo,
-                                             raw_ostream &O) {
-  if (OpNo < MI->getNumOperands()) {
-    unsigned e = static_cast<unsigned>(MI->getOperand(OpNo).getImm());
-    O << SPIRV::getSelectionControlName(e);
-  }
-}
-
-void SPIRVInstPrinter::printLoopControl(const MCInst *MI, unsigned OpNo,
-                                        raw_ostream &O) {
-  if (OpNo < MI->getNumOperands()) {
-    unsigned e = static_cast<unsigned>(MI->getOperand(OpNo).getImm());
-    O << SPIRV::getLoopControlName(e);
-  }
-}
-
-void SPIRVInstPrinter::printFunctionControl(const MCInst *MI, unsigned OpNo,
-                                            raw_ostream &O) {
-  if (OpNo < MI->getNumOperands()) {
-    unsigned e = static_cast<unsigned>(MI->getOperand(OpNo).getImm());
-    O << SPIRV::getFunctionControlName(e);
-  }
+void SPIRVInstPrinter::printExtension(const MCInst *MI, unsigned OpNo,
+                                      raw_ostream &O) {
+  llvm_unreachable("Unimplemented printExtension");
 }
 
-void SPIRVInstPrinter::printMemorySemantics(const MCInst *MI, unsigned OpNo,
+template <OperandCategory::OperandCategory category>
+void SPIRVInstPrinter::printSymbolicOperand(const MCInst *MI, unsigned OpNo,
                                             raw_ostream &O) {
   if (OpNo < MI->getNumOperands()) {
-    unsigned e = static_cast<unsigned>(MI->getOperand(OpNo).getImm());
-    O << SPIRV::getMemorySemanticsName(e);
-  }
-}
-
-void SPIRVInstPrinter::printMemoryOperand(const MCInst *MI, unsigned OpNo,
-                                          raw_ostream &O) {
-  if (OpNo < MI->getNumOperands()) {
-    unsigned e = static_cast<unsigned>(MI->getOperand(OpNo).getImm());
-    O << SPIRV::getMemoryOperandName(e);
-  }
-}
-
-void SPIRVInstPrinter::printScope(const MCInst *MI, unsigned OpNo,
-                                  raw_ostream &O) {
-  if (OpNo < MI->getNumOperands()) {
-    SPIRV::Scope e = static_cast<SPIRV::Scope>(MI->getOperand(OpNo).getImm());
-    O << SPIRV::getScopeName(e);
-  }
-}
-
-void SPIRVInstPrinter::printGroupOperation(const MCInst *MI, unsigned OpNo,
-                                           raw_ostream &O) {
-  if (OpNo < MI->getNumOperands()) {
-    SPIRV::GroupOperation e =
-        static_cast<SPIRV::GroupOperation>(MI->getOperand(OpNo).getImm());
-    O << SPIRV::getGroupOperationName(e);
-  }
-}
-
-void SPIRVInstPrinter::printKernelEnqueueFlags(const MCInst *MI, unsigned OpNo,
-                                               raw_ostream &O) {
-  if (OpNo < MI->getNumOperands()) {
-    SPIRV::KernelEnqueueFlags e =
-        static_cast<SPIRV::KernelEnqueueFlags>(MI->getOperand(OpNo).getImm());
-    O << SPIRV::getKernelEnqueueFlagsName(e);
-  }
-}
-
-void SPIRVInstPrinter::printKernelProfilingInfo(const MCInst *MI, unsigned OpNo,
-                                                raw_ostream &O) {
-  if (OpNo < MI->getNumOperands()) {
-    SPIRV::KernelProfilingInfo e =
-        static_cast<SPIRV::KernelProfilingInfo>(MI->getOperand(OpNo).getImm());
-    O << SPIRV::getKernelProfilingInfoName(e);
+    O << getSymbolicOperandMnemonic(category, MI->getOperand(OpNo).getImm());
   }
 }

diff  --git a/llvm/lib/Target/SPIRV/MCTargetDesc/SPIRVInstPrinter.h b/llvm/lib/Target/SPIRV/MCTargetDesc/SPIRVInstPrinter.h
index cd3b6f1e6d665..f9ed98d3e7c6c 100644
--- a/llvm/lib/Target/SPIRV/MCTargetDesc/SPIRVInstPrinter.h
+++ b/llvm/lib/Target/SPIRV/MCTargetDesc/SPIRVInstPrinter.h
@@ -13,6 +13,7 @@
 #ifndef LLVM_LIB_TARGET_SPIRV_INSTPRINTER_SPIRVINSTPRINTER_H
 #define LLVM_LIB_TARGET_SPIRV_INSTPRINTER_SPIRVINSTPRINTER_H
 
+#include "MCTargetDesc/SPIRVBaseInfo.h"
 #include "llvm/MC/MCInstPrinter.h"
 
 namespace llvm {
@@ -38,52 +39,10 @@ class SPIRVInstPrinter : public MCInstPrinter {
   void printOpConstantVarOps(const MCInst *MI, unsigned StartIndex,
                              raw_ostream &O);
 
-  void printExtInst(const MCInst *MI, unsigned OpNo, raw_ostream &O);
+  void printExtension(const MCInst *MI, unsigned OpNo, raw_ostream &O);
+  template <SPIRV::OperandCategory::OperandCategory category>
+  void printSymbolicOperand(const MCInst *MI, unsigned OpNo, raw_ostream &O);
 
-  // SPIR-V enumerations printing.
-  void printCapability(const MCInst *MI, unsigned OpNo, raw_ostream &O);
-  void printSourceLanguage(const MCInst *MI, unsigned OpNo, raw_ostream &O);
-  void printExecutionModel(const MCInst *MI, unsigned OpNo, raw_ostream &O);
-  void printAddressingModel(const MCInst *MI, unsigned OpNo, raw_ostream &O);
-  void printMemoryModel(const MCInst *MI, unsigned OpNo, raw_ostream &O);
-  void printExecutionMode(const MCInst *MI, unsigned OpNo, raw_ostream &O);
-  void printStorageClass(const MCInst *MI, unsigned OpNo, raw_ostream &O);
-  void printDim(const MCInst *MI, unsigned OpNo, raw_ostream &O);
-
-  void printSamplerAddressingMode(const MCInst *MI, unsigned OpNo,
-                                  raw_ostream &O);
-  void printSamplerFilterMode(const MCInst *MI, unsigned OpNo, raw_ostream &O);
-
-  void printImageFormat(const MCInst *MI, unsigned OpNo, raw_ostream &O);
-  void printImageChannelOrder(const MCInst *MI, unsigned OpNo, raw_ostream &O);
-  void printImageChannelDataType(const MCInst *MI, unsigned OpNo,
-                                 raw_ostream &O);
-  void printImageOperand(const MCInst *MI, unsigned OpNo, raw_ostream &O);
-
-  void printFPFastMathMode(const MCInst *MI, unsigned OpNo, raw_ostream &O);
-  void printFPRoundingMode(const MCInst *MI, unsigned OpNo, raw_ostream &O);
-
-  void printLinkageType(const MCInst *MI, unsigned OpNo, raw_ostream &O);
-  void printAccessQualifier(const MCInst *MI, unsigned OpNo, raw_ostream &O);
-  void printFunctionParameterAttribute(const MCInst *MI, unsigned OpNo,
-                                       raw_ostream &O);
-
-  void printDecoration(const MCInst *MI, unsigned OpNo, raw_ostream &O);
-  void printBuiltIn(const MCInst *MI, unsigned OpNo, raw_ostream &O);
-
-  void printSelectionControl(const MCInst *MI, unsigned OpNo, raw_ostream &O);
-  void printLoopControl(const MCInst *MI, unsigned OpNo, raw_ostream &O);
-  void printFunctionControl(const MCInst *MI, unsigned OpNo, raw_ostream &O);
-
-  void printMemorySemantics(const MCInst *MI, unsigned OpNo, raw_ostream &O);
-  void printMemoryOperand(const MCInst *MI, unsigned OpNo, raw_ostream &O);
-
-  void printScope(const MCInst *MI, unsigned OpNo, raw_ostream &O);
-  void printGroupOperation(const MCInst *MI, unsigned OpNo, raw_ostream &O);
-
-  void printKernelEnqueueFlags(const MCInst *MI, unsigned OpNo, raw_ostream &O);
-  void printKernelProfilingInfo(const MCInst *MI, unsigned OpNo,
-                                raw_ostream &O);
   // Autogenerated by tblgen.
   std::pair<const char *, uint64_t> getMnemonic(const MCInst *MI) override;
   void printInstruction(const MCInst *MI, uint64_t Address, raw_ostream &O);

diff  --git a/llvm/lib/Target/SPIRV/SPIRVAsmPrinter.cpp b/llvm/lib/Target/SPIRV/SPIRVAsmPrinter.cpp
index 6d60bd5e3c97c..759891c52a0fd 100644
--- a/llvm/lib/Target/SPIRV/SPIRVAsmPrinter.cpp
+++ b/llvm/lib/Target/SPIRV/SPIRVAsmPrinter.cpp
@@ -64,7 +64,7 @@ class SPIRVAsmPrinter : public AsmPrinter {
   void outputOpFunctionEnd();
   void outputExtFuncDecls();
   void outputExecutionModeFromMDNode(Register Reg, MDNode *Node,
-                                     SPIRV::ExecutionMode EM);
+                                     SPIRV::ExecutionMode::ExecutionMode EM);
   void outputExecutionMode(const Module &M);
   void outputAnnotations(const Module &M);
   void outputModuleSections();
@@ -291,7 +291,8 @@ void SPIRVAsmPrinter::outputEntryPoints() {
   DenseSet<Register> InterfaceIDs;
   for (MachineInstr *MI : MAI->GlobalVarList) {
     assert(MI->getOpcode() == SPIRV::OpVariable);
-    auto SC = static_cast<SPIRV::StorageClass>(MI->getOperand(2).getImm());
+    auto SC = static_cast<SPIRV::StorageClass::StorageClass>(
+        MI->getOperand(2).getImm());
     // Before version 1.4, the interface's storage classes are limited to
     // the Input and Output storage classes. Starting with version 1.4,
     // the interface's storage classes are all storage classes used in
@@ -375,8 +376,8 @@ static void addOpsFromMDNode(MDNode *MDN, MCInst &Inst,
   }
 }
 
-void SPIRVAsmPrinter::outputExecutionModeFromMDNode(Register Reg, MDNode *Node,
-                                                    SPIRV::ExecutionMode EM) {
+void SPIRVAsmPrinter::outputExecutionModeFromMDNode(
+    Register Reg, MDNode *Node, SPIRV::ExecutionMode::ExecutionMode EM) {
   MCInst Inst;
   Inst.setOpcode(SPIRV::OpExecutionMode);
   Inst.addOperand(MCOperand::createReg(Reg));

diff  --git a/llvm/lib/Target/SPIRV/SPIRVCallLowering.cpp b/llvm/lib/Target/SPIRV/SPIRVCallLowering.cpp
index e8fedfeffde72..2bc53cb46525f 100644
--- a/llvm/lib/Target/SPIRV/SPIRVCallLowering.cpp
+++ b/llvm/lib/Target/SPIRV/SPIRVCallLowering.cpp
@@ -132,7 +132,8 @@ bool SPIRVCallLowering::lowerFormalArguments(MachineIRBuilder &MIRBuilder,
       if (VRegs[i].size() > 1)
         return false;
       Type *ArgTy = FTy->getParamType(i);
-      SPIRV::AccessQualifier AQ = SPIRV::AccessQualifier::ReadWrite;
+      SPIRV::AccessQualifier::AccessQualifier AQ =
+          SPIRV::AccessQualifier::ReadWrite;
       MDNode *Node = F.getMetadata("kernel_arg_access_qual");
       if (Node && i < Node->getNumOperands()) {
         StringRef AQString = cast<MDString>(Node->getOperand(i))->getString();
@@ -192,7 +193,8 @@ bool SPIRVCallLowering::lowerFormalArguments(MachineIRBuilder &MIRBuilder,
           assert(MD2 && "Metadata operand is expected");
           ConstantInt *Const = getConstInt(MD2, 0);
           assert(Const && "MDOperand should be ConstantInt");
-          auto Dec = static_cast<SPIRV::Decoration>(Const->getZExtValue());
+          auto Dec =
+              static_cast<SPIRV::Decoration::Decoration>(Const->getZExtValue());
           std::vector<uint32_t> DecVec;
           for (unsigned j = 1; j < MD2->getNumOperands(); j++) {
             ConstantInt *Const = getConstInt(MD2, j);

diff  --git a/llvm/lib/Target/SPIRV/SPIRVEnums.td b/llvm/lib/Target/SPIRV/SPIRVEnums.td
deleted file mode 100644
index 1d0c6ffd6e37f..0000000000000
--- a/llvm/lib/Target/SPIRV/SPIRVEnums.td
+++ /dev/null
@@ -1,51 +0,0 @@
-//===-- SPIRVEnums.td - Describe SPIRV Enum Operands -------*- tablegen -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-//
-// All SPIRV enums defined in SPIRVBaseInfo.h should have a corresponding enum
-// operand here. This enables the correct PrintMethod to be defined so
-// its name or mask bits can be automatically printed in SPIRVInstPrinter
-// when referred to in SPIRVInstrInfo.td.
-//
-//===----------------------------------------------------------------------===//
-
-class EnumOperand<string Name> : Operand<i32>{
-  let PrintMethod = "print"#Name;
-}
-
-def ExtInst : EnumOperand<"ExtInst">;
-
-def Capability : EnumOperand<"Capability">;
-def SourceLanguage : EnumOperand<"SourceLanguage">;
-def ExecutionModel : EnumOperand<"ExecutionModel">;
-def AddressingModel : EnumOperand<"AddressingModel">;
-def MemoryModel : EnumOperand<"MemoryModel">;
-def ExecutionMode : EnumOperand<"ExecutionMode">;
-def StorageClass : EnumOperand<"StorageClass">;
-def Dim : EnumOperand<"Dim">;
-def SamplerAddressingMode : EnumOperand<"SamplerAddressingMode">;
-def SamplerFilterMode : EnumOperand<"SamplerFilterMode">;
-def ImageFormat : EnumOperand<"ImageFormat">;
-def ImageChannelOrder : EnumOperand<"ImageChannelOrder">;
-def ImageChannelDataType : EnumOperand<"ImageChannelDataType">;
-def ImageOperand : EnumOperand<"ImageOperand">;
-def FPFastMathMode : EnumOperand<"FPFastMathMode">;
-def FProundingMode : EnumOperand<"FPRoundingMode">;
-def LinkageType : EnumOperand<"LinkageType">;
-def AccessQualifier : EnumOperand<"AccessQualifier">;
-def FunctionParameterAttribute : EnumOperand<"FunctionParameterAttribute">;
-def Decoration : EnumOperand<"Decoration">;
-def Builtin : EnumOperand<"Builtin">;
-def SelectionControl: EnumOperand<"SelectionControl">;
-def LoopControl: EnumOperand<"LoopControl">;
-def FunctionControl : EnumOperand<"FunctionControl">;
-def MemorySemantics : EnumOperand<"MemorySemantics">;
-def MemoryOperand : EnumOperand<"MemoryOperand">;
-def Scope : EnumOperand<"Scope">;
-def GroupOperation : EnumOperand<"GroupOperation">;
-def KernelEnqueueFlags : EnumOperand<"KernelEnqueueFlags">;
-def KernelProfilingInfo : EnumOperand<"KernelProfilingInfo">;

diff  --git a/llvm/lib/Target/SPIRV/SPIRVGlobalRegistry.cpp b/llvm/lib/Target/SPIRV/SPIRVGlobalRegistry.cpp
index 5c8fa7adfbdff..e0ce56f49d973 100644
--- a/llvm/lib/Target/SPIRV/SPIRVGlobalRegistry.cpp
+++ b/llvm/lib/Target/SPIRV/SPIRVGlobalRegistry.cpp
@@ -44,7 +44,7 @@ SPIRVType *SPIRVGlobalRegistry::assignVectTypeToVReg(
 
 SPIRVType *SPIRVGlobalRegistry::assignTypeToVReg(
     const Type *Type, Register VReg, MachineIRBuilder &MIRBuilder,
-    SPIRV::AccessQualifier AccessQual, bool EmitIR) {
+    SPIRV::AccessQualifier::AccessQualifier AccessQual, bool EmitIR) {
 
   SPIRVType *SpirvType =
       getOrCreateSPIRVType(Type, MIRBuilder, AccessQual, EmitIR);
@@ -296,9 +296,9 @@ SPIRVGlobalRegistry::getOrCreateConsIntVector(uint64_t Val, MachineInstr &I,
 
 Register SPIRVGlobalRegistry::buildGlobalVariable(
     Register ResVReg, SPIRVType *BaseType, StringRef Name,
-    const GlobalValue *GV, SPIRV::StorageClass Storage,
+    const GlobalValue *GV, SPIRV::StorageClass::StorageClass Storage,
     const MachineInstr *Init, bool IsConst, bool HasLinkageTy,
-    SPIRV::LinkageType LinkageType, MachineIRBuilder &MIRBuilder,
+    SPIRV::LinkageType::LinkageType LinkageType, MachineIRBuilder &MIRBuilder,
     bool IsInstSelector) {
   const GlobalVariable *GVar = nullptr;
   if (GV)
@@ -439,10 +439,9 @@ static bool isSpecialType(const Type *Ty) {
   return false;
 }
 
-SPIRVType *SPIRVGlobalRegistry::getOpTypePointer(SPIRV::StorageClass SC,
-                                                 SPIRVType *ElemType,
-                                                 MachineIRBuilder &MIRBuilder,
-                                                 Register Reg) {
+SPIRVType *SPIRVGlobalRegistry::getOpTypePointer(
+    SPIRV::StorageClass::StorageClass SC, SPIRVType *ElemType,
+    MachineIRBuilder &MIRBuilder, Register Reg) {
   if (!Reg.isValid())
     Reg = createTypeVReg(MIRBuilder);
   return MIRBuilder.buildInstr(SPIRV::OpTypePointer)
@@ -451,9 +450,8 @@ SPIRVType *SPIRVGlobalRegistry::getOpTypePointer(SPIRV::StorageClass SC,
       .addUse(getSPIRVTypeID(ElemType));
 }
 
-SPIRVType *
-SPIRVGlobalRegistry::getOpTypeForwardPointer(SPIRV::StorageClass SC,
-                                             MachineIRBuilder &MIRBuilder) {
+SPIRVType *SPIRVGlobalRegistry::getOpTypeForwardPointer(
+    SPIRV::StorageClass::StorageClass SC, MachineIRBuilder &MIRBuilder) {
   return MIRBuilder.buildInstr(SPIRV::OpTypeForwardPointer)
       .addUse(createTypeVReg(MIRBuilder))
       .addImm(static_cast<uint32_t>(SC));
@@ -481,10 +479,9 @@ SPIRVType *SPIRVGlobalRegistry::getOrCreateOpTypeFunctionWithArgs(
   return finishCreatingSPIRVType(Ty, SpirvType);
 }
 
-SPIRVType *SPIRVGlobalRegistry::findSPIRVType(const Type *Ty,
-                                              MachineIRBuilder &MIRBuilder,
-                                              SPIRV::AccessQualifier AccQual,
-                                              bool EmitIR) {
+SPIRVType *SPIRVGlobalRegistry::findSPIRVType(
+    const Type *Ty, MachineIRBuilder &MIRBuilder,
+    SPIRV::AccessQualifier::AccessQualifier AccQual, bool EmitIR) {
   Register Reg = DT.find(Ty, &MIRBuilder.getMF());
   if (Reg.isValid())
     return getSPIRVTypeForVReg(Reg);
@@ -500,10 +497,9 @@ Register SPIRVGlobalRegistry::getSPIRVTypeID(const SPIRVType *SpirvType) const {
   return SpirvType->defs().begin()->getReg();
 }
 
-SPIRVType *SPIRVGlobalRegistry::createSPIRVType(const Type *Ty,
-                                                MachineIRBuilder &MIRBuilder,
-                                                SPIRV::AccessQualifier AccQual,
-                                                bool EmitIR) {
+SPIRVType *SPIRVGlobalRegistry::createSPIRVType(
+    const Type *Ty, MachineIRBuilder &MIRBuilder,
+    SPIRV::AccessQualifier::AccessQualifier AccQual, bool EmitIR) {
   assert(!isSpecialType(Ty));
   auto &TypeToSPIRVTypeMap = DT.getTypes()->getAllUses();
   auto t = TypeToSPIRVTypeMap.find(Ty);
@@ -577,7 +573,7 @@ SPIRVType *SPIRVGlobalRegistry::createSPIRVType(const Type *Ty,
 
 SPIRVType *SPIRVGlobalRegistry::restOfCreateSPIRVType(
     const Type *Ty, MachineIRBuilder &MIRBuilder,
-    SPIRV::AccessQualifier AccessQual, bool EmitIR) {
+    SPIRV::AccessQualifier::AccessQualifier AccessQual, bool EmitIR) {
   if (TypesInProcessing.count(Ty) && !Ty->isPointerTy())
     return nullptr;
   TypesInProcessing.insert(Ty);
@@ -607,7 +603,7 @@ SPIRVType *SPIRVGlobalRegistry::getSPIRVTypeForVReg(Register VReg) const {
 
 SPIRVType *SPIRVGlobalRegistry::getOrCreateSPIRVType(
     const Type *Ty, MachineIRBuilder &MIRBuilder,
-    SPIRV::AccessQualifier AccessQual, bool EmitIR) {
+    SPIRV::AccessQualifier::AccessQualifier AccessQual, bool EmitIR) {
   Register Reg = DT.find(Ty, &MIRBuilder.getMF());
   if (Reg.isValid())
     return getSPIRVTypeForVReg(Reg);
@@ -675,12 +671,13 @@ bool SPIRVGlobalRegistry::isScalarOrVectorSigned(const SPIRVType *Type) const {
   llvm_unreachable("Attempting to get sign of non-integer type.");
 }
 
-SPIRV::StorageClass
+SPIRV::StorageClass::StorageClass
 SPIRVGlobalRegistry::getPointerStorageClass(Register VReg) const {
   SPIRVType *Type = getSPIRVTypeForVReg(VReg);
   assert(Type && Type->getOpcode() == SPIRV::OpTypePointer &&
          Type->getOperand(1).isImm() && "Pointer type is expected");
-  return static_cast<SPIRV::StorageClass>(Type->getOperand(1).getImm());
+  return static_cast<SPIRV::StorageClass::StorageClass>(
+      Type->getOperand(1).getImm());
 }
 
 SPIRVType *
@@ -758,10 +755,9 @@ SPIRVType *SPIRVGlobalRegistry::getOrCreateSPIRVVectorType(
   return finishCreatingSPIRVType(LLVMTy, MIB);
 }
 
-SPIRVType *
-SPIRVGlobalRegistry::getOrCreateSPIRVPointerType(SPIRVType *BaseType,
-                                                 MachineIRBuilder &MIRBuilder,
-                                                 SPIRV::StorageClass SClass) {
+SPIRVType *SPIRVGlobalRegistry::getOrCreateSPIRVPointerType(
+    SPIRVType *BaseType, MachineIRBuilder &MIRBuilder,
+    SPIRV::StorageClass::StorageClass SClass) {
   return getOrCreateSPIRVType(
       PointerType::get(const_cast<Type *>(getTypeForSPIRVType(BaseType)),
                        storageClassToAddressSpace(SClass)),
@@ -770,7 +766,7 @@ SPIRVGlobalRegistry::getOrCreateSPIRVPointerType(SPIRVType *BaseType,
 
 SPIRVType *SPIRVGlobalRegistry::getOrCreateSPIRVPointerType(
     SPIRVType *BaseType, MachineInstr &I, const SPIRVInstrInfo &TII,
-    SPIRV::StorageClass SC) {
+    SPIRV::StorageClass::StorageClass SC) {
   Type *LLVMTy =
       PointerType::get(const_cast<Type *>(getTypeForSPIRVType(BaseType)),
                        storageClassToAddressSpace(SC));

diff  --git a/llvm/lib/Target/SPIRV/SPIRVGlobalRegistry.h b/llvm/lib/Target/SPIRV/SPIRVGlobalRegistry.h
index 59ac2712a02fb..6170b742a1f2f 100644
--- a/llvm/lib/Target/SPIRV/SPIRVGlobalRegistry.h
+++ b/llvm/lib/Target/SPIRV/SPIRVGlobalRegistry.h
@@ -45,18 +45,18 @@ class SPIRVGlobalRegistry {
   const unsigned PointerSize;
 
   // Add a new OpTypeXXX instruction without checking for duplicates.
+  SPIRVType *createSPIRVType(const Type *Type, MachineIRBuilder &MIRBuilder,
+                             SPIRV::AccessQualifier::AccessQualifier AQ =
+                                 SPIRV::AccessQualifier::ReadWrite,
+                             bool EmitIR = true);
+  SPIRVType *findSPIRVType(const Type *Ty, MachineIRBuilder &MIRBuilder,
+                           SPIRV::AccessQualifier::AccessQualifier accessQual =
+                               SPIRV::AccessQualifier::ReadWrite,
+                           bool EmitIR = true);
   SPIRVType *
-  createSPIRVType(const Type *Type, MachineIRBuilder &MIRBuilder,
-                  SPIRV::AccessQualifier AQ = SPIRV::AccessQualifier::ReadWrite,
-                  bool EmitIR = true);
-  SPIRVType *findSPIRVType(
-      const Type *Ty, MachineIRBuilder &MIRBuilder,
-      SPIRV::AccessQualifier accessQual = SPIRV::AccessQualifier::ReadWrite,
-      bool EmitIR = true);
-  SPIRVType *restOfCreateSPIRVType(const Type *Type,
-                                   MachineIRBuilder &MIRBuilder,
-                                   SPIRV::AccessQualifier AccessQual,
-                                   bool EmitIR);
+  restOfCreateSPIRVType(const Type *Type, MachineIRBuilder &MIRBuilder,
+                        SPIRV::AccessQualifier::AccessQualifier AccessQual,
+                        bool EmitIR);
 
 public:
   SPIRVGlobalRegistry(unsigned PointerSize);
@@ -98,10 +98,11 @@ class SPIRVGlobalRegistry {
 
   // Get or create a SPIR-V type corresponding the given LLVM IR type,
   // and map it to the given VReg by creating an ASSIGN_TYPE instruction.
-  SPIRVType *assignTypeToVReg(
-      const Type *Type, Register VReg, MachineIRBuilder &MIRBuilder,
-      SPIRV::AccessQualifier AQ = SPIRV::AccessQualifier::ReadWrite,
-      bool EmitIR = true);
+  SPIRVType *assignTypeToVReg(const Type *Type, Register VReg,
+                              MachineIRBuilder &MIRBuilder,
+                              SPIRV::AccessQualifier::AccessQualifier AQ =
+                                  SPIRV::AccessQualifier::ReadWrite,
+                              bool EmitIR = true);
   SPIRVType *assignIntTypeToVReg(unsigned BitWidth, Register VReg,
                                  MachineInstr &I, const SPIRVInstrInfo &TII);
   SPIRVType *assignVectTypeToVReg(SPIRVType *BaseType, unsigned NumElements,
@@ -118,10 +119,11 @@ class SPIRVGlobalRegistry {
   // EmitIR controls if we emit GMIR or SPV constants (e.g. for array sizes)
   // because this method may be called from InstructionSelector and we don't
   // want to emit extra IR instructions there.
-  SPIRVType *getOrCreateSPIRVType(
-      const Type *Type, MachineIRBuilder &MIRBuilder,
-      SPIRV::AccessQualifier AQ = SPIRV::AccessQualifier::ReadWrite,
-      bool EmitIR = true);
+  SPIRVType *getOrCreateSPIRVType(const Type *Type,
+                                  MachineIRBuilder &MIRBuilder,
+                                  SPIRV::AccessQualifier::AccessQualifier AQ =
+                                      SPIRV::AccessQualifier::ReadWrite,
+                                  bool EmitIR = true);
 
   const Type *getTypeForSPIRVType(const SPIRVType *Ty) const {
     auto Res = SPIRVToLLVMType.find(Ty);
@@ -159,7 +161,7 @@ class SPIRVGlobalRegistry {
   bool isScalarOrVectorSigned(const SPIRVType *Type) const;
 
   // Gets the storage class of the pointer type assigned to this vreg.
-  SPIRV::StorageClass getPointerStorageClass(Register VReg) const;
+  SPIRV::StorageClass::StorageClass getPointerStorageClass(Register VReg) const;
 
   // Return the number of bits SPIR-V pointers and size_t variables require.
   unsigned getPointerSize() const { return PointerSize; }
@@ -186,10 +188,11 @@ class SPIRVGlobalRegistry {
   SPIRVType *getOpTypeStruct(const StructType *Ty, MachineIRBuilder &MIRBuilder,
                              bool EmitIR = true);
 
-  SPIRVType *getOpTypePointer(SPIRV::StorageClass SC, SPIRVType *ElemType,
-                              MachineIRBuilder &MIRBuilder, Register Reg);
+  SPIRVType *getOpTypePointer(SPIRV::StorageClass::StorageClass SC,
+                              SPIRVType *ElemType, MachineIRBuilder &MIRBuilder,
+                              Register Reg);
 
-  SPIRVType *getOpTypeForwardPointer(SPIRV::StorageClass SC,
+  SPIRVType *getOpTypeForwardPointer(SPIRV::StorageClass::StorageClass SC,
                                      MachineIRBuilder &MIRBuilder);
 
   SPIRVType *getOpTypeFunction(SPIRVType *RetType,
@@ -212,12 +215,14 @@ class SPIRVGlobalRegistry {
                                     const SPIRVInstrInfo &TII);
   Register getOrCreateUndef(MachineInstr &I, SPIRVType *SpvType,
                             const SPIRVInstrInfo &TII);
-  Register
-  buildGlobalVariable(Register Reg, SPIRVType *BaseType, StringRef Name,
-                      const GlobalValue *GV, SPIRV::StorageClass Storage,
-                      const MachineInstr *Init, bool IsConst, bool HasLinkageTy,
-                      SPIRV::LinkageType LinkageType,
-                      MachineIRBuilder &MIRBuilder, bool IsInstSelector);
+  Register buildGlobalVariable(Register Reg, SPIRVType *BaseType,
+                               StringRef Name, const GlobalValue *GV,
+                               SPIRV::StorageClass::StorageClass Storage,
+                               const MachineInstr *Init, bool IsConst,
+                               bool HasLinkageTy,
+                               SPIRV::LinkageType::LinkageType LinkageType,
+                               MachineIRBuilder &MIRBuilder,
+                               bool IsInstSelector);
 
   // Convenient helpers for getting types with check for duplicates.
   SPIRVType *getOrCreateSPIRVIntegerType(unsigned BitWidth,
@@ -235,10 +240,10 @@ class SPIRVGlobalRegistry {
                                         const SPIRVInstrInfo &TII);
   SPIRVType *getOrCreateSPIRVPointerType(
       SPIRVType *BaseType, MachineIRBuilder &MIRBuilder,
-      SPIRV::StorageClass SClass = SPIRV::StorageClass::Function);
+      SPIRV::StorageClass::StorageClass SClass = SPIRV::StorageClass::Function);
   SPIRVType *getOrCreateSPIRVPointerType(
       SPIRVType *BaseType, MachineInstr &I, const SPIRVInstrInfo &TII,
-      SPIRV::StorageClass SClass = SPIRV::StorageClass::Function);
+      SPIRV::StorageClass::StorageClass SClass = SPIRV::StorageClass::Function);
   SPIRVType *getOrCreateOpTypeFunctionWithArgs(
       const Type *Ty, SPIRVType *RetType,
       const SmallVectorImpl<SPIRVType *> &ArgTypes,

diff  --git a/llvm/lib/Target/SPIRV/SPIRVInstrInfo.td b/llvm/lib/Target/SPIRV/SPIRVInstrInfo.td
index d1c20795f8045..081d8add0c1bb 100644
--- a/llvm/lib/Target/SPIRV/SPIRVInstrInfo.td
+++ b/llvm/lib/Target/SPIRV/SPIRVInstrInfo.td
@@ -11,7 +11,7 @@
 //===----------------------------------------------------------------------===//
 
 include "SPIRVInstrFormats.td"
-include "SPIRVEnums.td"
+include "SPIRVSymbolicOperands.td"
 
 // Codegen only metadata instructions
 let isCodeGenOnly=1 in {
@@ -131,7 +131,7 @@ def OpMemberDecorateString: Op<5633, (outs),
 def OpExtension: Op<10, (outs), (ins StringImm:$name, variable_ops), "OpExtension $name">;
 def OpExtInstImport: Op<11, (outs ID:$res), (ins StringImm:$extInstsName, variable_ops),
                   "$res = OpExtInstImport $extInstsName">;
-def OpExtInst: Op<12, (outs ID:$res), (ins TYPE:$ty, ID:$set, ExtInst:$inst, variable_ops),
+def OpExtInst: Op<12, (outs ID:$res), (ins TYPE:$ty, ID:$set, Extension:$inst, variable_ops),
                   "$res = OpExtInst $ty $set $inst">;
 
 // 3.42.5 Mode-Setting Instructions

diff  --git a/llvm/lib/Target/SPIRV/SPIRVInstructionSelector.cpp b/llvm/lib/Target/SPIRV/SPIRVInstructionSelector.cpp
index 9365fd22e4e79..4be676a1d8c52 100644
--- a/llvm/lib/Target/SPIRV/SPIRVInstructionSelector.cpp
+++ b/llvm/lib/Target/SPIRV/SPIRVInstructionSelector.cpp
@@ -413,7 +413,7 @@ bool SPIRVInstructionSelector::selectUnOp(Register ResVReg,
                            Opcode);
 }
 
-static SPIRV::Scope getScope(SyncScope::ID Ord) {
+static SPIRV::Scope::Scope getScope(SyncScope::ID Ord) {
   switch (Ord) {
   case SyncScope::SingleThread:
     return SPIRV::Scope::Invocation;
@@ -616,7 +616,7 @@ bool SPIRVInstructionSelector::selectAtomicCmpXchg(Register ResVReg,
   return Result;
 }
 
-static bool isGenericCastablePtr(SPIRV::StorageClass SC) {
+static bool isGenericCastablePtr(SPIRV::StorageClass::StorageClass SC) {
   switch (SC) {
   case SPIRV::StorageClass::Workgroup:
   case SPIRV::StorageClass::CrossWorkgroup:
@@ -658,8 +658,8 @@ bool SPIRVInstructionSelector::selectAddrSpaceCast(Register ResVReg,
   }
   Register SrcPtr = I.getOperand(1).getReg();
   SPIRVType *SrcPtrTy = GR.getSPIRVTypeForVReg(SrcPtr);
-  SPIRV::StorageClass SrcSC = GR.getPointerStorageClass(SrcPtr);
-  SPIRV::StorageClass DstSC = GR.getPointerStorageClass(ResVReg);
+  SPIRV::StorageClass::StorageClass SrcSC = GR.getPointerStorageClass(SrcPtr);
+  SPIRV::StorageClass::StorageClass DstSC = GR.getPointerStorageClass(ResVReg);
 
   // Casting from an eligable pointer to Generic.
   if (DstSC == SPIRV::StorageClass::Generic && isGenericCastablePtr(SrcSC))
@@ -1342,10 +1342,11 @@ bool SPIRVInstructionSelector::selectGlobalValue(
     return true;
 
   unsigned AddrSpace = GV->getAddressSpace();
-  SPIRV::StorageClass Storage = addressSpaceToStorageClass(AddrSpace);
+  SPIRV::StorageClass::StorageClass Storage =
+      addressSpaceToStorageClass(AddrSpace);
   bool HasLnkTy = GV->getLinkage() != GlobalValue::InternalLinkage &&
                   Storage != SPIRV::StorageClass::Function;
-  SPIRV::LinkageType LnkType =
+  SPIRV::LinkageType::LinkageType LnkType =
       (GV->isDeclaration() || GV->hasAvailableExternallyLinkage())
           ? SPIRV::LinkageType::Import
           : SPIRV::LinkageType::Export;

diff  --git a/llvm/lib/Target/SPIRV/SPIRVModuleAnalysis.cpp b/llvm/lib/Target/SPIRV/SPIRVModuleAnalysis.cpp
index 143ddf7297dcc..45a327f7d78e1 100644
--- a/llvm/lib/Target/SPIRV/SPIRVModuleAnalysis.cpp
+++ b/llvm/lib/Target/SPIRV/SPIRVModuleAnalysis.cpp
@@ -65,8 +65,10 @@ void SPIRVModuleAnalysis::setBaseInfo(const Module &M) {
   // TODO: determine memory model and source language from the configuratoin.
   if (auto MemModel = M.getNamedMetadata("spirv.MemoryModel")) {
     auto MemMD = MemModel->getOperand(0);
-    MAI.Addr = static_cast<SPIRV::AddressingModel>(getMetadataUInt(MemMD, 0));
-    MAI.Mem = static_cast<SPIRV::MemoryModel>(getMetadataUInt(MemMD, 1));
+    MAI.Addr = static_cast<SPIRV::AddressingModel::AddressingModel>(
+        getMetadataUInt(MemMD, 0));
+    MAI.Mem =
+        static_cast<SPIRV::MemoryModel::MemoryModel>(getMetadataUInt(MemMD, 1));
   } else {
     MAI.Mem = SPIRV::MemoryModel::OpenCL;
     unsigned PtrSize = ST->getPointerSize();

diff  --git a/llvm/lib/Target/SPIRV/SPIRVModuleAnalysis.h b/llvm/lib/Target/SPIRV/SPIRVModuleAnalysis.h
index 9bcdf6e9ae2a8..c19f2c2a9ce7f 100644
--- a/llvm/lib/Target/SPIRV/SPIRVModuleAnalysis.h
+++ b/llvm/lib/Target/SPIRV/SPIRVModuleAnalysis.h
@@ -48,9 +48,9 @@ using RegisterAliasMapTy =
 // The struct contains results of the module analysis and methods
 // to access them.
 struct ModuleAnalysisInfo {
-  SPIRV::MemoryModel Mem;
-  SPIRV::AddressingModel Addr;
-  SPIRV::SourceLanguage SrcLang;
+  SPIRV::MemoryModel::MemoryModel Mem;
+  SPIRV::AddressingModel::AddressingModel Addr;
+  SPIRV::SourceLanguage::SourceLanguage SrcLang;
   unsigned SrcLangVersion;
   StringSet<> SrcExt;
   // Maps ExtInstSet to corresponding ID register.

diff  --git a/llvm/lib/Target/SPIRV/SPIRVSymbolicOperands.td b/llvm/lib/Target/SPIRV/SPIRVSymbolicOperands.td
new file mode 100644
index 0000000000000..347193505a739
--- /dev/null
+++ b/llvm/lib/Target/SPIRV/SPIRVSymbolicOperands.td
@@ -0,0 +1,1535 @@
+//===- SPIRVSymbolicOperands.td ----------------------------*- tablegen -*-===//
+//
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+//
+//===----------------------------------------------------------------------===//
+//
+// This file defines symbolic/named operands for various SPIR-V instructions.
+//
+//===----------------------------------------------------------------------===//
+
+include "llvm/TableGen/SearchableTable.td"
+
+//===----------------------------------------------------------------------===//
+// Lookup table containing symbolic operands with the following columns:
+// - Category (Extension/Capability/BuiltIn/etc.)
+// - Value (32-bit representation for binary emission)
+// - Mnemonic (String representation for textual emission)
+// - MinVersion
+// - MaxVersion
+//===----------------------------------------------------------------------===//
+
+// Forward-declare classes used in SymbolicOperand
+class OperandCategory;
+
+class SymbolicOperand<OperandCategory category, bits<32> value, string mnemonic, bits<32> minVersion, bits<32> maxVersion> {
+  OperandCategory Category = category;
+  bits<32> Value = value;
+  string Mnemonic = mnemonic;
+  bits<32> MinVersion = minVersion;
+  bits<32> MaxVersion = maxVersion;
+}
+
+def SymbolicOperands : GenericTable {
+  let FilterClass = "SymbolicOperand";
+  let Fields = ["Category", "Value", "Mnemonic", "MinVersion", "MaxVersion"];
+  string TypeOf_Category = "OperandCategory";
+  let PrimaryKey = ["Category", "Value"];
+  // Function for looking up symbolic operands based on category and value.
+  let PrimaryKeyName = "lookupSymbolicOperandByCategoryAndValue";
+}
+
+// Function for looking up symbolic operands based on just category.
+def lookupSymbolicOperandByCategory : SearchIndex {
+  let Table = SymbolicOperands;
+  let Key = ["Category"];
+}
+
+// Function for looking up symbolic operands based on category and mnemonic.
+def lookupSymbolicOperandByCategoryAndMnemonic : SearchIndex {
+  let Table = SymbolicOperands;
+  let Key = ["Category", "Mnemonic"];
+}
+
+//===----------------------------------------------------------------------===//
+// Lookup table for matching symbolic operands (category + 32-bit value) to
+// a SPIR-V extension.
+//===----------------------------------------------------------------------===//
+
+// Forward-declare classes used in ExtensionEntry
+class Extension;
+
+class ExtensionEntry<OperandCategory category, bits<32> value, Extension reqExtension> {
+  OperandCategory Category = category;
+  bits<32> Value = value;
+  Extension ReqExtension = reqExtension;
+}
+
+def ExtensionEntries : GenericTable {
+  let FilterClass = "ExtensionEntry";
+  let Fields = ["Category", "Value", "ReqExtension"];
+  string TypeOf_Category = "OperandCategory";
+  string TypeOf_ReqExtension = "Extension";
+  let PrimaryKey = ["Category", "Value"];
+  // Function for looking up the extension by category + value.
+  let PrimaryKeyName = "lookupExtensionByCategoryAndValue";
+}
+
+//===----------------------------------------------------------------------===//
+// Lookup table for matching symbolic operands (category + 32-bit value) to
+// SPIR-V capabilities. If an operand requires more than one capability, there
+// will be multiple consecutive entries present in the table.
+//===----------------------------------------------------------------------===//
+
+// Forward-declare classes used in ExtensionEntry
+class Capability;
+
+class CapabilityEntry<OperandCategory category, bits<32> value, Capability reqCabaility> {
+  OperandCategory Category = category;
+  bits<32> Value = value;
+  Capability ReqCapability = reqCabaility;
+}
+
+def CapabilityEntries : GenericTable {
+  let FilterClass = "CapabilityEntry";
+  let Fields = ["Category", "Value", "ReqCapability"];
+  string TypeOf_Category = "OperandCategory";
+  string TypeOf_ReqCapability = "Capability";
+  let PrimaryKey = ["Category", "Value"];
+  // Function for looking up a (the first) capability by category + value. Next
+  // capabilities should be consecutive.
+  let PrimaryKeyName = "lookupCapabilityByCategoryAndValue";
+}
+
+//===----------------------------------------------------------------------===//
+// Multiclass used to define a SymbolicOperand and at the same time declare
+// required extension and capabilities.
+//===----------------------------------------------------------------------===//
+
+multiclass SymbolicOperandWithRequirements<OperandCategory category, bits<32> value, string mnemonic, bits<32> minVersion, bits<32> maxVersion, list<Extension> reqExtensions, list<Capability> reqCapabilities> {
+    assert !ge(!size(mnemonic), 1), "No mnemonic/string representation provided for symbolic operand with value " # value;
+    def : SymbolicOperand<category, value, mnemonic, minVersion, maxVersion>;
+
+    assert !le(!size(reqExtensions), 1), "Too many required extensions for a symbolic/named operand: " # mnemonic;
+    if !eq(!size(reqExtensions), 1) then {
+        def : ExtensionEntry<category, value, reqExtensions[0]>;
+    }
+
+    foreach capability = reqCapabilities in {
+        def : CapabilityEntry<category, value, capability>;
+    }
+}
+
+//===----------------------------------------------------------------------===//
+// Enum defining 
diff erent categories of symbolic/named operands.
+//===----------------------------------------------------------------------===//
+
+def OperandCategory : GenericEnum {
+  let FilterClass = "OperandCategory";
+}
+
+class OperandCategory;
+
+def ExtensionOperand : OperandCategory;
+def CapabilityOperand : OperandCategory;
+def SourceLanguageOperand : OperandCategory;
+def AddressingModelOperand : OperandCategory;
+def ExecutionModelOperand : OperandCategory;
+def MemoryModelOperand : OperandCategory;
+def ExecutionModeOperand : OperandCategory;
+def StorageClassOperand : OperandCategory;
+def DimOperand : OperandCategory;
+def SamplerAddressingModeOperand : OperandCategory;
+def SamplerFilterModeOperand : OperandCategory;
+def ImageFormatOperand : OperandCategory;
+def ImageChannelOrderOperand : OperandCategory;
+def ImageChannelDataTypeOperand : OperandCategory;
+def ImageOperandOperand : OperandCategory;
+def FPFastMathModeOperand : OperandCategory;
+def FPRoundingModeOperand : OperandCategory;
+def LinkageTypeOperand : OperandCategory;
+def AccessQualifierOperand : OperandCategory;
+def FunctionParameterAttributeOperand : OperandCategory;
+def DecorationOperand : OperandCategory;
+def BuiltInOperand : OperandCategory;
+def SelectionControlOperand : OperandCategory;
+def LoopControlOperand : OperandCategory;
+def FunctionControlOperand : OperandCategory;
+def MemorySemanticsOperand : OperandCategory;
+def MemoryOperandOperand : OperandCategory;
+def ScopeOperand : OperandCategory;
+def GroupOperationOperand : OperandCategory;
+def KernelEnqueueFlagsOperand : OperandCategory;
+def KernelProfilingInfoOperand : OperandCategory;
+def OpcodeOperand : OperandCategory;
+
+//===----------------------------------------------------------------------===//
+// Multiclass used to define Extesions enum values and at the same time
+// SymbolicOperand entries.
+//===----------------------------------------------------------------------===//
+
+def Extension : GenericEnum, Operand<i32> {
+  let FilterClass = "Extension";
+  let NameField = "Name";
+  let ValueField = "Value";
+  let PrintMethod = "printExtension";
+}
+
+class Extension<string name, bits<32> value> {
+  string Name = name;
+  bits<32> Value = value;
+}
+
+multiclass ExtensionOperand<bits<32> value> {
+  def NAME : Extension<NAME, value>;
+  defm : SymbolicOperandWithRequirements<ExtensionOperand, value, NAME, 0, 0, [], []>;
+}
+
+defm SPV_AMD_shader_explicit_vertex_parameter : ExtensionOperand<1>;
+defm SPV_AMD_shader_trinary_minmax_extension : ExtensionOperand<2>;
+defm SPV_AMD_gcn_shader : ExtensionOperand<3>;
+defm SPV_KHR_shader_ballot : ExtensionOperand<4>;
+defm SPV_AMD_shader_ballot : ExtensionOperand<5>;
+defm SPV_AMD_gpu_shader_half_float : ExtensionOperand<6>;
+defm SPV_KHR_shader_draw_parameters : ExtensionOperand<7>;
+defm SPV_KHR_subgroup_vote : ExtensionOperand<8>;
+defm SPV_KHR_16bit_storeage : ExtensionOperand<9>;
+defm SPV_KHR_device_group : ExtensionOperand<10>;
+defm SPV_KHR_multiview : ExtensionOperand<11>;
+defm SPV_NVX_multiview_per_view_attributes : ExtensionOperand<12>;
+defm SPV_NV_viewport_array2 : ExtensionOperand<13>;
+defm SPV_NV_stereo_view_rendering : ExtensionOperand<14>;
+defm SPV_NV_sample_mask_override_coverage : ExtensionOperand<15>;
+defm SPV_NV_geometry_shader_passthrough : ExtensionOperand<16>;
+defm SPV_AMD_texture_gather_bias_lod : ExtensionOperand<17>;
+defm SPV_KHR_storage_buffer_storage_class : ExtensionOperand<18>;
+defm SPV_KHR_variable_pointers : ExtensionOperand<19>;
+defm SPV_AMD_gpu_shader_int16 : ExtensionOperand<20>;
+defm SPV_KHR_post_depth_coverage : ExtensionOperand<21>;
+defm SPV_KHR_shader_atomic_counter_ops : ExtensionOperand<22>;
+defm SPV_EXT_shader_stencil_export : ExtensionOperand<23>;
+defm SPV_EXT_shader_viewport_index_layer : ExtensionOperand<24>;
+defm SPV_AMD_shader_image_load_store_lod : ExtensionOperand<25>;
+defm SPV_AMD_shader_fragment_mask : ExtensionOperand<26>;
+defm SPV_EXT_fragment_fully_covered : ExtensionOperand<27>;
+defm SPV_AMD_gpu_shader_half_float_fetch : ExtensionOperand<28>;
+defm SPV_GOOGLE_decorate_string : ExtensionOperand<29>;
+defm SPV_GOOGLE_hlsl_functionality1 : ExtensionOperand<30>;
+defm SPV_NV_shader_subgroup_partitioned : ExtensionOperand<31>;
+defm SPV_EXT_descriptor_indexing : ExtensionOperand<32>;
+defm SPV_KHR_8bit_storage : ExtensionOperand<33>;
+defm SPV_KHR_vulkan_memory_model : ExtensionOperand<34>;
+defm SPV_NV_ray_tracing : ExtensionOperand<35>;
+defm SPV_NV_compute_shader_derivatives : ExtensionOperand<36>;
+defm SPV_NV_fragment_shader_barycentric : ExtensionOperand<37>;
+defm SPV_NV_mesh_shader : ExtensionOperand<38>;
+defm SPV_NV_shader_image_footprint : ExtensionOperand<39>;
+defm SPV_NV_shading_rate : ExtensionOperand<40>;
+defm SPV_INTEL_subgroups : ExtensionOperand<41>;
+defm SPV_INTEL_media_block_io : ExtensionOperand<42>;
+defm SPV_EXT_fragment_invocation_density : ExtensionOperand<44>;
+defm SPV_KHR_no_integer_wrap_decoration : ExtensionOperand<45>;
+defm SPV_KHR_float_controls : ExtensionOperand<46>;
+defm SPV_EXT_physical_storage_buffer : ExtensionOperand<47>;
+defm SPV_INTEL_fpga_memory_attributes : ExtensionOperand<48>;
+defm SPV_NV_cooperative_matrix : ExtensionOperand<49>;
+defm SPV_INTEL_shader_integer_functions2 : ExtensionOperand<50>;
+defm SPV_INTEL_fpga_loop_controls : ExtensionOperand<51>;
+defm SPV_EXT_fragment_shader_interlock : ExtensionOperand<52>;
+defm SPV_NV_shader_sm_builtins : ExtensionOperand<53>;
+defm SPV_KHR_shader_clock : ExtensionOperand<54>;
+defm SPV_INTEL_unstructured_loop_controls : ExtensionOperand<55>;
+defm SPV_EXT_demote_to_helper_invocation : ExtensionOperand<56>;
+defm SPV_INTEL_fpga_reg : ExtensionOperand<57>;
+
+//===----------------------------------------------------------------------===//
+// Multiclass used to define Capabilities enum values and at the same time
+// SymbolicOperand entries with string mnemonics, versioning, extensions, and
+// capabilities.
+//===----------------------------------------------------------------------===//
+
+def Capability : GenericEnum, Operand<i32> {
+  let FilterClass = "Capability";
+  let NameField = "Name";
+  let ValueField = "Value";
+  let PrintMethod = !strconcat("printSymbolicOperand<OperandCategory::", FilterClass, "Operand>");
+}
+
+class Capability<string name, bits<32> value> {
+  string Name = name;
+  bits<32> Value = value;
+}
+
+multiclass CapabilityOperand<bits<32> value, bits<32> minVersion, bits<32> maxVersion, list<Extension> reqExtensions, list<Capability> reqCapabilities> {
+  def NAME : Capability<NAME, value>;
+  defm : SymbolicOperandWithRequirements<CapabilityOperand, value, NAME, minVersion, maxVersion, reqExtensions, reqCapabilities>;
+}
+
+defm Matrix : CapabilityOperand<0, 0, 0, [], []>;
+defm Shader : CapabilityOperand<1, 0, 0, [], [Matrix]>;
+defm Geometry : CapabilityOperand<2, 0, 0, [], [Shader]>;
+defm Tessellation : CapabilityOperand<3, 0, 0, [], [Shader]>;
+defm Addresses : CapabilityOperand<4, 0, 0, [], []>;
+defm Linkage : CapabilityOperand<5, 0, 0, [], []>;
+defm Kernel : CapabilityOperand<6, 0, 0, [], []>;
+defm Vector16 : CapabilityOperand<7, 0, 0, [], [Kernel]>;
+defm Float16Buffer : CapabilityOperand<8, 0, 0, [], [Kernel]>;
+defm Float16 : CapabilityOperand<9, 0, 0, [], []>;
+defm Float64 : CapabilityOperand<10, 0, 0, [], []>;
+defm Int64 : CapabilityOperand<11, 0, 0, [], []>;
+defm Int64Atomics : CapabilityOperand<12, 0, 0, [], [Int64]>;
+defm ImageBasic : CapabilityOperand<13, 0, 0, [], [Kernel]>;
+defm ImageReadWrite : CapabilityOperand<14, 0, 0, [], [ImageBasic]>;
+defm ImageMipmap : CapabilityOperand<15, 0, 0, [], [ImageBasic]>;
+defm Pipes : CapabilityOperand<17, 0, 0, [], [Kernel]>;
+defm Groups : CapabilityOperand<18, 0, 0, [], []>;
+defm DeviceEnqueue : CapabilityOperand<19, 0, 0, [], []>;
+defm LiteralSampler : CapabilityOperand<20, 0, 0, [], [Kernel]>;
+defm AtomicStorage : CapabilityOperand<21, 0, 0, [], [Shader]>;
+defm Int16 : CapabilityOperand<22, 0, 0, [], []>;
+defm TessellationPointSize : CapabilityOperand<23, 0, 0, [], [Tessellation]>;
+defm GeometryPointSize : CapabilityOperand<24, 0, 0, [], [Geometry]>;
+defm ImageGatherExtended : CapabilityOperand<25, 0, 0, [], [Shader]>;
+defm StorageImageMultisample : CapabilityOperand<27, 0, 0, [], [Shader]>;
+defm UniformBufferArrayDynamicIndexing : CapabilityOperand<28, 0, 0, [], [Shader]>;
+defm SampledImageArrayDymnamicIndexing : CapabilityOperand<29, 0, 0, [], [Shader]>;
+defm ClipDistance : CapabilityOperand<32, 0, 0, [], [Shader]>;
+defm CullDistance : CapabilityOperand<33, 0, 0, [], [Shader]>;
+defm SampleRateShading : CapabilityOperand<35, 0, 0, [], [Shader]>;
+defm SampledRect : CapabilityOperand<37, 0, 0, [], [Shader]>;
+defm ImageRect : CapabilityOperand<36, 0, 0, [], [SampledRect]>;
+defm GenericPointer : CapabilityOperand<38, 0, 0, [], [Addresses]>;
+defm Int8 : CapabilityOperand<39, 0, 0, [], []>;
+defm InputAttachment : CapabilityOperand<40, 0, 0, [], [Shader]>;
+defm SparseResidency : CapabilityOperand<41, 0, 0, [], [Shader]>;
+defm MinLod : CapabilityOperand<42, 0, 0, [], [Shader]>;
+defm Sampled1D : CapabilityOperand<43, 0, 0, [], []>;
+defm Image1D : CapabilityOperand<44, 0, 0, [], [Sampled1D]>;
+defm SampledCubeArray : CapabilityOperand<45, 0, 0, [], [Shader]>;
+defm ImageCubeArray : CapabilityOperand<34, 0, 0, [], [SampledCubeArray]>;
+defm SampledBuffer : CapabilityOperand<46, 0, 0, [], []>;
+defm ImageBuffer : CapabilityOperand<47, 0, 0, [], [SampledBuffer]>;
+defm ImageMSArray : CapabilityOperand<48, 0, 0, [], [Shader]>;
+defm StorageImageExtendedFormats : CapabilityOperand<49, 0, 0, [], [Shader]>;
+defm ImageQuery : CapabilityOperand<50, 0, 0, [], [Shader]>;
+defm DerivativeControl : CapabilityOperand<51, 0, 0, [], [Shader]>;
+defm InterpolationFunction : CapabilityOperand<52, 0, 0, [], [Shader]>;
+defm TransformFeedback : CapabilityOperand<53, 0, 0, [], [Shader]>;
+defm GeometryStreams : CapabilityOperand<54, 0, 0, [], [Geometry]>;
+defm StorageImageReadWithoutFormat : CapabilityOperand<55, 0, 0, [], [Shader]>;
+defm StorageImageWriteWithoutFormat : CapabilityOperand<56, 0, 0, [], [Shader]>;
+defm MultiViewport : CapabilityOperand<57, 0, 0, [], [Geometry]>;
+defm SubgroupDispatch : CapabilityOperand<58, 0x10100, 0, [], [DeviceEnqueue]>;
+defm NamedBarrier : CapabilityOperand<59, 0x10100, 0, [], [Kernel]>;
+defm PipeStorage : CapabilityOperand<60, 0x10100, 0, [], [Pipes]>;
+defm GroupNonUniform : CapabilityOperand<61, 0x10300, 0, [], []>;
+defm GroupNonUniformVote : CapabilityOperand<62, 0x10300, 0, [], [GroupNonUniform]>;
+defm GroupNonUniformArithmetic : CapabilityOperand<63, 0x10300, 0, [], [GroupNonUniform]>;
+defm GroupNonUniformBallot : CapabilityOperand<64, 0x10300, 0, [], [GroupNonUniform]>;
+defm GroupNonUniformShuffle : CapabilityOperand<65, 0x10300, 0, [], [GroupNonUniform]>;
+defm GroupNonUniformShuffleRelative : CapabilityOperand<66, 0x10300, 0, [], [GroupNonUniform]>;
+defm GroupNonUniformClustered : CapabilityOperand<67, 0x10300, 0, [], [GroupNonUniform]>;
+defm GroupNonUniformQuad : CapabilityOperand<68, 0x10300, 0, [], [GroupNonUniform]>;
+defm SubgroupBallotKHR : CapabilityOperand<4423, 0, 0, [SPV_KHR_shader_ballot], []>;
+defm DrawParameters : CapabilityOperand<4427, 0x10300, 0, [SPV_KHR_shader_draw_parameters], [Shader]>;
+defm SubgroupVoteKHR : CapabilityOperand<4431, 0, 0, [SPV_KHR_subgroup_vote], []>;
+defm StorageBuffer16BitAccess : CapabilityOperand<4433, 0x10300, 0, [SPV_KHR_16bit_storeage], []>;
+defm StorageUniform16 : CapabilityOperand<4434, 0x10300, 0, [SPV_KHR_16bit_storeage], [StorageBuffer16BitAccess]>;
+defm StoragePushConstant16 : CapabilityOperand<4435, 0x10300, 0, [SPV_KHR_16bit_storeage], []>;
+defm StorageInputOutput16 : CapabilityOperand<4436, 0x10300, 0, [SPV_KHR_16bit_storeage], []>;
+defm DeviceGroup : CapabilityOperand<4437, 0x10300, 0, [SPV_KHR_device_group], []>;
+defm MultiView : CapabilityOperand<4439, 0x10300, 0, [SPV_KHR_multiview], [Shader]>;
+defm VariablePointersStorageBuffer : CapabilityOperand<4441, 0x10300, 0, [SPV_KHR_variable_pointers], [Shader]>;
+defm VariablePointers : CapabilityOperand<4442, 0x10300, 0, [SPV_KHR_variable_pointers], [VariablePointersStorageBuffer]>;
+defm AtomicStorageOps : CapabilityOperand<4445, 0, 0, [SPV_KHR_shader_atomic_counter_ops], []>;
+defm SampleMaskPostDepthCoverage : CapabilityOperand<4447, 0, 0, [SPV_KHR_post_depth_coverage], []>;
+defm StorageBuffer8BitAccess : CapabilityOperand<4448, 0, 0, [SPV_KHR_8bit_storage], []>;
+defm UniformAndStorageBuffer8BitAccess : CapabilityOperand<4449, 0, 0, [SPV_KHR_8bit_storage], [StorageBuffer8BitAccess]>;
+defm StoragePushConstant8 : CapabilityOperand<4450, 0, 0, [SPV_KHR_8bit_storage], []>;
+defm DenormPreserve : CapabilityOperand<4464, 0x10400, 0, [SPV_KHR_float_controls], []>;
+defm DenormFlushToZero : CapabilityOperand<4465, 0x10400, 0, [SPV_KHR_float_controls], []>;
+defm SignedZeroInfNanPreserve : CapabilityOperand<4466, 0x10400, 0, [SPV_KHR_float_controls], []>;
+defm RoundingModeRTE : CapabilityOperand<4467, 0x10400, 0, [SPV_KHR_float_controls], []>;
+defm RoundingModeRTZ : CapabilityOperand<4468, 0x10400, 0, [SPV_KHR_float_controls], []>;
+defm Float16ImageAMD : CapabilityOperand<5008, 0, 0, [], [Shader]>;
+defm ImageGatherBiasLodAMD : CapabilityOperand<5009, 0, 0, [], [Shader]>;
+defm FragmentMaskAMD : CapabilityOperand<5010, 0, 0, [], [Shader]>;
+defm StencilExportEXT : CapabilityOperand<5013, 0, 0, [], [Shader]>;
+defm ImageReadWriteLodAMD : CapabilityOperand<5015, 0, 0, [], [Shader]>;
+defm SampleMaskOverrideCoverageNV : CapabilityOperand<5249, 0, 0, [], [SampleRateShading]>;
+defm GeometryShaderPassthroughNV : CapabilityOperand<5251, 0, 0, [], [Geometry]>;
+defm ShaderViewportIndexLayerEXT : CapabilityOperand<5254, 0, 0, [], [MultiViewport]>;
+defm ShaderViewportMaskNV : CapabilityOperand<5255, 0, 0, [], [ShaderViewportIndexLayerEXT]>;
+defm ShaderStereoViewNV : CapabilityOperand<5259, 0, 0, [], [ShaderViewportMaskNV]>;
+defm PerViewAttributesNV : CapabilityOperand<5260, 0, 0, [], [MultiView]>;
+defm FragmentFullyCoveredEXT : CapabilityOperand<5265, 0, 0, [], [Shader]>;
+defm MeshShadingNV : CapabilityOperand<5266, 0, 0, [], [Shader]>;
+defm ShaderNonUniformEXT : CapabilityOperand<5301, 0, 0, [], [Shader]>;
+defm RuntimeDescriptorArrayEXT : CapabilityOperand<5302, 0, 0, [], [Shader]>;
+defm InputAttachmentArrayDynamicIndexingEXT : CapabilityOperand<5303, 0, 0, [], [InputAttachment]>;
+defm UniformTexelBufferArrayDynamicIndexingEXT : CapabilityOperand<5304, 0, 0, [], [SampledBuffer]>;
+defm StorageTexelBufferArrayDynamicIndexingEXT : CapabilityOperand<5305, 0, 0, [], [ImageBuffer]>;
+defm UniformBufferArrayNonUniformIndexingEXT : CapabilityOperand<5306, 0, 0, [], [ShaderNonUniformEXT]>;
+defm SampledImageArrayNonUniformIndexingEXT : CapabilityOperand<5307, 0, 0, [], [ShaderNonUniformEXT]>;
+defm StorageBufferArrayNonUniformIndexingEXT : CapabilityOperand<5308, 0, 0, [], [ShaderNonUniformEXT]>;
+defm StorageImageArrayNonUniformIndexingEXT : CapabilityOperand<5309, 0, 0, [], [ShaderNonUniformEXT]>;
+defm InputAttachmentArrayNonUniformIndexingEXT : CapabilityOperand<5310, 0, 0, [], [InputAttachment, ShaderNonUniformEXT]>;
+defm UniformTexelBufferArrayNonUniformIndexingEXT : CapabilityOperand<5311, 0, 0, [], [SampledBuffer, ShaderNonUniformEXT]>;
+defm StorageTexelBufferArrayNonUniformIndexingEXT : CapabilityOperand<5312, 0, 0, [], [ImageBuffer, ShaderNonUniformEXT]>;
+defm RayTracingNV : CapabilityOperand<5340, 0, 0, [], [Shader]>;
+defm SubgroupShuffleINTEL : CapabilityOperand<5568, 0, 0, [], []>;
+defm SubgroupBufferBlockIOINTEL : CapabilityOperand<5569, 0, 0, [], []>;
+defm SubgroupImageBlockIOINTEL : CapabilityOperand<5570, 0, 0, [], []>;
+defm SubgroupImageMediaBlockIOINTEL : CapabilityOperand<5579, 0, 0, [], []>;
+defm SubgroupAvcMotionEstimationINTEL : CapabilityOperand<5696, 0, 0, [], []>;
+defm SubgroupAvcMotionEstimationIntraINTEL : CapabilityOperand<5697, 0, 0, [], []>;
+defm SubgroupAvcMotionEstimationChromaINTEL : CapabilityOperand<5698, 0, 0, [], []>;
+defm GroupNonUniformPartitionedNV : CapabilityOperand<5297, 0, 0, [], []>;
+defm VulkanMemoryModelKHR : CapabilityOperand<5345, 0, 0, [], []>;
+defm VulkanMemoryModelDeviceScopeKHR : CapabilityOperand<5346, 0, 0, [], []>;
+defm ImageFootprintNV : CapabilityOperand<5282, 0, 0, [], []>;
+defm FragmentBarycentricNV : CapabilityOperand<5284, 0, 0, [], []>;
+defm ComputeDerivativeGroupQuadsNV : CapabilityOperand<5288, 0, 0, [], []>;
+defm ComputeDerivativeGroupLinearNV : CapabilityOperand<5350, 0, 0, [], []>;
+defm FragmentDensityEXT : CapabilityOperand<5291, 0, 0, [], [Shader]>;
+defm PhysicalStorageBufferAddressesEXT : CapabilityOperand<5347, 0, 0, [], [Shader]>;
+defm CooperativeMatrixNV : CapabilityOperand<5357, 0, 0, [], [Shader]>;
+
+//===----------------------------------------------------------------------===//
+// Multiclass used to define SourceLanguage enum values and at the same time
+// SymbolicOperand entries.
+//===----------------------------------------------------------------------===//
+
+def SourceLanguage : GenericEnum, Operand<i32> {
+  let FilterClass = "SourceLanguage";
+  let NameField = "Name";
+  let ValueField = "Value";
+  let PrintMethod = !strconcat("printSymbolicOperand<OperandCategory::", FilterClass, "Operand>");
+}
+
+class SourceLanguage<string name, bits<32> value> {
+  string Name = name;
+  bits<32> Value = value;
+}
+
+multiclass SourceLanguageOperand<bits<32> value> {
+  def : SourceLanguage<NAME, value>;
+  defm : SymbolicOperandWithRequirements<SourceLanguageOperand, value, NAME, 0, 0, [], []>;
+}
+
+defm Unknown : SourceLanguageOperand<0>;
+defm ESSL : SourceLanguageOperand<1>;
+defm GLSL : SourceLanguageOperand<2>;
+defm OpenCL_C : SourceLanguageOperand<3>;
+defm OpenCL_CPP : SourceLanguageOperand<4>;
+defm HLSL : SourceLanguageOperand<5>;
+
+//===----------------------------------------------------------------------===//
+// Multiclass used to define AddressingModel enum values and at the same time
+// SymbolicOperand entries with string mnemonics, and capabilities.
+//===----------------------------------------------------------------------===//
+
+def AddressingModel : GenericEnum, Operand<i32> {
+  let FilterClass = "AddressingModel";
+  let NameField = "Name";
+  let ValueField = "Value";
+  let PrintMethod = !strconcat("printSymbolicOperand<OperandCategory::", FilterClass, "Operand>");
+}
+
+class AddressingModel<string name, bits<32> value> {
+  string Name = name;
+  bits<32> Value = value;
+}
+
+multiclass AddressingModelOperand<bits<32> value, list<Capability> reqCapabilities> {
+  def : AddressingModel<NAME, value>;
+  defm : SymbolicOperandWithRequirements<AddressingModelOperand, value, NAME, 0, 0, [], reqCapabilities>;
+}
+
+defm Logical : AddressingModelOperand<0, []>;
+defm Physical32 : AddressingModelOperand<1, [Addresses]>;
+defm Physical64 : AddressingModelOperand<2, [Addresses]>;
+defm PhysicalStorageBuffer64EXT : AddressingModelOperand<5348, [PhysicalStorageBufferAddressesEXT]>;
+
+//===----------------------------------------------------------------------===//
+// Multiclass used to define ExecutionModel enum values and at the same time
+// SymbolicOperand entries with string mnemonics and capabilities.
+//===----------------------------------------------------------------------===//
+
+def ExecutionModel : GenericEnum, Operand<i32> {
+  let FilterClass = "ExecutionModel";
+  let NameField = "Name";
+  let ValueField = "Value";
+  let PrintMethod = !strconcat("printSymbolicOperand<OperandCategory::", FilterClass, "Operand>");
+}
+
+class ExecutionModel<string name, bits<32> value> {
+  string Name = name;
+  bits<32> Value = value;
+}
+
+multiclass ExecutionModelOperand<bits<32> value, list<Capability> reqCapabilities> {
+  def : ExecutionModel<NAME, value>;
+  defm : SymbolicOperandWithRequirements<ExecutionModelOperand, value, NAME, 0, 0, [], reqCapabilities>;
+}
+
+defm Vertex : ExecutionModelOperand<0, [Shader]>;
+defm TessellationControl: ExecutionModelOperand<1, [Tessellation]>;
+defm TessellationEvaluation: ExecutionModelOperand<2, [Tessellation]>;
+defm Geometry: ExecutionModelOperand<3, [Geometry]>;
+defm Fragment: ExecutionModelOperand<4, [Shader]>;
+defm GLCompute: ExecutionModelOperand<5, [Shader]>;
+defm Kernel: ExecutionModelOperand<6, [Kernel]>;
+defm TaskNV: ExecutionModelOperand<5267, [MeshShadingNV]>;
+defm MeshNV: ExecutionModelOperand<5268, [MeshShadingNV]>;
+defm RayGenerationNV: ExecutionModelOperand<5313, [RayTracingNV]>;
+defm IntersectionNV: ExecutionModelOperand<5314, [RayTracingNV]>;
+defm AnyHitNV: ExecutionModelOperand<5315, [RayTracingNV]>;
+defm ClosestHitNV: ExecutionModelOperand<5316, [RayTracingNV]>;
+defm MissNV: ExecutionModelOperand<5317, [RayTracingNV]>;
+defm CallableNV: ExecutionModelOperand<5318, [RayTracingNV]>;
+
+//===----------------------------------------------------------------------===//
+// Multiclass used to define MemoryModel enum values and at the same time
+// SymbolicOperand entries with string mnemonics and capabilities.
+//===----------------------------------------------------------------------===//
+
+def MemoryModel : GenericEnum, Operand<i32> {
+  let FilterClass = "MemoryModel";
+  let NameField = "Name";
+  let ValueField = "Value";
+  let PrintMethod = !strconcat("printSymbolicOperand<OperandCategory::", FilterClass, "Operand>");
+}
+
+class MemoryModel<string name, bits<32> value> {
+  string Name = name;
+  bits<32> Value = value;
+}
+
+multiclass MemoryModelOperand<bits<32> value, list<Capability> reqCapabilities> {
+  def : MemoryModel<NAME, value>;
+  defm : SymbolicOperandWithRequirements<MemoryModelOperand, value, NAME, 0, 0, [], reqCapabilities>;
+}
+
+defm Simple : MemoryModelOperand<0, [Shader]>;
+defm GLSL450 : MemoryModelOperand<1, [Shader]>;
+defm OpenCL : MemoryModelOperand<2, [Kernel]>;
+defm VulkanKHR : MemoryModelOperand<3, [VulkanMemoryModelKHR]>;
+
+//===----------------------------------------------------------------------===//
+// Multiclass used to define ExecutionMode enum values and at the same time
+// SymbolicOperand entries with string mnemonics and capabilities.
+//===----------------------------------------------------------------------===//
+
+def ExecutionMode : GenericEnum, Operand<i32> {
+  let FilterClass = "ExecutionMode";
+  let NameField = "Name";
+  let ValueField = "Value";
+  let PrintMethod = !strconcat("printSymbolicOperand<OperandCategory::", FilterClass, "Operand>");
+}
+
+class ExecutionMode<string name, bits<32> value> {
+  string Name = name;
+  bits<32> Value = value;
+}
+
+multiclass ExecutionModeOperand<bits<32> value, list<Capability> reqCapabilities> {
+  def : ExecutionMode<NAME, value>;
+  defm : SymbolicOperandWithRequirements<ExecutionModeOperand, value, NAME, 0, 0, [], reqCapabilities>;
+}
+
+defm Invocations : ExecutionModeOperand<0, [Geometry]>;
+defm SpacingEqual : ExecutionModeOperand<1, [Tessellation]>;
+defm SpacingFractionalEven : ExecutionModeOperand<2, [Tessellation]>;
+defm SpacingFractionalOdd : ExecutionModeOperand<3, [Tessellation]>;
+defm VertexOrderCw : ExecutionModeOperand<4, [Tessellation]>;
+defm VertexOrderCcw : ExecutionModeOperand<5, [Tessellation]>;
+defm PixelCenterInteger : ExecutionModeOperand<6, [Shader]>;
+defm OriginUpperLeft : ExecutionModeOperand<7, [Shader]>;
+defm OriginLowerLeft : ExecutionModeOperand<8, [Shader]>;
+defm EarlyFragmentTests : ExecutionModeOperand<9, [Shader]>;
+defm PointMode : ExecutionModeOperand<10, [Tessellation]>;
+defm Xfb : ExecutionModeOperand<11, [TransformFeedback]>;
+defm DepthReplacing : ExecutionModeOperand<12, [Shader]>;
+defm DepthGreater : ExecutionModeOperand<14, [Shader]>;
+defm DepthLess : ExecutionModeOperand<15, [Shader]>;
+defm DepthUnchanged : ExecutionModeOperand<16, [Shader]>;
+defm LocalSize : ExecutionModeOperand<17, []>;
+defm LocalSizeHint : ExecutionModeOperand<18, [Kernel]>;
+defm InputPoints : ExecutionModeOperand<19, [Geometry]>;
+defm InputLines : ExecutionModeOperand<20, [Geometry]>;
+defm InputLinesAdjacency : ExecutionModeOperand<21, [Geometry]>;
+defm Triangles : ExecutionModeOperand<22, [Geometry]>;
+defm InputTrianglesAdjacency : ExecutionModeOperand<23, [Geometry]>;
+defm Quads : ExecutionModeOperand<24, [Tessellation]>;
+defm Isolines : ExecutionModeOperand<25, [Tessellation]>;
+defm OutputVertices : ExecutionModeOperand<26, [Geometry]>;
+defm OutputPoints : ExecutionModeOperand<27, [Geometry]>;
+defm OutputLineStrip : ExecutionModeOperand<28, [Geometry]>;
+defm OutputTriangleStrip : ExecutionModeOperand<29, [Geometry]>;
+defm VecTypeHint : ExecutionModeOperand<30, [Kernel]>;
+defm ContractionOff : ExecutionModeOperand<31, [Kernel]>;
+defm Initializer : ExecutionModeOperand<33, [Kernel]>;
+defm Finalizer : ExecutionModeOperand<34, [Kernel]>;
+defm SubgroupSize : ExecutionModeOperand<35, [SubgroupDispatch]>;
+defm SubgroupsPerWorkgroup : ExecutionModeOperand<36, [SubgroupDispatch]>;
+defm SubgroupsPerWorkgroupId : ExecutionModeOperand<37, [SubgroupDispatch]>;
+defm LocalSizeId : ExecutionModeOperand<38, []>;
+defm LocalSizeHintId : ExecutionModeOperand<39, [Kernel]>;
+defm PostDepthCoverage : ExecutionModeOperand<4446, [SampleMaskPostDepthCoverage]>;
+defm DenormPreserve : ExecutionModeOperand<4459, [DenormPreserve]>;
+defm DenormFlushToZero : ExecutionModeOperand<4460, [DenormFlushToZero]>;
+defm SignedZeroInfNanPreserve : ExecutionModeOperand<4461, [SignedZeroInfNanPreserve]>;
+defm RoundingModeRTE : ExecutionModeOperand<4462, [RoundingModeRTE]>;
+defm RoundingModeRTZ : ExecutionModeOperand<4463, [RoundingModeRTZ]>;
+defm StencilRefReplacingEXT : ExecutionModeOperand<5027, [StencilExportEXT]>;
+defm OutputLinesNV : ExecutionModeOperand<5269, [MeshShadingNV]>;
+defm DerivativeGroupQuadsNV : ExecutionModeOperand<5289, [ComputeDerivativeGroupQuadsNV]>;
+defm DerivativeGroupLinearNV : ExecutionModeOperand<5290, [ComputeDerivativeGroupLinearNV]>;
+defm OutputTrianglesNV : ExecutionModeOperand<5298, [MeshShadingNV]>;
+
+//===----------------------------------------------------------------------===//
+// Multiclass used to define StorageClass enum values and at the same time
+// SymbolicOperand entries with string mnemonics and capabilities.
+//===----------------------------------------------------------------------===//
+
+def StorageClass : GenericEnum, Operand<i32> {
+  let FilterClass = "StorageClass";
+  let NameField = "Name";
+  let ValueField = "Value";
+  let PrintMethod = !strconcat("printSymbolicOperand<OperandCategory::", FilterClass, "Operand>");
+}
+
+class StorageClass<string name, bits<32> value> {
+  string Name = name;
+  bits<32> Value = value;
+}
+
+multiclass StorageClassOperand<bits<32> value, list<Capability> reqCapabilities> {
+  def : StorageClass<NAME, value>;
+  defm : SymbolicOperandWithRequirements<StorageClassOperand, value, NAME, 0, 0, [], reqCapabilities>;
+}
+
+defm UniformConstant : StorageClassOperand<0, []>;
+defm Input : StorageClassOperand<1, []>;
+defm Uniform : StorageClassOperand<2, [Shader]>;
+defm Output : StorageClassOperand<3, [Shader]>;
+defm Workgroup : StorageClassOperand<4, []>;
+defm CrossWorkgroup : StorageClassOperand<5, []>;
+defm Private : StorageClassOperand<6, [Shader]>;
+defm Function : StorageClassOperand<7, []>;
+defm Generic : StorageClassOperand<8, [GenericPointer]>;
+defm PushConstant : StorageClassOperand<9, [Shader]>;
+defm AtomicCounter : StorageClassOperand<10, [AtomicStorage]>;
+defm Image : StorageClassOperand<11, []>;
+defm StorageBuffer : StorageClassOperand<12, [Shader]>;
+defm CallableDataNV : StorageClassOperand<5328, [RayTracingNV]>;
+defm IncomingCallableDataNV : StorageClassOperand<5329, [RayTracingNV]>;
+defm RayPayloadNV : StorageClassOperand<5338, [RayTracingNV]>;
+defm HitAttributeNV : StorageClassOperand<5339, [RayTracingNV]>;
+defm IncomingRayPayloadNV : StorageClassOperand<5342, [RayTracingNV]>;
+defm ShaderRecordBufferNV : StorageClassOperand<5343, [RayTracingNV]>;
+defm PhysicalStorageBufferEXT : StorageClassOperand<5349, [PhysicalStorageBufferAddressesEXT]>;
+
+//===----------------------------------------------------------------------===//
+// Multiclass used to define Dim enum values and at the same time
+// SymbolicOperand entries with string mnemonics and capabilities.
+//===----------------------------------------------------------------------===//
+
+def Dim : GenericEnum, Operand<i32> {
+  let FilterClass = "Dim";
+  let NameField = "Name";
+  let ValueField = "Value";
+  let PrintMethod = !strconcat("printSymbolicOperand<OperandCategory::", FilterClass, "Operand>");
+}
+
+class Dim<string name, bits<32> value> {
+  string Name = name;
+  bits<32> Value = value;
+}
+
+multiclass DimOperand<bits<32> value, string mnemonic, list<Capability> reqCapabilities> {
+  def NAME : Dim<NAME, value>;
+  defm : SymbolicOperandWithRequirements<DimOperand, value, mnemonic, 0, 0, [], reqCapabilities>;
+}
+
+defm DIM_1D : DimOperand<0, "1D", [Sampled1D, Image1D]>;
+defm DIM_2D : DimOperand<1, "2D", [Shader, Kernel, ImageMSArray]>;
+defm DIM_3D : DimOperand<2, "3D", []>;
+defm DIM_Cube : DimOperand<3, "Cube", [Shader, ImageCubeArray]>;
+defm DIM_Rect : DimOperand<4, "Rect", [SampledRect, ImageRect]>;
+defm DIM_Buffer : DimOperand<5, "Buffer", [SampledBuffer, ImageBuffer]>;
+defm DIM_SubpassData : DimOperand<6, "SubpassData", [InputAttachment]>;
+
+//===----------------------------------------------------------------------===//
+// Multiclass used to define SamplerAddressingMode enum values and at the same
+// time SymbolicOperand entries with string mnemonics and capabilities.
+//===----------------------------------------------------------------------===//
+
+def SamplerAddressingMode : GenericEnum, Operand<i32> {
+  let FilterClass = "SamplerAddressingMode";
+  let NameField = "Name";
+  let ValueField = "Value";
+  let PrintMethod = !strconcat("printSymbolicOperand<OperandCategory::", FilterClass, "Operand>");
+}
+
+class SamplerAddressingMode<string name, bits<32> value> {
+  string Name = name;
+  bits<32> Value = value;
+}
+
+multiclass SamplerAddressingModeOperand<bits<32> value, list<Capability> reqCapabilities> {
+  def : SamplerAddressingMode<NAME, value>;
+  defm : SymbolicOperandWithRequirements<SamplerAddressingModeOperand, value, NAME, 0, 0, [], reqCapabilities>;
+}
+
+defm None : SamplerAddressingModeOperand<0, [Kernel]>;
+defm ClampToEdge : SamplerAddressingModeOperand<1, [Kernel]>;
+defm Clamp : SamplerAddressingModeOperand<2, [Kernel]>;
+defm Repeat : SamplerAddressingModeOperand<3, [Kernel]>;
+defm RepeatMirrored : SamplerAddressingModeOperand<4, [Kernel]>;
+
+//===----------------------------------------------------------------------===//
+// Multiclass used to define SamplerFilterMode enum values and at the same
+// time SymbolicOperand entries with string mnemonics and capabilities.
+//===----------------------------------------------------------------------===//
+
+def SamplerFilterMode : GenericEnum, Operand<i32> {
+  let FilterClass = "SamplerFilterMode";
+  let NameField = "Name";
+  let ValueField = "Value";
+  let PrintMethod = !strconcat("printSymbolicOperand<OperandCategory::", FilterClass, "Operand>");
+}
+
+class SamplerFilterMode<string name, bits<32> value> {
+  string Name = name;
+  bits<32> Value = value;
+}
+
+multiclass SamplerFilterModeOperand<bits<32> value, list<Capability> reqCapabilities> {
+  def : SamplerFilterMode<NAME, value>;
+  defm : SymbolicOperandWithRequirements<SamplerFilterModeOperand, value, NAME, 0, 0, [], reqCapabilities>;
+}
+
+defm Nearest : SamplerFilterModeOperand<0, [Kernel]>;
+defm Linear : SamplerFilterModeOperand<1, [Kernel]>;
+
+//===----------------------------------------------------------------------===//
+// Multiclass used to define ImageFormat enum values and at the same time
+// SymbolicOperand entries with string mnemonics and capabilities.
+//===----------------------------------------------------------------------===//
+
+def ImageFormat : GenericEnum, Operand<i32> {
+  let FilterClass = "ImageFormat";
+  let NameField = "Name";
+  let ValueField = "Value";
+  let PrintMethod = !strconcat("printSymbolicOperand<OperandCategory::", FilterClass, "Operand>");
+}
+
+class ImageFormat<string name, bits<32> value> {
+  string Name = name;
+  bits<32> Value = value;
+}
+
+multiclass ImageFormatOperand<bits<32> value, list<Capability> reqCapabilities> {
+  def : ImageFormat<NAME, value>;
+  defm : SymbolicOperandWithRequirements<ImageFormatOperand, value, NAME, 0, 0, [], reqCapabilities>;
+}
+
+defm Unknown : ImageFormatOperand<0, []>;
+defm Rgba32f : ImageFormatOperand<1, [Shader]>;
+defm Rgba16f : ImageFormatOperand<2, [Shader]>;
+defm R32f : ImageFormatOperand<3, [Shader]>;
+defm Rgba8 : ImageFormatOperand<4, [Shader]>;
+defm Rgba8Snorm : ImageFormatOperand<5, [Shader]>;
+defm Rg32f : ImageFormatOperand<6, [StorageImageExtendedFormats]>;
+defm Rg16f : ImageFormatOperand<7, [StorageImageExtendedFormats]>;
+defm R11fG11fB10f : ImageFormatOperand<8, [StorageImageExtendedFormats]>;
+defm R16f : ImageFormatOperand<9, [StorageImageExtendedFormats]>;
+defm Rgba16 : ImageFormatOperand<10, [StorageImageExtendedFormats]>;
+defm Rgb10A2 : ImageFormatOperand<11, [StorageImageExtendedFormats]>;
+defm Rg16 : ImageFormatOperand<12, [StorageImageExtendedFormats]>;
+defm Rg8 : ImageFormatOperand<13, [StorageImageExtendedFormats]>;
+defm R16 : ImageFormatOperand<14, [StorageImageExtendedFormats]>;
+defm R8 : ImageFormatOperand<15, [StorageImageExtendedFormats]>;
+defm Rgba16Snorm : ImageFormatOperand<16, [StorageImageExtendedFormats]>;
+defm Rg16Snorm : ImageFormatOperand<17, [StorageImageExtendedFormats]>;
+defm Rg8Snorm : ImageFormatOperand<18, [StorageImageExtendedFormats]>;
+defm R16Snorm : ImageFormatOperand<19, [StorageImageExtendedFormats]>;
+defm R8Snorm : ImageFormatOperand<20, [StorageImageExtendedFormats]>;
+defm Rgba32i : ImageFormatOperand<21, [Shader]>;
+defm Rgba16i : ImageFormatOperand<22, [Shader]>;
+defm Rgba8i : ImageFormatOperand<23, [Shader]>;
+defm R32i : ImageFormatOperand<24, [Shader]>;
+defm Rg32i : ImageFormatOperand<25, [StorageImageExtendedFormats]>;
+defm Rg16i : ImageFormatOperand<26, [StorageImageExtendedFormats]>;
+defm Rg8i : ImageFormatOperand<27, [StorageImageExtendedFormats]>;
+defm R16i : ImageFormatOperand<28, [StorageImageExtendedFormats]>;
+defm R8i : ImageFormatOperand<29, [StorageImageExtendedFormats]>;
+defm Rgba32ui : ImageFormatOperand<30, [Shader]>;
+defm Rgba16ui : ImageFormatOperand<31, [Shader]>;
+defm Rgba8ui : ImageFormatOperand<32, [Shader]>;
+defm R32ui : ImageFormatOperand<33, [Shader]>;
+defm Rgb10a2ui : ImageFormatOperand<34, [StorageImageExtendedFormats]>;
+defm Rg32ui : ImageFormatOperand<35, [StorageImageExtendedFormats]>;
+defm Rg16ui : ImageFormatOperand<36, [StorageImageExtendedFormats]>;
+defm Rg8ui : ImageFormatOperand<37, [StorageImageExtendedFormats]>;
+defm R16ui : ImageFormatOperand<38, [StorageImageExtendedFormats]>;
+defm R8ui : ImageFormatOperand<39, [StorageImageExtendedFormats]>;
+
+//===----------------------------------------------------------------------===//
+// Multiclass used to define ImageChannelOrder enum values and at the same time
+// SymbolicOperand entries with string mnemonics and capabilities.
+//===----------------------------------------------------------------------===//
+
+def ImageChannelOrder : GenericEnum, Operand<i32> {
+  let FilterClass = "ImageChannelOrder";
+  let NameField = "Name";
+  let ValueField = "Value";
+  let PrintMethod = !strconcat("printSymbolicOperand<OperandCategory::", FilterClass, "Operand>");
+}
+
+class ImageChannelOrder<string name, bits<32> value> {
+  string Name = name;
+  bits<32> Value = value;
+}
+
+multiclass ImageChannelOrderOperand<bits<32> value, list<Capability> reqCapabilities> {
+  def : ImageChannelOrder<NAME, value>;
+  defm : SymbolicOperandWithRequirements<ImageChannelOrderOperand, value, NAME, 0, 0, [], reqCapabilities>;
+}
+
+defm R : ImageChannelOrderOperand<0, [Kernel]>;
+defm A : ImageChannelOrderOperand<1, [Kernel]>;
+defm RG : ImageChannelOrderOperand<2, [Kernel]>;
+defm RA : ImageChannelOrderOperand<3, [Kernel]>;
+defm RGB : ImageChannelOrderOperand<4, [Kernel]>;
+defm RGBA : ImageChannelOrderOperand<5, [Kernel]>;
+defm BGRA : ImageChannelOrderOperand<6, [Kernel]>;
+defm ARGB : ImageChannelOrderOperand<7, [Kernel]>;
+defm Intensity : ImageChannelOrderOperand<8, [Kernel]>;
+defm Luminance : ImageChannelOrderOperand<9, [Kernel]>;
+defm Rx : ImageChannelOrderOperand<10, [Kernel]>;
+defm RGx : ImageChannelOrderOperand<11, [Kernel]>;
+defm RGBx : ImageChannelOrderOperand<12, [Kernel]>;
+defm Depth : ImageChannelOrderOperand<13, [Kernel]>;
+defm DepthStencil : ImageChannelOrderOperand<14, [Kernel]>;
+defm sRGB : ImageChannelOrderOperand<15, [Kernel]>;
+defm sRGBx : ImageChannelOrderOperand<16, [Kernel]>;
+defm sRGBA : ImageChannelOrderOperand<17, [Kernel]>;
+defm sBGRA : ImageChannelOrderOperand<18, [Kernel]>;
+defm ABGR : ImageChannelOrderOperand<19, [Kernel]>;
+
+//===----------------------------------------------------------------------===//
+// Multiclass used to define ImageChannelDataType enum values and at the same
+// time SymbolicOperand entries with string mnemonics and capabilities.
+//===----------------------------------------------------------------------===//
+
+def ImageChannelDataType : GenericEnum, Operand<i32> {
+  let FilterClass = "ImageChannelDataType";
+  let NameField = "Name";
+  let ValueField = "Value";
+  let PrintMethod = !strconcat("printSymbolicOperand<OperandCategory::", FilterClass, "Operand>");
+}
+
+class ImageChannelDataType<string name, bits<32> value> {
+  string Name = name;
+  bits<32> Value = value;
+}
+
+multiclass ImageChannelDataTypeOperand<bits<32> value, list<Capability> reqCapabilities> {
+  def : ImageChannelDataType<NAME, value>;
+  defm : SymbolicOperandWithRequirements<ImageChannelDataTypeOperand, value, NAME, 0, 0, [], reqCapabilities>;
+}
+
+defm SnormInt8 : ImageChannelDataTypeOperand<0, []>;
+defm SnormInt16 : ImageChannelDataTypeOperand<1, []>;
+defm UnormInt8 : ImageChannelDataTypeOperand<2, [Kernel]>;
+defm UnormInt16 : ImageChannelDataTypeOperand<3, [Kernel]>;
+defm UnormShort565 : ImageChannelDataTypeOperand<4, [Kernel]>;
+defm UnormShort555 : ImageChannelDataTypeOperand<5, [Kernel]>;
+defm UnormInt101010 : ImageChannelDataTypeOperand<6, [Kernel]>;
+defm SignedInt8 : ImageChannelDataTypeOperand<7, [Kernel]>;
+defm SignedInt16 : ImageChannelDataTypeOperand<8, [Kernel]>;
+defm SignedInt32 : ImageChannelDataTypeOperand<9, [Kernel]>;
+defm UnsignedInt8 : ImageChannelDataTypeOperand<10, [Kernel]>;
+defm UnsignedInt16 : ImageChannelDataTypeOperand<11, [Kernel]>;
+defm UnsigendInt32 : ImageChannelDataTypeOperand<12, [Kernel]>;
+defm HalfFloat : ImageChannelDataTypeOperand<13, [Kernel]>;
+defm Float : ImageChannelDataTypeOperand<14, [Kernel]>;
+defm UnormInt24 : ImageChannelDataTypeOperand<15, [Kernel]>;
+defm UnormInt101010_2 : ImageChannelDataTypeOperand<16, [Kernel]>;
+
+//===----------------------------------------------------------------------===//
+// Multiclass used to define ImageOperand enum values and at the same time
+// SymbolicOperand entries with string mnemonics and capabilities.
+//===----------------------------------------------------------------------===//
+
+def ImageOperand : GenericEnum, Operand<i32> {
+  let FilterClass = "ImageOperand";
+  let NameField = "Name";
+  let ValueField = "Value";
+  let PrintMethod = !strconcat("printSymbolicOperand<OperandCategory::", FilterClass, "Operand>");
+}
+
+class ImageOperand<string name, bits<32> value> {
+  string Name = name;
+  bits<32> Value = value;
+}
+
+multiclass ImageOperandOperand<bits<32> value, list<Capability> reqCapabilities> {
+  def : ImageOperand<NAME, value>;
+  defm : SymbolicOperandWithRequirements<ImageOperandOperand, value, NAME, 0, 0, [], reqCapabilities>;
+}
+
+defm None : ImageOperandOperand<0x0, []>;
+defm Bias : ImageOperandOperand<0x1, [Shader]>;
+defm Lod : ImageOperandOperand<0x2, []>;
+defm Grad : ImageOperandOperand<0x4, []>;
+defm ConstOffset : ImageOperandOperand<0x8, []>;
+defm Offset : ImageOperandOperand<0x10, [ImageGatherExtended]>;
+defm ConstOffsets : ImageOperandOperand<0x20, [ImageGatherExtended]>;
+defm Sample : ImageOperandOperand<0x40, []>;
+defm MinLod : ImageOperandOperand<0x80, [MinLod]>;
+defm MakeTexelAvailableKHR : ImageOperandOperand<0x100, [VulkanMemoryModelKHR]>;
+defm MakeTexelVisibleKHR : ImageOperandOperand<0x200, [VulkanMemoryModelKHR]>;
+defm NonPrivateTexelKHR : ImageOperandOperand<0x400, [VulkanMemoryModelKHR]>;
+defm VolatileTexelKHR : ImageOperandOperand<0x800, [VulkanMemoryModelKHR]>;
+defm SignExtend : ImageOperandOperand<0x1000, []>;
+defm ZeroExtend : ImageOperandOperand<0x2000, []>;
+
+//===----------------------------------------------------------------------===//
+// Multiclass used to define FPFastMathMode enum values and at the same time
+// SymbolicOperand entries with string mnemonics and capabilities.
+//===----------------------------------------------------------------------===//
+
+def FPFastMathMode : GenericEnum, Operand<i32> {
+  let FilterClass = "FPFastMathMode";
+  let NameField = "Name";
+  let ValueField = "Value";
+  let PrintMethod = !strconcat("printSymbolicOperand<OperandCategory::", FilterClass, "Operand>");
+}
+
+class FPFastMathMode<string name, bits<32> value> {
+  string Name = name;
+  bits<32> Value = value;
+}
+
+multiclass FPFastMathModeOperand<bits<32> value, list<Capability> reqCapabilities> {
+  def : FPFastMathMode<NAME, value>;
+  defm : SymbolicOperandWithRequirements<FPFastMathModeOperand, value, NAME, 0, 0, [], reqCapabilities>;
+}
+
+defm None : FPFastMathModeOperand<0x0, []>;
+defm NotNaN : FPFastMathModeOperand<0x1, [Kernel]>;
+defm NotInf : FPFastMathModeOperand<0x2, [Kernel]>;
+defm NSZ : FPFastMathModeOperand<0x4, [Kernel]>;
+defm AllowRecip : FPFastMathModeOperand<0x8, [Kernel]>;
+defm Fast : FPFastMathModeOperand<0x10, [Kernel]>;
+
+//===----------------------------------------------------------------------===//
+// Multiclass used to define FPRoundingMode enum values and at the same time
+// SymbolicOperand entries with string mnemonics.
+//===----------------------------------------------------------------------===//
+
+def FPRoundingMode : GenericEnum, Operand<i32> {
+  let FilterClass = "FPRoundingMode";
+  let NameField = "Name";
+  let ValueField = "Value";
+  let PrintMethod = !strconcat("printSymbolicOperand<OperandCategory::", FilterClass, "Operand>");
+}
+
+class FPRoundingMode<string name, bits<32> value> {
+  string Name = name;
+  bits<32> Value = value;
+}
+
+multiclass FPRoundingModeOperand<bits<32> value> {
+  def NAME : FPRoundingMode<NAME, value>;
+  defm : SymbolicOperandWithRequirements<FPRoundingModeOperand, value, NAME, 0, 0, [], []>;
+}
+
+defm RTE : FPRoundingModeOperand<0>;
+defm RTZ : FPRoundingModeOperand<1>;
+defm RTP : FPRoundingModeOperand<2>;
+defm RTN : FPRoundingModeOperand<3>;
+
+//===----------------------------------------------------------------------===//
+// Multiclass used to define LinkageType enum values and at the same time
+// SymbolicOperand entries with string mnemonics and capabilities.
+//===----------------------------------------------------------------------===//
+
+def LinkageType : GenericEnum, Operand<i32> {
+  let FilterClass = "LinkageType";
+  let NameField = "Name";
+  let ValueField = "Value";
+  let PrintMethod = !strconcat("printSymbolicOperand<OperandCategory::", FilterClass, "Operand>");
+}
+
+class LinkageType<string name, bits<32> value> {
+  string Name = name;
+  bits<32> Value = value;
+}
+
+multiclass LinkageTypeOperand<bits<32> value, list<Capability> reqCapabilities> {
+  def : LinkageType<NAME, value>;
+  defm : SymbolicOperandWithRequirements<LinkageTypeOperand, value, NAME, 0, 0, [], reqCapabilities>;
+}
+
+defm Export : LinkageTypeOperand<0, [Linkage]>;
+defm Import : LinkageTypeOperand<1, [Linkage]>;
+
+//===----------------------------------------------------------------------===//
+// Multiclass used to define AccessQualifier enum values and at the same time
+// SymbolicOperand entries with string mnemonics and capabilities.
+//===----------------------------------------------------------------------===//
+
+def AccessQualifier : GenericEnum, Operand<i32> {
+  let FilterClass = "AccessQualifier";
+  let NameField = "Name";
+  let ValueField = "Value";
+  let PrintMethod = !strconcat("printSymbolicOperand<OperandCategory::", FilterClass, "Operand>");
+}
+
+class AccessQualifier<string name, bits<32> value> {
+  string Name = name;
+  bits<32> Value = value;
+}
+
+multiclass AccessQualifierOperand<bits<32> value, list<Capability> reqCapabilities> {
+  def NAME : AccessQualifier<NAME, value>;
+  defm : SymbolicOperandWithRequirements<AccessQualifierOperand, value, NAME, 0, 0, [], reqCapabilities>;
+}
+
+defm ReadOnly : AccessQualifierOperand<0, [Kernel]>;
+defm WriteOnly : AccessQualifierOperand<1, [Kernel]>;
+defm ReadWrite : AccessQualifierOperand<2, [Kernel]>;
+
+//===----------------------------------------------------------------------===//
+// Multiclass used to define FunctionParameterAttribute enum values and at the
+// same time SymbolicOperand entries with string mnemonics and capabilities.
+//===----------------------------------------------------------------------===//
+
+def FunctionParameterAttribute : GenericEnum, Operand<i32> {
+  let FilterClass = "FunctionParameterAttribute";
+  let NameField = "Name";
+  let ValueField = "Value";
+  let PrintMethod = !strconcat("printSymbolicOperand<OperandCategory::", FilterClass, "Operand>");
+}
+
+class FunctionParameterAttribute<string name, bits<32> value> {
+  string Name = name;
+  bits<32> Value = value;
+}
+
+multiclass FunctionParameterAttributeOperand<bits<32> value, list<Capability> reqCapabilities> {
+  def : FunctionParameterAttribute<NAME, value>;
+  defm : SymbolicOperandWithRequirements<FunctionParameterAttributeOperand, value, NAME, 0, 0, [], reqCapabilities>;
+}
+
+defm Zext : FunctionParameterAttributeOperand<0, [Kernel]>;
+defm Sext : FunctionParameterAttributeOperand<1, [Kernel]>;
+defm ByVal : FunctionParameterAttributeOperand<2, [Kernel]>;
+defm Sret : FunctionParameterAttributeOperand<3, [Kernel]>;
+defm NoAlias : FunctionParameterAttributeOperand<4, [Kernel]>;
+defm NoCapture : FunctionParameterAttributeOperand<5, [Kernel]>;
+defm NoWrite : FunctionParameterAttributeOperand<6, [Kernel]>;
+defm NoReadWrite : FunctionParameterAttributeOperand<7, [Kernel]>;
+
+//===----------------------------------------------------------------------===//
+// Multiclass used to define Decoration enum values and at the same time
+// SymbolicOperand entries with string mnemonics, versioning, extensions and
+// capabilities.
+//===----------------------------------------------------------------------===//
+
+def Decoration : GenericEnum, Operand<i32> {
+  let FilterClass = "Decoration";
+  let NameField = "Name";
+  let ValueField = "Value";
+  let PrintMethod = !strconcat("printSymbolicOperand<OperandCategory::", FilterClass, "Operand>");
+}
+
+class Decoration<string name, bits<32> value> {
+  string Name = name;
+  bits<32> Value = value;
+}
+
+multiclass DecorationOperand<bits<32> value, bits<32> minVersion, bits<32> maxVersion, list<Extension> reqExtensions, list<Capability> reqCapabilities> {
+  def : Decoration<NAME, value>;
+  defm : SymbolicOperandWithRequirements<DecorationOperand, value, NAME, minVersion, maxVersion, reqExtensions, reqCapabilities>;
+}
+
+defm RelaxedPrecision : DecorationOperand<0, 0, 0, [], [Shader]>;
+defm SpecId : DecorationOperand<1, 0, 0, [], [Shader, Kernel]>;
+defm Block : DecorationOperand<2, 0, 0, [], [Shader]>;
+defm BufferBlock : DecorationOperand<3, 0, 0, [], [Shader]>;
+defm RowMajor : DecorationOperand<4, 0, 0, [], [Matrix]>;
+defm ColMajor : DecorationOperand<5, 0, 0, [], [Matrix]>;
+defm ArrayStride : DecorationOperand<6, 0, 0, [], [Shader]>;
+defm MatrixStride : DecorationOperand<7, 0, 0, [], [Matrix]>;
+defm GLSLShared : DecorationOperand<8, 0, 0, [], [Shader]>;
+defm GLSLPacked : DecorationOperand<9, 0, 0, [], [Shader]>;
+defm CPacked : DecorationOperand<10, 0, 0, [], [Kernel]>;
+defm BuiltIn : DecorationOperand<11, 0, 0, [], []>;
+defm NoPerspective : DecorationOperand<13, 0, 0, [], [Shader]>;
+defm Flat : DecorationOperand<14, 0, 0, [], [Shader]>;
+defm Patch : DecorationOperand<15, 0, 0, [], [Tessellation]>;
+defm Centroid : DecorationOperand<16, 0, 0, [], [Shader]>;
+defm Sample : DecorationOperand<17, 0, 0, [], [SampleRateShading]>;
+defm Invariant : DecorationOperand<18, 0, 0, [], [Shader]>;
+defm Restrict : DecorationOperand<19, 0, 0, [], []>;
+defm Aliased : DecorationOperand<20, 0, 0, [], []>;
+defm Volatile : DecorationOperand<21, 0, 0, [], []>;
+defm Constant : DecorationOperand<22, 0, 0, [], [Kernel]>;
+defm Coherent : DecorationOperand<23, 0, 0, [], []>;
+defm NonWritable : DecorationOperand<24, 0, 0, [], []>;
+defm NonReadable : DecorationOperand<25, 0, 0, [], []>;
+defm Uniform : DecorationOperand<26, 0, 0, [], [Shader]>;
+defm UniformId : DecorationOperand<27, 0, 0, [], [Shader]>;
+defm SaturatedConversion : DecorationOperand<28, 0, 0, [], [Kernel]>;
+defm Stream : DecorationOperand<29, 0, 0, [], [GeometryStreams]>;
+defm Location : DecorationOperand<30, 0, 0, [], [Shader]>;
+defm Component : DecorationOperand<31, 0, 0, [], [Shader]>;
+defm Index : DecorationOperand<32, 0, 0, [], [Shader]>;
+defm Binding : DecorationOperand<33, 0, 0, [], [Shader]>;
+defm DescriptorSet : DecorationOperand<34, 0, 0, [], [Shader]>;
+defm Offset : DecorationOperand<35, 0, 0, [], [Shader]>;
+defm XfbBuffer : DecorationOperand<36, 0, 0, [], [TransformFeedback]>;
+defm XfbStride : DecorationOperand<37, 0, 0, [], [TransformFeedback]>;
+defm FuncParamAttr : DecorationOperand<38, 0, 0, [], [Kernel]>;
+defm FPRoundingMode : DecorationOperand<39, 0, 0, [], []>;
+defm FPFastMathMode : DecorationOperand<40, 0, 0, [], [Kernel]>;
+defm LinkageAttributes : DecorationOperand<41, 0, 0, [], [Linkage]>;
+defm NoContraction : DecorationOperand<42, 0, 0, [], [Shader]>;
+defm InputAttachmentIndex : DecorationOperand<43, 0, 0, [], [InputAttachment]>;
+defm Alignment : DecorationOperand<44, 0, 0, [], [Kernel]>;
+defm MaxByteOffset : DecorationOperand<45, 0, 0, [], [Addresses]>;
+defm AlignmentId : DecorationOperand<46, 0, 0, [], [Kernel]>;
+defm MaxByteOffsetId : DecorationOperand<47, 0, 0, [], [Addresses]>;
+defm NoSignedWrap : DecorationOperand<4469, 0x10400, 0, [SPV_KHR_no_integer_wrap_decoration], []>;
+defm NoUnsignedWrap : DecorationOperand<4470, 0x10400, 0, [SPV_KHR_no_integer_wrap_decoration], []>;
+defm ExplicitInterpAMD : DecorationOperand<4999, 0, 0, [], []>;
+defm OverrideCoverageNV : DecorationOperand<5248, 0, 0, [], [SampleMaskOverrideCoverageNV]>;
+defm PassthroughNV : DecorationOperand<5250, 0, 0, [], [GeometryShaderPassthroughNV]>;
+defm ViewportRelativeNV : DecorationOperand<5252, 0, 0, [], [ShaderViewportMaskNV]>;
+defm SecondaryViewportRelativeNV : DecorationOperand<5256, 0, 0, [], [ShaderStereoViewNV]>;
+defm PerPrimitiveNV : DecorationOperand<5271, 0, 0, [], [MeshShadingNV]>;
+defm PerViewNV : DecorationOperand<5272, 0, 0, [], [MeshShadingNV]>;
+defm PerVertexNV : DecorationOperand<5273, 0, 0, [], [FragmentBarycentricNV]>;
+defm NonUniformEXT : DecorationOperand<5300, 0, 0, [], [ShaderNonUniformEXT]>;
+defm CountBuffer : DecorationOperand<5634, 0, 0, [], []>;
+defm UserSemantic : DecorationOperand<5635, 0, 0, [], []>;
+defm RestrictPointerEXT : DecorationOperand<5355, 0, 0, [], [PhysicalStorageBufferAddressesEXT]>;
+defm AliasedPointerEXT : DecorationOperand<5356, 0, 0, [], [PhysicalStorageBufferAddressesEXT]>;
+
+//===----------------------------------------------------------------------===//
+// Multiclass used to define BuiltIn enum values and at the same time
+// SymbolicOperand entries with string mnemonics, versioning, extensions and
+// capabilities.
+//===----------------------------------------------------------------------===//
+
+def BuiltIn : GenericEnum, Operand<i32> {
+  let FilterClass = "BuiltIn";
+  let NameField = "Name";
+  let ValueField = "Value";
+  let PrintMethod = !strconcat("printSymbolicOperand<OperandCategory::", FilterClass, "Operand>");
+}
+
+class BuiltIn<string name, bits<32> value> {
+  string Name = name;
+  bits<32> Value = value;
+}
+
+multiclass BuiltInOperand<bits<32> value, bits<32> minVersion, bits<32> maxVersion, list<Extension> reqExtensions, list<Capability> reqCapabilities> {
+  def NAME : BuiltIn<NAME, value>;
+  defm : SymbolicOperandWithRequirements<BuiltInOperand, value, NAME, minVersion, maxVersion, reqExtensions, reqCapabilities>;
+}
+
+defm Position : BuiltInOperand<0, 0, 0, [], [Shader]>;
+defm PointSize : BuiltInOperand<1, 0, 0, [], [Shader]>;
+defm ClipDistanceVariable : BuiltInOperand<3, 0, 0, [], [ClipDistance]>;
+defm CullDistanceVariable : BuiltInOperand<4, 0, 0, [], [CullDistance]>;
+defm VertexId : BuiltInOperand<5, 0, 0, [], [Shader]>;
+defm InstanceId : BuiltInOperand<6, 0, 0, [], [Shader]>;
+defm PrimitiveId : BuiltInOperand<7, 0, 0, [], [Geometry, Tessellation, RayTracingNV]>;
+defm InvocationId : BuiltInOperand<8, 0, 0, [], [Geometry, Tessellation]>;
+defm Layer : BuiltInOperand<9, 0, 0, [], [Geometry]>;
+defm ViewportIndex : BuiltInOperand<10, 0, 0, [], [MultiViewport]>;
+defm TessLevelOuter : BuiltInOperand<11, 0, 0, [], [Tessellation]>;
+defm TessLevelInner : BuiltInOperand<12, 0, 0, [], [Tessellation]>;
+defm TessCoord : BuiltInOperand<13, 0, 0, [], [Tessellation]>;
+defm PatchVertices : BuiltInOperand<14, 0, 0, [], [Tessellation]>;
+defm FragCoord : BuiltInOperand<15, 0, 0, [], [Shader]>;
+defm PointCoord : BuiltInOperand<16, 0, 0, [], [Shader]>;
+defm FrontFacing : BuiltInOperand<17, 0, 0, [], [Shader]>;
+defm SampleId : BuiltInOperand<18, 0, 0, [], [SampleRateShading]>;
+defm SamplePosition : BuiltInOperand<19, 0, 0, [], [SampleRateShading]>;
+defm SampleMask : BuiltInOperand<20, 0, 0, [], [Shader]>;
+defm FragDepth : BuiltInOperand<22, 0, 0, [], [Shader]>;
+defm HelperInvocation : BuiltInOperand<23, 0, 0, [], [Shader]>;
+defm NumWorkgroups : BuiltInOperand<24, 0, 0, [], []>;
+defm WorkgroupSize : BuiltInOperand<25, 0, 0, [], []>;
+defm WorkgroupId : BuiltInOperand<26, 0, 0, [], []>;
+defm LocalInvocationId : BuiltInOperand<27, 0, 0, [], []>;
+defm GlobalInvocationId : BuiltInOperand<28, 0, 0, [], []>;
+defm LocalInvocationIndex : BuiltInOperand<29, 0, 0, [], []>;
+defm WorkDim : BuiltInOperand<30, 0, 0, [], [Kernel]>;
+defm GlobalSize : BuiltInOperand<31, 0, 0, [], [Kernel]>;
+defm EnqueuedWorkgroupSize : BuiltInOperand<32, 0, 0, [], [Kernel]>;
+defm GlobalOffset : BuiltInOperand<33, 0, 0, [], [Kernel]>;
+defm GlobalLinearId : BuiltInOperand<34, 0, 0, [], [Kernel]>;
+defm SubgroupSize : BuiltInOperand<36, 0, 0, [], [Kernel, GroupNonUniform, SubgroupBallotKHR]>;
+defm SubgroupMaxSize : BuiltInOperand<37, 0, 0, [], [Kernel]>;
+defm NumSubgroups : BuiltInOperand<38, 0, 0, [], [Kernel, GroupNonUniform]>;
+defm NumEnqueuedSubgroups : BuiltInOperand<39, 0, 0, [], [Kernel]>;
+defm SubgroupId : BuiltInOperand<40, 0, 0, [], [Kernel, GroupNonUniform]>;
+defm SubgroupLocalInvocationId : BuiltInOperand<41, 0, 0, [], [Kernel, GroupNonUniform, SubgroupBallotKHR]>;
+defm VertexIndex : BuiltInOperand<42, 0, 0, [], [Shader]>;
+defm InstanceIndex : BuiltInOperand<43, 0, 0, [], [Shader]>;
+defm SubgroupEqMask : BuiltInOperand<4416, 0, 0, [], [SubgroupBallotKHR, GroupNonUniformBallot]>;
+defm SubgroupGeMask : BuiltInOperand<4417, 0, 0, [], [SubgroupBallotKHR, GroupNonUniformBallot]>;
+defm SubgroupGtMask : BuiltInOperand<4418, 0, 0, [], [SubgroupBallotKHR, GroupNonUniformBallot]>;
+defm SubgroupLeMask : BuiltInOperand<4419, 0, 0, [], [SubgroupBallotKHR, GroupNonUniformBallot]>;
+defm SubgroupLtMask : BuiltInOperand<4420, 0, 0, [], [SubgroupBallotKHR, GroupNonUniformBallot]>;
+defm BaseVertex : BuiltInOperand<4424, 0, 0, [], [DrawParameters]>;
+defm BaseInstance : BuiltInOperand<4425, 0, 0, [], [DrawParameters]>;
+defm DrawIndex : BuiltInOperand<4426, 0, 0, [], [DrawParameters, MeshShadingNV]>;
+defm DeviceIndex : BuiltInOperand<4438, 0, 0, [], [DeviceGroup]>;
+defm ViewIndex : BuiltInOperand<4440, 0, 0, [], [MultiView]>;
+defm BaryCoordNoPerspAMD : BuiltInOperand<4492, 0, 0, [], []>;
+defm BaryCoordNoPerspCentroidAMD : BuiltInOperand<4493, 0, 0, [], []>;
+defm BaryCoordNoPerspSampleAMD : BuiltInOperand<4494, 0, 0, [], []>;
+defm BaryCoordSmoothAMD : BuiltInOperand<4495, 0, 0, [], []>;
+defm BaryCoordSmoothCentroid : BuiltInOperand<4496, 0, 0, [], []>;
+defm BaryCoordSmoothSample : BuiltInOperand<4497, 0, 0, [], []>;
+defm BaryCoordPullModel : BuiltInOperand<4498, 0, 0, [], []>;
+defm FragStencilRefEXT : BuiltInOperand<5014, 0, 0, [], [StencilExportEXT]>;
+defm ViewportMaskNV : BuiltInOperand<5253, 0, 0, [], [ShaderViewportMaskNV, MeshShadingNV]>;
+defm SecondaryPositionNV : BuiltInOperand<5257, 0, 0, [], [ShaderStereoViewNV]>;
+defm SecondaryViewportMaskNV : BuiltInOperand<5258, 0, 0, [], [ShaderStereoViewNV]>;
+defm PositionPerViewNV : BuiltInOperand<5261, 0, 0, [], [PerViewAttributesNV, MeshShadingNV]>;
+defm ViewportMaskPerViewNV : BuiltInOperand<5262, 0, 0, [], [PerViewAttributesNV, MeshShadingNV]>;
+defm FullyCoveredEXT : BuiltInOperand<5264, 0, 0, [], [FragmentFullyCoveredEXT]>;
+defm TaskCountNV : BuiltInOperand<5274, 0, 0, [], [MeshShadingNV]>;
+defm PrimitiveCountNV : BuiltInOperand<5275, 0, 0, [], [MeshShadingNV]>;
+defm PrimitiveIndicesNV : BuiltInOperand<5276, 0, 0, [], [MeshShadingNV]>;
+defm ClipDistancePerViewNV : BuiltInOperand<5277, 0, 0, [], [MeshShadingNV]>;
+defm CullDistancePerViewNV : BuiltInOperand<5278, 0, 0, [], [MeshShadingNV]>;
+defm LayerPerViewNV : BuiltInOperand<5279, 0, 0, [], [MeshShadingNV]>;
+defm MeshViewCountNV : BuiltInOperand<5280, 0, 0, [], [MeshShadingNV]>;
+defm MeshViewIndices : BuiltInOperand<5281, 0, 0, [], [MeshShadingNV]>;
+defm BaryCoordNV : BuiltInOperand<5286, 0, 0, [], [FragmentBarycentricNV]>;
+defm BaryCoordNoPerspNV : BuiltInOperand<5287, 0, 0, [], [FragmentBarycentricNV]>;
+defm FragSizeEXT : BuiltInOperand<5292, 0, 0, [], [FragmentDensityEXT]>;
+defm FragInvocationCountEXT : BuiltInOperand<5293, 0, 0, [], [FragmentDensityEXT]>;
+defm LaunchIdNV : BuiltInOperand<5319, 0, 0, [], [RayTracingNV]>;
+defm LaunchSizeNV : BuiltInOperand<5320, 0, 0, [], [RayTracingNV]>;
+defm WorldRayOriginNV : BuiltInOperand<5321, 0, 0, [], [RayTracingNV]>;
+defm WorldRayDirectionNV : BuiltInOperand<5322, 0, 0, [], [RayTracingNV]>;
+defm ObjectRayOriginNV : BuiltInOperand<5323, 0, 0, [], [RayTracingNV]>;
+defm ObjectRayDirectionNV : BuiltInOperand<5324, 0, 0, [], [RayTracingNV]>;
+defm RayTminNV : BuiltInOperand<5325, 0, 0, [], [RayTracingNV]>;
+defm RayTmaxNV : BuiltInOperand<5326, 0, 0, [], [RayTracingNV]>;
+defm InstanceCustomIndexNV : BuiltInOperand<5327, 0, 0, [], [RayTracingNV]>;
+defm ObjectToWorldNV : BuiltInOperand<5330, 0, 0, [], [RayTracingNV]>;
+defm WorldToObjectNV : BuiltInOperand<5331, 0, 0, [], [RayTracingNV]>;
+defm HitTNV : BuiltInOperand<5332, 0, 0, [], [RayTracingNV]>;
+defm HitKindNV : BuiltInOperand<5333, 0, 0, [], [RayTracingNV]>;
+defm IncomingRayFlagsNV : BuiltInOperand<5351, 0, 0, [], [RayTracingNV]>;
+
+//===----------------------------------------------------------------------===//
+// Multiclass used to define SelectionControl enum values and at the same time
+// SymbolicOperand entries with string mnemonics.
+//===----------------------------------------------------------------------===//
+
+def SelectionControl : GenericEnum, Operand<i32> {
+  let FilterClass = "SelectionControl";
+  let NameField = "Name";
+  let ValueField = "Value";
+  let PrintMethod = !strconcat("printSymbolicOperand<OperandCategory::", FilterClass, "Operand>");
+}
+
+class SelectionControl<string name, bits<32> value> {
+  string Name = name;
+  bits<32> Value = value;
+}
+
+multiclass SelectionControlOperand<bits<32> value> {
+  def : SelectionControl<NAME, value>;
+  defm : SymbolicOperandWithRequirements<SelectionControlOperand, value, NAME, 0, 0, [], []>;
+}
+
+defm None : SelectionControlOperand<0x0>;
+defm Flatten : SelectionControlOperand<0x1>;
+defm DontFlatten : SelectionControlOperand<0x2>;
+
+//===----------------------------------------------------------------------===//
+// Multiclass used to define LoopControl enum values and at the same time
+// SymbolicOperand entries with string mnemonics.
+//===----------------------------------------------------------------------===//
+
+def LoopControl : GenericEnum, Operand<i32> {
+  let FilterClass = "LoopControl";
+  let NameField = "Name";
+  let ValueField = "Value";
+  let PrintMethod = !strconcat("printSymbolicOperand<OperandCategory::", FilterClass, "Operand>");
+}
+
+class LoopControl<string name, bits<32> value> {
+  string Name = name;
+  bits<32> Value = value;
+}
+
+multiclass LoopControlOperand<bits<32> value> {
+  def : LoopControl<NAME, value>;
+  defm : SymbolicOperandWithRequirements<LoopControlOperand, value, NAME, 0, 0, [], []>;
+}
+
+defm None : LoopControlOperand<0x0>;
+defm Unroll : LoopControlOperand<0x1>;
+defm DontUnroll : LoopControlOperand<0x2>;
+defm DependencyInfinite : LoopControlOperand<0x4>;
+defm DependencyLength : LoopControlOperand<0x8>;
+defm MinIterations : LoopControlOperand<0x10>;
+defm MaxIterations : LoopControlOperand<0x20>;
+defm IterationMultiple : LoopControlOperand<0x40>;
+defm PeelCount : LoopControlOperand<0x80>;
+defm PartialCount : LoopControlOperand<0x100>;
+
+//===----------------------------------------------------------------------===//
+// Multiclass used to define FunctionControl enum values and at the same time
+// SymbolicOperand entries with string mnemonics.
+//===----------------------------------------------------------------------===//
+
+def FunctionControl : GenericEnum, Operand<i32> {
+  let FilterClass = "FunctionControl";
+  let NameField = "Name";
+  let ValueField = "Value";
+  let PrintMethod = !strconcat("printSymbolicOperand<OperandCategory::", FilterClass, "Operand>");
+}
+
+class FunctionControl<string name, bits<32> value> {
+  string Name = name;
+  bits<32> Value = value;
+}
+
+multiclass FunctionControlOperand<bits<32> value> {
+  def : FunctionControl<NAME, value>;
+  defm : SymbolicOperandWithRequirements<FunctionControlOperand, value, NAME, 0, 0, [], []>;
+}
+
+defm None : FunctionControlOperand<0x0>;
+defm Inline : FunctionControlOperand<0x1>;
+defm DontInline : FunctionControlOperand<0x2>;
+defm Pure : FunctionControlOperand<0x4>;
+defm Const : FunctionControlOperand<0x8>;
+
+//===----------------------------------------------------------------------===//
+// Multiclass used to define MemorySemantics enum values and at the same time
+// SymbolicOperand entries with string mnemonics, versioning, extensions and
+// capabilities.
+//===----------------------------------------------------------------------===//
+
+def MemorySemantics : GenericEnum, Operand<i32> {
+  let FilterClass = "MemorySemantics";
+  let NameField = "Name";
+  let ValueField = "Value";
+  let PrintMethod = !strconcat("printSymbolicOperand<OperandCategory::", FilterClass, "Operand>");
+}
+
+class MemorySemantics<string name, bits<32> value> {
+  string Name = name;
+  bits<32> Value = value;
+}
+
+multiclass MemorySemanticsOperand<bits<32> value, bits<32> minVersion, bits<32> maxVersion, list<Extension> reqExtensions, list<Capability> reqCapabilities> {
+  def : MemorySemantics<NAME, value>;
+  defm : SymbolicOperandWithRequirements<MemorySemanticsOperand, value, NAME, minVersion, maxVersion, reqExtensions, reqCapabilities>;
+}
+
+defm None : MemorySemanticsOperand<0x0, 0, 0, [], []>;
+defm Acquire : MemorySemanticsOperand<0x2, 0, 0, [], []>;
+defm Release : MemorySemanticsOperand<0x4, 0, 0, [], []>;
+defm AcquireRelease : MemorySemanticsOperand<0x8, 0, 0, [], []>;
+defm SequentiallyConsistent : MemorySemanticsOperand<0x10, 0, 0, [], []>;
+defm UniformMemory : MemorySemanticsOperand<0x40, 0, 0, [], [Shader]>;
+defm SubgroupMemory : MemorySemanticsOperand<0x80, 0, 0, [], []>;
+defm WorkgroupMemory : MemorySemanticsOperand<0x100, 0, 0, [], []>;
+defm CrossWorkgroupMemory : MemorySemanticsOperand<0x200, 0, 0, [], []>;
+defm AtomicCounterMemory : MemorySemanticsOperand<0x400, 0, 0, [], [AtomicStorage]>;
+defm ImageMemory : MemorySemanticsOperand<0x800, 0, 0, [], []>;
+defm OutputMemoryKHR : MemorySemanticsOperand<0x1000, 0, 0, [], [VulkanMemoryModelKHR]>;
+defm MakeAvailableKHR : MemorySemanticsOperand<0x2000, 0, 0, [], [VulkanMemoryModelKHR]>;
+defm MakeVisibleKHR : MemorySemanticsOperand<0x4000, 0, 0, [], [VulkanMemoryModelKHR]>;
+
+//===----------------------------------------------------------------------===//
+// Multiclass used to define MemoryOperand enum values and at the same time
+// SymbolicOperand entries with string mnemonics, versioning, extensions and
+// capabilities.
+//===----------------------------------------------------------------------===//
+
+def MemoryOperand : GenericEnum, Operand<i32> {
+  let FilterClass = "MemoryOperand";
+  let NameField = "Name";
+  let ValueField = "Value";
+  let PrintMethod = !strconcat("printSymbolicOperand<OperandCategory::", FilterClass, "Operand>");
+}
+
+class MemoryOperand<string name, bits<32> value> {
+  string Name = name;
+  bits<32> Value = value;
+}
+
+multiclass MemoryOperandOperand<bits<32> value, bits<32> minVersion, bits<32> maxVersion, list<Extension> reqExtensions, list<Capability> reqCapabilities> {
+  def : MemoryOperand<NAME, value>;
+  defm : SymbolicOperandWithRequirements<MemoryOperandOperand, value, NAME, minVersion, maxVersion, reqExtensions, reqCapabilities>;
+}
+
+defm None : MemoryOperandOperand<0x0, 0, 0, [], []>;
+defm Volatile : MemoryOperandOperand<0x1, 0, 0, [], []>;
+defm Aligned : MemoryOperandOperand<0x2, 0, 0, [], []>;
+defm Nontemporal : MemoryOperandOperand<0x4, 0, 0, [], []>;
+defm MakePointerAvailableKHR : MemoryOperandOperand<0x8, 0, 0, [], [VulkanMemoryModelKHR]>;
+defm MakePointerVisibleKHR : MemoryOperandOperand<0x10, 0, 0, [], [VulkanMemoryModelKHR]>;
+defm NonPrivatePointerKHR : MemoryOperandOperand<0x20, 0, 0, [], [VulkanMemoryModelKHR]>;
+
+//===----------------------------------------------------------------------===//
+// Multiclass used to define Scope enum values and at the same time
+// SymbolicOperand entries with string mnemonics, versioning, extensions and
+// capabilities.
+//===----------------------------------------------------------------------===//
+
+def Scope : GenericEnum, Operand<i32> {
+  let FilterClass = "Scope";
+  let NameField = "Name";
+  let ValueField = "Value";
+  let PrintMethod = !strconcat("printSymbolicOperand<OperandCategory::", FilterClass, "Operand>");
+}
+
+class Scope<string name, bits<32> value> {
+  string Name = name;
+  bits<32> Value = value;
+}
+
+multiclass ScopeOperand<bits<32> value, bits<32> minVersion, bits<32> maxVersion, list<Extension> reqExtensions, list<Capability> reqCapabilities> {
+  def : Scope<NAME, value>;
+  defm : SymbolicOperandWithRequirements<ScopeOperand, value, NAME, minVersion, maxVersion, reqExtensions, reqCapabilities>;
+}
+
+defm CrossDevice : ScopeOperand<0, 0, 0, [], []>;
+defm Device : ScopeOperand<1, 0, 0, [], []>;
+defm Workgroup : ScopeOperand<2, 0, 0, [], []>;
+defm Subgroup : ScopeOperand<3, 0, 0, [], []>;
+defm Invocation : ScopeOperand<4, 0, 0, [], []>;
+defm QueueFamilyKHR : ScopeOperand<5, 0, 0, [], [VulkanMemoryModelKHR]>;
+
+//===----------------------------------------------------------------------===//
+// Multiclass used to define GroupOperation enum values and at the same time
+// SymbolicOperand entries with string mnemonics, versioning, extensions and
+// capabilities.
+//===----------------------------------------------------------------------===//
+
+def GroupOperation : GenericEnum, Operand<i32> {
+  let FilterClass = "GroupOperation";
+  let NameField = "Name";
+  let ValueField = "Value";
+  let PrintMethod = !strconcat("printSymbolicOperand<OperandCategory::", FilterClass, "Operand>");
+}
+
+class GroupOperation<string name, bits<32> value> {
+  string Name = name;
+  bits<32> Value = value;
+}
+
+multiclass GroupOperationOperand<bits<32> value, bits<32> minVersion, bits<32> maxVersion, list<Extension> reqExtensions, list<Capability> reqCapabilities> {
+  def NAME : GroupOperation<NAME, value>;
+  defm : SymbolicOperandWithRequirements<GroupOperationOperand, value, NAME, minVersion, maxVersion, reqExtensions, reqCapabilities>;
+}
+
+defm Reduce : GroupOperationOperand<0, 0, 0, [], [Kernel, GroupNonUniformArithmetic, GroupNonUniformBallot]>;
+defm InclusiveScan : GroupOperationOperand<1, 0, 0, [], [Kernel, GroupNonUniformArithmetic, GroupNonUniformBallot]>;
+defm ExclusiveScan : GroupOperationOperand<2, 0, 0, [], [Kernel, GroupNonUniformArithmetic, GroupNonUniformBallot]>;
+defm ClusteredReduce : GroupOperationOperand<3, 0, 0, [], [GroupNonUniformClustered]>;
+defm PartitionedReduceNV : GroupOperationOperand<6, 0, 0, [], [GroupNonUniformPartitionedNV]>;
+defm PartitionedInclusiveScanNV : GroupOperationOperand<7, 0, 0, [], [GroupNonUniformPartitionedNV]>;
+defm PartitionedExclusiveScanNV : GroupOperationOperand<8, 0, 0, [], [GroupNonUniformPartitionedNV]>;
+
+//===----------------------------------------------------------------------===//
+// Multiclass used to define KernelEnqueueFlags enum values and at the same time
+// SymbolicOperand entries with string mnemonics, versioning, extensions and
+// capabilities.
+//===----------------------------------------------------------------------===//
+
+def KernelEnqueueFlags : GenericEnum, Operand<i32> {
+  let FilterClass = "KernelEnqueueFlags";
+  let NameField = "Name";
+  let ValueField = "Value";
+  let PrintMethod = !strconcat("printSymbolicOperand<OperandCategory::", FilterClass, "Operand>");
+}
+
+class KernelEnqueueFlags<string name, bits<32> value> {
+  string Name = name;
+  bits<32> Value = value;
+}
+
+multiclass KernelEnqueueFlagsOperand<bits<32> value, bits<32> minVersion, bits<32> maxVersion, list<Extension> reqExtensions, list<Capability> reqCapabilities> {
+  def : KernelEnqueueFlags<NAME, value>;
+  defm : SymbolicOperandWithRequirements<KernelEnqueueFlagsOperand, value, NAME, minVersion, maxVersion, reqExtensions, reqCapabilities>;
+}
+
+defm NoWait : KernelEnqueueFlagsOperand<0, 0, 0, [], [Kernel]>;
+defm WaitKernel : KernelEnqueueFlagsOperand<1, 0, 0, [], [Kernel]>;
+defm WaitWorkGroup : KernelEnqueueFlagsOperand<2, 0, 0, [], [Kernel]>;
+
+//===----------------------------------------------------------------------===//
+// Multiclass used to define KernelProfilingInfo enum values and at the same time
+// SymbolicOperand entries with string mnemonics, versioning, extensions and
+// capabilities.
+//===----------------------------------------------------------------------===//
+
+def KernelProfilingInfo : GenericEnum, Operand<i32> {
+  let FilterClass = "KernelProfilingInfo";
+  let NameField = "Name";
+  let ValueField = "Value";
+  let PrintMethod = !strconcat("printSymbolicOperand<OperandCategory::", FilterClass, "Operand>");
+}
+
+class KernelProfilingInfo<string name, bits<32> value> {
+  string Name = name;
+  bits<32> Value = value;
+}
+
+multiclass KernelProfilingInfoOperand<bits<32> value, bits<32> minVersion, bits<32> maxVersion, list<Extension> reqExtensions, list<Capability> reqCapabilities> {
+  def : KernelProfilingInfo<NAME, value>;
+  defm : SymbolicOperandWithRequirements<KernelProfilingInfoOperand, value, NAME, minVersion, maxVersion, reqExtensions, reqCapabilities>;
+}
+
+defm None : KernelProfilingInfoOperand<0x0, 0, 0, [], []>;
+defm CmdExecTime : KernelProfilingInfoOperand<0x1, 0, 0, [], [Kernel]>;
+
+//===----------------------------------------------------------------------===//
+// Multiclass used to define Opcode enum values and at the same time
+// SymbolicOperand entries with string mnemonics and capabilities.
+//===----------------------------------------------------------------------===//
+
+def Opcode : GenericEnum, Operand<i32> {
+  let FilterClass = "Opcode";
+  let NameField = "Name";
+  let ValueField = "Value";
+  let PrintMethod = !strconcat("printSymbolicOperand<OperandCategory::", FilterClass, "Operand>");
+}
+
+class Opcode<string name, bits<32> value> {
+  string Name = name;
+  bits<32> Value = value;
+}
+
+multiclass OpcodeOperand<bits<32> value> {
+  def : Opcode<NAME, value>;
+  defm : SymbolicOperandWithRequirements<OpcodeOperand, value, NAME, 0, 0, [], []>;
+}
+// TODO: implement other mnemonics.
+defm InBoundsPtrAccessChain : OpcodeOperand<70>;
+defm PtrCastToGeneric : OpcodeOperand<121>;

diff  --git a/llvm/lib/Target/SPIRV/SPIRVUtils.cpp b/llvm/lib/Target/SPIRV/SPIRVUtils.cpp
index 15671ef3e512a..304a23ca9bfd1 100644
--- a/llvm/lib/Target/SPIRV/SPIRVUtils.cpp
+++ b/llvm/lib/Target/SPIRV/SPIRVUtils.cpp
@@ -20,7 +20,7 @@
 #include "llvm/CodeGen/MachineInstrBuilder.h"
 #include "llvm/IR/IntrinsicsSPIRV.h"
 
-using namespace llvm;
+namespace llvm {
 
 // The following functions are used to add these string literals as a series of
 // 32-bit integer operands with the correct format, and unpack them if necessary
@@ -114,7 +114,7 @@ static void finishBuildOpDecorate(MachineInstrBuilder &MIB,
 }
 
 void buildOpDecorate(Register Reg, MachineIRBuilder &MIRBuilder,
-                     llvm::SPIRV::Decoration Dec,
+                     SPIRV::Decoration::Decoration Dec,
                      const std::vector<uint32_t> &DecArgs, StringRef StrImm) {
   auto MIB = MIRBuilder.buildInstr(SPIRV::OpDecorate)
                  .addUse(Reg)
@@ -123,7 +123,7 @@ void buildOpDecorate(Register Reg, MachineIRBuilder &MIRBuilder,
 }
 
 void buildOpDecorate(Register Reg, MachineInstr &I, const SPIRVInstrInfo &TII,
-                     llvm::SPIRV::Decoration Dec,
+                     SPIRV::Decoration::Decoration Dec,
                      const std::vector<uint32_t> &DecArgs, StringRef StrImm) {
   MachineBasicBlock &MBB = *I.getParent();
   auto MIB = BuildMI(MBB, I, I.getDebugLoc(), TII.get(SPIRV::OpDecorate))
@@ -134,7 +134,7 @@ void buildOpDecorate(Register Reg, MachineInstr &I, const SPIRVInstrInfo &TII,
 
 // TODO: maybe the following two functions should be handled in the subtarget
 // to allow for 
diff erent OpenCL vs Vulkan handling.
-unsigned storageClassToAddressSpace(SPIRV::StorageClass SC) {
+unsigned storageClassToAddressSpace(SPIRV::StorageClass::StorageClass SC) {
   switch (SC) {
   case SPIRV::StorageClass::Function:
     return 0;
@@ -153,7 +153,8 @@ unsigned storageClassToAddressSpace(SPIRV::StorageClass SC) {
   }
 }
 
-SPIRV::StorageClass addressSpaceToStorageClass(unsigned AddrSpace) {
+SPIRV::StorageClass::StorageClass
+addressSpaceToStorageClass(unsigned AddrSpace) {
   switch (AddrSpace) {
   case 0:
     return SPIRV::StorageClass::Function;
@@ -172,7 +173,8 @@ SPIRV::StorageClass addressSpaceToStorageClass(unsigned AddrSpace) {
   }
 }
 
-SPIRV::MemorySemantics getMemSemanticsForStorageClass(SPIRV::StorageClass SC) {
+SPIRV::MemorySemantics::MemorySemantics
+getMemSemanticsForStorageClass(SPIRV::StorageClass::StorageClass SC) {
   switch (SC) {
   case SPIRV::StorageClass::StorageBuffer:
   case SPIRV::StorageClass::Uniform:
@@ -190,7 +192,7 @@ SPIRV::MemorySemantics getMemSemanticsForStorageClass(SPIRV::StorageClass SC) {
   }
 }
 
-SPIRV::MemorySemantics getMemSemantics(AtomicOrdering Ord) {
+SPIRV::MemorySemantics::MemorySemantics getMemSemantics(AtomicOrdering Ord) {
   switch (Ord) {
   case AtomicOrdering::Acquire:
     return SPIRV::MemorySemantics::Acquire;
@@ -236,3 +238,4 @@ bool isSpvIntrinsic(MachineInstr &MI, Intrinsic::ID IntrinsicID) {
 Type *getMDOperandAsType(const MDNode *N, unsigned I) {
   return cast<ValueAsMetadata>(N->getOperand(I))->getType();
 }
+} // namespace llvm

diff  --git a/llvm/lib/Target/SPIRV/SPIRVUtils.h b/llvm/lib/Target/SPIRV/SPIRVUtils.h
index 35e24b0765708..ce7d1c0e0bcfe 100644
--- a/llvm/lib/Target/SPIRV/SPIRVUtils.h
+++ b/llvm/lib/Target/SPIRV/SPIRVUtils.h
@@ -27,63 +27,61 @@ class MachineRegisterInfo;
 class Register;
 class StringRef;
 class SPIRVInstrInfo;
-} // namespace llvm
 
 // Add the given string as a series of integer operand, inserting null
 // terminators and padding to make sure the operands all have 32-bit
 // little-endian words.
-void addStringImm(const llvm::StringRef &Str, llvm::MCInst &Inst);
-void addStringImm(const llvm::StringRef &Str, llvm::MachineInstrBuilder &MIB);
-void addStringImm(const llvm::StringRef &Str, llvm::IRBuilder<> &B,
-                  std::vector<llvm::Value *> &Args);
+void addStringImm(const StringRef &Str, MCInst &Inst);
+void addStringImm(const StringRef &Str, MachineInstrBuilder &MIB);
+void addStringImm(const StringRef &Str, IRBuilder<> &B,
+                  std::vector<Value *> &Args);
 
 // Read the series of integer operands back as a null-terminated string using
 // the reverse of the logic in addStringImm.
-std::string getStringImm(const llvm::MachineInstr &MI, unsigned StartIndex);
+std::string getStringImm(const MachineInstr &MI, unsigned StartIndex);
 
 // Add the given numerical immediate to MIB.
-void addNumImm(const llvm::APInt &Imm, llvm::MachineInstrBuilder &MIB);
+void addNumImm(const APInt &Imm, MachineInstrBuilder &MIB);
 
 // Add an OpName instruction for the given target register.
-void buildOpName(llvm::Register Target, const llvm::StringRef &Name,
-                 llvm::MachineIRBuilder &MIRBuilder);
+void buildOpName(Register Target, const StringRef &Name,
+                 MachineIRBuilder &MIRBuilder);
 
 // Add an OpDecorate instruction for the given Reg.
-void buildOpDecorate(llvm::Register Reg, llvm::MachineIRBuilder &MIRBuilder,
-                     llvm::SPIRV::Decoration Dec,
+void buildOpDecorate(Register Reg, MachineIRBuilder &MIRBuilder,
+                     SPIRV::Decoration::Decoration Dec,
                      const std::vector<uint32_t> &DecArgs,
-                     llvm::StringRef StrImm = "");
-void buildOpDecorate(llvm::Register Reg, llvm::MachineInstr &I,
-                     const llvm::SPIRVInstrInfo &TII,
-                     llvm::SPIRV::Decoration Dec,
+                     StringRef StrImm = "");
+void buildOpDecorate(Register Reg, MachineInstr &I, const SPIRVInstrInfo &TII,
+                     SPIRV::Decoration::Decoration Dec,
                      const std::vector<uint32_t> &DecArgs,
-                     llvm::StringRef StrImm = "");
+                     StringRef StrImm = "");
 
 // Convert a SPIR-V storage class to the corresponding LLVM IR address space.
-unsigned storageClassToAddressSpace(llvm::SPIRV::StorageClass SC);
+unsigned storageClassToAddressSpace(SPIRV::StorageClass::StorageClass SC);
 
 // Convert an LLVM IR address space to a SPIR-V storage class.
-llvm::SPIRV::StorageClass addressSpaceToStorageClass(unsigned AddrSpace);
+SPIRV::StorageClass::StorageClass
+addressSpaceToStorageClass(unsigned AddrSpace);
 
-llvm::SPIRV::MemorySemantics
-getMemSemanticsForStorageClass(llvm::SPIRV::StorageClass SC);
+SPIRV::MemorySemantics::MemorySemantics
+getMemSemanticsForStorageClass(SPIRV::StorageClass::StorageClass SC);
 
-llvm::SPIRV::MemorySemantics getMemSemantics(llvm::AtomicOrdering Ord);
+SPIRV::MemorySemantics::MemorySemantics getMemSemantics(AtomicOrdering Ord);
 
 // Find def instruction for the given ConstReg, walking through
 // spv_track_constant and ASSIGN_TYPE instructions. Updates ConstReg by def
 // of OpConstant instruction.
-llvm::MachineInstr *
-getDefInstrMaybeConstant(llvm::Register &ConstReg,
-                         const llvm::MachineRegisterInfo *MRI);
+MachineInstr *getDefInstrMaybeConstant(Register &ConstReg,
+                                       const MachineRegisterInfo *MRI);
 
 // Get constant integer value of the given ConstReg.
-uint64_t getIConstVal(llvm::Register ConstReg,
-                      const llvm::MachineRegisterInfo *MRI);
+uint64_t getIConstVal(Register ConstReg, const MachineRegisterInfo *MRI);
 
 // Check if MI is a SPIR-V specific intrinsic call.
-bool isSpvIntrinsic(llvm::MachineInstr &MI, llvm::Intrinsic::ID IntrinsicID);
+bool isSpvIntrinsic(MachineInstr &MI, Intrinsic::ID IntrinsicID);
 
 // Get type of i-th operand of the metadata node.
-llvm::Type *getMDOperandAsType(const llvm::MDNode *N, unsigned I);
+Type *getMDOperandAsType(const MDNode *N, unsigned I);
+} // namespace llvm
 #endif // LLVM_LIB_TARGET_SPIRV_SPIRVUTILS_H


        


More information about the llvm-commits mailing list