From dcbdc8c19b4b1e581b8b83a513b11c4c4248d0fc Mon Sep 17 00:00:00 2001 From: Erik Desjardins Date: Thu, 17 Feb 2022 00:58:13 -0500 Subject: At opt-level=0, apply only ABI-affecting attributes to functions This should provide a small perf improvement for debug builds, and should more than cancel out the regression from adding noundef, which was only significant in debug builds. --- src/test/codegen/function-arguments-noopt.rs | 63 ++++++++++++++++++++++++++++ 1 file changed, 63 insertions(+) create mode 100644 src/test/codegen/function-arguments-noopt.rs (limited to 'src/test/codegen/function-arguments-noopt.rs') diff --git a/src/test/codegen/function-arguments-noopt.rs b/src/test/codegen/function-arguments-noopt.rs new file mode 100644 index 00000000000..c8c88888978 --- /dev/null +++ b/src/test/codegen/function-arguments-noopt.rs @@ -0,0 +1,63 @@ +// compile-flags: -C opt-level=0 -C no-prepopulate-passes + +// This test checks that arguments/returns in opt-level=0 builds, +// while lacking attributes used for optimization, still have ABI-affecting attributes. + +#![crate_type = "lib"] +#![feature(rustc_attrs)] + +pub struct S { + _field: [i32; 8], +} + +// CHECK: define zeroext i1 @boolean(i1 zeroext %x) +#[no_mangle] +pub fn boolean(x: bool) -> bool { + x +} + +// CHECK-LABEL: @boolean_call +#[no_mangle] +pub fn boolean_call(x: bool, f: fn(bool) -> bool) -> bool { +// CHECK: call zeroext i1 %f(i1 zeroext %x) + f(x) +} + +// CHECK: define i32* @borrow(i32* %x) +#[no_mangle] +pub fn borrow(x: &i32) -> &i32 { + x +} + +// CHECK-LABEL: @borrow_call +#[no_mangle] +pub fn borrow_call(x: &i32, f: fn(&i32) -> &i32) -> &i32 { + // CHECK: call i32* %f(i32* %x) + f(x) +} + +// CHECK: define void @struct_(%S* sret(%S){{( %0)?}}, %S* %x) +#[no_mangle] +pub fn struct_(x: S) -> S { + x +} + +// CHECK-LABEL: @struct_call +#[no_mangle] +pub fn struct_call(x: S, f: fn(S) -> S) -> S { + // CHECK: call void %f(%S* sret(%S){{( %0)?}}, %S* %{{.+}}) + f(x) +} + +// CHECK: define { i8, i8 } @enum_(i1 zeroext %x.0, i8 %x.1) +#[no_mangle] +pub fn enum_(x: Option) -> Option { + x +} + +// CHECK-LABEL: @enum_call +#[no_mangle] +pub fn enum_call(x: Option, f: fn(Option) -> Option) -> Option { + // CHECK: call { i8, i8 } %f(i1 zeroext %x.0, i8 %x.1) + f(x) +} -- cgit 1.4.1-3-g733a5 From 6e740ae9348508544f41076ea9c7f8b4c3848688 Mon Sep 17 00:00:00 2001 From: Erik Desjardins Date: Sat, 19 Feb 2022 09:59:36 -0500 Subject: always add align attributes --- compiler/rustc_codegen_llvm/src/abi.rs | 20 ++++++++++---------- src/test/codegen/function-arguments-noopt.rs | 4 ++-- 2 files changed, 12 insertions(+), 12 deletions(-) (limited to 'src/test/codegen/function-arguments-noopt.rs') diff --git a/compiler/rustc_codegen_llvm/src/abi.rs b/compiler/rustc_codegen_llvm/src/abi.rs index a20801914ad..5b8cc238480 100644 --- a/compiler/rustc_codegen_llvm/src/abi.rs +++ b/compiler/rustc_codegen_llvm/src/abi.rs @@ -59,6 +59,9 @@ impl ArgAttributesExt for ArgAttributes { llattr.apply_llfn(idx, llfn); } } + if let Some(align) = self.pointee_align { + llvm::LLVMRustAddAlignmentAttr(llfn, idx.as_uint(), align.bytes() as u32); + } match self.arg_ext { ArgExtension::None => {} ArgExtension::Zext => llvm::Attribute::ZExt.apply_llfn(idx, llfn), @@ -77,9 +80,6 @@ impl ArgAttributesExt for ArgAttributes { } regular -= ArgAttribute::NonNull; } - if let Some(align) = self.pointee_align { - llvm::LLVMRustAddAlignmentAttr(llfn, idx.as_uint(), align.bytes() as u32); - } for (attr, llattr) in OPTIMIZATION_ATTRIBUTES { if regular.contains(attr) { llattr.apply_llfn(idx, llfn); @@ -105,6 +105,13 @@ impl ArgAttributesExt for ArgAttributes { llattr.apply_callsite(idx, callsite); } } + if let Some(align) = self.pointee_align { + llvm::LLVMRustAddAlignmentCallSiteAttr( + callsite, + idx.as_uint(), + align.bytes() as u32, + ); + } match self.arg_ext { ArgExtension::None => {} ArgExtension::Zext => llvm::Attribute::ZExt.apply_callsite(idx, callsite), @@ -127,13 +134,6 @@ impl ArgAttributesExt for ArgAttributes { } regular -= ArgAttribute::NonNull; } - if let Some(align) = self.pointee_align { - llvm::LLVMRustAddAlignmentCallSiteAttr( - callsite, - idx.as_uint(), - align.bytes() as u32, - ); - } for (attr, llattr) in OPTIMIZATION_ATTRIBUTES { if regular.contains(attr) { llattr.apply_callsite(idx, callsite); diff --git a/src/test/codegen/function-arguments-noopt.rs b/src/test/codegen/function-arguments-noopt.rs index c8c88888978..1d740a4b329 100644 --- a/src/test/codegen/function-arguments-noopt.rs +++ b/src/test/codegen/function-arguments-noopt.rs @@ -23,7 +23,7 @@ pub fn boolean_call(x: bool, f: fn(bool) -> bool) -> bool { f(x) } -// CHECK: define i32* @borrow(i32* %x) +// CHECK: define align 4 i32* @borrow(i32* align 4 %x) #[no_mangle] pub fn borrow(x: &i32) -> &i32 { x @@ -32,7 +32,7 @@ pub fn borrow(x: &i32) -> &i32 { // CHECK-LABEL: @borrow_call #[no_mangle] pub fn borrow_call(x: &i32, f: fn(&i32) -> &i32) -> &i32 { - // CHECK: call i32* %f(i32* %x) + // CHECK: call align 4 i32* %f(i32* align 4 %x) f(x) } -- cgit 1.4.1-3-g733a5 From 945276c92076ea82747b4c8d0b19206c2940e7d8 Mon Sep 17 00:00:00 2001 From: Erik Desjardins Date: Fri, 25 Feb 2022 19:24:59 -0500 Subject: avoid test failure on targets where all functions are dso_local (e.g. wasm) --- src/test/codegen/function-arguments-noopt.rs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/test/codegen/function-arguments-noopt.rs') diff --git a/src/test/codegen/function-arguments-noopt.rs b/src/test/codegen/function-arguments-noopt.rs index 1d740a4b329..94561288dc5 100644 --- a/src/test/codegen/function-arguments-noopt.rs +++ b/src/test/codegen/function-arguments-noopt.rs @@ -10,7 +10,7 @@ pub struct S { _field: [i32; 8], } -// CHECK: define zeroext i1 @boolean(i1 zeroext %x) +// CHECK: zeroext i1 @boolean(i1 zeroext %x) #[no_mangle] pub fn boolean(x: bool) -> bool { x @@ -23,7 +23,7 @@ pub fn boolean_call(x: bool, f: fn(bool) -> bool) -> bool { f(x) } -// CHECK: define align 4 i32* @borrow(i32* align 4 %x) +// CHECK: align 4 i32* @borrow(i32* align 4 %x) #[no_mangle] pub fn borrow(x: &i32) -> &i32 { x @@ -36,7 +36,7 @@ pub fn borrow_call(x: &i32, f: fn(&i32) -> &i32) -> &i32 { f(x) } -// CHECK: define void @struct_(%S* sret(%S){{( %0)?}}, %S* %x) +// CHECK: void @struct_(%S* sret(%S){{( %0)?}}, %S* %x) #[no_mangle] pub fn struct_(x: S) -> S { x @@ -49,7 +49,7 @@ pub fn struct_call(x: S, f: fn(S) -> S) -> S { f(x) } -// CHECK: define { i8, i8 } @enum_(i1 zeroext %x.0, i8 %x.1) +// CHECK: { i8, i8 } @enum_(i1 zeroext %x.0, i8 %x.1) #[no_mangle] pub fn enum_(x: Option) -> Option { x -- cgit 1.4.1-3-g733a5