This is the mail archive of the
gcc-patches@gcc.gnu.org
mailing list for the GCC project.
Merge core cgraph.c changes from tree-ssa
- From: Jan Hubicka <jh at suse dot cz>
- To: gcc-patches at gcc dot gnu dot org, rth at redhat dot com
- Date: Thu, 5 Feb 2004 13:45:29 +0100
- Subject: Merge core cgraph.c changes from tree-ssa
Hi,
this patch merge majority of cgraph changes from tree-ssa to mainline
per Diego's request. There are no new features or optimizations, it
just change the datastructure in following way:
- there is 1-1 correspondence in between call sites and edges
This will allow to control inlining based individually for each call
as needed for profile based inlinining. It also remove some
quadratic bookeeping code in the old cgraph that was trying to keep
this information partly available
- now the inline functions are maintained as clones - ie once edge is
marked inline, copy of the calee node is made. This allow context
sensitive inlining needed for instance for Richard's leafify
attribute or recursive inlininig and it also happens to make a many
things a lot easier - it is trivial now to noice when function body
is still needed because some of inlining didn't happen yet and it
makes it trivial to compute code size growth when marking something
to inlinine
The notion of cloning would be usefull to implement real function
clonning too :)
- major simplification of interfaces to inlining decisions heuristics.
The second part requires change in how inlining work - it is no longer
possible to inline into function and then alter use it for inlining
into it's callers as the inlinine plan may require different inlining in
both occasions, so it is necesary to save body before inlining.
This is easy on tree-ssa where we need it anyway (as the body is about
to be destroyed), but for mainline I have to bring all the needed
changes in one big step.
So I would very apprechiate the review of the changes outside cgraph
itself, but I would be happy about review of the cgraph changes
themselves. I tried to make them easy to understand, but the code is
getting somewhat complex solving several complicated issues and I would
be happy to know how readable it is.
I plan two "noisy" changes after the tree-ssa merge. I would like to
split all the inlining code into separate module, as the cgraphunit has
enough of complex logic evenwithout it. I would also replace the
edge->inline_failed tests by !cgraph_inline_p predicate to make it less
confusing (the edge->inline_failed really is !edge->inline_call just
because I need to store reason why inlinining didn't happen)
Bootstrapped/regtested i686-pc-gnu-linux. I also verified memory
consumption and compilation times on Geoff's testcase and they are fine.
Garbage production went about 8% up because of copying the function
bodies, the overall memory peak went down, because of more curefull
memory management.
I have some patches for the first - in particular I can inline
"destructivly" when I know that this is last use of the function and I
can avoid some saving, but I don't want the patch to get more complex
than it is right now.
Honza
2004-02-05 Jan Hubicka <jh@suse.cz>
* cgraph.c: Add overall comment.
(cgraph_inline_hash): New global variable.
(cgraph_create_node): Break out from ...
(cgraph_node): ... here.
(cgraph_edge): New function.
(cgraph_create_edge): New CALL_EXPR argument; some sanity checking.
(cgraph_remove_edge): Accept edge, intead of source and destination.
(cgraph_redirect_edge_callee): New.
(cgraph_remove_node): Update all new datastructures.
(cgraph_record_call, cgraph_remove_call): Kill.
(dump_cgraph_node): Break out from ... ; dump new datastructures.
(dump_cgraph): ... here.
(cgraph_function_possibly_inlined_p): Use new hashtable.
(cgraph_clone_edge, cgraph_clone_node): New.
* cgraph.h: Include hashtab.h
(struct cgraph_global_info): Kill cloned_times, inline_once, will_be_output
fields, add inlined_to pointer.
(cgraph_node): Add pointer to next_clone.
(cgraph_remove_edge, cgraph_create_edge): Update prototype.
(cgraph_remove_call, cgraph_record_call): Kill.
(cgraph_inline_hash): Declare.
(dump_cgraph_node, cgraph_edge, cg4raph_clone_edge, cgraph_clone_node,
cgraph_redirect_edge_callee): Declare.
(cgraph_create_edges, cgraph_inline_p): Update prorotype.
(cgraph_preserve_function_body_p, verify_cgraph, verify_cgraph_node,
cgraph_mark_inline_edge, cgraph_clone_inlined_nodes): Declare.
* cgraphunit.c: Add overall comment.
(cgraph_optimize_function): Kill.
(cgraph_assemble_pending_functions): Do not assemble inline clones.
(cgraph_finalize_function): Update call of cgraph_remove_node
(record_call_1): Record call sites.
(cgraph_create_edges): Accept node instead of decl argument.
(error_found): New static variable.
(verify_cgraph_node_1, verify_cgraph_node, verify_cgraph): New functions.
(cgraph_analyze_function): Update for new datastructures.
(cgraph_finalize_compilation_unit): Plug memory leak.
(cgraph_optimize_function): Kill.
(cgraph_expand_function): Do not use cgraph_optimize_function.
(INLINED_TIMES, SET_INLINED_TIMES, cgraph_inlined_into,
cgraph_inlined_callees): Kill.
(cgraph_remove_unreachable_nodes): Verify cgraph; update handling of
clones.
(estimate_growth): Simplify.
(cgraph_clone_inlined_nodes): New function.
(cgraph_mark_inline_edge): Re-implement.
(cgraph_mark_inline): Likewise.
(cgraph_check_inline_limits): Simplify.
(cgraph_recursive_inlining_p): New.
(update_callee_keys): Break out from ...
(cgraph_decide_inlining_of_small_functions): ... here; simplify.
(cgraph_decide_inlining, cgraph_decide_inlining_incrementally):
Likewise.
(cgraph_expand_all_functions): Remove inline clones from the ordered
list.
(cgraph_preserve_function_body_p): New predicate.
(cgraph_optimize): Verify cgraph.
* function.h (struct function): Add fields saved_tree/saved_args.
* timevar.def (TV_CGRAPH_VERIFY): Use verifier.
* toplev.c (rest_of_compilation): Do not free cfun.
* tree-inline.c: Include function.h
(struct inline_data): Add saving_p field; replace decl/current_decl by
node/current_node.
(insert_decl_map): New function.
(copy_body_r): Handle saving; update cgraph datastructure.
(copy_body): Handle recursive inlining.
(initialize_inlined_parameters): Likewise.
(expand_call_inline): Propagate node attributes; update cgraph.
(optimize_inline_calls): Verify that datastructure still match.
(save_body): New function.
* tree-inline.h (save_body): New.
* tree-optimize.c (tree_rest_of_compilation): preserve function body; do inlining.
* ada/utils.c: Include function.h.
(end_subprog_body): clear cfun and DECL_SAVED_INSNS.
* f/com.c: Include function.h.
(end_subprog_body): clear cfun and DECL_SAVED_INSNS.
* f/Make-lang.in (com.o): Add dependnecy on function.h
Index: Makefile.in
===================================================================
RCS file: /cvs/gcc/gcc/gcc/Makefile.in,v
retrieving revision 1.1241
diff -c -3 -p -r1.1241 Makefile.in
*** Makefile.in 3 Feb 2004 11:22:34 -0000 1.1241
--- Makefile.in 5 Feb 2004 12:43:39 -0000
*************** tree-dump.o: tree-dump.c $(CONFIG_H) $(S
*** 1497,1503 ****
tree-inline.o : tree-inline.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) \
$(TREE_H) $(RTL_H) $(EXPR_H) flags.h $(PARAMS_H) input.h insn-config.h \
$(INTEGRATE_H) $(VARRAY_H) $(HASHTAB_H) $(SPLAY_TREE_H) toplev.h \
! langhooks.h $(C_COMMON_H) tree-inline.h cgraph.h intl.h
tree-optimize.o : tree-optimize.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) \
$(TREE_H) toplev.h langhooks.h cgraph.h $(TIMEVAR_H) function.h $(GGC_H)
--- 1497,1503 ----
tree-inline.o : tree-inline.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) \
$(TREE_H) $(RTL_H) $(EXPR_H) flags.h $(PARAMS_H) input.h insn-config.h \
$(INTEGRATE_H) $(VARRAY_H) $(HASHTAB_H) $(SPLAY_TREE_H) toplev.h \
! langhooks.h $(C_COMMON_H) tree-inline.h cgraph.h intl.h function.h
tree-optimize.o : tree-optimize.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) \
$(TREE_H) toplev.h langhooks.h cgraph.h $(TIMEVAR_H) function.h $(GGC_H)
Index: cgraph.c
===================================================================
RCS file: /cvs/gcc/gcc/gcc/cgraph.c,v
retrieving revision 1.43
diff -c -3 -p -r1.43 cgraph.c
*** cgraph.c 29 Jan 2004 00:34:09 -0000 1.43
--- cgraph.c 5 Feb 2004 12:43:39 -0000
*************** along with GCC; see the file COPYING. I
*** 19,24 ****
--- 19,84 ----
Software Foundation, 59 Temple Place - Suite 330, Boston, MA
02111-1307, USA. */
+ /* This file contains basic routines manipulating call graph and variable pool
+
+ The callgraph:
+
+ The call-graph is data structure designed for intra-procedural optimization
+ but it is also used in non-unit-at-a-time compilation to allow easier code
+ sharing.
+
+ The call-graph consist of nodes and edges represented via linked lists.
+ Each function (external or not) corresponds to the unique node (in
+ contrast to tree DECL nodes where we can have multiple nodes for each
+ function).
+
+ The mapping from declarations to call-graph nodes is done using hash table
+ based on DECL_ASSEMBLER_NAME, so it is essential for assembler name to
+ not change once the declaration is inserted into the call-graph.
+ The call-graph nodes are created lazily using cgraph_node function when
+ called for unknown declaration.
+
+ When built, there is one edge for each direct call. It is possible that
+ the reference will be later optimized out. The call-graph is built
+ conservatively in order to make conservative data flow analysis possible.
+
+ The callgraph at the moment does not represent indirect calls or calls
+ from other compilation unit. Flag NEEDED is set for each node that may
+ be accessed in such a invisible way and it shall be considered an
+ entry point to the callgraph.
+
+ Intraprocedural information:
+
+ Callgraph is place to store data needed for intraprocedural optimization.
+ All datastructures are divided into three components: local_info that
+ is produced while analyzing the function, global_info that is result
+ of global walkking of the callgraph on the end of compilation and
+ rtl_info used by RTL backend to propagate data from already compiled
+ functions to their callers.
+
+ Inlining plans:
+
+ The function inlining information is decided in advance and maintained
+ in the callgraph as so called inline plan.
+ For each inlined call, the calle's node is clonned to represent the
+ new function copy produced by inlininer.
+ Each inlined call gets unque corresponding clone node of the callee
+ and the datastructure is updated while inlining is performed, so
+ the clones are elliminated and their callee edges redirected to the
+ caller.
+
+ Each edge has "inline_failed" field. When the field is set to NULL,
+ the call will be inlined. When it is non-NULL it contains an reason
+ why inlining wasn't performaned.
+
+
+ The varpool data structure:
+
+ Varpool is used to maintain variables in similar manner as call-graph
+ is used for functions. Most of the API is symmetric replacing cgraph
+ function prefix by cgraph_varpool */
+
+
#include "config.h"
#include "system.h"
#include "coretypes.h"
*************** Software Foundation, 59 Temple Place - S
*** 36,45 ****
#include "output.h"
#include "intl.h"
-
/* Hash table used to convert declarations into nodes. */
static GTY((param_is (struct cgraph_node))) htab_t cgraph_hash;
/* The linked list of cgraph nodes. */
struct cgraph_node *cgraph_nodes;
--- 96,108 ----
#include "output.h"
#include "intl.h"
/* Hash table used to convert declarations into nodes. */
static GTY((param_is (struct cgraph_node))) htab_t cgraph_hash;
+ /* We destructivly update callgraph during inlining and thus we need to
+ keep information on whether inlining happent separately. */
+ htab_t cgraph_inline_hash;
+
/* The linked list of cgraph nodes. */
struct cgraph_node *cgraph_nodes;
*************** int cgraph_varpool_n_nodes;
*** 67,74 ****
/* The linked list of cgraph varpool nodes. */
static GTY(()) struct cgraph_varpool_node *cgraph_varpool_nodes;
- static struct cgraph_edge *create_edge (struct cgraph_node *,
- struct cgraph_node *);
static hashval_t hash_node (const void *);
static int eq_node (const void *, const void *);
--- 130,135 ----
*************** eq_node (const void *p1, const void *p2)
*** 91,96 ****
--- 152,174 ----
(tree) p2);
}
+ /* Allocate new callgraph node and insert it into basic datastructures. */
+ static struct cgraph_node *
+ cgraph_create_node (void)
+ {
+ struct cgraph_node *node;
+
+ node = ggc_alloc_cleared (sizeof (*node));
+ node->next = cgraph_nodes;
+ node->uid = cgraph_max_uid++;
+ if (cgraph_nodes)
+ cgraph_nodes->previous = node;
+ node->previous = NULL;
+ cgraph_nodes = node;
+ cgraph_n_nodes++;
+ return node;
+ }
+
/* Return cgraph node assigned to DECL. Create new one when needed. */
struct cgraph_node *
cgraph_node (tree decl)
*************** cgraph_node (tree decl)
*** 110,124 ****
(DECL_ASSEMBLER_NAME (decl)), INSERT);
if (*slot)
return *slot;
! node = ggc_alloc_cleared (sizeof (*node));
node->decl = decl;
- node->next = cgraph_nodes;
- node->uid = cgraph_max_uid++;
- if (cgraph_nodes)
- cgraph_nodes->previous = node;
- node->previous = NULL;
- cgraph_nodes = node;
- cgraph_n_nodes++;
*slot = node;
if (DECL_CONTEXT (decl) && TREE_CODE (DECL_CONTEXT (decl)) == FUNCTION_DECL)
{
--- 188,196 ----
(DECL_ASSEMBLER_NAME (decl)), INSERT);
if (*slot)
return *slot;
!
! node = cgraph_create_node ();
node->decl = decl;
*slot = node;
if (DECL_CONTEXT (decl) && TREE_CODE (DECL_CONTEXT (decl)) == FUNCTION_DECL)
{
*************** cgraph_node (tree decl)
*** 129,134 ****
--- 201,223 ----
return node;
}
+ /* Return callgraph edge representing CALL_EXPR. */
+ struct cgraph_edge *
+ cgraph_edge (struct cgraph_node *node, tree call_expr)
+ {
+ struct cgraph_edge *e;
+
+ /* This loop may turn out to be performance problem. In such case adding
+ hashtables into call nodes with very many edges is probably best
+ sollution. It is not good idea to add pointer into CALL_EXPR itself
+ because we want to make possible having multiple cgraph nodes representing
+ different clones of the same body before the body is actually cloned. */
+ for (e = node->callees; e; e= e->next_callee)
+ if (e->call_expr == call_expr)
+ break;
+ return e;
+ }
+
/* Try to find existing function for identifier ID. */
struct cgraph_node *
cgraph_node_for_identifier (tree id)
*************** cgraph_node_for_identifier (tree id)
*** 151,161 ****
/* Create edge from CALLER to CALLEE in the cgraph. */
! static struct cgraph_edge *
! create_edge (struct cgraph_node *caller, struct cgraph_node *callee)
{
struct cgraph_edge *edge = ggc_alloc (sizeof (struct cgraph_edge));
! struct cgraph_edge *edge2;
if (!DECL_SAVED_TREE (callee->decl))
edge->inline_failed = N_("function body not available");
--- 240,260 ----
/* Create edge from CALLER to CALLEE in the cgraph. */
! struct cgraph_edge *
! cgraph_create_edge (struct cgraph_node *caller, struct cgraph_node *callee,
! tree call_expr)
{
struct cgraph_edge *edge = ggc_alloc (sizeof (struct cgraph_edge));
! #ifdef ENABLE_CHECKING
! struct cgraph_edge *e;
!
! for (e = caller->callees; e; e = e->next_callee)
! if (e->call_expr == call_expr)
! abort ();
! #endif
!
! if (TREE_CODE (call_expr) != CALL_EXPR)
! abort ();
if (!DECL_SAVED_TREE (callee->decl))
edge->inline_failed = N_("function body not available");
*************** create_edge (struct cgraph_node *caller,
*** 167,185 ****
else
edge->inline_failed = N_("function not inlinable");
! /* At the moment we don't associate calls with specific CALL_EXPRs
! as we probably ought to, so we must preserve inline_call flags to
! be the same in all copies of the same edge. */
! if (cgraph_global_info_ready)
! for (edge2 = caller->callees; edge2; edge2 = edge2->next_callee)
! if (edge2->callee == callee)
! {
! edge->inline_failed = edge2->inline_failed;
! break;
! }
edge->caller = caller;
edge->callee = callee;
edge->next_caller = callee->callers;
edge->next_callee = caller->callees;
caller->callees = edge;
--- 266,276 ----
else
edge->inline_failed = N_("function not inlinable");
! edge->aux = NULL;
edge->caller = caller;
edge->callee = callee;
+ edge->call_expr = call_expr;
edge->next_caller = callee->callers;
edge->next_callee = caller->callees;
caller->callees = edge;
*************** create_edge (struct cgraph_node *caller,
*** 187,206 ****
return edge;
}
! /* Remove the edge from CALLER to CALLEE in the cgraph. */
void
! cgraph_remove_edge (struct cgraph_node *caller, struct cgraph_node *callee)
{
struct cgraph_edge **edge, **edge2;
! for (edge = &callee->callers; *edge && (*edge)->caller != caller;
edge = &((*edge)->next_caller))
continue;
if (!*edge)
abort ();
*edge = (*edge)->next_caller;
! for (edge2 = &caller->callees; *edge2 && (*edge2)->callee != callee;
edge2 = &(*edge2)->next_callee)
continue;
if (!*edge2)
--- 278,297 ----
return edge;
}
! /* Remove the edge E the cgraph. */
void
! cgraph_remove_edge (struct cgraph_edge *e)
{
struct cgraph_edge **edge, **edge2;
! for (edge = &e->callee->callers; *edge && *edge != e;
edge = &((*edge)->next_caller))
continue;
if (!*edge)
abort ();
*edge = (*edge)->next_caller;
! for (edge2 = &e->caller->callees; *edge2 && *edge2 != e;
edge2 = &(*edge2)->next_callee)
continue;
if (!*edge2)
*************** cgraph_remove_edge (struct cgraph_node *
*** 208,223 ****
*edge2 = (*edge2)->next_callee;
}
/* Remove the node from cgraph. */
void
cgraph_remove_node (struct cgraph_node *node)
{
void **slot;
while (node->callers)
! cgraph_remove_edge (node->callers->caller, node);
while (node->callees)
! cgraph_remove_edge (node, node->callees->callee);
while (node->nested)
cgraph_remove_node (node->nested);
if (node->origin)
--- 299,336 ----
*edge2 = (*edge2)->next_callee;
}
+ /* Redirect callee of E to N. The function does not update underlying
+ call expression. */
+
+ void
+ cgraph_redirect_edge_callee (struct cgraph_edge *e, struct cgraph_node *n)
+ {
+ struct cgraph_edge **edge;
+
+ for (edge = &e->callee->callers; *edge && *edge != e;
+ edge = &((*edge)->next_caller))
+ continue;
+ if (!*edge)
+ abort ();
+ *edge = (*edge)->next_caller;
+ e->callee = n;
+ e->next_caller = n->callers;
+ n->callers = e;
+ }
+
/* Remove the node from cgraph. */
void
cgraph_remove_node (struct cgraph_node *node)
{
void **slot;
+ bool check_dead = 1;
+ bool inlined = node->global.inlined_to;
+
while (node->callers)
! cgraph_remove_edge (node->callers);
while (node->callees)
! cgraph_remove_edge (node->callees);
while (node->nested)
cgraph_remove_node (node->nested);
if (node->origin)
*************** cgraph_remove_node (struct cgraph_node *
*** 234,248 ****
cgraph_nodes = node->next;
if (node->next)
node->next->previous = node->previous;
- DECL_SAVED_TREE (node->decl) = NULL;
- DECL_SAVED_INSNS (node->decl) = NULL;
- DECL_ARGUMENTS (node->decl) = NULL;
- DECL_INITIAL (node->decl) = error_mark_node;
slot =
htab_find_slot_with_hash (cgraph_hash, DECL_ASSEMBLER_NAME (node->decl),
IDENTIFIER_HASH_VALUE (DECL_ASSEMBLER_NAME
(node->decl)), NO_INSERT);
! htab_clear_slot (cgraph_hash, slot);
/* Do not free the structure itself so the walk over chain can continue. */
}
--- 347,402 ----
cgraph_nodes = node->next;
if (node->next)
node->next->previous = node->previous;
slot =
htab_find_slot_with_hash (cgraph_hash, DECL_ASSEMBLER_NAME (node->decl),
IDENTIFIER_HASH_VALUE (DECL_ASSEMBLER_NAME
(node->decl)), NO_INSERT);
! if (*slot == node)
! {
! if (node->next_clone)
! *slot = node->next_clone;
! else
! {
! htab_clear_slot (cgraph_hash, slot);
! if (!dump_enabled_p (TDI_all) && !inlined)
! {
! DECL_SAVED_TREE (node->decl) = NULL;
! DECL_SAVED_INSNS (node->decl) = NULL;
! DECL_ARGUMENTS (node->decl) = NULL;
! DECL_INITIAL (node->decl) = error_mark_node;
! }
! check_dead = false;
! }
! }
! else
! {
! struct cgraph_node *n;
!
! for (n = *slot; n->next_clone != node; n = n->next_clone)
! continue;
! n->next_clone = node->next_clone;
! }
!
! /* Work out whether we still need a function body (either there is inline
! clone or there is out of line function whose body is not written). */
! if (check_dead && flag_unit_at_a_time)
! {
! struct cgraph_node *n;
!
! for (n = *slot; n; n = n->next_clone)
! if (n->global.inlined_to
! || (!n->global.inlined_to
! && !TREE_ASM_WRITTEN (n->decl) && !DECL_EXTERNAL (n->decl)))
! break;
! if (!n && !dump_enabled_p (TDI_all) && !inlined)
! {
! DECL_SAVED_TREE (node->decl) = NULL;
! DECL_SAVED_INSNS (node->decl) = NULL;
! DECL_ARGUMENTS (node->decl) = NULL;
! DECL_INITIAL (node->decl) = error_mark_node;
! }
! }
! cgraph_n_nodes--;
/* Do not free the structure itself so the walk over chain can continue. */
}
*************** cgraph_mark_needed_node (struct cgraph_n
*** 281,300 ****
cgraph_mark_reachable_node (node);
}
- /* Record call from CALLER to CALLEE. */
-
- struct cgraph_edge *
- cgraph_record_call (tree caller, tree callee)
- {
- return create_edge (cgraph_node (caller), cgraph_node (callee));
- }
-
- void
- cgraph_remove_call (tree caller, tree callee)
- {
- cgraph_remove_edge (cgraph_node (caller), cgraph_node (callee));
- }
-
/* Return true when CALLER_DECL calls CALLEE_DECL. */
bool
--- 435,440 ----
*************** cgraph_node_name (struct cgraph_node *no
*** 356,361 ****
--- 496,555 ----
return (*lang_hooks.decl_printable_name) (node->decl, 2);
}
+ /* Dump given cgraph node. */
+ void
+ dump_cgraph_node (FILE *f, struct cgraph_node *node)
+ {
+ struct cgraph_edge *edge;
+ fprintf (f, "%s/%i:", cgraph_node_name (node), node->uid);
+ if (node->global.inlined_to)
+ fprintf (f, " (inline copy in %s/%i)",
+ cgraph_node_name (node->global.inlined_to),
+ node->global.inlined_to->uid);
+ if (node->local.self_insns)
+ fprintf (f, " %i insns", node->local.self_insns);
+ if (node->global.insns && node->global.insns != node->local.self_insns)
+ fprintf (f, " (%i after inlining)", node->global.insns);
+ if (node->origin)
+ fprintf (f, " nested in: %s", cgraph_node_name (node->origin));
+ if (node->needed)
+ fprintf (f, " needed");
+ else if (node->reachable)
+ fprintf (f, " reachable");
+ if (DECL_SAVED_TREE (node->decl))
+ fprintf (f, " tree");
+ if (node->output)
+ fprintf (f, " output");
+
+ if (node->local.local)
+ fprintf (f, " local");
+ if (node->local.disregard_inline_limits)
+ fprintf (f, " always_inline");
+ else if (node->local.inlinable)
+ fprintf (f, " inlinable");
+ if (TREE_ASM_WRITTEN (node->decl))
+ fprintf (f, " asm_written");
+
+ fprintf (f, "\n called by: ");
+ for (edge = node->callers; edge; edge = edge->next_caller)
+ {
+ fprintf (f, "%s/%i ", cgraph_node_name (edge->caller),
+ edge->caller->uid);
+ if (!edge->inline_failed)
+ fprintf(f, "(inlined) ");
+ }
+
+ fprintf (f, "\n calls: ");
+ for (edge = node->callees; edge; edge = edge->next_callee)
+ {
+ fprintf (f, "%s/%i ", cgraph_node_name (edge->callee),
+ edge->callee->uid);
+ if (!edge->inline_failed)
+ fprintf(f, "(inlined) ");
+ }
+ fprintf (f, "\n");
+ }
+
/* Dump the callgraph. */
void
*************** dump_cgraph (FILE *f)
*** 365,412 ****
fprintf (f, "callgraph:\n\n");
for (node = cgraph_nodes; node; node = node->next)
! {
! struct cgraph_edge *edge;
! fprintf (f, "%s:", cgraph_node_name (node));
! if (node->local.self_insns)
! fprintf (f, " %i insns", node->local.self_insns);
! if (node->global.insns && node->global.insns != node->local.self_insns)
! fprintf (f, " (%i after inlining)", node->global.insns);
! if (node->origin)
! fprintf (f, " nested in: %s", cgraph_node_name (node->origin));
! if (node->needed)
! fprintf (f, " needed");
! else if (node->reachable)
! fprintf (f, " reachable");
! if (DECL_SAVED_TREE (node->decl))
! fprintf (f, " tree");
!
! if (node->local.local)
! fprintf (f, " local");
! if (node->local.disregard_inline_limits)
! fprintf (f, " always_inline");
! else if (node->local.inlinable)
! fprintf (f, " inlinable");
! if (node->global.cloned_times > 1)
! fprintf (f, " cloned %ix", node->global.cloned_times);
!
! fprintf (f, "\n called by: ");
! for (edge = node->callers; edge; edge = edge->next_caller)
! {
! fprintf (f, "%s ", cgraph_node_name (edge->caller));
! if (!edge->inline_failed)
! fprintf(f, "(inlined) ");
! }
!
! fprintf (f, "\n calls: ");
! for (edge = node->callees; edge; edge = edge->next_callee)
! {
! fprintf (f, "%s ", cgraph_node_name (edge->callee));
! if (!edge->inline_failed)
! fprintf(f, "(inlined) ");
! }
! fprintf (f, "\n");
! }
}
/* Returns a hash code for P. */
--- 559,565 ----
fprintf (f, "callgraph:\n\n");
for (node = cgraph_nodes; node; node = node->next)
! dump_cgraph_node (f, node);
}
/* Returns a hash code for P. */
*************** bool
*** 626,635 ****
cgraph_function_possibly_inlined_p (tree decl)
{
if (!cgraph_global_info_ready)
! return (DECL_INLINE (decl)
! && (!flag_really_no_inline
! || (*lang_hooks.tree_inlining.disregard_inline_limits) (decl)));
! return cgraph_node (decl)->global.inlined;
}
#include "gt-cgraph.h"
--- 779,830 ----
cgraph_function_possibly_inlined_p (tree decl)
{
if (!cgraph_global_info_ready)
! return (DECL_INLINE (decl) && !flag_really_no_inline);
! if (!cgraph_inline_hash)
! return false;
! return (htab_find_slot (cgraph_inline_hash, DECL_ASSEMBLER_NAME (decl),
! NO_INSERT) != NULL);
! }
!
! /* Create clone of E in the node N represented by CALL_EXPR the callgraph. */
! struct cgraph_edge *
! cgraph_clone_edge (struct cgraph_edge *e, struct cgraph_node *n, tree call_expr)
! {
! struct cgraph_edge *new = cgraph_create_edge (n, e->callee, call_expr);
!
! new->inline_failed = e->inline_failed;
! return new;
}
+ /* Create node representing clone of N. */
+ struct cgraph_node *
+ cgraph_clone_node (struct cgraph_node *n)
+ {
+ struct cgraph_node *new = cgraph_create_node ();
+ struct cgraph_edge *e;
+
+ new->decl = n->decl;
+ new->origin = n->origin;
+ if (new->origin)
+ {
+ new->next_nested = new->origin->nested;
+ new->origin->nested = new;
+ }
+ /* Cloning of functions with nested functions would require cloning of
+ the nested functions too. Just sanity check that we don't do that. */
+ if (new->nested)
+ abort ();
+ new->analyzed = n->analyzed;
+ new->local = n->local;
+ new->global = n->global;
+ new->rtl = n->rtl;
+
+ for (e = n->callees;e; e=e->next_callee)
+ cgraph_clone_edge (e, new, e->call_expr);
+
+ new->next_clone = n->next_clone;
+ n->next_clone = new;
+
+ return new;
+ }
#include "gt-cgraph.h"
Index: cgraph.h
===================================================================
RCS file: /cvs/gcc/gcc/gcc/cgraph.h,v
retrieving revision 1.27
diff -c -3 -p -r1.27 cgraph.h
*** cgraph.h 21 Jan 2004 20:39:52 -0000 1.27
--- cgraph.h 5 Feb 2004 12:43:39 -0000
*************** Software Foundation, 59 Temple Place - S
*** 21,26 ****
--- 21,27 ----
#ifndef GCC_CGRAPH_H
#define GCC_CGRAPH_H
+ #include "hashtab.h"
/* Information about the function collected locally.
Available after function is analyzed. */
*************** struct cgraph_local_info GTY(())
*** 50,70 ****
struct cgraph_global_info GTY(())
{
/* Estimated size of the function after inlining. */
int insns;
! /* Number of times given function will be cloned during output. */
! int cloned_times;
!
! /* Set when the function will be inlined exactly once. */
! bool inline_once;
!
! /* Set to true for all reachable functions before inlining is decided.
! Once we inline all calls to the function and the function is local,
! it is set to false. */
! bool will_be_output;
!
! /* Set iff at least one of the caller edges has inline_call flag set. */
bool inlined;
};
--- 51,63 ----
struct cgraph_global_info GTY(())
{
+ /* For inline clones this points to the function they will be inlined into. */
+ struct cgraph_node *inlined_to;
+
/* Estimated size of the function after inlining. */
int insns;
! /* Set iff the function has been inlined at least once. */
bool inlined;
};
*************** struct cgraph_node GTY((chain_next ("%h.
*** 97,102 ****
--- 90,97 ----
struct cgraph_node *next_nested;
/* Pointer to the next function in cgraph_nodes_queue. */
struct cgraph_node *next_needed;
+ /* Pointer to the next clone. */
+ struct cgraph_node *next_clone;
PTR GTY ((skip (""))) aux;
struct cgraph_local_info local;
*************** struct cgraph_node GTY((chain_next ("%h.
*** 117,128 ****
bool output;
};
! struct cgraph_edge GTY(())
{
struct cgraph_node *caller;
struct cgraph_node *callee;
struct cgraph_edge *next_caller;
struct cgraph_edge *next_callee;
/* When NULL, inline this call. When non-NULL, points to the explanation
why function was not inlined. */
const char *inline_failed;
--- 112,125 ----
bool output;
};
! struct cgraph_edge GTY((chain_next ("%h.next_caller")))
{
struct cgraph_node *caller;
struct cgraph_node *callee;
struct cgraph_edge *next_caller;
struct cgraph_edge *next_callee;
+ tree call_expr;
+ PTR GTY ((skip (""))) aux;
/* When NULL, inline this call. When non-NULL, points to the explanation
why function was not inlined. */
const char *inline_failed;
*************** extern FILE *cgraph_dump_file;
*** 155,181 ****
extern GTY(()) int cgraph_varpool_n_nodes;
extern GTY(()) struct cgraph_varpool_node *cgraph_varpool_nodes_queue;
/* In cgraph.c */
void dump_cgraph (FILE *);
! void cgraph_remove_edge (struct cgraph_node *, struct cgraph_node *);
! void cgraph_remove_call (tree, tree);
void cgraph_remove_node (struct cgraph_node *);
! struct cgraph_edge *cgraph_record_call (tree, tree);
struct cgraph_node *cgraph_node (tree decl);
struct cgraph_node *cgraph_node_for_identifier (tree id);
bool cgraph_calls_p (tree, tree);
struct cgraph_local_info *cgraph_local_info (tree);
struct cgraph_global_info *cgraph_global_info (tree);
struct cgraph_rtl_info *cgraph_rtl_info (tree);
const char * cgraph_node_name (struct cgraph_node *);
struct cgraph_varpool_node *cgraph_varpool_node (tree decl);
struct cgraph_varpool_node *cgraph_varpool_node_for_identifier (tree id);
void cgraph_varpool_mark_needed_node (struct cgraph_varpool_node *);
void cgraph_varpool_finalize_decl (tree);
bool cgraph_varpool_assemble_pending_decls (void);
bool cgraph_function_possibly_inlined_p (tree);
--- 152,185 ----
extern GTY(()) int cgraph_varpool_n_nodes;
extern GTY(()) struct cgraph_varpool_node *cgraph_varpool_nodes_queue;
+ extern GTY((param_is (union tree_node))) htab_t cgraph_inline_hash;
/* In cgraph.c */
void dump_cgraph (FILE *);
! void dump_cgraph_node (FILE *, struct cgraph_node *);
! void cgraph_remove_edge (struct cgraph_edge *);
void cgraph_remove_node (struct cgraph_node *);
! struct cgraph_edge *cgraph_create_edge (struct cgraph_node *,
! struct cgraph_node *,
! tree);
struct cgraph_node *cgraph_node (tree decl);
+ struct cgraph_edge *cgraph_edge (struct cgraph_node *, tree call_expr);
struct cgraph_node *cgraph_node_for_identifier (tree id);
bool cgraph_calls_p (tree, tree);
struct cgraph_local_info *cgraph_local_info (tree);
struct cgraph_global_info *cgraph_global_info (tree);
struct cgraph_rtl_info *cgraph_rtl_info (tree);
const char * cgraph_node_name (struct cgraph_node *);
+ struct cgraph_edge * cgraph_clone_edge (struct cgraph_edge *, struct cgraph_node *, tree);
+ struct cgraph_node * cgraph_clone_node (struct cgraph_node *);
struct cgraph_varpool_node *cgraph_varpool_node (tree decl);
struct cgraph_varpool_node *cgraph_varpool_node_for_identifier (tree id);
void cgraph_varpool_mark_needed_node (struct cgraph_varpool_node *);
void cgraph_varpool_finalize_decl (tree);
bool cgraph_varpool_assemble_pending_decls (void);
+ void cgraph_redirect_edge_callee (struct cgraph_edge *, struct cgraph_node *);
bool cgraph_function_possibly_inlined_p (tree);
*************** bool cgraph_function_possibly_inlined_p
*** 183,192 ****
bool cgraph_assemble_pending_functions (void);
void cgraph_finalize_function (tree, bool);
void cgraph_finalize_compilation_unit (void);
! void cgraph_create_edges (tree, tree);
void cgraph_optimize (void);
void cgraph_mark_needed_node (struct cgraph_node *);
void cgraph_mark_reachable_node (struct cgraph_node *);
! bool cgraph_inline_p (tree, tree, const char **reason);
#endif /* GCC_CGRAPH_H */
--- 187,201 ----
bool cgraph_assemble_pending_functions (void);
void cgraph_finalize_function (tree, bool);
void cgraph_finalize_compilation_unit (void);
! void cgraph_create_edges (struct cgraph_node *, tree);
void cgraph_optimize (void);
void cgraph_mark_needed_node (struct cgraph_node *);
void cgraph_mark_reachable_node (struct cgraph_node *);
! bool cgraph_inline_p (struct cgraph_edge *, const char **reason);
! bool cgraph_preserve_function_body_p (tree);
! void verify_cgraph (void);
! void verify_cgraph_node (struct cgraph_node *);
! void cgraph_mark_inline_edge (struct cgraph_edge *e);
! void cgraph_clone_inlined_nodes (struct cgraph_edge *e, bool duplicate);
#endif /* GCC_CGRAPH_H */
Index: cgraphunit.c
===================================================================
RCS file: /cvs/gcc/gcc/gcc/cgraphunit.c,v
retrieving revision 1.49
diff -c -3 -p -r1.49 cgraphunit.c
*** cgraphunit.c 29 Jan 2004 00:34:09 -0000 1.49
--- cgraphunit.c 5 Feb 2004 12:43:39 -0000
*************** along with GCC; see the file COPYING. I
*** 19,24 ****
--- 19,168 ----
Software Foundation, 59 Temple Place - Suite 330, Boston, MA
02111-1307, USA. */
+ /* This module implements main driver of compilation process as well as
+ few basic intraprocedural optimizers.
+
+ The main scope of this file is to act as an interface in between
+ tree based frontends and the backend (and middle end)
+
+ The front-end is supposed to use following functionality:
+
+ - cgraph_finalize_function
+
+ This function is called once front-end has parsed whole body of function
+ and it is certain that the function body nor the declaration will change.
+
+ (There is one exception needed for implementing GCC extern inline function.)
+
+ - cgraph_varpool_finalize_variable
+
+ This function has same behaviour as the above but is used for static
+ variables.
+
+ - cgraph_finalize_compilation_unit
+
+ This function is called once compilation unit is finalized and it will
+ no longer change.
+
+ In the unit-at-a-time the call-graph construction and local function
+ analysis takes place here. Bodies of unreachable functions are released
+ to conserve memory usage.
+
+ ??? The compilation unit in this point of view should be compilation
+ unit as defined by the language - for instance C frontend allows multiple
+ compilation units to be parsed at once and it should call function each
+ time parsing is done so we save memory.
+
+ - cgraph_optimize
+
+ In this unit-at-a-time compilation the intra procedural analysis takes
+ place here. In particular the static functions whose address is never
+ taken are marked as local. Backend can then use this information to
+ modify calling conventions, do better inlining or similar optimizations.
+
+ - cgraph_assemble_pending_functions
+ - cgraph_varpool_assemble_pending_variables
+
+ In non-unit-at-a-time mode these functions can be used to force compilation
+ of functions or variables that are known to be needed at given stage
+ of compilation
+
+ - cgraph_mark_needed_node
+ - cgraph_varpool_mark_needed_node
+
+ When function or variable is referenced by some hidden way (for instance
+ via assembly code and marked by attribute "used"), the call-graph data structure
+ must be updated accordingly by this function.
+
+ - analyze_expr callback
+
+ This function is responsible for lowering tree nodes not understood by
+ generic code into understandable ones or alternatively marking
+ callgraph and varpool nodes referenced by the as needed.
+
+ ??? On the tree-ssa genericizing should take place here and we will avoid
+ need for these hooks (replacing them by genericizing hook)
+
+ - expand_function callback
+
+ This function is used to expand function and pass it into RTL back-end.
+ Front-end should not make any assumptions about when this function can be
+ called. In particular cgraph_assemble_pending_functions,
+ cgraph_varpool_assemble_pending_variables, cgraph_finalize_function,
+ cgraph_varpool_finalize_function, cgraph_optimize can cause arbitrarily
+ previously finalized functions to be expanded.
+
+ We implement two compilation modes.
+
+ - unit-at-a-time: In this mode analyzing of all functions is deferred
+ to cgraph_finalize_compilation_unit and expansion into cgraph_optimize.
+
+ In cgraph_finalize_compilation_unit the reachable functions are
+ analyzed. During analysis the call-graph edges from reachable
+ functions are constructed and their destinations are marked as
+ reachable. References to functions and variables are discovered too
+ and variables found to be needed output to the assembly file. Via
+ mark_referenced call in assemble_variable functions referenced by
+ static variables are noticed too.
+
+ The intra-procedural information is produced and it's existence
+ indicated by global_info_ready. Once this flag is set it is impossible
+ to change function from !reachable to reachable and thus
+ assemble_variable no longer call mark_referenced.
+
+ Finally the call-graph is topologically sorted and all reachable functions
+ that has not been completely inlined or are not external are output.
+
+ ??? It is possible that reference to function or variable is optimized
+ out. We can not deal with this nicely because topological order is not
+ suitable for it. For tree-ssa we may consider another pass doing
+ optimization and re-discovering reachable functions.
+
+ ??? Reorganize code so variables are output very last and only if they
+ really has been referenced by produced code, so we catch more cases
+ where reference has been optimized out.
+
+ - non-unit-at-a-time
+
+ All functions are variables are output as early as possible to conserve
+ memory consumption. This may or may not result in less memory used but
+ it is still needed for some legacy code that rely on particular ordering
+ of things output from the compiler.
+
+ Varpool data structures are not used and variables are output directly.
+
+ Functions are output early using call of
+ cgraph_assemble_pending_function from cgraph_finalize_function. The
+ decision on whether function is needed is made more conservative so
+ uninlininable static functions are needed too. During the call-graph
+ construction the edge destinations are not marked as reachable and it
+ is completely relied upn assemble_variable to mark them.
+
+ Inlining decision heuristics
+ ??? Move this to separate file after tree-ssa merge.
+
+ We separate inlining decisions from the inliner itself and store it
+ inside callgraph as so called inline plan. Reffer to cgraph.c
+ documentation about particular representation of inline plans in the
+ callgraph
+
+ The implementation of particular heuristics is separated from
+ the rest of code to make it easier to replace it with more complicated
+ implementation in the future. The rest of inlining code acts as a
+ library aimed to modify the callgraph and verify that the parameters
+ on code size growth fits.
+
+ To mark given call inline, use cgraph_mark_inline function, the
+ verification is performed by cgraph_default_inline_p and
+ cgraph_check_inline_limits.
+
+ The heuristics implements simple knapsack style algorithm ordering
+ all functions by their "profitability" (estimated by code size growth)
+ and inlining them in priority order.
+
+ cgraph_decide_inlining implements heuristics taking whole callgraph
+ into account, while cgraph_decide_inlining_incrementally considers
+ only one function at a time and is used in non-unit-at-a-time mode. */
#include "config.h"
#include "system.h"
#include "coretypes.h"
*************** static void cgraph_mark_functions_to_out
*** 47,53 ****
static void cgraph_expand_function (struct cgraph_node *);
static tree record_call_1 (tree *, int *, void *);
static void cgraph_mark_local_functions (void);
- static void cgraph_optimize_function (struct cgraph_node *);
static bool cgraph_default_inline_p (struct cgraph_node *n);
static void cgraph_analyze_function (struct cgraph_node *node);
static void cgraph_decide_inlining_incrementally (struct cgraph_node *);
--- 191,196 ----
*************** cgraph_assemble_pending_functions (void)
*** 138,144 ****
struct cgraph_node *n = cgraph_nodes_queue;
cgraph_nodes_queue = cgraph_nodes_queue->next_needed;
! if (!n->origin && !DECL_EXTERNAL (n->decl))
{
cgraph_expand_function (n);
output = true;
--- 281,288 ----
struct cgraph_node *n = cgraph_nodes_queue;
cgraph_nodes_queue = cgraph_nodes_queue->next_needed;
! n->next_needed = NULL;
! if (!n->origin && !n->global.inlined_to && !DECL_EXTERNAL (n->decl))
{
cgraph_expand_function (n);
output = true;
*************** cgraph_finalize_function (tree decl, boo
*** 186,192 ****
node->analyzed = false;
node->local.redefined_extern_inline = true;
while (node->callees)
! cgraph_remove_edge (node, node->callees->callee);
/* We may need to re-queue the node for assembling in case
we already proceeded it and ignored as not needed. */
--- 330,336 ----
node->analyzed = false;
node->local.redefined_extern_inline = true;
while (node->callees)
! cgraph_remove_edge (node->callees);
/* We may need to re-queue the node for assembling in case
we already proceeded it and ignored as not needed. */
*************** record_call_1 (tree *tp, int *walk_subtr
*** 267,273 ****
tree decl = get_callee_fndecl (*tp);
if (decl && TREE_CODE (decl) == FUNCTION_DECL)
{
! cgraph_record_call (data, decl);
/* When we see a function call, we don't want to look at the
function reference in the ADDR_EXPR that is hanging from
--- 411,417 ----
tree decl = get_callee_fndecl (*tp);
if (decl && TREE_CODE (decl) == FUNCTION_DECL)
{
! cgraph_create_edge (data, cgraph_node (decl), *tp);
/* When we see a function call, we don't want to look at the
function reference in the ADDR_EXPR that is hanging from
*************** record_call_1 (tree *tp, int *walk_subtr
*** 300,319 ****
return NULL;
}
! /* Create cgraph edges for function calls inside BODY from DECL. */
void
! cgraph_create_edges (tree decl, tree body)
{
/* The nodes we're interested in are never shared, so walk
the tree ignoring duplicates. */
visited_nodes = htab_create (37, htab_hash_pointer,
htab_eq_pointer, NULL);
! walk_tree (&body, record_call_1, decl, visited_nodes);
htab_delete (visited_nodes);
visited_nodes = NULL;
}
/* Analyze the function scheduled to be output. */
static void
cgraph_analyze_function (struct cgraph_node *node)
--- 444,605 ----
return NULL;
}
! /* Create cgraph edges for function calls inside BODY from NODE. */
void
! cgraph_create_edges (struct cgraph_node *node, tree body)
{
/* The nodes we're interested in are never shared, so walk
the tree ignoring duplicates. */
visited_nodes = htab_create (37, htab_hash_pointer,
htab_eq_pointer, NULL);
! walk_tree (&body, record_call_1, node, visited_nodes);
htab_delete (visited_nodes);
visited_nodes = NULL;
}
+ static bool error_found;
+
+ /* Callbrack of verify_cgraph_node. Check that all call_exprs have cgraph nodes. */
+ static tree
+ verify_cgraph_node_1 (tree *tp, int *walk_subtrees, void *data)
+ {
+ tree t = *tp;
+ tree decl;
+
+ if (TREE_CODE (t) == CALL_EXPR && (decl = get_callee_fndecl (t)))
+ {
+ struct cgraph_edge *e = cgraph_edge (data, t);
+ if (e)
+ {
+ if (e->aux)
+ {
+ error ("Shared call_expr:");
+ debug_tree (t);
+ error_found = true;
+ }
+ if (e->callee->decl != cgraph_node (decl)->decl)
+ {
+ error ("Edge points to wrong declaration:");
+ debug_tree (e->callee->decl);
+ fprintf (stderr," Instead of:");
+ debug_tree (decl);
+ }
+ e->aux = (void *)1;
+ }
+ else
+ {
+ error ("Missing callgraph edge for call expr:");
+ debug_tree (t);
+ error_found = true;
+ }
+ }
+ /* Save some cycles by not walking types and declaration as we
+ won't find anything useful there anyway. */
+ if (DECL_P (*tp) || TYPE_P (*tp))
+ {
+ *walk_subtrees = 0;
+ }
+ return NULL_TREE;
+ }
+
+ /* Verify cgraph nodes of given cgraph node. */
+ void
+ verify_cgraph_node (struct cgraph_node *node)
+ {
+ struct cgraph_edge *e;
+ struct cgraph_node *main_clone;
+
+ timevar_push (TV_CGRAPH_VERIFY);
+ error_found = false;
+ for (e = node->callees; e; e = e->next_callee)
+ if (e->aux)
+ {
+ error ("Aux field set for edge %s->%s",
+ cgraph_node_name (e->caller), cgraph_node_name (e->callee));
+ error_found = true;
+ }
+ for (e = node->callers; e; e = e->next_caller)
+ {
+ if (!e->inline_failed)
+ {
+ if (node->global.inlined_to
+ != (e->caller->global.inlined_to
+ ? e->caller->global.inlined_to : e->caller))
+ {
+ error ("Inlined_to pointer is wrong");
+ error_found = true;
+ }
+ if (node->callers->next_caller)
+ {
+ error ("Multiple inline callers");
+ error_found = true;
+ }
+ }
+ else
+ if (node->global.inlined_to)
+ {
+ error ("Inlined_to pointer set for noninline callers");
+ error_found = true;
+ }
+ }
+ if (!node->callers && node->global.inlined_to)
+ {
+ error ("Inlined_to pointer is set but no predecesors found");
+ error_found = true;
+ }
+ if (node->global.inlined_to == node)
+ {
+ error ("Inlined_to pointer reffers to itself");
+ error_found = true;
+ }
+
+ for (main_clone = cgraph_node (node->decl); main_clone;
+ main_clone = main_clone->next_clone)
+ if (main_clone == node)
+ break;
+ if (!node)
+ {
+ error ("Node not found in DECL_ASSEMBLER_NAME hash");
+ error_found = true;
+ }
+
+ if (node->analyzed
+ && DECL_SAVED_TREE (node->decl) && !TREE_ASM_WRITTEN (node->decl)
+ && (!DECL_EXTERNAL (node->decl) || node->global.inlined_to))
+ {
+ walk_tree_without_duplicates (&DECL_SAVED_TREE (node->decl),
+ verify_cgraph_node_1, node);
+ for (e = node->callees; e; e = e->next_callee)
+ {
+ if (!e->aux)
+ {
+ error ("Edge %s->%s has no corresponding call_expr",
+ cgraph_node_name (e->caller),
+ cgraph_node_name (e->callee));
+ error_found = true;
+ }
+ e->aux = 0;
+ }
+ }
+ if (error_found)
+ {
+ dump_cgraph_node (stderr, node);
+ internal_error ("verify_cgraph_node failed.");
+ }
+ timevar_pop (TV_CGRAPH_VERIFY);
+ }
+
+ /* Verify whole cgraph structure. */
+ void
+ verify_cgraph (void)
+ {
+ struct cgraph_node *node;
+
+ for (node = cgraph_nodes; node; node = node->next)
+ verify_cgraph_node (node);
+ }
+
/* Analyze the function scheduled to be output. */
static void
cgraph_analyze_function (struct cgraph_node *node)
*************** cgraph_analyze_function (struct cgraph_n
*** 324,330 ****
current_function_decl = decl;
/* First kill forward declaration so reverse inlining works properly. */
! cgraph_create_edges (decl, DECL_SAVED_TREE (decl));
node->local.inlinable = tree_inlinable_function_p (decl);
if (!DECL_ESTIMATED_INSNS (decl))
--- 610,616 ----
current_function_decl = decl;
/* First kill forward declaration so reverse inlining works properly. */
! cgraph_create_edges (node, DECL_SAVED_TREE (decl));
node->local.inlinable = tree_inlinable_function_p (decl);
if (!DECL_ESTIMATED_INSNS (decl))
*************** cgraph_analyze_function (struct cgraph_n
*** 335,359 ****
node->local.disregard_inline_limits
= (*lang_hooks.tree_inlining.disregard_inline_limits) (decl);
for (e = node->callers; e; e = e->next_caller)
! if (e->inline_failed)
! {
! if (node->local.redefined_extern_inline)
! e->inline_failed = N_("redefined extern inline functions are not "
! "considered for inlining");
! else if (!node->local.inlinable)
! e->inline_failed = N_("function not inlinable");
! else
! e->inline_failed = N_("function not considered for inlining");
! }
if (flag_really_no_inline && !node->local.disregard_inline_limits)
node->local.inlinable = 0;
/* Inlining characteristics are maintained by the cgraph_mark_inline. */
node->global.insns = node->local.self_insns;
- if (!DECL_EXTERNAL (decl))
- {
- node->global.cloned_times = 1;
- node->global.will_be_output = true;
- }
node->analyzed = true;
current_function_decl = NULL;
--- 621,639 ----
node->local.disregard_inline_limits
= (*lang_hooks.tree_inlining.disregard_inline_limits) (decl);
for (e = node->callers; e; e = e->next_caller)
! {
! if (node->local.redefined_extern_inline)
! e->inline_failed = N_("redefined extern inline functions are not "
! "considered for inlining");
! else if (!node->local.inlinable)
! e->inline_failed = N_("function not inlinable");
! else
! e->inline_failed = N_("function not considered for inlining");
! }
if (flag_really_no_inline && !node->local.disregard_inline_limits)
node->local.inlinable = 0;
/* Inlining characteristics are maintained by the cgraph_mark_inline. */
node->global.insns = node->local.self_insns;
node->analyzed = true;
current_function_decl = NULL;
*************** cgraph_finalize_compilation_unit (void)
*** 397,402 ****
--- 677,683 ----
node = cgraph_nodes_queue;
cgraph_nodes_queue = cgraph_nodes_queue->next_needed;
+ node->next_needed = NULL;
/* ??? It is possible to create extern inline function and later using
weak alas attribute to kill it's body. See
*************** cgraph_finalize_compilation_unit (void)
*** 437,445 ****
if (!node->reachable && DECL_SAVED_TREE (decl))
{
- cgraph_remove_node (node);
if (cgraph_dump_file)
fprintf (cgraph_dump_file, " %s", cgraph_node_name (node));
}
else
node->next_needed = NULL;
--- 718,726 ----
if (!node->reachable && DECL_SAVED_TREE (decl))
{
if (cgraph_dump_file)
fprintf (cgraph_dump_file, " %s", cgraph_node_name (node));
+ cgraph_remove_node (node);
}
else
node->next_needed = NULL;
*************** cgraph_mark_functions_to_output (void)
*** 476,520 ****
always inlined, as well as those that are reachable from
outside the current compilation unit. */
if (DECL_SAVED_TREE (decl)
&& (node->needed
|| (e && node->reachable))
&& !TREE_ASM_WRITTEN (decl) && !node->origin
&& !DECL_EXTERNAL (decl))
node->output = 1;
! else
! DECL_SAVED_INSNS (decl) = NULL;
! }
! }
!
! /* Optimize the function before expansion. */
!
! static void
! cgraph_optimize_function (struct cgraph_node *node)
! {
! tree decl = node->decl;
!
! timevar_push (TV_INTEGRATION);
! /* optimize_inline_calls avoids inlining of current_function_decl. */
! current_function_decl = decl;
! if (flag_inline_trees)
! {
! struct cgraph_edge *e;
!
! for (e = node->callees; e; e = e->next_callee)
! if (!e->inline_failed || warn_inline
! || (DECL_DECLARED_INLINE_P (e->callee->decl)
! && lookup_attribute ("always_inline",
! DECL_ATTRIBUTES (e->callee->decl))))
! break;
! if (e)
! optimize_inline_calls (decl);
! }
! if (node->nested)
! {
! for (node = node->nested; node; node = node->next_nested)
! cgraph_optimize_function (node);
}
- timevar_pop (TV_INTEGRATION);
}
/* Expand function specified by NODE. */
--- 757,776 ----
always inlined, as well as those that are reachable from
outside the current compilation unit. */
if (DECL_SAVED_TREE (decl)
+ && !node->global.inlined_to
&& (node->needed
|| (e && node->reachable))
&& !TREE_ASM_WRITTEN (decl) && !node->origin
&& !DECL_EXTERNAL (decl))
node->output = 1;
! /* We should've reclaimed all functions that are not needed. */
! else if (!node->global.inlined_to && DECL_SAVED_TREE (decl)
! && !node->origin && !DECL_EXTERNAL (decl))
! {
! dump_cgraph_node (stderr, node);
! abort ();
! }
}
}
/* Expand function specified by NODE. */
*************** cgraph_expand_function (struct cgraph_no
*** 524,538 ****
{
tree decl = node->decl;
if (flag_unit_at_a_time)
announce_function (decl);
- cgraph_optimize_function (node);
-
/* Generate RTL for the body of DECL. Nested functions are expanded
via lang_expand_decl_stmt. */
(*lang_hooks.callgraph.expand_function) (decl);
! if (DECL_DEFER_OUTPUT (decl))
abort ();
current_function_decl = NULL;
--- 780,799 ----
{
tree decl = node->decl;
+ /* We ought to not compile any inline clones. */
+ if (node->global.inlined_to)
+ abort ();
+
if (flag_unit_at_a_time)
announce_function (decl);
/* Generate RTL for the body of DECL. Nested functions are expanded
via lang_expand_decl_stmt. */
(*lang_hooks.callgraph.expand_function) (decl);
!
! /* Make sure that BE didn't gave up on compiling. */
! if (!TREE_ASM_WRITTEN (node->decl)
! && !(sorrycount || errorcount))
abort ();
current_function_decl = NULL;
*************** cgraph_postorder (struct cgraph_node **o
*** 600,806 ****
return order_pos;
}
- #define INLINED_TIMES(node) ((size_t)(node)->aux)
- #define SET_INLINED_TIMES(node,times) ((node)->aux = (void *)(times))
-
- /* Return list of nodes we decided to inline NODE into, set their output
- flag and compute INLINED_TIMES.
-
- We do simple backtracing to get INLINED_TIMES right. This should not be
- expensive as we limit the amount of inlining. Alternatively we may first
- discover set of nodes, topologically sort these and propagate
- INLINED_TIMES */
-
- static int
- cgraph_inlined_into (struct cgraph_node *node, struct cgraph_node **array)
- {
- int nfound = 0;
- struct cgraph_edge **stack;
- struct cgraph_edge *e, *e1;
- int sp;
- int i;
-
- /* Fast path: since we traverse in mostly topological order, we will likely
- find no edges. */
- for (e = node->callers; e; e = e->next_caller)
- if (!e->inline_failed)
- break;
-
- if (!e)
- return 0;
-
- /* Allocate stack for back-tracking up callgraph. */
- stack = xmalloc ((cgraph_n_nodes + 1) * sizeof (struct cgraph_edge));
- sp = 0;
-
- /* Push the first edge on to the stack. */
- stack[sp++] = e;
-
- while (sp)
- {
- struct cgraph_node *caller;
-
- /* Look at the edge on the top of the stack. */
- e = stack[sp - 1];
- caller = e->caller;
-
- /* Check if the caller destination has been visited yet. */
- if (!caller->output)
- {
- array[nfound++] = e->caller;
- /* Mark that we have visited the destination. */
- caller->output = true;
- SET_INLINED_TIMES (caller, 0);
- }
- SET_INLINED_TIMES (caller, INLINED_TIMES (caller) + 1);
-
- for (e1 = caller->callers; e1; e1 = e1->next_caller)
- if (!e1->inline_failed)
- break;
-
- if (e1)
- stack[sp++] = e1;
- else
- {
- while (true)
- {
- for (e1 = e->next_caller; e1; e1 = e1->next_caller)
- if (!e1->inline_failed)
- break;
-
- if (e1)
- {
- stack[sp - 1] = e1;
- break;
- }
- else
- {
- sp--;
- if (!sp)
- break;
- e = stack[sp - 1];
- }
- }
- }
- }
-
- free (stack);
-
-
- if (cgraph_dump_file)
- {
- fprintf (cgraph_dump_file, " Found inline predecesors of %s:",
- cgraph_node_name (node));
- for (i = 0; i < nfound; i++)
- {
- fprintf (cgraph_dump_file, " %s", cgraph_node_name (array[i]));
- if (INLINED_TIMES (array[i]) != 1)
- fprintf (cgraph_dump_file, " (%i times)",
- (int)INLINED_TIMES (array[i]));
- }
- fprintf (cgraph_dump_file, "\n");
- }
-
- return nfound;
- }
-
- /* Return list of nodes we decided to inline into NODE, set their output
- flag and compute INLINED_TIMES.
-
- This function is identical to cgraph_inlined_into with callers and callees
- nodes swapped. */
-
- static int
- cgraph_inlined_callees (struct cgraph_node *node, struct cgraph_node **array)
- {
- int nfound = 0;
- struct cgraph_edge **stack;
- struct cgraph_edge *e, *e1;
- int sp;
- int i;
-
- /* Fast path: since we traverse in mostly topological order, we will likely
- find no edges. */
- for (e = node->callees; e; e = e->next_callee)
- if (!e->inline_failed)
- break;
-
- if (!e)
- return 0;
-
- /* Allocate stack for back-tracking up callgraph. */
- stack = xmalloc ((cgraph_n_nodes + 1) * sizeof (struct cgraph_edge));
- sp = 0;
-
- /* Push the first edge on to the stack. */
- stack[sp++] = e;
-
- while (sp)
- {
- struct cgraph_node *callee;
-
- /* Look at the edge on the top of the stack. */
- e = stack[sp - 1];
- callee = e->callee;
-
- /* Check if the callee destination has been visited yet. */
- if (!callee->output)
- {
- array[nfound++] = e->callee;
- /* Mark that we have visited the destination. */
- callee->output = true;
- SET_INLINED_TIMES (callee, 0);
- }
- SET_INLINED_TIMES (callee, INLINED_TIMES (callee) + 1);
-
- for (e1 = callee->callees; e1; e1 = e1->next_callee)
- if (!e1->inline_failed)
- break;
- if (e1)
- stack[sp++] = e1;
- else
- {
- while (true)
- {
- for (e1 = e->next_callee; e1; e1 = e1->next_callee)
- if (!e1->inline_failed)
- break;
-
- if (e1)
- {
- stack[sp - 1] = e1;
- break;
- }
- else
- {
- sp--;
- if (!sp)
- break;
- e = stack[sp - 1];
- }
- }
- }
- }
-
- free (stack);
-
- if (cgraph_dump_file)
- {
- fprintf (cgraph_dump_file, " Found inline successors of %s:",
- cgraph_node_name (node));
- for (i = 0; i < nfound; i++)
- {
- fprintf (cgraph_dump_file, " %s", cgraph_node_name (array[i]));
- if (INLINED_TIMES (array[i]) != 1)
- fprintf (cgraph_dump_file, " (%i times)",
- (int)INLINED_TIMES (array[i]));
- }
- fprintf (cgraph_dump_file, "\n");
- }
-
- return nfound;
- }
-
/* Perform reachability analysis and reclaim all unreachable nodes.
This function also remove unneeded bodies of extern inline functions
and thus needs to be done only after inlining decisions has been made. */
--- 861,866 ----
*************** cgraph_remove_unreachable_nodes (void)
*** 812,817 ****
--- 872,880 ----
bool changed = false;
int insns = 0;
+ #ifdef ENABLE_CHECKING
+ verify_cgraph ();
+ #endif
if (cgraph_dump_file)
fprintf (cgraph_dump_file, "\nReclaiming functions:");
#ifdef ENABLE_CHECKING
*************** cgraph_remove_unreachable_nodes (void)
*** 851,860 ****
/* Remove unreachable nodes. Extern inline functions need special care;
Unreachable extern inline functions shall be removed.
Reachable extern inline functions we never inlined shall get their bodies
! eliminated.
Reachable extern inline functions we sometimes inlined will be turned into
unanalyzed nodes so they look like for true extern functions to the rest
! of code. */
for (node = cgraph_nodes; node; node = node->next)
{
if (!node->aux)
--- 914,924 ----
/* Remove unreachable nodes. Extern inline functions need special care;
Unreachable extern inline functions shall be removed.
Reachable extern inline functions we never inlined shall get their bodies
! eliminated
Reachable extern inline functions we sometimes inlined will be turned into
unanalyzed nodes so they look like for true extern functions to the rest
! of code. Body of such functions is relased via remove_node once the
! inline clones are eliminated. */
for (node = cgraph_nodes; node; node = node->next)
{
if (!node->aux)
*************** cgraph_remove_unreachable_nodes (void)
*** 879,887 ****
break;
if (e || node->needed)
{
! DECL_SAVED_TREE (node->decl) = NULL_TREE;
while (node->callees)
! cgraph_remove_edge (node, node->callees->callee);
node->analyzed = false;
}
else
--- 943,963 ----
break;
if (e || node->needed)
{
! struct cgraph_node *clone;
!
! for (clone = node->next_clone; clone;
! clone = clone->next_clone)
! if (clone->aux)
! break;
! if (!clone)
! {
! DECL_SAVED_TREE (node->decl) = NULL;
! DECL_SAVED_INSNS (node->decl) = NULL;
! DECL_ARGUMENTS (node->decl) = NULL;
! DECL_INITIAL (node->decl) = error_mark_node;
! }
while (node->callees)
! cgraph_remove_edge (node->callees);
node->analyzed = false;
}
else
*************** cgraph_remove_unreachable_nodes (void)
*** 899,905 ****
return changed;
}
-
/* Estimate size of the function after inlining WHAT into TO. */
static int
--- 975,980 ----
*************** static int
*** 915,1027 ****
cgraph_estimate_growth (struct cgraph_node *node)
{
int growth = 0;
- int calls_saved = 0;
- int clones_added = 0;
struct cgraph_edge *e;
for (e = node->callers; e; e = e->next_caller)
if (e->inline_failed)
! {
! growth += ((cgraph_estimate_size_after_inlining (1, e->caller, node)
! -
! e->caller->global.insns) *e->caller->global.cloned_times);
! calls_saved += e->caller->global.cloned_times;
! clones_added += e->caller->global.cloned_times;
! }
/* ??? Wrong for self recursive functions or cases where we decide to not
inline for different reasons, but it is not big deal as in that case
we will keep the body around, but we will also avoid some inlining. */
if (!node->needed && !node->origin && !DECL_EXTERNAL (node->decl))
! growth -= node->global.insns, clones_added--;
!
! if (!calls_saved)
! calls_saved = 1;
return growth;
}
! /* Update insn sizes after inlining WHAT into TO that is already inlined into
! all nodes in INLINED array. */
!
! static void
! cgraph_mark_inline (struct cgraph_node *to, struct cgraph_node *what,
! struct cgraph_node **inlined, int ninlined,
! struct cgraph_node **inlined_callees,
! int ninlined_callees)
{
! int i;
! int times = 0;
! int clones = 0;
! struct cgraph_edge *e;
! bool called = false;
! int new_insns;
! what->global.inlined = 1;
! for (e = what->callers; e; e = e->next_caller)
{
! if (e->caller == to)
! {
! if (!e->inline_failed)
! continue;
! e->inline_failed = NULL;
! times++;
! clones += e->caller->global.cloned_times;
! }
! else if (e->inline_failed)
! called = true;
}
! if (!times)
abort ();
! ncalls_inlined += times;
! new_insns = cgraph_estimate_size_after_inlining (times, to, what);
! if (to->global.will_be_output)
! overall_insns += new_insns - to->global.insns;
! to->global.insns = new_insns;
!
! if (!called && !what->needed && !what->origin
! && flag_unit_at_a_time
! && !DECL_EXTERNAL (what->decl))
{
! if (!what->global.will_be_output)
! abort ();
! clones--;
! nfunctions_inlined++;
! what->global.will_be_output = 0;
! overall_insns -= what->global.insns;
}
! what->global.cloned_times += clones;
! for (i = 0; i < ninlined; i++)
{
! new_insns =
! cgraph_estimate_size_after_inlining (INLINED_TIMES (inlined[i]) *
! times, inlined[i], what);
! if (inlined[i]->global.will_be_output)
! overall_insns += new_insns - inlined[i]->global.insns;
! inlined[i]->global.insns = new_insns;
}
! for (i = 0; i < ninlined_callees; i++)
{
! inlined_callees[i]->global.cloned_times +=
! INLINED_TIMES (inlined_callees[i]) * clones;
}
}
! /* Return false when inlining WHAT into TO is not good idea as it would cause
! too large growth of function bodies. */
static bool
cgraph_check_inline_limits (struct cgraph_node *to, struct cgraph_node *what,
- struct cgraph_node **inlined, int ninlined,
const char **reason)
{
- int i;
int times = 0;
struct cgraph_edge *e;
int newsize;
int limit;
for (e = to->callees; e; e = e->next_callee)
if (e->callee == what)
times++;
--- 990,1142 ----
cgraph_estimate_growth (struct cgraph_node *node)
{
int growth = 0;
struct cgraph_edge *e;
for (e = node->callers; e; e = e->next_caller)
if (e->inline_failed)
! growth += (cgraph_estimate_size_after_inlining (1, e->caller, node)
! - e->caller->global.insns);
/* ??? Wrong for self recursive functions or cases where we decide to not
inline for different reasons, but it is not big deal as in that case
we will keep the body around, but we will also avoid some inlining. */
if (!node->needed && !node->origin && !DECL_EXTERNAL (node->decl))
! growth -= node->global.insns;
return growth;
}
! /* E is expected to be an edge being inlined. Clone destination node of
! the edge and redirect it to the new clone.
! DUPLICATE is used for bookeeping on whether we are actually creating new
! clones or re-using node originally representing out-of-line function call.
! */
! void
! cgraph_clone_inlined_nodes (struct cgraph_edge *e, bool duplicate)
{
! struct cgraph_node *n;
! /* We may elliminate the need for out-of-line copy to be output. In that
! case just go ahead and re-use it. */
! if (!e->callee->callers->next_caller
! && (!e->callee->needed || DECL_EXTERNAL (e->callee->decl))
! && !e->callee->origin
! && duplicate
! && flag_unit_at_a_time)
{
! if (e->callee->global.inlined_to)
! abort ();
! if (!DECL_EXTERNAL (e->callee->decl))
! overall_insns -= e->callee->global.insns, nfunctions_inlined++;
! duplicate = 0;
}
! else if (duplicate)
! {
! n = cgraph_clone_node (e->callee);
! cgraph_redirect_edge_callee (e, n);
! }
!
! if (e->caller->global.inlined_to)
! e->callee->global.inlined_to = e->caller->global.inlined_to;
! else
! e->callee->global.inlined_to = e->caller;
!
! /* Recursivly clone all bodies. */
! for (e = e->callee->callees; e; e = e->next_callee)
! if (!e->inline_failed)
! cgraph_clone_inlined_nodes (e, duplicate);
! }
!
! /* Mark edge E as inlined and update callgraph accordingly. */
!
! void
! cgraph_mark_inline_edge (struct cgraph_edge *e)
! {
! int old_insns = 0, new_insns = 0;
! struct cgraph_node *to = NULL, *what;
!
! if (!e->inline_failed)
abort ();
! e->inline_failed = NULL;
! if (!e->callee->global.inlined && flag_unit_at_a_time)
{
! void **slot;
! if (!cgraph_inline_hash)
! cgraph_inline_hash = htab_create_ggc (42, htab_hash_pointer,
! htab_eq_pointer, NULL);
! slot = htab_find_slot (cgraph_inline_hash,
! DECL_ASSEMBLER_NAME (e->callee->decl), INSERT);
! *slot = DECL_ASSEMBLER_NAME (e->callee->decl);
}
! e->callee->global.inlined = true;
!
! cgraph_clone_inlined_nodes (e, true);
!
! what = e->callee;
!
! /* Now update size of caller and all functions caller is inlined into. */
! for (;e && !e->inline_failed; e = e->caller->callers)
{
! old_insns = e->caller->global.insns;
! new_insns = cgraph_estimate_size_after_inlining (1, e->caller,
! what);
! if (new_insns < 0)
! abort ();
! to = e->caller;
! to->global.insns = new_insns;
}
! if (what->global.inlined_to != to)
! abort ();
! overall_insns += new_insns - old_insns;
! ncalls_inlined++;
! }
!
! /* Mark all calls of EDGE->CALLEE inlined into EDGE->CALLER.
! Return following unredirected edge in the list of callers
! of EDGE->CALLEE */
!
! static struct cgraph_edge *
! cgraph_mark_inline (struct cgraph_edge *edge)
! {
! struct cgraph_node *to = edge->caller;
! struct cgraph_node *what = edge->callee;
! struct cgraph_edge *e, *next;
! int times = 0;
!
! /* Look for all calls, mark them inline and clone recursivly
! all inlined functions. */
! for (e = what->callers; e; e = next)
{
! next = e->next_caller;
! if (e->caller == to && e->inline_failed)
! {
! cgraph_mark_inline_edge (e);
! if (e == edge)
! edge = next;
! times ++;
! }
}
+ if (!times)
+ abort ();
+ return edge;
}
! /* Return false when inlining WHAT into TO is not good idea
! as it would cause too large growth of function bodies. */
static bool
cgraph_check_inline_limits (struct cgraph_node *to, struct cgraph_node *what,
const char **reason)
{
int times = 0;
struct cgraph_edge *e;
int newsize;
int limit;
+ if (to->global.inlined_to)
+ to = to->global.inlined_to;
+
for (e = to->callees; e; e = e->next_callee)
if (e->callee == what)
times++;
*************** cgraph_check_inline_limits (struct cgrap
*** 1039,1061 ****
if (newsize > PARAM_VALUE (PARAM_LARGE_FUNCTION_INSNS)
&& newsize > limit)
{
! *reason = N_("--param large-function-growth limit reached");
return false;
}
- for (i = 0; i < ninlined; i++)
- {
- newsize =
- cgraph_estimate_size_after_inlining (INLINED_TIMES (inlined[i]) *
- times, inlined[i], what);
- if (newsize > PARAM_VALUE (PARAM_LARGE_FUNCTION_INSNS)
- && newsize >
- inlined[i]->local.self_insns *
- (100 + PARAM_VALUE (PARAM_LARGE_FUNCTION_GROWTH)) / 100)
- {
- *reason = N_("--param large-function-growth limit reached while inlining the caller");
- return false;
- }
- }
return true;
}
--- 1154,1163 ----
if (newsize > PARAM_VALUE (PARAM_LARGE_FUNCTION_INSNS)
&& newsize > limit)
{
! if (reason)
! *reason = N_("--param large-function-growth limit reached");
return false;
}
return true;
}
*************** cgraph_default_inline_p (struct cgraph_n
*** 1072,1077 ****
--- 1174,1227 ----
return n->global.insns < MAX_INLINE_INSNS_AUTO;
}
+ /* Return true when inlining WHAT would create recursive inlining.
+ We call recursive inlining all cases where same function appears more than
+ once in the single recusion nest path in the inline graph. */
+
+ static bool
+ cgraph_recursive_inlining_p (struct cgraph_node *to,
+ struct cgraph_node *what,
+ const char **reason)
+ {
+ struct cgraph_node *node;
+
+ /* Walk TO and all functions TO is inlined in. */
+ while (1)
+ {
+ /* We create recursive inlining either by inlining WHAT into something
+ already inlined in possibly different clone of WHAT. */
+ if (what->decl == to->decl)
+ goto recursive;
+ /* Or by inlining WHAT into something that is already inlined in WHAT. */
+ for (node = cgraph_node (to->decl); node; node = node->next_clone)
+ if (node->global.inlined_to == what)
+ goto recursive;
+ if (!to->callers || to->callers->inline_failed)
+ return false;
+ to = to->callers->caller;
+ }
+ recursive:
+ if (reason)
+ *reason = (what->local.disregard_inline_limits
+ ? N_("recursive inlining") : "");
+ return true;
+ }
+
+ /* Recompute heap nodes for each of callees. */
+ static void
+ update_callee_keys (fibheap_t heap, struct fibnode **heap_node,
+ struct cgraph_node *node)
+ {
+ struct cgraph_edge *e;
+
+ for (e = node->callees; e; e = e->next_callee)
+ if (e->inline_failed && heap_node[e->callee->uid])
+ fibheap_replace_key (heap, heap_node[e->callee->uid],
+ cgraph_estimate_growth (e->callee));
+ else if (!e->inline_failed)
+ update_callee_keys (heap, heap_node, e->callee);
+ }
+
/* Set inline_failed for all callers of given function to REASON. */
static void
*************** cgraph_set_inline_failed (struct cgraph_
*** 1094,1108 ****
to be passed to cgraph_inlined_into and cgraph_inlined_callees. */
static void
! cgraph_decide_inlining_of_small_functions (struct cgraph_node **inlined,
! struct cgraph_node **inlined_callees)
{
- int i;
struct cgraph_node *node;
fibheap_t heap = fibheap_new ();
struct fibnode **heap_node =
xcalloc (cgraph_max_uid, sizeof (struct fibnode *));
- int ninlined, ninlined_callees;
int max_insns = ((HOST_WIDEST_INT) initial_insns
* (100 + PARAM_VALUE (PARAM_INLINE_UNIT_GROWTH)) / 100);
--- 1244,1255 ----
to be passed to cgraph_inlined_into and cgraph_inlined_callees. */
static void
! cgraph_decide_inlining_of_small_functions (void)
{
struct cgraph_node *node;
fibheap_t heap = fibheap_new ();
struct fibnode **heap_node =
xcalloc (cgraph_max_uid, sizeof (struct fibnode *));
int max_insns = ((HOST_WIDEST_INT) initial_insns
* (100 + PARAM_VALUE (PARAM_INLINE_UNIT_GROWTH)) / 100);
*************** cgraph_decide_inlining_of_small_function
*** 1128,1134 ****
fprintf (cgraph_dump_file, "\nDeciding on smaller functions:\n");
while (overall_insns <= max_insns && (node = fibheap_extract_min (heap)))
{
! struct cgraph_edge *e;
int old_insns = overall_insns;
heap_node[node->uid] = NULL;
--- 1275,1281 ----
fprintf (cgraph_dump_file, "\nDeciding on smaller functions:\n");
while (overall_insns <= max_insns && (node = fibheap_extract_min (heap)))
{
! struct cgraph_edge *e, *next;
int old_insns = overall_insns;
heap_node[node->uid] = NULL;
*************** cgraph_decide_inlining_of_small_function
*** 1144,1220 ****
N_("--param max-inline-insns-single limit reached after inlining into the callee"));
continue;
}
! ninlined_callees = cgraph_inlined_callees (node, inlined_callees);
! for (e = node->callers; e; e = e->next_caller)
! if (e->inline_failed)
! {
! /* Marking recursive function inlinine has sane semantic and
! thus we should not warn on it. */
! if (e->caller == node)
! {
! e->inline_failed = "";
! continue;
! }
! ninlined = cgraph_inlined_into (e->caller, inlined);
! if (e->callee->output)
! e->inline_failed = "";
! if (e->callee->output
! || !cgraph_check_inline_limits (e->caller, node, inlined,
! ninlined, &e->inline_failed))
! {
! for (i = 0; i < ninlined; i++)
! inlined[i]->output = 0, inlined[i]->aux = 0;
! if (cgraph_dump_file)
! fprintf (cgraph_dump_file, " Not inlining into %s.\n",
! cgraph_node_name (e->caller));
! continue;
! }
! cgraph_mark_inline (e->caller, node, inlined, ninlined,
! inlined_callees, ninlined_callees);
! if (heap_node[e->caller->uid])
! fibheap_replace_key (heap, heap_node[e->caller->uid],
! cgraph_estimate_growth (e->caller));
!
! /* Size of the functions we updated into has changed, so update
! the keys. */
! for (i = 0; i < ninlined; i++)
! {
! inlined[i]->output = 0, inlined[i]->aux = 0;
! if (heap_node[inlined[i]->uid])
! fibheap_replace_key (heap, heap_node[inlined[i]->uid],
! cgraph_estimate_growth (inlined[i]));
! }
! if (cgraph_dump_file)
! fprintf (cgraph_dump_file,
! " Inlined into %s which now has %i insns.\n",
! cgraph_node_name (e->caller),
! e->caller->global.insns);
! }
/* Similarly all functions called by the function we just inlined
are now called more times; update keys. */
- for (e = node->callees; e; e = e->next_callee)
- if (e->inline_failed && heap_node[e->callee->uid])
- fibheap_replace_key (heap, heap_node[e->callee->uid],
- cgraph_estimate_growth (e->callee));
-
- for (i = 0; i < ninlined_callees; i++)
- {
- struct cgraph_edge *e;
-
- for (e = inlined_callees[i]->callees; e; e = e->next_callee)
- if (e->inline_failed && heap_node[e->callee->uid])
- fibheap_replace_key (heap, heap_node[e->callee->uid],
- cgraph_estimate_growth (e->callee));
-
- inlined_callees[i]->output = 0;
- inlined_callees[i]->aux = 0;
- }
if (cgraph_dump_file)
fprintf (cgraph_dump_file,
! " Inlined %i times for a net change of %+i insns.\n",
! node->global.cloned_times, overall_insns - old_insns);
}
while ((node = fibheap_extract_min (heap)) != NULL)
if (!node->local.disregard_inline_limits)
--- 1291,1338 ----
N_("--param max-inline-insns-single limit reached after inlining into the callee"));
continue;
}
! for (e = node->callers; e; e = next)
! {
! next = e->next_caller;
! if (e->inline_failed)
! {
! struct cgraph_node *where;
!
! if (cgraph_recursive_inlining_p (e->caller, e->callee,
! &e->inline_failed)
! || !cgraph_check_inline_limits (e->caller, e->callee,
! &e->inline_failed))
! {
! if (cgraph_dump_file)
! fprintf (cgraph_dump_file, " Not inlining into %s:%s.\n",
! cgraph_node_name (e->caller), e->inline_failed);
! continue;
! }
! next = cgraph_mark_inline (e);
! where = e->caller;
! if (where->global.inlined_to)
! where = where->global.inlined_to;
!
! if (heap_node[where->uid])
! fibheap_replace_key (heap, heap_node[where->uid],
! cgraph_estimate_growth (where));
!
! if (cgraph_dump_file)
! fprintf (cgraph_dump_file,
! " Inlined into %s which now has %i insns.\n",
! cgraph_node_name (e->caller),
! e->caller->global.insns);
! }
! }
/* Similarly all functions called by the function we just inlined
are now called more times; update keys. */
+ update_callee_keys (heap, heap_node, node);
if (cgraph_dump_file)
fprintf (cgraph_dump_file,
! " Inlined for a net change of %+i insns.\n",
! overall_insns - old_insns);
}
while ((node = fibheap_extract_min (heap)) != NULL)
if (!node->local.disregard_inline_limits)
*************** cgraph_decide_inlining (void)
*** 1233,1246 ****
int nnodes;
struct cgraph_node **order =
xcalloc (cgraph_n_nodes, sizeof (struct cgraph_node *));
- struct cgraph_node **inlined =
- xcalloc (cgraph_n_nodes, sizeof (struct cgraph_node *));
- struct cgraph_node **inlined_callees =
- xcalloc (cgraph_n_nodes, sizeof (struct cgraph_node *));
- int ninlined;
- int ninlined_callees;
int old_insns = 0;
! int i, y;
for (node = cgraph_nodes; node; node = node->next)
initial_insns += node->local.self_insns;
--- 1351,1358 ----
int nnodes;
struct cgraph_node **order =
xcalloc (cgraph_n_nodes, sizeof (struct cgraph_node *));
int old_insns = 0;
! int i;
for (node = cgraph_nodes; node; node = node->next)
initial_insns += node->local.self_insns;
*************** cgraph_decide_inlining (void)
*** 1258,1268 ****
if (cgraph_dump_file)
fprintf (cgraph_dump_file, "\nInlining always_inline functions:\n");
- #ifdef ENABLE_CHECKING
- for (node = cgraph_nodes; node; node = node->next)
- if (node->aux || node->output)
- abort ();
- #endif
/* In the first pass mark all always_inline edges. Do this with a priority
so none of our later choices will make this impossible. */
--- 1370,1375 ----
*************** cgraph_decide_inlining (void)
*** 1281,1331 ****
fprintf (cgraph_dump_file,
"\nConsidering %s %i insns (always inline)\n",
cgraph_node_name (e->callee), e->callee->global.insns);
- ninlined = cgraph_inlined_into (order[i], inlined);
for (; e; e = e->next_callee)
{
old_insns = overall_insns;
! if (!e->inline_failed || !e->callee->local.inlinable
! || !e->callee->local.disregard_inline_limits)
! continue;
! if (e->callee->output || e->callee == node)
! {
! e->inline_failed = N_("recursive inlining");
! continue;
! }
! ninlined_callees =
! cgraph_inlined_callees (e->callee, inlined_callees);
! cgraph_mark_inline (node, e->callee, inlined, ninlined,
! inlined_callees, ninlined_callees);
! for (y = 0; y < ninlined_callees; y++)
! inlined_callees[y]->output = 0, inlined_callees[y]->aux = 0;
if (cgraph_dump_file)
fprintf (cgraph_dump_file,
" Inlined into %s which now has %i insns.\n",
cgraph_node_name (node->callees->caller),
node->callees->caller->global.insns);
}
! if (cgraph_dump_file && node->global.cloned_times > 0)
! fprintf (cgraph_dump_file,
! " Inlined %i times for a net change of %+i insns.\n",
! node->global.cloned_times, overall_insns - old_insns);
! for (y = 0; y < ninlined; y++)
! inlined[y]->output = 0, inlined[y]->aux = 0;
}
- #ifdef ENABLE_CHECKING
- for (node = cgraph_nodes; node; node = node->next)
- if (node->aux || node->output)
- abort ();
- #endif
if (!flag_really_no_inline)
{
! cgraph_decide_inlining_of_small_functions (inlined, inlined_callees);
! #ifdef ENABLE_CHECKING
! for (node = cgraph_nodes; node; node = node->next)
! if (node->aux || node->output)
! abort ();
! #endif
if (cgraph_dump_file)
fprintf (cgraph_dump_file, "\nDeciding on functions called once:\n");
--- 1388,1417 ----
fprintf (cgraph_dump_file,
"\nConsidering %s %i insns (always inline)\n",
cgraph_node_name (e->callee), e->callee->global.insns);
for (; e; e = e->next_callee)
{
old_insns = overall_insns;
! if (!e->inline_failed || !e->callee->local.disregard_inline_limits)
! continue;
! if (cgraph_recursive_inlining_p (order[i], e->callee,
! &e->inline_failed))
! continue;
! cgraph_mark_inline (e);
if (cgraph_dump_file)
fprintf (cgraph_dump_file,
" Inlined into %s which now has %i insns.\n",
cgraph_node_name (node->callees->caller),
node->callees->caller->global.insns);
}
! if (cgraph_dump_file)
! fprintf (cgraph_dump_file,
! " Inlined for a net change of %+i insns.\n",
! overall_insns - old_insns);
}
if (!flag_really_no_inline)
{
! cgraph_decide_inlining_of_small_functions ();
if (cgraph_dump_file)
fprintf (cgraph_dump_file, "\nDeciding on functions called once:\n");
*************** cgraph_decide_inlining (void)
*** 1351,1357 ****
ok = false;
if (ok)
{
- const char *dummy_reason;
if (cgraph_dump_file)
fprintf (cgraph_dump_file,
"\nConsidering %s %i insns.\n"
--- 1437,1442 ----
*************** cgraph_decide_inlining (void)
*** 1359,1380 ****
cgraph_node_name (node), node->global.insns,
cgraph_node_name (node->callers->caller),
node->callers->caller->global.insns);
! ninlined = cgraph_inlined_into (node->callers->caller,
! inlined);
old_insns = overall_insns;
! /* Inlining functions once would never cause inlining warnings. */
! if (cgraph_check_inline_limits
! (node->callers->caller, node, inlined, ninlined,
! &dummy_reason))
{
! ninlined_callees =
! cgraph_inlined_callees (node, inlined_callees);
! cgraph_mark_inline (node->callers->caller, node, inlined,
! ninlined, inlined_callees,
! ninlined_callees);
! for (y = 0; y < ninlined_callees; y++)
! inlined_callees[y]->output = 0, inlined_callees[y]->aux = 0;
if (cgraph_dump_file)
fprintf (cgraph_dump_file,
" Inlined into %s which now has %i insns"
--- 1444,1456 ----
cgraph_node_name (node), node->global.insns,
cgraph_node_name (node->callers->caller),
node->callers->caller->global.insns);
!
old_insns = overall_insns;
! if (cgraph_check_inline_limits (node->callers->caller, node,
! NULL))
{
! cgraph_mark_inline (node->callers);
if (cgraph_dump_file)
fprintf (cgraph_dump_file,
" Inlined into %s which now has %i insns"
*************** cgraph_decide_inlining (void)
*** 1389,1400 ****
fprintf (cgraph_dump_file,
" Inline limit reached, not inlined.\n");
}
- for (y = 0; y < ninlined; y++)
- inlined[y]->output = 0, inlined[y]->aux = 0;
}
}
}
}
cgraph_remove_unreachable_nodes ();
if (cgraph_dump_file)
--- 1465,1478 ----
fprintf (cgraph_dump_file,
" Inline limit reached, not inlined.\n");
}
}
}
}
}
+
+ /* We will never output extern functions we didn't inline.
+ ??? Perhaps we can prevent accounting of growth of external
+ inline functions. */
cgraph_remove_unreachable_nodes ();
if (cgraph_dump_file)
*************** cgraph_decide_inlining (void)
*** 1404,1411 ****
ncalls_inlined, nfunctions_inlined, initial_insns,
overall_insns);
free (order);
- free (inlined);
- free (inlined_callees);
}
/* Decide on the inlining. We do so in the topological order to avoid
--- 1482,1487 ----
*************** static void
*** 1415,1509 ****
cgraph_decide_inlining_incrementally (struct cgraph_node *node)
{
struct cgraph_edge *e;
- struct cgraph_node **inlined =
- xmalloc (sizeof (struct cgraph_node *) * cgraph_n_nodes);
- struct cgraph_node **inlined_callees =
- xmalloc (sizeof (struct cgraph_node *) * cgraph_n_nodes);
- int ninlined;
- int ninlined_callees;
- int y;
-
- ninlined = cgraph_inlined_into (node, inlined);
/* First of all look for always inline functions. */
for (e = node->callees; e; e = e->next_callee)
! if (e->callee->local.disregard_inline_limits && e->inline_failed
/* ??? It is possible that renaming variable removed the function body
in duplicate_decls. See gcc.c-torture/compile/20011119-2.c */
&& DECL_SAVED_TREE (e->callee->decl))
! {
! if (e->callee->output || e->callee == node)
! {
! e->inline_failed = N_("recursive inlining");
! continue;
! }
! ninlined_callees = cgraph_inlined_callees (e->callee, inlined_callees);
! cgraph_mark_inline (node, e->callee, inlined, ninlined,
! inlined_callees, ninlined_callees);
! for (y = 0; y < ninlined_callees; y++)
! inlined_callees[y]->output = 0, inlined_callees[y]->aux = 0;
! }
if (!flag_really_no_inline)
! {
! /* Now do the automatic inlining. */
! for (e = node->callees; e; e = e->next_callee)
! if (e->callee->local.inlinable && e->inline_failed
! && cgraph_default_inline_p (e->callee)
! && cgraph_check_inline_limits (node, e->callee, inlined,
! ninlined, &e->inline_failed)
! && DECL_SAVED_TREE (e->callee->decl))
! {
! /* Marking recursive function inlinine has sane semantic and thus
! we should not warn on it. */
! if (e->callee->output || e->callee == node)
! {
! e->inline_failed = "";
! continue;
! }
! ninlined_callees = cgraph_inlined_callees (e->callee,
! inlined_callees);
! cgraph_mark_inline (node, e->callee, inlined, ninlined,
! inlined_callees, ninlined_callees);
! for (y = 0; y < ninlined_callees; y++)
! inlined_callees[y]->output = 0, inlined_callees[y]->aux = 0;
! }
! }
!
! /* Clear the flags set by cgraph_inlined_into. */
! for (y = 0; y < ninlined; y++)
! inlined[y]->output = 0, inlined[y]->aux = 0;
!
! free (inlined);
! free (inlined_callees);
}
! /* Return true when CALLER_DECL should be inlined into CALLEE_DECL.
! When returned false and reason is non-NULL, set it to the reason
! why the call was not inlined. */
bool
! cgraph_inline_p (tree caller_decl, tree callee_decl, const char **reason)
{
! struct cgraph_node *caller = cgraph_node (caller_decl);
! struct cgraph_node *callee = cgraph_node (callee_decl);
! struct cgraph_edge *e;
!
! for (e = caller->callees; e; e = e->next_callee)
! if (e->callee == callee)
! {
! if (e->inline_failed && reason)
! *reason = e->inline_failed;
! return !e->inline_failed;
! }
! /* We do not record builtins in the callgraph. Perhaps it would make more
! sense to do so and then prune out those not overwritten by explicit
! function body. */
! if (reason)
! *reason = "originally indirect function calls never inlined";
! return false;
}
/* Expand all functions that must be output.
Attempt to topologically sort the nodes so function is output when
--- 1491,1535 ----
cgraph_decide_inlining_incrementally (struct cgraph_node *node)
{
struct cgraph_edge *e;
/* First of all look for always inline functions. */
for (e = node->callees; e; e = e->next_callee)
! if (e->callee->local.disregard_inline_limits
! && e->inline_failed
! && !cgraph_recursive_inlining_p (node, e->callee, &e->inline_failed)
/* ??? It is possible that renaming variable removed the function body
in duplicate_decls. See gcc.c-torture/compile/20011119-2.c */
&& DECL_SAVED_TREE (e->callee->decl))
! cgraph_mark_inline (e);
+ /* Now do the automatic inlining. */
if (!flag_really_no_inline)
! for (e = node->callees; e; e = e->next_callee)
! if (e->callee->local.inlinable
! && e->inline_failed
! && !e->callee->local.disregard_inline_limits
! && !cgraph_recursive_inlining_p (node, e->callee, &e->inline_failed)
! && cgraph_check_inline_limits (node, e->callee, &e->inline_failed)
! && DECL_SAVED_TREE (e->callee->decl))
! {
! if (cgraph_default_inline_p (e->callee))
! cgraph_mark_inline (e);
! else
! e->inline_failed
! = N_("--param max-inline-insns-single limit reached");
! }
}
! /* Return true when CALLER_DECL should be inlined into CALLEE_DECL. */
bool
! cgraph_inline_p (struct cgraph_edge *e, const char **reason)
{
! *reason = e->inline_failed;
! return !e->inline_failed;
}
+
/* Expand all functions that must be output.
Attempt to topologically sort the nodes so function is output when
*************** cgraph_expand_all_functions (void)
*** 1520,1533 ****
struct cgraph_node *node;
struct cgraph_node **order =
xcalloc (cgraph_n_nodes, sizeof (struct cgraph_node *));
! int order_pos = 0;
int i;
cgraph_mark_functions_to_output ();
order_pos = cgraph_postorder (order);
! for (i = order_pos - 1; i >= 0; i--)
{
node = order[i];
if (node->output)
--- 1546,1567 ----
struct cgraph_node *node;
struct cgraph_node **order =
xcalloc (cgraph_n_nodes, sizeof (struct cgraph_node *));
! int order_pos = 0, new_order_pos = 0;
int i;
cgraph_mark_functions_to_output ();
order_pos = cgraph_postorder (order);
+ if (order_pos != cgraph_n_nodes)
+ abort ();
! /* Garbage collector may remove inline clones we elliminate during
! optimization. So we must be sure to not reference them. */
! for (i = 0; i < order_pos; i++)
! if (order[i]->output)
! order[new_order_pos++] = order[i];
!
! for (i = new_order_pos - 1; i >= 0; i--)
{
node = order[i];
if (node->output)
*************** cgraph_mark_local_functions (void)
*** 1570,1580 ****
--- 1604,1635 ----
fprintf (cgraph_dump_file, "\n\n");
}
+ /* Return true when function body of DECL still needs to be kept around
+ for later re-use. */
+ bool
+ cgraph_preserve_function_body_p (tree decl)
+ {
+ struct cgraph_node *node;
+ /* Keep the body; we're going to dump it. */
+ if (dump_enabled_p (TDI_all))
+ return true;
+ if (!cgraph_global_info_ready)
+ return (DECL_INLINE (decl) && !flag_really_no_inline);
+ /* Look if there is any clone around. */
+ for (node = cgraph_node (decl); node; node = node->next_clone)
+ if (node->global.inlined_to)
+ return true;
+ return false;
+ }
+
/* Perform simple optimizations based on callgraph. */
void
cgraph_optimize (void)
{
+ #ifdef ENABLE_CHECKING
+ verify_cgraph ();
+ #endif
if (!flag_unit_at_a_time)
return;
timevar_push (TV_CGRAPHOPT);
*************** cgraph_optimize (void)
*** 1588,1594 ****
dump_cgraph (cgraph_dump_file);
}
! cgraph_decide_inlining ();
cgraph_global_info_ready = true;
if (cgraph_dump_file)
{
--- 1643,1650 ----
dump_cgraph (cgraph_dump_file);
}
! if (flag_inline_trees)
! cgraph_decide_inlining ();
cgraph_global_info_ready = true;
if (cgraph_dump_file)
{
*************** cgraph_optimize (void)
*** 1600,1609 ****
--- 1656,1671 ----
/* Output everything. */
if (!quiet_flag)
fprintf (stderr, "Assembling functions:\n");
+ #ifdef ENABLE_CHECKING
+ verify_cgraph ();
+ #endif
cgraph_expand_all_functions ();
if (cgraph_dump_file)
{
fprintf (cgraph_dump_file, "\nFinal ");
dump_cgraph (cgraph_dump_file);
}
+ #ifdef ENABLE_CHECKING
+ verify_cgraph ();
+ #endif
}
Index: function.h
===================================================================
RCS file: /cvs/gcc/gcc/gcc/function.h,v
retrieving revision 1.110
diff -c -3 -p -r1.110 function.h
*** function.h 4 Feb 2004 12:22:32 -0000 1.110
--- function.h 5 Feb 2004 12:43:39 -0000
*************** struct function GTY(())
*** 181,186 ****
--- 181,193 ----
struct emit_status *emit;
struct varasm_status *varasm;
+ /* For tree-optimize.c. */
+
+ /* Saved tree and arguments during tree optimization. Used later for
+ inlining */
+ tree saved_tree;
+ tree saved_args;
+
/* For function.c. */
/* Points to the FUNCTION_DECL of this function. */
Index: timevar.def
===================================================================
RCS file: /cvs/gcc/gcc/gcc/timevar.def,v
retrieving revision 1.24
diff -c -3 -p -r1.24 timevar.def
*** timevar.def 31 Jan 2004 02:06:48 -0000 1.24
--- timevar.def 5 Feb 2004 12:43:39 -0000
*************** DEFTIMEVAR (TV_PARSE , "
*** 61,66 ****
--- 61,67 ----
DEFTIMEVAR (TV_NAME_LOOKUP , "name lookup")
DEFTIMEVAR (TV_OVERLOAD , "overload resolution")
DEFTIMEVAR (TV_TEMPLATE_INSTANTIATION, "template instantiation")
+ DEFTIMEVAR (TV_CGRAPH_VERIFY , "callgraph verifier")
DEFTIMEVAR (TV_EXPAND , "expand")
DEFTIMEVAR (TV_VARCONST , "varconst")
DEFTIMEVAR (TV_INTEGRATION , "integration")
Index: toplev.c
===================================================================
RCS file: /cvs/gcc/gcc/gcc/toplev.c,v
retrieving revision 1.873
diff -c -3 -p -r1.873 toplev.c
*** toplev.c 30 Jan 2004 17:43:23 -0000 1.873
--- toplev.c 5 Feb 2004 12:43:39 -0000
*************** rest_of_compilation (tree decl)
*** 3666,3677 ****
/* We're done with this function. Free up memory if we can. */
free_after_parsing (cfun);
- if (! DECL_DEFER_OUTPUT (decl))
- {
- free_after_compilation (cfun);
- DECL_SAVED_INSNS (decl) = 0;
- }
- cfun = 0;
ggc_collect ();
--- 3666,3671 ----
Index: tree-inline.c
===================================================================
RCS file: /cvs/gcc/gcc/gcc/tree-inline.c,v
retrieving revision 1.91
diff -c -3 -p -r1.91 tree-inline.c
*** tree-inline.c 21 Jan 2004 20:40:04 -0000 1.91
--- tree-inline.c 5 Feb 2004 12:43:40 -0000
*************** Boston, MA 02111-1307, USA. */
*** 39,44 ****
--- 39,45 ----
#include "langhooks.h"
#include "cgraph.h"
#include "intl.h"
+ #include "function.h"
/* This should be eventually be generalized to other languages, but
*************** typedef struct inline_data
*** 103,114 ****
distinguish between those two situations. This flag is true if
we are cloning, rather than inlining. */
bool cloning_p;
/* Hash table used to prevent walk_tree from visiting the same node
umpteen million times. */
htab_t tree_pruner;
! /* Decl of function we are inlining into. */
! tree decl;
! tree current_decl;
} inline_data;
/* Prototypes. */
--- 104,118 ----
distinguish between those two situations. This flag is true if
we are cloning, rather than inlining. */
bool cloning_p;
+ /* Similarly for saving function body. */
+ bool saving_p;
/* Hash table used to prevent walk_tree from visiting the same node
umpteen million times. */
htab_t tree_pruner;
! /* Callgraph node of function we are inlining into. */
! struct cgraph_node *node;
! /* Callgraph node of currently inlined function. */
! struct cgraph_node *current_node;
} inline_data;
/* Prototypes. */
*************** static void remap_block (tree *, tree, i
*** 131,136 ****
--- 135,156 ----
static tree add_stmt_to_compound (tree, tree, tree);
#endif /* INLINER_FOR_JAVA */
+ /* Insert a tree->tree mapping for ID. Despite the name suggests
+ that the trees should be variables, it is used for more than that. */
+
+ static void
+ insert_decl_map (inline_data *id, tree key, tree value)
+ {
+ splay_tree_insert (id->decl_map, (splay_tree_key) key,
+ (splay_tree_value) value);
+
+ /* Always insert an identity map as well. If we see this same new
+ node again, we won't want to duplicate it a second time. */
+ if (key != value)
+ splay_tree_insert (id->decl_map, (splay_tree_key) value,
+ (splay_tree_value) value);
+ }
+
/* Remap DECL during the copying of the BLOCK tree for the function. */
static tree
*************** copy_body_r (tree *tp, int *walk_subtree
*** 529,537 ****
/* If this is a RETURN_STMT, change it into an EXPR_STMT and a
GOTO_STMT with the RET_LABEL as its target. */
#ifndef INLINER_FOR_JAVA
! if (TREE_CODE (*tp) == RETURN_STMT && id->ret_label)
#else /* INLINER_FOR_JAVA */
! if (TREE_CODE (*tp) == RETURN_EXPR && id->ret_label)
#endif /* INLINER_FOR_JAVA */
{
tree return_stmt = *tp;
--- 549,557 ----
/* If this is a RETURN_STMT, change it into an EXPR_STMT and a
GOTO_STMT with the RET_LABEL as its target. */
#ifndef INLINER_FOR_JAVA
! if (TREE_CODE (*tp) == RETURN_STMT && id->ret_label && !id->saving_p)
#else /* INLINER_FOR_JAVA */
! if (TREE_CODE (*tp) == RETURN_EXPR && id->ret_label && !id->saving_p)
#endif /* INLINER_FOR_JAVA */
{
tree return_stmt = *tp;
*************** copy_body_r (tree *tp, int *walk_subtree
*** 636,641 ****
--- 656,663 ----
knows not to copy VAR_DECLs, etc., so this is safe. */
else
{
+ tree old_node = *tp;
+
if (TREE_CODE (*tp) == MODIFY_EXPR
&& TREE_OPERAND (*tp, 0) == TREE_OPERAND (*tp, 1)
&& ((*lang_hooks.tree_inlining.auto_var_in_fn_p)
*************** copy_body_r (tree *tp, int *walk_subtree
*** 683,688 ****
--- 705,736 ----
copy_tree_r (tp, walk_subtrees, NULL);
+ if (TREE_CODE (*tp) == CALL_EXPR && id->node && get_callee_fndecl (*tp))
+ {
+ if (id->saving_p)
+ {
+ struct cgraph_node *node;
+ struct cgraph_edge *edge;
+
+ for (node = id->node->next_clone; node; node = node->next_clone)
+ {
+ edge = cgraph_edge (node, old_node);
+ if (edge)
+ edge->call_expr = *tp;
+ else
+ abort ();
+ }
+ }
+ else if (!id->cloning_p)
+ {
+ struct cgraph_edge *edge;
+
+ edge = cgraph_edge (id->current_node, old_node);
+ if (edge)
+ cgraph_clone_edge (edge, id->node, *tp);
+ }
+ }
+
TREE_TYPE (*tp) = remap_type (TREE_TYPE (*tp), id);
/* The copied TARGET_EXPR has never been expanded, even if the
*************** static tree
*** 705,712 ****
copy_body (inline_data *id)
{
tree body;
! body = DECL_SAVED_TREE (VARRAY_TOP_TREE (id->fns));
walk_tree (&body, copy_body_r, id, NULL);
return body;
--- 753,765 ----
copy_body (inline_data *id)
{
tree body;
+ tree fndecl = VARRAY_TOP_TREE (id->fns);
! if (fndecl == current_function_decl
! && cfun->saved_tree)
! body = cfun->saved_tree;
! else
! body = DECL_SAVED_TREE (fndecl);
walk_tree (&body, copy_body_r, id, NULL);
return body;
*************** initialize_inlined_parameters (inline_da
*** 732,739 ****
int argnum = 0;
/* Figure out what the parameters are. */
! parms =
! DECL_ARGUMENTS (fn);
/* Start with no initializations whatsoever. */
init_stmts = NULL_TREE;
--- 785,793 ----
int argnum = 0;
/* Figure out what the parameters are. */
! parms = DECL_ARGUMENTS (fn);
! if (fn == current_function_decl && cfun->saved_args)
! parms = cfun->saved_args;
/* Start with no initializations whatsoever. */
init_stmts = NULL_TREE;
*************** expand_call_inline (tree *tp, int *walk_
*** 1250,1255 ****
--- 1304,1310 ----
splay_tree st;
tree args;
tree return_slot_addr;
+ struct cgraph_edge *edge;
const char *reason;
/* See what we've got. */
*************** expand_call_inline (tree *tp, int *walk_
*** 1329,1337 ****
&& DECL_SAVED_TREE (DECL_ABSTRACT_ORIGIN (fn)))
fn = DECL_ABSTRACT_ORIGIN (fn);
/* Don't try to inline functions that are not well-suited to
inlining. */
! if (!cgraph_inline_p (id->current_decl, fn, &reason))
{
if (lookup_attribute ("always_inline", DECL_ATTRIBUTES (fn)))
{
--- 1384,1413 ----
&& DECL_SAVED_TREE (DECL_ABSTRACT_ORIGIN (fn)))
fn = DECL_ABSTRACT_ORIGIN (fn);
+ /* Objective C and fortran still calls tree_rest_of_compilation directly.
+ Kill this check once this is fixed. */
+ if (!id->current_node->analyzed)
+ return NULL_TREE;
+
+ edge = cgraph_edge (id->current_node, t);
+
+ /* Constant propagation on argument done during previous inlining
+ may create new direct call. Produce an edge for it. */
+ if (!edge)
+ {
+ struct cgraph_node *dest = cgraph_node (fn);
+
+ /* FN must have address taken so it can be passed as argument. */
+ if (!dest->needed)
+ abort ();
+ cgraph_create_edge (id->node, dest, t)->inline_failed
+ = N_("originally indirect function call not considered for inlining");
+ return NULL_TREE;
+ }
+
/* Don't try to inline functions that are not well-suited to
inlining. */
! if (!cgraph_inline_p (edge, &reason))
{
if (lookup_attribute ("always_inline", DECL_ATTRIBUTES (fn)))
{
*************** expand_call_inline (tree *tp, int *walk_
*** 1348,1353 ****
--- 1424,1434 ----
return NULL_TREE;
}
+ #ifdef ENABLE_CHECKING
+ if (edge->callee->decl != id->node->decl)
+ verify_cgraph_node (edge->callee);
+ #endif
+
if (! (*lang_hooks.tree_inlining.start_inlining) (fn))
return NULL_TREE;
*************** expand_call_inline (tree *tp, int *walk_
*** 1483,1505 ****
/* After we've initialized the parameters, we insert the body of the
function itself. */
#ifndef INLINER_FOR_JAVA
! inlined_body = &COMPOUND_BODY (stmt);
! while (*inlined_body)
! inlined_body = &TREE_CHAIN (*inlined_body);
! *inlined_body = copy_body (id);
#else /* INLINER_FOR_JAVA */
! {
! tree new_body;
! java_inlining_map_static_initializers (fn, id->decl_map);
! new_body = copy_body (id);
! TREE_TYPE (new_body) = TREE_TYPE (TREE_TYPE (fn));
! BLOCK_EXPR_BODY (expr)
! = add_stmt_to_compound (BLOCK_EXPR_BODY (expr),
! TREE_TYPE (new_body), new_body);
! inlined_body = &BLOCK_EXPR_BODY (expr);
! }
#endif /* INLINER_FOR_JAVA */
/* After the body of the function comes the RET_LABEL. This must come
before we evaluate the returned value below, because that evaluation
--- 1564,1592 ----
/* After we've initialized the parameters, we insert the body of the
function itself. */
+ {
+ struct cgraph_node *old_node = id->current_node;
+
+ id->current_node = edge->callee;
#ifndef INLINER_FOR_JAVA
! inlined_body = &COMPOUND_BODY (stmt);
! while (*inlined_body)
! inlined_body = &TREE_CHAIN (*inlined_body);
! *inlined_body = copy_body (id);
#else /* INLINER_FOR_JAVA */
! {
! tree new_body;
! java_inlining_map_static_initializers (fn, id->decl_map);
! new_body = copy_body (id);
! TREE_TYPE (new_body) = TREE_TYPE (TREE_TYPE (fn));
! BLOCK_EXPR_BODY (expr)
! = add_stmt_to_compound (BLOCK_EXPR_BODY (expr),
! TREE_TYPE (new_body), new_body);
! inlined_body = &BLOCK_EXPR_BODY (expr);
! }
#endif /* INLINER_FOR_JAVA */
+ id->current_node = old_node;
+ }
/* After the body of the function comes the RET_LABEL. This must come
before we evaluate the returned value below, because that evaluation
*************** expand_call_inline (tree *tp, int *walk_
*** 1575,1593 ****
id->inlined_insns += DECL_ESTIMATED_INSNS (fn) - 1;
/* Update callgraph if needed. */
! if (id->decl)
! {
! cgraph_remove_call (id->decl, fn);
! cgraph_create_edges (id->decl, *inlined_body);
! }
/* Recurse into the body of the just inlined function. */
! {
! tree old_decl = id->current_decl;
! id->current_decl = fn;
! expand_calls_inline (inlined_body, id);
! id->current_decl = old_decl;
! }
VARRAY_POP (id->fns);
/* If we've returned to the top level, clear out the record of how
--- 1662,1671 ----
id->inlined_insns += DECL_ESTIMATED_INSNS (fn) - 1;
/* Update callgraph if needed. */
! cgraph_remove_node (edge->callee);
/* Recurse into the body of the just inlined function. */
! expand_calls_inline (inlined_body, id);
VARRAY_POP (id->fns);
/* If we've returned to the top level, clear out the record of how
*************** optimize_inline_calls (tree fn)
*** 1629,1636 ****
/* Clear out ID. */
memset (&id, 0, sizeof (id));
! id.decl = fn;
! id.current_decl = fn;
/* Don't allow recursion into FN. */
VARRAY_TREE_INIT (id.fns, 32, "fns");
VARRAY_PUSH_TREE (id.fns, fn);
--- 1707,1713 ----
/* Clear out ID. */
memset (&id, 0, sizeof (id));
! id.current_node = id.node = cgraph_node (fn);
/* Don't allow recursion into FN. */
VARRAY_TREE_INIT (id.fns, 32, "fns");
VARRAY_PUSH_TREE (id.fns, fn);
*************** optimize_inline_calls (tree fn)
*** 1672,1677 ****
--- 1749,1766 ----
VARRAY_ACTIVE_SIZE (id.inlined_fns) * sizeof (tree));
DECL_INLINED_FNS (fn) = ifn;
}
+ #ifdef ENABLE_CHECKING
+ {
+ struct cgraph_edge *e;
+
+ verify_cgraph_node (id.node);
+
+ /* Double check that we inlined everything we are supposed to inline. */
+ for (e = id.node->callees; e; e = e->next_callee)
+ if (!e->inline_failed)
+ abort ();
+ }
+ #endif
}
/* FN is a function that has a complete body, and CLONE is a function
*************** clone_body (tree clone, tree fn, void *a
*** 1699,1704 ****
--- 1788,1827 ----
/* Actually copy the body. */
TREE_CHAIN (DECL_SAVED_TREE (clone)) = copy_body (&id);
+ }
+
+ /* Save duplicate of body in FN. MAP is used to pass around splay tree
+ used to update arguments in restore_body. */
+ tree
+ save_body (tree fn, tree *arg_copy)
+ {
+ inline_data id;
+ tree body, *parg;
+
+ memset (&id, 0, sizeof (id));
+ VARRAY_TREE_INIT (id.fns, 1, "fns");
+ VARRAY_PUSH_TREE (id.fns, fn);
+ id.node = cgraph_node (fn);
+ id.saving_p = true;
+ id.decl_map = splay_tree_new (splay_tree_compare_pointers, NULL, NULL);
+ *arg_copy = DECL_ARGUMENTS (fn);
+ for (parg = arg_copy; *parg; parg = &TREE_CHAIN (*parg))
+ {
+ tree new = copy_node (*parg);
+ (*lang_hooks.dup_lang_specific_decl) (new);
+ DECL_ABSTRACT_ORIGIN (new) = DECL_ORIGIN (*parg);
+ insert_decl_map (&id, *parg, new);
+ TREE_CHAIN (new) = TREE_CHAIN (*parg);
+ *parg = new;
+ }
+ insert_decl_map (&id, DECL_RESULT (fn), DECL_RESULT (fn));
+
+ /* Actually copy the body. */
+ body = copy_body (&id);
+
+ /* Clean up. */
+ splay_tree_delete (id.decl_map);
+ return body;
}
/* Apply FUNC to all the sub-trees of TP in a pre-order traversal.
Index: tree-inline.h
===================================================================
RCS file: /cvs/gcc/gcc/gcc/tree-inline.h,v
retrieving revision 1.8
diff -c -3 -p -r1.8 tree-inline.h
*** tree-inline.h 5 Aug 2003 14:11:43 -0000 1.8
--- tree-inline.h 5 Feb 2004 12:43:40 -0000
*************** tree walk_tree (tree*, walk_tree_fn, voi
*** 30,35 ****
--- 30,36 ----
tree walk_tree_without_duplicates (tree*, walk_tree_fn, void*);
tree copy_tree_r (tree*, int*, void*);
void clone_body (tree, tree, void*);
+ tree save_body (tree, tree *);
void remap_save_expr (tree*, void*, tree, int*);
/* 0 if we should not perform inlining.
Index: tree-optimize.c
===================================================================
RCS file: /cvs/gcc/gcc/gcc/tree-optimize.c,v
retrieving revision 2.10
diff -c -3 -p -r2.10 tree-optimize.c
*** tree-optimize.c 31 Jan 2004 02:06:48 -0000 2.10
--- tree-optimize.c 5 Feb 2004 12:43:40 -0000
*************** void
*** 96,101 ****
--- 96,102 ----
tree_rest_of_compilation (tree fndecl, bool nested_p)
{
location_t saved_loc;
+ struct cgraph_node *node, *saved_node = NULL;
timevar_push (TV_EXPAND);
*************** tree_rest_of_compilation (tree fndecl, b
*** 118,123 ****
--- 119,157 ----
immediate_size_expand = 0;
cfun->x_dont_save_pending_sizes_p = 1;
+ node = cgraph_node (fndecl);
+
+ /* We might need the body of this function so that we can expand
+ it inline somewhere else. This means not lowering some constructs
+ such as exception handling. */
+ if (cgraph_preserve_function_body_p (fndecl))
+ {
+ if (!flag_unit_at_a_time)
+ {
+ struct cgraph_edge *e;
+
+ saved_node = cgraph_clone_node (node);
+ for (e = saved_node->callees; e; e = e->next_callee)
+ if (!e->inline_failed)
+ cgraph_clone_inlined_nodes (e, true);
+ }
+ cfun->saved_tree = save_body (fndecl, &cfun->saved_args);
+ }
+
+ if (flag_inline_trees)
+ {
+ struct cgraph_edge *e;
+ for (e = node->callees; e; e = e->next_callee)
+ if (!e->inline_failed || warn_inline)
+ break;
+ if (e)
+ {
+ timevar_push (TV_INTEGRATION);
+ optimize_inline_calls (fndecl);
+ timevar_pop (TV_INTEGRATION);
+ }
+ }
+
/* If the function has a variably modified type, there may be
SAVE_EXPRs in the parameter types. Their context must be set to
refer to this function; they cannot be expanded in the containing
*************** tree_rest_of_compilation (tree fndecl, b
*** 167,172 ****
--- 201,207 ----
/* Run the optimizers and output the assembler code for this function. */
rest_of_compilation (fndecl);
+
/* Undo the GC context switch. */
if (nested_p)
ggc_pop_context ();
*************** tree_rest_of_compilation (tree fndecl, b
*** 205,215 ****
walk_tree_without_duplicates (&DECL_SAVED_TREE (fndecl),
clear_decl_rtl,
fndecl);
! if (!cgraph_function_possibly_inlined_p (fndecl))
{
DECL_SAVED_TREE (fndecl) = NULL;
! if (DECL_SAVED_INSNS (fndecl) == 0
! && !cgraph_node (fndecl)->origin)
{
/* Stop pointing to the local nodes about to be freed.
But DECL_INITIAL must remain nonzero so we know this
--- 240,270 ----
walk_tree_without_duplicates (&DECL_SAVED_TREE (fndecl),
clear_decl_rtl,
fndecl);
! /* Restore original body if still needed. */
! if (cfun->saved_tree)
! {
! DECL_SAVED_TREE (fndecl) = cfun->saved_tree;
! DECL_ARGUMENTS (fndecl) = cfun->saved_args;
!
! /* When not in unit-at-a-time mode, we must preserve out of line copy
! representing node before inlining. Restore original outgoing edges
! using clone we created earlier. */
! if (!flag_unit_at_a_time)
! {
! struct cgraph_edge *e;
! while (node->callees)
! cgraph_remove_edge (node->callees);
! node->callees = saved_node->callees;
! saved_node->callees = NULL;
! for (e = saved_node->callees; e; e = e->next_callee)
! e->caller = node;
! cgraph_remove_node (saved_node);
! }
! }
! else
{
DECL_SAVED_TREE (fndecl) = NULL;
! if (cgraph_node (fndecl)->origin)
{
/* Stop pointing to the local nodes about to be freed.
But DECL_INITIAL must remain nonzero so we know this
*************** tree_rest_of_compilation (tree fndecl, b
*** 222,227 ****
--- 277,285 ----
DECL_ARGUMENTS (fndecl) = 0;
}
}
+ free_after_compilation (cfun);
+ cfun = 0;
+ DECL_SAVED_INSNS (fndecl) = 0;
input_location = saved_loc;
Index: ada/utils.c
===================================================================
RCS file: /cvs/gcc/gcc/gcc/ada/utils.c,v
retrieving revision 1.42
diff -c -3 -p -r1.42 utils.c
*** ada/utils.c 2 Feb 2004 12:32:01 -0000 1.42
--- ada/utils.c 5 Feb 2004 12:43:40 -0000
***************
*** 37,42 ****
--- 37,43 ----
#include "debug.h"
#include "convert.h"
#include "target.h"
+ #include "function.h"
#include "ada.h"
#include "types.h"
*************** end_subprog_body (void)
*** 1918,1924 ****
/* If we're only annotating types, don't actually compile this
function. */
if (!type_annotate_only)
! rest_of_compilation (current_function_decl);
if (function_nesting_depth > 1)
ggc_pop_context ();
--- 1919,1933 ----
/* If we're only annotating types, don't actually compile this
function. */
if (!type_annotate_only)
! {
! rest_of_compilation (current_function_decl);
! if (! DECL_DEFER_OUTPUT (current_function_decl))
! {
! free_after_compilation (cfun);
! DECL_SAVED_INSNS (current_function_decl) = 0;
! }
! cfun = 0;
! }
if (function_nesting_depth > 1)
ggc_pop_context ();
Index: f/Make-lang.in
===================================================================
RCS file: /cvs/gcc/gcc/gcc/f/Make-lang.in,v
retrieving revision 1.142
diff -c -3 -p -r1.142 Make-lang.in
*** f/Make-lang.in 31 Jan 2004 00:50:01 -0000 1.142
--- f/Make-lang.in 5 Feb 2004 12:43:42 -0000
*************** f/com.o: f/com.c f/proj.h $(CONFIG_H) $(
*** 375,381 ****
f/intrin.def f/lab.h f/symbol.h f/symbol.def f/equiv.h f/storag.h f/global.h \
f/name.h f/expr.h f/implic.h f/src.h f/st.h $(GGC_H) toplev.h diagnostic.h \
$(LANGHOOKS_DEF) langhooks.h intl.h real.h debug.h gt-f-com.h gtype-f.h \
! coretypes.h $(TM_H)
f/data.o: f/data.c f/proj.h $(CONFIG_H) $(SYSTEM_H) f/data.h f/bld.h f/bld-op.def \
f/bit.h f/malloc.h f/com.h f/com-rt.def $(TREE_H) f/info.h f/info-b.def \
f/info-k.def f/info-w.def f/target.h f/bad.h f/bad.def f/where.h glimits.h \
--- 375,381 ----
f/intrin.def f/lab.h f/symbol.h f/symbol.def f/equiv.h f/storag.h f/global.h \
f/name.h f/expr.h f/implic.h f/src.h f/st.h $(GGC_H) toplev.h diagnostic.h \
$(LANGHOOKS_DEF) langhooks.h intl.h real.h debug.h gt-f-com.h gtype-f.h \
! coretypes.h $(TM_H) function.h
f/data.o: f/data.c f/proj.h $(CONFIG_H) $(SYSTEM_H) f/data.h f/bld.h f/bld-op.def \
f/bit.h f/malloc.h f/com.h f/com-rt.def $(TREE_H) f/info.h f/info-b.def \
f/info-k.def f/info-w.def f/target.h f/bad.h f/bad.def f/where.h glimits.h \
Index: f/com.c
===================================================================
RCS file: /cvs/gcc/gcc/gcc/f/com.c,v
retrieving revision 1.222
diff -c -3 -p -r1.222 com.c
*** f/com.c 3 Feb 2004 05:15:46 -0000 1.222
--- f/com.c 5 Feb 2004 12:43:43 -0000
*************** typedef struct { unsigned :16, :16, :16;
*** 136,141 ****
--- 136,142 ----
#include "target.h"
#include "top.h"
#include "type.h"
+ #include "function.h"
/* Externals defined here. */
*************** finish_function (int nested)
*** 13591,13596 ****
--- 13592,13603 ----
/* Run the optimizers and output the assembler code for this function. */
rest_of_compilation (fndecl);
+ if (! DECL_DEFER_OUTPUT (fndecl))
+ {
+ free_after_compilation (cfun);
+ DECL_SAVED_INSNS (fndecl) = 0;
+ }
+ cfun = 0;
/* Undo the GC context switch. */
if (nested)