Revert "Merge remote-tracking branch 'aosp/upstream-main' into u..."ndk-r26dndk-r26cndk-r26bndk-r26-rc1ndk-r26-beta1ndk-r26ndk-r27-releasendk-r26-releasemaster-ndk

Revert submission 2388945-update-shaderc

Reason for revert: Breaks NDK build on darwin.

Reverted changes: /q/submissionid:2388945-update-shaderc

Change-Id: Ic13076f833683ce9c351c48ab39b479a5b283455

14 files changed, 21 insertions, 1255 deletions

diff --git a/include/spirv/spir-v.xml b/include/spirv/spir-v.xml
index 642fdf3..dad141b 100644
--- a/include/spirv/spir-v.xml
+++ b/include/spirv/spir-v.xml
@@ -62,7 +62,7 @@
         <id value="9"   vendor="Qualcomm"   comment="Contact weifengz@qti.qualcomm.com"/>
         <id value="10"  vendor="AMD"        comment="Contact Daniel Rakos, daniel.rakos@amd.com"/>
         <id value="11"  vendor="Intel"      comment="Contact Alexey, alexey.bader@intel.com"/>
-        <id value="12"  vendor="Imagination" comment="Contact Stephen Clarke, stephen.clarke@imgtec.com"/>
+        <id value="12"  vendor="Imagination" comment="Contact James Jones"/>
         <id value="13"  vendor="Google" tool="Shaderc over Glslang" comment="Contact David Neto, dneto@google.com"/>
         <id value="14"  vendor="Google" tool="spiregg" comment="Contact Lei Zhang, antiagainst@google.com"/>
         <id value="15"  vendor="Google" tool="rspirv" comment="Contact Lei Zhang, antiagainst@gmail.com"/>
@@ -86,8 +86,7 @@
         <id value="33"  vendor="DragonJoker" tool="ShaderWriter" comment="Contact Sylvain Doremus, https://github.com/DragonJoker/ShaderWriter"/>
         <id value="34"  vendor="Rayan Hatout" tool="SPIRVSmith" comment="Contact Rayan Hatout rayan.hatout@gmail.com, Repo https://github.com/rayanht/SPIRVSmith"/>
         <id value="35"  vendor="Saarland University" tool="Shady" comment="Contact Hugo Devillers devillers@uni-saarland.de, Repo https://github.com/Hugobros3/shady"/>
-        <id value="36"  vendor="Taichi Graphics" tool="Taichi" comment="Contact Rendong Liang rendongliang@taichi.graphics, Repo https://github.com/taichi-dev/taichi"/>
-        <unused start="37" end="0xFFFF" comment="Tool ID range reservable for future use by vendors"/>
+        <unused start="36" end="0xFFFF" comment="Tool ID range reservable for future use by vendors"/>
     </ids>
 
     <!-- SECTION: SPIR-V Opcodes and Enumerants -->
diff --git a/include/spirv/unified1/NonSemanticClspvReflection.h b/include/spirv/unified1/NonSemanticClspvReflection.h
index 1a31549..0cdf29d 100644
--- a/include/spirv/unified1/NonSemanticClspvReflection.h
+++ b/include/spirv/unified1/NonSemanticClspvReflection.h
@@ -33,7 +33,7 @@ extern "C" {
 #endif
 
 enum {
-    NonSemanticClspvReflectionRevision = 5,
+    NonSemanticClspvReflectionRevision = 4,
     NonSemanticClspvReflectionRevision_BitWidthPadding = 0x7fffffff
 };
 
@@ -73,22 +73,10 @@ enum NonSemanticClspvReflectionInstructions {
     NonSemanticClspvReflectionImageArgumentInfoChannelDataTypeUniform = 33,
     NonSemanticClspvReflectionArgumentStorageTexelBuffer = 34,
     NonSemanticClspvReflectionArgumentUniformTexelBuffer = 35,
-    NonSemanticClspvReflectionConstantDataPointerPushConstant = 36,
-    NonSemanticClspvReflectionProgramScopeVariablePointerPushConstant = 37,
-    NonSemanticClspvReflectionPrintfInfo = 38,
-    NonSemanticClspvReflectionPrintfBufferStorageBuffer = 39,
-    NonSemanticClspvReflectionPrintfBufferPointerPushConstant = 40,
     NonSemanticClspvReflectionInstructionsMax = 0x7fffffff
 };
 
 
-enum NonSemanticClspvReflectionKernelPropertyFlags {
-    NonSemanticClspvReflectionNone = 0x0,
-    NonSemanticClspvReflectionMayUsePrintf = 0x1,
-    NonSemanticClspvReflectionKernelPropertyFlagsMax = 0x7fffffff
-};
-
-
 #ifdef __cplusplus
 }
 #endif
diff --git a/include/spirv/unified1/extinst.nonsemantic.clspvreflection.grammar.json b/include/spirv/unified1/extinst.nonsemantic.clspvreflection.grammar.json
index d6499cc..b5a6637 100644
--- a/include/spirv/unified1/extinst.nonsemantic.clspvreflection.grammar.json
+++ b/include/spirv/unified1/extinst.nonsemantic.clspvreflection.grammar.json
@@ -1,15 +1,12 @@
 {
-  "revision" : 5,
+  "revision" : 4,
   "instructions" : [
     {
       "opname" : "Kernel",
       "opcode" : 1,
       "operands" : [
         { "kind" : "IdRef", "name" : "Kernel" },
-        { "kind" : "IdRef", "name" : "Name" },
-        { "kind" : "IdRef", "name" : "NumArguments", "quantifier" : "?" },
-        { "kind" : "IdRef", "name" : "Flags", "quantifier" : "?"  },
-        { "kind" : "IdRef", "name" : "Attributes", "quantifier" : "?"  }
+        { "kind" : "IdRef", "name" : "Name" }
       ]
     },
     {
@@ -350,67 +347,6 @@
         { "kind" : "IdRef", "name" : "Binding" },
         { "kind" : "IdRef", "name" : "ArgInfo", "quantifier" : "?" }
       ]
-    },
-    {
-      "opname" : "ConstantDataPointerPushConstant",
-      "opcode" : 36,
-      "operands" : [
-        { "kind" : "IdRef", "name" : "Offset"},
-        { "kind" : "IdRef", "name" : "Size"},
-        { "kind" : "IdRef", "name" : "Data" }
-      ]
-    },
-    {
-      "opname" : "ProgramScopeVariablePointerPushConstant",
-      "opcode" : 37,
-      "operands" : [
-        { "kind" : "IdRef", "name" : "Offset"},
-        { "kind" : "IdRef", "name" : "Size"},
-        { "kind" : "IdRef", "name" : "Data" }
-      ]
-    },
-    {
-      "opname" : "PrintfInfo",
-      "opcode" : 38,
-      "operands" : [
-        { "kind" : "IdRef", "name" : "PrintfID" },
-        { "kind" : "IdRef", "name" : "FormatString" },
-        { "kind" : "IdRef", "quantifier" : "*", "name" : "ArgumentSizes"}
-      ]
-    },
-    {
-      "opname" : "PrintfBufferStorageBuffer",
-      "opcode" : 39,
-      "operands" : [
-        { "kind" : "IdRef", "name" : "DescriptorSet" },
-        { "kind" : "IdRef", "name" : "Binding" },
-        { "kind" : "IdRef", "name" : "BufferSize"}
-      ]
-    },
-    {
-    "opname" : "PrintfBufferPointerPushConstant",
-    "opcode" : 40,
-    "operands" : [
-      { "kind" : "IdRef", "name" : "Offset" },
-      { "kind" : "IdRef", "name" : "Size"},
-      { "kind" : "IdRef", "name" : "BufferSize"}
-      ]
-    }
-  ],
-  "operand_kinds" : [
-    {
-      "category" : "BitEnum",
-      "kind" : "KernelPropertyFlags",
-      "enumerants" : [
-        {
-          "enumerant" : "None",
-          "value" : "0x0"
-        },
-        {
-          "enumerant" : "MayUsePrintf",
-          "value" : "0x1"
-        }
-      ]
     }
   ]
 }
diff --git a/include/spirv/unified1/spirv.bf b/include/spirv/unified1/spirv.bf
index 15eafab..4bdb937 100644
--- a/include/spirv/unified1/spirv.bf
+++ b/include/spirv/unified1/spirv.bf
@@ -192,7 +192,6 @@ namespace Spv
             NoGlobalOffsetINTEL = 5895,
             NumSIMDWorkitemsINTEL = 5896,
             SchedulerTargetFmaxMhzINTEL = 5903,
-            StreamingInterfaceINTEL = 6154,
             NamedBarrierCountINTEL = 6417,
         }
 
@@ -225,7 +224,6 @@ namespace Spv
             ShaderRecordBufferNV = 5343,
             PhysicalStorageBuffer = 5349,
             PhysicalStorageBufferEXT = 5349,
-            HitObjectAttributeNV = 5385,
             TaskPayloadWorkgroupEXT = 5402,
             CodeSectionINTEL = 5605,
             DeviceOnlyINTEL = 5936,
@@ -453,7 +451,6 @@ namespace Spv
             NoCapture = 5,
             NoWrite = 6,
             NoReadWrite = 7,
-            RuntimeAlignedINTEL = 5940,
         }
 
         [AllowDuplicates, CRepr] public enum Decoration
@@ -524,7 +521,6 @@ namespace Spv
             RestrictPointerEXT = 5355,
             AliasedPointer = 5356,
             AliasedPointerEXT = 5356,
-            HitObjectShaderRecordBufferNV = 5386,
             BindlessSamplerNV = 5398,
             BindlessImageNV = 5399,
             BoundSamplerNV = 5400,
@@ -563,12 +559,8 @@ namespace Spv
             PrefetchINTEL = 5902,
             StallEnableINTEL = 5905,
             FuseLoopsInFunctionINTEL = 5907,
-            MathOpDSPModeINTEL = 5909,
             AliasScopeINTEL = 5914,
             NoAliasINTEL = 5915,
-            InitiationIntervalINTEL = 5917,
-            MaxConcurrencyINTEL = 5918,
-            PipelineEnableINTEL = 5919,
             BufferLocationINTEL = 5921,
             IOPipeStorageINTEL = 5944,
             FunctionFloatingPointModeINTEL = 6080,
@@ -744,8 +736,6 @@ namespace Spv
             MaxInterleavingINTEL = 21,
             SpeculatedIterationsINTEL = 22,
             NoFusionINTEL = 23,
-            LoopCountINTEL = 24,
-            MaxReinvocationDelayINTEL = 25,
         }
 
         [AllowDuplicates, CRepr] public enum LoopControlMask
@@ -768,8 +758,6 @@ namespace Spv
             MaxInterleavingINTEL = 0x00200000,
             SpeculatedIterationsINTEL = 0x00400000,
             NoFusionINTEL = 0x00800000,
-            LoopCountINTEL = 0x01000000,
-            MaxReinvocationDelayINTEL = 0x02000000,
         }
 
         [AllowDuplicates, CRepr] public enum FunctionControlShift
@@ -1076,7 +1064,6 @@ namespace Spv
             DemoteToHelperInvocation = 5379,
             DemoteToHelperInvocationEXT = 5379,
             RayTracingOpacityMicromapEXT = 5381,
-            ShaderInvocationReorderNV = 5383,
             BindlessTextureNV = 5390,
             SubgroupShuffleINTEL = 5568,
             SubgroupBufferBlockIOINTEL = 5569,
@@ -1110,13 +1097,10 @@ namespace Spv
             FPGAMemoryAccessesINTEL = 5898,
             FPGAClusterAttributesINTEL = 5904,
             LoopFuseINTEL = 5906,
-            FPGADSPControlINTEL = 5908,
             MemoryAccessAliasingINTEL = 5910,
-            FPGAInvocationPipeliningAttributesINTEL = 5916,
             FPGABufferLocationINTEL = 5920,
             ArbitraryPrecisionFixedPointINTEL = 5922,
             USMStorageClassesINTEL = 5935,
-            RuntimeAlignedAttributeINTEL = 5939,
             IOPipesINTEL = 5943,
             BlockingPipesINTEL = 5945,
             FPGARegINTEL = 5948,
@@ -1635,39 +1619,6 @@ namespace Spv
             OpFragmentMaskFetchAMD = 5011,
             OpFragmentFetchAMD = 5012,
             OpReadClockKHR = 5056,
-            OpHitObjectRecordHitMotionNV = 5249,
-            OpHitObjectRecordHitWithIndexMotionNV = 5250,
-            OpHitObjectRecordMissMotionNV = 5251,
-            OpHitObjectGetWorldToObjectNV = 5252,
-            OpHitObjectGetObjectToWorldNV = 5253,
-            OpHitObjectGetObjectRayDirectionNV = 5254,
-            OpHitObjectGetObjectRayOriginNV = 5255,
-            OpHitObjectTraceRayMotionNV = 5256,
-            OpHitObjectGetShaderRecordBufferHandleNV = 5257,
-            OpHitObjectGetShaderBindingTableRecordIndexNV = 5258,
-            OpHitObjectRecordEmptyNV = 5259,
-            OpHitObjectTraceRayNV = 5260,
-            OpHitObjectRecordHitNV = 5261,
-            OpHitObjectRecordHitWithIndexNV = 5262,
-            OpHitObjectRecordMissNV = 5263,
-            OpHitObjectExecuteShaderNV = 5264,
-            OpHitObjectGetCurrentTimeNV = 5265,
-            OpHitObjectGetAttributesNV = 5266,
-            OpHitObjectGetHitKindNV = 5267,
-            OpHitObjectGetPrimitiveIndexNV = 5268,
-            OpHitObjectGetGeometryIndexNV = 5269,
-            OpHitObjectGetInstanceIdNV = 5270,
-            OpHitObjectGetInstanceCustomIndexNV = 5271,
-            OpHitObjectGetWorldRayDirectionNV = 5272,
-            OpHitObjectGetWorldRayOriginNV = 5273,
-            OpHitObjectGetRayTMaxNV = 5274,
-            OpHitObjectGetRayTMinNV = 5275,
-            OpHitObjectIsEmptyNV = 5276,
-            OpHitObjectIsHitNV = 5277,
-            OpHitObjectIsMissNV = 5278,
-            OpReorderThreadWithHitObjectNV = 5279,
-            OpReorderThreadWithHintNV = 5280,
-            OpTypeHitObjectNV = 5281,
             OpImageSampleFootprintNV = 5283,
             OpEmitMeshTasksEXT = 5294,
             OpSetMeshOutputsEXT = 5295,
