diff options
author | Richard Sandiford <richard.sandiford@arm.com> | 2024-02-21 11:12:28 +0000 |
---|---|---|
committer | Richard Sandiford <richard.sandiford@arm.com> | 2024-02-21 11:12:28 +0000 |
commit | 22f0cf36ec0ad4ec76b50cd87eaab925bda74df8 (patch) | |
tree | 3eac4385902196b3666916457385c72a9e7c9e55 | |
parent | 58930e9fd1816c2a71c4f4e54a82e870d3afe10a (diff) | |
download | gcc-22f0cf36ec0ad4ec76b50cd87eaab925bda74df8.zip gcc-22f0cf36ec0ad4ec76b50cd87eaab925bda74df8.tar.gz gcc-22f0cf36ec0ad4ec76b50cd87eaab925bda74df8.tar.bz2 |
aarch64: Ensure ZT0 is zeroed in a new-ZT0 function
ACLE guarantees that a function like:
__arm_new("zt0") foo() { ... }
will start with ZT0 equal to zero. I'd forgotten to enforce that
after commiting a lazy save. After such a save, we should zero
ZA iff the function has ZA state and zero ZT0 iff the function
has ZT0 state.
gcc/
* config/aarch64/aarch64.cc (aarch64_mode_emit_local_sme_state):
In the code that commits a lazy save, only zero ZA if the function
has ZA state. Similarly zero ZT0 if the function has ZT0 state.
gcc/testsuite/
* gcc.target/aarch64/sme/zt0_state_5.c (test3): Expect ZT0 rather
than ZA to be zeroed.
(test5): Remove zeroing of ZA.
-rw-r--r-- | gcc/config/aarch64/aarch64.cc | 8 | ||||
-rw-r--r-- | gcc/testsuite/gcc.target/aarch64/sme/zt0_state_5.c | 3 |
2 files changed, 8 insertions, 3 deletions
diff --git a/gcc/config/aarch64/aarch64.cc b/gcc/config/aarch64/aarch64.cc index ed7fbca..de746e2 100644 --- a/gcc/config/aarch64/aarch64.cc +++ b/gcc/config/aarch64/aarch64.cc @@ -29338,6 +29338,7 @@ aarch64_mode_emit_local_sme_state (aarch64_local_sme_state mode, bl __arm_tpidr2_save msr tpidr2_el0, xzr zero { za } // Only if ZA is live + zero { zt0 } // Only if ZT0 is live no_save: */ auto tmp_reg = gen_reg_rtx (DImode); emit_insn (gen_aarch64_read_tpidr2 (tmp_reg)); @@ -29348,7 +29349,12 @@ aarch64_mode_emit_local_sme_state (aarch64_local_sme_state mode, emit_insn (gen_aarch64_clear_tpidr2 ()); if (mode == aarch64_local_sme_state::ACTIVE_LIVE || mode == aarch64_local_sme_state::ACTIVE_DEAD) - emit_insn (gen_aarch64_initial_zero_za ()); + { + if (aarch64_cfun_has_state ("za")) + emit_insn (gen_aarch64_initial_zero_za ()); + if (aarch64_cfun_has_state ("zt0")) + emit_insn (gen_aarch64_sme_zero_zt0 ()); + } emit_label (label); } diff --git a/gcc/testsuite/gcc.target/aarch64/sme/zt0_state_5.c b/gcc/testsuite/gcc.target/aarch64/sme/zt0_state_5.c index 0fba218..2e00846 100644 --- a/gcc/testsuite/gcc.target/aarch64/sme/zt0_state_5.c +++ b/gcc/testsuite/gcc.target/aarch64/sme/zt0_state_5.c @@ -54,7 +54,7 @@ __arm_new("zt0") int test3() ** cbz x0, [^\n]+ ** bl __arm_tpidr2_save ** msr tpidr2_el0, xzr -** zero { za } +** zero { zt0 } ** smstart za ** bl in_zt0 ** smstop za @@ -102,7 +102,6 @@ __arm_new("zt0") void test5() ** cbz x0, [^\n]+ ** bl __arm_tpidr2_save ** msr tpidr2_el0, xzr -** zero { za } ** smstart za ** bl out_zt0 ** ... |