procyberian/gcc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

profile-count.h (profile_count::max): Work on profiles of different type.

Browse source 
* 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
This commit is contained in:
Jan Hubicka 2019-11-28 17:58:24 +01:00 • committed by Jan Hubicka
parent 2dfd63ded8
commit 97dd1ee8de
2 changed files with 29 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
gcc/ChangeLog
View file

@ -1,3 +1,17 @@
2019-11-28 Jan Hubicka <hubicka@ucw.cz>
* 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 <hubicka@ucw.cz>
* 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 <mjambor@suse.cz>
PR ipa/92697

19
gcc/profile-count.h
View file

@ -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;
}