Commit 7e729474 by Martin Liska Committed by Martin Liska

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
parent 5f0a92e5
2015-10-20 Martin Liska <mliska@suse.cz>
* 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 <ramana.radhakrishnan@arm.com> 2015-10-20 Ramana Radhakrishnan <ramana.radhakrishnan@arm.com>
PR other/67868 PR other/67868
...@@ -569,9 +569,7 @@ cgraph_node::create_virtual_clone (vec<cgraph_edge *> redirect_callers, ...@@ -569,9 +569,7 @@ cgraph_node::create_virtual_clone (vec<cgraph_edge *> redirect_callers,
ipa_replace_map *map; ipa_replace_map *map;
char *name; char *name;
if (!in_lto_p) gcc_checking_assert (local.versionable);
gcc_checking_assert (tree_versionable_function_p (old_decl));
gcc_assert (local.can_change_signature || !args_to_skip); gcc_assert (local.can_change_signature || !args_to_skip);
/* Make a new FUNCTION_DECL tree node */ /* Make a new FUNCTION_DECL tree node */
......
...@@ -514,7 +514,8 @@ print_all_lattices (FILE * f, bool dump_sources, bool dump_benefits) ...@@ -514,7 +514,8 @@ print_all_lattices (FILE * f, bool dump_sources, bool dump_benefits)
with NODE. */ with NODE. */
static void static void
determine_versionability (struct cgraph_node *node) determine_versionability (struct cgraph_node *node,
struct ipa_node_params *info)
{ {
const char *reason = NULL; const char *reason = NULL;
...@@ -546,7 +547,7 @@ determine_versionability (struct cgraph_node *node) ...@@ -546,7 +547,7 @@ determine_versionability (struct cgraph_node *node)
fprintf (dump_file, "Function %s/%i is not versionable, reason: %s.\n", fprintf (dump_file, "Function %s/%i is not versionable, reason: %s.\n",
node->name (), node->order, reason); 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 /* Return true if it is at all technically possible to create clones of a
...@@ -555,7 +556,7 @@ determine_versionability (struct cgraph_node *node) ...@@ -555,7 +556,7 @@ determine_versionability (struct cgraph_node *node)
static bool static bool
ipcp_versionable_function_p (struct cgraph_node *node) 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. */ /* Structure holding accumulated information about callers of a node. */
...@@ -2896,7 +2897,7 @@ ipcp_propagate_stage (struct ipa_topo_info *topo) ...@@ -2896,7 +2897,7 @@ ipcp_propagate_stage (struct ipa_topo_info *topo)
{ {
struct ipa_node_params *info = IPA_NODE_REF (node); struct ipa_node_params *info = IPA_NODE_REF (node);
determine_versionability (node); determine_versionability (node, info);
if (node->has_gimple_body_p ()) if (node->has_gimple_body_p ())
{ {
info->lattices = XCNEWVEC (struct ipcp_param_lattices, info->lattices = XCNEWVEC (struct ipcp_param_lattices,
...@@ -4609,11 +4610,7 @@ ipcp_generate_summary (void) ...@@ -4609,11 +4610,7 @@ ipcp_generate_summary (void)
ipa_register_cgraph_hooks (); ipa_register_cgraph_hooks ();
FOR_EACH_FUNCTION_WITH_GIMPLE_BODY (node) 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. */ /* Write ipcp summary for nodes in SET. */
......
...@@ -4112,6 +4112,10 @@ inline_generate_summary (void) ...@@ -4112,6 +4112,10 @@ inline_generate_summary (void)
{ {
struct cgraph_node *node; 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 /* When not optimizing, do not bother to analyze. Inlining is still done
because edge redirection needs to happen there. */ because edge redirection needs to happen there. */
if (!optimize && !flag_generate_lto && !flag_generate_offload && !flag_wpa) if (!optimize && !flag_generate_lto && !flag_generate_offload && !flag_wpa)
......
...@@ -3507,6 +3507,7 @@ ipa_node_params_t::duplicate(cgraph_node *src, cgraph_node *dst, ...@@ -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->analysis_done = old_info->analysis_done;
new_info->node_enqueued = old_info->node_enqueued; new_info->node_enqueued = old_info->node_enqueued;
new_info->versionable = old_info->versionable;
old_av = ipa_get_agg_replacements_for_node (src); old_av = ipa_get_agg_replacements_for_node (src);
if (old_av) if (old_av)
......
...@@ -334,6 +334,8 @@ struct ipa_node_params ...@@ -334,6 +334,8 @@ struct ipa_node_params
unsigned node_within_scc : 1; unsigned node_within_scc : 1;
/* Node is calling a private function called only once. */ /* Node is calling a private function called only once. */
unsigned node_calling_single_call : 1; 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 /* Intermediate information that we get from alias analysis about a particular
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment