From: Martin Liska Date: Tue, 20 Oct 2015 11:59:51 +0000 (+0200) Subject: Correctly fill up cgraph_node::local.versionable flag. X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=7e729474b27556fc64cf413e32b460bce101b435;p=gcc.git Correctly fill up cgraph_node::local.versionable flag. * cgraphclones.c (cgraph_node::create_virtual_clone): Verify cgraph_node.local.versionable instead of calling tree_versionable_function_p. * ipa-cp.c (determine_versionability): Save the information to ipa_node_params summary. (ipcp_versionable_function_p): Use it. (ipcp_propagate_stage): Pass IPA_NODE_REF to a called function. (ipcp_generate_summary): Do not compute cgraph_node versionability. * ipa-inline-analysis.c (inline_generate_summary): Compute versionability for all cgraph nodes. * ipa-prop.c (ipa_node_params_t::duplicate): Duplicate ipa_node_params::versionability. * ipa-prop.h (struct ipa_node_params): Declare it. From-SVN: r229055 --- diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 44f2928fb49..45fc66ab95e 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,20 @@ +2015-10-20 Martin Liska + + * cgraphclones.c (cgraph_node::create_virtual_clone): + Verify cgraph_node.local.versionable instead of calling + tree_versionable_function_p. + * ipa-cp.c (determine_versionability): Save the information + to ipa_node_params summary. + (ipcp_versionable_function_p): Use it. + (ipcp_propagate_stage): Pass IPA_NODE_REF to a called function. + (ipcp_generate_summary): Do not compute cgraph_node + versionability. + * ipa-inline-analysis.c (inline_generate_summary): Compute + versionability for all cgraph nodes. + * ipa-prop.c (ipa_node_params_t::duplicate): Duplicate + ipa_node_params::versionability. + * ipa-prop.h (struct ipa_node_params): Declare it. + 2015-10-20 Ramana Radhakrishnan PR other/67868 diff --git a/gcc/cgraphclones.c b/gcc/cgraphclones.c index e51431c4b68..f243f6ffdce 100644 --- a/gcc/cgraphclones.c +++ b/gcc/cgraphclones.c @@ -569,9 +569,7 @@ cgraph_node::create_virtual_clone (vec redirect_callers, ipa_replace_map *map; char *name; - if (!in_lto_p) - gcc_checking_assert (tree_versionable_function_p (old_decl)); - + gcc_checking_assert (local.versionable); gcc_assert (local.can_change_signature || !args_to_skip); /* Make a new FUNCTION_DECL tree node */ diff --git a/gcc/ipa-cp.c b/gcc/ipa-cp.c index d9d81f1e096..ef93b209dfb 100644 --- a/gcc/ipa-cp.c +++ b/gcc/ipa-cp.c @@ -514,7 +514,8 @@ print_all_lattices (FILE * f, bool dump_sources, bool dump_benefits) with NODE. */ static void -determine_versionability (struct cgraph_node *node) +determine_versionability (struct cgraph_node *node, + struct ipa_node_params *info) { const char *reason = NULL; @@ -546,7 +547,7 @@ determine_versionability (struct cgraph_node *node) fprintf (dump_file, "Function %s/%i is not versionable, reason: %s.\n", node->name (), node->order, reason); - node->local.versionable = (reason == NULL); + info->versionable = (reason == NULL); } /* Return true if it is at all technically possible to create clones of a @@ -555,7 +556,7 @@ determine_versionability (struct cgraph_node *node) static bool ipcp_versionable_function_p (struct cgraph_node *node) { - return node->local.versionable; + return IPA_NODE_REF (node)->versionable; } /* Structure holding accumulated information about callers of a node. */ @@ -2896,7 +2897,7 @@ ipcp_propagate_stage (struct ipa_topo_info *topo) { struct ipa_node_params *info = IPA_NODE_REF (node); - determine_versionability (node); + determine_versionability (node, info); if (node->has_gimple_body_p ()) { info->lattices = XCNEWVEC (struct ipcp_param_lattices, @@ -4609,11 +4610,7 @@ ipcp_generate_summary (void) ipa_register_cgraph_hooks (); FOR_EACH_FUNCTION_WITH_GIMPLE_BODY (node) - { - node->local.versionable - = tree_versionable_function_p (node->decl); - ipa_analyze_node (node); - } + ipa_analyze_node (node); } /* Write ipcp summary for nodes in SET. */ diff --git a/gcc/ipa-inline-analysis.c b/gcc/ipa-inline-analysis.c index 38e1ec0d5c5..35322ccae57 100644 --- a/gcc/ipa-inline-analysis.c +++ b/gcc/ipa-inline-analysis.c @@ -4112,6 +4112,10 @@ inline_generate_summary (void) { struct cgraph_node *node; + FOR_EACH_DEFINED_FUNCTION (node) + if (DECL_STRUCT_FUNCTION (node->decl)) + node->local.versionable = tree_versionable_function_p (node->decl); + /* When not optimizing, do not bother to analyze. Inlining is still done because edge redirection needs to happen there. */ if (!optimize && !flag_generate_lto && !flag_generate_offload && !flag_wpa) diff --git a/gcc/ipa-prop.c b/gcc/ipa-prop.c index 8dd94793130..19846a8642b 100644 --- a/gcc/ipa-prop.c +++ b/gcc/ipa-prop.c @@ -3507,6 +3507,7 @@ ipa_node_params_t::duplicate(cgraph_node *src, cgraph_node *dst, new_info->analysis_done = old_info->analysis_done; new_info->node_enqueued = old_info->node_enqueued; + new_info->versionable = old_info->versionable; old_av = ipa_get_agg_replacements_for_node (src); if (old_av) diff --git a/gcc/ipa-prop.h b/gcc/ipa-prop.h index b9868bbbd5b..35952dce1ca 100644 --- a/gcc/ipa-prop.h +++ b/gcc/ipa-prop.h @@ -334,6 +334,8 @@ struct ipa_node_params unsigned node_within_scc : 1; /* Node is calling a private function called only once. */ unsigned node_calling_single_call : 1; + /* False when there is something makes versioning impossible. */ + unsigned versionable : 1; }; /* Intermediate information that we get from alias analysis about a particular