ipa-inline.c (compute_uninlined_call_time, [...]): always use frequencies.

	* ipa-inline.c (compute_uninlined_call_time, compute_inlined_call_time):
	always use frequencies.

From-SVN: r254724

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index dbe4c0550894116bccc22d6f16500d11efb7580c..9740447ab98873147c5272f848922bf4f9bc8f29 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2017-11-13  Jan Hubicka  <hubicka@ucw.cz>
+
+       * ipa-inline.c (compute_uninlined_call_time, compute_inlined_call_time):
+       always use frequencies.
+
 2017-11-13  Jan Hubicka  <hubicka@ucw.cz>
 
        * bb-reorder.c: Remove frequencies from comments.

diff --git a/gcc/ipa-inline.c b/gcc/ipa-inline.c
index 8a2fd4baeeb5d4c27a81a87ae8ffef2346bad2e8..91bf8e67e8a228dc38d2711d2b45d8b5204abbfd 100644 (file)
--- a/gcc/ipa-inline.c
+++ b/gcc/ipa-inline.c
@@ -640,10 +640,6 @@ compute_uninlined_call_time (struct cgraph_edge *edge,
                         ? edge->caller->global.inlined_to
                         : edge->caller);
 
-  if (edge->count.ipa ().nonzero_p ()
-      && caller->count.ipa ().nonzero_p ())
-    uninlined_call_time *= (sreal)edge->count.ipa ().to_gcov_type ()
-                          / caller->count.ipa ().to_gcov_type ();
   sreal freq = edge->sreal_frequency ();
   if (freq != 0)
     uninlined_call_time *= freq;
@@ -666,9 +662,6 @@ compute_inlined_call_time (struct cgraph_edge *edge,
                         : edge->caller);
   sreal caller_time = ipa_fn_summaries->get (caller)->time;
 
-  if (edge->count.ipa ().nonzero_p ()
-      && caller->count.ipa ().nonzero_p ())
-    time *= (sreal)edge->count.to_gcov_type () / caller->count.to_gcov_type ();
   sreal freq = edge->sreal_frequency ();
   if (freq != 0)
     time *= freq;
@@ -1954,7 +1947,7 @@ inline_small_functions (void)
                   ? gimple_lineno ((const gimple *) edge->call_stmt)
                   : -1,
                   badness.to_double (),
-                  edge->frequency () / (double)CGRAPH_FREQ_BASE);
+                  edge->sreal_frequency ().to_double ());
          if (edge->count.ipa ().initialized_p ())
            {
              fprintf (dump_file, " Called ");