161 lines
6.9 KiB
Diff
161 lines
6.9 KiB
Diff
|
From 5c33afb2173f68a0166bd180977cd1e547df22dc Mon Sep 17 00:00:00 2001
|
||
|
|
From: Richard Sandiford <richard.sandiford@arm.com>
|
||
|
|
Date: Tue, 12 Sep 2023 16:05:12 +0100
|
||
|
|
Subject: [PATCH 101/157] [Backport][SME] aarch64: Remove
|
||
|
|
below_hard_fp_saved_regs_size
|
||
|
|
|
||
|
|
Reference: https://gcc.gnu.org/git/?p=gcc.git;a=commit;h=2abfc867d3ba025ac2146bb21b92a93e6325dec1
|
||
|
|
|
||
|
|
After previous patches, it's no longer necessary to store
|
||
|
|
saved_regs_size and below_hard_fp_saved_regs_size in the frame info.
|
||
|
|
All measurements instead use the top or bottom of the frame as
|
||
|
|
reference points.
|
||
|
|
|
||
|
|
gcc/
|
||
|
|
* config/aarch64/aarch64.h (aarch64_frame::saved_regs_size)
|
||
|
|
(aarch64_frame::below_hard_fp_saved_regs_size): Delete.
|
||
|
|
* config/aarch64/aarch64.cc (aarch64_layout_frame): Update accordingly.
|
||
|
|
---
|
||
|
|
gcc/config/aarch64/aarch64.cc | 45 ++++++++++++++++-------------------
|
||
|
|
gcc/config/aarch64/aarch64.h | 7 ------
|
||
|
|
2 files changed, 21 insertions(+), 31 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/gcc/config/aarch64/aarch64.cc b/gcc/config/aarch64/aarch64.cc
|
||
|
|
index dd80ceba8..0894ed325 100644
|
||
|
|
--- a/gcc/config/aarch64/aarch64.cc
|
||
|
|
+++ b/gcc/config/aarch64/aarch64.cc
|
||
|
|
@@ -8869,9 +8869,8 @@ aarch64_layout_frame (void)
|
||
|
|
|
||
|
|
/* OFFSET is now the offset of the hard frame pointer from the bottom
|
||
|
|
of the callee save area. */
|
||
|
|
- frame.below_hard_fp_saved_regs_size = offset - frame.bytes_below_saved_regs;
|
||
|
|
- bool saves_below_hard_fp_p
|
||
|
|
- = maybe_ne (frame.below_hard_fp_saved_regs_size, 0);
|
||
|
|
+ auto below_hard_fp_saved_regs_size = offset - frame.bytes_below_saved_regs;
|
||
|
|
+ bool saves_below_hard_fp_p = maybe_ne (below_hard_fp_saved_regs_size, 0);
|
||
|
|
gcc_assert (!saves_below_hard_fp_p
|
||
|
|
|| (frame.sve_save_and_probe != INVALID_REGNUM
|
||
|
|
&& known_eq (frame.reg_offset[frame.sve_save_and_probe],
|
||
|
|
@@ -8941,9 +8940,8 @@ aarch64_layout_frame (void)
|
||
|
|
|
||
|
|
offset = aligned_upper_bound (offset, STACK_BOUNDARY / BITS_PER_UNIT);
|
||
|
|
|
||
|
|
- frame.saved_regs_size = offset - frame.bytes_below_saved_regs;
|
||
|
|
- gcc_assert (known_eq (frame.saved_regs_size,
|
||
|
|
- frame.below_hard_fp_saved_regs_size)
|
||
|
|
+ auto saved_regs_size = offset - frame.bytes_below_saved_regs;
|
||
|
|
+ gcc_assert (known_eq (saved_regs_size, below_hard_fp_saved_regs_size)
|
||
|
|
|| (frame.hard_fp_save_and_probe != INVALID_REGNUM
|
||
|
|
&& known_eq (frame.reg_offset[frame.hard_fp_save_and_probe],
|
||
|
|
frame.bytes_below_hard_fp)));
|
||
|
|
@@ -8952,7 +8950,7 @@ aarch64_layout_frame (void)
|
||
|
|
The saving of the bottommost register counts as an implicit probe,
|
||
|
|
which allows us to maintain the invariant described in the comment
|
||
|
|
at expand_prologue. */
|
||
|
|
- gcc_assert (crtl->is_leaf || maybe_ne (frame.saved_regs_size, 0));
|
||
|
|
+ gcc_assert (crtl->is_leaf || maybe_ne (saved_regs_size, 0));
|
||
|
|
|
||
|
|
offset += get_frame_size ();
|
||
|
|
offset = aligned_upper_bound (offset, STACK_BOUNDARY / BITS_PER_UNIT);
|
||
|
|
@@ -9009,7 +9007,7 @@ aarch64_layout_frame (void)
|
||
|
|
|
||
|
|
HOST_WIDE_INT const_size, const_below_saved_regs, const_above_fp;
|
||
|
|
HOST_WIDE_INT const_saved_regs_size;
|
||
|
|
- if (known_eq (frame.saved_regs_size, 0))
|
||
|
|
+ if (known_eq (saved_regs_size, 0))
|
||
|
|
frame.initial_adjust = frame.frame_size;
|
||
|
|
else if (frame.frame_size.is_constant (&const_size)
|
||
|
|
&& const_size < max_push_offset
|
||
|
|
@@ -9022,7 +9020,7 @@ aarch64_layout_frame (void)
|
||
|
|
frame.callee_adjust = const_size;
|
||
|
|
}
|
||
|
|
else if (frame.bytes_below_saved_regs.is_constant (&const_below_saved_regs)
|
||
|
|
- && frame.saved_regs_size.is_constant (&const_saved_regs_size)
|
||
|
|
+ && saved_regs_size.is_constant (&const_saved_regs_size)
|
||
|
|
&& const_below_saved_regs + const_saved_regs_size < 512
|
||
|
|
/* We could handle this case even with data below the saved
|
||
|
|
registers, provided that that data left us with valid offsets
|
||
|
|
@@ -9041,8 +9039,7 @@ aarch64_layout_frame (void)
|
||
|
|
frame.initial_adjust = frame.frame_size;
|
||
|
|
}
|
||
|
|
else if (saves_below_hard_fp_p
|
||
|
|
- && known_eq (frame.saved_regs_size,
|
||
|
|
- frame.below_hard_fp_saved_regs_size))
|
||
|
|
+ && known_eq (saved_regs_size, below_hard_fp_saved_regs_size))
|
||
|
|
{
|
||
|
|
/* Frame in which all saves are SVE saves:
|
||
|
|
|
||
|
|
@@ -9064,7 +9061,7 @@ aarch64_layout_frame (void)
|
||
|
|
[save SVE registers relative to SP]
|
||
|
|
sub sp, sp, bytes_below_saved_regs */
|
||
|
|
frame.callee_adjust = const_above_fp;
|
||
|
|
- frame.sve_callee_adjust = frame.below_hard_fp_saved_regs_size;
|
||
|
|
+ frame.sve_callee_adjust = below_hard_fp_saved_regs_size;
|
||
|
|
frame.final_adjust = frame.bytes_below_saved_regs;
|
||
|
|
}
|
||
|
|
else
|
||
|
|
@@ -9079,7 +9076,7 @@ aarch64_layout_frame (void)
|
||
|
|
[save SVE registers relative to SP]
|
||
|
|
sub sp, sp, bytes_below_saved_regs */
|
||
|
|
frame.initial_adjust = frame.bytes_above_hard_fp;
|
||
|
|
- frame.sve_callee_adjust = frame.below_hard_fp_saved_regs_size;
|
||
|
|
+ frame.sve_callee_adjust = below_hard_fp_saved_regs_size;
|
||
|
|
frame.final_adjust = frame.bytes_below_saved_regs;
|
||
|
|
}
|
||
|
|
|
||
|
|
@@ -10231,17 +10228,17 @@ aarch64_epilogue_uses (int regno)
|
||
|
|
| local variables | <-- frame_pointer_rtx
|
||
|
|
| |
|
||
|
|
+-------------------------------+
|
||
|
|
- | padding | \
|
||
|
|
- +-------------------------------+ |
|
||
|
|
- | callee-saved registers | | frame.saved_regs_size
|
||
|
|
- +-------------------------------+ |
|
||
|
|
- | LR' | |
|
||
|
|
- +-------------------------------+ |
|
||
|
|
- | FP' | |
|
||
|
|
- +-------------------------------+ |<- hard_frame_pointer_rtx (aligned)
|
||
|
|
- | SVE vector registers | | \
|
||
|
|
- +-------------------------------+ | | below_hard_fp_saved_regs_size
|
||
|
|
- | SVE predicate registers | / /
|
||
|
|
+ | padding |
|
||
|
|
+ +-------------------------------+
|
||
|
|
+ | callee-saved registers |
|
||
|
|
+ +-------------------------------+
|
||
|
|
+ | LR' |
|
||
|
|
+ +-------------------------------+
|
||
|
|
+ | FP' |
|
||
|
|
+ +-------------------------------+ <-- hard_frame_pointer_rtx (aligned)
|
||
|
|
+ | SVE vector registers |
|
||
|
|
+ +-------------------------------+
|
||
|
|
+ | SVE predicate registers |
|
||
|
|
+-------------------------------+
|
||
|
|
| dynamic allocation |
|
||
|
|
+-------------------------------+
|
||
|
|
diff --git a/gcc/config/aarch64/aarch64.h b/gcc/config/aarch64/aarch64.h
|
||
|
|
index af480d9e8..292ef2eec 100644
|
||
|
|
--- a/gcc/config/aarch64/aarch64.h
|
||
|
|
+++ b/gcc/config/aarch64/aarch64.h
|
||
|
|
@@ -801,18 +801,11 @@ struct GTY (()) aarch64_frame
|
||
|
|
STACK_BOUNDARY. */
|
||
|
|
HOST_WIDE_INT saved_varargs_size;
|
||
|
|
|
||
|
|
- /* The size of the callee-save registers with a slot in REG_OFFSET. */
|
||
|
|
- poly_int64 saved_regs_size;
|
||
|
|
-
|
||
|
|
/* The number of bytes between the bottom of the static frame (the bottom
|
||
|
|
of the outgoing arguments) and the bottom of the register save area.
|
||
|
|
This value is always a multiple of STACK_BOUNDARY. */
|
||
|
|
poly_int64 bytes_below_saved_regs;
|
||
|
|
|
||
|
|
- /* The size of the callee-save registers with a slot in REG_OFFSET that
|
||
|
|
- are saved below the hard frame pointer. */
|
||
|
|
- poly_int64 below_hard_fp_saved_regs_size;
|
||
|
|
-
|
||
|
|
/* The number of bytes between the bottom of the static frame (the bottom
|
||
|
|
of the outgoing arguments) and the hard frame pointer. This value is
|
||
|
|
always a multiple of STACK_BOUNDARY. */
|
||
|
|
--
|
||
|
|
2.33.0
|
||
|
|
|