Merge branch 'master' of https://github.com/KhronosGroup/SPIRV-Headers into uniform_g...

diff --cc include/spirv/unified1/spirv.core.grammar.json
index 421ed97,d0d9a36..29317fd
--- 1/include/spirv/unified1/spirv.core.grammar.json
--- 2/include/spirv/unified1/spirv.core.grammar.json
+++ b/include/spirv/unified1/spirv.core.grammar.json
@@@ -8551,124 -8551,28 +8551,148 @@@
        "version" : "None"
      },
      {
+       "opname" : "OpControlBarrierArriveINTEL",
+       "class"  : "Barrier",
+       "opcode" : 6142,
+       "operands" : [
+         { "kind" : "IdScope",           "name" : "'Execution'" },
+         { "kind" : "IdScope",           "name" : "'Memory'" },
+         { "kind" : "IdMemorySemantics", "name" : "'Semantics'" }
+       ],
+       "capabilities" : [ "SplitBarrierINTEL" ],
+       "version" : "None"
+     },
+     {
+       "opname" : "OpControlBarrierWaitINTEL",
+       "class"  : "Barrier",
+       "opcode" : 6143,
+       "operands" : [
+         { "kind" : "IdScope",           "name" : "'Execution'" },
+         { "kind" : "IdScope",           "name" : "'Memory'" },
+         { "kind" : "IdMemorySemantics", "name" : "'Semantics'" }
+       ],
+       "capabilities" : [ "SplitBarrierINTEL" ],
+       "version" : "None"
++    },
++    {
 +      "opname" : "OpGroupIMulKHR",
 +      "class"  : "Group",
 +      "opcode" : 6401,
 +      "operands" : [
 +        { "kind" : "IdResultType" },
 +        { "kind" : "IdResult" },
 +        { "kind" : "IdScope",        "name" : "'Execution'" },
 +        { "kind" : "GroupOperation", "name" : "'Operation'" },
 +        { "kind" : "IdRef",          "name" : "'X'" }
 +      ],
 +      "capabilities" : [ "GroupUniformArithmeticKHR" ],
 +      "extensions" : [ "SPV_KHR_uniform_group_instructions" ],
 +      "version" : "None"
 +    },
 +    {
 +      "opname" : "OpGroupFMulKHR",
 +      "class"  : "Group",
 +      "opcode" : 6402,
 +      "operands" : [
 +        { "kind" : "IdResultType" },
 +        { "kind" : "IdResult" },
 +        { "kind" : "IdScope",        "name" : "'Execution'" },
 +        { "kind" : "GroupOperation", "name" : "'Operation'" },
 +        { "kind" : "IdRef",          "name" : "'X'" }
 +      ],
 +      "capabilities" : [ "GroupUniformArithmeticKHR" ],
 +      "extensions" : [ "SPV_KHR_uniform_group_instructions" ],
 +      "version" : "None"
 +    },
 +    {
 +      "opname" : "OpGroupBitwiseAndKHR",
 +      "class"  : "Group",
 +      "opcode" : 6403,
 +      "operands" : [
 +        { "kind" : "IdResultType" },
 +        { "kind" : "IdResult" },
 +        { "kind" : "IdScope",        "name" : "'Execution'" },
 +        { "kind" : "GroupOperation", "name" : "'Operation'" },
 +        { "kind" : "IdRef",          "name" : "'X'" }
 +      ],
 +      "capabilities" : [ "GroupUniformArithmeticKHR" ],
 +      "extensions" : [ "SPV_KHR_uniform_group_instructions" ],
 +      "version" : "None"
 +    },
 +    {
 +      "opname" : "OpGroupBitwiseOrKHR",
 +      "class"  : "Group",
 +      "opcode" : 6404,
 +      "operands" : [
 +        { "kind" : "IdResultType" },
 +        { "kind" : "IdResult" },
 +        { "kind" : "IdScope",        "name" : "'Execution'" },
 +        { "kind" : "GroupOperation", "name" : "'Operation'" },
 +        { "kind" : "IdRef",          "name" : "'X'" }
 +      ],
 +      "capabilities" : [ "GroupUniformArithmeticKHR" ],
 +      "extensions" : [ "SPV_KHR_uniform_group_instructions" ],
 +      "version" : "None"
 +    },
 +    {
 +      "opname" : "OpGroupBitwiseXorKHR",
 +      "class"  : "Group",
 +      "opcode" : 6405,
 +      "operands" : [
 +        { "kind" : "IdResultType" },
 +        { "kind" : "IdResult" },
 +        { "kind" : "IdScope",        "name" : "'Execution'" },
 +        { "kind" : "GroupOperation", "name" : "'Operation'" },
 +        { "kind" : "IdRef",          "name" : "'X'" }
 +      ],
 +      "capabilities" : [ "GroupUniformArithmeticKHR" ],
 +      "extensions" : [ "SPV_KHR_uniform_group_instructions" ],
 +      "version" : "None"
 +    },
 +    {
 +      "opname" : "OpGroupLogicalAndKHR",
 +      "class"  : "Group",
 +      "opcode" : 6406,
 +      "operands" : [
 +        { "kind" : "IdResultType" },
 +        { "kind" : "IdResult" },
 +        { "kind" : "IdScope",        "name" : "'Execution'" },
 +        { "kind" : "GroupOperation", "name" : "'Operation'" },
 +        { "kind" : "IdRef",          "name" : "'X'" }
 +      ],
 +      "capabilities" : [ "GroupUniformArithmeticKHR" ],
 +      "extensions" : [ "SPV_KHR_uniform_group_instructions" ],
 +      "version" : "None"
 +    },
 +    {
 +      "opname" : "OpGroupLogicalOrKHR",
 +      "class"  : "Group",
 +      "opcode" : 6407,
 +      "operands" : [
 +        { "kind" : "IdResultType" },
 +        { "kind" : "IdResult" },
 +        { "kind" : "IdScope",        "name" : "'Execution'" },
 +        { "kind" : "GroupOperation", "name" : "'Operation'" },
 +        { "kind" : "IdRef",          "name" : "'X'" }
 +      ],
 +      "capabilities" : [ "GroupUniformArithmeticKHR" ],
 +      "extensions" : [ "SPV_KHR_uniform_group_instructions" ],
 +      "version" : "None"
 +    },
 +    {
 +      "opname" : "OpGroupLogicalXorKHR",
 +      "class"  : "Group",
 +      "opcode" : 6408,
 +      "operands" : [
 +        { "kind" : "IdResultType" },
 +        { "kind" : "IdResult" },
 +        { "kind" : "IdScope",        "name" : "'Execution'" },
 +        { "kind" : "GroupOperation", "name" : "'Operation'" },
 +        { "kind" : "IdRef",          "name" : "'X'" }
 +      ],
 +      "capabilities" : [ "GroupUniformArithmeticKHR" ],
 +      "extensions" : [ "SPV_KHR_uniform_group_instructions" ],
 +      "version" : "None"
      }
    ],
    "operand_kinds" : [
@@@ -14003,10 -13907,10 +14027,16 @@@
            "version" : "None"
          },
          {
+           "enumerant" : "SplitBarrierINTEL",
+           "value" : 6141,
+           "extensions" : [ "SPV_INTEL_split_barrier" ],
+           "version" : "None"
++        },
++        {
 +          "enumerant" : "GroupUniformArithmeticKHR",
 +          "value" : 6400,
 +          "extensions" : [ "SPV_KHR_uniform_group_instructions"],
 +          "version" : "None"
          }
        ]
      },

