subgroup: don't special case ClusteredReduce anymore

Author: Firestar99

crates/spirv-std/src/arch/subgroup.rs

@@ -30,8 +30,14 @@ pub enum GroupOperation {
     /// A binary operation with an identity I and n (where n is the size of the workgroup)
     /// elements[a0, a1, … an-1] resulting in [I, a0, (a0 op a1), … (a0 op a1 op … op an-2)].
     ExclusiveScan = 2,
-    // /// See [`GROUP_OPERATION_CLUSTERED_REDUCE`]
-    // ClusteredReduce = 3,
+    /// The [`GroupOperation`] `ClusteredReduce`.
+    ///
+    /// All instructions with a [`GroupOperation`] require an additional `ClusterSize` parameter when [`GroupOperation`] is
+    /// `ClusteredReduce`. To map this requirement into rust, all function have a base version accepting [`GroupOperation`]
+    /// as a const generic, and a `_clustered` variant that is fixed to `ClusteredReduce` and takes the additional
+    /// `ClusterSize` parameter as a const generic. To not accidentally use a `ClusteredReduce` in the base variant of the
+    /// function, it was removed from the [`GroupOperation`] enum and instead resides individually.
+    ClusteredReduce = 3,
     /// Reserved.
     ///
     /// Requires Capability `GroupNonUniformPartitionedNV`.
@@ -46,15 +52,6 @@ pub enum GroupOperation {
     PartitionedExclusiveScanNV = 8,
 }
 
-/// The [`GroupOperation`] `ClusteredReduce`.
-///
-/// All instructions with a [`GroupOperation`] require an additional `ClusterSize` parameter when [`GroupOperation`] is
-/// `ClusteredReduce`. To map this requirement into rust, all function have a base version accepting [`GroupOperation`]
-/// as a const generic, and a `_clustered` variant that is fixed to `ClusteredReduce` and takes the additional
-/// `ClusterSize` parameter as a const generic. To not accidentally use a `ClusteredReduce` in the base variant of the
-/// function, it was removed from the [`GroupOperation`] enum and instead resides individually.
-pub const GROUP_OPERATION_CLUSTERED_REDUCE: u32 = 3;
-
 /// Only usable if the extension GL_KHR_shader_subgroup_basic is enabled.
 ///
 /// The function subgroupBarrier() enforces that all active invocations within a
@@ -782,7 +779,7 @@ macro_rules! macro_subgroup_op_clustered {
                     concat!("%result = ", $asm_op, " _ %subgroup {groupop} %value %clustersize"),
                     "OpStore {result} %result",
                     subgroup = const SUBGROUP,
-                    groupop = const GROUP_OPERATION_CLUSTERED_REDUCE,
+                    groupop = const (GroupOperation::ClusteredReduce as u32),
                     clustersize = const CLUSTER_SIZE,
                     value = in(reg) &value,
                     result = in(reg) &mut result,

tests/ui/arch/subgroup/subgroup_ballot.stderr

@@ -1,9 +1,9 @@
 %1 = OpFunction  %2  None %3
 %4 = OpFunctionParameter  %2
 %5 = OpLabel
-OpLine %6 381 8
+OpLine %6 378 8
 %7 = OpGroupNonUniformBallot  %8  %9 %4
-OpLine %6 417 8
+OpLine %6 414 8
 %10 = OpGroupNonUniformInverseBallot  %2  %9 %7
 OpNoLine
 OpReturnValue %10

tests/ui/arch/subgroup/subgroup_ballot_bit_count.stderr

@@ -1,7 +1,7 @@
 %1 = OpFunction  %2  None %3
 %4 = OpFunctionParameter  %5
 %6 = OpLabel
-OpLine %7 513 0
+OpLine %7 510 0
 %8 = OpGroupNonUniformBallotBitCount  %2  %9 Reduce %4
 OpNoLine
 OpReturnValue %8

tests/ui/arch/subgroup/subgroup_broadcast_first.stderr

@@ -1,7 +1,7 @@
 %1 = OpFunction  %2  None %3
 %4 = OpFunctionParameter  %2
 %5 = OpLabel
-OpLine %6 348 8
+OpLine %6 345 8
 %7 = OpGroupNonUniformBroadcastFirst  %2  %8 %4
 OpNoLine
 OpReturnValue %7

tests/ui/arch/subgroup/subgroup_elect.stderr

@@ -1,6 +1,6 @@
 %1 = OpFunction  %2  None %3
 %4 = OpLabel
-OpLine %5 183 8
+OpLine %5 180 8
 %6 = OpGroupNonUniformElect  %2  %7
 OpNoLine
 OpReturnValue %6

tests/ui/arch/subgroup/subgroup_i_add_clustered.stderr

@@ -1,7 +1,7 @@
 %1 = OpFunction  %2  None %3
 %4 = OpFunctionParameter  %2
 %5 = OpLabel
-OpLine %6 811 0
+OpLine %6 808 0
 %7 = OpGroupNonUniformIAdd  %2  %8 ClusteredReduce %4 %9
 OpNoLine
 OpReturnValue %7

tests/ui/arch/subgroup/subgroup_i_add_exclusive_scan.stderr

@@ -1,7 +1,7 @@
 %1 = OpFunction  %2  None %3
 %4 = OpFunctionParameter  %2
 %5 = OpLabel
-OpLine %6 798 0
+OpLine %6 795 0
 %7 = OpGroupNonUniformIAdd  %2  %8 ExclusiveScan %4
 OpNoLine
 OpReturnValue %7

tests/ui/arch/subgroup/subgroup_i_add_inclusive_scan.stderr

@@ -1,7 +1,7 @@
 %1 = OpFunction  %2  None %3
 %4 = OpFunctionParameter  %2
 %5 = OpLabel
-OpLine %6 798 0
+OpLine %6 795 0
 %7 = OpGroupNonUniformIAdd  %2  %8 InclusiveScan %4
 OpNoLine
 OpReturnValue %7

tests/ui/arch/subgroup/subgroup_i_add_reduce.stderr

@@ -1,7 +1,7 @@
 %1 = OpFunction  %2  None %3
 %4 = OpFunctionParameter  %2
 %5 = OpLabel
-OpLine %6 798 0
+OpLine %6 795 0
 %7 = OpGroupNonUniformIAdd  %2  %8 Reduce %4
 OpNoLine
 OpReturnValue %7