Skip to content

Commit 6434ab8

Browse files
LegNeatoLegNeato
committed
Bless compiletest stderr for updated nightly diagnostics
1 parent e1591d0 commit 6434ab8

28 files changed

Lines changed: 417 additions & 648 deletions

‎tests/compiletests/ui/arch/debug_printf_type_checking.stderr‎

Lines changed: 5 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -75,10 +75,7 @@ LL | debug_printf!("%f", 11_u32);
7575
| |
7676
| this argument influences the return type of `assert_is_type`
7777
note: function defined here
78-
--> $SPIRV_STD_SRC/debug_printf.rs:6:8
79-
|
80-
LL | pub fn assert_is_type<T>(ty: T) -> T {
81-
| ^^^^^^^^^^^^^^
78+
--> crates/spirv-std/src/debug_printf.rs:6:7
8279
= note: this error originates in the macro `debug_printf` (in Nightly builds, run with -Z macro-backtrace for more info)
8380
help: change the type of the numeric literal from `u32` to `f32`
8481
|
@@ -103,10 +100,7 @@ LL | debug_printf!("%u", 11.0_f32);
103100
| |
104101
| this argument influences the return type of `assert_is_type`
105102
note: function defined here
106-
--> $SPIRV_STD_SRC/debug_printf.rs:6:8
107-
|
108-
LL | pub fn assert_is_type<T>(ty: T) -> T {
109-
| ^^^^^^^^^^^^^^
103+
--> crates/spirv-std/src/debug_printf.rs:6:7
110104
= note: this error originates in the macro `debug_printf` (in Nightly builds, run with -Z macro-backtrace for more info)
111105
help: change the type of the numeric literal from `f32` to `u32`
112106
|
@@ -130,11 +124,8 @@ LL | debug_printf!("%v2f", 11.0);
130124
`IVec2` implements `spirv_std::Vector<i32, 2>`
131125
`IVec3` implements `spirv_std::Vector<i32, 3>`
132126
and 8 others
133-
note: required by a bound in `assert_is_vector`
134-
--> $SPIRV_STD_SRC/debug_printf.rs:11:40
135-
|
136-
LL | pub fn assert_is_vector<TY: Scalar, V: Vector<TY, SIZE>, const SIZE: usize>(vec: V) -> V {
137-
| ^^^^^^^^^^^^^^^^ required by this bound in `assert_is_vector`
127+
note: required by a bound in `spirv_std::debug_printf::assert_is_vector`
128+
--> crates/spirv-std/src/debug_printf.rs:11:0
138129
= note: this error originates in the macro `debug_printf` (in Nightly builds, run with -Z macro-backtrace for more info)
139130

140131
error[E0308]: mismatched types
@@ -154,10 +145,7 @@ LL | debug_printf!("%f", Vec2::splat(33.3));
154145
| |
155146
| this argument influences the return type of `assert_is_type`
156147
note: function defined here
157-
--> $SPIRV_STD_SRC/debug_printf.rs:6:8
158-
|
159-
LL | pub fn assert_is_type<T>(ty: T) -> T {
160-
| ^^^^^^^^^^^^^^
148+
--> crates/spirv-std/src/debug_printf.rs:6:7
161149
= note: this error originates in the macro `debug_printf` (in Nightly builds, run with -Z macro-backtrace for more info)
162150

163151
error: aborting due to 14 previous errors

‎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,6 +1,7 @@
11
// build-pass
22
// compile-flags: -C target-feature=+GroupNonUniform,+GroupNonUniformArithmetic,+GroupNonUniformClustered,+ext:SPV_KHR_vulkan_memory_model
33
// normalize-stderr-test "\S*/crates/spirv-std/src/" -> "$$SPIRV_STD_SRC/"
4+
// normalize-stderr-test "\S*/lib/rustlib/" -> "$$SYSROOT/lib/rustlib/"
45

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

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

Lines changed: 12 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,26 @@
11
error[E0080]: evaluation panicked: `ClusterSize` must be at least 1
2-
--> $SPIRV_STD_SRC/arch/subgroup.rs:937:1
2+
--> $SYSROOT/lib/rustlib/src/rust/library/core/src/panic.rs:62:9
33
|
4-
LL | / macro_subgroup_op_clustered!(impl Integer, "OpGroupNonUniformIAdd", subgroup_clustered_i_add; r"
5-
LL | | An integer add group operation of all `value` operands contributed by active invocations in the group.
6-
LL | |
7-
LL | | Result Type must be a scalar or vector of integer type.
8-
... |
9-
LL | | * `ClusterSize` must not be greater than the size of the group
10-
LL | | ");
11-
| |__^ evaluation of `spirv_std::arch::subgroup_clustered_i_add::<0, u32, u32>::{constant#0}` failed here
4+
LL | $crate::panicking::panic_fmt($crate::const_format_args!($($t)+));
5+
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ evaluation of `spirv_std::arch::subgroup_clustered_i_add::<0, u32, u32>::{constant#0}` failed here
6+
|
7+
--> crates/spirv-std/src/arch/subgroup.rs:937:0
8+
::: crates/spirv-std/src/arch/subgroup.rs:954:2
9+
|
10+
= note: in this macro invocation
1211
|
1312
= 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)
1413

1514
note: erroneous constant encountered
16-
--> $SPIRV_STD_SRC/arch/subgroup.rs:937:1
15+
--> crates/spirv-std/src/arch/subgroup.rs:890:12
16+
::: crates/spirv-std/src/arch/subgroup.rs:954:2
1717
|
18-
LL | / macro_subgroup_op_clustered!(impl Integer, "OpGroupNonUniformIAdd", subgroup_clustered_i_add; r"
19-
LL | | An integer add group operation of all `value` operands contributed by active invocations in the group.
20-
LL | |
21-
LL | | Result Type must be a scalar or vector of integer type.
22-
... |
23-
LL | | * `ClusterSize` must not be greater than the size of the group
24-
LL | | ");
25-
| |__^
18+
= note: in this macro invocation
2619
|
2720
= note: this note originates in the macro `macro_subgroup_op_clustered` (in Nightly builds, run with -Z macro-backtrace for more info)
2821

2922
note: the above error was encountered while instantiating `fn subgroup_clustered_i_add::<0, u32, u32>`
30-
--> $DIR/subgroup_cluster_size_0_fail.rs:10:5
23+
--> $DIR/subgroup_cluster_size_0_fail.rs:11:5
3124
|
3225
LL | spirv_std::arch::subgroup_clustered_i_add::<0, _>(value)
3326
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^

‎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,6 +1,7 @@
11
// build-pass
22
// compile-flags: -C target-feature=+GroupNonUniform,+GroupNonUniformArithmetic,+GroupNonUniformClustered,+ext:SPV_KHR_vulkan_memory_model
33
// normalize-stderr-test "\S*/crates/spirv-std/src/" -> "$$SPIRV_STD_SRC/"
4+
// normalize-stderr-test "\S*/lib/rustlib/" -> "$$SYSROOT/lib/rustlib/"
45

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

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

Lines changed: 12 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,26 @@
11
error[E0080]: evaluation panicked: `ClusterSize` must be a power of 2
2-
--> $SPIRV_STD_SRC/arch/subgroup.rs:937:1
2+
--> $SYSROOT/lib/rustlib/src/rust/library/core/src/panic.rs:62:9
33
|
4-
LL | / macro_subgroup_op_clustered!(impl Integer, "OpGroupNonUniformIAdd", subgroup_clustered_i_add; r"
5-
LL | | An integer add group operation of all `value` operands contributed by active invocations in the group.
6-
LL | |
7-
LL | | Result Type must be a scalar or vector of integer type.
8-
... |
9-
LL | | * `ClusterSize` must not be greater than the size of the group
10-
LL | | ");
11-
| |__^ evaluation of `spirv_std::arch::subgroup_clustered_i_add::<5, u32, u32>::{constant#0}` failed here
4+
LL | $crate::panicking::panic_fmt($crate::const_format_args!($($t)+));
5+
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ evaluation of `spirv_std::arch::subgroup_clustered_i_add::<5, u32, u32>::{constant#0}` failed here
6+
|
7+
--> crates/spirv-std/src/arch/subgroup.rs:937:0
8+
::: crates/spirv-std/src/arch/subgroup.rs:954:2
9+
|
10+
= note: in this macro invocation
1211
|
1312
= 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)
1413

1514
note: erroneous constant encountered
16-
--> $SPIRV_STD_SRC/arch/subgroup.rs:937:1
15+
--> crates/spirv-std/src/arch/subgroup.rs:890:12
16+
::: crates/spirv-std/src/arch/subgroup.rs:954:2
1717
|
18-
LL | / macro_subgroup_op_clustered!(impl Integer, "OpGroupNonUniformIAdd", subgroup_clustered_i_add; r"
19-
LL | | An integer add group operation of all `value` operands contributed by active invocations in the group.
20-
LL | |
21-
LL | | Result Type must be a scalar or vector of integer type.
22-
... |
23-
LL | | * `ClusterSize` must not be greater than the size of the group
24-
LL | | ");
25-
| |__^
18+
= note: in this macro invocation
2619
|
2720
= note: this note originates in the macro `macro_subgroup_op_clustered` (in Nightly builds, run with -Z macro-backtrace for more info)
2821

2922
note: the above error was encountered while instantiating `fn subgroup_clustered_i_add::<5, u32, u32>`
30-
--> $DIR/subgroup_cluster_size_non_power_of_two_fail.rs:10:5
23+
--> $DIR/subgroup_cluster_size_non_power_of_two_fail.rs:11:5
3124
|
3225
LL | spirv_std::arch::subgroup_clustered_i_add::<5, _>(value)
3326
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^

‎tests/compiletests/ui/arch/subgroup/subgroup_composite_enum_err.stderr‎

Lines changed: 2 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -21,35 +21,6 @@ LL | | C,
2121
LL | | }
2222
| |_^
2323

24-
error[E0412]: cannot find type `C` in this scope
25-
--> $DIR/subgroup_composite_enum_err.rs:
26-
|
27-
LL | #[repr(C)]
28-
| ^
29-
LL | #[derive(Copy, Clone, Default, ScalarComposite)]
30-
| --------------- similarly named type parameter `F` defined here
31-
|
32-
help: there is an enum variant `crate::CRepr::C` and 6 others; try using the variant's enum
33-
|
34-
LL - #[repr(C)]
35-
LL + #[repr(crate::CRepr)]
36-
|
37-
LL - #[repr(C)]
38-
LL + #[repr(crate::NoDefault)]
39-
|
40-
LL - #[repr(C)]
41-
LL + #[repr(crate::NoFrom)]
42-
|
43-
LL - #[repr(C)]
44-
LL + #[repr(crate::NoRepr)]
45-
|
46-
= and 2 other candidates
47-
help: a type parameter with a similar name exists
48-
|
49-
LL - #[repr(C)]
50-
LL + #[repr(F)]
51-
|
52-
5324
error[E0566]: conflicting representation hints
5425
--> $DIR/subgroup_composite_enum_err.rs:
5526
|
@@ -142,7 +113,7 @@ LL | enum_repr_from!(NoDefault, i32);
142113
candidate #1: `Default`
143114
= note: this error originates in the macro `enum_repr_from` (in Nightly builds, run with -Z macro-backtrace for more info)
144115

145-
error: aborting due to 9 previous errors
116+
error: aborting due to 8 previous errors
146117

147-
Some errors have detailed explanations: E0277, E0412, E0566, E0599.
118+
Some errors have detailed explanations: E0277, E0566, E0599.
148119
For more information about an error, try `rustc --explain E0277`.

‎tests/compiletests/ui/dis/issue-1062.stderr‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ OpLine %5 11 12
44
%6 = OpLoad %7 %8
55
OpLine %5 11 35
66
%9 = OpLoad %7 %10
7-
OpLine %11 1134 4
7+
OpLine %11 1243 4
88
%12 = OpBitwiseAnd %7 %9 %13
99
%14 = OpISub %7 %15 %12
1010
%16 = OpShiftLeftLogical %7 %6 %12

‎tests/compiletests/ui/dis/panic_builtin_bounds_check.stderr‎

Lines changed: 43 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -4,53 +4,53 @@ OpExtension "SPV_KHR_non_semantic_info"
44
OpMemoryModel Logical Simple
55
OpEntryPoint Fragment %2 "main"
66
OpExecutionMode %2 OriginUpperLeft
7-
%3 = OpString "/n[Rust panicked at $SYSROOT/lib/rustlib/src/rust/library/core/src/panicking.rs:276:5]/n index out of bounds: the len is %u but the index is %u/n in main()/n"
8-
%4 = OpString $SYSROOT/lib/rustlib/src/rust/library/core/src/panicking.rs"
9-
%5 = OpString "$DIR/panic_builtin_bounds_check.rs"
10-
OpDecorate %6 ArrayStride 4
11-
%7 = OpTypeVoid
12-
%8 = OpTypeFunction %7
13-
%9 = OpTypeInt 32 0
14-
%10 = OpConstant %9 4
15-
%11 = OpTypeArray %9 %10
16-
%12 = OpTypePointer Function %11
17-
%6 = OpTypeArray %9 %10
18-
%13 = OpConstant %9 0
19-
%14 = OpConstant %9 1
20-
%15 = OpConstant %9 2
21-
%16 = OpConstant %9 3
22-
%17 = OpTypeBool
23-
%18 = OpConstant %9 5
24-
%19 = OpTypePointer Function %9
25-
%2 = OpFunction %7 None %8
26-
%20 = OpLabel
27-
OpLine %5 32 4
28-
%21 = OpVariable %12 Function
29-
OpLine %5 32 23
30-
%22 = OpCompositeConstruct %6 %13 %14 %15 %16
31-
OpLine %5 27 4
32-
%23 = OpCompositeExtract %9 %22 0
33-
%24 = OpCompositeExtract %9 %22 1
34-
%25 = OpCompositeExtract %9 %22 2
35-
%26 = OpCompositeExtract %9 %22 3
36-
%27 = OpCompositeConstruct %11 %23 %24 %25 %26
37-
OpStore %21 %27
38-
%28 = OpULessThan %17 %18 %10
7+
%3 = OpString "/n[Rust panicked at $DIR/panic_builtin_bounds_check.rs:27:5]/n <unknown message> (failed to find/decode `format_args!` expansion)/n in main()/n"
8+
%4 = OpString "$DIR/panic_builtin_bounds_check.rs"
9+
OpDecorate %5 ArrayStride 4
10+
%6 = OpTypeVoid
11+
%7 = OpTypeFunction %6
12+
%8 = OpTypeInt 32 0
13+
%9 = OpConstant %8 4
14+
%10 = OpTypeArray %8 %9
15+
%11 = OpTypePointer Function %10
16+
%5 = OpTypeArray %8 %9
17+
%12 = OpConstant %8 0
18+
%13 = OpConstant %8 1
19+
%14 = OpConstant %8 2
20+
%15 = OpConstant %8 3
21+
%16 = OpTypeBool
22+
%17 = OpConstant %8 5
23+
%18 = OpTypePointer Function %8
24+
%2 = OpFunction %6 None %7
25+
%19 = OpLabel
26+
OpLine %4 32 4
27+
%20 = OpVariable %11 Function
28+
OpLine %4 32 23
29+
%21 = OpCompositeConstruct %5 %12 %13 %14 %15
30+
OpLine %4 32 4
31+
%22 = OpCompositeExtract %8 %21 0
32+
%23 = OpCompositeExtract %8 %21 1
33+
%24 = OpCompositeExtract %8 %21 2
34+
%25 = OpCompositeExtract %8 %21 3
35+
%26 = OpCompositeConstruct %10 %22 %23 %24 %25
36+
OpStore %20 %26
37+
OpLine %4 27 4
38+
%27 = OpULessThan %16 %17 %9
3939
OpNoLine
40-
OpSelectionMerge %29 None
41-
OpBranchConditional %28 %30 %31
40+
OpSelectionMerge %28 None
41+
OpBranchConditional %27 %29 %30
42+
%29 = OpLabel
43+
OpBranch %28
4244
%30 = OpLabel
43-
OpBranch %29
44-
%31 = OpLabel
45-
OpLine %4 276 4
46-
%32 = OpExtInst %7 %1 1 %3 %10 %18
45+
OpLine %4 27 4
46+
%31 = OpExtInst %6 %1 1 %3
4747
OpNoLine
4848
OpReturn
49-
%29 = OpLabel
50-
OpLine %5 27 4
51-
%33 = OpIAdd %9 %13 %18
52-
%34 = OpInBoundsAccessChain %19 %21 %33
53-
%35 = OpLoad %9 %34
49+
%28 = OpLabel
50+
OpLine %4 27 4
51+
%32 = OpIAdd %8 %12 %17
52+
%33 = OpInBoundsAccessChain %18 %20 %32
53+
%34 = OpLoad %8 %33
5454
OpNoLine
5555
OpReturn
5656
OpFunctionEnd

0 commit comments

Comments
 (0)