From 5159a1f1e91e03d4b82808a0062697318232543f Mon Sep 17 00:00:00 2001 From: Jan Hubicka Date: Tue, 14 Mar 2023 09:10:35 +0100 Subject: [PATCH] Fix overactive sanity check in profile_count::to_sreal_scale As discussed in the PR log, profile_count::to_cgraph_frequency was originally intended to work across function boundary and has some extra logic and sanity check for that. It is used only within single function and with current API it can not really work well globally, so this patch synchronizes its implementation with probability_in which does similar job but to determine relative probability. gcc/ChangeLog: 2023-03-14 Jan Hubicka PR tree-optimization/106896 * profile-count.cc (profile_count::to_sreal_scale): Synchronize implementatoin with probability_in; avoid some asserts. --- gcc/profile-count.cc | 34 +++++++++++----------------------- 1 file changed, 11 insertions(+), 23 deletions(-) diff --git a/gcc/profile-count.cc b/gcc/profile-count.cc index d05fef3fb003..16585045f8ea 100644 --- a/gcc/profile-count.cc +++ b/gcc/profile-count.cc @@ -325,6 +325,13 @@ profile_count::to_cgraph_frequency (profile_count entry_bb_count) const sreal profile_count::to_sreal_scale (profile_count in, bool *known) const { + if (*this == zero () + && !(in == zero ())) + { + if (known) + *known = true; + return 0; + } if (!initialized_p () || !in.initialized_p ()) { if (known) @@ -333,32 +340,13 @@ profile_count::to_sreal_scale (profile_count in, bool *known) const } if (known) *known = true; - /* Watch for cases where one count is IPA and other is not. */ - if (in.ipa ().initialized_p ()) - { - gcc_checking_assert (ipa ().initialized_p ()); - /* If current count is inter-procedurally 0 and IN is inter-procedurally - non-zero, return 0. */ - if (in.ipa ().nonzero_p () - && !ipa().nonzero_p ()) - return 0; - } - else - /* We can handle correctly 0 IPA count within locally estimated - profile, but otherwise we are lost and this should not happen. */ - gcc_checking_assert (!ipa ().initialized_p () || !ipa ().nonzero_p ()); - if (*this == zero ()) - return 0; - if (m_val == in.m_val) + if (*this == in) return 1; gcc_checking_assert (compatible_p (in)); - + if (m_val == in.m_val) + return 1; if (!in.m_val) - { - if (!m_val) - return 1; - return m_val * 4; - } + return m_val * 4; return (sreal)m_val / (sreal)in.m_val; } -- 2.47.2