From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp-out1.suse.de (smtp-out1.suse.de [IPv6:2001:67c:2178:6::1c]) by sourceware.org (Postfix) with ESMTPS id 6C1273858C83 for ; Wed, 22 Feb 2023 11:43:50 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 6C1273858C83 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=suse.de Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=suse.de Received: from relay2.suse.de (relay2.suse.de [149.44.160.134]) by smtp-out1.suse.de (Postfix) with ESMTP id 17F19373A1; Wed, 22 Feb 2023 11:43:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1677066229; h=from:from:reply-to: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=3joOsEEXejiAvWOTEOaw9GNgl94HSrfMKkujFuy/6Ik=; b=c4JQT8h9x+zxtYJwTuVfBKx+5o+F4dWoV11IqFs2thLHCTtMz8oxqOzCuKGi0zZ+aNz9tk glqaYZ5EFmN+DEOsfx/Ildq+l1Eh1UlUNGJ352o3arnULYcLTcgvKa8xFx6tWxCFwLrLZZ E5sa631cleahQUt9VGPPBr3c7ALRh3w= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1677066229; h=from:from:reply-to: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=3joOsEEXejiAvWOTEOaw9GNgl94HSrfMKkujFuy/6Ik=; b=0f1nCPQaI7x175OuoGA/RcE2qgZ0OHttB5f/8UIseg76IGP24nZ8EtYTCAUaDniDOClDsb m3gk4pxF0lQ5LHBw== Received: from wotan.suse.de (wotan.suse.de [10.160.0.1]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by relay2.suse.de (Postfix) with ESMTPS id F21682C141; Wed, 22 Feb 2023 11:43:48 +0000 (UTC) Date: Wed, 22 Feb 2023 11:43:48 +0000 (UTC) From: Richard Biener To: Jakub Jelinek , jwakely@redhat.com cc: gcc-patches@gcc.gnu.org Subject: Re: [PATCH] tree: Add 3 argument fndecl_built_in_p In-Reply-To: Message-ID: References: User-Agent: Alpine 2.22 (LSU 394 2020-01-19) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII X-Spam-Status: No, score=-5.0 required=5.0 tests=BAYES_00,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE,SPF_PASS,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 Wed, 22 Feb 2023, Jakub Jelinek wrote: > On Wed, Feb 22, 2023 at 09:52:06AM +0000, Richard Biener wrote: > > > The following testcase ICEs because we still have some spots that > > > treat BUILT_IN_UNREACHABLE specially but not BUILT_IN_UNREACHABLE_TRAP > > > the same. > > This patch uses (fndecl_built_in_p (node, BUILT_IN_UNREACHABLE) > || fndecl_built_in_p (node, BUILT_IN_UNREACHABLE_TRAP)) > a lot and from grepping around, we do something like that in lots of > other places, or in some spots instead as > (fndecl_built_in_p (node, BUILT_IN_NORMAL) > && (DECL_FUNCTION_CODE (node) == BUILT_IN_WHATEVER1 > || DECL_FUNCTION_CODE (node) == BUILT_IN_WHATEVER2)) > The following patch adds an overload for this case, so we can write > it in a shorter way. It isn't worth for 3+, code in that case > typically uses the fndecl_built_in_p (node, BUILT_IN_NORMAL) > + switch in DECL_FUNCTION_CODE. > > If this isn't appropriate for GCC 13 (or not at all), I think we'll > need to change at least ipa-prop.cc because it suffers from the same > problem as the previous patch was fixing. Is it possible to use C++ (template) magic to expand the > 1 argument case to if (fndecl_built_in_p (BUILT_IN_NORMA) && (... || ... || ... lispy we'd expand to the head check and then recursively on the first and the remaining args. Richard. > 2023-02-22 Jakub Jelinek > > * tree.h (fndecl_built_in_p): New overload with 2 built_in_function > arguments. > * builtins.cc (fold_builtin_expect): Use it. > * gimplify.cc (goa_stabilize_expr): Likewise. > * cgraphclones.cc (cgraph_node::create_clone): Likewise. > * ipa-fnsummary.cc (compute_fn_summary): Likewise. > * omp-low.cc (setjmp_or_longjmp_p): Likewise. > * cgraph.cc (cgraph_edge::redirect_call_stmt_to_callee, > cgraph_update_edges_for_call_stmt_node, > cgraph_edge::verify_corresponds_to_fndecl, > cgraph_node::verify_node): Likewise. > * tree-stdarg.cc (optimize_va_list_gpr_fpr_size): Likewise. > * gimple-ssa-warn-access.cc (matching_alloc_calls_p): Likewise. > * ipa-prop.cc (try_make_edge_direct_virtual_call): Handle > BUILT_IN_UNREACHABLE_TRAP like BUILT_IN_UNREACHABLE. > > --- gcc/tree.h.jj 2023-02-17 12:45:08.223636043 +0100 > +++ gcc/tree.h 2023-02-22 11:25:31.608825229 +0100 > @@ -6615,6 +6615,18 @@ fndecl_built_in_p (const_tree node, buil > && DECL_FUNCTION_CODE (node) == name); > } > > +/* Faster variant of > + fndecl_built_in_p (NODE, NAME1) || fndecl_built_in_p (NODE, NAME2). */ > + > +inline bool > +fndecl_built_in_p (const_tree node, built_in_function name1, > + built_in_function name2) > +{ > + return (fndecl_built_in_p (node, BUILT_IN_NORMAL) > + && (DECL_FUNCTION_CODE (node) == name1 > + || DECL_FUNCTION_CODE (node) == name2)); > +} > + > /* A struct for encapsulating location information about an operator > and the operation built from it. > > --- gcc/builtins.cc.jj 2023-02-14 12:09:57.163647987 +0100 > +++ gcc/builtins.cc 2023-02-22 11:29:43.800179949 +0100 > @@ -8625,8 +8625,8 @@ fold_builtin_expect (location_t loc, tre > > if (TREE_CODE (inner) == CALL_EXPR > && (fndecl = get_callee_fndecl (inner)) > - && (fndecl_built_in_p (fndecl, BUILT_IN_EXPECT) > - || fndecl_built_in_p (fndecl, BUILT_IN_EXPECT_WITH_PROBABILITY))) > + && fndecl_built_in_p (fndecl, BUILT_IN_EXPECT, > + BUILT_IN_EXPECT_WITH_PROBABILITY)) > return arg0; > > inner = inner_arg0; > --- gcc/gimplify.cc.jj 2023-02-15 09:23:27.807390189 +0100 > +++ gcc/gimplify.cc 2023-02-22 11:32:38.446655528 +0100 > @@ -15815,8 +15815,8 @@ goa_stabilize_expr (tree *expr_p, gimple > if (TREE_CODE (expr) == CALL_EXPR) > { > if (tree fndecl = get_callee_fndecl (expr)) > - if (fndecl_built_in_p (fndecl, BUILT_IN_CLEAR_PADDING) > - || fndecl_built_in_p (fndecl, BUILT_IN_MEMCMP)) > + if (fndecl_built_in_p (fndecl, BUILT_IN_CLEAR_PADDING, > + BUILT_IN_MEMCMP)) > { > int nargs = call_expr_nargs (expr); > for (int i = 0; i < nargs; i++) > --- gcc/cgraphclones.cc.jj 2023-02-22 11:21:56.467934980 +0100 > +++ gcc/cgraphclones.cc 2023-02-22 11:28:30.272242754 +0100 > @@ -425,9 +425,8 @@ cgraph_node::create_clone (tree new_decl > version. The only exception is when the edge was proved to > be unreachable during the cloning procedure. */ > if (!e->callee > - || !(fndecl_built_in_p (e->callee->decl, BUILT_IN_UNREACHABLE) > - || fndecl_built_in_p (e->callee->decl, > - BUILT_IN_UNREACHABLE_TRAP))) > + || !fndecl_built_in_p (e->callee->decl, BUILT_IN_UNREACHABLE, > + BUILT_IN_UNREACHABLE_TRAP)) > e->redirect_callee_duplicating_thunks (new_node); > } > new_node->expand_all_artificial_thunks (); > --- gcc/ipa-fnsummary.cc.jj 2023-01-02 09:32:45.510951148 +0100 > +++ gcc/ipa-fnsummary.cc 2023-02-22 11:33:07.922229473 +0100 > @@ -3180,8 +3180,8 @@ compute_fn_summary (struct cgraph_node * > for (e = node->callees; e; e = e->next_callee) > { > tree cdecl = e->callee->decl; > - if (fndecl_built_in_p (cdecl, BUILT_IN_APPLY_ARGS) > - || fndecl_built_in_p (cdecl, BUILT_IN_VA_START)) > + if (fndecl_built_in_p (cdecl, BUILT_IN_APPLY_ARGS, > + BUILT_IN_VA_START)) > break; > } > node->can_change_signature = !e; > --- gcc/omp-low.cc.jj 2023-01-02 09:32:25.281243440 +0100 > +++ gcc/omp-low.cc 2023-02-22 11:35:06.418516664 +0100 > @@ -3992,8 +3992,7 @@ scan_omp_1_op (tree *tp, int *walk_subtr > static bool > setjmp_or_longjmp_p (const_tree fndecl) > { > - if (fndecl_built_in_p (fndecl, BUILT_IN_SETJMP) > - || fndecl_built_in_p (fndecl, BUILT_IN_LONGJMP)) > + if (fndecl_built_in_p (fndecl, BUILT_IN_SETJMP, BUILT_IN_LONGJMP)) > return true; > > tree declname = DECL_NAME (fndecl); > --- gcc/cgraph.cc.jj 2023-02-22 11:21:56.466934995 +0100 > +++ gcc/cgraph.cc 2023-02-22 11:27:29.907115300 +0100 > @@ -1548,8 +1548,8 @@ cgraph_edge::redirect_call_stmt_to_calle > else > { > if (flag_checking > - && !fndecl_built_in_p (e->callee->decl, BUILT_IN_UNREACHABLE) > - && !fndecl_built_in_p (e->callee->decl, BUILT_IN_UNREACHABLE_TRAP)) > + && !fndecl_built_in_p (e->callee->decl, BUILT_IN_UNREACHABLE, > + BUILT_IN_UNREACHABLE_TRAP)) > ipa_verify_edge_has_no_modifications (e); > new_stmt = e->call_stmt; > gimple_call_set_fndecl (new_stmt, e->callee->decl); > @@ -1635,9 +1635,8 @@ cgraph_update_edges_for_call_stmt_node ( > { > /* Keep calls marked as dead dead. */ > if (new_stmt && is_gimple_call (new_stmt) && e->callee > - && (fndecl_built_in_p (e->callee->decl, BUILT_IN_UNREACHABLE) > - || fndecl_built_in_p (e->callee->decl, > - BUILT_IN_UNREACHABLE_TRAP))) > + && fndecl_built_in_p (e->callee->decl, BUILT_IN_UNREACHABLE, > + BUILT_IN_UNREACHABLE_TRAP)) > { > cgraph_edge::set_call_stmt (node->get_edge (old_stmt), > as_a (new_stmt)); > @@ -3259,9 +3258,8 @@ cgraph_edge::verify_corresponds_to_fndec > /* Optimizers can redirect unreachable calls or calls triggering undefined > behavior to __builtin_unreachable or __builtin_unreachable trap. */ > > - if (fndecl_built_in_p (callee->decl, BUILT_IN_NORMAL) > - && (DECL_FUNCTION_CODE (callee->decl) == BUILT_IN_UNREACHABLE > - || DECL_FUNCTION_CODE (callee->decl) == BUILT_IN_UNREACHABLE_TRAP)) > + if (fndecl_built_in_p (callee->decl, BUILT_IN_UNREACHABLE, > + BUILT_IN_UNREACHABLE_TRAP)) > return false; > > if (callee->former_clone_of != node->decl > @@ -3601,9 +3599,8 @@ cgraph_node::verify_node (void) > /* Optimized out calls are redirected to __builtin_unreachable. */ > && (e->count.nonzero_p () > || ! e->callee->decl > - || !(fndecl_built_in_p (e->callee->decl, BUILT_IN_UNREACHABLE) > - || fndecl_built_in_p (e->callee->decl, > - BUILT_IN_UNREACHABLE_TRAP))) > + || !fndecl_built_in_p (e->callee->decl, BUILT_IN_UNREACHABLE, > + BUILT_IN_UNREACHABLE_TRAP)) > && count > == ENTRY_BLOCK_PTR_FOR_FN (DECL_STRUCT_FUNCTION (decl))->count > && (!e->count.ipa_p () > --- gcc/tree-stdarg.cc.jj 2023-01-02 09:32:24.970247934 +0100 > +++ gcc/tree-stdarg.cc 2023-02-22 11:38:22.383684097 +0100 > @@ -867,8 +867,8 @@ optimize_va_list_gpr_fpr_size (function > tree callee = gimple_call_fndecl (stmt); > > if (callee > - && (fndecl_built_in_p (callee, BUILT_IN_VA_START) > - || fndecl_built_in_p (callee, BUILT_IN_VA_END))) > + && fndecl_built_in_p (callee, BUILT_IN_VA_START, > + BUILT_IN_VA_END)) > continue; > } > > --- gcc/gimple-ssa-warn-access.cc.jj 2023-02-16 10:13:23.822208868 +0100 > +++ gcc/gimple-ssa-warn-access.cc 2023-02-22 11:31:36.168555726 +0100 > @@ -1780,8 +1780,7 @@ matching_alloc_calls_p (tree alloc_decl, > > /* Return false for deallocation functions that are known not > to match. */ > - if (fndecl_built_in_p (dealloc_decl, BUILT_IN_FREE) > - || fndecl_built_in_p (dealloc_decl, BUILT_IN_REALLOC)) > + if (fndecl_built_in_p (dealloc_decl, BUILT_IN_FREE, BUILT_IN_REALLOC)) > return false; > /* Otherwise proceed below to check the deallocation function's > "*dealloc" attributes to look for one that mentions this operator > @@ -1805,8 +1804,8 @@ matching_alloc_calls_p (tree alloc_decl, > if (DECL_IS_OPERATOR_DELETE_P (dealloc_decl)) > return false; > > - if (fndecl_built_in_p (dealloc_decl, BUILT_IN_FREE) > - || fndecl_built_in_p (dealloc_decl, BUILT_IN_REALLOC)) > + if (fndecl_built_in_p (dealloc_decl, BUILT_IN_FREE, > + BUILT_IN_REALLOC)) > return true; > > alloc_dealloc_kind = alloc_kind_t::builtin; > --- gcc/ipa-prop.cc.jj 2023-01-02 09:32:46.077942956 +0100 > +++ gcc/ipa-prop.cc 2023-02-22 11:34:15.572251634 +0100 > @@ -3849,7 +3849,8 @@ try_make_edge_direct_virtual_call (struc > if (can_refer) > { > if (!t > - || fndecl_built_in_p (t, BUILT_IN_UNREACHABLE) > + || fndecl_built_in_p (t, BUILT_IN_UNREACHABLE, > + BUILT_IN_UNREACHABLE_TRAP) > || !possible_polymorphic_call_target_p > (ie, cgraph_node::get (t))) > { > > Jakub > > -- Richard Biener SUSE Software Solutions Germany GmbH, Frankenstrasse 146, 90461 Nuernberg, Germany; GF: Ivo Totev, Andrew Myers, Andrew McDonald, Boudien Moerman; HRB 36809 (AG Nuernberg)