diff options
| author | Jan Hubicka <hubicka@ucw.cz> | 2018-01-24 09:12:40 +0100 |
|---|---|---|
| committer | Jan Hubicka <hubicka@gcc.gnu.org> | 2018-01-24 08:12:40 +0000 |
| commit | 97c07987a6d8052c77125b5f9841abc1f937b3eb (patch) | |
| tree | 660c3f17e8e166b824b72c77a9eb809b2f20310e /gcc/tree-ssa-tail-merge.c | |
| parent | 3885527ddf9ea47d0eab8d2c3a503a8e8e01d97d (diff) | |
cfgcleanup.c (try_crossjump_to_edge): Use combine_with_count to merge probabilities.
* cfgcleanup.c (try_crossjump_to_edge): Use combine_with_count
to merge probabilities.
* predict.c (probably_never_executed): Also mark as cold functions
with global 0 profile and guessed local profile.
* profile-count.c (profile_probability::combine_with_count): New
member function.
* profile-count.h (profile_probability::operator*,
profile_probability::operator*=, profile_probability::operator/,
profile_probability::operator/=): Reduce precision to adjusted
and set value to guessed on contradictory divisions.
(profile_probability::combine_with_freq): Remove.
(profile_probability::combine_wiht_count): Declare.
(profile_count::force_nonzero):: Set to adjusted.
(profile_count::probability_in):: Set quality to adjusted.
* tree-ssa-tail-merge.c (replace_block_by): Use
combine_with_count.
From-SVN: r257010
Diffstat (limited to 'gcc/tree-ssa-tail-merge.c')
| -rw-r--r-- | gcc/tree-ssa-tail-merge.c | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/gcc/tree-ssa-tail-merge.c b/gcc/tree-ssa-tail-merge.c index d43f3fbf556..a687c3f28df 100644 --- a/gcc/tree-ssa-tail-merge.c +++ b/gcc/tree-ssa-tail-merge.c @@ -1570,17 +1570,8 @@ replace_block_by (basic_block bb1, basic_block bb2) /* If probabilities are same, we are done. If counts are nonzero we can distribute accordingly. In remaining cases just avreage the values and hope for the best. */ - if (e1->probability == e2->probability) - ; - else if (bb1->count.nonzero_p () || bb2->count.nonzero_p ()) - e2->probability - = e2->probability - * bb2->count.probability_in (bb1->count + bb2->count) - + e1->probability - * bb1->count.probability_in (bb1->count + bb2->count); - else - e2->probability = e2->probability * profile_probability::even () - + e1->probability * profile_probability::even (); + e2->probability = e1->probability.combine_with_count + (bb1->count, e2->probability, bb2->count); } bb2->count += bb1->count; |