Skip to content

Update tests for LLVM 23 #159391

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

Merged
rust-bors merged 5 commits into from
Jul 17, 2026
Merged

Update tests for LLVM 23 #159391

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
e215910
Update global_asm tests for LLVM 23
nikic Jul 13, 2026
d4a24cd
Adjust codegen test for LLVM 23
nikic Jul 13, 2026
283a60b
Update simd mask test for LLVM 23
nikic Jul 13, 2026
61d9ba2
Disable slice is_ascii() test on LLVM 23
nikic Jul 13, 2026
df6afdf
Adjust PGO tests for LLVM 23
nikic Jul 14, 2026
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
34 changes: 26 additions & 8 deletions tests/assembly-llvm/simd-intrinsic-mask-reduce.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,16 @@
// verify that simd mask reductions do not introduce additional bit shift operations
//@ add-minicore
//@ revisions: x86 aarch64
//@ revisions: x86 aarch64-llvm22 aarch64
//@ [x86] compile-flags: --target=x86_64-unknown-linux-gnu -C llvm-args=-x86-asm-syntax=intel
// Set the base cpu explicitly, in case the default has been changed.
//@ [x86] compile-flags: -C target-cpu=x86-64
//@ [x86] needs-llvm-components: x86
//@ [aarch64-llvm22] compile-flags: --target=aarch64-unknown-linux-gnu
//@ [aarch64-llvm22] needs-llvm-components: aarch64
//@ [aarch64-llvm22] max-llvm-major-version: 22
//@ [aarch64] compile-flags: --target=aarch64-unknown-linux-gnu
//@ [aarch64] needs-llvm-components: aarch64
//@ [aarch64] min-llvm-version: 23
//@ assembly-output: emit-asm
//@ compile-flags: --crate-type=lib -Copt-level=3 -C panic=abort

Expand All @@ -33,12 +37,19 @@ pub unsafe extern "C" fn mask_reduce_all(m: mask8x16) -> bool {
// x86-NEXT: {{cmp ax, -1|cmp eax, 65535|xor eax, 65535}}
// x86-NEXT: sete al
//
// aarch64-llvm22-NOT: shl
// aarch64-llvm22: cmge v0.16b, v0.16b, #0
// aarch64-llvm22-DAG: mov [[REG1:[a-z0-9]+]], #1
// aarch64-llvm22-DAG: umaxv b0, v0.16b
// aarch64-llvm22-NEXT: fmov [[REG2:[a-z0-9]+]], s0
// aarch64-llvm22-NEXT: bic w0, [[REG1]], [[REG2]]
//
// aarch64-NOT: shl
// aarch64: cmge v0.16b, v0.16b, #0
// aarch64-DAG: mov [[REG1:[a-z0-9]+]], #1
// aarch64-DAG: umaxv b0, v0.16b
// aarch64-NEXT: fmov [[REG2:[a-z0-9]+]], s0
// aarch64-NEXT: bic w0, [[REG1]], [[REG2]]
// aarch64-NEXT: addp [[REG1:d[0-9]+]], v0.2d
// aarch64-NEXT: fmov [[REG2:x[0-9]+]], [[REG1]]
// aarch64-NEXT: cmp [[REG2]], #0
// aarch64-NEXT: cset w0, eq
simd_reduce_all(m)
}

Expand All @@ -50,10 +61,17 @@ pub unsafe extern "C" fn mask_reduce_any(m: mask8x16) -> bool {
// x86-NEXT: test eax, eax
// x86-NEXT: setne al
//
// aarch64-llvm22-NOT: shl
// aarch64-llvm22: cmlt v0.16b, v0.16b, #0
// aarch64-llvm22-NEXT: umaxv b0, v0.16b
// aarch64-llvm22-NEXT: fmov [[REG:[a-z0-9]+]], s0
// aarch64-llvm22-NEXT: and w0, [[REG]], #0x1
//
// aarch64-NOT: shl
// aarch64: cmlt v0.16b, v0.16b, #0
// aarch64-NEXT: umaxv b0, v0.16b
// aarch64-NEXT: fmov [[REG:[a-z0-9]+]], s0
// aarch64-NEXT: and w0, [[REG]], #0x1
// aarch64-NEXT: addp [[REG1:d[0-9]+]], v0.2d
// aarch64-NEXT: fmov [[REG2:x[0-9]+]], [[REG1]]
// aarch64-NEXT: cmp [[REG2]], #0
// aarch64-NEXT: cset w0, ne
simd_reduce_any(m)
}
5 changes: 5 additions & 0 deletions tests/assembly-llvm/slice-is_ascii.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,11 @@
//@ only-x86_64
//@ ignore-sgx

