diff options
| author | Jan Hubicka <jh@suse.cz> | 2011-09-22 01:10:07 +0200 |
|---|---|---|
| committer | Jan Hubicka <hubicka@gcc.gnu.org> | 2011-09-21 23:10:07 +0000 |
| commit | b439486d5ea107753d27548edeb515bb4fee14e9 (patch) | |
| tree | 03d2df04611961b6960dba43f872601e7f44ad29 /gcc | |
| parent | e9fcc7074890e0be0a9ec7b2d17972ceea5aead4 (diff) | |
| download | gcc-b439486d5ea107753d27548edeb515bb4fee14e9.zip gcc-b439486d5ea107753d27548edeb515bb4fee14e9.tar.gz gcc-b439486d5ea107753d27548edeb515bb4fee14e9.tar.bz2 | |
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
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/ipa-inline-analysis.c | 5 | ||||
| -rw-r--r-- | gcc/ipa-inline.c | 5 | ||||
| -rw-r--r-- | gcc/ipa-inline.h | 2 |
4 files changed, 11 insertions, 7 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index ed4c4fc..4301b4c 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 fc954b3..f82052e 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 c10a618..304a4df 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 bba13b6..c129d28 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); } |