Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

adapt integer comparison tests for LLVM 20 IR changes #129350

Merged
merged 1 commit into from
Aug 23, 2024
+41 −22
Merged

adapt integer comparison tests for LLVM 20 IR changes #129350

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
42 changes: 28 additions & 14 deletions tests/assembly/x86_64-cmp.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
//@ revisions: DEBUG OPTIM
//@ revisions: DEBUG LLVM-PRE-20-OPTIM LLVM-20-OPTIM
//@ [DEBUG] compile-flags: -C opt-level=0
//@ [OPTIM] compile-flags: -C opt-level=3
//@ [LLVM-PRE-20-OPTIM] compile-flags: -C opt-level=3
//@ [LLVM-PRE-20-OPTIM] ignore-llvm-version: 20 - 99
//@ [LLVM-20-OPTIM] compile-flags: -C opt-level=3
//@ [LLVM-20-OPTIM] min-llvm-version: 20
//@ assembly-output: emit-asm
//@ compile-flags: --crate-type=lib -C llvm-args=-x86-asm-syntax=intel
//@ only-x86_64
Expand All @@ -21,12 +24,18 @@ pub fn signed_cmp(a: i16, b: i16) -> std::cmp::Ordering {
// DEBUG: and
// DEBUG: sub

// OPTIM: xor
// OPTIM: cmp
// OPTIM: setne
// OPTIM: mov
// OPTIM: cmovge
// OPTIM: ret
// LLVM-PRE-20-OPTIM: xor
// LLVM-PRE-20-OPTIM: cmp
// LLVM-PRE-20-OPTIM: setne
// LLVM-PRE-20-OPTIM: mov
// LLVM-PRE-20-OPTIM: cmovge
// LLVM-PRE-20-OPTIM: ret
//
// LLVM-20-OPTIM: cmp
// LLVM-20-OPTIM: setl
// LLVM-20-OPTIM: setg
// LLVM-20-OPTIM: sub
// LLVM-20-OPTIM: ret
three_way_compare(a, b)
}

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

// OPTIM: xor
// OPTIM: cmp
// OPTIM: setne
// OPTIM: mov
// OPTIM: cmovae
// OPTIM: ret
// LLVM-PRE-20-OPTIM: xor
// LLVM-PRE-20-OPTIM: cmp
// LLVM-PRE-20-OPTIM: setne
// LLVM-PRE-20-OPTIM: mov
// LLVM-PRE-20-OPTIM: cmovae
// LLVM-PRE-20-OPTIM: ret
//
// LLVM-20-OPTIM: cmp
// LLVM-20-OPTIM: seta
// LLVM-20-OPTIM: sbb
// LLVM-20-OPTIM: ret
three_way_compare(a, b)
}
21 changes: 13 additions & 8 deletions tests/codegen/integer-cmp.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
// This is test for more optimal Ord implementation for integers.
// See <https://github.com/rust-lang/rust/issues/63758> for more info.

//@ revisions: llvm-pre-20 llvm-20
//@ [llvm-20] min-llvm-version: 20
//@ [llvm-pre-20] ignore-llvm-version: 20 - 99
//@ compile-flags: -C opt-level=3

#![crate_type = "lib"]
Expand All @@ -10,19 +13,21 @@ use std::cmp::Ordering;
// CHECK-LABEL: @cmp_signed
#[no_mangle]
pub fn cmp_signed(a: i64, b: i64) -> Ordering {
// CHECK: icmp slt
// CHECK: icmp ne
// CHECK: zext i1
// CHECK: select i1
// llvm-20: @llvm.scmp.i8.i64
// llvm-pre-20: icmp slt
// llvm-pre-20: icmp ne
// llvm-pre-20: zext i1
// llvm-pre-20: select i1
a.cmp(&b)
}

// CHECK-LABEL: @cmp_unsigned
#[no_mangle]
pub fn cmp_unsigned(a: u32, b: u32) -> Ordering {
// CHECK: icmp ult
// CHECK: icmp ne
// CHECK: zext i1
// CHECK: select i1
// llvm-20: @llvm.ucmp.i8.i32
// llvm-pre-20: icmp ult
// llvm-pre-20: icmp ne
// llvm-pre-20: zext i1
// llvm-pre-20: select i1
a.cmp(&b)
}
Loading