// No longer optimizes as desired, tracked at:
// https://github.com/rust-lang/rust/issues/154141
// https://github.com/llvm/llvm-project/issues/209216
//@ max-llvm-major-version: 22

#![feature(str_internals)]

// CHECK-LABEL: is_ascii_simple_demo:
Expand Down
4 changes: 2 additions & 2 deletions tests/codegen-llvm/asm/global_asm.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@

use std::arch::global_asm;

// CHECK-LABEL: foo
// CHECK: module asm
// CHECK-LABEL: foo
// this regex will capture the correct unconditional branch inst.
// CHECK: module asm "{{[[:space:]]+}}jmp baz"
// CHECK: "{{[[:space:]]+}}jmp baz"
global_asm!(
r#"
.global foo
Expand Down
4 changes: 2 additions & 2 deletions tests/codegen-llvm/asm/global_asm_include.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@

use std::arch::global_asm;

// CHECK-LABEL: foo
// CHECK: module asm
// CHECK: module asm "{{[[:space:]]+}}jmp baz"
// CHECK-LABEL: foo
// CHECK: "{{[[:space:]]+}}jmp baz"
global_asm!(include_str!("foo.s"));

extern "C" {
Expand Down
6 changes: 3 additions & 3 deletions tests/codegen-llvm/asm/global_asm_x2.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,12 @@

use core::arch::global_asm;

// CHECK-LABEL: foo
// CHECK: module asm
// CHECK: module asm "{{[[:space:]]+}}jmp baz"
// CHECK-LABEL: foo
// CHECK: "{{[[:space:]]+}}jmp baz"
// any other global_asm will be appended to this first block, so:
// CHECK-LABEL: bar
// CHECK: module asm "{{[[:space:]]+}}jmp quux"
// CHECK: "{{[[:space:]]+}}jmp quux"
global_asm!(
r#"
.global foo
Expand Down
3 changes: 1 addition & 2 deletions tests/codegen-llvm/issues/issue-107681-unwrap_unchecked.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ pub unsafe fn foo(x: &mut Copied<Iter<'_, u32>>) -> u32 {
// CHECK-NOT: br {{.*}}
// CHECK-NOT: select
// CHECK: [[RET:%.*]] = load i32, ptr
// CHECK-NEXT: assume
// CHECK-NEXT: ret i32 [[RET]]
// CHECK: ret i32 [[RET]]
x.next().unwrap_unchecked()
}
6 changes: 3 additions & 3 deletions tests/run-make/pgo-branch-weights/filecheck-patterns.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,16 @@
# First, establish that certain !prof labels are attached to the expected
# functions and branching instructions.

CHECK: define void @function_called_twice(i32 {{.*}} !prof [[function_called_twice_id:![0-9]+]] {
CHECK: define void @function_called_twice(i32 {{.*}} !prof [[function_called_twice_id:![0-9]+]]
CHECK: br i1 {{.*}}, label {{.*}}, label {{.*}}, !prof [[branch_weights0:![0-9]+]]

CHECK: define void @function_called_42_times(i32{{.*}} %c) {{.*}} !prof [[function_called_42_times_id:![0-9]+]] {
CHECK: define void @function_called_42_times(i32{{.*}} %c) {{.*}} !prof [[function_called_42_times_id:![0-9]+]]
CHECK: switch i32 %c, label {{.*}} [
CHECK-NEXT: i32 97, label {{.*}}
CHECK-NEXT: i32 98, label {{.*}}
CHECK-NEXT: ], !prof [[branch_weights1:![0-9]+]]

CHECK: define void @function_called_never(i32 {{.*}} !prof [[function_called_never_id:![0-9]+]] {
CHECK: define void @function_called_never(i32 {{.*}} !prof [[function_called_never_id:![0-9]+]]



Expand Down
2 changes: 1 addition & 1 deletion tests/run-make/pgo-embed-bc-lto/interesting.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ pub fn function_called_once() {
}

// CHECK-LABEL: @function_called_once
// CHECK-SAME: !prof [[function_called_once_id:![0-9]+]] {
// CHECK-SAME: !prof [[function_called_once_id:![0-9]+]]
// CHECK: "CG Profile"
// CHECK-NOT: "CG Profile"
// CHECK-DAG: [[function_called_once_id]] = !{!"function_entry_count", i64 1}
Loading