diff --git a/include/spirv/unified1/spirv.core.grammar.json b/include/spirv/unified1/spirv.core.grammar.json
index b23d8a8..c6517c4 100644
--- a/include/spirv/unified1/spirv.core.grammar.json
+++ b/include/spirv/unified1/spirv.core.grammar.json
@@ -4755,461 +4755,6 @@
       "version" : "None"
     },
     {
-      "opname" : "OpHitObjectRecordHitMotionNV",
-      "class"  : "Reserved",
-      "opcode" : 5249,
-      "operands" : [
-        { "kind" : "IdRef", "name" : "'Hit Object'" },
-        { "kind" : "IdRef", "name" : "'Acceleration Structure'" },
-        { "kind" : "IdRef", "name" : "'InstanceId'" },
-        { "kind" : "IdRef", "name" : "'PrimitiveId'" },
-        { "kind" : "IdRef", "name" : "'GeometryIndex'" },
-        { "kind" : "IdRef", "name" : "'Hit Kind'" },
-        { "kind" : "IdRef", "name" : "'SBT Record Offset'" },
-        { "kind" : "IdRef", "name" : "'SBT Record Stride'" },
-        { "kind" : "IdRef", "name" : "'Origin'" },
-        { "kind" : "IdRef", "name" : "'TMin'" },
-        { "kind" : "IdRef", "name" : "'Direction'" },
-        { "kind" : "IdRef", "name" : "'TMax'" },
-        { "kind" : "IdRef", "name" : "'Current Time'" },
-        { "kind" : "IdRef", "name" : "'HitObject Attributes'" }
-      ],
-      "capabilities" : [ "ShaderInvocationReorderNV", "RayTracingMotionBlurNV" ],
-      "version" : "None"
-    },
-    {
-      "opname" : "OpHitObjectRecordHitWithIndexMotionNV",
-      "class"  : "Reserved",
-      "opcode" : 5250,
-      "operands" : [
-        { "kind" : "IdRef", "name" : "'Hit Object'" },
-        { "kind" : "IdRef", "name" : "'Acceleration Structure'" },
-        { "kind" : "IdRef", "name" : "'InstanceId'" },
-        { "kind" : "IdRef", "name" : "'PrimitiveId'" },
-        { "kind" : "IdRef", "name" : "'GeometryIndex'" },
-        { "kind" : "IdRef", "name" : "'Hit Kind'" },
-        { "kind" : "IdRef", "name" : "'SBT Record Index'" },
-        { "kind" : "IdRef", "name" : "'Origin'" },
-        { "kind" : "IdRef", "name" : "'TMin'" },
-        { "kind" : "IdRef", "name" : "'Direction'" },
-        { "kind" : "IdRef", "name" : "'TMax'" },
-        { "kind" : "IdRef", "name" : "'Current Time'" },
-        { "kind" : "IdRef", "name" : "'HitObject Attributes'" }
-      ],
-      "capabilities" : [ "ShaderInvocationReorderNV", "RayTracingMotionBlurNV" ],
-      "version" : "None"
-    },
-    {
-      "opname" : "OpHitObjectRecordMissMotionNV",
-      "class"  : "Reserved",
-      "opcode" : 5251,
-      "operands" : [
-        { "kind" : "IdRef", "name" : "'Hit Object'" },
-        { "kind" : "IdRef", "name" : "'SBT Index'" },
-        { "kind" : "IdRef", "name" : "'Origin'" },
-        { "kind" : "IdRef", "name" : "'TMin'" },
-        { "kind" : "IdRef", "name" : "'Direction'" },
-        { "kind" : "IdRef", "name" : "'TMax'" },
-        { "kind" : "IdRef", "name" : "'Current Time'" }
-      ],
-      "capabilities" : [ "ShaderInvocationReorderNV", "RayTracingMotionBlurNV" ],
-      "version" : "None"
-    },
-    {
-      "opname" : "OpHitObjectGetWorldToObjectNV",
-      "class"  : "Reserved",
-      "opcode" : 5252,
-      "operands" : [
-        { "kind" : "IdResultType"},
-        { "kind" : "IdResult"},
-        { "kind" : "IdRef", "name" : "'Hit Object'" }
-      ],
-      "capabilities" : [ "ShaderInvocationReorderNV" ],
-      "version" : "None"
-    },
-    {
-      "opname" : "OpHitObjectGetObjectToWorldNV",
-      "class"  : "Reserved",
-      "opcode" : 5253,
-      "operands" : [
-        { "kind" : "IdResultType"},
-        { "kind" : "IdResult"},
-        { "kind" : "IdRef", "name" : "'Hit Object'" }
-      ],
-      "capabilities" : [ "ShaderInvocationReorderNV" ],
-      "version" : "None"
-    },
-    {
-      "opname" : "OpHitObjectGetObjectRayDirectionNV",
-      "class"  : "Reserved",
-      "opcode" : 5254,
-      "operands" : [
-        { "kind" : "IdResultType"},
-        { "kind" : "IdResult"},
-        { "kind" : "IdRef", "name" : "'Hit Object'" }
-      ],
-      "capabilities" : [ "ShaderInvocationReorderNV" ],
-      "version" : "None"
-    },
-    {
-      "opname" : "OpHitObjectGetObjectRayOriginNV",
-      "class"  : "Reserved",
-      "opcode" : 5255,
-      "operands" : [
-        { "kind" : "IdResultType"},
-        { "kind" : "IdResult"},
-        { "kind" : "IdRef", "name" : "'Hit Object'" }
-      ],
-      "capabilities" : [ "ShaderInvocationReorderNV" ],
-      "version" : "None"
-    },
-    {
-      "opname" : "OpHitObjectTraceRayMotionNV",
-      "class"  : "Reserved",
-      "opcode" : 5256,
-      "operands" : [
-        { "kind" : "IdRef", "name" : "'Hit Object'" },
-        { "kind" : "IdRef", "name" : "'Acceleration Structure'"},
-        { "kind" : "IdRef", "name" : "'RayFlags'"},
-        { "kind" : "IdRef", "name" : "'Cullmask'"},
-        { "kind" : "IdRef", "name" : "'SBT Record Offset'"},
-        { "kind" : "IdRef", "name" : "'SBT Record Stride'"},
-        { "kind" : "IdRef", "name" : "'Miss Index'"},
-        { "kind" : "IdRef", "name" : "'Origin'"},
-        { "kind" : "IdRef", "name" : "'TMin'"},
-        { "kind" : "IdRef", "name" : "'Direction'"},
-        { "kind" : "IdRef", "name" : "'TMax'"},
-        { "kind" : "IdRef", "name" : "'Time'"},
-        { "kind" : "IdRef", "name" : "'Payload'"}
-      ],
-      "capabilities" : [ "ShaderInvocationReorderNV", "RayTracingMotionBlurNV" ],
-      "version" : "None"
-    },
-    {
-      "opname" : "OpHitObjectGetShaderRecordBufferHandleNV",
-      "class"  : "Reserved",
-      "opcode" : 5257,
-      "operands" : [
-        { "kind" : "IdResultType"},
-        { "kind" : "IdResult"},
-        { "kind" : "IdRef", "name" : "'Hit Object'" }
-      ],
-      "capabilities" : [ "ShaderInvocationReorderNV" ],
-      "version" : "None"
-    },
-    {
-      "opname" : "OpHitObjectGetShaderBindingTableRecordIndexNV",
-      "class"  : "Reserved",
-      "opcode" : 5258,
-      "operands" : [
-        { "kind" : "IdResultType"},
-        { "kind" : "IdResult"},
-        { "kind" : "IdRef", "name" : "'Hit Object'" }
-      ],
-      "capabilities" : [ "ShaderInvocationReorderNV" ],
-      "version" : "None"
-    },
-    {
-      "opname" : "OpHitObjectRecordEmptyNV",
-      "class"  : "Reserved",
-      "opcode" : 5259,
-      "operands" : [
-        { "kind" : "IdRef", "name" : "'Hit Object'" }
-      ],
-      "capabilities" : [ "ShaderInvocationReorderNV" ],
-      "version" : "None"
-    },
-    {
-      "opname" : "OpHitObjectTraceRayNV",
-      "class"  : "Reserved",
-      "opcode" : 5260,
-      "operands" : [
-        { "kind" : "IdRef", "name" : "'Hit Object'" },
-        { "kind" : "IdRef", "name" : "'Acceleration Structure'"},
-        { "kind" : "IdRef", "name" : "'RayFlags'"},
-        { "kind" : "IdRef", "name" : "'Cullmask'"},
-        { "kind" : "IdRef", "name" : "'SBT Record Offset'"},
-        { "kind" : "IdRef", "name" : "'SBT Record Stride'"},
-        { "kind" : "IdRef", "name" : "'Miss Index'"},
-        { "kind" : "IdRef", "name" : "'Origin'"},
-        { "kind" : "IdRef", "name" : "'TMin'"},
-        { "kind" : "IdRef", "name" : "'Direction'"},
-        { "kind" : "IdRef", "name" : "'TMax'"},
-        { "kind" : "IdRef", "name" : "'Payload'"}
-      ],
-      "capabilities" : [ "ShaderInvocationReorderNV" ],
-      "version" : "None"
-    },
-    {
-      "opname" : "OpHitObjectRecordHitNV",
-      "class"  : "Reserved",
-      "opcode" : 5261,
-      "operands" : [
-        { "kind" : "IdRef", "name" : "'Hit Object'" },
-        { "kind" : "IdRef", "name" : "'Acceleration Structure'" },
-        { "kind" : "IdRef", "name" : "'InstanceId'" },
-        { "kind" : "IdRef", "name" : "'PrimitiveId'" },
-        { "kind" : "IdRef", "name" : "'GeometryIndex'" },
-        { "kind" : "IdRef", "name" : "'Hit Kind'" },
-        { "kind" : "IdRef", "name" : "'SBT Record Offset'" },
-        { "kind" : "IdRef", "name" : "'SBT Record Stride'" },
-        { "kind" : "IdRef", "name" : "'Origin'" },
-        { "kind" : "IdRef", "name" : "'TMin'" },
-        { "kind" : "IdRef", "name" : "'Direction'" },
-        { "kind" : "IdRef", "name" : "'TMax'" },
-        { "kind" : "IdRef", "name" : "'HitObject Attributes'" }
-      ],
-      "capabilities" : [ "ShaderInvocationReorderNV" ],
-      "version" : "None"
-    },
-    {
-      "opname" : "OpHitObjectRecordHitWithIndexNV",
-      "class"  : "Reserved",
-      "opcode" : 5262,
-      "operands" : [
-        { "kind" : "IdRef", "name" : "'Hit Object'" },
-        { "kind" : "IdRef", "name" : "'Acceleration Structure'" },
-        { "kind" : "IdRef", "name" : "'InstanceId'" },
-        { "kind" : "IdRef", "name" : "'PrimitiveId'" },
-        { "kind" : "IdRef", "name" : "'GeometryIndex'" },
-        { "kind" : "IdRef", "name" : "'Hit Kind'" },
-        { "kind" : "IdRef", "name" : "'SBT Record Index'" },
-        { "kind" : "IdRef", "name" : "'Origin'" },
-        { "kind" : "IdRef", "name" : "'TMin'" },
-        { "kind" : "IdRef", "name" : "'Direction'" },
-        { "kind" : "IdRef", "name" : "'TMax'" },
-        { "kind" : "IdRef", "name" : "'HitObject Attributes'" }
-      ],
-      "capabilities" : [ "ShaderInvocationReorderNV" ],
-      "version" : "None"
-    },
-    {
-      "opname" : "OpHitObjectRecordMissNV",
-      "class"  : "Reserved",
-      "opcode" : 5263,
-      "operands" : [
-        { "kind" : "IdRef", "name" : "'Hit Object'" },
-        { "kind" : "IdRef", "name" : "'SBT Index'" },
-        { "kind" : "IdRef", "name" : "'Origin'" },
-        { "kind" : "IdRef", "name" : "'TMin'" },
-        { "kind" : "IdRef", "name" : "'Direction'" },
-        { "kind" : "IdRef", "name" : "'TMax'" }
-      ],
-      "capabilities" : [ "ShaderInvocationReorderNV" ],
-      "version" : "None"
-    },
-    {
-      "opname" : "OpHitObjectExecuteShaderNV",
-      "class"  : "Reserved",
-      "opcode" : 5264,
-      "operands" : [
-        { "kind" : "IdRef", "name" : "'Hit Object'" },
-        { "kind" : "IdRef", "name" : "'Payload'" }
-      ],
-      "capabilities" : [ "ShaderInvocationReorderNV" ],
-      "version" : "None"
-    },
-    {
-      "opname" : "OpHitObjectGetCurrentTimeNV",
-      "class"  : "Reserved",
-      "opcode" : 5265,
-      "operands" : [
-        { "kind" : "IdResultType"},
-        { "kind" : "IdResult"},
-        { "kind" : "IdRef", "name" : "'Hit Object'" }
-      ],
-      "capabilities" : [ "ShaderInvocationReorderNV" ],
-      "version" : "None"
-    },
-    {
-      "opname" : "OpHitObjectGetAttributesNV",
-      "class"  : "Reserved",
-      "opcode" : 5266,
-      "operands" : [
-        { "kind" : "IdRef", "name" : "'Hit Object'" },
-        { "kind" : "IdRef", "name" : "'Hit Object Attribute'" }
-      ],
-      "capabilities" : [ "ShaderInvocationReorderNV" ],
-      "version" : "None"
-    },
-    {
-      "opname" : "OpHitObjectGetHitKindNV",
-      "class"  : "Reserved",
-      "opcode" : 5267,
-      "operands" : [
-        { "kind" : "IdResultType"},
-        { "kind" : "IdResult"},
-        { "kind" : "IdRef", "name" : "'Hit Object'" }
-      ],
-      "capabilities" : [ "ShaderInvocationReorderNV" ],
-      "version" : "None"
-    },
-    {
-      "opname" : "OpHitObjectGetPrimitiveIndexNV",
-      "class"  : "Reserved",
-      "opcode" : 5268,
-      "operands" : [
-        { "kind" : "IdResultType"},
-        { "kind" : "IdResult"},
-        { "kind" : "IdRef", "name" : "'Hit Object'" }
-      ],
-      "capabilities" : [ "ShaderInvocationReorderNV" ],
-      "version" : "None"
-    },
-    {
-      "opname" : "OpHitObjectGetGeometryIndexNV",
-      "class"  : "Reserved",
-      "opcode" : 5269,
-      "operands" : [
-        { "kind" : "IdResultType"},
-        { "kind" : "IdResult"},
-        { "kind" : "IdRef", "name" : "'Hit Object'" }
-      ],
-      "capabilities" : [ "ShaderInvocationReorderNV" ],
-      "version" : "None"
-    },
-    {
-      "opname" : "OpHitObjectGetInstanceIdNV",
-      "class"  : "Reserved",
-      "opcode" : 5270,
-      "operands" : [
-        { "kind" : "IdResultType"},
-        { "kind" : "IdResult"},
-        { "kind" : "IdRef", "name" : "'Hit Object'" }
-      ],
-      "capabilities" : [ "ShaderInvocationReorderNV" ],
-      "version" : "None"
-    },
-    {
-      "opname" : "OpHitObjectGetInstanceCustomIndexNV",
-      "class"  : "Reserved",
-      "opcode" : 5271,
-      "operands" : [
-        { "kind" : "IdResultType"},
-        { "kind" : "IdResult"},
-        { "kind" : "IdRef", "name" : "'Hit Object'" }
-      ],
-      "capabilities" : [ "ShaderInvocationReorderNV" ],
-      "version" : "None"
-    },
-    {
-      "opname" : "OpHitObjectGetWorldRayDirectionNV",
-      "class"  : "Reserved",
-      "opcode" : 5272,
-      "operands" : [
-        { "kind" : "IdResultType"},
-        { "kind" : "IdResult"},
-        { "kind" : "IdRef", "name" : "'Hit Object'" }
-      ],
-      "capabilities" : [ "ShaderInvocationReorderNV" ],
-      "version" : "None"
-    },
-    {
-      "opname" : "OpHitObjectGetWorldRayOriginNV",
-      "class"  : "Reserved",
-      "opcode" : 5273,
-      "operands" : [
-        { "kind" : "IdResultType"},
-        { "kind" : "IdResult"},
-        { "kind" : "IdRef", "name" : "'Hit Object'" }
-      ],
-      "capabilities" : [ "ShaderInvocationReorderNV" ],
-      "version" : "None"
-    },
-    {
-      "opname" : "OpHitObjectGetRayTMaxNV",
-      "class"  : "Reserved",
-      "opcode" : 5274,
-      "operands" : [
-        { "kind" : "IdResultType"},
-        { "kind" : "IdResult"},
-        { "kind" : "IdRef", "name" : "'Hit Object'" }
-      ],
-      "capabilities" : [ "ShaderInvocationReorderNV" ],
-      "version" : "None"
-    },
-    {
-      "opname" : "OpHitObjectGetRayTMinNV",
-      "class"  : "Reserved",
-      "opcode" : 5275,
-      "operands" : [
-        { "kind" : "IdResultType"},
-        { "kind" : "IdResult"},
-        { "kind" : "IdRef", "name" : "'Hit Object'" }
-      ],
-      "capabilities" : [ "ShaderInvocationReorderNV" ],
-      "version" : "None"
-    },
-    {
-      "opname" : "OpHitObjectIsEmptyNV",
-      "class"  : "Reserved",
-      "opcode" : 5276,
-      "operands" : [
-        { "kind" : "IdResultType"},
-        { "kind" : "IdResult"},
-        { "kind" : "IdRef", "name" : "'Hit Object'" }
-      ],
-      "capabilities" : [ "ShaderInvocationReorderNV" ],
-      "version" : "None"
-    },
-    {
-      "opname" : "OpHitObjectIsHitNV",
-      "class"  : "Reserved",
-      "opcode" : 5277,
-      "operands" : [
-        { "kind" : "IdResultType"},
-        { "kind" : "IdResult"},
-        { "kind" : "IdRef", "name" : "'Hit Object'" }
-      ],
-      "capabilities" : [ "ShaderInvocationReorderNV" ],
-      "version" : "None"
-    },
-    {
-      "opname" : "OpHitObjectIsMissNV",
-      "class"  : "Reserved",
-      "opcode" : 5278,
-      "operands" : [
-        { "kind" : "IdResultType"},
-        { "kind" : "IdResult"},
-        { "kind" : "IdRef", "name" : "'Hit Object'" }
-      ],
-      "capabilities" : [ "ShaderInvocationReorderNV" ],
-      "version" : "None"
-    },
-    {
-      "opname" : "OpReorderThreadWithHitObjectNV",
-      "class"  : "Reserved",
-      "opcode" : 5279,
-      "operands" : [
-        { "kind" : "IdRef", "name" : "'Hit Object'" },
-        { "kind" : "IdRef", "quantifier" : "?", "name" : "'Hint'" },
-        { "kind" : "IdRef", "quantifier" : "?", "name" : "'Bits'" }
-      ],
-      "capabilities" : [ "ShaderInvocationReorderNV" ],
-      "version" : "None"
-    },
-    {
-      "opname" : "OpReorderThreadWithHintNV",
-      "class"  : "Reserved",
-      "opcode" : 5280,
-      "operands" : [
-        { "kind" : "IdRef", "name" : "'Hint'" },
-        { "kind" : "IdRef", "name" : "'Bits'" }
-      ],
-      "capabilities" : [ "ShaderInvocationReorderNV" ],
-      "version" : "None"
-    },
-    {
-      "opname" : "OpTypeHitObjectNV",
-      "class"  : "Reserved",
-      "opcode" : 5281,
-      "operands" : [
-        { "kind" : "IdResult" }
-      ],
-      "capabilities" : [ "ShaderInvocationReorderNV" ],
-      "version" : "None"
-    },
-    {
       "opname" : "OpImageSampleFootprintNV",
       "class"  : "Image",
       "opcode" : 5283,
@@ -9475,6 +9020,7 @@
             { "kind" : "LiteralInteger" }
           ],
           "capabilities" : [ "FPGALoopControlsINTEL" ],
