From patchwork Wed Feb 21 11:16:21 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Sandiford X-Patchwork-Id: 86153 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 111803858C24 for ; Wed, 21 Feb 2024 11:16:55 +0000 (GMT) X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by sourceware.org (Postfix) with ESMTP id 6F4323858419 for ; Wed, 21 Feb 2024 11:16:23 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 6F4323858419 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=arm.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=arm.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 6F4323858419 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=217.140.110.172 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1708514185; cv=none; b=QsfkvnWe0/uXdVHyCQW70fQ8Bi4/egtjhmQn+qXOT6NdV5kWvJHQNqsCbHeYHLJ+Lr+dyhlYdwVGrk3x1ALiOBRv6QcafNuwoSZ2PlqNIcTOYvBofUy/7sMUVJbns9HPUtXu/rm6yYNa0TqWtQWdzwwORTm1zD/wIuXccHTl0LE= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1708514185; c=relaxed/simple; bh=qFq/I0qKkajKglpoxfUUNLhiUcj383BuRVvlrwr8nsM=; h=From:To:Subject:Date:Message-ID:MIME-Version; b=HLK9Rj+tuOTQfZY/xK3asPSI0UMHWMXLHW8SRXoyw36b6fiOQR7BP6tINnm0bKXCRyPRVdaTt1tIfq9WnJscXAvOa9AJ+0j5jHpmPMf0ftSd0ZFKB9rZrWsnlAb2Q/KIutEo1Th9wlGoUyEFPUTUZv4HMkEOsDn5XwK2mak8ZJY= ARC-Authentication-Results: i=1; server2.sourceware.org Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 7FBF1FEC for ; Wed, 21 Feb 2024 03:17:01 -0800 (PST) Received: from localhost (e121540-lin.manchester.arm.com [10.32.110.72]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 9B3D93F73F for ; Wed, 21 Feb 2024 03:16:22 -0800 (PST) From: Richard Sandiford To: gcc-patches@gcc.gnu.org Mail-Followup-To: gcc-patches@gcc.gnu.org, richard.sandiford@arm.com Subject: [pushed] aarch64: More SME vs -mtrack-speculation Date: Wed, 21 Feb 2024 11:16:21 +0000 Message-ID: User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.3 (gnu/linux) MIME-Version: 1.0 X-Spam-Status: No, score=-20.9 required=5.0 tests=BAYES_00, GIT_PATCH_0, KAM_DMARC_NONE, KAM_DMARC_STATUS, KAM_LAZY_DOMAIN_SECURITY, KAM_SHORT, SPF_HELO_NONE, SPF_NONE, TXREP, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: gcc-patches@gcc.gnu.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: gcc-patches-bounces+patchwork=sourceware.org@gcc.gnu.org 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. Tested on aarch64-linux-gnu & pushed. Richard 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. --- 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(-) create mode 100644 gcc/testsuite/gcc.target/aarch64/sme/locally_streaming_1_ts.c create mode 100644 gcc/testsuite/gcc.target/aarch64/sme/sibcall_7_ts.c diff --git a/gcc/config/aarch64/aarch64.cc b/gcc/config/aarch64/aarch64.cc index 8a3aa98a32e..28d1555dada 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 00000000000..25ac345a6dd --- /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 00000000000..4b47678bf00 --- /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"