diff options
| author | Maxim Kuvyrkov <maxim@codesourcery.com> | 2011-11-15 03:46:08 +0000 |
|---|---|---|
| committer | Maxim Kuvyrkov <mkuvyrkov@gcc.gnu.org> | 2011-11-15 03:46:08 +0000 |
| commit | d2d668fbbb3625987fa4117e63df38fa745874bd (patch) | |
| tree | 1efbbc4ccd7ffb98f0069e2281a731e60cdb0fa3 /gcc/tree-inline.c | |
| parent | e3790e8a9f45bd38f4cf3aa1df6bbf1020b2931c (diff) | |
| download | gcc-d2d668fbbb3625987fa4117e63df38fa745874bd.zip gcc-d2d668fbbb3625987fa4117e63df38fa745874bd.tar.gz gcc-d2d668fbbb3625987fa4117e63df38fa745874bd.tar.bz2 | |
ipa-cp.c (ipa_value_from_jfunc): Make global.
* ipa-cp.c (ipa_value_from_jfunc): Make global.
(ipa_cst_from_jfunc): Remove, use ipa_value_from_jfunc instead.
(get_indirect_edge_target): Rename, make global.
(devirtualization_time_bonus, estimate_local_effects,)
(ipcp_discover_new_direct_edges): Update.
* ipa-inline-analysis.c (evaluate_conditions_for_edge):
Generalize to also handle types. Rename to ...
(evaluate_properties_for_edge): Use instead of
evaluate_conditions_for_edge.
(estimate_edge_devirt_benefit): New function.
(estimate_calls_size_and_time): Use it.
(estimate_node_size_and_time, estimate_ipcp_clone_size_and_time,)
(inline_merge_summary): Update.
(do_estimate_edge_time, do_estimate_edge_growth): Update. Calculate
parameter information at the call site and pass it on to subroutines.
* tree-inline.c (estimate_num_insns): Distinguish between direct and
indirect calls.
(init_inline_once): Set size and time costs or indirect calls.
* tree-inline.h (eni_weights): Add indirect_call_cost.
From-SVN: r181377
Diffstat (limited to 'gcc/tree-inline.c')
| -rw-r--r-- | gcc/tree-inline.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/gcc/tree-inline.c b/gcc/tree-inline.c index 7daa9d2..2260403 100644 --- a/gcc/tree-inline.c +++ b/gcc/tree-inline.c @@ -3521,7 +3521,7 @@ estimate_num_insns (gimple stmt, eni_weights *weights) case GIMPLE_CALL: { tree decl = gimple_call_fndecl (stmt); - struct cgraph_node *node; + struct cgraph_node *node = NULL; /* Do not special case builtins where we see the body. This just confuse inliner. */ @@ -3556,7 +3556,7 @@ estimate_num_insns (gimple stmt, eni_weights *weights) } } - cost = weights->call_cost; + cost = node ? weights->call_cost : weights->indirect_call_cost; if (gimple_call_lhs (stmt)) cost += estimate_move_cost (TREE_TYPE (gimple_call_lhs (stmt))); for (i = 0; i < gimple_call_num_args (stmt); i++) @@ -3674,6 +3674,7 @@ void init_inline_once (void) { eni_size_weights.call_cost = 1; + eni_size_weights.indirect_call_cost = 3; eni_size_weights.target_builtin_call_cost = 1; eni_size_weights.div_mod_cost = 1; eni_size_weights.omp_cost = 40; @@ -3686,6 +3687,7 @@ init_inline_once (void) underestimating the cost does less harm than overestimating it, so we choose a rather small value here. */ eni_time_weights.call_cost = 10; + eni_time_weights.indirect_call_cost = 15; eni_time_weights.target_builtin_call_cost = 1; eni_time_weights.div_mod_cost = 10; eni_time_weights.omp_cost = 40; |