mirrors/gcc
1
0
Fork 0
mirror of https://gcc.gnu.org/git/gcc.git synced 2024-11-25 03:44:04 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix modref handling of parameter adjustments and jump functions.

Browse Source 
* ipa-modref-tree.h (struct modref_tree): Revert prevoius change.
	* ipa-modref.c (analyze_function): Dump original summary.
	(modref_read): Only set IPA if streaming summary (not optimization
	summary).
	(remap_arguments): New function.
	(modref_transform): New function.
	(compute_parm_map): Fix offset calculation.
	(ipa_merge_modref_summary_after_inlining): Do not merge stores when
	they can be ignored.
This commit is contained in:
Jan Hubicka 2020-10-10 20:55:37 +02:00
parent f1f1008c7c
commit c8fd2be174
2 changed files with 92 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
gcc/ipa-modref-tree.h
View File

@ -496,8 +496,7 @@ struct GTY((user)) modref_tree
/* Copy OTHER to THIS. */
void copy_from (modref_tree <T> *other)
{
auto_vec <modref_parm_map, 32> parm_map;
merge (other, &parm_map);
merge (other, NULL);
}
/* Search BASE in tree; return NULL if failed. */

99
gcc/ipa-modref.c
View File

@ -757,7 +757,14 @@ analyze_function (function *f, bool ipa)
if (!summaries)
summaries = modref_summaries::create_ggc (symtab);
else /* Remove existing summary if we are re-running the pass. */
summaries->remove (cgraph_node::get (f->decl));
{
if (dump_file && summaries->get (cgraph_node::get (f->decl)))
{
fprintf (dump_file, "Past summary:\n");
summaries->get (cgraph_node::get (f->decl))->dump (dump_file);
}
summaries->remove (cgraph_node::get (f->decl));
}
((modref_summaries *)summaries)->ipa = ipa;
@ -1290,7 +1297,7 @@ modref_read (void)
if (!summaries)
summaries = modref_summaries::create_ggc (symtab);
((modref_summaries *)summaries)->ipa = true;
((modref_summaries *)summaries)->ipa = !flag_ltrans;
while ((file_data = file_data_vec[j++]))
{
@ -1309,6 +1316,76 @@ modref_read (void)
}
}
/* Update parameter indexes in TT according to MAP. */
void
remap_arguments (vec <int> *map, modref_records *tt)
{
size_t i;
modref_base_node <alias_set_type> *base_node;
FOR_EACH_VEC_SAFE_ELT (tt->bases, i, base_node)
{
size_t j;
modref_ref_node <alias_set_type> *ref_node;
FOR_EACH_VEC_SAFE_ELT (base_node->refs, j, ref_node)
{
size_t k;
modref_access_node *access_node;
FOR_EACH_VEC_SAFE_ELT (ref_node->accesses, k, access_node)
if (access_node->parm_index > 0)
access_node->parm_index = (*map)[access_node->parm_index];
}
}
}
/* If signature changed, update the summary. */
static unsigned int
modref_transform (struct cgraph_node *node)
{
if (!node->clone.param_adjustments)
return 0;
modref_summary *r = summaries->get (node);
if (!r)
return 0;
if (dump_file)
{
fprintf (dump_file, "Updating summary for %s from:\n",
node->dump_name ());
r->dump (dump_file);
}
size_t i, max = 0;
ipa_adjusted_param *p;
FOR_EACH_VEC_SAFE_ELT (node->clone.param_adjustments->m_adj_params, i, p)
{
int idx = node->clone.param_adjustments->get_original_index (i);
if (idx > (int)max)
max = idx;
}
auto_vec <int, 32> map;
map.safe_grow (max + 1);
for (i = 0; i <= max; i++)
map.quick_push (-1);
FOR_EACH_VEC_SAFE_ELT (node->clone.param_adjustments->m_adj_params, i, p)
{
int idx = node->clone.param_adjustments->get_original_index (i);
if (idx >= 0)
map[i] = idx;
}
remap_arguments (&map, r->loads);
remap_arguments (&map, r->stores);
if (dump_file)
{
fprintf (dump_file, "to:\n");
r->dump (dump_file);
}
return 0;
}
/* Definition of the modref IPA pass. */
const pass_data pass_data_ipa_modref =
{
@ -1335,7 +1412,7 @@ public:
modref_read, /* read_optimization_summary */
NULL, /* stmt_fixup */
0, /* function_transform_todo_flags_start */
NULL, /* function_transform */
modref_transform,/* function_transform */
NULL) /* variable_transform */
{}
@ -1448,7 +1525,10 @@ compute_parm_map (cgraph_edge *callee_edge, vec<modref_parm_map> *parm_map)
{
(*parm_map)[i].parm_index = ipa_get_jf_ancestor_formal_id (jf);
(*parm_map)[i].parm_offset_known = true;
(*parm_map)[i].parm_offset = ipa_get_jf_ancestor_offset (jf);
gcc_checking_assert
(!(ipa_get_jf_ancestor_offset (jf) & (BITS_PER_UNIT - 1)));
(*parm_map)[i].parm_offset
= ipa_get_jf_ancestor_offset (jf) >> LOG2_BITS_PER_UNIT;
}
else
(*parm_map)[i].parm_index = -1;
@ -1503,10 +1583,13 @@ ipa_merge_modref_summary_after_inlining (cgraph_edge *edge)
compute_parm_map (edge, &parm_map);
if (to_info->loads)
to_info->loads->merge (callee_info->loads, &parm_map);
if (to_info->stores)
to_info->stores->merge (callee_info->stores, &parm_map);
if (!ignore_stores_p (edge->callee->decl, flags))
{
if (to_info->loads)
to_info->loads->merge (callee_info->loads, &parm_map);
if (to_info->stores)
to_info->stores->merge (callee_info->stores, &parm_map);
}
if (to_info->loads_lto)
to_info->loads_lto->merge (callee_info->loads_lto, &parm_map);
if (to_info->stores_lto)