diff --cc include/spirv/unified1/spirv.cs
index 6c04ae7,53821a3..eb379a3
--- 1/include/spirv/unified1/spirv.cs
--- 2/include/spirv/unified1/spirv.cs
+++ b/include/spirv/unified1/spirv.cs
@@@ -1087,7 -1087,7 +1087,8 @@@ namespace Sp
              OptNoneINTEL = 6094,
              AtomicFloat16AddEXT = 6095,
              DebugInfoModuleINTEL = 6114,
+             SplitBarrierINTEL = 6141,
 +            GroupUniformArithmeticKHR = 6400,
          }
  
          public enum RayFlagsShift
@@@ -1852,14 -1852,8 +1853,16 @@@
              OpTypeStructContinuedINTEL = 6090,
              OpConstantCompositeContinuedINTEL = 6091,
              OpSpecConstantCompositeContinuedINTEL = 6092,
+             OpControlBarrierArriveINTEL = 6142,
+             OpControlBarrierWaitINTEL = 6143,
 +            OpGroupIMulKHR = 6401,
 +            OpGroupFMulKHR = 6402,
 +            OpGroupBitwiseAndKHR = 6403,
 +            OpGroupBitwiseOrKHR = 6404,
 +            OpGroupBitwiseXorKHR = 6405,
 +            OpGroupLogicalAndKHR = 6406,
 +            OpGroupLogicalOrKHR = 6407,
 +            OpGroupLogicalXorKHR = 6408,
          }
      }
  }

