From patchwork Thu Jan 26 15:59:40 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jakub Jelinek X-Patchwork-Id: 48776 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp345835wrn; Thu, 26 Jan 2023 08:00:36 -0800 (PST) X-Google-Smtp-Source: AK7set90feKL9hAfWQY9LDyz/dRf6B660Ilee5i2RHqyMSZM5BOwmZnqz0ke7fAm18LXaTM585Wi X-Received: by 2002:aa7:c250:0:b0:4a0:ae6b:c9e6 with SMTP id y16-20020aa7c250000000b004a0ae6bc9e6mr6580576edo.3.1674748836141; Thu, 26 Jan 2023 08:00:36 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1674748836; cv=none; d=google.com; s=arc-20160816; b=o/Boouyy0GO15tFH7l/Og5RQZ+XNkwPms2yhfuZBnr71FrhINFRt5kAfSJWZh2UgXT S5g6dja6u2dOmpE5Ftc1Z9ZKNv0M6uxmdTWXu4EyNcdMoikhNt+CYruxeTSeNZ0wp4Bv 8seCguzHK/wza6UhNhtop+kAkr3T6pAAWWcK/DOIce71ss6co5+aKULZOLCRfw6PJgyE X4QhG/ND+bv2ZeAx4YePB4ukBdqTUmu8V8ALzibdUulAaVB8ms2+JV0S8ZdITl5WITQB oa83rxU5U75jaG+g2RO4Gk9B9pZQ7/hCvXj2xy4zkJLS/2vZo0P12b+W6jI04M7328jZ rIEw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:reply-to:from:list-subscribe:list-help:list-post :list-archive:list-unsubscribe:list-id:precedence :content-disposition:in-reply-to:mime-version:references:message-id :subject:cc:to:date:dmarc-filter:delivered-to:dkim-signature :dkim-filter; bh=uKoz7Ww2vi/kXhfEEXPrMKSBjD34ih5wCzjP4qbP9is=; b=GtWUqe8rhQENjfSUvw6Kp18eRVsWgCLUociYgsJyA70D1GHiaUSiSh+A/Qm6+EV/tb tU3465p3kmDXkyvgbswOZ1oyN4jaticXfXqSVqrgwafgPyCFXBrLhfDlxKKSAhPxv/nS 5LF0COkXO85a/9AIsbLBh8aSfWg5lEIrgL1p3JPJ9CKGjBBR63+DYObUaJpz4e82xTiM AhiYikppkvzt9yfRyH/rK6pPggySHCKgKqkzv6jyEvfnKgwA/cODfSxChE8JLPjxiKJ3 +5Ss4UtKxBg3V8tae+0jb3HGJIm5wv3QDhciLFOvT/9T2Lz0osXz+9DpYTrQ/QN7qof2 Gz8Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gcc.gnu.org header.s=default header.b=USNtECqU; spf=pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 2620:52:3:1:0:246e:9693:128c as permitted sender) smtp.mailfrom="gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=gnu.org Received: from sourceware.org (server2.sourceware.org. [2620:52:3:1:0:246e:9693:128c]) by mx.google.com with ESMTPS id t13-20020a508d4d000000b004a0b5985ec0si2346819edt.241.2023.01.26.08.00.35 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 26 Jan 2023 08:00:36 -0800 (PST) Received-SPF: pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 2620:52:3:1:0:246e:9693:128c as permitted sender) client-ip=2620:52:3:1:0:246e:9693:128c; Authentication-Results: mx.google.com; dkim=pass header.i=@gcc.gnu.org header.s=default header.b=USNtECqU; spf=pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 2620:52:3:1:0:246e:9693:128c as permitted sender) smtp.mailfrom="gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=gnu.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id D9D103858D38 for ; Thu, 26 Jan 2023 16:00:34 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org D9D103858D38 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1674748834; bh=uKoz7Ww2vi/kXhfEEXPrMKSBjD34ih5wCzjP4qbP9is=; h=Date:To:Cc:Subject:References:In-Reply-To:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From:Reply-To:From; b=USNtECqUs16KfuMLFLF5IMOEzvsu2hiUcQUgOg//adV3swwXjjb3SiQvhDuARddhk kGW8OH2adzomyhhCpfCezojfkeZ/UGCReoiar41Bzso6ujG8hzKdjFcINsBGNKxIqU Vl4yGFUUdw7fjaaoysOjh0P21rQPEwdgl4EDZzyw= X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org 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 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 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: 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-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 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: Jakub Jelinek via Gcc-patches From: Jakub Jelinek Reply-To: Jakub Jelinek Errors-To: gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org Sender: "Gcc-patches" X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1756101435640638998?= X-GMAIL-MSGID: =?utf-8?q?1756101435640638998?= 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. Jakub --- 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. */