subgroup ops refactor, matches glsl more closely

Firestar99 · LegNeato · commit 0b32144afe45 · 2024-11-07T16:48:53.000Z
diff --git a/crates/spirv-std/src/arch/subgroup.rs b/crates/spirv-std/src/arch/subgroup.rs
diff --git a/tests/ui/arch/subgroup/subgroup_ballot_bit_count.rs b/tests/ui/arch/subgroup/subgroup_ballot_bit_count.rs
@@ -6,7 +6,7 @@ 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_std::arch::subgroup_ballot_bit_count(ballot)
 }
 
 #[spirv(compute(threads(1, 1, 1)))]
diff --git a/tests/ui/arch/subgroup/subgroup_ballot_bit_count.stderr b/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 493 8
+OpLine %7 513 0
 %8 = OpGroupNonUniformBallotBitCount  %2  %9 Reduce %4
 OpNoLine
 OpReturnValue %8
diff --git a/tests/ui/arch/subgroup/subgroup_i_add_clustered.rs b/tests/ui/arch/subgroup/subgroup_i_add_clustered.rs
@@ -7,7 +7,7 @@ use spirv_std::arch::{GroupOperation, SubgroupMask};
 use spirv_std::spirv;
 
 unsafe fn subgroup_i_add_clustered(value: u32) -> u32 {
-    spirv_std::arch::subgroup_i_add_clustered::<8, _>(value)
+    spirv_std::arch::subgroup_clustered_i_add::<8, _>(value)
 }
 
 #[spirv(compute(threads(32, 1, 1)))]
diff --git a/tests/ui/arch/subgroup/subgroup_i_add_clustered.stderr b/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 784 8
+OpLine %6 811 0
 %7 = OpGroupNonUniformIAdd  %2  %8 ClusteredReduce %4 %9
 OpNoLine
 OpReturnValue %7
diff --git a/tests/ui/arch/subgroup/subgroup_i_add_exclusive_scan.rs b/tests/ui/arch/subgroup/subgroup_i_add_exclusive_scan.rs
@@ -7,7 +7,7 @@ use spirv_std::arch::{GroupOperation, SubgroupMask};
 use spirv_std::spirv;
 
 unsafe fn subgroup_i_add_exclusive_scan(value: u32) -> u32 {
-    spirv_std::arch::subgroup_i_add::<{ GroupOperation::ExclusiveScan as u32 }, _>(value)
+    spirv_std::arch::subgroup_exclusive_i_add(value)
 }
 
 #[spirv(compute(threads(32, 1, 1)))]
diff --git a/tests/ui/arch/subgroup/subgroup_i_add_exclusive_scan.stderr b/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 743 8
+OpLine %6 798 0
 %7 = OpGroupNonUniformIAdd  %2  %8 ExclusiveScan %4
 OpNoLine
 OpReturnValue %7
diff --git a/tests/ui/arch/subgroup/subgroup_i_add_inclusive_scan.rs b/tests/ui/arch/subgroup/subgroup_i_add_inclusive_scan.rs
@@ -7,7 +7,7 @@ use spirv_std::arch::{GroupOperation, SubgroupMask};
 use spirv_std::spirv;
 
 unsafe fn subgroup_i_add_inclusive_scan(value: u32) -> u32 {
-    spirv_std::arch::subgroup_i_add::<{ GroupOperation::InclusiveScan as u32 }, _>(value)
+    spirv_std::arch::subgroup_inclusive_i_add(value)
 }
 
 #[spirv(compute(threads(32, 1, 1)))]
diff --git a/tests/ui/arch/subgroup/subgroup_i_add_inclusive_scan.stderr b/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 743 8
+OpLine %6 798 0
 %7 = OpGroupNonUniformIAdd  %2  %8 InclusiveScan %4
 OpNoLine
 OpReturnValue %7