diff --cc include/spirv/unified1/spirv.h
index 3beb44a,ba1c998..e75bef8
--- 1/include/spirv/unified1/spirv.h
--- 2/include/spirv/unified1/spirv.h
+++ b/include/spirv/unified1/spirv.h
@@@ -1087,7 -1087,7 +1087,8 @@@ typedef enum SpvCapability_ 
      SpvCapabilityOptNoneINTEL = 6094,
      SpvCapabilityAtomicFloat16AddEXT = 6095,
      SpvCapabilityDebugInfoModuleINTEL = 6114,
+     SpvCapabilitySplitBarrierINTEL = 6141,
 +    SpvCapabilityGroupUniformArithmeticKHR = 6400,
      SpvCapabilityMax = 0x7fffffff,
  } SpvCapability;
  
@@@ -1850,14 -1850,8 +1851,16 @@@ typedef enum SpvOp_ 
      SpvOpTypeStructContinuedINTEL = 6090,
      SpvOpConstantCompositeContinuedINTEL = 6091,
      SpvOpSpecConstantCompositeContinuedINTEL = 6092,
+     SpvOpControlBarrierArriveINTEL = 6142,
+     SpvOpControlBarrierWaitINTEL = 6143,
 +    SpvOpGroupIMulKHR = 6401,
 +    SpvOpGroupFMulKHR = 6402,
 +    SpvOpGroupBitwiseAndKHR = 6403,
 +    SpvOpGroupBitwiseOrKHR = 6404,
 +    SpvOpGroupBitwiseXorKHR = 6405,
 +    SpvOpGroupLogicalAndKHR = 6406,
 +    SpvOpGroupLogicalOrKHR = 6407,
 +    SpvOpGroupLogicalXorKHR = 6408,
      SpvOpMax = 0x7fffffff,
  } SpvOp;
  
@@@ -2512,14 -2506,8 +2515,16 @@@ inline void SpvHasResultAndType(SpvOp o
      case SpvOpTypeStructContinuedINTEL: *hasResult = false; *hasResultType = false; break;
      case SpvOpConstantCompositeContinuedINTEL: *hasResult = false; *hasResultType = false; break;
      case SpvOpSpecConstantCompositeContinuedINTEL: *hasResult = false; *hasResultType = false; break;
+     case SpvOpControlBarrierArriveINTEL: *hasResult = false; *hasResultType = false; break;
+     case SpvOpControlBarrierWaitINTEL: *hasResult = false; *hasResultType = false; break;
 +    case SpvOpGroupIMulKHR: *hasResult = true; *hasResultType = true; break;
 +    case SpvOpGroupFMulKHR: *hasResult = true; *hasResultType = true; break;
 +    case SpvOpGroupBitwiseAndKHR: *hasResult = true; *hasResultType = true; break;
 +    case SpvOpGroupBitwiseOrKHR: *hasResult = true; *hasResultType = true; break;
 +    case SpvOpGroupBitwiseXorKHR: *hasResult = true; *hasResultType = true; break;
 +    case SpvOpGroupLogicalAndKHR: *hasResult = true; *hasResultType = true; break;
 +    case SpvOpGroupLogicalOrKHR: *hasResult = true; *hasResultType = true; break;
 +    case SpvOpGroupLogicalXorKHR: *hasResult = true; *hasResultType = true; break;
      }
  }
  #endif /* SPV_ENABLE_UTILITY_CODE */

