Message ID | CY5PR21MB3542E50C76592E21B7207AB491519@CY5PR21MB3542.namprd21.prod.outlook.com |
---|---|
State | New |
Headers | show |
Series | Fix profile count comparison. | expand |
On Fri, Sep 23, 2022 at 8:53 PM Eugene Rozenfeld via Gcc-patches <gcc-patches@gcc.gnu.org> wrote: > > The comparison was incorrect when the counts weren't PRECISE. > For example, crossmodule-indir-call-topn-1.c was failing > with AutoFDO: when count_sum is 0 with quality AFDO, > count_sum > profile_count::zero() evaluates to true. Taking that > branch then leads to an assert in the call to to_sreal(). > > Tested on x86_64-pc-linux-gnu. OK > gcc/ChangeLog: > > * ipa-cp.cc (good_cloning_opportunity_p): Fix profile count comparison. > --- > gcc/ipa-cp.cc | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/gcc/ipa-cp.cc b/gcc/ipa-cp.cc > index 543a9334e2c..66bba71c068 100644 > --- a/gcc/ipa-cp.cc > +++ b/gcc/ipa-cp.cc > @@ -3338,9 +3338,9 @@ good_cloning_opportunity_p (struct cgraph_node *node, sreal time_benefit, > > ipa_node_params *info = ipa_node_params_sum->get (node); > int eval_threshold = opt_for_fn (node->decl, param_ipa_cp_eval_threshold); > - if (count_sum > profile_count::zero ()) > + if (count_sum.nonzero_p ()) > { > - gcc_assert (base_count > profile_count::zero ()); > + gcc_assert (base_count.nonzero_p ()); > sreal factor = count_sum.probability_in (base_count).to_sreal (); > sreal evaluation = (time_benefit * factor) / size_cost; > evaluation = incorporate_penalties (node, info, evaluation); > -- > 2.25.1
diff --git a/gcc/ipa-cp.cc b/gcc/ipa-cp.cc index 543a9334e2c..66bba71c068 100644 --- a/gcc/ipa-cp.cc +++ b/gcc/ipa-cp.cc @@ -3338,9 +3338,9 @@ good_cloning_opportunity_p (struct cgraph_node *node, sreal time_benefit, ipa_node_params *info = ipa_node_params_sum->get (node); int eval_threshold = opt_for_fn (node->decl, param_ipa_cp_eval_threshold); - if (count_sum > profile_count::zero ()) + if (count_sum.nonzero_p ()) { - gcc_assert (base_count > profile_count::zero ()); + gcc_assert (base_count.nonzero_p ()); sreal factor = count_sum.probability_in (base_count).to_sreal (); sreal evaluation = (time_benefit * factor) / size_cost; evaluation = incorporate_penalties (node, info, evaluation);