+          "extensions" : [ "SPV_INTEL_fpga_loop_controls" ],
           "version" : "None"
         },
         {
@@ -9484,6 +9030,7 @@
             { "kind" : "LiteralInteger" }
           ],
           "capabilities" : [ "FPGALoopControlsINTEL" ],
+          "extensions" : [ "SPV_INTEL_fpga_loop_controls" ],
           "version" : "None"
         },
         {
@@ -9493,6 +9040,7 @@
             { "kind" : "LiteralInteger" }
           ],
           "capabilities" : [ "FPGALoopControlsINTEL" ],
+          "extensions" : [ "SPV_INTEL_fpga_loop_controls" ],
           "version" : "None"
         },
         {
@@ -9502,6 +9050,7 @@
             { "kind" : "LiteralInteger" }
           ],
           "capabilities" : [ "FPGALoopControlsINTEL" ],
+          "extensions" : [ "SPV_INTEL_fpga_loop_controls" ],
           "version" : "None"
         },
         {
@@ -9511,6 +9060,7 @@
             { "kind" : "LiteralInteger" }
           ],
           "capabilities" : [ "FPGALoopControlsINTEL" ],
+          "extensions" : [ "SPV_INTEL_fpga_loop_controls" ],
           "version" : "None"
         },
         {
@@ -9520,6 +9070,7 @@
             { "kind" : "LiteralInteger" }
           ],
           "capabilities" : [ "FPGALoopControlsINTEL" ],
+          "extensions" : [ "SPV_INTEL_fpga_loop_controls" ],
           "version" : "None"
         },
         {
@@ -9529,30 +9080,17 @@
             { "kind" : "LiteralInteger" }
           ],
           "capabilities" : [ "FPGALoopControlsINTEL" ],
+          "extensions" : [ "SPV_INTEL_fpga_loop_controls" ],
           "version" : "None"
         },
         {
           "enumerant" : "NoFusionINTEL",
           "value" : "0x800000",
-          "capabilities" : [ "FPGALoopControlsINTEL" ],
-          "version" : "None"
-        },
-        {
-          "enumerant" : "LoopCountINTEL",
-          "value" : "0x1000000",
-          "parameters" : [
-            { "kind" : "LiteralInteger" }
-          ],
-          "capabilities" : [ "FPGALoopControlsINTEL" ],
-          "version" : "None"
-        },
-        {
-          "enumerant" : "MaxReinvocationDelayINTEL",
-          "value" : "0x2000000",
           "parameters" : [
             { "kind" : "LiteralInteger" }
           ],
           "capabilities" : [ "FPGALoopControlsINTEL" ],
+          "extensions" : [ "SPV_INTEL_fpga_loop_controls" ],
           "version" : "None"
         }
       ]
@@ -10708,15 +10246,6 @@
           "version" : "None"
         },
         {
-          "enumerant" : "StreamingInterfaceINTEL",
-          "value" : 6154,
-          "parameters" : [
-            { "kind" : "LiteralInteger", "name" : "'StallFreeReturn'" }
-          ],
-          "capabilities" : [ "FPGAKernelAttributesINTEL" ],
-          "version" : "None"
-        },
-        {
           "enumerant" : "NamedBarrierCountINTEL",
           "value" : 6417,
           "parameters" : [
@@ -10894,12 +10423,6 @@
           "version" : "1.5"
         },
         {
-          "enumerant" : "HitObjectAttributeNV",
-          "value" : 5385,
-          "capabilities" : [ "ShaderInvocationReorderNV" ],
-          "version" : "None"
-        },
-        {
           "enumerant" : "TaskPayloadWorkgroupEXT",
           "value" : 5402,
           "extensions" : [ "SPV_EXT_mesh_shader" ],
@@ -11661,11 +11184,6 @@
           "enumerant" : "NoReadWrite",
           "value" : 7,
           "capabilities" : [ "Kernel" ]
-        },
-        {
-          "enumerant" : "RuntimeAlignedINTEL",
-          "value" : 5940,
-          "capabilities" : [ "RuntimeAlignedAttributeINTEL" ]
         }
       ]
     },
@@ -12107,12 +11625,6 @@
           "version" : "1.5"
         },
         {
-          "enumerant" : "HitObjectShaderRecordBufferNV",
-          "value" : 5386,
-          "capabilities" : [ "ShaderInvocationReorderNV" ],
-          "version" : "None"
-        },
-        {
           "enumerant" : "BindlessSamplerNV",
           "value" : 5398,
           "capabilities" : [ "BindlessTextureNV" ],
@@ -12418,16 +11930,6 @@
           "version" : "None"
         },
         {
-          "enumerant" : "MathOpDSPModeINTEL",
-          "value" : 5909,
-          "parameters" : [
-            { "kind" : "LiteralInteger", "name" : "'Mode'" },
-            { "kind" : "LiteralInteger", "name" : "'Propagate'" }
-          ],
-          "capabilities" : [ "FPGADSPControlINTEL" ],
-          "version" : "None"
-        },
-        {
           "enumerant" : "AliasScopeINTEL",
           "value" : 5914,
           "parameters" : [
@@ -12446,33 +11948,6 @@
           "version" : "None"
         },
         {
-          "enumerant" : "InitiationIntervalINTEL",
-          "value" : 5917,
-          "parameters" : [
-            { "kind" : "LiteralInteger", "name" : "'Cycles'" }
-          ],
-          "capabilities" : [ "FPGAInvocationPipeliningAttributesINTEL" ],
-          "version" : "None"
-        },
-        {
-          "enumerant" : "MaxConcurrencyINTEL",
-          "value" : 5918,
-          "parameters" : [
-            { "kind" : "LiteralInteger", "name" : "'Invocations'" }
-          ],
-          "capabilities" : [ "FPGAInvocationPipeliningAttributesINTEL" ],
-          "version" : "None"
-        },
-        {
-          "enumerant" : "PipelineEnableINTEL",
-          "value" : 5919,
-          "parameters" : [
-            { "kind" : "LiteralInteger", "name" : "'Enable'" }
-          ],
-          "capabilities" : [ "FPGAInvocationPipeliningAttributesINTEL" ],
-          "version" : "None"
-        },
-        {
           "enumerant" : "BufferLocationINTEL",
           "value" : 5921,
           "parameters" : [
@@ -14449,13 +13924,6 @@
           "version" : "None"
         },
         {
-          "enumerant" : "ShaderInvocationReorderNV",
-          "value" : 5383,
-          "capabilities" : [ "RayTracingKHR" ],
-          "extensions" : [ "SPV_NV_shader_invocation_reorder" ],
-          "version" : "None"
-        },
-        {
           "enumerant" : "BindlessTextureNV",
           "value" : 5390,
           "extensions" : [ "SPV_NV_bindless_texture" ],
@@ -14657,24 +14125,12 @@
           "version" : "None"
         },
         {
-          "enumerant" : "FPGADSPControlINTEL",
-          "value" : 5908,
-          "extensions" : [ "SPV_INTEL_fpga_dsp_control" ],
-          "version" : "None"
-        },
-        {
           "enumerant" : "MemoryAccessAliasingINTEL",
           "value" : 5910,
           "extensions" : [ "SPV_INTEL_memory_access_aliasing" ],
           "version" : "None"
         },
         {
-          "enumerant" : "FPGAInvocationPipeliningAttributesINTEL",
-          "value" : 5916,
-          "extensions" : [ "SPV_INTEL_fpga_invocation_pipelining_attributes" ],
-          "version" : "None"
-        },
-        {
           "enumerant" : "FPGABufferLocationINTEL",
           "value" : 5920,
           "extensions" : [ "SPV_INTEL_fpga_buffer_location" ],
@@ -14693,12 +14149,6 @@
           "version" : "None"
         },
         {
-          "enumerant" : "RuntimeAlignedAttributeINTEL",
-          "value" : 5939,
-          "extensions" : [ "SPV_INTEL_runtime_aligned" ],
-          "version" : "None"
-        },
-        {
           "enumerant" : "IOPipesINTEL",
           "value" : 5943,
           "extensions" : [ "SPV_INTEL_io_pipes" ],
diff --git a/include/spirv/unified1/spirv.cs b/include/spirv/unified1/spirv.cs
index f836fc9..0cf3d34 100644
--- a/include/spirv/unified1/spirv.cs
+++ b/include/spirv/unified1/spirv.cs
@@ -191,7 +191,6 @@ namespace Spv
             NoGlobalOffsetINTEL = 5895,
             NumSIMDWorkitemsINTEL = 5896,
             SchedulerTargetFmaxMhzINTEL = 5903,
-            StreamingInterfaceINTEL = 6154,
             NamedBarrierCountINTEL = 6417,
         }
 
@@ -224,7 +223,6 @@ namespace Spv
             ShaderRecordBufferNV = 5343,
             PhysicalStorageBuffer = 5349,
             PhysicalStorageBufferEXT = 5349,
-            HitObjectAttributeNV = 5385,
             TaskPayloadWorkgroupEXT = 5402,
             CodeSectionINTEL = 5605,
             DeviceOnlyINTEL = 5936,
@@ -452,7 +450,6 @@ namespace Spv
             NoCapture = 5,
             NoWrite = 6,
             NoReadWrite = 7,
-            RuntimeAlignedINTEL = 5940,
         }
 
         public enum Decoration
@@ -523,7 +520,6 @@ namespace Spv
             RestrictPointerEXT = 5355,
             AliasedPointer = 5356,
             AliasedPointerEXT = 5356,
-            HitObjectShaderRecordBufferNV = 5386,
             BindlessSamplerNV = 5398,
             BindlessImageNV = 5399,
             BoundSamplerNV = 5400,
@@ -562,12 +558,8 @@ namespace Spv
             PrefetchINTEL = 5902,
             StallEnableINTEL = 5905,
             FuseLoopsInFunctionINTEL = 5907,
-            MathOpDSPModeINTEL = 5909,
             AliasScopeINTEL = 5914,
             NoAliasINTEL = 5915,
-            InitiationIntervalINTEL = 5917,
-            MaxConcurrencyINTEL = 5918,
-            PipelineEnableINTEL = 5919,
             BufferLocationINTEL = 5921,
             IOPipeStorageINTEL = 5944,
             FunctionFloatingPointModeINTEL = 6080,
@@ -743,8 +735,6 @@ namespace Spv
             MaxInterleavingINTEL = 21,
             SpeculatedIterationsINTEL = 22,
             NoFusionINTEL = 23,
-            LoopCountINTEL = 24,
-            MaxReinvocationDelayINTEL = 25,
         }
 
         public enum LoopControlMask
@@ -767,8 +757,6 @@ namespace Spv
             MaxInterleavingINTEL = 0x00200000,
             SpeculatedIterationsINTEL = 0x00400000,
             NoFusionINTEL = 0x00800000,
-            LoopCountINTEL = 0x01000000,
-            MaxReinvocationDelayINTEL = 0x02000000,
         }
 
         public enum FunctionControlShift
@@ -1075,7 +1063,6 @@ namespace Spv
             DemoteToHelperInvocation = 5379,
             DemoteToHelperInvocationEXT = 5379,
             RayTracingOpacityMicromapEXT = 5381,
-            ShaderInvocationReorderNV = 5383,
             BindlessTextureNV = 5390,
             SubgroupShuffleINTEL = 5568,
             SubgroupBufferBlockIOINTEL = 5569,
@@ -1109,13 +1096,10 @@ namespace Spv
             FPGAMemoryAccessesINTEL = 5898,
             FPGAClusterAttributesINTEL = 5904,
             LoopFuseINTEL = 5906,
-            FPGADSPControlINTEL = 5908,
             MemoryAccessAliasingINTEL = 5910,
-            FPGAInvocationPipeliningAttributesINTEL = 5916,
             FPGABufferLocationINTEL = 5920,
             ArbitraryPrecisionFixedPointINTEL = 5922,
             USMStorageClassesINTEL = 5935,
-            RuntimeAlignedAttributeINTEL = 5939,
             IOPipesINTEL = 5943,
             BlockingPipesINTEL = 5945,
             FPGARegINTEL = 5948,
@@ -1634,39 +1618,6 @@ namespace Spv
             OpFragmentMaskFetchAMD = 5011,
             OpFragmentFetchAMD = 5012,
             OpReadClockKHR = 5056,
