From 69ae4233cfdffd4269e07203406ff0ccb2671896 Mon Sep 17 00:00:00 2001 From: Erik Desjardins Date: Tue, 15 Feb 2022 23:45:09 -0500 Subject: Add !align metadata on loads of &/&mut/Box Note that this refers to the alignment of what the loaded value points to, _not_ the alignment of the loaded value itself. --- src/test/codegen/loads.rs | 44 ++++++++++++++++++++++++++++++++++++-------- 1 file changed, 36 insertions(+), 8 deletions(-) (limited to 'src/test/codegen') diff --git a/src/test/codegen/loads.rs b/src/test/codegen/loads.rs index 977175a4a62..268c55561f2 100644 --- a/src/test/codegen/loads.rs +++ b/src/test/codegen/loads.rs @@ -18,21 +18,47 @@ pub enum MyBool { False, } +#[repr(align(16))] +pub struct Align16(u128); + +// CHECK: @ptr_alignment_helper({}** {{.*}} align [[PTR_ALIGNMENT:[0-9]+]] +#[no_mangle] +pub fn ptr_alignment_helper(x: &&()) {} + // CHECK-LABEL: @load_ref #[no_mangle] pub fn load_ref<'a>(x: &&'a i32) -> &'a i32 { -// Alignment of a reference itself is target dependent, so just match any alignment: -// the main thing we care about here is !nonnull and !noundef. -// CHECK: load i32*, i32** %x, align {{[0-9]+}}, !nonnull !{{[0-9]+}}, !noundef !{{[0-9]+}} +// CHECK: load i32*, i32** %x, align [[PTR_ALIGNMENT]], !nonnull !{{[0-9]+}}, !align ![[ALIGN_4_META:[0-9]+]], !noundef !{{[0-9]+}} + *x +} + +// CHECK-LABEL: @load_ref_higher_alignment +#[no_mangle] +pub fn load_ref_higher_alignment<'a>(x: &&'a Align16) -> &'a Align16 { +// CHECK: load %Align16*, %Align16** %x, align [[PTR_ALIGNMENT]], !nonnull !{{[0-9]+}}, !align ![[ALIGN_16_META:[0-9]+]], !noundef !{{[0-9]+}} + *x +} + +// CHECK-LABEL: @load_scalar_pair +#[no_mangle] +pub fn load_scalar_pair<'a>(x: &(&'a i32, &'a Align16)) -> (&'a i32, &'a Align16) { +// CHECK: load i32*, i32** %{{.+}}, align [[PTR_ALIGNMENT]], !nonnull !{{[0-9]+}}, !align ![[ALIGN_4_META]], !noundef !{{[0-9]+}} +// CHECK: load i64*, i64** %{{.+}}, align [[PTR_ALIGNMENT]], !nonnull !{{[0-9]+}}, !align ![[ALIGN_16_META]], !noundef !{{[0-9]+}} + *x +} + +// CHECK-LABEL: @load_raw_pointer +#[no_mangle] +pub fn load_raw_pointer<'a>(x: &*const i32) -> *const i32 { +// loaded raw pointer should not have !nonnull, !align, or !noundef metadata +// CHECK: load i32*, i32** %x, align [[PTR_ALIGNMENT]]{{$}} *x } // CHECK-LABEL: @load_box #[no_mangle] pub fn load_box<'a>(x: Box>) -> Box { -// Alignment of a box itself is target dependent, so just match any alignment: -// the main thing we care about here is !nonnull and !noundef. -// CHECK: load i32*, i32** %x, align {{[0-9]+}}, !nonnull !{{[0-9]+}}, !noundef !{{[0-9]+}} +// CHECK: load i32*, i32** %x, align [[PTR_ALIGNMENT]], !nonnull !{{[0-9]+}}, !align ![[ALIGN_4_META]], !noundef !{{[0-9]+}} *x } @@ -120,5 +146,7 @@ pub fn small_struct_alignment(x: Bytes) -> Bytes { x } -// CHECK: ![[BOOL_RANGE]] = !{i8 0, i8 2} -// CHECK: ![[NONZEROU16_RANGE]] = !{i16 1, i16 0} +// CHECK-DAG: ![[BOOL_RANGE]] = !{i8 0, i8 2} +// CHECK-DAG: ![[NONZEROU16_RANGE]] = !{i16 1, i16 0} +// CHECK-DAG: ![[ALIGN_4_META]] = !{i64 4} +// CHECK-DAG: ![[ALIGN_16_META]] = !{i64 16} -- cgit 1.4.1-3-g733a5 From f147303434f6b26d64458a999fb6760fdd422977 Mon Sep 17 00:00:00 2001 From: Erik Desjardins Date: Wed, 2 Mar 2022 17:30:58 -0500 Subject: fix tests on platforms where Align16 is represented as i128 --- src/test/codegen/loads.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/test/codegen') diff --git a/src/test/codegen/loads.rs b/src/test/codegen/loads.rs index 268c55561f2..7952bf67a46 100644 --- a/src/test/codegen/loads.rs +++ b/src/test/codegen/loads.rs @@ -35,7 +35,7 @@ pub fn load_ref<'a>(x: &&'a i32) -> &'a i32 { // CHECK-LABEL: @load_ref_higher_alignment #[no_mangle] pub fn load_ref_higher_alignment<'a>(x: &&'a Align16) -> &'a Align16 { -// CHECK: load %Align16*, %Align16** %x, align [[PTR_ALIGNMENT]], !nonnull !{{[0-9]+}}, !align ![[ALIGN_16_META:[0-9]+]], !noundef !{{[0-9]+}} +// CHECK: load {{%Align16|i128}}*, {{%Align16|i128}}** %x, align [[PTR_ALIGNMENT]], !nonnull !{{[0-9]+}}, !align ![[ALIGN_16_META:[0-9]+]], !noundef !{{[0-9]+}} *x } -- cgit 1.4.1-3-g733a5 From a381aefebb69c7fa518a20f3db6639f29096cc96 Mon Sep 17 00:00:00 2001 From: Erik Desjardins Date: Wed, 2 Mar 2022 22:46:23 -0500 Subject: make test work on noopt builder --- src/test/codegen/loads.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/test/codegen') diff --git a/src/test/codegen/loads.rs b/src/test/codegen/loads.rs index 7952bf67a46..c7444ce02fa 100644 --- a/src/test/codegen/loads.rs +++ b/src/test/codegen/loads.rs @@ -21,7 +21,7 @@ pub enum MyBool { #[repr(align(16))] pub struct Align16(u128); -// CHECK: @ptr_alignment_helper({}** {{.*}} align [[PTR_ALIGNMENT:[0-9]+]] +// CHECK: @ptr_alignment_helper({}** {{.*}}align [[PTR_ALIGNMENT:[0-9]+]] #[no_mangle] pub fn ptr_alignment_helper(x: &&()) {} -- cgit 1.4.1-3-g733a5