Skip to content

Commit 52eaa30

Browse files
committed
llvm 20: adapt integer comparison tests
The LLVM commit llvm/llvm-project@abf69a1 changed the IR in a few comparison tests: https://buildkite.com/llvm-project/rust-llvm-integrate-prototype/builds/30500#01917017-26fe-4a4d-956b-725a2903e5a8 Adapted accordingly.
1 parent 4d7c095 commit 52eaa30

File tree

3 files changed

+56
-27
lines changed

3 files changed

+56
-27
lines changed

tests/assembly/x86_64-cmp.rs

+28-14
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
1-
//@ revisions: DEBUG OPTIM
1+
//@ revisions: DEBUG LLVM-PRE-20-OPTIM LLVM-20-OPTIM
22
//@ [DEBUG] compile-flags: -C opt-level=0
3-
//@ [OPTIM] compile-flags: -C opt-level=3
3+
//@ [LLVM-PRE-20-OPTIM] compile-flags: -C opt-level=3
4+
//@ [LLVM-PRE-20-OPTIM] ignore-llvm-version: 20 - 99
5+
//@ [LLVM-20-OPTIM] compile-flags: -C opt-level=3
6+
//@ [LLVM-20-OPTIM] min-llvm-version: 20
47
//@ assembly-output: emit-asm
58
//@ compile-flags: --crate-type=lib -C llvm-args=-x86-asm-syntax=intel
69
//@ only-x86_64
@@ -21,12 +24,18 @@ pub fn signed_cmp(a: i16, b: i16) -> std::cmp::Ordering {
2124
// DEBUG: and
2225
// DEBUG: sub
2326

24-
// OPTIM: xor
25-
// OPTIM: cmp
26-
// OPTIM: setne
27-
// OPTIM: mov
28-
// OPTIM: cmovge
29-
// OPTIM: ret
27+
// LLVM-PRE-20-OPTIM: xor
28+
// LLVM-PRE-20-OPTIM: cmp
29+
// LLVM-PRE-20-OPTIM: setne
30+
// LLVM-PRE-20-OPTIM: mov
31+
// LLVM-PRE-20-OPTIM: cmovge
32+
// LLVM-PRE-20-OPTIM: ret
33+
//
34+
// LLVM-20-OPTIM: cmp
35+
// LLVM-20-OPTIM: setl
36+
// LLVM-20-OPTIM: setg
37+
// LLVM-20-OPTIM: sub
38+
// LLVM-20-OPTIM: ret
3039
three_way_compare(a, b)
3140
}
3241

@@ -41,11 +50,16 @@ pub fn unsigned_cmp(a: u16, b: u16) -> std::cmp::Ordering {
4150
// DEBUG: and
4251
// DEBUG: sub
4352

44-
// OPTIM: xor
45-
// OPTIM: cmp
46-
// OPTIM: setne
47-
// OPTIM: mov
48-
// OPTIM: cmovae
49-
// OPTIM: ret
53+
// LLVM-PRE-20-OPTIM: xor
54+
// LLVM-PRE-20-OPTIM: cmp
55+
// LLVM-PRE-20-OPTIM: setne
56+
// LLVM-PRE-20-OPTIM: mov
57+
// LLVM-PRE-20-OPTIM: cmovae
58+
// LLVM-PRE-20-OPTIM: ret
59+
//
60+
// LLVM-20-OPTIM: cmp
61+
// LLVM-20-OPTIM: seta
62+
// LLVM-20-OPTIM: sbb
63+
// LLVM-20-OPTIM: ret
5064
three_way_compare(a, b)
5165
}

tests/codegen/comparison-operators-2-tuple.rs

+15-5
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
1+
// ignore-tidy-linelength
12
//@ compile-flags: -C opt-level=1 -Z merge-functions=disabled
23
//@ only-x86_64
4+
//@ revisions: llvm-pre-20 llvm-20
5+
//@ [llvm-20] min-llvm-version: 20
6+
//@ [llvm-pre-20] ignore-llvm-version: 20 - 99
37

48
#![crate_type = "lib"]
59

