From: Jan Hubicka <jh@suse.cz>
Date: Wed, 21 Sep 2011 23:10:07 +0000 (+0200)
Subject: ipa-inline.c (relative_time_benefit): Fix wrong bracketting.
X-Git-Tag: releases/gcc-4.7.0~3652
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=b439486d5ea107753d27548edeb515bb4fee14e9;p=thirdparty%2Fgcc.git

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 ed4c4fc84469..4301b4ccfe95 100644
--- 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 fc954b3d1017..f82052ebc5ca 100644
--- 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 c10a61822837..304a4df21115 100644
--- 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 bba13b6af46a..c129d28f239b 100644
--- 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);
 }