-            OpHitObjectRecordHitMotionNV = 5249,
-            OpHitObjectRecordHitWithIndexMotionNV = 5250,
-            OpHitObjectRecordMissMotionNV = 5251,
-            OpHitObjectGetWorldToObjectNV = 5252,
-            OpHitObjectGetObjectToWorldNV = 5253,
-            OpHitObjectGetObjectRayDirectionNV = 5254,
-            OpHitObjectGetObjectRayOriginNV = 5255,
-            OpHitObjectTraceRayMotionNV = 5256,
-            OpHitObjectGetShaderRecordBufferHandleNV = 5257,
-            OpHitObjectGetShaderBindingTableRecordIndexNV = 5258,
-            OpHitObjectRecordEmptyNV = 5259,
-            OpHitObjectTraceRayNV = 5260,
-            OpHitObjectRecordHitNV = 5261,
-            OpHitObjectRecordHitWithIndexNV = 5262,
-            OpHitObjectRecordMissNV = 5263,
-            OpHitObjectExecuteShaderNV = 5264,
-            OpHitObjectGetCurrentTimeNV = 5265,
-            OpHitObjectGetAttributesNV = 5266,
-            OpHitObjectGetHitKindNV = 5267,
-            OpHitObjectGetPrimitiveIndexNV = 5268,
-            OpHitObjectGetGeometryIndexNV = 5269,
-            OpHitObjectGetInstanceIdNV = 5270,
-            OpHitObjectGetInstanceCustomIndexNV = 5271,
-            OpHitObjectGetWorldRayDirectionNV = 5272,
-            OpHitObjectGetWorldRayOriginNV = 5273,
-            OpHitObjectGetRayTMaxNV = 5274,
-            OpHitObjectGetRayTMinNV = 5275,
-            OpHitObjectIsEmptyNV = 5276,
-            OpHitObjectIsHitNV = 5277,
-            OpHitObjectIsMissNV = 5278,
-            OpReorderThreadWithHitObjectNV = 5279,
-            OpReorderThreadWithHintNV = 5280,
-            OpTypeHitObjectNV = 5281,
             OpImageSampleFootprintNV = 5283,
             OpEmitMeshTasksEXT = 5294,
             OpSetMeshOutputsEXT = 5295,
diff --git a/include/spirv/unified1/spirv.h b/include/spirv/unified1/spirv.h
index 366b556..af4f06b 100644
--- a/include/spirv/unified1/spirv.h
+++ b/include/spirv/unified1/spirv.h
@@ -199,7 +199,6 @@ typedef enum SpvExecutionMode_ {
     SpvExecutionModeNoGlobalOffsetINTEL = 5895,
     SpvExecutionModeNumSIMDWorkitemsINTEL = 5896,
     SpvExecutionModeSchedulerTargetFmaxMhzINTEL = 5903,
-    SpvExecutionModeStreamingInterfaceINTEL = 6154,
     SpvExecutionModeNamedBarrierCountINTEL = 6417,
     SpvExecutionModeMax = 0x7fffffff,
 } SpvExecutionMode;
