From patchwork Mon Sep 5 13:15:56 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Sandiford X-Patchwork-Id: 1674289 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=gcc.gnu.org (client-ip=2620:52:3:1:0:246e:9693:128c; helo=sourceware.org; envelope-from=gcc-patches-bounces+incoming=patchwork.ozlabs.org@gcc.gnu.org; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=gcc.gnu.org header.i=@gcc.gnu.org header.a=rsa-sha256 header.s=default header.b=RwvHjfow; dkim-atps=neutral Received: from sourceware.org (server2.sourceware.org [IPv6:2620:52:3:1:0:246e:9693:128c]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4MLptr6zvGz1yhd for ; Mon, 5 Sep 2022 23:16:20 +1000 (AEST) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id F3A12385AC3F for ; Mon, 5 Sep 2022 13:16:18 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org F3A12385AC3F DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1662383779; bh=d1ezanzcAtjNDFQXNbuAhBjI0ZyQEADHpnW5wb7vLjs=; h=To:Subject:Date:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:From; b=RwvHjfow9/2TZZ3osWFKF7lN9aNhiZAI7jAiifrBJlXVhqiWVDHd3g7WbTO1b+tWd svbdtwfFDth93ThdYX9N9tfYGf6fpLzV6b9bUFrSChG8q/VbUG7rdG24zAoXDGEaXL MZGQH4RwX7ndfyWktU+j7j7v93DY6x8xyX40+qlc= 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 37D593858CDA for ; Mon, 5 Sep 2022 13:15:59 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 37D593858CDA 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 C3630ED1 for ; Mon, 5 Sep 2022 06:16:04 -0700 (PDT) Received: from localhost (e121540-lin.manchester.arm.com [10.32.98.62]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 2E9133F7B4 for ; Mon, 5 Sep 2022 06:15:58 -0700 (PDT) To: gcc-patches@gcc.gnu.org Mail-Followup-To: gcc-patches@gcc.gnu.org, richard.sandiford@arm.com Subject: [pushed] aarch64: Remove lazy SIMD builtin initialisation Date: Mon, 05 Sep 2022 14:15:56 +0100 Message-ID: User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.3 (gnu/linux) MIME-Version: 1.0 X-Spam-Status: No, score=-49.3 required=5.0 tests=BAYES_00, GIT_PATCH_0, KAM_DMARC_NONE, KAM_DMARC_STATUS, KAM_LAZY_DOMAIN_SECURITY, 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.29 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Richard Sandiford via Gcc-patches From: Richard Sandiford Reply-To: Richard Sandiford Errors-To: gcc-patches-bounces+incoming=patchwork.ozlabs.org@gcc.gnu.org Sender: "Gcc-patches" At one time the aarch64 port registered the Advanced SIMD builtins lazily, when we first encountered a set of target flags that includes +simd. These days we always initialise them at start-up, temporarily forcing a conducive set of flags if necessary. This patch removes some vestiges of the old way of doing things. Tested on aarch64-linux-gnu & pushed. Richard gcc/ * config/aarch64/aarch64-protos.h (aarch64_init_simd_builtins): Remove prototype. * config/aarch64/aarch64-builtins.cc (aarch64_simd_builtins_initialized_p): Delete. (aarch64_init_simd_builtins): Make static. Remove protection against multiple calls. * config/aarch64/aarch64-c.cc (aarch64_pragma_target_parse): Remove lazy SIMD builtin initialization. * config/aarch64/aarch64.cc (aarch64_option_valid_attribute_p): Likewise. --- gcc/config/aarch64/aarch64-builtins.cc | 9 +-------- gcc/config/aarch64/aarch64-c.cc | 13 ------------- gcc/config/aarch64/aarch64-protos.h | 1 - gcc/config/aarch64/aarch64.cc | 12 ------------ 4 files changed, 1 insertion(+), 34 deletions(-) diff --git a/gcc/config/aarch64/aarch64-builtins.cc b/gcc/config/aarch64/aarch64-builtins.cc index f90fda4ca97..5eef5aaa402 100644 --- a/gcc/config/aarch64/aarch64-builtins.cc +++ b/gcc/config/aarch64/aarch64-builtins.cc @@ -1300,8 +1300,6 @@ aarch64_get_attributes (unsigned int f, machine_mode mode) return aarch64_add_attribute ("leaf", attrs); } -static bool aarch64_simd_builtins_initialized_p = false; - /* Due to the architecture not providing lane variant of the lane instructions for fcmla we can't use the standard simd builtin expansion code, but we still want the majority of the validation that would normally be done. */ @@ -1586,14 +1584,9 @@ handle_arm_neon_h (void) aarch64_init_simd_intrinsics (); } -void +static void aarch64_init_simd_builtins (void) { - if (aarch64_simd_builtins_initialized_p) - return; - - aarch64_simd_builtins_initialized_p = true; - aarch64_init_simd_builtin_types (); /* Strong-typing hasn't been implemented for all AdvSIMD builtin intrinsics. diff --git a/gcc/config/aarch64/aarch64-c.cc b/gcc/config/aarch64/aarch64-c.cc index 3d2fb5ec2ef..52ed4a218a8 100644 --- a/gcc/config/aarch64/aarch64-c.cc +++ b/gcc/config/aarch64/aarch64-c.cc @@ -270,19 +270,6 @@ aarch64_pragma_target_parse (tree args, tree pop_target) if (pop_target) aarch64_save_restore_target_globals (pop_target); - /* Initialize SIMD builtins if we haven't already. - Set current_target_pragma to NULL for the duration so that - the builtin initialization code doesn't try to tag the functions - being built with the attributes specified by any current pragma, thus - going into an infinite recursion. */ - if (TARGET_SIMD) - { - tree saved_current_target_pragma = current_target_pragma; - current_target_pragma = NULL; - aarch64_init_simd_builtins (); - current_target_pragma = saved_current_target_pragma; - } - return true; } diff --git a/gcc/config/aarch64/aarch64-protos.h b/gcc/config/aarch64/aarch64-protos.h index 99af10ad534..5ecdb8af863 100644 --- a/gcc/config/aarch64/aarch64-protos.h +++ b/gcc/config/aarch64/aarch64-protos.h @@ -907,7 +907,6 @@ void aarch64_sve_expand_vector_init (rtx, rtx); void aarch64_init_cumulative_args (CUMULATIVE_ARGS *, const_tree, rtx, const_tree, unsigned, bool = false); void aarch64_init_expanders (void); -void aarch64_init_simd_builtins (void); void aarch64_emit_call_insn (rtx); void aarch64_register_pragmas (void); void aarch64_relayout_simd_types (void); diff --git a/gcc/config/aarch64/aarch64.cc b/gcc/config/aarch64/aarch64.cc index b12f13f4f22..2311ad0e2b8 100644 --- a/gcc/config/aarch64/aarch64.cc +++ b/gcc/config/aarch64/aarch64.cc @@ -18898,18 +18898,6 @@ aarch64_option_valid_attribute_p (tree fndecl, tree, tree args, int) if (ret) { aarch64_override_options_internal (&global_options); - /* Initialize SIMD builtins if we haven't already. - Set current_target_pragma to NULL for the duration so that - the builtin initialization code doesn't try to tag the functions - being built with the attributes specified by any current pragma, thus - going into an infinite recursion. */ - if (TARGET_SIMD) - { - tree saved_current_target_pragma = current_target_pragma; - current_target_pragma = NULL; - aarch64_init_simd_builtins (); - current_target_pragma = saved_current_target_pragma; - } new_target = build_target_option_node (&global_options, &global_options_set); }