git
/
gcc
mirror of git://gcc.gnu.org/git/gcc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ipa-inline.c (edge_badness): Cap edge->count at max_count for badness calculations. 

* ipa-inline.c (edge_badness): Cap edge->count at max_count for badness
	calculations.

From-SVN: r203897
This commit is contained in:
Paulo Matos 2013-10-21 15:41:46 +00:00 committed by Paulo Matos
parent b5c4ff7888
commit 0bff361040
2 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
gcc/ChangeLog
View File

@ -1,3 +1,8 @@
2013-10-21 Paulo Matos <pmatos@broadcom.com>
* ipa-inline.c (edge_badness): Cap edge->count at max_count for badness
calculations.
2013-10-21 Jeff Law <law@redhat.com> 2013-10-21 Jeff Law <law@redhat.com>
* tree-ssa-threadedge.c (thread_through_normal_block): New argument VISITED. * tree-ssa-threadedge.c (thread_through_normal_block): New argument VISITED.

14
gcc/ipa-inline.c
View File

@ -903,12 +903,16 @@ edge_badness (struct cgraph_edge *edge, bool dump)
{ {
sreal tmp, relbenefit_real, growth_real; sreal tmp, relbenefit_real, growth_real;
int relbenefit = relative_time_benefit (callee_info, edge, edge_time); int relbenefit = relative_time_benefit (callee_info, edge, edge_time);
/* Capping edge->count to max_count. edge->count can be larger than
max_count if an inline adds new edges which increase max_count
after max_count is computed. */
int edge_count = edge->count > max_count ? max_count : edge->count;
sreal_init (&relbenefit_real, relbenefit, 0); sreal_init (&relbenefit_real, relbenefit, 0);
sreal_init (&growth_real, growth, 0); sreal_init (&growth_real, growth, 0);
/* relative_edge_count. */ /* relative_edge_count. */
sreal_init (&tmp, edge->count, 0); sreal_init (&tmp, edge_count, 0);
sreal_div (&tmp, &tmp, &max_count_real); sreal_div (&tmp, &tmp, &max_count_real);
/* relative_time_benefit. */ /* relative_time_benefit. */
@ -921,16 +925,14 @@ edge_badness (struct cgraph_edge *edge, bool dump)
badness = -1 * sreal_to_int (&tmp); badness = -1 * sreal_to_int (&tmp);
/* Be sure that insanity of the profile won't lead to increasing counts
in the scalling and thus to overflow in the computation above. */
gcc_assert (max_count >= edge->count);
if (dump) if (dump)
{ {
fprintf (dump_file, fprintf (dump_file,
" %i (relative %f): profile info. Relative count %f" " %i (relative %f): profile info. Relative count %f%s"
" * Relative benefit %f\n", " * Relative benefit %f\n",
(int) badness, (double) badness / INT_MIN, (int) badness, (double) badness / INT_MIN,
(double) edge->count / max_count, (double) edge_count / max_count,
edge->count > max_count ? " (capped to max_count)" : "",
relbenefit * 100.0 / RELATIVE_TIME_BENEFIT_RANGE); relbenefit * 100.0 / RELATIVE_TIME_BENEFIT_RANGE);
} }
} }