ipa-inline.c (relative_time_benefit): Fix wrong bracketting.

	* ipa-inline.c (relative_time_benefit): Fix wrong bracketting.
	* ipa-inline.h (estimate_edge_time): Fix pasto.
	* ipa-inline-analysis.c (do_estiamte_edge_time): Remove capping.

From-SVN: r179064

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index ed4c4fc8446911a657a0e2c8e435d42b6c806f8a..4301b4ccfe95d05452c4927fc18beaa50abba75b 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2011-09-21  Jan Hubicka  <jh@suse.cz>
+
+       * ipa-inline.c (relative_time_benefit): Fix wrong bracketting.
+       * ipa-inline.h (estimate_edge_time): Fix pasto.
+       * ipa-inline-analysis.c (do_estiamte_edge_time): Remove capping.
+
 2011-09-21  Jakub Jelinek  <jakub@redhat.com>
 
        * config/i386/i386.c (ix86_expand_sse_movcc): Use

diff --git a/gcc/ipa-inline-analysis.c b/gcc/ipa-inline-analysis.c
index fc954b3d101779c0dc115ef9ab7e7549c40cd66d..f82052ebc5cab00d38fb8c13c30523352109d322 100644 (file)
--- a/gcc/ipa-inline-analysis.c
+++ b/gcc/ipa-inline-analysis.c
@@ -2164,10 +2164,9 @@ do_estimate_edge_time (struct cgraph_edge *edge)
                               evaluate_conditions_for_edge (edge, true),
                               &size, &time);
 
-  ret = (((gcov_type)time - es->call_stmt_time) * edge->frequency
+  ret = (((gcov_type)time
+          - es->call_stmt_time) * edge->frequency
         + CGRAPH_FREQ_BASE / 2) / CGRAPH_FREQ_BASE;
-  if (ret > MAX_TIME)
-    ret = MAX_TIME;
 
   /* When caching, update the cache entry.  */
   if (edge_growth_cache)

diff --git a/gcc/ipa-inline.c b/gcc/ipa-inline.c
index c10a61822837c00d45fce13afe68f5a73094e1e5..304a4df211158925a0430ac6f968f93e81307ff0 100644 (file)
--- a/gcc/ipa-inline.c
+++ b/gcc/ipa-inline.c
@@ -710,9 +710,8 @@ relative_time_benefit (struct inline_summary *callee_info,
   uninlined_call_time =
     ((gcov_type)
      (callee_info->time
-      + inline_edge_summary (edge)->call_stmt_time
-      + CGRAPH_FREQ_BASE / 2) * edge->frequency
-     / CGRAPH_FREQ_BASE);
+      + inline_edge_summary (edge)->call_stmt_time) * edge->frequency
+     + CGRAPH_FREQ_BASE / 2) / CGRAPH_FREQ_BASE;
   /* Compute relative time benefit, i.e. how much the call becomes faster.
      ??? perhaps computing how much the caller+calle together become faster
      would lead to more realistic results.  */

diff --git a/gcc/ipa-inline.h b/gcc/ipa-inline.h
index bba13b6af46a5e3c19d59d5c31a87c54e888e608..c129d28f239bca7ae77fb47684221e09d3522de2 100644 (file)
--- a/gcc/ipa-inline.h
+++ b/gcc/ipa-inline.h
@@ -219,7 +219,7 @@ estimate_edge_time (struct cgraph_edge *edge)
   if ((int)VEC_length (edge_growth_cache_entry, edge_growth_cache) <= edge->uid
       || !(ret = VEC_index (edge_growth_cache_entry,
                            edge_growth_cache,
-                           edge->uid)->size))
+                           edge->uid)->time))
     return do_estimate_edge_time (edge);
   return ret - (ret > 0);
 }