From 97dd1ee8de2ceb45b1572964bc2849d32cb2b322 Mon Sep 17 00:00:00 2001 From: Jan Hubicka Date: Thu, 28 Nov 2019 17:58:24 +0100 Subject: [PATCH] profile-count.h (profile_count::max): Work on profiles of different type. * profile-count.h (profile_count::max): Work on profiles of different type. (profile_count::apply_scale): Be sure that ret is not local or global0 type if num is global. From-SVN: r278813 --- gcc/ChangeLog | 14 ++++++++++++++ gcc/profile-count.h | 19 +++++++++++++++---- 2 files changed, 29 insertions(+), 4 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 60863539404..e842cd2648d 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,17 @@ +2019-11-28 Jan Hubicka + + * profile-count.h (profile_count::max): Work on profiles of different + type. + (profile_count::apply_scale): Be sure that ret is not local or global0 + type if num is global. + +2019-11-28 Jan Hubicka + + * profile-count.h (profile_count::max): Work on profiles of different + type. + (profile_count::apply_scale): Be sure that ret is not local or global0 + type if num is global. + 2019-11-28 Martin Jambor PR ipa/92697 diff --git a/gcc/profile-count.h b/gcc/profile-count.h index 967c5ec1a12..b79de83e479 100644 --- a/gcc/profile-count.h +++ b/gcc/profile-count.h @@ -992,6 +992,14 @@ public: profile_count max (profile_count other) const { + profile_count val = *this; + + /* Always prefer nonzero IPA counts over local counts. */ + if (ipa ().nonzero_p () || other.ipa ().nonzero_p ()) + { + val = ipa (); + other = other.ipa (); + } if (!initialized_p ()) return other; if (!other.initialized_p ()) @@ -1001,8 +1009,8 @@ public: if (other == zero ()) return *this; gcc_checking_assert (compatible_p (other)); - if (m_val < other.m_val || (m_val == other.m_val - && m_quality < other.m_quality)) + if (val.m_val < other.m_val || (m_val == other.m_val + && val.m_quality < other.m_quality)) return other; return *this; } @@ -1075,8 +1083,11 @@ public: ret.m_val = MIN (val, max_count); ret.m_quality = MIN (MIN (MIN (m_quality, ADJUSTED), num.m_quality), den.m_quality); - if (num.ipa_p () && !ret.ipa_p ()) - ret.m_quality = MIN (num.m_quality, GUESSED); + /* Be sure that ret is not local if num is global. + Also ensure that ret is not global0 when num is global. */ + if (num.ipa_p ()) + ret.m_quality = MAX (ret.m_quality, + num == num.ipa () ? GUESSED : num.m_quality); return ret; } -- 2.30.2