OpenE2K/gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

ipa-inline-transform.c: Include function.h, cfg.h and basic-block.h

Browse Source 
* ipa-inline-transform.c: Include function.h, cfg.h and basic-block.h
	(mark_all_inlined_calls_cdtor): Fix formating.
	(inline_transform): Rescale profile before inlining.

From-SVN: r249098
This commit is contained in:
Jan Hubicka 2017-06-11 01:18:44 +02:00 committed by Jan Hubicka
parent 1511c8c005
commit 09fcc0c01d
2 changed files with 41 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gcc/ChangeLog
View File

@ -1,3 +1,9 @@
2017-06-10 Jan Hubicka <hubicka@ucw.cz>
* ipa-inline-transform.c: Include function.h, cfg.h and basic-block.h
(mark_all_inlined_calls_cdtor): Fix formating.
(inline_transform): Rescale profile before inlining.
2017-06-10 Jan Hubicka <hubicka@ucw.cz>
* cgraph.h (cgraph_edge::clone): Update prototype.

37
gcc/ipa-inline-transform.c
View File

@ -44,6 +44,9 @@ along with GCC; see the file COPYING3. If not see
#include "ipa-fnsummary.h"
#include "ipa-inline.h"
#include "tree-inline.h"
#include "function.h"
#include "cfg.h"
#include "basic-block.h"
int ncalls_inlined;
int nfunctions_inlined;
@ -276,7 +279,7 @@ mark_all_inlined_calls_cdtor (cgraph_node *node)
{
cs->in_polymorphic_cdtor = true;
if (!cs->inline_failed)
mark_all_inlined_calls_cdtor (cs->callee);
mark_all_inlined_calls_cdtor (cs->callee);
}
for (cgraph_edge *cs = node->indirect_calls; cs; cs = cs->next_callee)
cs->in_polymorphic_cdtor = true;
@ -661,7 +664,37 @@ inline_transform (struct cgraph_node *node)
timevar_push (TV_INTEGRATION);
if (node->callees && (opt_for_fn (node->decl, optimize) || has_inline))
todo = optimize_inline_calls (current_function_decl);
{
profile_count num = node->count;
profile_count den = ENTRY_BLOCK_PTR_FOR_FN (cfun)->count;
bool scale = num.initialized_p ()
&& (den > 0 || num == profile_count::zero ())
&& !(num == den);
if (scale)
{
if (dump_file)
{
fprintf (dump_file, "Applying count scale ");
num.dump (dump_file);
fprintf (dump_file, "/");
den.dump (dump_file);
fprintf (dump_file, "\n");
}
basic_block bb;
FOR_ALL_BB_FN (bb, cfun)
{
bb->count = bb->count.apply_scale (num, den);
edge e;
edge_iterator ei;
FOR_EACH_EDGE (e, ei, bb->succs)
e->count = e->count.apply_scale (num, den);
}
ENTRY_BLOCK_PTR_FOR_FN (cfun)->count = node->count;
}
todo = optimize_inline_calls (current_function_decl);
}
timevar_pop (TV_INTEGRATION);
cfun->always_inline_functions_inlined = true;