subgroup: drop the non_uniform from all subgroup functions, matching glsl

Author: Firestar99

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

@@ -0,0 +1,17 @@
+// build-pass
+// compile-flags: -C target-feature=+GroupNonUniform,+GroupNonUniformBallot,+ext:SPV_KHR_vulkan_memory_model
+// compile-flags: -C llvm-args=--disassemble-fn=subgroup_ballot::subgroup_ballot
+
+use spirv_std::spirv;
+
+unsafe fn subgroup_ballot(predicate: bool) -> bool {
+    let ballot = spirv_std::arch::subgroup_ballot(predicate);
+    spirv_std::arch::subgroup_inverse_ballot(ballot)
+}
+
+#[spirv(compute(threads(1, 1, 1)))]
+pub fn main() {
+    unsafe {
+        subgroup_ballot(true);
+    }
+}

tests/ui/arch/subgroup/subgroup_ballot.rs

@@ -0,0 +1,17 @@
+// build-pass
+// compile-flags: -C target-feature=+GroupNonUniform,+GroupNonUniformBallot,+ext:SPV_KHR_vulkan_memory_model
+// compile-flags: -C llvm-args=--disassemble-fn=subgroup_ballot_bit_count::subgroup_ballot_bit_count
+
+use spirv_std::arch::{GroupOperation, SubgroupMask};
+use spirv_std::spirv;
+
+unsafe fn subgroup_ballot_bit_count(ballot: SubgroupMask) -> u32 {
+    spirv_std::arch::subgroup_ballot_bit_count::<{ GroupOperation::Reduce as u32 }>(ballot)
+}
+
+#[spirv(compute(threads(1, 1, 1)))]
+pub fn main() {
+    unsafe {
+        subgroup_ballot_bit_count(spirv_std::arch::subgroup_ballot(true));
+    }
+}

tests/ui/arch/subgroup/subgroup_non_uniform_ballot.stderr renamed to tests/ui/arch/subgroup/subgroup_ballot.stderr

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

tests/ui/arch/subgroup/subgroup_ballot_bit_count.rs

@@ -0,0 +1,17 @@
+// build-pass
+// compile-flags: -C target-feature=+GroupNonUniform,+GroupNonUniformBallot,+ext:SPV_KHR_vulkan_memory_model
+// compile-flags: -C llvm-args=--disassemble-fn=subgroup_broadcast_first::subgroup_broadcast_first
+
+use glam::Vec3;
+use spirv_std::spirv;
+
+unsafe fn subgroup_broadcast_first(vec: Vec3) -> Vec3 {
+    spirv_std::arch::subgroup_broadcast_first::<Vec3>(vec)
+}
+
+#[spirv(compute(threads(1, 1, 1)))]
+pub fn main() {
+    unsafe {
+        subgroup_broadcast_first(Vec3::new(1., 2., 3.));
+    }
+}

tests/ui/arch/subgroup/subgroup_non_uniform_ballot_bit_count.stderr renamed to tests/ui/arch/subgroup/subgroup_ballot_bit_count.stderr

@@ -0,0 +1,16 @@
+// build-pass
+// compile-flags: -C target-feature=+GroupNonUniform,+ext:SPV_KHR_vulkan_memory_model
+// compile-flags: -C llvm-args=--disassemble-fn=subgroup_elect::subgroup_elect
+
+use spirv_std::spirv;
+
+unsafe fn subgroup_elect() -> bool {
+    spirv_std::arch::subgroup_elect()
+}
+
+#[spirv(compute(threads(1, 1, 1)))]
+pub fn main() {
+    unsafe {
+        subgroup_elect();
+    }
+}

tests/ui/arch/subgroup/subgroup_broadcast_first.rs

@@ -1,18 +1,18 @@
 // build-pass
 // compile-flags: -C target-feature=+GroupNonUniform,+GroupNonUniformArithmetic,+GroupNonUniformClustered,+ext:SPV_KHR_vulkan_memory_model
-// compile-flags: -C llvm-args=--disassemble-fn=subgroup_non_uniform_i_add_clustered::subgroup_non_uniform_i_add_clustered
+// compile-flags: -C llvm-args=--disassemble-fn=subgroup_i_add_clustered::subgroup_i_add_clustered
 
 use glam::UVec3;
 use spirv_std::arch::{GroupOperation, SubgroupMask};
 use spirv_std::spirv;
 
-unsafe fn subgroup_non_uniform_i_add_clustered(value: u32) -> u32 {
-    spirv_std::arch::subgroup_non_uniform_i_add_clustered::<8, _>(value)
+unsafe fn subgroup_i_add_clustered(value: u32) -> u32 {
+    spirv_std::arch::subgroup_i_add_clustered::<8, _>(value)
 }
 
 #[spirv(compute(threads(32, 1, 1)))]
 pub fn main(#[spirv(local_invocation_id)] local_invocation_id: UVec3) {
     unsafe {
-        subgroup_non_uniform_i_add_clustered(local_invocation_id.x);
+        subgroup_i_add_clustered(local_invocation_id.x);
     }
 }