From patchwork Wed Jul 6 13:31:34 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pierre-Marie de Rodat X-Patchwork-Id: 1652992 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.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=eAB2G9/I; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=gcc.gnu.org (client-ip=8.43.85.97; helo=sourceware.org; envelope-from=gcc-patches-bounces+incoming=patchwork.ozlabs.org@gcc.gnu.org; receiver=) Received: from sourceware.org (server2.sourceware.org [8.43.85.97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4LdL9W6pVPz9s07 for ; Wed, 6 Jul 2022 23:34:07 +1000 (AEST) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id B36783838015 for ; Wed, 6 Jul 2022 13:34:05 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org B36783838015 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1657114445; bh=L4wKMOspqHyCQtOyjMMAFgnivIcA1ZunF5wzl/CocMQ=; h=Date:To:Subject:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:Cc:From; b=eAB2G9/I6dR3ars2DW480ZxCk9ZIjX8KW/jv0MILds/t4g7wCxpahVwMv0b4MFmJJ Mbs2sQdL69RH4dHeGXNIXwOZuiwnVTRiPuRWmGytuOgSfkiTsVclr8hWSCB5UXlAXU B/n0gXlUlKXL+SZtYkj36KSq6gjt8iYV5qHONKCs= X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from mail-wm1-x32d.google.com (mail-wm1-x32d.google.com [IPv6:2a00:1450:4864:20::32d]) by sourceware.org (Postfix) with ESMTPS id 81CF6385AE53 for ; Wed, 6 Jul 2022 13:31:36 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 81CF6385AE53 Received: by mail-wm1-x32d.google.com with SMTP id j7so8855915wmp.2 for ; Wed, 06 Jul 2022 06:31:36 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:date:from:to:cc:subject:message-id:mime-version :content-disposition; bh=L4wKMOspqHyCQtOyjMMAFgnivIcA1ZunF5wzl/CocMQ=; b=GksRa4ar4uRSqCPrr2f+ZcbtsT4Fr7ilKUXE+fKsBcY4zmlVfOkjdmq1Ka/FSQtelG AdYO6HhD7cCoCjDm0Guc+TNC7eUOXgbHyHvzDE7sugTvGq/QWpeGwQaH5GQ27XkHf13s XAbiypiq51sG/4+bmEBIjb6+9kmD3MNcHVzKrSvtyJu4wqdmxBw6NE7V9fZ/RpvPdrvu s+tFsqy0T2saT2eWGxmaD8PgeTdQqV+tv9QQAj6iiy4SVBdoYD1ObL1nNrmN18eC7CFS BUsWor+jI8mBR+LHXUEc2kch137yiF1iGzWb56tPNc72UH7Fg3SJo2ln5XPetA7v8iL/ JLgQ== X-Gm-Message-State: AJIora+/WxAU2td/njVYwNO+9nLnqJGRQBZ3FmOYr/7RoymN6s8a6h2q ougOGPgEgV4VrBPT6PTLW7L41UBwT0HGLw== X-Google-Smtp-Source: AGRyM1vQ9Ot1+IEfBFUH77HF349UxDwflahphqX6yv+B1J6k0lUPn6SuL2Az7EBG7GPnUkTh1uTdnQ== X-Received: by 2002:a05:600c:19d0:b0:3a1:99b7:512 with SMTP id u16-20020a05600c19d000b003a199b70512mr21246361wmq.106.1657114295175; Wed, 06 Jul 2022 06:31:35 -0700 (PDT) Received: from adacore.com ([45.147.211.82]) by smtp.gmail.com with ESMTPSA id m16-20020adfe950000000b0021d70a871cbsm5175366wrn.32.2022.07.06.06.31.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 06 Jul 2022 06:31:34 -0700 (PDT) Date: Wed, 6 Jul 2022 13:31:34 +0000 To: gcc-patches@gcc.gnu.org Subject: [Ada] Improve code generated for aggregates of VFA type Message-ID: <20220706133134.GA2207262@adacore.com> MIME-Version: 1.0 Content-Disposition: inline X-Spam-Status: No, score=-13.3 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, 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: Pierre-Marie de Rodat via Gcc-patches From: Pierre-Marie de Rodat Reply-To: Pierre-Marie de Rodat Cc: Eric Botcazou Errors-To: gcc-patches-bounces+incoming=patchwork.ozlabs.org@gcc.gnu.org Sender: "Gcc-patches" This avoids using a full access for constants internally generated from assignments of aggregates with a Volatile_Full_Access type. Tested on x86_64-pc-linux-gnu, committed on trunk gcc/ada/ * gcc-interface/gigi.h (simple_constant_p): Declare. * gcc-interface/decl.cc (gnat_to_gnu_entity) : Strip the qualifiers from the type of a simple constant. (simple_constant_p): New predicate. * gcc-interface/trans.cc (node_is_atomic): Return true for objects with atomic type except for simple constants. (node_is_volatile_full_access): Return false for simple constants with VFA type. diff --git a/gcc/ada/gcc-interface/decl.cc b/gcc/ada/gcc-interface/decl.cc --- a/gcc/ada/gcc-interface/decl.cc +++ b/gcc/ada/gcc-interface/decl.cc @@ -660,8 +660,8 @@ gnat_to_gnu_entity (Entity_Id gnat_entity, tree gnu_expr, bool definition) like variables. */ if (definition && !gnu_expr - && No (Address_Clause (gnat_entity)) && !No_Initialization (gnat_decl) + && No (Address_Clause (gnat_entity)) && No (gnat_renamed_obj)) { gnu_decl = error_mark_node; @@ -781,6 +781,11 @@ gnat_to_gnu_entity (Entity_Id gnat_entity, tree gnu_expr, bool definition) if (kind == E_Loop_Parameter) gnu_type = get_base_type (gnu_type); + /* If this is a simple constant, strip the qualifiers from its type, + since the constant represents only its value. */ + else if (simple_constant_p (gnat_entity)) + gnu_type = TYPE_MAIN_VARIANT (gnu_type); + /* Reject non-renamed objects whose type is an unconstrained array or any object whose type is a dummy type or void. */ if ((TREE_CODE (gnu_type) == UNCONSTRAINED_ARRAY_TYPE @@ -9541,6 +9546,19 @@ promote_object_alignment (tree gnu_type, tree gnu_size, Entity_Id gnat_entity) return align; } +/* Return whether GNAT_ENTITY is a simple constant, i.e. it represents only + its value and reading it has no side effects. */ + +bool +simple_constant_p (Entity_Id gnat_entity) +{ + return Ekind (gnat_entity) == E_Constant + && Present (Constant_Value (gnat_entity)) + && !No_Initialization (gnat_entity) + && No (Address_Clause (gnat_entity)) + && No (Renamed_Object (gnat_entity)); +} + /* Verify that TYPE is something we can implement atomically. If not, issue an error for GNAT_ENTITY. COMPONENT_P is true if we are being called to process a component type. */ diff --git a/gcc/ada/gcc-interface/gigi.h b/gcc/ada/gcc-interface/gigi.h --- a/gcc/ada/gcc-interface/gigi.h +++ b/gcc/ada/gcc-interface/gigi.h @@ -998,6 +998,10 @@ extern Entity_Id get_debug_scope (Node_Id gnat_node, bool *is_subprogram); should be synchronized with Exp_Dbug.Debug_Renaming_Declaration. */ extern bool can_materialize_object_renaming_p (Node_Id expr); +/* Return whether GNAT_ENTITY is a simple constant, i.e. it represents only + its value and reading it has no side effects. */ +extern bool simple_constant_p (Entity_Id gnat_entity); + /* Return the size of TYPE, which must be a positive power of 2. */ extern unsigned int resolve_atomic_size (tree type); diff --git a/gcc/ada/gcc-interface/trans.cc b/gcc/ada/gcc-interface/trans.cc --- a/gcc/ada/gcc-interface/trans.cc +++ b/gcc/ada/gcc-interface/trans.cc @@ -4111,9 +4111,11 @@ node_is_atomic (Node_Id gnat_node) case N_Identifier: case N_Expanded_Name: gnat_entity = Entity (gnat_node); - if (Ekind (gnat_entity) != E_Variable) + if (!Is_Object (gnat_entity)) break; - return Is_Atomic (gnat_entity) || Is_Atomic (Etype (gnat_entity)); + return Is_Atomic (gnat_entity) + || (Is_Atomic (Etype (gnat_entity)) + && !simple_constant_p (gnat_entity)); case N_Selected_Component: return Is_Atomic (Etype (gnat_node)) @@ -4152,7 +4154,8 @@ node_is_volatile_full_access (Node_Id gnat_node) if (!Is_Object (gnat_entity)) break; return Is_Volatile_Full_Access (gnat_entity) - || Is_Volatile_Full_Access (Etype (gnat_entity)); + || (Is_Volatile_Full_Access (Etype (gnat_entity)) + && !simple_constant_p (gnat_entity)); case N_Selected_Component: return Is_Volatile_Full_Access (Etype (gnat_node))