diff --cc include/spirv/unified1/spirv.hpp
index 37b0c3c,a016d7d..0991d3c
--- 1/include/spirv/unified1/spirv.hpp
--- 2/include/spirv/unified1/spirv.hpp
+++ b/include/spirv/unified1/spirv.hpp
@@@ -1083,7 -1083,7 +1083,8 @@@ enum Capability 
      CapabilityOptNoneINTEL = 6094,
      CapabilityAtomicFloat16AddEXT = 6095,
      CapabilityDebugInfoModuleINTEL = 6114,
+     CapabilitySplitBarrierINTEL = 6141,
 +    CapabilityGroupUniformArithmeticKHR = 6400,
      CapabilityMax = 0x7fffffff,
  };
  
@@@ -1846,14 -1846,8 +1847,16 @@@ enum Op 
      OpTypeStructContinuedINTEL = 6090,
      OpConstantCompositeContinuedINTEL = 6091,
      OpSpecConstantCompositeContinuedINTEL = 6092,
+     OpControlBarrierArriveINTEL = 6142,
+     OpControlBarrierWaitINTEL = 6143,
 +    OpGroupIMulKHR = 6401,
 +    OpGroupFMulKHR = 6402,
 +    OpGroupBitwiseAndKHR = 6403,
 +    OpGroupBitwiseOrKHR = 6404,
 +    OpGroupBitwiseXorKHR = 6405,
 +    OpGroupLogicalAndKHR = 6406,
 +    OpGroupLogicalOrKHR = 6407,
 +    OpGroupLogicalXorKHR = 6408,
      OpMax = 0x7fffffff,
  };
  
@@@ -2508,14 -2502,8 +2511,16 @@@ inline void HasResultAndType(Op opcode
      case OpTypeStructContinuedINTEL: *hasResult = false; *hasResultType = false; break;
      case OpConstantCompositeContinuedINTEL: *hasResult = false; *hasResultType = false; break;
      case OpSpecConstantCompositeContinuedINTEL: *hasResult = false; *hasResultType = false; break;
+     case OpControlBarrierArriveINTEL: *hasResult = false; *hasResultType = false; break;
+     case OpControlBarrierWaitINTEL: *hasResult = false; *hasResultType = false; break;
 +    case OpGroupIMulKHR: *hasResult = true; *hasResultType = true; break;
 +    case OpGroupFMulKHR: *hasResult = true; *hasResultType = true; break;
 +    case OpGroupBitwiseAndKHR: *hasResult = true; *hasResultType = true; break;
 +    case OpGroupBitwiseOrKHR: *hasResult = true; *hasResultType = true; break;
 +    case OpGroupBitwiseXorKHR: *hasResult = true; *hasResultType = true; break;
 +    case OpGroupLogicalAndKHR: *hasResult = true; *hasResultType = true; break;
 +    case OpGroupLogicalOrKHR: *hasResult = true; *hasResultType = true; break;
 +    case OpGroupLogicalXorKHR: *hasResult = true; *hasResultType = true; break;
      }
  }
  #endif /* SPV_ENABLE_UTILITY_CODE */

diff --cc include/spirv/unified1/spirv.hpp11
index bf78446,89d793c..92a94c1
--- 1/include/spirv/unified1/spirv.hpp11
--- 2/include/spirv/unified1/spirv.hpp11
+++ b/include/spirv/unified1/spirv.hpp11
@@@ -1083,7 -1083,7 +1083,8 @@@ enum class Capability : unsigned 
      OptNoneINTEL = 6094,
      AtomicFloat16AddEXT = 6095,
      DebugInfoModuleINTEL = 6114,
+     SplitBarrierINTEL = 6141,
 +    GroupUniformArithmeticKHR = 6400,
      Max = 0x7fffffff,
  };
  
@@@ -1846,14 -1846,8 +1847,16 @@@ enum class Op : unsigned 
      OpTypeStructContinuedINTEL = 6090,
      OpConstantCompositeContinuedINTEL = 6091,
      OpSpecConstantCompositeContinuedINTEL = 6092,
