From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1130) id 315BA3858414; Wed, 21 Feb 2024 11:13:24 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 315BA3858414 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1708514004; bh=rAr/81hBt/03ph6b6ej1DdXrNXAJ8FHIVbuCAMaqdu8=; h=From:To:Subject:Date:From; b=mJkMZDrdaV3487iXzHl7cYUOpHmxTJx2jyqXIGkOpJik5mK6Hi3dD2RKdH+W4/Tcb gJskYpdBfLKewyE3qpy1US8bQWGCl6xrr0GT7iq1/Yugz9A0HcI62QeCOPPpIr+wzI OVBr/wAyrUr7Ag+bB/V3PntDByb1HGw0do/uBmXo= MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="utf-8" From: Richard Sandiford To: gcc-cvs@gcc.gnu.org Subject: [gcc r14-9103] aarch64: More SME vs -mtrack-speculation X-Act-Checkin: gcc X-Git-Author: Richard Sandiford X-Git-Refname: refs/heads/trunk X-Git-Oldrev: 3651b1b23fdd30fd00f0cd08ec4806dd16d1f3d3 X-Git-Newrev: 38004cf8699a82790d83846e3bd37e151e709ede Message-Id: <20240221111324.315BA3858414@sourceware.org> Date: Wed, 21 Feb 2024 11:13:24 +0000 (GMT) List-Id: https://gcc.gnu.org/g:38004cf8699a82790d83846e3bd37e151e709ede commit r14-9103-g38004cf8699a82790d83846e3bd37e151e709ede Author: Richard Sandiford Date: Wed Feb 21 11:12:29 2024 +0000 aarch64: More SME vs -mtrack-speculation The sequence to commit a lazy save includes a branch based on whether TPIDR2_EL0 is zero. The code assumed that CBZ could be used for this, but that instruction is forbidden when -mtrack-speculation is being used. gcc/ * config/aarch64/aarch64.cc (aarch64_mode_emit_local_sme_state): Use aarch64_gen_compare_zero_and_branch rather than emitting a CBZ directly. gcc/testsuite/ * gcc.target/aarch64/sme/locally_streaming_1_ts.c: New test. * gcc.target/aarch64/sme/sibcall_7_ts.c: Likewise. Diff: --- gcc/config/aarch64/aarch64.cc | 3 ++- gcc/testsuite/gcc.target/aarch64/sme/locally_streaming_1_ts.c | 3 +++ gcc/testsuite/gcc.target/aarch64/sme/sibcall_7_ts.c | 3 +++ 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/gcc/config/aarch64/aarch64.cc b/gcc/config/aarch64/aarch64.cc index 8a3aa98a32e9..28d1555dada9 100644 --- a/gcc/config/aarch64/aarch64.cc +++ b/gcc/config/aarch64/aarch64.cc @@ -29344,7 +29344,8 @@ aarch64_mode_emit_local_sme_state (aarch64_local_sme_state mode, auto tmp_reg = gen_reg_rtx (DImode); emit_insn (gen_aarch64_read_tpidr2 (tmp_reg)); auto label = gen_label_rtx (); - auto jump = emit_jump_insn (gen_aarch64_cbeqdi1 (tmp_reg, label)); + rtx branch = aarch64_gen_compare_zero_and_branch (EQ, tmp_reg, label); + auto jump = emit_jump_insn (branch); JUMP_LABEL (jump) = label; emit_insn (gen_aarch64_tpidr2_save ()); emit_insn (gen_aarch64_clear_tpidr2 ()); diff --git a/gcc/testsuite/gcc.target/aarch64/sme/locally_streaming_1_ts.c b/gcc/testsuite/gcc.target/aarch64/sme/locally_streaming_1_ts.c new file mode 100644 index 000000000000..25ac345a6dda --- /dev/null +++ b/gcc/testsuite/gcc.target/aarch64/sme/locally_streaming_1_ts.c @@ -0,0 +1,3 @@ +// { dg-options "-O -fomit-frame-pointer -mtrack-speculation" } + +#include "locally_streaming_1.c" diff --git a/gcc/testsuite/gcc.target/aarch64/sme/sibcall_7_ts.c b/gcc/testsuite/gcc.target/aarch64/sme/sibcall_7_ts.c new file mode 100644 index 000000000000..4b47678bf009 --- /dev/null +++ b/gcc/testsuite/gcc.target/aarch64/sme/sibcall_7_ts.c @@ -0,0 +1,3 @@ +// { dg-options "-O2 -mtrack-speculation" } + +#include "sibcall_7.c"