From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from nikam.ms.mff.cuni.cz (nikam.ms.mff.cuni.cz [195.113.20.16]) by sourceware.org (Postfix) with ESMTPS id B1FFF38344CE for ; Wed, 22 Jun 2022 10:56:40 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org B1FFF38344CE Received: by nikam.ms.mff.cuni.cz (Postfix, from userid 16202) id 55524289A5E; Wed, 22 Jun 2022 12:56:38 +0200 (CEST) Date: Wed, 22 Jun 2022 12:56:38 +0200 From: Jan Hubicka To: Martin =?iso-8859-2?Q?Li=B9ka?= Cc: gcc-patches@gcc.gnu.org, Martin Jambor Subject: Re: [PATCH] ipa-icf: skip variables with body_removed Message-ID: References: <1cf184b6-a0a1-7514-37e1-ddd8c6b7d7e3@suse.cz> <4b73ee0b-3353-da35-8537-e646f361815c@suse.cz> MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-2 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <4b73ee0b-3353-da35-8537-e646f361815c@suse.cz> X-Spam-Status: No, score=-11.1 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, GIT_PATCH_0, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, 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-List-Received-Date: Wed, 22 Jun 2022 10:56:42 -0000 > @Honza: PING > > On 5/20/22 09:46, Martin Liška wrote: > > On 5/19/22 17:02, Jan Hubicka wrote: > >>> Similarly to cgraph_nodes, it may happen that body_removed is set > >>> during merging of symbols. > >>> > >>> PR ipa/105600 > >>> > >>> Patch can bootstrap on x86_64-linux-gnu and survives regression tests. > >>> > >>> Ready to be installed? > >>> Thanks, > >>> Martin > >>> > >>> gcc/ChangeLog: > >>> > >>> * ipa-icf.cc (sem_item_optimizer::filter_removed_items): > >>> Skip variables with body_removed. > >>> --- > >>> gcc/ipa-icf.cc | 7 ++++--- > >>> 1 file changed, 4 insertions(+), 3 deletions(-) > >>> > >>> diff --git a/gcc/ipa-icf.cc b/gcc/ipa-icf.cc > >>> index 765ae746745..6528a7a10b2 100644 > >>> --- a/gcc/ipa-icf.cc > >>> +++ b/gcc/ipa-icf.cc > >>> @@ -2411,10 +2411,11 @@ sem_item_optimizer::filter_removed_items (void) > >>> { > >>> /* Filter out non-readonly variables. */ > >>> tree decl = item->decl; > >>> - if (TREE_READONLY (decl)) > >>> - filtered.safe_push (item); > >>> - else > >>> + varpool_node *vnode = static_cast (item)->get_node (); > >>> + if (!TREE_READONLY (decl) || vnode->body_removed) > >>> remove_item (item); > >>> + else > >>> + filtered.safe_push (item); > >> > >> So the situation here is that we merge symbols but keep syntactic alias > >> because the declarations are not compatible (have different attributes > >> perhaps because of fortify source)? > > > > The test-case is more about a constexpr symbol or so, I'm not familiar enough > > with these modern C++. > > > > cgraph_node looks like: > > > > (gdb) p item->node->debug() > > _ZN8nlohmann6detail12static_constINS0_10to_json_fnEE5valueE/10 (value) @0x7ffff7fb3200 > > Type: variable > > Body removed by symtab_remove_unreachable_nodes > > Visibility: externally_visible semantic_interposition preempted_reg external public weak comdat comdat_group:_ZN8nlohmann6detail12static_constINS0_10to_json_fnEE5valueE one_only > > References: > > Referring: _Z7to_jsonRN8nlohmann10basic_jsonISt3mapSt6vectorNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEblmiSaNS_14adl_serializerES2_IhSaIhEEEERK8Settings/1 (addr) _Z7to_jsonRN8nlohmann10basic_jsonISt3mapSt6vectorNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEblmiSaNS_14adl_serializerES2_IhSaIhEEEERK8Settings/1 (addr) > > Read from file: a.o > > Availability: not_available > > Varpool flags: initialized read-only OK, I think I worked out what happens here. The thing is that the symbol has "external" flag set. In my mental picture we should be keeping their definitions around since they are used for constant folding, but it seems it is not what happens. We special case inline functions but we do not special case external symbols. This is a missed optimization oppurtunity but not completely trivial to fix, since external symbol may reffer to internal one (such as comdat) but even if it does so we want to optimize out that comdat. So we need some bookkeeping for referneces from external symbols. I will implement that but I guess we still want your patch since this is optional optimization. So patch is OK. Honza > > > > > >> > >> Will ICF still see through the aliases and do merging? > > > > No. > > > >> I think you can > >> craft a testcase by triggering the attribute mismatch and see what > >> happens. At the time we implemented ICF these aliases did not exists, > >> so maybe some TLC is needed here. > > > > Please come up with such test case :) > > > > Thanks, > > Martin > > > >> > >> Honza > > >