From ae6ea0e7090c88bd511190b8562f0696e0495aee Mon Sep 17 00:00:00 2001 From: Nikita Popov Date: Mon, 20 Jan 2025 11:07:09 +0100 Subject: [PATCH 1/2] Update to LLVM 20 --- src/llvm-project | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/llvm-project b/src/llvm-project index 7e8c93c87c611..4f8b101ee2ea3 160000 --- a/src/llvm-project +++ b/src/llvm-project @@ -1 +1 @@ -Subproject commit 7e8c93c87c611f21d9bd95100563392f4c18bfe7 +Subproject commit 4f8b101ee2ea374ca27786b9e11b9c42dbbdb5fe From 881aa2dad6db43e471ed42280b07cc83eee9c8b5 Mon Sep 17 00:00:00 2001 From: Nikita Popov Date: Mon, 27 Jan 2025 15:25:32 +0000 Subject: [PATCH 2/2] Adjust NVPTX ABI test for LLVM 20 LLVM 20 prints additional .ptr .align 4 annotations. --- tests/assembly/nvptx-kernel-abi/nvptx-kernel-args-abi-v7.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/assembly/nvptx-kernel-abi/nvptx-kernel-args-abi-v7.rs b/tests/assembly/nvptx-kernel-abi/nvptx-kernel-args-abi-v7.rs index fb3a325a41f81..4b743cb39fa24 100644 --- a/tests/assembly/nvptx-kernel-abi/nvptx-kernel-args-abi-v7.rs +++ b/tests/assembly/nvptx-kernel-abi/nvptx-kernel-args-abi-v7.rs @@ -242,7 +242,7 @@ pub unsafe extern "ptx-kernel" fn f_float_array_arg(_a: [f32; 5]) {} //pub unsafe extern "ptx-kernel" fn f_u128_array_arg(_a: [u128; 5]) {} // CHECK: .visible .entry f_u32_slice_arg( -// CHECK: .param .u64 f_u32_slice_arg_param_0 +// CHECK: .param .u64 {{(\.ptr \.align 4 )?}}f_u32_slice_arg_param_0 // CHECK: .param .u64 f_u32_slice_arg_param_1 #[no_mangle] pub unsafe extern "ptx-kernel" fn f_u32_slice_arg(_a: &[u32]) {}