Skip to content

Commit 01a26c0

Browse files
borsbors
committed
Auto merge of #135764 - nikic:llvm-20-test-fixes, r=wesleywiser
Fix tests on LLVM 20 For sparcv8plus.rs, duplicate the test for LLVM 19 and LLVM 20. LLVM 20 resolves one of the FIXME in the test. For x86_64-bigint-add.rs split the check lines for LLVM 19 and LLVM 20. The difference in codegen here is due to a difference in unroll factor, which I believe is not what the test is interested in. Fixes #132957. Fixes #133754.
2 parents 15c6f7e + 2718710 commit 01a26c0

12 files changed

+105
-15
lines changed

‎tests/assembly/x86_64-bigint-helpers.rs

+13-6
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,9 @@
22
//@ assembly-output: emit-asm
33
//@ compile-flags: --crate-type=lib -O -C target-cpu=x86-64-v4
44
//@ compile-flags: -C llvm-args=-x86-asm-syntax=intel
5+
//@ revisions: llvm-pre-20 llvm-20
6+
//@ [llvm-20] min-llvm-version: 20
7+
//@ [llvm-pre-20] max-llvm-major-version: 19
58

69
#![no_std]
710
#![feature(bigint_helper_methods)]
@@ -20,12 +23,16 @@ pub unsafe extern "sysv64" fn bigint_chain_carrying_add(
2023
n: usize,
2124
mut carry: bool,
2225
) -> bool {
23-
// CHECK: mov [[TEMP:r..]], qword ptr [rsi + 8*[[IND:r..]] + 8]
24-
// CHECK: adc [[TEMP]], qword ptr [rdx + 8*[[IND]] + 8]
25-
// CHECK: mov qword ptr [rdi + 8*[[IND]] + 8], [[TEMP]]
26-
// CHECK: mov [[TEMP]], qword ptr [rsi + 8*[[IND]] + 16]
27-
// CHECK: adc [[TEMP]], qword ptr [rdx + 8*[[IND]] + 16]
28-
// CHECK: mov qword ptr [rdi + 8*[[IND]] + 16], [[TEMP]]
26+
// llvm-pre-20: mov [[TEMP:r..]], qword ptr [rsi + 8*[[IND:r..]] + 8]
27+
// llvm-pre-20: adc [[TEMP]], qword ptr [rdx + 8*[[IND]] + 8]
28+
// llvm-pre-20: mov qword ptr [rdi + 8*[[IND]] + 8], [[TEMP]]
29+
// llvm-pre-20: mov [[TEMP]], qword ptr [rsi + 8*[[IND]] + 16]
30+
// llvm-pre-20: adc [[TEMP]], qword ptr [rdx + 8*[[IND]] + 16]
31+
// llvm-pre-20: mov qword ptr [rdi + 8*[[IND]] + 16], [[TEMP]]
32+
// llvm-20: adc [[TEMP:r..]], qword ptr [rdx + 8*[[IND:r..]]]
33+
// llvm-20: mov qword ptr [rdi + 8*[[IND]]], [[TEMP]]
34+
// llvm-20: mov [[TEMP]], qword ptr [rsi + 8*[[IND]] + 8]
35+
// llvm-20: adc [[TEMP]], qword ptr [rdx + 8*[[IND]] + 8]
2936
for i in 0..n {
3037
(*dest.add(i), carry) = u64::carrying_add(*src1.add(i), *src2.add(i), carry);
3138
}

‎tests/ui/abi/sparcv8plus-llvm19.rs

+43
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
//@ revisions: sparc sparcv8plus sparc_cpu_v9 sparc_feature_v8plus sparc_cpu_v9_feature_v8plus
2+
//@[sparc] compile-flags: --target sparc-unknown-none-elf
3+
//@[sparc] needs-llvm-components: sparc
4+
//@[sparcv8plus] compile-flags: --target sparc-unknown-linux-gnu
5+
//@[sparcv8plus] needs-llvm-components: sparc
6+
//@[sparc_cpu_v9] compile-flags: --target sparc-unknown-none-elf -C target-cpu=v9
7+
//@[sparc_cpu_v9] needs-llvm-components: sparc
8+
//@[sparc_feature_v8plus] compile-flags: --target sparc-unknown-none-elf -C target-feature=+v8plus
9+
//@[sparc_feature_v8plus] needs-llvm-components: sparc
10+
//@[sparc_cpu_v9_feature_v8plus] compile-flags: --target sparc-unknown-none-elf -C target-cpu=v9 -C target-feature=+v8plus
11+
//@[sparc_cpu_v9_feature_v8plus] needs-llvm-components: sparc
12+
//@ exact-llvm-major-version: 19
13+
14+
#![crate_type = "rlib"]
15+
#![feature(no_core, rustc_attrs, lang_items)]
16+
#![no_core]
17+
18+
#[lang = "sized"]
19+
trait Sized {}
20+
#[lang = "copy"]
21+
trait Copy {}
22+
23+
#[rustc_builtin_macro]
24+
macro_rules! compile_error {
25+
() => {};
26+
}
27+
28+
#[cfg(all(not(target_feature = "v8plus"), not(target_feature = "v9")))]
29+
compile_error!("-v8plus,-v9");
30+
//[sparc]~^ ERROR -v8plus,-v9
31+
32+
// FIXME: sparc_cpu_v9 should be in "-v8plus,+v9" group (fixed in LLVM 20)
33+
#[cfg(all(target_feature = "v8plus", target_feature = "v9"))]
34+
compile_error!("+v8plus,+v9");
35+
//[sparcv8plus,sparc_cpu_v9_feature_v8plus,sparc_cpu_v9]~^ ERROR +v8plus,+v9
36+
37+
// FIXME: should be rejected
38+
#[cfg(all(target_feature = "v8plus", not(target_feature = "v9")))]
39+
compile_error!("+v8plus,-v9 (FIXME)");
40+
//[sparc_feature_v8plus]~^ ERROR +v8plus,-v9 (FIXME)
41+
42+
#[cfg(all(not(target_feature = "v8plus"), target_feature = "v9"))]
43+
compile_error!("-v8plus,+v9");

‎tests/ui/abi/sparcv8plus-llvm19.sparc.stderr

+8
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
error: -v8plus,-v9
2+
--> $DIR/sparcv8plus-llvm19.rs:29:1
3+
|
4+
LL | compile_error!("-v8plus,-v9");
5+
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
6+
7+
error: aborting due to 1 previous error
8+

‎tests/ui/abi/sparcv8plus-llvm19.sparc_cpu_v9.stderr

+8
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
error: +v8plus,+v9
2+
--> $DIR/sparcv8plus-llvm19.rs:34:1
3+
|
4+
LL | compile_error!("+v8plus,+v9");
5+
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
6+
7+
error: aborting due to 1 previous error
8+

‎tests/ui/abi/sparcv8plus-llvm19.sparc_cpu_v9_feature_v8plus.stderr

+8
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
error: +v8plus,+v9
2+
--> $DIR/sparcv8plus-llvm19.rs:34:1
3+
|
4+
LL | compile_error!("+v8plus,+v9");
5+
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
6+
7+
error: aborting due to 1 previous error
8+

‎tests/ui/abi/sparcv8plus-llvm19.sparc_feature_v8plus.stderr

+8
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
error: +v8plus,-v9 (FIXME)
2+
--> $DIR/sparcv8plus-llvm19.rs:39:1
3+
|
4+
LL | compile_error!("+v8plus,-v9 (FIXME)");
5+
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
6+
7+
error: aborting due to 1 previous error
8+

‎tests/ui/abi/sparcv8plus-llvm19.sparcv8plus.stderr

+8
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
error: +v8plus,+v9
2+
--> $DIR/sparcv8plus-llvm19.rs:34:1
3+
|
4+
LL | compile_error!("+v8plus,+v9");
5+
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
6+
7+
error: aborting due to 1 previous error
8+

‎tests/ui/abi/sparcv8plus.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
//@[sparc_feature_v8plus] needs-llvm-components: sparc
1010
//@[sparc_cpu_v9_feature_v8plus] compile-flags: --target sparc-unknown-none-elf -C target-cpu=v9 -C target-feature=+v8plus
1111
//@[sparc_cpu_v9_feature_v8plus] needs-llvm-components: sparc
12-
//@ min-llvm-version: 19
12+
//@ min-llvm-version: 20
1313

1414
#![crate_type = "rlib"]
1515
#![feature(no_core, rustc_attrs, lang_items)]
@@ -29,10 +29,9 @@ macro_rules! compile_error {
2929
compile_error!("-v8plus,-v9");
3030
//[sparc]~^ ERROR -v8plus,-v9
3131

32-
// FIXME: sparc_cpu_v9 should be in "-v8plus,+v9" group (fixed in LLVM 20)
3332
#[cfg(all(target_feature = "v8plus", target_feature = "v9"))]
3433
compile_error!("+v8plus,+v9");
35-
//[sparcv8plus,sparc_cpu_v9_feature_v8plus,sparc_cpu_v9]~^ ERROR +v8plus,+v9
34+
//[sparcv8plus,sparc_cpu_v9_feature_v8plus]~^ ERROR +v8plus,+v9
3635

3736
// FIXME: should be rejected
3837
#[cfg(all(target_feature = "v8plus", not(target_feature = "v9")))]
@@ -41,3 +40,4 @@ compile_error!("+v8plus,-v9 (FIXME)");
4140

4241
#[cfg(all(not(target_feature = "v8plus"), target_feature = "v9"))]
4342
compile_error!("-v8plus,+v9");
43+
//[sparc_cpu_v9]~^ ERROR -v8plus,+v9

‎tests/ui/abi/sparcv8plus.sparc_cpu_v9.stderr

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
error: +v8plus,+v9
2-
--> $DIR/sparcv8plus.rs:34:1
1+
error: -v8plus,+v9
2+
--> $DIR/sparcv8plus.rs:42:1
33
|
4-
LL | compile_error!("+v8plus,+v9");
4+
LL | compile_error!("-v8plus,+v9");
55
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
66

77
error: aborting due to 1 previous error

‎tests/ui/abi/sparcv8plus.sparc_cpu_v9_feature_v8plus.stderr

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
error: +v8plus,+v9
2-
--> $DIR/sparcv8plus.rs:34:1
2+
--> $DIR/sparcv8plus.rs:33:1
33
|
44
LL | compile_error!("+v8plus,+v9");
55
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^

‎tests/ui/abi/sparcv8plus.sparc_feature_v8plus.stderr

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
error: +v8plus,-v9 (FIXME)
2-
--> $DIR/sparcv8plus.rs:39:1
2+
--> $DIR/sparcv8plus.rs:38:1
33
|
44
LL | compile_error!("+v8plus,-v9 (FIXME)");
55
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^

‎tests/ui/abi/sparcv8plus.sparcv8plus.stderr

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
error: +v8plus,+v9
2-
--> $DIR/sparcv8plus.rs:34:1
2+
--> $DIR/sparcv8plus.rs:33:1
33
|
44
LL | compile_error!("+v8plus,+v9");
55
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^

0 commit comments

Comments
 (0)