@@ -232,7 +231,6 @@ typedef enum SpvStorageClass_ {
     SpvStorageClassShaderRecordBufferNV = 5343,
     SpvStorageClassPhysicalStorageBuffer = 5349,
     SpvStorageClassPhysicalStorageBufferEXT = 5349,
-    SpvStorageClassHitObjectAttributeNV = 5385,
     SpvStorageClassTaskPayloadWorkgroupEXT = 5402,
     SpvStorageClassCodeSectionINTEL = 5605,
     SpvStorageClassDeviceOnlyINTEL = 5936,
@@ -458,7 +456,6 @@ typedef enum SpvFunctionParameterAttribute_ {
     SpvFunctionParameterAttributeNoCapture = 5,
     SpvFunctionParameterAttributeNoWrite = 6,
     SpvFunctionParameterAttributeNoReadWrite = 7,
-    SpvFunctionParameterAttributeRuntimeAlignedINTEL = 5940,
     SpvFunctionParameterAttributeMax = 0x7fffffff,
 } SpvFunctionParameterAttribute;
 
@@ -529,7 +526,6 @@ typedef enum SpvDecoration_ {
     SpvDecorationRestrictPointerEXT = 5355,
     SpvDecorationAliasedPointer = 5356,
     SpvDecorationAliasedPointerEXT = 5356,
-    SpvDecorationHitObjectShaderRecordBufferNV = 5386,
     SpvDecorationBindlessSamplerNV = 5398,
     SpvDecorationBindlessImageNV = 5399,
     SpvDecorationBoundSamplerNV = 5400,
@@ -568,12 +564,8 @@ typedef enum SpvDecoration_ {
     SpvDecorationPrefetchINTEL = 5902,
     SpvDecorationStallEnableINTEL = 5905,
     SpvDecorationFuseLoopsInFunctionINTEL = 5907,
-    SpvDecorationMathOpDSPModeINTEL = 5909,
     SpvDecorationAliasScopeINTEL = 5914,
     SpvDecorationNoAliasINTEL = 5915,
-    SpvDecorationInitiationIntervalINTEL = 5917,
-    SpvDecorationMaxConcurrencyINTEL = 5918,
-    SpvDecorationPipelineEnableINTEL = 5919,
     SpvDecorationBufferLocationINTEL = 5921,
     SpvDecorationIOPipeStorageINTEL = 5944,
     SpvDecorationFunctionFloatingPointModeINTEL = 6080,
@@ -748,8 +740,6 @@ typedef enum SpvLoopControlShift_ {
     SpvLoopControlMaxInterleavingINTELShift = 21,
     SpvLoopControlSpeculatedIterationsINTELShift = 22,
     SpvLoopControlNoFusionINTELShift = 23,
-    SpvLoopControlLoopCountINTELShift = 24,
-    SpvLoopControlMaxReinvocationDelayINTELShift = 25,
     SpvLoopControlMax = 0x7fffffff,
 } SpvLoopControlShift;
 
@@ -772,8 +762,6 @@ typedef enum SpvLoopControlMask_ {
     SpvLoopControlMaxInterleavingINTELMask = 0x00200000,
     SpvLoopControlSpeculatedIterationsINTELMask = 0x00400000,
     SpvLoopControlNoFusionINTELMask = 0x00800000,
-    SpvLoopControlLoopCountINTELMask = 0x01000000,
-    SpvLoopControlMaxReinvocationDelayINTELMask = 0x02000000,
 } SpvLoopControlMask;
 
 typedef enum SpvFunctionControlShift_ {
@@ -1075,7 +1063,6 @@ typedef enum SpvCapability_ {
     SpvCapabilityDemoteToHelperInvocation = 5379,
     SpvCapabilityDemoteToHelperInvocationEXT = 5379,
     SpvCapabilityRayTracingOpacityMicromapEXT = 5381,
-    SpvCapabilityShaderInvocationReorderNV = 5383,
     SpvCapabilityBindlessTextureNV = 5390,
     SpvCapabilitySubgroupShuffleINTEL = 5568,
     SpvCapabilitySubgroupBufferBlockIOINTEL = 5569,
@@ -1109,13 +1096,10 @@ typedef enum SpvCapability_ {
     SpvCapabilityFPGAMemoryAccessesINTEL = 5898,
     SpvCapabilityFPGAClusterAttributesINTEL = 5904,
     SpvCapabilityLoopFuseINTEL = 5906,
-    SpvCapabilityFPGADSPControlINTEL = 5908,
     SpvCapabilityMemoryAccessAliasingINTEL = 5910,
-    SpvCapabilityFPGAInvocationPipeliningAttributesINTEL = 5916,
     SpvCapabilityFPGABufferLocationINTEL = 5920,
     SpvCapabilityArbitraryPrecisionFixedPointINTEL = 5922,
     SpvCapabilityUSMStorageClassesINTEL = 5935,
-    SpvCapabilityRuntimeAlignedAttributeINTEL = 5939,
     SpvCapabilityIOPipesINTEL = 5943,
     SpvCapabilityBlockingPipesINTEL = 5945,
     SpvCapabilityFPGARegINTEL = 5948,
@@ -1632,39 +1616,6 @@ typedef enum SpvOp_ {
     SpvOpFragmentMaskFetchAMD = 5011,
     SpvOpFragmentFetchAMD = 5012,
     SpvOpReadClockKHR = 5056,
-    SpvOpHitObjectRecordHitMotionNV = 5249,
-    SpvOpHitObjectRecordHitWithIndexMotionNV = 5250,
-    SpvOpHitObjectRecordMissMotionNV = 5251,
-    SpvOpHitObjectGetWorldToObjectNV = 5252,
-    SpvOpHitObjectGetObjectToWorldNV = 5253,
-    SpvOpHitObjectGetObjectRayDirectionNV = 5254,
-    SpvOpHitObjectGetObjectRayOriginNV = 5255,
-    SpvOpHitObjectTraceRayMotionNV = 5256,
-    SpvOpHitObjectGetShaderRecordBufferHandleNV = 5257,
-    SpvOpHitObjectGetShaderBindingTableRecordIndexNV = 5258,
-    SpvOpHitObjectRecordEmptyNV = 5259,
-    SpvOpHitObjectTraceRayNV = 5260,
-    SpvOpHitObjectRecordHitNV = 5261,
-    SpvOpHitObjectRecordHitWithIndexNV = 5262,
-    SpvOpHitObjectRecordMissNV = 5263,
-    SpvOpHitObjectExecuteShaderNV = 5264,
-    SpvOpHitObjectGetCurrentTimeNV = 5265,
-    SpvOpHitObjectGetAttributesNV = 5266,
-    SpvOpHitObjectGetHitKindNV = 5267,
-    SpvOpHitObjectGetPrimitiveIndexNV = 5268,
-    SpvOpHitObjectGetGeometryIndexNV = 5269,
-    SpvOpHitObjectGetInstanceIdNV = 5270,
-    SpvOpHitObjectGetInstanceCustomIndexNV = 5271,
-    SpvOpHitObjectGetWorldRayDirectionNV = 5272,
-    SpvOpHitObjectGetWorldRayOriginNV = 5273,
-    SpvOpHitObjectGetRayTMaxNV = 5274,
-    SpvOpHitObjectGetRayTMinNV = 5275,
-    SpvOpHitObjectIsEmptyNV = 5276,
-    SpvOpHitObjectIsHitNV = 5277,
-    SpvOpHitObjectIsMissNV = 5278,
-    SpvOpReorderThreadWithHitObjectNV = 5279,
-    SpvOpReorderThreadWithHintNV = 5280,
-    SpvOpTypeHitObjectNV = 5281,
     SpvOpImageSampleFootprintNV = 5283,
     SpvOpEmitMeshTasksEXT = 5294,
     SpvOpSetMeshOutputsEXT = 5295,
@@ -2340,39 +2291,6 @@ inline void SpvHasResultAndType(SpvOp opcode, bool *hasResult, bool *hasResultTy
     case SpvOpFragmentMaskFetchAMD: *hasResult = true; *hasResultType = true; break;
     case SpvOpFragmentFetchAMD: *hasResult = true; *hasResultType = true; break;
     case SpvOpReadClockKHR: *hasResult = true; *hasResultType = true; break;
-    case SpvOpHitObjectRecordHitMotionNV: *hasResult = false; *hasResultType = false; break;
-    case SpvOpHitObjectRecordHitWithIndexMotionNV: *hasResult = false; *hasResultType = false; break;
-    case SpvOpHitObjectRecordMissMotionNV: *hasResult = false; *hasResultType = false; break;
-    case SpvOpHitObjectGetWorldToObjectNV: *hasResult = true; *hasResultType = true; break;
-    case SpvOpHitObjectGetObjectToWorldNV: *hasResult = true; *hasResultType = true; break;
-    case SpvOpHitObjectGetObjectRayDirectionNV: *hasResult = true; *hasResultType = true; break;
-    case SpvOpHitObjectGetObjectRayOriginNV: *hasResult = true; *hasResultType = true; break;
-    case SpvOpHitObjectTraceRayMotionNV: *hasResult = false; *hasResultType = false; break;
-    case SpvOpHitObjectGetShaderRecordBufferHandleNV: *hasResult = true; *hasResultType = true; break;
-    case SpvOpHitObjectGetShaderBindingTableRecordIndexNV: *hasResult = true; *hasResultType = true; break;
-    case SpvOpHitObjectRecordEmptyNV: *hasResult = false; *hasResultType = false; break;
-    case SpvOpHitObjectTraceRayNV: *hasResult = false; *hasResultType = false; break;
-    case SpvOpHitObjectRecordHitNV: *hasResult = false; *hasResultType = false; break;
-    case SpvOpHitObjectRecordHitWithIndexNV: *hasResult = false; *hasResultType = false; break;
-    case SpvOpHitObjectRecordMissNV: *hasResult = false; *hasResultType = false; break;
-    case SpvOpHitObjectExecuteShaderNV: *hasResult = false; *hasResultType = false; break;
-    case SpvOpHitObjectGetCurrentTimeNV: *hasResult = true; *hasResultType = true; break;
-    case SpvOpHitObjectGetAttributesNV: *hasResult = false; *hasResultType = false; break;
-    case SpvOpHitObjectGetHitKindNV: *hasResult = true; *hasResultType = true; break;
-    case SpvOpHitObjectGetPrimitiveIndexNV: *hasResult = true; *hasResultType = true; break;
-    case SpvOpHitObjectGetGeometryIndexNV: *hasResult = true; *hasResultType = true; break;
-    case SpvOpHitObjectGetInstanceIdNV: *hasResult = true; *hasResultType = true; break;
-    case SpvOpHitObjectGetInstanceCustomIndexNV: *hasResult = true; *hasResultType = true; break;
-    case SpvOpHitObjectGetWorldRayDirectionNV: *hasResult = true; *hasResultType = true; break;
-    case SpvOpHitObjectGetWorldRayOriginNV: *hasResult = true; *hasResultType = true; break;
-    case SpvOpHitObjectGetRayTMaxNV: *hasResult = true; *hasResultType = true; break;
-    case SpvOpHitObjectGetRayTMinNV: *hasResult = true; *hasResultType = true; break;
-    case SpvOpHitObjectIsEmptyNV: *hasResult = true; *hasResultType = true; break;
-    case SpvOpHitObjectIsHitNV: *hasResult = true; *hasResultType = true; break;
-    case SpvOpHitObjectIsMissNV: *hasResult = true; *hasResultType = true; break;
-    case SpvOpReorderThreadWithHitObjectNV: *hasResult = false; *hasResultType = false; break;
-    case SpvOpReorderThreadWithHintNV: *hasResult = false; *hasResultType = false; break;
-    case SpvOpTypeHitObjectNV: *hasResult = true; *hasResultType = false; break;
     case SpvOpImageSampleFootprintNV: *hasResult = true; *hasResultType = true; break;
     case SpvOpEmitMeshTasksEXT: *hasResult = false; *hasResultType = false; break;
     case SpvOpSetMeshOutputsEXT: *hasResult = false; *hasResultType = false; break;
diff --git a/include/spirv/unified1/spirv.hpp b/include/spirv/unified1/spirv.hpp
index 65d84e2..b7ec5d7 100644
--- a/include/spirv/unified1/spirv.hpp
+++ b/include/spirv/unified1/spirv.hpp
@@ -195,7 +195,6 @@ enum ExecutionMode {
     ExecutionModeNoGlobalOffsetINTEL = 5895,
     ExecutionModeNumSIMDWorkitemsINTEL = 5896,
     ExecutionModeSchedulerTargetFmaxMhzINTEL = 5903,
-    ExecutionModeStreamingInterfaceINTEL = 6154,
     ExecutionModeNamedBarrierCountINTEL = 6417,
     ExecutionModeMax = 0x7fffffff,
 };
@@ -228,7 +227,6 @@ enum StorageClass {
     StorageClassShaderRecordBufferNV = 5343,
     StorageClassPhysicalStorageBuffer = 5349,
     StorageClassPhysicalStorageBufferEXT = 5349,
-    StorageClassHitObjectAttributeNV = 5385,
     StorageClassTaskPayloadWorkgroupEXT = 5402,
     StorageClassCodeSectionINTEL = 5605,
     StorageClassDeviceOnlyINTEL = 5936,
@@ -454,7 +452,6 @@ enum FunctionParameterAttribute {
     FunctionParameterAttributeNoCapture = 5,
     FunctionParameterAttributeNoWrite = 6,
     FunctionParameterAttributeNoReadWrite = 7,
-    FunctionParameterAttributeRuntimeAlignedINTEL = 5940,
     FunctionParameterAttributeMax = 0x7fffffff,
 };
 
@@ -525,7 +522,6 @@ enum Decoration {
     DecorationRestrictPointerEXT = 5355,
     DecorationAliasedPointer = 5356,
     DecorationAliasedPointerEXT = 5356,
-    DecorationHitObjectShaderRecordBufferNV = 5386,
     DecorationBindlessSamplerNV = 5398,
     DecorationBindlessImageNV = 5399,
     DecorationBoundSamplerNV = 5400,
@@ -564,12 +560,8 @@ enum Decoration {
     DecorationPrefetchINTEL = 5902,
     DecorationStallEnableINTEL = 5905,
     DecorationFuseLoopsInFunctionINTEL = 5907,
-    DecorationMathOpDSPModeINTEL = 5909,
     DecorationAliasScopeINTEL = 5914,
     DecorationNoAliasINTEL = 5915,
-    DecorationInitiationIntervalINTEL = 5917,
-    DecorationMaxConcurrencyINTEL = 5918,
-    DecorationPipelineEnableINTEL = 5919,
     DecorationBufferLocationINTEL = 5921,
     DecorationIOPipeStorageINTEL = 5944,
     DecorationFunctionFloatingPointModeINTEL = 6080,
@@ -744,8 +736,6 @@ enum LoopControlShift {
     LoopControlMaxInterleavingINTELShift = 21,
     LoopControlSpeculatedIterationsINTELShift = 22,
     LoopControlNoFusionINTELShift = 23,
-    LoopControlLoopCountINTELShift = 24,
-    LoopControlMaxReinvocationDelayINTELShift = 25,
     LoopControlMax = 0x7fffffff,
 };
 
@@ -768,8 +758,6 @@ enum LoopControlMask {
     LoopControlMaxInterleavingINTELMask = 0x00200000,
     LoopControlSpeculatedIterationsINTELMask = 0x00400000,
     LoopControlNoFusionINTELMask = 0x00800000,
-    LoopControlLoopCountINTELMask = 0x01000000,
-    LoopControlMaxReinvocationDelayINTELMask = 0x02000000,
 };
 
 enum FunctionControlShift {
@@ -1071,7 +1059,6 @@ enum Capability {
     CapabilityDemoteToHelperInvocation = 5379,
     CapabilityDemoteToHelperInvocationEXT = 5379,
     CapabilityRayTracingOpacityMicromapEXT = 5381,
-    CapabilityShaderInvocationReorderNV = 5383,
     CapabilityBindlessTextureNV = 5390,
     CapabilitySubgroupShuffleINTEL = 5568,
     CapabilitySubgroupBufferBlockIOINTEL = 5569,
@@ -1105,13 +1092,10 @@ enum Capability {
     CapabilityFPGAMemoryAccessesINTEL = 5898,
     CapabilityFPGAClusterAttributesINTEL = 5904,
     CapabilityLoopFuseINTEL = 5906,
-    CapabilityFPGADSPControlINTEL = 5908,
     CapabilityMemoryAccessAliasingINTEL = 5910,
-    CapabilityFPGAInvocationPipeliningAttributesINTEL = 5916,
     CapabilityFPGABufferLocationINTEL = 5920,
     CapabilityArbitraryPrecisionFixedPointINTEL = 5922,
     CapabilityUSMStorageClassesINTEL = 5935,
-    CapabilityRuntimeAlignedAttributeINTEL = 5939,
     CapabilityIOPipesINTEL = 5943,
     CapabilityBlockingPipesINTEL = 5945,
     CapabilityFPGARegINTEL = 5948,
@@ -1628,39 +1612,6 @@ enum Op {
     OpFragmentMaskFetchAMD = 5011,
     OpFragmentFetchAMD = 5012,
     OpReadClockKHR = 5056,
-    OpHitObjectRecordHitMotionNV = 5249,
-    OpHitObjectRecordHitWithIndexMotionNV = 5250,
-    OpHitObjectRecordMissMotionNV = 5251,
-    OpHitObjectGetWorldToObjectNV = 5252,
-    OpHitObjectGetObjectToWorldNV = 5253,
-    OpHitObjectGetObjectRayDirectionNV = 5254,
-    OpHitObjectGetObjectRayOriginNV = 5255,
-    OpHitObjectTraceRayMotionNV = 5256,
-    OpHitObjectGetShaderRecordBufferHandleNV = 5257,
-    OpHitObjectGetShaderBindingTableRecordIndexNV = 5258,
-    OpHitObjectRecordEmptyNV = 5259,
-    OpHitObjectTraceRayNV = 5260,
-    OpHitObjectRecordHitNV = 5261,
-    OpHitObjectRecordHitWithIndexNV = 5262,
-    OpHitObjectRecordMissNV = 5263,
-    OpHitObjectExecuteShaderNV = 5264,
-    OpHitObjectGetCurrentTimeNV = 5265,
-    OpHitObjectGetAttributesNV = 5266,
-    OpHitObjectGetHitKindNV = 5267,
-    OpHitObjectGetPrimitiveIndexNV = 5268,
-    OpHitObjectGetGeometryIndexNV = 5269,
-    OpHitObjectGetInstanceIdNV = 5270,
-    OpHitObjectGetInstanceCustomIndexNV = 5271,
-    OpHitObjectGetWorldRayDirectionNV = 5272,
-    OpHitObjectGetWorldRayOriginNV = 5273,
-    OpHitObjectGetRayTMaxNV = 5274,
-    OpHitObjectGetRayTMinNV = 5275,
-    OpHitObjectIsEmptyNV = 5276,
-    OpHitObjectIsHitNV = 5277,
-    OpHitObjectIsMissNV = 5278,
-    OpReorderThreadWithHitObjectNV = 5279,
-    OpReorderThreadWithHintNV = 5280,
-    OpTypeHitObjectNV = 5281,
     OpImageSampleFootprintNV = 5283,
     OpEmitMeshTasksEXT = 5294,
     OpSetMeshOutputsEXT = 5295,
@@ -2336,39 +2287,6 @@ inline void HasResultAndType(Op opcode, bool *hasResult, bool *hasResultType) {
     case OpFragmentMaskFetchAMD: *hasResult = true; *hasResultType = true; break;
     case OpFragmentFetchAMD: *hasResult = true; *hasResultType = true; break;
     case OpReadClockKHR: *hasResult = true; *hasResultType = true; break;
-    case OpHitObjectRecordHitMotionNV: *hasResult = false; *hasResultType = false; break;
-    case OpHitObjectRecordHitWithIndexMotionNV: *hasResult = false; *hasResultType = false; break;
-    case OpHitObjectRecordMissMotionNV: *hasResult = false; *hasResultType = false; break;
-    case OpHitObjectGetWorldToObjectNV: *hasResult = true; *hasResultType = true; break;
-    case OpHitObjectGetObjectToWorldNV: *hasResult = true; *hasResultType = true; break;
-    case OpHitObjectGetObjectRayDirectionNV: *hasResult = true; *hasResultType = true; break;
-    case OpHitObjectGetObjectRayOriginNV: *hasResult = true; *hasResultType = true; break;
-    case OpHitObjectTraceRayMotionNV: *hasResult = false; *hasResultType = false; break;
-    case OpHitObjectGetShaderRecordBufferHandleNV: *hasResult = true; *hasResultType = true; break;
-    case OpHitObjectGetShaderBindingTableRecordIndexNV: *hasResult = true; *hasResultType = true; break;
-    case OpHitObjectRecordEmptyNV: *hasResult = false; *hasResultType = false; break;
-    case OpHitObjectTraceRayNV: *hasResult = false; *hasResultType = false; break;
-    case OpHitObjectRecordHitNV: *hasResult = false; *hasResultType = false; break;
-    case OpHitObjectRecordHitWithIndexNV: *hasResult = false; *hasResultType = false; break;
-    case OpHitObjectRecordMissNV: *hasResult = false; *hasResultType = false; break;
-    case OpHitObjectExecuteShaderNV: *hasResult = false; *hasResultType = false; break;
-    case OpHitObjectGetCurrentTimeNV: *hasResult = true; *hasResultType = true; break;
-    case OpHitObjectGetAttributesNV: *hasResult = false; *hasResultType = false; break;
-    case OpHitObjectGetHitKindNV: *hasResult = true; *hasResultType = true; break;
-    case OpHitObjectGetPrimitiveIndexNV: *hasResult = true; *hasResultType = true; break;
-    case OpHitObjectGetGeometryIndexNV: *hasResult = true; *hasResultType = true; break;
-    case OpHitObjectGetInstanceIdNV: *hasResult = true; *hasResultType = true; break;
-    case OpHitObjectGetInstanceCustomIndexNV: *hasResult = true; *hasResultType = true; break;
-    case OpHitObjectGetWorldRayDirectionNV: *hasResult = true; *hasResultType = true; break;
-    case OpHitObjectGetWorldRayOriginNV: *hasResult = true; *hasResultType = true; break;
-    case OpHitObjectGetRayTMaxNV: *hasResult = true; *hasResultType = true; break;
-    case OpHitObjectGetRayTMinNV: *hasResult = true; *hasResultType = true; break;
-    case OpHitObjectIsEmptyNV: *hasResult = true; *hasResultType = true; break;
-    case OpHitObjectIsHitNV: *hasResult = true; *hasResultType = true; break;
-    case OpHitObjectIsMissNV: *hasResult = true; *hasResultType = true; break;
-    case OpReorderThreadWithHitObjectNV: *hasResult = false; *hasResultType = false; break;
-    case OpReorderThreadWithHintNV: *hasResult = false; *hasResultType = false; break;
-    case OpTypeHitObjectNV: *hasResult = true; *hasResultType = false; break;
     case OpImageSampleFootprintNV: *hasResult = true; *hasResultType = true; break;
     case OpEmitMeshTasksEXT: *hasResult = false; *hasResultType = false; break;
     case OpSetMeshOutputsEXT: *hasResult = false; *hasResultType = false; break;
@@ -2651,48 +2569,18 @@ inline void HasResultAndType(Op opcode, bool *hasResult, bool *hasResultType) {
 }
 #endif /* SPV_ENABLE_UTILITY_CODE */
 
-// Overload bitwise operators for mask bit combining
+// Overload operator| for mask bit combining
 
 inline ImageOperandsMask operator|(ImageOperandsMask a, ImageOperandsMask b) { return ImageOperandsMask(unsigned(a) | unsigned(b)); }
-inline ImageOperandsMask operator&(ImageOperandsMask a, ImageOperandsMask b) { return ImageOperandsMask(unsigned(a) & unsigned(b)); }
-inline ImageOperandsMask operator^(ImageOperandsMask a, ImageOperandsMask b) { return ImageOperandsMask(unsigned(a) ^ unsigned(b)); }
-inline ImageOperandsMask operator~(ImageOperandsMask a) { return ImageOperandsMask(~unsigned(a)); }
 inline FPFastMathModeMask operator|(FPFastMathModeMask a, FPFastMathModeMask b) { return FPFastMathModeMask(unsigned(a) | unsigned(b)); }
-inline FPFastMathModeMask operator&(FPFastMathModeMask a, FPFastMathModeMask b) { return FPFastMathModeMask(unsigned(a) & unsigned(b)); }
-inline FPFastMathModeMask operator^(FPFastMathModeMask a, FPFastMathModeMask b) { return FPFastMathModeMask(unsigned(a) ^ unsigned(b)); }
-inline FPFastMathModeMask operator~(FPFastMathModeMask a) { return FPFastMathModeMask(~unsigned(a)); }
 inline SelectionControlMask operator|(SelectionControlMask a, SelectionControlMask b) { return SelectionControlMask(unsigned(a) | unsigned(b)); }
-inline SelectionControlMask operator&(SelectionControlMask a, SelectionControlMask b) { return SelectionControlMask(unsigned(a) & unsigned(b)); }
-inline SelectionControlMask operator^(SelectionControlMask a, SelectionControlMask b) { return SelectionControlMask(unsigned(a) ^ unsigned(b)); }
-inline SelectionControlMask operator~(SelectionControlMask a) { return SelectionControlMask(~unsigned(a)); }
 inline LoopControlMask operator|(LoopControlMask a, LoopControlMask b) { return LoopControlMask(unsigned(a) | unsigned(b)); }
-inline LoopControlMask operator&(LoopControlMask a, LoopControlMask b) { return LoopControlMask(unsigned(a) & unsigned(b)); }
-inline LoopControlMask operator^(LoopControlMask a, LoopControlMask b) { return LoopControlMask(unsigned(a) ^ unsigned(b)); }
-inline LoopControlMask operator~(LoopControlMask a) { return LoopControlMask(~unsigned(a)); }
 inline FunctionControlMask operator|(FunctionControlMask a, FunctionControlMask b) { return FunctionControlMask(unsigned(a) | unsigned(b)); }
-inline FunctionControlMask operator&(FunctionControlMask a, FunctionControlMask b) { return FunctionControlMask(unsigned(a) & unsigned(b)); }
-inline FunctionControlMask operator^(FunctionControlMask a, FunctionControlMask b) { return FunctionControlMask(unsigned(a) ^ unsigned(b)); }
-inline FunctionControlMask operator~(FunctionControlMask a) { return FunctionControlMask(~unsigned(a)); }
 inline MemorySemanticsMask operator|(MemorySemanticsMask a, MemorySemanticsMask b) { return MemorySemanticsMask(unsigned(a) | unsigned(b)); }
-inline MemorySemanticsMask operator&(MemorySemanticsMask a, MemorySemanticsMask b) { return MemorySemanticsMask(unsigned(a) & unsigned(b)); }
-inline MemorySemanticsMask operator^(MemorySemanticsMask a, MemorySemanticsMask b) { return MemorySemanticsMask(unsigned(a) ^ unsigned(b)); }
-inline MemorySemanticsMask operator~(MemorySemanticsMask a) { return MemorySemanticsMask(~unsigned(a)); }
 inline MemoryAccessMask operator|(MemoryAccessMask a, MemoryAccessMask b) { return MemoryAccessMask(unsigned(a) | unsigned(b)); }
-inline MemoryAccessMask operator&(MemoryAccessMask a, MemoryAccessMask b) { return MemoryAccessMask(unsigned(a) & unsigned(b)); }
-inline MemoryAccessMask operator^(MemoryAccessMask a, MemoryAccessMask b) { return MemoryAccessMask(unsigned(a) ^ unsigned(b)); }
-inline MemoryAccessMask operator~(MemoryAccessMask a) { return MemoryAccessMask(~unsigned(a)); }
 inline KernelProfilingInfoMask operator|(KernelProfilingInfoMask a, KernelProfilingInfoMask b) { return KernelProfilingInfoMask(unsigned(a) | unsigned(b)); }
-inline KernelProfilingInfoMask operator&(KernelProfilingInfoMask a, KernelProfilingInfoMask b) { return KernelProfilingInfoMask(unsigned(a) & unsigned(b)); }
-inline KernelProfilingInfoMask operator^(KernelProfilingInfoMask a, KernelProfilingInfoMask b) { return KernelProfilingInfoMask(unsigned(a) ^ unsigned(b)); }
-inline KernelProfilingInfoMask operator~(KernelProfilingInfoMask a) { return KernelProfilingInfoMask(~unsigned(a)); }
 inline RayFlagsMask operator|(RayFlagsMask a, RayFlagsMask b) { return RayFlagsMask(unsigned(a) | unsigned(b)); }
-inline RayFlagsMask operator&(RayFlagsMask a, RayFlagsMask b) { return RayFlagsMask(unsigned(a) & unsigned(b)); }
-inline RayFlagsMask operator^(RayFlagsMask a, RayFlagsMask b) { return RayFlagsMask(unsigned(a) ^ unsigned(b)); }
-inline RayFlagsMask operator~(RayFlagsMask a) { return RayFlagsMask(~unsigned(a)); }
 inline FragmentShadingRateMask operator|(FragmentShadingRateMask a, FragmentShadingRateMask b) { return FragmentShadingRateMask(unsigned(a) | unsigned(b)); }
-inline FragmentShadingRateMask operator&(FragmentShadingRateMask a, FragmentShadingRateMask b) { return FragmentShadingRateMask(unsigned(a) & unsigned(b)); }
-inline FragmentShadingRateMask operator^(FragmentShadingRateMask a, FragmentShadingRateMask b) { return FragmentShadingRateMask(unsigned(a) ^ unsigned(b)); }
-inline FragmentShadingRateMask operator~(FragmentShadingRateMask a) { return FragmentShadingRateMask(~unsigned(a)); }
 
 }  // end namespace spv
 
diff --git a/include/spirv/unified1/spirv.hpp11 b/include/spirv/unified1/spirv.hpp11
index 341d333..f0f5871 100644
--- a/include/spirv/unified1/spirv.hpp11
+++ b/include/spirv/unified1/spirv.hpp11
@@ -195,7 +195,6 @@ enum class ExecutionMode : unsigned {
     NoGlobalOffsetINTEL = 5895,
     NumSIMDWorkitemsINTEL = 5896,
     SchedulerTargetFmaxMhzINTEL = 5903,
-    StreamingInterfaceINTEL = 6154,
     NamedBarrierCountINTEL = 6417,
     Max = 0x7fffffff,
 };
@@ -228,7 +227,6 @@ enum class StorageClass : unsigned {
     ShaderRecordBufferNV = 5343,
     PhysicalStorageBuffer = 5349,
     PhysicalStorageBufferEXT = 5349,
-    HitObjectAttributeNV = 5385,
     TaskPayloadWorkgroupEXT = 5402,
     CodeSectionINTEL = 5605,
     DeviceOnlyINTEL = 5936,
@@ -454,7 +452,6 @@ enum class FunctionParameterAttribute : unsigned {
     NoCapture = 5,
     NoWrite = 6,
     NoReadWrite = 7,
-    RuntimeAlignedINTEL = 5940,
     Max = 0x7fffffff,
 };
 
@@ -525,7 +522,6 @@ enum class Decoration : unsigned {
     RestrictPointerEXT = 5355,
     AliasedPointer = 5356,
     AliasedPointerEXT = 5356,
-    HitObjectShaderRecordBufferNV = 5386,
     BindlessSamplerNV = 5398,
     BindlessImageNV = 5399,
     BoundSamplerNV = 5400,
@@ -564,12 +560,8 @@ enum class Decoration : unsigned {
     PrefetchINTEL = 5902,
     StallEnableINTEL = 5905,
     FuseLoopsInFunctionINTEL = 5907,
-    MathOpDSPModeINTEL = 5909,
     AliasScopeINTEL = 5914,
     NoAliasINTEL = 5915,
-    InitiationIntervalINTEL = 5917,
-    MaxConcurrencyINTEL = 5918,
-    PipelineEnableINTEL = 5919,
     BufferLocationINTEL = 5921,
     IOPipeStorageINTEL = 5944,
     FunctionFloatingPointModeINTEL = 6080,
@@ -744,8 +736,6 @@ enum class LoopControlShift : unsigned {
     MaxInterleavingINTEL = 21,
     SpeculatedIterationsINTEL = 22,
     NoFusionINTEL = 23,
-    LoopCountINTEL = 24,
-    MaxReinvocationDelayINTEL = 25,
     Max = 0x7fffffff,
 };
 
@@ -768,8 +758,6 @@ enum class LoopControlMask : unsigned {
     MaxInterleavingINTEL = 0x00200000,
     SpeculatedIterationsINTEL = 0x00400000,
     NoFusionINTEL = 0x00800000,
-    LoopCountINTEL = 0x01000000,
-    MaxReinvocationDelayINTEL = 0x02000000,
 };
 
 enum class FunctionControlShift : unsigned {
@@ -1071,7 +1059,6 @@ enum class Capability : unsigned {
     DemoteToHelperInvocation = 5379,
     DemoteToHelperInvocationEXT = 5379,
     RayTracingOpacityMicromapEXT = 5381,
-    ShaderInvocationReorderNV = 5383,
     BindlessTextureNV = 5390,
     SubgroupShuffleINTEL = 5568,
     SubgroupBufferBlockIOINTEL = 5569,
@@ -1105,13 +1092,10 @@ enum class Capability : unsigned {
     FPGAMemoryAccessesINTEL = 5898,
     FPGAClusterAttributesINTEL = 5904,
     LoopFuseINTEL = 5906,
-    FPGADSPControlINTEL = 5908,
     MemoryAccessAliasingINTEL = 5910,
-    FPGAInvocationPipeliningAttributesINTEL = 5916,
     FPGABufferLocationINTEL = 5920,
     ArbitraryPrecisionFixedPointINTEL = 5922,
     USMStorageClassesINTEL = 5935,
-    RuntimeAlignedAttributeINTEL = 5939,
     IOPipesINTEL = 5943,
     BlockingPipesINTEL = 5945,
     FPGARegINTEL = 5948,
@@ -1628,39 +1612,6 @@ enum class Op : unsigned {
     OpFragmentMaskFetchAMD = 5011,
     OpFragmentFetchAMD = 5012,
     OpReadClockKHR = 5056,
-    OpHitObjectRecordHitMotionNV = 5249,
-    OpHitObjectRecordHitWithIndexMotionNV = 5250,
-    OpHitObjectRecordMissMotionNV = 5251,
-    OpHitObjectGetWorldToObjectNV = 5252,
-    OpHitObjectGetObjectToWorldNV = 5253,
-    OpHitObjectGetObjectRayDirectionNV = 5254,
-    OpHitObjectGetObjectRayOriginNV = 5255,
-    OpHitObjectTraceRayMotionNV = 5256,
-    OpHitObjectGetShaderRecordBufferHandleNV = 5257,
-    OpHitObjectGetShaderBindingTableRecordIndexNV = 5258,
-    OpHitObjectRecordEmptyNV = 5259,
-    OpHitObjectTraceRayNV = 5260,
-    OpHitObjectRecordHitNV = 5261,
-    OpHitObjectRecordHitWithIndexNV = 5262,
-    OpHitObjectRecordMissNV = 5263,
-    OpHitObjectExecuteShaderNV = 5264,
-    OpHitObjectGetCurrentTimeNV = 5265,
-    OpHitObjectGetAttributesNV = 5266,
-    OpHitObjectGetHitKindNV = 5267,
-    OpHitObjectGetPrimitiveIndexNV = 5268,
-    OpHitObjectGetGeometryIndexNV = 5269,
-    OpHitObjectGetInstanceIdNV = 5270,
-    OpHitObjectGetInstanceCustomIndexNV = 5271,
-    OpHitObjectGetWorldRayDirectionNV = 5272,
-    OpHitObjectGetWorldRayOriginNV = 5273,
-    OpHitObjectGetRayTMaxNV = 5274,
-    OpHitObjectGetRayTMinNV = 5275,
-    OpHitObjectIsEmptyNV = 5276,
-    OpHitObjectIsHitNV = 5277,
-    OpHitObjectIsMissNV = 5278,
-    OpReorderThreadWithHitObjectNV = 5279,
-    OpReorderThreadWithHintNV = 5280,
-    OpTypeHitObjectNV = 5281,
     OpImageSampleFootprintNV = 5283,
     OpEmitMeshTasksEXT = 5294,
     OpSetMeshOutputsEXT = 5295,
@@ -2336,39 +2287,6 @@ inline void HasResultAndType(Op opcode, bool *hasResult, bool *hasResultType) {
     case Op::OpFragmentMaskFetchAMD: *hasResult = true; *hasResultType = true; break;
     case Op::OpFragmentFetchAMD: *hasResult = true; *hasResultType = true; break;
     case Op::OpReadClockKHR: *hasResult = true; *hasResultType = true; break;
-    case Op::OpHitObjectRecordHitMotionNV: *hasResult = false; *hasResultType = false; break;
-    case Op::OpHitObjectRecordHitWithIndexMotionNV: *hasResult = false; *hasResultType = false; break;
-    case Op::OpHitObjectRecordMissMotionNV: *hasResult = false; *hasResultType = false; break;
-    case Op::OpHitObjectGetWorldToObjectNV: *hasResult = true; *hasResultType = true; break;
-    case Op::OpHitObjectGetObjectToWorldNV: *hasResult = true; *hasResultType = true; break;
-    case Op::OpHitObjectGetObjectRayDirectionNV: *hasResult = true; *hasResultType = true; break;
-    case Op::OpHitObjectGetObjectRayOriginNV: *hasResult = true; *hasResultType = true; break;
-    case Op::OpHitObjectTraceRayMotionNV: *hasResult = false; *hasResultType = false; break;
-    case Op::OpHitObjectGetShaderRecordBufferHandleNV: *hasResult = true; *hasResultType = true; break;
-    case Op::OpHitObjectGetShaderBindingTableRecordIndexNV: *hasResult = true; *hasResultType = true; break;
-    case Op::OpHitObjectRecordEmptyNV: *hasResult = false; *hasResultType = false; break;
-    case Op::OpHitObjectTraceRayNV: *hasResult = false; *hasResultType = false; break;
-    case Op::OpHitObjectRecordHitNV: *hasResult = false; *hasResultType = false; break;
-    case Op::OpHitObjectRecordHitWithIndexNV: *hasResult = false; *hasResultType = false; break;
-    case Op::OpHitObjectRecordMissNV: *hasResult = false; *hasResultType = false; break;
-    case Op::OpHitObjectExecuteShaderNV: *hasResult = false; *hasResultType = false; break;
-    case Op::OpHitObjectGetCurrentTimeNV: *hasResult = true; *hasResultType = true; break;
-    case Op::OpHitObjectGetAttributesNV: *hasResult = false; *hasResultType = false; break;
-    case Op::OpHitObjectGetHitKindNV: *hasResult = true; *hasResultType = true; break;
-    case Op::OpHitObjectGetPrimitiveIndexNV: *hasResult = true; *hasResultType = true; break;
-    case Op::OpHitObjectGetGeometryIndexNV: *hasResult = true; *hasResultType = true; break;
-    case Op::OpHitObjectGetInstanceIdNV: *hasResult = true; *hasResultType = true; break;
-    case Op::OpHitObjectGetInstanceCustomIndexNV: *hasResult = true; *hasResultType = true; break;
-    case Op::OpHitObjectGetWorldRayDirectionNV: *hasResult = true; *hasResultType = true; break;
-    case Op::OpHitObjectGetWorldRayOriginNV: *hasResult = true; *hasResultType = true; break;
-    case Op::OpHitObjectGetRayTMaxNV: *hasResult = true; *hasResultType = true; break;
-    case Op::OpHitObjectGetRayTMinNV: *hasResult = true; *hasResultType = true; break;
-    case Op::OpHitObjectIsEmptyNV: *hasResult = true; *hasResultType = true; break;
-    case Op::OpHitObjectIsHitNV: *hasResult = true; *hasResultType = true; break;
-    case Op::OpHitObjectIsMissNV: *hasResult = true; *hasResultType = true; break;
-    case Op::OpReorderThreadWithHitObjectNV: *hasResult = false; *hasResultType = false; break;
-    case Op::OpReorderThreadWithHintNV: *hasResult = false; *hasResultType = false; break;
-    case Op::OpTypeHitObjectNV: *hasResult = true; *hasResultType = false; break;
     case Op::OpImageSampleFootprintNV: *hasResult = true; *hasResultType = true; break;
     case Op::OpEmitMeshTasksEXT: *hasResult = false; *hasResultType = false; break;
     case Op::OpSetMeshOutputsEXT: *hasResult = false; *hasResultType = false; break;
@@ -2651,48 +2569,18 @@ inline void HasResultAndType(Op opcode, bool *hasResult, bool *hasResultType) {
 }
 #endif /* SPV_ENABLE_UTILITY_CODE */
 
-// Overload bitwise operators for mask bit combining
+// Overload operator| for mask bit combining
 
 inline ImageOperandsMask operator|(ImageOperandsMask a, ImageOperandsMask b) { return ImageOperandsMask(unsigned(a) | unsigned(b)); }
-inline ImageOperandsMask operator&(ImageOperandsMask a, ImageOperandsMask b) { return ImageOperandsMask(unsigned(a) & unsigned(b)); }
-inline ImageOperandsMask operator^(ImageOperandsMask a, ImageOperandsMask b) { return ImageOperandsMask(unsigned(a) ^ unsigned(b)); }
-inline ImageOperandsMask operator~(ImageOperandsMask a) { return ImageOperandsMask(~unsigned(a)); }
 inline FPFastMathModeMask operator|(FPFastMathModeMask a, FPFastMathModeMask b) { return FPFastMathModeMask(unsigned(a) | unsigned(b)); }
-inline FPFastMathModeMask operator&(FPFastMathModeMask a, FPFastMathModeMask b) { return FPFastMathModeMask(unsigned(a) & unsigned(b)); }
-inline FPFastMathModeMask operator^(FPFastMathModeMask a, FPFastMathModeMask b) { return FPFastMathModeMask(unsigned(a) ^ unsigned(b)); }
-inline FPFastMathModeMask operator~(FPFastMathModeMask a) { return FPFastMathModeMask(~unsigned(a)); }
 inline SelectionControlMask operator|(SelectionControlMask a, SelectionControlMask b) { return SelectionControlMask(unsigned(a) | unsigned(b)); }
-inline SelectionControlMask operator&(SelectionControlMask a, SelectionControlMask b) { return SelectionControlMask(unsigned(a) & unsigned(b)); }
-inline SelectionControlMask operator^(SelectionControlMask a, SelectionControlMask b) { return SelectionControlMask(unsigned(a) ^ unsigned(b)); }
-inline SelectionControlMask operator~(SelectionControlMask a) { return SelectionControlMask(~unsigned(a)); }
 inline LoopControlMask operator|(LoopControlMask a, LoopControlMask b) { return LoopControlMask(unsigned(a) | unsigned(b)); }
-inline LoopControlMask operator&(LoopControlMask a, LoopControlMask b) { return LoopControlMask(unsigned(a) & unsigned(b)); }
-inline LoopControlMask operator^(LoopControlMask a, LoopControlMask b) { return LoopControlMask(unsigned(a) ^ unsigned(b)); }
-inline LoopControlMask operator~(LoopControlMask a) { return LoopControlMask(~unsigned(a)); }
 inline FunctionControlMask operator|(FunctionControlMask a, FunctionControlMask b) { return FunctionControlMask(unsigned(a) | unsigned(b)); }
-inline FunctionControlMask operator&(FunctionControlMask a, FunctionControlMask b) { return FunctionControlMask(unsigned(a) & unsigned(b)); }
-inline FunctionControlMask operator^(FunctionControlMask a, FunctionControlMask b) { return FunctionControlMask(unsigned(a) ^ unsigned(b)); }
-inline FunctionControlMask operator~(FunctionControlMask a) { return FunctionControlMask(~unsigned(a)); }
 inline MemorySemanticsMask operator|(MemorySemanticsMask a, MemorySemanticsMask b) { return MemorySemanticsMask(unsigned(a) | unsigned(b)); }
-inline MemorySemanticsMask operator&(MemorySemanticsMask a, MemorySemanticsMask b) { return MemorySemanticsMask(unsigned(a) & unsigned(b)); }
-inline MemorySemanticsMask operator^(MemorySemanticsMask a, MemorySemanticsMask b) { return MemorySemanticsMask(unsigned(a) ^ unsigned(b)); }
-inline MemorySemanticsMask operator~(MemorySemanticsMask a) { return MemorySemanticsMask(~unsigned(a)); }
 inline MemoryAccessMask operator|(MemoryAccessMask a, MemoryAccessMask b) { return MemoryAccessMask(unsigned(a) | unsigned(b)); }
-inline MemoryAccessMask operator&(MemoryAccessMask a, MemoryAccessMask b) { return MemoryAccessMask(unsigned(a) & unsigned(b)); }
-inline MemoryAccessMask operator^(MemoryAccessMask a, MemoryAccessMask b) { return MemoryAccessMask(unsigned(a) ^ unsigned(b)); }
-inline MemoryAccessMask operator~(MemoryAccessMask a) { return MemoryAccessMask(~unsigned(a)); }
 inline KernelProfilingInfoMask operator|(KernelProfilingInfoMask a, KernelProfilingInfoMask b) { return KernelProfilingInfoMask(unsigned(a) | unsigned(b)); }
-inline KernelProfilingInfoMask operator&(KernelProfilingInfoMask a, KernelProfilingInfoMask b) { return KernelProfilingInfoMask(unsigned(a) & unsigned(b)); }
-inline KernelProfilingInfoMask operator^(KernelProfilingInfoMask a, KernelProfilingInfoMask b) { return KernelProfilingInfoMask(unsigned(a) ^ unsigned(b)); }
-inline KernelProfilingInfoMask operator~(KernelProfilingInfoMask a) { return KernelProfilingInfoMask(~unsigned(a)); }
 inline RayFlagsMask operator|(RayFlagsMask a, RayFlagsMask b) { return RayFlagsMask(unsigned(a) | unsigned(b)); }
-inline RayFlagsMask operator&(RayFlagsMask a, RayFlagsMask b) { return RayFlagsMask(unsigned(a) & unsigned(b)); }
-inline RayFlagsMask operator^(RayFlagsMask a, RayFlagsMask b) { return RayFlagsMask(unsigned(a) ^ unsigned(b)); }
-inline RayFlagsMask operator~(RayFlagsMask a) { return RayFlagsMask(~unsigned(a)); }
 inline FragmentShadingRateMask operator|(FragmentShadingRateMask a, FragmentShadingRateMask b) { return FragmentShadingRateMask(unsigned(a) | unsigned(b)); }
-inline FragmentShadingRateMask operator&(FragmentShadingRateMask a, FragmentShadingRateMask b) { return FragmentShadingRateMask(unsigned(a) & unsigned(b)); }
-inline FragmentShadingRateMask operator^(FragmentShadingRateMask a, FragmentShadingRateMask b) { return FragmentShadingRateMask(unsigned(a) ^ unsigned(b)); }
-inline FragmentShadingRateMask operator~(FragmentShadingRateMask a) { return FragmentShadingRateMask(~unsigned(a)); }
 
 }  // end namespace spv
 
diff --git a/include/spirv/unified1/spirv.json b/include/spirv/unified1/spirv.json
index 4cd00db..466f0b0 100644
--- a/include/spirv/unified1/spirv.json
+++ b/include/spirv/unified1/spirv.json
@@ -214,7 +214,6 @@
                     "NoGlobalOffsetINTEL": 5895,
                     "NumSIMDWorkitemsINTEL": 5896,
                     "SchedulerTargetFmaxMhzINTEL": 5903,
-                    "StreamingInterfaceINTEL": 6154,
                     "NamedBarrierCountINTEL": 6417
                 }
             },
@@ -250,7 +249,6 @@
                     "ShaderRecordBufferNV": 5343,
                     "PhysicalStorageBuffer": 5349,
                     "PhysicalStorageBufferEXT": 5349,
-                    "HitObjectAttributeNV": 5385,
                     "TaskPayloadWorkgroupEXT": 5402,
                     "CodeSectionINTEL": 5605,
                     "DeviceOnlyINTEL": 5936,
@@ -476,8 +474,7 @@
                     "NoAlias": 4,
                     "NoCapture": 5,
                     "NoWrite": 6,
-                    "NoReadWrite": 7,
-                    "RuntimeAlignedINTEL": 5940
+                    "NoReadWrite": 7
                 }
             },
             {
@@ -551,7 +548,6 @@
                     "RestrictPointerEXT": 5355,
                     "AliasedPointer": 5356,
                     "AliasedPointerEXT": 5356,
-                    "HitObjectShaderRecordBufferNV": 5386,
                     "BindlessSamplerNV": 5398,
                     "BindlessImageNV": 5399,
                     "BoundSamplerNV": 5400,
@@ -590,12 +586,8 @@
                     "PrefetchINTEL": 5902,
                     "StallEnableINTEL": 5905,
                     "FuseLoopsInFunctionINTEL": 5907,
-                    "MathOpDSPModeINTEL": 5909,
                     "AliasScopeINTEL": 5914,
                     "NoAliasINTEL": 5915,
-                    "InitiationIntervalINTEL": 5917,
-                    "MaxConcurrencyINTEL": 5918,
-                    "PipelineEnableINTEL": 5919,
                     "BufferLocationINTEL": 5921,
                     "IOPipeStorageINTEL": 5944,
                     "FunctionFloatingPointModeINTEL": 6080,
@@ -772,9 +764,7 @@
                     "LoopCoalesceINTEL": 20,
                     "MaxInterleavingINTEL": 21,
                     "SpeculatedIterationsINTEL": 22,
-                    "NoFusionINTEL": 23,
-                    "LoopCountINTEL": 24,
-                    "MaxReinvocationDelayINTEL": 25
+                    "NoFusionINTEL": 23
                 }
             },
             {
@@ -1051,7 +1041,6 @@
                     "DemoteToHelperInvocation": 5379,
                     "DemoteToHelperInvocationEXT": 5379,
                     "RayTracingOpacityMicromapEXT": 5381,
-                    "ShaderInvocationReorderNV": 5383,
                     "BindlessTextureNV": 5390,
                     "SubgroupShuffleINTEL": 5568,
                     "SubgroupBufferBlockIOINTEL": 5569,
@@ -1085,13 +1074,10 @@
                     "FPGAMemoryAccessesINTEL": 5898,
                     "FPGAClusterAttributesINTEL": 5904,
                     "LoopFuseINTEL": 5906,
-                    "FPGADSPControlINTEL": 5908,
                     "MemoryAccessAliasingINTEL": 5910,
-                    "FPGAInvocationPipeliningAttributesINTEL": 5916,
                     "FPGABufferLocationINTEL": 5920,
                     "ArbitraryPrecisionFixedPointINTEL": 5922,
                     "USMStorageClassesINTEL": 5935,
-                    "RuntimeAlignedAttributeINTEL": 5939,
                     "IOPipesINTEL": 5943,
                     "BlockingPipesINTEL": 5945,
                     "FPGARegINTEL": 5948,
@@ -1618,39 +1604,6 @@
                     "OpFragmentMaskFetchAMD": 5011,
                     "OpFragmentFetchAMD": 5012,
                     "OpReadClockKHR": 5056,
-                    "OpHitObjectRecordHitMotionNV": 5249,
-                    "OpHitObjectRecordHitWithIndexMotionNV": 5250,
-                    "OpHitObjectRecordMissMotionNV": 5251,
-                    "OpHitObjectGetWorldToObjectNV": 5252,
-                    "OpHitObjectGetObjectToWorldNV": 5253,
-                    "OpHitObjectGetObjectRayDirectionNV": 5254,
-                    "OpHitObjectGetObjectRayOriginNV": 5255,
-                    "OpHitObjectTraceRayMotionNV": 5256,
-                    "OpHitObjectGetShaderRecordBufferHandleNV": 5257,
-                    "OpHitObjectGetShaderBindingTableRecordIndexNV": 5258,
-                    "OpHitObjectRecordEmptyNV": 5259,
-                    "OpHitObjectTraceRayNV": 5260,
-                    "OpHitObjectRecordHitNV": 5261,
-                    "OpHitObjectRecordHitWithIndexNV": 5262,
-                    "OpHitObjectRecordMissNV": 5263,
-                    "OpHitObjectExecuteShaderNV": 5264,
-                    "OpHitObjectGetCurrentTimeNV": 5265,
-                    "OpHitObjectGetAttributesNV": 5266,
-                    "OpHitObjectGetHitKindNV": 5267,
-                    "OpHitObjectGetPrimitiveIndexNV": 5268,
-                    "OpHitObjectGetGeometryIndexNV": 5269,
-                    "OpHitObjectGetInstanceIdNV": 5270,
-                    "OpHitObjectGetInstanceCustomIndexNV": 5271,
-                    "OpHitObjectGetWorldRayDirectionNV": 5272,
-                    "OpHitObjectGetWorldRayOriginNV": 5273,
-                    "OpHitObjectGetRayTMaxNV": 5274,
-                    "OpHitObjectGetRayTMinNV": 5275,
-                    "OpHitObjectIsEmptyNV": 5276,
-                    "OpHitObjectIsHitNV": 5277,
-                    "OpHitObjectIsMissNV": 5278,
-                    "OpReorderThreadWithHitObjectNV": 5279,
-                    "OpReorderThreadWithHintNV": 5280,
-                    "OpTypeHitObjectNV": 5281,
                     "OpImageSampleFootprintNV": 5283,
                     "OpEmitMeshTasksEXT": 5294,
                     "OpSetMeshOutputsEXT": 5295,
diff --git a/include/spirv/unified1/spirv.lua b/include/spirv/unified1/spirv.lua
index a755d04..b763c84 100644
--- a/include/spirv/unified1/spirv.lua
+++ b/include/spirv/unified1/spirv.lua
@@ -182,7 +182,6 @@ spv = {
         NoGlobalOffsetINTEL = 5895,
         NumSIMDWorkitemsINTEL = 5896,
         SchedulerTargetFmaxMhzINTEL = 5903,
-        StreamingInterfaceINTEL = 6154,
         NamedBarrierCountINTEL = 6417,
     },
 
@@ -214,7 +213,6 @@ spv = {
         ShaderRecordBufferNV = 5343,
         PhysicalStorageBuffer = 5349,
         PhysicalStorageBufferEXT = 5349,
-        HitObjectAttributeNV = 5385,
         TaskPayloadWorkgroupEXT = 5402,
         CodeSectionINTEL = 5605,
         DeviceOnlyINTEL = 5936,
@@ -428,7 +426,6 @@ spv = {
         NoCapture = 5,
         NoWrite = 6,
         NoReadWrite = 7,
-        RuntimeAlignedINTEL = 5940,
     },
 
     Decoration = {
@@ -498,7 +495,6 @@ spv = {
         RestrictPointerEXT = 5355,
         AliasedPointer = 5356,
         AliasedPointerEXT = 5356,
-        HitObjectShaderRecordBufferNV = 5386,
         BindlessSamplerNV = 5398,
         BindlessImageNV = 5399,
         BoundSamplerNV = 5400,
@@ -537,12 +533,8 @@ spv = {
         PrefetchINTEL = 5902,
         StallEnableINTEL = 5905,
         FuseLoopsInFunctionINTEL = 5907,
-        MathOpDSPModeINTEL = 5909,
         AliasScopeINTEL = 5914,
         NoAliasINTEL = 5915,
-        InitiationIntervalINTEL = 5917,
-        MaxConcurrencyINTEL = 5918,
-        PipelineEnableINTEL = 5919,
         BufferLocationINTEL = 5921,
         IOPipeStorageINTEL = 5944,
         FunctionFloatingPointModeINTEL = 6080,
@@ -714,8 +706,6 @@ spv = {
         MaxInterleavingINTEL = 21,
         SpeculatedIterationsINTEL = 22,
         NoFusionINTEL = 23,
-        LoopCountINTEL = 24,
-        MaxReinvocationDelayINTEL = 25,
     },
 
     LoopControlMask = {
@@ -737,8 +727,6 @@ spv = {
         MaxInterleavingINTEL = 0x00200000,
         SpeculatedIterationsINTEL = 0x00400000,
         NoFusionINTEL = 0x00800000,
-        LoopCountINTEL = 0x01000000,
-        MaxReinvocationDelayINTEL = 0x02000000,
     },
 
     FunctionControlShift = {
@@ -1033,7 +1021,6 @@ spv = {
         DemoteToHelperInvocation = 5379,
         DemoteToHelperInvocationEXT = 5379,
         RayTracingOpacityMicromapEXT = 5381,
-        ShaderInvocationReorderNV = 5383,
         BindlessTextureNV = 5390,
         SubgroupShuffleINTEL = 5568,
         SubgroupBufferBlockIOINTEL = 5569,
@@ -1067,13 +1054,10 @@ spv = {
         FPGAMemoryAccessesINTEL = 5898,
         FPGAClusterAttributesINTEL = 5904,
         LoopFuseINTEL = 5906,
-        FPGADSPControlINTEL = 5908,
         MemoryAccessAliasingINTEL = 5910,
-        FPGAInvocationPipeliningAttributesINTEL = 5916,
         FPGABufferLocationINTEL = 5920,
         ArbitraryPrecisionFixedPointINTEL = 5922,
         USMStorageClassesINTEL = 5935,
-        RuntimeAlignedAttributeINTEL = 5939,
         IOPipesINTEL = 5943,
         BlockingPipesINTEL = 5945,
         FPGARegINTEL = 5948,
@@ -1579,39 +1563,6 @@ spv = {
         OpFragmentMaskFetchAMD = 5011,
         OpFragmentFetchAMD = 5012,
         OpReadClockKHR = 5056,
-        OpHitObjectRecordHitMotionNV = 5249,
-        OpHitObjectRecordHitWithIndexMotionNV = 5250,
-        OpHitObjectRecordMissMotionNV = 5251,
-        OpHitObjectGetWorldToObjectNV = 5252,
-        OpHitObjectGetObjectToWorldNV = 5253,
-        OpHitObjectGetObjectRayDirectionNV = 5254,
-        OpHitObjectGetObjectRayOriginNV = 5255,
-        OpHitObjectTraceRayMotionNV = 5256,
-        OpHitObjectGetShaderRecordBufferHandleNV = 5257,
-        OpHitObjectGetShaderBindingTableRecordIndexNV = 5258,
-        OpHitObjectRecordEmptyNV = 5259,
-        OpHitObjectTraceRayNV = 5260,
-        OpHitObjectRecordHitNV = 5261,
-        OpHitObjectRecordHitWithIndexNV = 5262,
-        OpHitObjectRecordMissNV = 5263,
-        OpHitObjectExecuteShaderNV = 5264,
-        OpHitObjectGetCurrentTimeNV = 5265,
-        OpHitObjectGetAttributesNV = 5266,
-        OpHitObjectGetHitKindNV = 5267,
-        OpHitObjectGetPrimitiveIndexNV = 5268,
-        OpHitObjectGetGeometryIndexNV = 5269,
-        OpHitObjectGetInstanceIdNV = 5270,
-        OpHitObjectGetInstanceCustomIndexNV = 5271,
-        OpHitObjectGetWorldRayDirectionNV = 5272,
-        OpHitObjectGetWorldRayOriginNV = 5273,
-        OpHitObjectGetRayTMaxNV = 5274,
-        OpHitObjectGetRayTMinNV = 5275,
-        OpHitObjectIsEmptyNV = 5276,
-        OpHitObjectIsHitNV = 5277,
-        OpHitObjectIsMissNV = 5278,
-        OpReorderThreadWithHitObjectNV = 5279,
-        OpReorderThreadWithHintNV = 5280,
-        OpTypeHitObjectNV = 5281,
         OpImageSampleFootprintNV = 5283,
         OpEmitMeshTasksEXT = 5294,
         OpSetMeshOutputsEXT = 5295,
diff --git a/include/spirv/unified1/spirv.py b/include/spirv/unified1/spirv.py
index 8a8b979..12e3401 100644
--- a/include/spirv/unified1/spirv.py
+++ b/include/spirv/unified1/spirv.py
@@ -182,7 +182,6 @@ spv = {
         'NoGlobalOffsetINTEL' : 5895,
         'NumSIMDWorkitemsINTEL' : 5896,
         'SchedulerTargetFmaxMhzINTEL' : 5903,
-        'StreamingInterfaceINTEL' : 6154,
         'NamedBarrierCountINTEL' : 6417,
     },
 
@@ -214,7 +213,6 @@ spv = {
         'ShaderRecordBufferNV' : 5343,
         'PhysicalStorageBuffer' : 5349,
         'PhysicalStorageBufferEXT' : 5349,
-        'HitObjectAttributeNV' : 5385,
         'TaskPayloadWorkgroupEXT' : 5402,
         'CodeSectionINTEL' : 5605,
         'DeviceOnlyINTEL' : 5936,
@@ -428,7 +426,6 @@ spv = {
         'NoCapture' : 5,
         'NoWrite' : 6,
         'NoReadWrite' : 7,
-        'RuntimeAlignedINTEL' : 5940,
     },
 
     'Decoration' : {
@@ -498,7 +495,6 @@ spv = {
         'RestrictPointerEXT' : 5355,
         'AliasedPointer' : 5356,
         'AliasedPointerEXT' : 5356,
-        'HitObjectShaderRecordBufferNV' : 5386,
         'BindlessSamplerNV' : 5398,
         'BindlessImageNV' : 5399,
         'BoundSamplerNV' : 5400,
@@ -537,12 +533,8 @@ spv = {
         'PrefetchINTEL' : 5902,
         'StallEnableINTEL' : 5905,
         'FuseLoopsInFunctionINTEL' : 5907,
-        'MathOpDSPModeINTEL' : 5909,
         'AliasScopeINTEL' : 5914,
         'NoAliasINTEL' : 5915,
-        'InitiationIntervalINTEL' : 5917,
-        'MaxConcurrencyINTEL' : 5918,
-        'PipelineEnableINTEL' : 5919,
         'BufferLocationINTEL' : 5921,
         'IOPipeStorageINTEL' : 5944,
         'FunctionFloatingPointModeINTEL' : 6080,
@@ -714,8 +706,6 @@ spv = {
         'MaxInterleavingINTEL' : 21,
         'SpeculatedIterationsINTEL' : 22,
         'NoFusionINTEL' : 23,
-        'LoopCountINTEL' : 24,
-        'MaxReinvocationDelayINTEL' : 25,
     },
 
     'LoopControlMask' : {
@@ -737,8 +727,6 @@ spv = {
         'MaxInterleavingINTEL' : 0x00200000,
         'SpeculatedIterationsINTEL' : 0x00400000,
         'NoFusionINTEL' : 0x00800000,
-        'LoopCountINTEL' : 0x01000000,
-        'MaxReinvocationDelayINTEL' : 0x02000000,
     },
 
     'FunctionControlShift' : {
@@ -1033,7 +1021,6 @@ spv = {
         'DemoteToHelperInvocation' : 5379,
         'DemoteToHelperInvocationEXT' : 5379,
         'RayTracingOpacityMicromapEXT' : 5381,
-        'ShaderInvocationReorderNV' : 5383,
         'BindlessTextureNV' : 5390,
         'SubgroupShuffleINTEL' : 5568,
         'SubgroupBufferBlockIOINTEL' : 5569,
@@ -1067,13 +1054,10 @@ spv = {
         'FPGAMemoryAccessesINTEL' : 5898,
         'FPGAClusterAttributesINTEL' : 5904,
         'LoopFuseINTEL' : 5906,
-        'FPGADSPControlINTEL' : 5908,
         'MemoryAccessAliasingINTEL' : 5910,
-        'FPGAInvocationPipeliningAttributesINTEL' : 5916,
         'FPGABufferLocationINTEL' : 5920,
         'ArbitraryPrecisionFixedPointINTEL' : 5922,
         'USMStorageClassesINTEL' : 5935,
-        'RuntimeAlignedAttributeINTEL' : 5939,
         'IOPipesINTEL' : 5943,
         'BlockingPipesINTEL' : 5945,
         'FPGARegINTEL' : 5948,
@@ -1579,39 +1563,6 @@ spv = {
         'OpFragmentMaskFetchAMD' : 5011,
         'OpFragmentFetchAMD' : 5012,
         'OpReadClockKHR' : 5056,
-        'OpHitObjectRecordHitMotionNV' : 5249,
-        'OpHitObjectRecordHitWithIndexMotionNV' : 5250,
-        'OpHitObjectRecordMissMotionNV' : 5251,
-        'OpHitObjectGetWorldToObjectNV' : 5252,
-        'OpHitObjectGetObjectToWorldNV' : 5253,
-        'OpHitObjectGetObjectRayDirectionNV' : 5254,
-        'OpHitObjectGetObjectRayOriginNV' : 5255,
-        'OpHitObjectTraceRayMotionNV' : 5256,
-        'OpHitObjectGetShaderRecordBufferHandleNV' : 5257,
-        'OpHitObjectGetShaderBindingTableRecordIndexNV' : 5258,
-        'OpHitObjectRecordEmptyNV' : 5259,
-        'OpHitObjectTraceRayNV' : 5260,
-        'OpHitObjectRecordHitNV' : 5261,
-        'OpHitObjectRecordHitWithIndexNV' : 5262,
-        'OpHitObjectRecordMissNV' : 5263,
-        'OpHitObjectExecuteShaderNV' : 5264,
-        'OpHitObjectGetCurrentTimeNV' : 5265,
-        'OpHitObjectGetAttributesNV' : 5266,
-        'OpHitObjectGetHitKindNV' : 5267,
-        'OpHitObjectGetPrimitiveIndexNV' : 5268,
-        'OpHitObjectGetGeometryIndexNV' : 5269,
-        'OpHitObjectGetInstanceIdNV' : 5270,
-        'OpHitObjectGetInstanceCustomIndexNV' : 5271,
-        'OpHitObjectGetWorldRayDirectionNV' : 5272,
-        'OpHitObjectGetWorldRayOriginNV' : 5273,
-        'OpHitObjectGetRayTMaxNV' : 5274,
-        'OpHitObjectGetRayTMinNV' : 5275,
-        'OpHitObjectIsEmptyNV' : 5276,
-        'OpHitObjectIsHitNV' : 5277,
-        'OpHitObjectIsMissNV' : 5278,
-        'OpReorderThreadWithHitObjectNV' : 5279,
-        'OpReorderThreadWithHintNV' : 5280,
-        'OpTypeHitObjectNV' : 5281,
         'OpImageSampleFootprintNV' : 5283,
         'OpEmitMeshTasksEXT' : 5294,
         'OpSetMeshOutputsEXT' : 5295,
diff --git a/include/spirv/unified1/spv.d b/include/spirv/unified1/spv.d
index 7b5f89f..6462405 100644
--- a/include/spirv/unified1/spv.d
+++ b/include/spirv/unified1/spv.d
@@ -194,7 +194,6 @@ enum ExecutionMode : uint
     NoGlobalOffsetINTEL = 5895,
     NumSIMDWorkitemsINTEL = 5896,
     SchedulerTargetFmaxMhzINTEL = 5903,
-    StreamingInterfaceINTEL = 6154,
     NamedBarrierCountINTEL = 6417,
 }
 
@@ -227,7 +226,6 @@ enum StorageClass : uint
     ShaderRecordBufferNV = 5343,
     PhysicalStorageBuffer = 5349,
     PhysicalStorageBufferEXT = 5349,
-    HitObjectAttributeNV = 5385,
     TaskPayloadWorkgroupEXT = 5402,
     CodeSectionINTEL = 5605,
     DeviceOnlyINTEL = 5936,
@@ -455,7 +453,6 @@ enum FunctionParameterAttribute : uint
     NoCapture = 5,
     NoWrite = 6,
     NoReadWrite = 7,
-    RuntimeAlignedINTEL = 5940,
 }
 
 enum Decoration : uint
@@ -526,7 +523,6 @@ enum Decoration : uint
     RestrictPointerEXT = 5355,
     AliasedPointer = 5356,
     AliasedPointerEXT = 5356,
-    HitObjectShaderRecordBufferNV = 5386,
     BindlessSamplerNV = 5398,
     BindlessImageNV = 5399,
     BoundSamplerNV = 5400,
@@ -565,12 +561,8 @@ enum Decoration : uint
     PrefetchINTEL = 5902,
     StallEnableINTEL = 5905,
     FuseLoopsInFunctionINTEL = 5907,
-    MathOpDSPModeINTEL = 5909,
     AliasScopeINTEL = 5914,
     NoAliasINTEL = 5915,
-    InitiationIntervalINTEL = 5917,
-    MaxConcurrencyINTEL = 5918,
-    PipelineEnableINTEL = 5919,
     BufferLocationINTEL = 5921,
     IOPipeStorageINTEL = 5944,
     FunctionFloatingPointModeINTEL = 6080,
@@ -746,8 +738,6 @@ enum LoopControlShift : uint
     MaxInterleavingINTEL = 21,
     SpeculatedIterationsINTEL = 22,
     NoFusionINTEL = 23,
-    LoopCountINTEL = 24,
-    MaxReinvocationDelayINTEL = 25,
 }
 
 enum LoopControlMask : uint
@@ -770,8 +760,6 @@ enum LoopControlMask : uint
     MaxInterleavingINTEL = 0x00200000,
     SpeculatedIterationsINTEL = 0x00400000,
     NoFusionINTEL = 0x00800000,
-    LoopCountINTEL = 0x01000000,
-    MaxReinvocationDelayINTEL = 0x02000000,
 }
 
 enum FunctionControlShift : uint
@@ -1078,7 +1066,6 @@ enum Capability : uint
     DemoteToHelperInvocation = 5379,
     DemoteToHelperInvocationEXT = 5379,
     RayTracingOpacityMicromapEXT = 5381,
-    ShaderInvocationReorderNV = 5383,
     BindlessTextureNV = 5390,
     SubgroupShuffleINTEL = 5568,
     SubgroupBufferBlockIOINTEL = 5569,
@@ -1112,13 +1099,10 @@ enum Capability : uint
     FPGAMemoryAccessesINTEL = 5898,
     FPGAClusterAttributesINTEL = 5904,
     LoopFuseINTEL = 5906,
-    FPGADSPControlINTEL = 5908,
     MemoryAccessAliasingINTEL = 5910,
-    FPGAInvocationPipeliningAttributesINTEL = 5916,
     FPGABufferLocationINTEL = 5920,
     ArbitraryPrecisionFixedPointINTEL = 5922,
     USMStorageClassesINTEL = 5935,
-    RuntimeAlignedAttributeINTEL = 5939,
     IOPipesINTEL = 5943,
     BlockingPipesINTEL = 5945,
     FPGARegINTEL = 5948,
@@ -1637,39 +1621,6 @@ enum Op : uint
     OpFragmentMaskFetchAMD = 5011,
     OpFragmentFetchAMD = 5012,
     OpReadClockKHR = 5056,
-    OpHitObjectRecordHitMotionNV = 5249,
-    OpHitObjectRecordHitWithIndexMotionNV = 5250,
-    OpHitObjectRecordMissMotionNV = 5251,
-    OpHitObjectGetWorldToObjectNV = 5252,
-    OpHitObjectGetObjectToWorldNV = 5253,
-    OpHitObjectGetObjectRayDirectionNV = 5254,
-    OpHitObjectGetObjectRayOriginNV = 5255,
-    OpHitObjectTraceRayMotionNV = 5256,
-    OpHitObjectGetShaderRecordBufferHandleNV = 5257,
-    OpHitObjectGetShaderBindingTableRecordIndexNV = 5258,
-    OpHitObjectRecordEmptyNV = 5259,
-    OpHitObjectTraceRayNV = 5260,
-    OpHitObjectRecordHitNV = 5261,
-    OpHitObjectRecordHitWithIndexNV = 5262,
-    OpHitObjectRecordMissNV = 5263,
-    OpHitObjectExecuteShaderNV = 5264,
-    OpHitObjectGetCurrentTimeNV = 5265,
-    OpHitObjectGetAttributesNV = 5266,
-    OpHitObjectGetHitKindNV = 5267,
-    OpHitObjectGetPrimitiveIndexNV = 5268,
-    OpHitObjectGetGeometryIndexNV = 5269,
-    OpHitObjectGetInstanceIdNV = 5270,
-    OpHitObjectGetInstanceCustomIndexNV = 5271,
-    OpHitObjectGetWorldRayDirectionNV = 5272,
-    OpHitObjectGetWorldRayOriginNV = 5273,
-    OpHitObjectGetRayTMaxNV = 5274,
-    OpHitObjectGetRayTMinNV = 5275,
-    OpHitObjectIsEmptyNV = 5276,
-    OpHitObjectIsHitNV = 5277,
-    OpHitObjectIsMissNV = 5278,
-    OpReorderThreadWithHitObjectNV = 5279,
-    OpReorderThreadWithHintNV = 5280,
-    OpTypeHitObjectNV = 5281,
     OpImageSampleFootprintNV = 5283,
     OpEmitMeshTasksEXT = 5294,
     OpSetMeshOutputsEXT = 5295,
diff --git a/tools/buildHeaders/header.cpp b/tools/buildHeaders/header.cpp
index fbae044..f9e06fb 100644
--- a/tools/buildHeaders/header.cpp
+++ b/tools/buildHeaders/header.cpp
@@ -583,7 +583,8 @@ namespace {
         void printEpilogue(std::ostream& out) const override {
             const Json::Value& enums = spvRoot["spv"]["enum"];
 
-            out << "// Overload bitwise operators for mask bit combining\n\n";
+            // Create overloaded operator| for mask types
+            out << "// Overload operator| for mask bit combining\n\n";
 
             for (auto opClass = enums.begin(); opClass != enums.end(); ++opClass) {
                 const bool isMask   = (*opClass)["Type"].asString() == "Bit";
@@ -592,18 +593,8 @@ namespace {
                 if (isMask) {
                     const auto typeName = opName + styleStr(enumMask);
 
-                    // Overload operator|
-                    out << "inline " << typeName << " operator|(" << typeName << " a, " << typeName << " b) { return " <<
-                        typeName << "(unsigned(a) | unsigned(b)); }\n";
-                    // Overload operator&
-                    out << "inline " << typeName << " operator&(" << typeName << " a, " << typeName << " b) { return " <<
-                        typeName << "(unsigned(a) & unsigned(b)); }\n";
-                    // Overload operator^
-                    out << "inline " << typeName << " operator^(" << typeName << " a, " << typeName << " b) { return " <<
-                        typeName << "(unsigned(a) ^ unsigned(b)); }\n";
-                    // Overload operator~
-                    out << "inline " << typeName << " operator~(" << typeName << " a) { return " <<
-                        typeName << "(~unsigned(a)); }\n";
+                    out << "inline " + typeName + " operator|(" + typeName + " a, " + typeName + " b) { return " +
+                        typeName + "(unsigned(a) | unsigned(b)); }\n";
                 }
             }