caller_growth_limits (struct cgraph_edge *e)
{
struct cgraph_node *to = e->caller;
- struct cgraph_node *what = e->callee;
+ struct cgraph_node *what = cgraph_function_or_thunk_node (e->callee, NULL);
int newsize;
int limit = 0;
HOST_WIDE_INT stack_size_limit = 0, inlined_stack;
we immediately inline to. This is the most relaxed
interpretation of the rule "do not grow large functions
too much in order to prevent compiler from exploding". */
- do
+ while (true)
{
info = inline_summary (to);
if (limit < info->self_size)
stack_size_limit = info->estimated_self_stack_size;
if (to->global.inlined_to)
to = to->callers->caller;
+ else
+ break;
}
- while (to->global.inlined_to);
what_info = inline_summary (what);
return false;
}
+ if (!what_info->estimated_stack_size)
+ return true;
+
/* FIXME: Stack size limit often prevents inlining in Fortran programs
due to large i/o datastructures used by the Fortran front-end.
We ought to ignore this limit when we know that the edge is executed
on every invocation of the caller (i.e. its call statement dominates
exit block). We do not track this information, yet. */
- stack_size_limit += (stack_size_limit
+ stack_size_limit += ((gcov_type)stack_size_limit
* PARAM_VALUE (PARAM_STACK_FRAME_GROWTH) / 100);
inlined_stack = (outer_info->stack_frame_offset
can_inline_edge_p (struct cgraph_edge *e, bool report)
{
bool inlinable = true;
+ enum availability avail;
+ struct cgraph_node *callee
+ = cgraph_function_or_thunk_node (e->callee, &avail);
tree caller_tree = DECL_FUNCTION_SPECIFIC_OPTIMIZATION (e->caller->decl);
- tree callee_tree = DECL_FUNCTION_SPECIFIC_OPTIMIZATION (e->callee->decl);
+ tree callee_tree
+ = callee ? DECL_FUNCTION_SPECIFIC_OPTIMIZATION (callee->decl) : NULL;
+ struct function *caller_cfun = DECL_STRUCT_FUNCTION (e->caller->decl);
+ struct function *callee_cfun
+ = callee ? DECL_STRUCT_FUNCTION (callee->decl) : NULL;
+
+ if (!caller_cfun && e->caller->clone_of)
+ caller_cfun = DECL_STRUCT_FUNCTION (e->caller->clone_of->decl);
+
+ if (!callee_cfun && callee && callee->clone_of)
+ callee_cfun = DECL_STRUCT_FUNCTION (callee->clone_of->decl);
gcc_assert (e->inline_failed);
- if (!e->callee->analyzed)
+ if (!callee || !callee->analyzed)
{
e->inline_failed = CIF_BODY_NOT_AVAILABLE;
inlinable = false;
}
- else if (!inline_summary (e->callee)->inlinable)
+ else if (!inline_summary (callee)->inlinable)
{
e->inline_failed = CIF_FUNCTION_NOT_INLINABLE;
inlinable = false;
}
- else if (cgraph_function_body_availability (e->callee) <= AVAIL_OVERWRITABLE)
+ else if (avail <= AVAIL_OVERWRITABLE)
{
e->inline_failed = CIF_OVERWRITABLE;
return false;
}
/* Don't inline if the functions have different EH personalities. */
else if (DECL_FUNCTION_PERSONALITY (e->caller->decl)
- && DECL_FUNCTION_PERSONALITY (e->callee->decl)
+ && DECL_FUNCTION_PERSONALITY (callee->decl)
&& (DECL_FUNCTION_PERSONALITY (e->caller->decl)
- != DECL_FUNCTION_PERSONALITY (e->callee->decl)))
+ != DECL_FUNCTION_PERSONALITY (callee->decl)))
{
e->inline_failed = CIF_EH_PERSONALITY;
inlinable = false;
}
+ /* TM pure functions should not be inlined into non-TM_pure
+ functions. */
+ else if (is_tm_pure (callee->decl)
+ && !is_tm_pure (e->caller->decl))
+ {
+ e->inline_failed = CIF_UNSPECIFIED;
+ inlinable = false;
+ }
/* Don't inline if the callee can throw non-call exceptions but the
caller cannot.
FIXME: this is obviously wrong for LTO where STRUCT_FUNCTION is missing.
Move the flag into cgraph node or mirror it in the inline summary. */
- else if (DECL_STRUCT_FUNCTION (e->callee->decl)
- && DECL_STRUCT_FUNCTION (e->callee->decl)->can_throw_non_call_exceptions
- && !(DECL_STRUCT_FUNCTION (e->caller->decl)
- && DECL_STRUCT_FUNCTION (e->caller->decl)->can_throw_non_call_exceptions))
+ else if (callee_cfun && callee_cfun->can_throw_non_call_exceptions
+ && !(caller_cfun && caller_cfun->can_throw_non_call_exceptions))
{
e->inline_failed = CIF_NON_CALL_EXCEPTIONS;
inlinable = false;
}
/* Check compatibility of target optimization options. */
else if (!targetm.target_option.can_inline_p (e->caller->decl,
- e->callee->decl))
+ callee->decl))
{
e->inline_failed = CIF_TARGET_OPTION_MISMATCH;
inlinable = false;
}
/* Check if caller growth allows the inlining. */
- else if (!DECL_DISREGARD_INLINE_LIMITS (e->callee->decl)
+ else if (!DECL_DISREGARD_INLINE_LIMITS (callee->decl)
+ && !lookup_attribute ("flatten",
+ DECL_ATTRIBUTES
+ (e->caller->global.inlined_to
+ ? e->caller->global.inlined_to->decl
+ : e->caller->decl))
&& !caller_growth_limits (e))
inlinable = false;
/* Don't inline a function with a higher optimization level than the
? callee_tree
: optimization_default_node);
- if ((caller_opt->x_optimize > callee_opt->x_optimize)
- || (caller_opt->x_optimize_size != callee_opt->x_optimize_size))
+ if (((caller_opt->x_optimize > callee_opt->x_optimize)
+ || (caller_opt->x_optimize_size != callee_opt->x_optimize_size))
+ /* gcc.dg/pr43564.c. Look at forced inline even in -O0. */
+ && !DECL_DISREGARD_INLINE_LIMITS (e->callee->decl))
{
- e->inline_failed = CIF_TARGET_OPTIMIZATION_MISMATCH;
+ e->inline_failed = CIF_OPTIMIZATION_MISMATCH;
inlinable = false;
}
}
- /* Be sure that the cannot_inline_p flag is up to date. */
- gcc_checking_assert (!e->call_stmt
- || (gimple_call_cannot_inline_p (e->call_stmt)
- == e->call_stmt_cannot_inline_p)
- /* In -flto-partition=none mode we really keep things out of
- sync because call_stmt_cannot_inline_p is set at cgraph
- merging when function bodies are not there yet. */
- || (in_lto_p && !gimple_call_cannot_inline_p (e->call_stmt)));
if (!inlinable && report)
report_inline_failed_reason (e);
return inlinable;
static bool
can_early_inline_edge_p (struct cgraph_edge *e)
{
+ struct cgraph_node *callee = cgraph_function_or_thunk_node (e->callee,
+ NULL);
/* Early inliner might get called at WPA stage when IPA pass adds new
function. In this case we can not really do any of early inlining
because function bodies are missing. */
- if (!gimple_has_body_p (e->callee->decl))
+ if (!gimple_has_body_p (callee->decl))
{
e->inline_failed = CIF_BODY_NOT_AVAILABLE;
return false;
the callee by early inliner, yet). We don't have CIF code for this
case; later we will re-do the decision in the real inliner. */
if (!gimple_in_ssa_p (DECL_STRUCT_FUNCTION (e->caller->decl))
- || !gimple_in_ssa_p (DECL_STRUCT_FUNCTION (e->callee->decl)))
+ || !gimple_in_ssa_p (DECL_STRUCT_FUNCTION (callee->decl)))
{
if (dump_file)
fprintf (dump_file, " edge not inlinable: not in SSA form\n");
want_early_inline_function_p (struct cgraph_edge *e)
{
bool want_inline = true;
+ struct cgraph_node *callee = cgraph_function_or_thunk_node (e->callee, NULL);
- if (DECL_DISREGARD_INLINE_LIMITS (e->callee->decl))
+ if (DECL_DISREGARD_INLINE_LIMITS (callee->decl))
;
- else if (!DECL_DECLARED_INLINE_P (e->callee->decl)
+ else if (!DECL_DECLARED_INLINE_P (callee->decl)
&& !flag_inline_small_functions)
{
e->inline_failed = CIF_FUNCTION_NOT_INLINE_CANDIDATE;
fprintf (dump_file, " will not early inline: %s/%i->%s/%i, "
"call is cold and code would grow by %i\n",
cgraph_node_name (e->caller), e->caller->uid,
- cgraph_node_name (e->callee), e->callee->uid,
+ cgraph_node_name (callee), callee->uid,
growth);
want_inline = false;
}
- else if (!leaf_node_p (e->callee)
+ else if (!leaf_node_p (callee)
&& growth > 0)
{
if (dump_file)
fprintf (dump_file, " will not early inline: %s/%i->%s/%i, "
"callee is not leaf and code would grow by %i\n",
cgraph_node_name (e->caller), e->caller->uid,
- cgraph_node_name (e->callee), e->callee->uid,
+ cgraph_node_name (callee), callee->uid,
growth);
want_inline = false;
}
fprintf (dump_file, " will not early inline: %s/%i->%s/%i, "
"growth %i exceeds --param early-inlining-insns\n",
cgraph_node_name (e->caller), e->caller->uid,
- cgraph_node_name (e->callee), e->callee->uid,
+ cgraph_node_name (callee), callee->uid,
growth);
want_inline = false;
}
want_inline_small_function_p (struct cgraph_edge *e, bool report)
{
bool want_inline = true;
+ struct cgraph_node *callee = cgraph_function_or_thunk_node (e->callee, NULL);
- if (DECL_DISREGARD_INLINE_LIMITS (e->callee->decl))
+ if (DECL_DISREGARD_INLINE_LIMITS (callee->decl))
;
- else if (!DECL_DECLARED_INLINE_P (e->callee->decl)
+ else if (!DECL_DECLARED_INLINE_P (callee->decl)
&& !flag_inline_small_functions)
{
e->inline_failed = CIF_FUNCTION_NOT_INLINE_CANDIDATE;
if (growth <= 0)
;
- else if (DECL_DECLARED_INLINE_P (e->callee->decl)
+ else if (DECL_DECLARED_INLINE_P (callee->decl)
&& growth >= MAX_INLINE_INSNS_SINGLE)
{
e->inline_failed = CIF_MAX_INLINE_INSNS_SINGLE_LIMIT;
want_inline = false;
}
- else if (!DECL_DECLARED_INLINE_P (e->callee->decl)
+ /* Before giving up based on fact that caller size will grow, allow
+ functions that are called few times and eliminating the offline
+ copy will lead to overall code size reduction.
+ Not all of these will be handled by subsequent inlining of functions
+ called once: in particular weak functions are not handled or funcitons
+ that inline to multiple calls but a lot of bodies is optimized out.
+ Finally we want to inline earlier to allow inlining of callbacks.
+
+ This is slightly wrong on aggressive side: it is entirely possible
+ that function is called many times with a context where inlining
+ reduces code size and few times with a context where inlining increase
+ code size. Resoluting growth estimate will be negative even if it
+ would make more sense to keep offline copy and do not inline into the
+ call sites that makes the code size grow.
+
+ When badness orders the calls in a way that code reducing calls come
+ first, this situation is not a problem at all: after inlining all
+ "good" calls, we will realize that keeping the function around is
+ better. */
+ else if (growth <= MAX_INLINE_INSNS_SINGLE
+ /* Unlike for functions called once, we play unsafe with
+ COMDATs. We can allow that since we know functions
+ in consideration are small (and thus risk is small) and
+ moreover grow estimates already accounts that COMDAT
+ functions may or may not disappear when eliminated from
+ current unit. With good probability making aggressive
+ choice in all units is going to make overall program
+ smaller.
+
+ Consequently we ask cgraph_can_remove_if_no_direct_calls_p
+ instead of
+ cgraph_will_be_removed_from_program_if_no_direct_calls */
+ && !DECL_EXTERNAL (callee->decl)
+ && cgraph_can_remove_if_no_direct_calls_p (callee)
+ && estimate_growth (callee) <= 0)
+ ;
+ else if (!DECL_DECLARED_INLINE_P (callee->decl)
&& !flag_inline_functions)
{
e->inline_failed = CIF_NOT_DECLARED_INLINED;
want_inline = false;
}
- else if (!DECL_DECLARED_INLINE_P (e->callee->decl)
+ else if (!DECL_DECLARED_INLINE_P (callee->decl)
&& growth >= MAX_INLINE_INSNS_AUTO)
{
e->inline_failed = CIF_MAX_INLINE_INSNS_AUTO_LIMIT;
want_inline = false;
}
- else if (!cgraph_maybe_hot_edge_p (e)
- && estimate_growth (e->callee) > 0)
+ /* If call is cold, do not inline when function body would grow. */
+ else if (!cgraph_maybe_hot_edge_p (e))
{
e->inline_failed = CIF_UNLIKELY_CALL;
want_inline = false;
int caller_freq = CGRAPH_FREQ_BASE;
int max_depth = PARAM_VALUE (PARAM_MAX_INLINE_RECURSIVE_DEPTH_AUTO);
- if (DECL_DECLARED_INLINE_P (edge->callee->decl))
+ if (DECL_DECLARED_INLINE_P (edge->caller->decl))
max_depth = PARAM_VALUE (PARAM_MAX_INLINE_RECURSIVE_DEPTH);
if (!cgraph_maybe_hot_edge_p (edge))
return want_inline;
}
+/* Return true when NODE has caller other than EDGE.
+ Worker for cgraph_for_node_and_aliases. */
+
+static bool
+check_caller_edge (struct cgraph_node *node, void *edge)
+{
+ return (node->callers
+ && node->callers != edge);
+}
+
/* Decide if NODE is called once inlining it would eliminate need
for the offline copy of function. */
static bool
want_inline_function_called_once_p (struct cgraph_node *node)
{
+ struct cgraph_node *function = cgraph_function_or_thunk_node (node, NULL);
/* Already inlined? */
- if (node->global.inlined_to)
+ if (function->global.inlined_to)
return false;
/* Zero or more then one callers? */
if (!node->callers
|| node->callers->next_caller)
return false;
+ /* Maybe other aliases has more direct calls. */
+ if (cgraph_for_node_and_aliases (node, check_caller_edge, node->callers, true))
+ return false;
/* Recursive call makes no sense to inline. */
- if (node->callers->caller == node)
+ if (cgraph_edge_recursive_p (node->callers))
return false;
/* External functions are not really in the unit, so inlining
them when called once would just increase the program size. */
- if (DECL_EXTERNAL (node->decl))
+ if (DECL_EXTERNAL (function->decl))
return false;
/* Offline body must be optimized out. */
- if (!cgraph_will_be_removed_from_program_if_no_direct_calls (node))
+ if (!cgraph_will_be_removed_from_program_if_no_direct_calls (function))
return false;
if (!can_inline_edge_p (node->callers, true))
return false;
return true;
}
+
+/* Return relative time improvement for inlining EDGE in range
+ 1...2^9. */
+
+static inline int
+relative_time_benefit (struct inline_summary *callee_info,
+ struct cgraph_edge *edge,
+ int time_growth)
+{
+ int relbenefit;
+ gcov_type uninlined_call_time;
+
+ uninlined_call_time =
+ ((gcov_type)
+ (callee_info->time
+ + 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. */
+ if (!uninlined_call_time)
+ uninlined_call_time = 1;
+ relbenefit =
+ (uninlined_call_time - time_growth) * 256 / (uninlined_call_time);
+ relbenefit = MIN (relbenefit, 512);
+ relbenefit = MAX (relbenefit, 1);
+ return relbenefit;
+}
+
+
/* A cost model driving the inlining heuristics in a way so the edges with
smallest badness are inlined first. After each inlining is performed
the costs of all caller edges of nodes affected are recomputed so the
{
gcov_type badness;
int growth, time_growth;
- struct inline_summary *callee_info = inline_summary (edge->callee);
+ struct cgraph_node *callee = cgraph_function_or_thunk_node (edge->callee,
+ NULL);
+ struct inline_summary *callee_info = inline_summary (callee);
- if (DECL_DISREGARD_INLINE_LIMITS (edge->callee->decl))
+ if (DECL_DISREGARD_INLINE_LIMITS (callee->decl))
return INT_MIN;
growth = estimate_edge_growth (edge);
{
fprintf (dump_file, " Badness calculation for %s -> %s\n",
cgraph_node_name (edge->caller),
- cgraph_node_name (edge->callee));
- fprintf (dump_file, " growth size %i, time %i\n",
+ cgraph_node_name (callee));
+ fprintf (dump_file, " size growth %i, time growth %i\n",
growth,
time_growth);
}
/* Always prefer inlining saving code size. */
if (growth <= 0)
{
- badness = INT_MIN - growth;
+ badness = INT_MIN / 2 + growth;
if (dump)
- fprintf (dump_file, " %i: Growth %i < 0\n", (int) badness,
+ fprintf (dump_file, " %i: Growth %i <= 0\n", (int) badness,
growth);
}
- /* When profiling is available, base priorities -(#calls / growth).
- So we optimize for overall number of "executed" inlined calls. */
+ /* When profiling is available, compute badness as:
+
+ relative_edge_count * relative_time_benefit
+ goodness = -------------------------------------------
+ edge_growth
+ badness = -goodness
+
+ The fraction is upside down, becuase on edge counts and time beneits
+ the bounds are known. Edge growth is essentially unlimited. */
+
else if (max_count)
{
- int benefitperc;
- benefitperc = (((gcov_type)callee_info->time
- * edge->frequency / CGRAPH_FREQ_BASE - time_growth) * 100
- / (callee_info->time + 1) + 1);
- benefitperc = MIN (benefitperc, 100);
- benefitperc = MAX (benefitperc, 0);
+ int relbenefit = relative_time_benefit (callee_info, edge, time_growth);
badness =
((int)
- ((double) edge->count * INT_MIN / max_count / 100) *
- benefitperc) / growth;
+ ((double) edge->count * INT_MIN / 2 / max_count / 512) *
+ relative_time_benefit (callee_info, edge, time_growth)) / growth;
/* Be sure that insanity of the profile won't lead to increasing counts
in the scalling and thus to overflow in the computation above. */
" * Relative benefit %f\n",
(int) badness, (double) badness / INT_MIN,
(double) edge->count / max_count,
- (double) benefitperc);
+ relbenefit * 100 / 256.0);
}
}
- /* When function local profile is available, base priorities on
- growth / frequency, so we optimize for overall frequency of inlined
- calls. This is not too accurate since while the call might be frequent
- within function, the function itself is infrequent.
+ /* When function local profile is available. Compute badness as:
- Other objective to optimize for is number of different calls inlined.
- We add the estimated growth after inlining all functions to bias the
- priorities slightly in this direction (so fewer times called functions
- of the same size gets priority). */
+
+ growth_of_callee
+ badness = -------------------------------------- + growth_for-all
+ relative_time_benefit * edge_frequency
+
+ */
else if (flag_guess_branch_prob)
{
- int div = edge->frequency * 100 / CGRAPH_FREQ_BASE + 1;
- int benefitperc;
- int growth_for_all;
- badness = growth * 10000;
- benefitperc = (((gcov_type)callee_info->time
- * edge->frequency / CGRAPH_FREQ_BASE - time_growth) * 100
- / (callee_info->time + 1) + 1);
- benefitperc = MIN (benefitperc, 100);
- benefitperc = MAX (benefitperc, 0);
- div *= benefitperc;
-
- /* Decrease badness if call is nested. */
- /* Compress the range so we don't overflow. */
- if (div > 10000)
- div = 10000 + ceil_log2 (div) - 8;
- if (div < 1)
- div = 1;
- if (badness > 0)
- badness /= div;
- growth_for_all = estimate_growth (edge->callee);
- badness += growth_for_all;
- if (badness > INT_MAX)
- badness = INT_MAX;
+ int div = edge->frequency * (1<<10) / CGRAPH_FREQ_MAX;
+
+ div = MAX (div, 1);
+ gcc_checking_assert (edge->frequency <= CGRAPH_FREQ_MAX);
+ div *= relative_time_benefit (callee_info, edge, time_growth);
+
+ /* frequency is normalized in range 1...2^10.
+ relbenefit in range 1...2^9
+ DIV should be in range 1....2^19. */
+ gcc_checking_assert (div >= 1 && div <= (1<<19));
+
+ /* Result must be integer in range 0...INT_MAX.
+ Set the base of fixed point calculation so we don't lose much of
+ precision for small bandesses (those are interesting) yet we don't
+ overflow for growths that are still in interesting range.
+
+ Fixed point arithmetic with point at 8th bit. */
+ badness = ((gcov_type)growth) * (1<<(19+8));
+ badness = (badness + div / 2) / div;
+
+ /* Overall growth of inlining all calls of function matters: we want to
+ inline so offline copy of function is no longer needed.
+
+ Additionally functions that can be fully inlined without much of
+ effort are better inline candidates than functions that can be fully
+ inlined only after noticeable overall unit growths. The latter
+ are better in a sense compressing of code size by factoring out common
+ code into separate function shared by multiple code paths.
+
+ We might mix the valud into the fraction by taking into account
+ relative growth of the unit, but for now just add the number
+ into resulting fraction. */
+ if (badness > INT_MAX / 2)
+ {
+ badness = INT_MAX / 2;
+ if (dump)
+ fprintf (dump_file, "Badness overflow\n");
+ }
if (dump)
{
fprintf (dump_file,
- " %i: guessed profile. frequency %i, overall growth %i,"
- " benefit %i%%, divisor %i\n",
- (int) badness, edge->frequency, growth_for_all,
- benefitperc, div);
+ " %i: guessed profile. frequency %f,"
+ " benefit %f%%, divisor %i\n",
+ (int) badness, (double)edge->frequency / CGRAPH_FREQ_BASE,
+ relative_time_benefit (callee_info, edge, time_growth) * 100 / 256.0, div);
}
}
/* When function local profile is not available or it does not give
else
{
int nest = MIN (inline_edge_summary (edge)->loop_depth, 8);
- badness = estimate_growth (edge->callee) * 256;
+ badness = growth * 256;
/* Decrease badness if call is nested. */
if (badness > 0)
a minimum of heap. */
if (badness < n->key)
{
- fibheap_replace_key (heap, n, badness);
if (dump_file && (dump_flags & TDF_DETAILS))
{
fprintf (dump_file,
(int)n->key,
badness);
}
+ fibheap_replace_key (heap, n, badness);
gcc_checking_assert (n->key == badness);
}
}
}
}
-/* Recompute heap nodes for each of caller edge. */
+
+/* NODE was inlined.
+ All caller edges needs to be resetted because
+ size estimates change. Similarly callees needs reset
+ because better context may be known. */
+
+static void
+reset_edge_caches (struct cgraph_node *node)
+{
+ struct cgraph_edge *edge;
+ struct cgraph_edge *e = node->callees;
+ struct cgraph_node *where = node;
+ int i;
+ struct ipa_ref *ref;
+
+ if (where->global.inlined_to)
+ where = where->global.inlined_to;
+
+ /* WHERE body size has changed, the cached growth is invalid. */
+ reset_node_growth_cache (where);
+
+ for (edge = where->callers; edge; edge = edge->next_caller)
+ if (edge->inline_failed)
+ reset_edge_growth_cache (edge);
+ for (i = 0; ipa_ref_list_refering_iterate (&where->ref_list, i, ref); i++)
+ if (ref->use == IPA_REF_ALIAS)
+ reset_edge_caches (ipa_ref_refering_node (ref));
+
+ if (!e)
+ return;
+
+ while (true)
+ if (!e->inline_failed && e->callee->callees)
+ e = e->callee->callees;
+ else
+ {
+ if (e->inline_failed)
+ reset_edge_growth_cache (e);
+ if (e->next_callee)
+ e = e->next_callee;
+ else
+ {
+ do
+ {
+ if (e->caller == node)
+ return;
+ e = e->caller->callers;
+ }
+ while (!e->next_callee);
+ e = e->next_callee;
+ }
+ }
+}
+
+/* Recompute HEAP nodes for each of caller of NODE.
+ UPDATED_NODES track nodes we already visited, to avoid redundant work.
+ When CHECK_INLINABLITY_FOR is set, re-check for specified edge that
+ it is inlinable. Otherwise check all edges. */
static void
update_caller_keys (fibheap_t heap, struct cgraph_node *node,
- bitmap updated_nodes)
+ bitmap updated_nodes,
+ struct cgraph_edge *check_inlinablity_for)
{
struct cgraph_edge *edge;
+ int i;
+ struct ipa_ref *ref;
- if (!inline_summary (node)->inlinable
+ if ((!node->alias && !inline_summary (node)->inlinable)
|| cgraph_function_body_availability (node) <= AVAIL_OVERWRITABLE
|| node->global.inlined_to)
return;
if (!bitmap_set_bit (updated_nodes, node->uid))
return;
- reset_node_growth_cache (node);
- /* See if there is something to do. */
- for (edge = node->callers; edge; edge = edge->next_caller)
- if (edge->inline_failed)
- break;
- if (!edge)
- return;
+ for (i = 0; ipa_ref_list_refering_iterate (&node->ref_list, i, ref); i++)
+ if (ref->use == IPA_REF_ALIAS)
+ {
+ struct cgraph_node *alias = ipa_ref_refering_node (ref);
+ update_caller_keys (heap, alias, updated_nodes, check_inlinablity_for);
+ }
- for (; edge; edge = edge->next_caller)
+ for (edge = node->callers; edge; edge = edge->next_caller)
if (edge->inline_failed)
{
- reset_edge_growth_cache (edge);
- if (can_inline_edge_p (edge, false)
- && want_inline_small_function_p (edge, false))
- update_edge_key (heap, edge);
- else if (edge->aux)
+ if (!check_inlinablity_for
+ || check_inlinablity_for == edge)
{
- report_inline_failed_reason (edge);
- fibheap_delete_node (heap, (fibnode_t) edge->aux);
- edge->aux = NULL;
+ if (can_inline_edge_p (edge, false)
+ && want_inline_small_function_p (edge, false))
+ update_edge_key (heap, edge);
+ else if (edge->aux)
+ {
+ report_inline_failed_reason (edge);
+ fibheap_delete_node (heap, (fibnode_t) edge->aux);
+ edge->aux = NULL;
+ }
}
+ else if (edge->aux)
+ update_edge_key (heap, edge);
}
}
-/* Recompute heap nodes for each uninlined call.
+/* Recompute HEAP nodes for each uninlined call in NODE.
This is used when we know that edge badnesses are going only to increase
(we introduced new call site) and thus all we need is to insert newly
created edges into heap. */
{
struct cgraph_edge *e = node->callees;
- reset_node_growth_cache (node);
-
if (!e)
return;
while (true)
e = e->callee->callees;
else
{
- reset_edge_growth_cache (e);
+ enum availability avail;
+ struct cgraph_node *callee;
+ /* We do not reset callee growth cache here. Since we added a new call,
+ growth chould have just increased and consequentely badness metric
+ don't need updating. */
if (e->inline_failed
- && inline_summary (e->callee)->inlinable
- && cgraph_function_body_availability (e->callee) >= AVAIL_AVAILABLE
- && !bitmap_bit_p (updated_nodes, e->callee->uid))
+ && (callee = cgraph_function_or_thunk_node (e->callee, &avail))
+ && inline_summary (callee)->inlinable
+ && cgraph_function_body_availability (callee) >= AVAIL_AVAILABLE
+ && !bitmap_bit_p (updated_nodes, callee->uid))
{
- reset_node_growth_cache (node);
- update_edge_key (heap, e);
+ if (can_inline_edge_p (e, false)
+ && want_inline_small_function_p (e, false))
+ update_edge_key (heap, e);
+ else if (e->aux)
+ {
+ report_inline_failed_reason (e);
+ fibheap_delete_node (heap, (fibnode_t) e->aux);
+ e->aux = NULL;
+ }
}
if (e->next_callee)
e = e->next_callee;
bitmap updated_nodes)
{
struct cgraph_edge *e = node->callees;
-
- reset_node_growth_cache (node);
-
if (!e)
return;
while (true)
e = e->callee->callees;
else
{
+ struct cgraph_node *callee = cgraph_function_or_thunk_node (e->callee,
+ NULL);
+
+ /* We inlined and thus callees might have different number of calls.
+ Reset their caches */
+ reset_node_growth_cache (callee);
if (e->inline_failed)
- update_caller_keys (heap, e->callee, updated_nodes);
+ update_caller_keys (heap, callee, updated_nodes, e);
if (e->next_callee)
e = e->next_callee;
else
fibheap_t heap)
{
struct cgraph_edge *e;
+ enum availability avail;
+
for (e = where->callees; e; e = e->next_callee)
- if (e->callee == node)
+ if (e->callee == node
+ || (cgraph_function_or_thunk_node (e->callee, &avail) == node
+ && avail > AVAIL_OVERWRITABLE))
{
/* When profile feedback is available, prioritize by expected number
of calls. */
depth = 1;
for (cnode = curr->caller;
cnode->global.inlined_to; cnode = cnode->callers->caller)
- if (node->decl == curr->callee->decl)
- depth++;
+ if (node->decl
+ == cgraph_function_or_thunk_node (curr->callee, NULL)->decl)
+ depth++;
if (!want_inline_self_recursive_call_p (curr, node, false, depth))
continue;
/* We need original clone to copy around. */
master_clone = cgraph_clone_node (node, node->decl,
node->count, CGRAPH_FREQ_BASE,
- false, NULL);
+ false, NULL, true);
for (e = master_clone->callees; e; e = e->next_callee)
if (!e->inline_failed)
clone_inlined_nodes (e, true, false, NULL);
struct cgraph_edge *edge = VEC_pop (cgraph_edge_p, new_edges);
gcc_assert (!edge->aux);
- if (inline_summary (edge->callee)->inlinable
- && edge->inline_failed
+ if (edge->inline_failed
&& can_inline_edge_p (edge, true)
&& want_inline_small_function_p (edge, true))
edge->aux = fibheap_insert (heap, edge_badness (edge, false), edge);
max_count = 0;
initialize_growth_caches ();
- for (node = cgraph_nodes; node; node = node->next)
- if (node->analyzed
- && !node->global.inlined_to)
+ FOR_EACH_DEFINED_FUNCTION (node)
+ if (!node->global.inlined_to)
{
- struct inline_summary *info = inline_summary (node);
+ if (cgraph_function_with_gimple_body_p (node)
+ || node->thunk.thunk_p)
+ {
+ struct inline_summary *info = inline_summary (node);
- if (!DECL_EXTERNAL (node->decl))
- initial_size += info->size;
+ if (!DECL_EXTERNAL (node->decl))
+ initial_size += info->size;
+ }
for (edge = node->callers; edge; edge = edge->next_caller)
if (max_count < edge->count)
/* Populate the heeap with all edges we might inline. */
- for (node = cgraph_nodes; node; node = node->next)
- if (node->analyzed
- && !node->global.inlined_to)
+ FOR_EACH_DEFINED_FUNCTION (node)
+ if (!node->global.inlined_to)
{
if (dump_file)
fprintf (dump_file, "Enqueueing calls of %s/%i.\n",
struct cgraph_node *where, *callee;
int badness = fibheap_min_key (heap);
int current_badness;
+ int cached_badness;
int growth;
edge = (struct cgraph_edge *) fibheap_extract_min (heap);
if (!edge->inline_failed)
continue;
+ /* Be sure that caches are maintained consistent.
+ We can not make this ENABLE_CHECKING only because it cause differnt
+ updates of the fibheap queue. */
+ cached_badness = edge_badness (edge, false);
+ reset_edge_growth_cache (edge);
+ reset_node_growth_cache (edge->callee);
+
/* When updating the edge costs, we only decrease badness in the keys.
Increases of badness are handled lazilly; when we see key with out
of date value on it, we re-insert it now. */
current_badness = edge_badness (edge, false);
+ gcc_assert (cached_badness == current_badness);
gcc_assert (current_badness >= badness);
if (current_badness != badness)
{
if (!can_inline_edge_p (edge, true))
continue;
- callee = edge->callee;
+ callee = cgraph_function_or_thunk_node (edge->callee, NULL);
growth = estimate_edge_growth (edge);
if (dump_file)
{
fprintf (dump_file,
"\nConsidering %s with %i size\n",
- cgraph_node_name (edge->callee),
- inline_summary (edge->callee)->size);
+ cgraph_node_name (callee),
+ inline_summary (callee)->size);
fprintf (dump_file,
" to be inlined into %s in %s:%i\n"
" Estimated growth after inlined into all is %+i insns.\n"
: gimple_filename ((const_gimple) edge->call_stmt),
flag_wpa ? -1
: gimple_lineno ((const_gimple) edge->call_stmt),
- estimate_growth (edge->callee),
+ estimate_growth (callee),
badness,
edge->frequency / (double)CGRAPH_FREQ_BASE);
if (edge->count)
}
if (overall_size + growth > max_size
- && !DECL_DISREGARD_INLINE_LIMITS (edge->callee->decl))
+ && !DECL_DISREGARD_INLINE_LIMITS (callee->decl))
{
edge->inline_failed = CIF_INLINE_UNIT_GROWTH_LIMIT;
report_inline_failed_reason (edge);
edge->inline_failed = CIF_RECURSIVE_INLINING;
continue;
}
+ reset_edge_caches (where);
/* Recursive inliner inlines all recursive calls of the function
at once. Consequently we need to update all callee keys. */
if (flag_indirect_inlining)
}
else
{
- struct cgraph_node *callee;
struct cgraph_node *outer_node = NULL;
int depth = 0;
where = edge->caller;
while (where->global.inlined_to)
{
- if (where->decl == edge->callee->decl)
+ if (where->decl == callee->decl)
outer_node = where, depth++;
where = where->callers->caller;
}
else if (depth && dump_file)
fprintf (dump_file, " Peeling recursion with depth %i\n", depth);
- callee = edge->callee;
gcc_checking_assert (!callee->global.inlined_to);
inline_call (edge, true, &new_indirect_edges, &overall_size);
if (flag_indirect_inlining)
add_new_edges_to_heap (heap, new_indirect_edges);
+ reset_edge_caches (edge->callee);
+ reset_node_growth_cache (callee);
+
/* We inlined last offline copy to the body. This might lead
to callees of function having fewer call sites and thus they
- may need updating. */
- if (callee->global.inlined_to)
+ may need updating.
+
+ FIXME: the callee size could also shrink because more information
+ is propagated from caller. We don't track when this happen and
+ thus we need to recompute everything all the time. Once this is
+ solved, "|| 1" should go away. */
+ if (callee->global.inlined_to || 1)
update_all_callee_keys (heap, callee, updated_nodes);
else
update_callee_keys (heap, edge->callee, updated_nodes);
inlined into (since it's body size changed) and for the functions
called by function we inlined (since number of it inlinable callers
might change). */
- update_caller_keys (heap, where, updated_nodes);
+ update_caller_keys (heap, where, updated_nodes, NULL);
/* We removed one call of the function we just inlined. If offline
copy is still needed, be sure to update the keys. */
if (callee != where && !callee->global.inlined_to)
- update_caller_keys (heap, callee, updated_nodes);
+ update_caller_keys (heap, callee, updated_nodes, NULL);
bitmap_clear (updated_nodes);
if (dump_file)
for (e = node->callees; e; e = e->next_callee)
{
struct cgraph_node *orig_callee;
+ struct cgraph_node *callee = cgraph_function_or_thunk_node (e->callee, NULL);
/* We've hit cycle? It is time to give up. */
- if (e->callee->aux)
+ if (callee->aux)
{
if (dump_file)
fprintf (dump_file,
"Not inlining %s into %s to avoid cycle.\n",
- cgraph_node_name (e->callee),
+ cgraph_node_name (callee),
cgraph_node_name (e->caller));
e->inline_failed = CIF_RECURSIVE_INLINING;
continue;
it in order to fully flatten the leaves. */
if (!e->inline_failed)
{
- flatten_function (e->callee, early);
+ flatten_function (callee, early);
continue;
}
}
if (gimple_in_ssa_p (DECL_STRUCT_FUNCTION (node->decl))
- != gimple_in_ssa_p (DECL_STRUCT_FUNCTION (e->callee->decl)))
+ != gimple_in_ssa_p (DECL_STRUCT_FUNCTION (callee->decl)))
{
if (dump_file)
fprintf (dump_file, "Not inlining: SSA form does not match.\n");
recursing through the original node if the node was cloned. */
if (dump_file)
fprintf (dump_file, " Inlining %s into %s.\n",
- cgraph_node_name (e->callee),
+ cgraph_node_name (callee),
cgraph_node_name (e->caller));
- orig_callee = e->callee;
+ orig_callee = callee;
inline_call (e, true, NULL, NULL);
if (e->callee != orig_callee)
orig_callee->aux = (void *) node;
XCNEWVEC (struct cgraph_node *, cgraph_n_nodes);
int i;
- if (in_lto_p && flag_indirect_inlining)
+ if (in_lto_p && optimize)
ipa_update_after_lto_read ();
- if (flag_indirect_inlining)
- ipa_create_all_structures_for_iinln ();
if (dump_file)
dump_inline_summaries (dump_file);
}
/* Free ipa-prop structures if they are no longer needed. */
- if (flag_indirect_inlining)
+ if (optimize)
ipa_free_all_structures_after_iinln ();
if (dump_file)
for (e = node->callees; e; e = e->next_callee)
{
- if (!DECL_DISREGARD_INLINE_LIMITS (e->callee->decl))
+ struct cgraph_node *callee = cgraph_function_or_thunk_node (e->callee, NULL);
+ if (!DECL_DISREGARD_INLINE_LIMITS (callee->decl))
continue;
if (cgraph_edge_recursive_p (e))
for (e = node->callees; e; e = e->next_callee)
{
- if (!inline_summary (e->callee)->inlinable
+ struct cgraph_node *callee = cgraph_function_or_thunk_node (e->callee, NULL);
+ if (!inline_summary (callee)->inlinable
|| !e->inline_failed)
continue;
/* Do not consider functions not declared inline. */
- if (!DECL_DECLARED_INLINE_P (e->callee->decl)
+ if (!DECL_DECLARED_INLINE_P (callee->decl)
&& !flag_inline_small_functions
&& !flag_inline_functions)
continue;
if (dump_file)
fprintf (dump_file, "Considering inline candidate %s.\n",
- cgraph_node_name (e->callee));
+ cgraph_node_name (callee));
if (!can_early_inline_edge_p (e))
continue;
if (dump_file)
fprintf (dump_file, " Inlining %s into %s.\n",
- cgraph_node_name (e->callee),
+ cgraph_node_name (callee),
cgraph_node_name (e->caller));
inline_call (e, true, NULL, NULL);
inlined = true;
if (seen_error ())
return 0;
+ /* Do nothing if datastructures for ipa-inliner are already computed. This
+ happens when some pass decides to construct new function and
+ cgraph_add_new_function calls lowering passes and early optimization on
+ it. This may confuse ourself when early inliner decide to inline call to
+ function clone, because function clones don't have parameter list in
+ ipa-prop matching their signature. */
+ if (ipa_node_params_vector)
+ return 0;
+
#ifdef ENABLE_CHECKING
verify_cgraph_node (node);
#endif
= estimate_num_insns (edge->call_stmt, &eni_size_weights);
es->call_stmt_time
= estimate_num_insns (edge->call_stmt, &eni_time_weights);
+ if (edge->callee->decl
+ && !gimple_check_call_matching_types (edge->call_stmt,
+ edge->callee->decl))
+ edge->call_stmt_cannot_inline_p = true;
}
timevar_pop (TV_INTEGRATION);
iterations++;
0, /* properties_provided */
0, /* properties_destroyed */
0, /* todo_flags_start */
- TODO_dump_func /* todo_flags_finish */
+ 0 /* todo_flags_finish */
}
};
/* When to run IPA inlining. Inlining of always-inline functions
- happens during early inlining. */
+ happens during early inlining.
+
+ Enable inlining unconditoinally at -flto. We need size estimates to
+ drive partitioning. */
static bool
gate_ipa_inline (void)
{
- /* ??? We'd like to skip this if not optimizing or not inlining as
- all always-inline functions have been processed by early
- inlining already. But this at least breaks EH with C++ as
- we need to unconditionally run fixup_cfg even at -O0.
- So leave it on unconditionally for now. */
- return 1;
+ return optimize || flag_lto || flag_wpa;
}
struct ipa_opt_pass_d pass_ipa_inline =
0, /* properties_provided */
0, /* properties_destroyed */
TODO_remove_functions, /* todo_flags_finish */
- TODO_dump_cgraph | TODO_dump_func
+ TODO_dump_cgraph
| TODO_remove_functions | TODO_ggc_collect /* todo_flags_finish */
},
inline_generate_summary, /* generate_summary */
OSDN Git Service
