diff options
Diffstat (limited to 'gcc/cfghooks.c')
| -rw-r--r-- | gcc/cfghooks.c | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/gcc/cfghooks.c b/gcc/cfghooks.c index bcda422d89a..18dc49a035e 100644 --- a/gcc/cfghooks.c +++ b/gcc/cfghooks.c @@ -160,10 +160,10 @@ verify_flow_info (void) e->src->index, e->dest->index); err = 1; } - if (e->probability < 0 || e->probability > REG_BR_PROB_BASE) + if (!e->probability.verify ()) { - error ("verify_flow_info: Wrong probability of edge %i->%i %i", - e->src->index, e->dest->index, e->probability); + error ("verify_flow_info: Wrong probability of edge %i->%i", + e->src->index, e->dest->index); err = 1; } if (!e->count.verify ()) @@ -443,8 +443,6 @@ redirect_edge_succ_nodup (edge e, basic_block new_succ) { s->flags |= e->flags; s->probability += e->probability; - if (s->probability > REG_BR_PROB_BASE) - s->probability = REG_BR_PROB_BASE; s->count += e->count; /* FIXME: This should be called via a hook and only for IR_GIMPLE. */ redirect_edge_var_map_dup (s, e); @@ -640,7 +638,7 @@ split_edge (edge e) ret = cfg_hooks->split_edge (e); ret->count = count; ret->frequency = freq; - single_succ_edge (ret)->probability = REG_BR_PROB_BASE; + single_succ_edge (ret)->probability = profile_probability::always (); single_succ_edge (ret)->count = count; if (irr) @@ -1451,17 +1449,17 @@ account_profile_record (struct profile_record *record, int after_pass) basic_block bb; edge_iterator ei; edge e; - int sum; FOR_ALL_BB_FN (bb, cfun) { if (bb != EXIT_BLOCK_PTR_FOR_FN (cfun) && profile_status_for_fn (cfun) != PROFILE_ABSENT) { - sum = 0; + profile_probability sum = profile_probability::never (); FOR_EACH_EDGE (e, ei, bb->succs) sum += e->probability; - if (EDGE_COUNT (bb->succs) && abs (sum - REG_BR_PROB_BASE) > 100) + if (EDGE_COUNT (bb->succs) + && sum.differs_from_p (profile_probability::always ())) record->num_mismatched_freq_out[after_pass]++; profile_count lsum = profile_count::zero (); FOR_EACH_EDGE (e, ei, bb->succs) @@ -1472,7 +1470,7 @@ account_profile_record (struct profile_record *record, int after_pass) if (bb != ENTRY_BLOCK_PTR_FOR_FN (cfun) && profile_status_for_fn (cfun) != PROFILE_ABSENT) { - sum = 0; + int sum = 0; FOR_EACH_EDGE (e, ei, bb->preds) sum += EDGE_FREQUENCY (e); if (abs (sum - bb->frequency) > 100 |