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.129.124]) by sourceware.org (Postfix) with ESMTPS id 4084B3858D28 for ; Thu, 26 Jan 2023 18:04:08 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 4084B3858D28 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=1674756247; h=from:from: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=yPaw/+CgG6zYb646R0WIjdadJCABNyXpc2LBbvKGE8s=; b=HlKIhh0KLwPr2ofwf0TWjFUiyxQhMHv1oUA5VEXBOdw7dQQlaq2N7qgrkHqKnC5p7OWJyg 23ByGgo79nefhgFdrMjxto4a2UUsYzgArJtjg9mGfXzqNBvFbRvI+a09pbBiOEctkRzdnD vlZ8p63/MlGZwzKvv4FlC0HN7bnOOF4= Received: from mail-yb1-f199.google.com (mail-yb1-f199.google.com [209.85.219.199]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_128_GCM_SHA256) id us-mta-433-l2rVivNhMneI0vHvGVAxhA-1; Thu, 26 Jan 2023 13:04:04 -0500 X-MC-Unique: l2rVivNhMneI0vHvGVAxhA-1 Received: by mail-yb1-f199.google.com with SMTP id z9-20020a25ba49000000b007d4416e3667so2652215ybj.23 for ; Thu, 26 Jan 2023 10:04:02 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=mime-version:references:message-id:in-reply-to:subject:cc:to:date :from:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=yPaw/+CgG6zYb646R0WIjdadJCABNyXpc2LBbvKGE8s=; b=Yy+QU7iojoqOtOMG/yCtq2W8OJ8qDC3mzZVfbNgIXSuMPmgL5MFyf5KZiQpRyLp6md TbYiZaZ/9pSWAIQPZT3JLAnpJc/Ve2Uf84EnRW7wVbXm4bwMnQtDo+lu8py9uK3SkSCs 1iwma3dZcKIW7YJjq+WGe4+FvJte3xcDSHfRcYHOY2bhg0zWOazx6YZQzuI8Tmjt/jeK YbT/vzGuI9IgbLfBE7YPFakW897Hk9oDAxA3VyzYNwoD2mxukXyP0RrJBBystodVZ1kK b3W+IDMVeoDG6DI1gXdifJ09XH63d2lzatoR8yL5fF89snS3l0KrvlVo3iUuYRmKq5Pj 5A3Q== X-Gm-Message-State: AO0yUKX/js9j8ybe4NNKO3kSVg6rb8IbfJ8SNTCXkqyYEhsos29AF3NS Jqkt88lYpzG61RQk56/nvEmKAP45OpOv1kVpJWpZEK+Zi3FMh6OPikpgJkvU0xE7dn8vHobMUot 0P4J852OYbXyE38Z0Zg== X-Received: by 2002:a81:ae56:0:b0:506:6503:dea8 with SMTP id g22-20020a81ae56000000b005066503dea8mr6856100ywk.7.1674756241613; Thu, 26 Jan 2023 10:04:01 -0800 (PST) X-Google-Smtp-Source: AK7set/7KHLYg8g3aDj94RXpqnJwrAKLTonlhrTDiDKtD1leQB3zKTA2fY4uFvFBWH15CleXHYN9CQ== X-Received: by 2002:a81:ae56:0:b0:506:6503:dea8 with SMTP id g22-20020a81ae56000000b005066503dea8mr6856080ywk.7.1674756241293; Thu, 26 Jan 2023 10:04:01 -0800 (PST) Received: from [192.168.1.130] (ool-457670bb.dyn.optonline.net. [69.118.112.187]) by smtp.gmail.com with ESMTPSA id w66-20020a379445000000b007069fde14a6sm1346716qkd.25.2023.01.26.10.04.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 26 Jan 2023 10:04:00 -0800 (PST) From: Patrick Palka X-Google-Original-From: Patrick Palka Date: Thu, 26 Jan 2023 13:03:59 -0500 (EST) To: Jakub Jelinek cc: Richard Biener , Jeff Law , Andrew Pinski , Patrick Palka , gcc-patches@gcc.gnu.org Subject: Re: [PATCH] tree: Fix up tree_code_{length,type} In-Reply-To: Message-ID: References: <1668794731-9349-1-git-send-email-apinski@marvell.com> MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=US-ASCII X-Spam-Status: No, score=-7.9 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, 26 Jan 2023, Jakub Jelinek wrote: > 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. LGTM FWIW. On a related note I noticed the function tree.h:tree_operand_length is declared static and is then used in the non-static inline functions tree_operand_check etc, which seems to be also be a (harmless) ODR violation? We probably should do s/static inline/inline throughout the header files at some point, which'd hopefully reduce the size of and speed up stage1 cc1plus. > > 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 > >