From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by sourceware.org (Postfix) with ESMTPS id 4CCC13858D28 for ; Thu, 26 Jan 2023 15:59:50 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 4CCC13858D28 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=redhat.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1674748790; h=from:from:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type:in-reply-to:in-reply-to: references:references; bh=uKoz7Ww2vi/kXhfEEXPrMKSBjD34ih5wCzjP4qbP9is=; b=CZP2Xn3zKxv0HwTW1zErIhjcjeaqJH5qJCKPfB64LPXc6zLn0vcHK5hiktjaetViQfHLJm KydjerU7uPGrdrIcjuL1DZeiqizj/Ws4z4QgIIUq0t8B1hheFJ2pk8jSKznj/oXfDwWABx uAbrlmkx1ypJjLHi0RDVr8iH/DlEKok= Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-228-yavmgpmQOi-IDmUMqZtQSQ-1; Thu, 26 Jan 2023 10:59:46 -0500 X-MC-Unique: yavmgpmQOi-IDmUMqZtQSQ-1 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.rdu2.redhat.com [10.11.54.8]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 6CCAB3C0DDB9; Thu, 26 Jan 2023 15:59:46 +0000 (UTC) Received: from tucnak.zalov.cz (unknown [10.39.192.223]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 22F45C15BA0; Thu, 26 Jan 2023 15:59:46 +0000 (UTC) Received: from tucnak.zalov.cz (localhost [127.0.0.1]) by tucnak.zalov.cz (8.17.1/8.17.1) with ESMTPS id 30QFxflC2745919 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384 bits=256 verify=NOT); Thu, 26 Jan 2023 16:59:42 +0100 Received: (from jakub@localhost) by tucnak.zalov.cz (8.17.1/8.17.1/Submit) id 30QFxes52745917; Thu, 26 Jan 2023 16:59:40 +0100 Date: Thu, 26 Jan 2023 16:59:40 +0100 From: Jakub Jelinek To: Richard Biener , Jeff Law , Andrew Pinski , Patrick Palka Cc: gcc-patches@gcc.gnu.org Subject: [PATCH] tree: Fix up tree_code_{length,type} Message-ID: Reply-To: Jakub Jelinek References: <1668794731-9349-1-git-send-email-apinski@marvell.com> MIME-Version: 1.0 In-Reply-To: X-Scanned-By: MIMEDefang 3.1 on 10.11.54.8 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=us-ascii Content-Disposition: inline X-Spam-Status: No, score=-3.8 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H2,SPF_HELO_NONE,SPF_NONE,TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org List-Id: On Thu, Jan 26, 2023 at 09:45:35AM -0500, Patrick Palka via Gcc-patches wrote: > > +#define DEFTREECODE(SYM, NAME, TYPE, LENGTH) TYPE, > > +#define END_OF_BASE_TREE_CODES tcc_exceptional, > > + > > + > > /* Class of tree given its code. */ > > -extern const enum tree_code_class tree_code_type[]; > > +constexpr enum tree_code_class tree_code_type[] = { > > +#include "all-tree.def" > > +}; > > + > > +#undef DEFTREECODE > > +#undef END_OF_BASE_TREE_CODES > > > > /* Each tree code class has an associated string representation. > > These must correspond to the tree_code_class entries. */ > > extern const char *const tree_code_class_strings[]; > > > > /* Number of argument-words in each kind of tree-node. */ > > -extern const unsigned char tree_code_length[]; > > + > > +#define DEFTREECODE(SYM, NAME, TYPE, LENGTH) LENGTH, > > +#define END_OF_BASE_TREE_CODES 0, > > +constexpr unsigned char tree_code_length[] = { > > +#include "all-tree.def" > > +}; > > + > > +#undef DEFTREECODE > > +#undef END_OF_BASE_TREE_CODES > > IIUC defining these globals as non-inline constexpr gives them internal > linkage, and so each TU contains its own unique copy of these globals. > This bloats cc1plus by a tiny bit and is technically an ODR violation > because some inline functions such as tree_class_check also ODR-use > these variables and so each defn of tree_class_check will refer to a > "different" tree_code_class. Since inline variables are a C++17 > feature, I guess we could fix this by defining the globals the old way > before C++17 and as inline constexpr otherwise? And I'd argue with the tiny bit. In my x86_64-linux cc1plus from today, I see 193 _ZL16tree_code_length vars, 374 bytes each, and 324 _ZL14tree_code_type vars, 1496 bytes each. So, that means waste of 555016 .rodata bytes, plus being highly non-cache friendly. The following patch does that. So far tested on x86_64-linux in my -O0 working tree (system gcc 12 compiler) where .rodata shrunk with the patch by 928896 bytes, in last stage of a bootstrapped tree (built by today's prev-gcc) where .rodata shrunk by 561728 bytes (in neither case .text or most other sections changed sizes) and on powerpc64le-linux --disable-bootstrap (system gcc 4.8.5) to test also the non-C++17 case. Ok for trunk if it passes full bootstrap/regtest? BTW, wonder if tree_code_type couldn't be an array of unsigned char elements rather than enum tree_code_class and we'd then cast it to the enum in the macro, that would shrink that array from 1496 bytes to 374. Of course, that sounds like stage1 material. 2023-01-26 Patrick Palka Jakub Jelinek * tree-core.h (tree_code_type, tree_code_length): For C++17 and later, add inline keyword, otherwise don't define the arrays, but declare extern arrays. * tree.cc (tree_code_type, tree_code_length): Define these arrays for C++14 and older. --- gcc/tree-core.h.jj 2023-01-02 09:32:31.188158094 +0100 +++ gcc/tree-core.h 2023-01-26 16:02:34.212113251 +0100 @@ -2284,17 +2284,20 @@ struct floatn_type_info { /* Matrix describing the structures contained in a given tree code. */ extern bool tree_contains_struct[MAX_TREE_CODES][64]; +/* Class of tree given its code. */ +#if __cpp_inline_variables >= 201606L #define DEFTREECODE(SYM, NAME, TYPE, LENGTH) TYPE, #define END_OF_BASE_TREE_CODES tcc_exceptional, - -/* Class of tree given its code. */ -constexpr enum tree_code_class tree_code_type[] = { +constexpr inline enum tree_code_class tree_code_type[] = { #include "all-tree.def" }; #undef DEFTREECODE #undef END_OF_BASE_TREE_CODES +#else +extern const enum tree_code_class tree_code_type[]; +#endif /* Each tree code class has an associated string representation. These must correspond to the tree_code_class entries. */ @@ -2302,14 +2305,18 @@ extern const char *const tree_code_class /* Number of argument-words in each kind of tree-node. */ +#if __cpp_inline_variables >= 201606L #define DEFTREECODE(SYM, NAME, TYPE, LENGTH) LENGTH, #define END_OF_BASE_TREE_CODES 0, -constexpr unsigned char tree_code_length[] = { +constexpr inline unsigned char tree_code_length[] = { #include "all-tree.def" }; #undef DEFTREECODE #undef END_OF_BASE_TREE_CODES +#else +extern const unsigned char tree_code_length[]; +#endif /* Vector of all alias pairs for global symbols. */ extern GTY(()) vec *alias_pairs; --- gcc/tree.cc.jj 2023-01-13 17:37:45.259482663 +0100 +++ gcc/tree.cc 2023-01-26 16:03:59.796878082 +0100 @@ -74,7 +74,33 @@ along with GCC; see the file COPYING3. #include "asan.h" #include "ubsan.h" +#if __cpp_inline_variables < 201606L +/* Tree code classes. */ +#define DEFTREECODE(SYM, NAME, TYPE, LENGTH) TYPE, +#define END_OF_BASE_TREE_CODES tcc_exceptional, + +const enum tree_code_class tree_code_type[] = { +#include "all-tree.def" +}; + +#undef DEFTREECODE +#undef END_OF_BASE_TREE_CODES + +/* Table indexed by tree code giving number of expression + operands beyond the fixed part of the node structure. + Not used for types or decls. */ + +#define DEFTREECODE(SYM, NAME, TYPE, LENGTH) LENGTH, +#define END_OF_BASE_TREE_CODES 0, + +const unsigned char tree_code_length[] = { +#include "all-tree.def" +}; + +#undef DEFTREECODE +#undef END_OF_BASE_TREE_CODES +#endif /* Names of tree components. Used for printing out the tree and error messages. */ Jakub