+     OpControlBarrierArriveINTEL = 6142,
+     OpControlBarrierWaitINTEL = 6143,
 +    OpGroupIMulKHR = 6401,
 +    OpGroupFMulKHR = 6402,
 +    OpGroupBitwiseAndKHR = 6403,
 +    OpGroupBitwiseOrKHR = 6404,
 +    OpGroupBitwiseXorKHR = 6405,
 +    OpGroupLogicalAndKHR = 6406,
 +    OpGroupLogicalOrKHR = 6407,
 +    OpGroupLogicalXorKHR = 6408,
      Max = 0x7fffffff,
  };
  
@@@ -2508,14 -2502,8 +2511,16 @@@ inline void HasResultAndType(Op opcode
      case Op::OpTypeStructContinuedINTEL: *hasResult = false; *hasResultType = false; break;
      case Op::OpConstantCompositeContinuedINTEL: *hasResult = false; *hasResultType = false; break;
      case Op::OpSpecConstantCompositeContinuedINTEL: *hasResult = false; *hasResultType = false; break;
+     case Op::OpControlBarrierArriveINTEL: *hasResult = false; *hasResultType = false; break;
+     case Op::OpControlBarrierWaitINTEL: *hasResult = false; *hasResultType = false; break;
 +    case Op::OpGroupIMulKHR: *hasResult = true; *hasResultType = true; break;
 +    case Op::OpGroupFMulKHR: *hasResult = true; *hasResultType = true; break;
 +    case Op::OpGroupBitwiseAndKHR: *hasResult = true; *hasResultType = true; break;
 +    case Op::OpGroupBitwiseOrKHR: *hasResult = true; *hasResultType = true; break;
 +    case Op::OpGroupBitwiseXorKHR: *hasResult = true; *hasResultType = true; break;
 +    case Op::OpGroupLogicalAndKHR: *hasResult = true; *hasResultType = true; break;
 +    case Op::OpGroupLogicalOrKHR: *hasResult = true; *hasResultType = true; break;
 +    case Op::OpGroupLogicalXorKHR: *hasResult = true; *hasResultType = true; break;
      }
  }
  #endif /* SPV_ENABLE_UTILITY_CODE */

diff --cc include/spirv/unified1/spirv.json
index b0dc71b,33ba1f3..aabc32d
--- 1/include/spirv/unified1/spirv.json
--- 2/include/spirv/unified1/spirv.json
+++ b/include/spirv/unified1/spirv.json
@@@ -1065,7 -1065,7 +1065,8 @@@
                      "OptNoneINTEL": 6094,
                      "AtomicFloat16AddEXT": 6095,
                      "DebugInfoModuleINTEL": 6114,
 -                    "SplitBarrierINTEL": 6141
++                    "SplitBarrierINTEL": 6141,
 +                    "GroupUniformArithmeticKHR": 6400
                  }
              },
              {
@@@ -1839,14 -1839,8 +1840,16 @@@
                      "OpTypeStructContinuedINTEL": 6090,
                      "OpConstantCompositeContinuedINTEL": 6091,
                      "OpSpecConstantCompositeContinuedINTEL": 6092,
 -                    "OpControlBarrierWaitINTEL": 6143
+                     "OpControlBarrierArriveINTEL": 6142,
++                    "OpControlBarrierWaitINTEL": 6143,
 +                    "OpGroupIMulKHR": 6401,
 +                    "OpGroupFMulKHR": 6402,
 +                    "OpGroupBitwiseAndKHR": 6403,
 +                    "OpGroupBitwiseOrKHR": 6404,
 +                    "OpGroupBitwiseXorKHR": 6405,
 +                    "OpGroupLogicalAndKHR": 6406,
 +                    "OpGroupLogicalOrKHR": 6407,
 +                    "OpGroupLogicalXorKHR": 6408
                  }
              }
          ]

diff --cc include/spirv/unified1/spirv.lua
index d281562,4e4dc84..235f1bf
--- 1/include/spirv/unified1/spirv.lua
--- 2/include/spirv/unified1/spirv.lua
+++ b/include/spirv/unified1/spirv.lua
@@@ -1045,7 -1045,7 +1045,8 @@@ spv = 
          OptNoneINTEL = 6094,
          AtomicFloat16AddEXT = 6095,
          DebugInfoModuleINTEL = 6114,
