Skip to content

Commit 4c378a0

Browse files
Firestar99LegNeato
authored andcommitted
normalise spirv-std path
1 parent 9ceae6a commit 4c378a0

File tree

4 files changed

+16
-14
lines changed

4 files changed

+16
-14
lines changed

tests/compiletests/ui/arch/subgroup/subgroup_cluster_size_0_fail.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
// build-pass
22
// compile-flags: -C target-feature=+GroupNonUniform,+GroupNonUniformArithmetic,+GroupNonUniformClustered,+ext:SPV_KHR_vulkan_memory_model
3+
// normalize-stderr-test "\S*/crates/spirv-std/src/" -> "$$SPIRV_STD_SRC/"
34

45
use glam::UVec3;
56
use spirv_std::arch::{GroupOperation, SubgroupMask};

tests/compiletests/ui/arch/subgroup/subgroup_cluster_size_0_fail.stderr

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
error[E0080]: evaluation of `spirv_std::arch::subgroup_clustered_i_add::<0, u32, u32>::{constant#0}` failed
2-
--> /home/firestar99/workspace/frameworks/rust-gpu/crates/spirv-std/src/arch/subgroup.rs:840:1
2+
--> $SPIRV_STD_SRC/arch/subgroup.rs:840:1
33
|
44
840 | / macro_subgroup_op_clustered!(impl Integer, "OpGroupNonUniformIAdd", subgroup_clustered_i_add; r"
55
841 | | An integer add group operation of all `value` operands contributed by active invocations in the group.
@@ -8,12 +8,12 @@ error[E0080]: evaluation of `spirv_std::arch::subgroup_clustered_i_add::<0, u32,
88
... |
99
856 | | * `ClusterSize` must not be greater than the size of the group
1010
857 | | ");
11-
| |__^ the evaluated program panicked at '`ClusterSize` must be at least 1', /home/firestar99/workspace/frameworks/rust-gpu/crates/spirv-std/src/arch/subgroup.rs:840:1
11+
| |__^ the evaluated program panicked at '`ClusterSize` must be at least 1', $SPIRV_STD_SRC/arch/subgroup.rs:840:1
1212
|
1313
= note: this error originates in the macro `$crate::panic::panic_2021` which comes from the expansion of the macro `macro_subgroup_op_clustered` (in Nightly builds, run with -Z macro-backtrace for more info)
1414

1515
note: erroneous constant encountered
16-
--> /home/firestar99/workspace/frameworks/rust-gpu/crates/spirv-std/src/arch/subgroup.rs:840:1
16+
--> $SPIRV_STD_SRC/arch/subgroup.rs:840:1
1717
|
1818
840 | / macro_subgroup_op_clustered!(impl Integer, "OpGroupNonUniformIAdd", subgroup_clustered_i_add; r"
1919
841 | | An integer add group operation of all `value` operands contributed by active invocations in the group.
@@ -27,10 +27,10 @@ note: erroneous constant encountered
2727
= note: this note originates in the macro `macro_subgroup_op_clustered` (in Nightly builds, run with -Z macro-backtrace for more info)
2828

2929
note: the above error was encountered while instantiating `fn spirv_std::arch::subgroup_clustered_i_add::<0, u32, u32>`
30-
--> $DIR/subgroup_cluster_size_0_fail.rs:9:5
31-
|
32-
9 | spirv_std::arch::subgroup_clustered_i_add::<0, _>(value)
33-
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
30+
--> $DIR/subgroup_cluster_size_0_fail.rs:10:5
31+
|
32+
10 | spirv_std::arch::subgroup_clustered_i_add::<0, _>(value)
33+
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
3434

3535
error: aborting due to 1 previous error
3636

tests/compiletests/ui/arch/subgroup/subgroup_cluster_size_non_power_of_two_fail.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
// build-pass
22
// compile-flags: -C target-feature=+GroupNonUniform,+GroupNonUniformArithmetic,+GroupNonUniformClustered,+ext:SPV_KHR_vulkan_memory_model
3+
// normalize-stderr-test "\S*/crates/spirv-std/src/" -> "$$SPIRV_STD_SRC/"
34

45
use glam::UVec3;
56
use spirv_std::arch::{GroupOperation, SubgroupMask};

tests/compiletests/ui/arch/subgroup/subgroup_cluster_size_non_power_of_two_fail.stderr

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
error[E0080]: evaluation of `spirv_std::arch::subgroup_clustered_i_add::<5, u32, u32>::{constant#0}` failed
2-
--> /home/firestar99/workspace/frameworks/rust-gpu/crates/spirv-std/src/arch/subgroup.rs:840:1
2+
--> $SPIRV_STD_SRC/arch/subgroup.rs:840:1
33
|
44
840 | / macro_subgroup_op_clustered!(impl Integer, "OpGroupNonUniformIAdd", subgroup_clustered_i_add; r"
55
841 | | An integer add group operation of all `value` operands contributed by active invocations in the group.
@@ -8,12 +8,12 @@ error[E0080]: evaluation of `spirv_std::arch::subgroup_clustered_i_add::<5, u32,
88
... |
99
856 | | * `ClusterSize` must not be greater than the size of the group
1010
857 | | ");
11-
| |__^ the evaluated program panicked at '`ClusterSize` must be a power of 2', /home/firestar99/workspace/frameworks/rust-gpu/crates/spirv-std/src/arch/subgroup.rs:840:1
11+
| |__^ the evaluated program panicked at '`ClusterSize` must be a power of 2', $SPIRV_STD_SRC/arch/subgroup.rs:840:1
1212
|
1313
= note: this error originates in the macro `$crate::panic::panic_2021` which comes from the expansion of the macro `macro_subgroup_op_clustered` (in Nightly builds, run with -Z macro-backtrace for more info)
1414

1515
note: erroneous constant encountered
16-
--> /home/firestar99/workspace/frameworks/rust-gpu/crates/spirv-std/src/arch/subgroup.rs:840:1
16+
--> $SPIRV_STD_SRC/arch/subgroup.rs:840:1
1717
|
1818
840 | / macro_subgroup_op_clustered!(impl Integer, "OpGroupNonUniformIAdd", subgroup_clustered_i_add; r"
1919
841 | | An integer add group operation of all `value` operands contributed by active invocations in the group.
@@ -27,10 +27,10 @@ note: erroneous constant encountered
2727
= note: this note originates in the macro `macro_subgroup_op_clustered` (in Nightly builds, run with -Z macro-backtrace for more info)
2828

2929
note: the above error was encountered while instantiating `fn spirv_std::arch::subgroup_clustered_i_add::<5, u32, u32>`
30-
--> $DIR/subgroup_cluster_size_non_power_of_two_fail.rs:9:5
31-
|
32-
9 | spirv_std::arch::subgroup_clustered_i_add::<5, _>(value)
33-
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
30+
--> $DIR/subgroup_cluster_size_non_power_of_two_fail.rs:10:5
31+
|
32+
10 | spirv_std::arch::subgroup_clustered_i_add::<5, _>(value)
33+
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
3434

3535
error: aborting due to 1 previous error
3636

0 commit comments

Comments
 (0)