diff --git a/tests/ui/arch/subgroup/subgroup_i_add_reduce.rs b/tests/ui/arch/subgroup/subgroup_i_add_reduce.rs
@@ -7,7 +7,7 @@ use spirv_std::arch::{GroupOperation, SubgroupMask};
 use spirv_std::spirv;
 
 unsafe fn subgroup_i_add_reduce(value: u32) -> u32 {
-    spirv_std::arch::subgroup_i_add::<{ GroupOperation::Reduce as u32 }, _>(value)
+    spirv_std::arch::subgroup_i_add(value)
 }
 
 #[spirv(compute(threads(32, 1, 1)))]
diff --git a/tests/ui/arch/subgroup/subgroup_i_add_reduce.stderr b/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 743 8
+OpLine %6 798 0
 %7 = OpGroupNonUniformIAdd  %2  %8 Reduce %4
 OpNoLine
 OpReturnValue %7

Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@ use spirv_std::arch::{GroupOperation, SubgroupMask};`
`6`	`6`	`use spirv_std::spirv;`
`7`	`7`
`8`	`8`	`unsafe fn subgroup_ballot_bit_count(ballot: SubgroupMask) -> u32 {`
`9`		`- spirv_std::arch::subgroup_ballot_bit_count::<{ GroupOperation::Reduce as u32 }>(ballot)`
	`9`	`+ spirv_std::arch::subgroup_ballot_bit_count(ballot)`
`10`	`10`	`}`
`11`	`11`
`12`	`12`	`#[spirv(compute(threads(1, 1, 1)))]`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@ use spirv_std::arch::{GroupOperation, SubgroupMask};`
`7`	`7`	`use spirv_std::spirv;`
`8`	`8`
`9`	`9`	`unsafe fn subgroup_i_add_clustered(value: u32) -> u32 {`
`10`		`- spirv_std::arch::subgroup_i_add_clustered::<8, _>(value)`
	`10`	`+ spirv_std::arch::subgroup_clustered_i_add::<8, _>(value)`
`11`	`11`	`}`
`12`	`12`
`13`	`13`	`#[spirv(compute(threads(32, 1, 1)))]`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@ use spirv_std::arch::{GroupOperation, SubgroupMask};`
`7`	`7`	`use spirv_std::spirv;`
`8`	`8`
`9`	`9`	`unsafe fn subgroup_i_add_exclusive_scan(value: u32) -> u32 {`
`10`		`- spirv_std::arch::subgroup_i_add::<{ GroupOperation::ExclusiveScan as u32 }, _>(value)`
	`10`	`+ spirv_std::arch::subgroup_exclusive_i_add(value)`
`11`	`11`	`}`
`12`	`12`
`13`	`13`	`#[spirv(compute(threads(32, 1, 1)))]`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@ use spirv_std::arch::{GroupOperation, SubgroupMask};`
`7`	`7`	`use spirv_std::spirv;`
`8`	`8`
`9`	`9`	`unsafe fn subgroup_i_add_inclusive_scan(value: u32) -> u32 {`
`10`		`- spirv_std::arch::subgroup_i_add::<{ GroupOperation::InclusiveScan as u32 }, _>(value)`
	`10`	`+ spirv_std::arch::subgroup_inclusive_i_add(value)`
`11`	`11`	`}`
`12`	`12`
`13`	`13`	`#[spirv(compute(threads(32, 1, 1)))]`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@ use spirv_std::arch::{GroupOperation, SubgroupMask};`
`7`	`7`	`use spirv_std::spirv;`
`8`	`8`
`9`	`9`	`unsafe fn subgroup_i_add_reduce(value: u32) -> u32 {`
`10`		`- spirv_std::arch::subgroup_i_add::<{ GroupOperation::Reduce as u32 }, _>(value)`
	`10`	`+ spirv_std::arch::subgroup_i_add(value)`
`11`	`11`	`}`
`12`	`12`
`13`	`13`	`#[spirv(compute(threads(32, 1, 1)))]`