@@ -77,11 +81,17 @@ pub fn check_ge_direct(a: TwoTuple, b: TwoTuple) -> bool {
7781
// CHECK-SAME: (i16 noundef %[[A0:.+]], i16 noundef %[[A1:.+]], i16 noundef %[[B0:.+]], i16 noundef %[[B1:.+]])
7882
#[no_mangle]
7983
pub fn check_lt_via_cmp(a: TwoTuple, b: TwoTuple) -> bool {
80-
// CHECK-DAG: %[[EQ:.+]] = icmp eq i16 %[[A0]], %[[B0]]
81-
// CHECK-DAG: %[[CMP0:.+]] = icmp slt i16 %[[A0]], %[[B0]]
82-
// CHECK-DAG: %[[CMP1:.+]] = icmp ult i16 %[[A1]], %[[B1]]
83-
// CHECK: %[[R:.+]] = select i1 %[[EQ]], i1 %[[CMP1]], i1 %[[CMP0]]
84-
// CHECK: ret i1 %[[R]]
84+
// llvm-20-DAG: %[[CMP0:.+]] = tail call noundef range(i8 -1, 2) i8 @llvm.scmp.i8.i16(i16 %[[A0]], i16 %[[B0]])
85+
// llvm-20-DAG: %[[EQ:.+]] = icmp eq i16 %[[A0]], %[[B0]]
86+
// llvm-20-DAG: %[[CMP1:.+]] = tail call range(i8 -1, 2) i8 @llvm.ucmp.i8.i16(i16 %[[A1]], i16 %[[B1]])
87+
// llvm-20: %[[S:.+]] = select i1 %[[EQ]], i8 %[[CMP1]], i8 %[[CMP0]]
88+
// llvm-20: %[[R:.+]] = icmp eq i8 %[[S]], -1
89+
// llvm-20: ret i1 %[[R]]
90+
// llvm-pre-20-DAG: icmp eq i16 %[[A0]], %[[B0]]
91+
// llvm-pre-20-DAG: %[[CMP0:.+]] = icmp slt i16 %[[A0]], %[[B0]]
92+
// llvm-pre-20-DAG: %[[CMP1:.+]] = icmp ult i16 %[[A1]], %[[B1]]
93+
// llvm-pre-20: %[[R:.+]] = select i1 %[[EQ]], i1 %[[CMP1]], i1 %[[CMP0]]
94+
// llvm-pre-20: ret i1 %[[R]]
8595
Ord::cmp(&a, &b).is_lt()
8696
}
8797

tests/codegen/integer-cmp.rs

+13-8
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
// This is test for more optimal Ord implementation for integers.
22
// See <https://github.com/rust-lang/rust/issues/63758> for more info.
33

4+
//@ revisions: llvm-pre-20 llvm-20
5+
//@ [llvm-20] min-llvm-version: 20
6+
//@ [llvm-pre-20] ignore-llvm-version: 20 - 99
47
//@ compile-flags: -C opt-level=3
58

69
#![crate_type = "lib"]
@@ -10,19 +13,21 @@ use std::cmp::Ordering;
1013
// CHECK-LABEL: @cmp_signed
1114
#[no_mangle]
1215
pub fn cmp_signed(a: i64, b: i64) -> Ordering {
13-
// CHECK: icmp slt
14-
// CHECK: icmp ne
15-
// CHECK: zext i1
16-
// CHECK: select i1
16+
// llvm-20: @llvm.scmp.i8.i64
17+
// llvm-pre-20: icmp slt
18+
// llvm-pre-20: icmp ne
19+
// llvm-pre-20: zext i1
20+
// llvm-pre-20: select i1
1721
a.cmp(&b)
1822
}
1923

2024
// CHECK-LABEL: @cmp_unsigned
2125
#[no_mangle]
2226
pub fn cmp_unsigned(a: u32, b: u32) -> Ordering {
23-
// CHECK: icmp ult
24-
// CHECK: icmp ne
25-
// CHECK: zext i1
26-
// CHECK: select i1
27+
// llvm-20: @llvm.ucmp.i8.i32
28+
// llvm-pre-20: icmp ult
29+
// llvm-pre-20: icmp ne
30+
// llvm-pre-20: zext i1
31+
// llvm-pre-20: select i1
2732
a.cmp(&b)
2833
}

0 commit comments

Comments
 (0)