+         SplitBarrierINTEL = 6141,
 +        GroupUniformArithmeticKHR = 6400,
      },
  
      RayFlagsShift = {
@@@ -1797,14 -1797,8 +1798,16 @@@
          OpTypeStructContinuedINTEL = 6090,
          OpConstantCompositeContinuedINTEL = 6091,
          OpSpecConstantCompositeContinuedINTEL = 6092,
+         OpControlBarrierArriveINTEL = 6142,
+         OpControlBarrierWaitINTEL = 6143,
 +        OpGroupIMulKHR = 6401,
 +        OpGroupFMulKHR = 6402,
 +        OpGroupBitwiseAndKHR = 6403,
 +        OpGroupBitwiseOrKHR = 6404,
 +        OpGroupBitwiseXorKHR = 6405,
 +        OpGroupLogicalAndKHR = 6406,
 +        OpGroupLogicalOrKHR = 6407,
 +        OpGroupLogicalXorKHR = 6408,
      },
  
  }

diff --cc include/spirv/unified1/spirv.py
index bda26e3,47e7c4c..1c15777
--- 1/include/spirv/unified1/spirv.py
--- 2/include/spirv/unified1/spirv.py
+++ b/include/spirv/unified1/spirv.py
@@@ -1045,7 -1045,7 +1045,8 @@@ spv = 
          'OptNoneINTEL' : 6094,
          'AtomicFloat16AddEXT' : 6095,
          'DebugInfoModuleINTEL' : 6114,
+         'SplitBarrierINTEL' : 6141,
 +        'GroupUniformArithmeticKHR' : 6400,
      },
  
      'RayFlagsShift' : {
@@@ -1797,14 -1797,8 +1798,16 @@@
          'OpTypeStructContinuedINTEL' : 6090,
          'OpConstantCompositeContinuedINTEL' : 6091,
          'OpSpecConstantCompositeContinuedINTEL' : 6092,
+         'OpControlBarrierArriveINTEL' : 6142,
+         'OpControlBarrierWaitINTEL' : 6143,
 +        'OpGroupIMulKHR' : 6401,
 +        'OpGroupFMulKHR' : 6402,
 +        'OpGroupBitwiseAndKHR' : 6403,
 +        'OpGroupBitwiseOrKHR' : 6404,
 +        'OpGroupBitwiseXorKHR' : 6405,
 +        'OpGroupLogicalAndKHR' : 6406,
 +        'OpGroupLogicalOrKHR' : 6407,
 +        'OpGroupLogicalXorKHR' : 6408,
      },
  
  }

diff --cc include/spirv/unified1/spv.d
index 0c0792d,6cd26ce..5ea5179
--- 1/include/spirv/unified1/spv.d
--- 2/include/spirv/unified1/spv.d
+++ b/include/spirv/unified1/spv.d
@@@ -1090,7 -1090,7 +1090,8 @@@ enum Capability : uin
      OptNoneINTEL = 6094,
      AtomicFloat16AddEXT = 6095,
      DebugInfoModuleINTEL = 6114,
+     SplitBarrierINTEL = 6141,
 +    GroupUniformArithmeticKHR = 6400,
  }
  
  enum RayFlagsShift : uint
@@@ -1855,14 -1855,8 +1856,16 @@@ enum Op : uin
      OpTypeStructContinuedINTEL = 6090,
      OpConstantCompositeContinuedINTEL = 6091,
      OpSpecConstantCompositeContinuedINTEL = 6092,
+     OpControlBarrierArriveINTEL = 6142,
+     OpControlBarrierWaitINTEL = 6143,
 +    OpGroupIMulKHR = 6401,
 +    OpGroupFMulKHR = 6402,
 +    OpGroupBitwiseAndKHR = 6403,
 +    OpGroupBitwiseOrKHR = 6404,
 +    OpGroupBitwiseXorKHR = 6405,
 +    OpGroupLogicalAndKHR = 6406,
 +    OpGroupLogicalOrKHR = 6407,
 +    OpGroupLogicalXorKHR = 6408,
  }