/* Basic IPA optimizations and utilities.
- Copyright (C) 2003, 2004, 2005, 2007, 2008, 2009, 2010
- Free Software Foundation, Inc.
+ Copyright (C) 2003-2013 Free Software Foundation, Inc.
This file is part of GCC.
#include "tm.h"
#include "cgraph.h"
#include "tree-pass.h"
-#include "timevar.h"
#include "gimple.h"
#include "ggc.h"
#include "flags.h"
#include "pointer-set.h"
#include "target.h"
#include "tree-iterator.h"
+#include "ipa-utils.h"
+#include "pointer-set.h"
+#include "ipa-inline.h"
+#include "hash-table.h"
+#include "tree-inline.h"
+#include "profile.h"
+#include "params.h"
+#include "lto-streamer.h"
+#include "data-streamer.h"
-/* Fill array order with all nodes with output flag set in the reverse
- topological order. */
+/* Return true when NODE can not be local. Worker for cgraph_local_node_p. */
-int
-cgraph_postorder (struct cgraph_node **order)
+static bool
+cgraph_non_local_node_p_1 (struct cgraph_node *node, void *data ATTRIBUTE_UNUSED)
{
- struct cgraph_node *node, *node2;
- int stack_size = 0;
- int order_pos = 0;
- struct cgraph_edge *edge, last;
- int pass;
-
- struct cgraph_node **stack =
- XCNEWVEC (struct cgraph_node *, cgraph_n_nodes);
-
- /* We have to deal with cycles nicely, so use a depth first traversal
- output algorithm. Ignore the fact that some functions won't need
- to be output and put them into order as well, so we get dependencies
- right through inline functions. */
- for (node = cgraph_nodes; node; node = node->next)
- node->aux = NULL;
- for (pass = 0; pass < 2; pass++)
- for (node = cgraph_nodes; node; node = node->next)
- if (!node->aux
- && (pass
- || (!cgraph_only_called_directly_p (node)
- && !node->address_taken)))
- {
- node2 = node;
- if (!node->callers)
- node->aux = &last;
- else
- node->aux = node->callers;
- while (node2)
- {
- while (node2->aux != &last)
- {
- edge = (struct cgraph_edge *) node2->aux;
- if (edge->next_caller)
- node2->aux = edge->next_caller;
- else
- node2->aux = &last;
- /* Break possible cycles involving always-inline
- functions by ignoring edges from always-inline
- functions to non-always-inline functions. */
- if (edge->caller->local.disregard_inline_limits
- && !edge->callee->local.disregard_inline_limits)
- continue;
- if (!edge->caller->aux)
- {
- if (!edge->caller->callers)
- edge->caller->aux = &last;
- else
- edge->caller->aux = edge->caller->callers;
- stack[stack_size++] = node2;
- node2 = edge->caller;
- break;
- }
- }
- if (node2->aux == &last)
- {
- order[order_pos++] = node2;
- if (stack_size)
- node2 = stack[--stack_size];
- else
- node2 = NULL;
- }
- }
- }
- free (stack);
- for (node = cgraph_nodes; node; node = node->next)
- node->aux = NULL;
- return order_pos;
+ /* FIXME: Aliases can be local, but i386 gets thunks wrong then. */
+ return !(cgraph_only_called_directly_or_aliased_p (node)
+ && !ipa_ref_has_aliases_p (&node->symbol.ref_list)
+ && node->symbol.definition
+ && !DECL_EXTERNAL (node->symbol.decl)
+ && !node->symbol.externally_visible
+ && !node->symbol.used_from_other_partition
+ && !node->symbol.in_other_partition);
+}
+
+/* Return true when function can be marked local. */
+
+static bool
+cgraph_local_node_p (struct cgraph_node *node)
+{
+ struct cgraph_node *n = cgraph_function_or_thunk_node (node, NULL);
+
+ /* FIXME: thunks can be considered local, but we need prevent i386
+ from attempting to change calling convention of them. */
+ if (n->thunk.thunk_p)
+ return false;
+ return !cgraph_for_node_and_aliases (n,
+ cgraph_non_local_node_p_1, NULL, true);
+
+}
+
+/* Return true when NODE has ADDR reference. */
+
+static bool
+has_addr_references_p (struct cgraph_node *node,
+ void *data ATTRIBUTE_UNUSED)
+{
+ int i;
+ struct ipa_ref *ref;
+
+ for (i = 0; ipa_ref_list_referring_iterate (&node->symbol.ref_list,
+ i, ref); i++)
+ if (ref->use == IPA_REF_ADDR)
+ return true;
+ return false;
}
/* Look for all functions inlined to NODE and update their inlined_to pointers
}
}
-/* Add cgraph NODE to queue starting at FIRST.
+/* Add symtab NODE to queue starting at FIRST.
The queue is linked via AUX pointers and terminated by pointer to 1.
We enqueue nodes at two occasions: when we find them reachable or when we find
reachable. */
static void
-enqueue_cgraph_node (struct cgraph_node *node, struct cgraph_node **first)
+enqueue_node (symtab_node node, symtab_node *first,
+ struct pointer_set_t *reachable)
{
/* Node is still in queue; do nothing. */
- if (node->aux && node->aux != (void *) 2)
+ if (node->symbol.aux && node->symbol.aux != (void *) 2)
return;
/* Node was already processed as unreachable, re-enqueue
only if it became reachable now. */
- if (node->aux == (void *)2 && !node->reachable)
+ if (node->symbol.aux == (void *)2 && !pointer_set_contains (reachable, node))
return;
- node->aux = *first;
- *first = node;
-}
-
-/* Add varpool NODE to queue starting at FIRST. */
-
-static void
-enqueue_varpool_node (struct varpool_node *node, struct varpool_node **first)
-{
- node->aux = *first;
+ node->symbol.aux = *first;
*first = node;
}
static void
process_references (struct ipa_ref_list *list,
- struct cgraph_node **first,
- struct varpool_node **first_varpool,
- bool before_inlining_p)
+ symtab_node *first,
+ bool before_inlining_p,
+ struct pointer_set_t *reachable)
{
int i;
struct ipa_ref *ref;
for (i = 0; ipa_ref_list_reference_iterate (list, i, ref); i++)
{
- if (ref->refered_type == IPA_REF_CGRAPH)
- {
- struct cgraph_node *node = ipa_ref_node (ref);
- if (!node->reachable
- && (!DECL_EXTERNAL (node->decl)
- || before_inlining_p))
- {
- node->reachable = true;
- enqueue_cgraph_node (node, first);
- }
- }
- else
- {
- struct varpool_node *node = ipa_ref_varpool_node (ref);
- if (!node->needed)
- {
- varpool_mark_needed_node (node);
- enqueue_varpool_node (node, first_varpool);
- }
- }
+ symtab_node node = ref->referred;
+
+ if (node->symbol.definition && !node->symbol.in_other_partition
+ && ((!DECL_EXTERNAL (node->symbol.decl) || node->symbol.alias)
+ || (before_inlining_p
+ /* We use variable constructors during late complation for
+ constant folding. Keep references alive so partitioning
+ knows about potential references. */
+ || (TREE_CODE (node->symbol.decl) == VAR_DECL
+ && flag_wpa
+ && ctor_for_folding (node->symbol.decl)
+ != error_mark_node))))
+ pointer_set_insert (reachable, node);
+ enqueue_node ((symtab_node) node, first, reachable);
}
}
-/* Return true when function NODE can be removed from callgraph
- if all direct calls are eliminated. */
-static inline bool
-varpool_can_remove_if_no_refs (struct varpool_node *node)
-{
- return (!node->force_output && !node->used_from_other_partition
- && (DECL_COMDAT (node->decl) || !node->externally_visible));
-}
+/* Perform reachability analysis and reclaim all unreachable nodes.
-/* Return true when function can be marked local. */
+ The algorithm is basically mark&sweep but with some extra refinements:
-static bool
-cgraph_local_node_p (struct cgraph_node *node)
-{
- return (cgraph_only_called_directly_p (node)
- && node->analyzed
- && !DECL_EXTERNAL (node->decl)
- && !node->local.externally_visible
- && !node->reachable_from_other_partition
- && !node->in_other_partition);
-}
+ - reachable extern inline functions needs special handling; the bodies needs
+ to stay in memory until inlining in hope that they will be inlined.
+ After inlining we release their bodies and turn them into unanalyzed
+ nodes even when they are reachable.
-/* Perform reachability analysis and reclaim all unreachable nodes.
- If BEFORE_INLINING_P is true this function is called before inlining
- decisions has been made. If BEFORE_INLINING_P is false this function also
- removes unneeded bodies of extern inline functions. */
+ BEFORE_INLINING_P specify whether we are before or after inlining.
+
+ - virtual functions are kept in callgraph even if they seem unreachable in
+ hope calls to them will be devirtualized.
+
+ Again we remove them after inlining. In late optimization some
+ devirtualization may happen, but it is not importnat since we won't inline
+ the call. In theory early opts and IPA should work out all important cases.
+
+ - virtual clones needs bodies of their origins for later materialization;
+ this means that we want to keep the body even if the origin is unreachable
+ otherwise. To avoid origin from sitting in the callgraph and being
+ walked by IPA passes, we turn them into unanalyzed nodes with body
+ defined.
+
+ We maintain set of function declaration where body needs to stay in
+ body_needed_for_clonning
+
+ Inline clones represent special case: their declaration match the
+ declaration of origin and cgraph_remove_node already knows how to
+ reshape callgraph and preserve body when offline copy of function or
+ inline clone is being removed.
+
+ - C++ virtual tables keyed to other unit are represented as DECL_EXTERNAL
+ variables with DECL_INITIAL set. We finalize these and keep reachable
+ ones around for constant folding purposes. After inlining we however
+ stop walking their references to let everything static referneced by them
+ to be removed when it is otherwise unreachable.
+
+ We maintain queue of both reachable symbols (i.e. defined symbols that needs
+ to stay) and symbols that are in boundary (i.e. external symbols referenced
+ by reachable symbols or origins of clones). The queue is represented
+ as linked list by AUX pointer terminated by 1.
+
+ A the end we keep all reachable symbols. For symbols in boundary we always
+ turn definition into a declaration, but we may keep function body around
+ based on body_needed_for_clonning
+
+ All symbols that enter the queue have AUX pointer non-zero and are in the
+ boundary. Pointer set REACHABLE is used to track reachable symbols.
+
+ Every symbol can be visited twice - once as part of boundary and once
+ as real reachable symbol. enqueue_node needs to decide whether the
+ node needs to be re-queued for second processing. For this purpose
+ we set AUX pointer of processed symbols in the boundary to constant 2. */
bool
-cgraph_remove_unreachable_nodes (bool before_inlining_p, FILE *file)
+symtab_remove_unreachable_nodes (bool before_inlining_p, FILE *file)
{
- struct cgraph_node *first = (struct cgraph_node *) (void *) 1;
- struct varpool_node *first_varpool = (struct varpool_node *) (void *) 1;
+ symtab_node first = (symtab_node) (void *) 1;
struct cgraph_node *node, *next;
struct varpool_node *vnode, *vnext;
bool changed = false;
+ struct pointer_set_t *reachable = pointer_set_create ();
+ struct pointer_set_t *body_needed_for_clonning = pointer_set_create ();
#ifdef ENABLE_CHECKING
- verify_cgraph ();
+ verify_symtab ();
#endif
if (file)
fprintf (file, "\nReclaiming functions:");
#ifdef ENABLE_CHECKING
- for (node = cgraph_nodes; node; node = node->next)
- gcc_assert (!node->aux);
- for (vnode = varpool_nodes; vnode; vnode = vnode->next)
- gcc_assert (!vnode->aux);
+ FOR_EACH_FUNCTION (node)
+ gcc_assert (!node->symbol.aux);
+ FOR_EACH_VARIABLE (vnode)
+ gcc_assert (!vnode->symbol.aux);
#endif
- varpool_reset_queue ();
- for (node = cgraph_nodes; node; node = node->next)
- if ((!cgraph_can_remove_if_no_direct_calls_and_refs_p (node)
- /* Keep around virtual functions for possible devirtualization. */
- || (!before_inlining_p
- && !node->global.inlined_to
- && DECL_VIRTUAL_P (node->decl)
- && (DECL_COMDAT (node->decl) || DECL_EXTERNAL (node->decl))))
- && ((!DECL_EXTERNAL (node->decl))
- || before_inlining_p))
- {
- gcc_assert (!node->global.inlined_to);
- enqueue_cgraph_node (node, &first);
- node->reachable = true;
- }
- else
- {
- gcc_assert (!node->aux);
- node->reachable = false;
- }
- for (vnode = varpool_nodes; vnode; vnode = vnode->next)
+ /* Mark functions whose bodies are obviously needed.
+ This is mostly when they can be referenced externally. Inline clones
+ are special since their declarations are shared with master clone and thus
+ cgraph_can_remove_if_no_direct_calls_and_refs_p should not be called on them. */
+ FOR_EACH_FUNCTION (node)
{
- vnode->next_needed = NULL;
- vnode->prev_needed = NULL;
- if (!varpool_can_remove_if_no_refs (vnode))
+ node->used_as_abstract_origin = false;
+ if (node->symbol.definition
+ && !node->global.inlined_to
+ && !node->symbol.in_other_partition
+ && (!cgraph_can_remove_if_no_direct_calls_and_refs_p (node)
+ /* Keep around virtual functions for possible devirtualization. */
+ || (before_inlining_p
+ && DECL_VIRTUAL_P (node->symbol.decl))))
{
- vnode->needed = false;
- varpool_mark_needed_node (vnode);
- enqueue_varpool_node (vnode, &first_varpool);
+ gcc_assert (!node->global.inlined_to);
+ pointer_set_insert (reachable, node);
+ enqueue_node ((symtab_node)node, &first, reachable);
}
else
- vnode->needed = false;
- }
-
- /* Perform reachability analysis. As a special case do not consider
- extern inline functions not inlined as live because we won't output
- them at all.
+ gcc_assert (!node->symbol.aux);
+ }
- We maintain two worklist, one for cgraph nodes other for varpools and
- are finished once both are empty. */
+ /* Mark variables that are obviously needed. */
+ FOR_EACH_DEFINED_VARIABLE (vnode)
+ if (!varpool_can_remove_if_no_refs (vnode)
+ && !vnode->symbol.in_other_partition)
+ {
+ pointer_set_insert (reachable, vnode);
+ enqueue_node ((symtab_node)vnode, &first, reachable);
+ }
- while (first != (struct cgraph_node *) (void *) 1
- || first_varpool != (struct varpool_node *) (void *) 1)
+ /* Perform reachability analysis. */
+ while (first != (symtab_node) (void *) 1)
{
- if (first != (struct cgraph_node *) (void *) 1)
+ bool in_boundary_p = !pointer_set_contains (reachable, first);
+ symtab_node node = first;
+
+ first = (symtab_node)first->symbol.aux;
+
+ /* If we are processing symbol in boundary, mark its AUX pointer for
+ possible later re-processing in enqueue_node. */
+ if (in_boundary_p)
+ node->symbol.aux = (void *)2;
+ else
{
- struct cgraph_edge *e;
- node = first;
- first = (struct cgraph_node *) first->aux;
- if (!node->reachable)
- node->aux = (void *)2;
-
- /* If we found this node reachable, first mark on the callees
- reachable too, unless they are direct calls to extern inline functions
- we decided to not inline. */
- if (node->reachable)
+ if (DECL_ABSTRACT_ORIGIN (node->symbol.decl))
{
- for (e = node->callees; e; e = e->next_callee)
- if (!e->callee->reachable
- && node->analyzed
- && (!e->inline_failed || !e->callee->analyzed
- || (!DECL_EXTERNAL (e->callee->decl))
- || before_inlining_p))
- {
- e->callee->reachable = true;
- enqueue_cgraph_node (e->callee, &first);
- }
- process_references (&node->ref_list, &first, &first_varpool, before_inlining_p);
+ struct cgraph_node *origin_node
+ = cgraph_get_create_real_symbol_node (DECL_ABSTRACT_ORIGIN (node->symbol.decl));
+ origin_node->used_as_abstract_origin = true;
+ enqueue_node ((symtab_node) origin_node, &first, reachable);
}
-
- /* If any function in a comdat group is reachable, force
- all other functions in the same comdat group to be
- also reachable. */
- if (node->same_comdat_group
- && node->reachable
- && !node->global.inlined_to)
+ /* If any symbol in a comdat group is reachable, force
+ all other in the same comdat group to be also reachable. */
+ if (node->symbol.same_comdat_group)
{
- for (next = node->same_comdat_group;
+ symtab_node next;
+ for (next = node->symbol.same_comdat_group;
next != node;
- next = next->same_comdat_group)
- if (!next->reachable)
- {
- next->reachable = true;
- enqueue_cgraph_node (next, &first);
- }
+ next = next->symbol.same_comdat_group)
+ if (!pointer_set_insert (reachable, next))
+ enqueue_node ((symtab_node) next, &first, reachable);
}
+ /* Mark references as reachable. */
+ process_references (&node->symbol.ref_list, &first,
+ before_inlining_p, reachable);
+ }
- /* We can freely remove inline clones even if they are cloned, however if
- function is clone of real clone, we must keep it around in order to
- make materialize_clones produce function body with the changes
- applied. */
- while (node->clone_of && !node->clone_of->aux
- && !gimple_has_body_p (node->decl))
+ if (cgraph_node *cnode = dyn_cast <cgraph_node> (node))
+ {
+ /* Mark the callees reachable unless they are direct calls to extern
+ inline functions we decided to not inline. */
+ if (!in_boundary_p)
{
- bool noninline = node->clone_of->decl != node->decl;
- node = node->clone_of;
- if (noninline && !node->reachable && !node->aux)
- {
- enqueue_cgraph_node (node, &first);
- break;
+ struct cgraph_edge *e;
+ for (e = cnode->callees; e; e = e->next_callee)
+ {
+ if (e->callee->symbol.definition
+ && !e->callee->symbol.in_other_partition
+ && (!e->inline_failed
+ || !DECL_EXTERNAL (e->callee->symbol.decl)
+ || e->callee->symbol.alias
+ || before_inlining_p))
+ pointer_set_insert (reachable, e->callee);
+ enqueue_node ((symtab_node) e->callee, &first, reachable);
+ }
+
+ /* When inline clone exists, mark body to be preserved so when removing
+ offline copy of the function we don't kill it. */
+ if (cnode->global.inlined_to)
+ pointer_set_insert (body_needed_for_clonning, cnode->symbol.decl);
+
+ /* For non-inline clones, force their origins to the boundary and ensure
+ that body is not removed. */
+ while (cnode->clone_of)
+ {
+ bool noninline = cnode->clone_of->symbol.decl != cnode->symbol.decl;
+ cnode = cnode->clone_of;
+ if (noninline)
+ {
+ pointer_set_insert (body_needed_for_clonning, cnode->symbol.decl);
+ enqueue_node ((symtab_node)cnode, &first, reachable);
+ }
}
}
}
- if (first_varpool != (struct varpool_node *) (void *) 1)
+ /* When we see constructor of external variable, keep referred nodes in the
+ boundary. This will also hold initializers of the external vars NODE
+ refers to. */
+ varpool_node *vnode = dyn_cast <varpool_node> (node);
+ if (vnode
+ && DECL_EXTERNAL (node->symbol.decl)
+ && !vnode->symbol.alias
+ && in_boundary_p)
{
- vnode = first_varpool;
- first_varpool = (struct varpool_node *)first_varpool->aux;
- vnode->aux = NULL;
- process_references (&vnode->ref_list, &first, &first_varpool, before_inlining_p);
- /* If any function in a comdat group is reachable, force
- all other functions in the same comdat group to be
- also reachable. */
- if (vnode->same_comdat_group)
- {
- struct varpool_node *next;
- for (next = vnode->same_comdat_group;
- next != vnode;
- next = next->same_comdat_group)
- if (!next->needed)
- {
- varpool_mark_needed_node (next);
- enqueue_varpool_node (next, &first_varpool);
- }
- }
+ struct ipa_ref *ref;
+ for (int i = 0; ipa_ref_list_reference_iterate (&node->symbol.ref_list, i, ref); i++)
+ enqueue_node (ref->referred, &first, reachable);
}
}
- /* Remove unreachable nodes.
-
- Completely unreachable functions can be fully removed from the callgraph.
- Extern inline functions that we decided to not inline need to become unanalyzed nodes of
- callgraph (so we still have edges to them). We remove function body then.
-
- Also we need to care functions that are unreachable but we need to keep them around
- for later clonning. In this case we also turn them to unanalyzed nodes, but
- keep the body around. */
- for (node = cgraph_nodes; node; node = next)
+ /* Remove unreachable functions. */
+ for (node = cgraph_first_function (); node; node = next)
{
- next = node->next;
- if (node->aux && !node->reachable)
- {
- cgraph_node_remove_callees (node);
- ipa_remove_all_references (&node->ref_list);
- node->analyzed = false;
- node->local.inlinable = false;
- }
- if (!node->aux)
- {
- struct cgraph_edge *e;
- bool found = false;
- int i;
- struct ipa_ref *ref;
+ next = cgraph_next_function (node);
- node->global.inlined_to = NULL;
+ /* If node is not needed at all, remove it. */
+ if (!node->symbol.aux)
+ {
if (file)
fprintf (file, " %s", cgraph_node_name (node));
- /* See if there is reachable caller. */
- for (e = node->callers; e && !found; e = e->next_caller)
- if (e->caller->reachable)
- found = true;
- for (i = 0; (ipa_ref_list_refering_iterate (&node->ref_list, i, ref)
- && !found); i++)
- if (ref->refering_type == IPA_REF_CGRAPH
- && ipa_ref_refering_node (ref)->reachable)
- found = true;
- else if (ref->refering_type == IPA_REF_VARPOOL
- && ipa_ref_refering_varpool_node (ref)->needed)
- found = true;
-
- /* If so, we need to keep node in the callgraph. */
- if (found || node->needed)
- {
- if (node->analyzed)
- {
- struct cgraph_node *clone;
-
- /* If there are still clones, we must keep body around.
- Otherwise we can just remove the body but keep the clone. */
- for (clone = node->clones; clone;
- clone = clone->next_sibling_clone)
- if (clone->aux)
- break;
- if (!clone)
- {
- cgraph_release_function_body (node);
- node->local.inlinable = false;
- if (node->prev_sibling_clone)
- node->prev_sibling_clone->next_sibling_clone = node->next_sibling_clone;
- else if (node->clone_of)
- node->clone_of->clones = node->next_sibling_clone;
- if (node->next_sibling_clone)
- node->next_sibling_clone->prev_sibling_clone = node->prev_sibling_clone;
- #ifdef ENABLE_CHECKING
- if (node->clone_of)
- node->former_clone_of = node->clone_of->decl;
- #endif
- node->clone_of = NULL;
- node->next_sibling_clone = NULL;
- node->prev_sibling_clone = NULL;
- }
- else
- gcc_assert (!clone->in_other_partition);
- node->analyzed = false;
- changed = true;
- cgraph_node_remove_callees (node);
- ipa_remove_all_references (&node->ref_list);
- }
- }
- else
+ cgraph_remove_node (node);
+ changed = true;
+ }
+ /* If node is unreachable, remove its body. */
+ else if (!pointer_set_contains (reachable, node))
+ {
+ if (!pointer_set_contains (body_needed_for_clonning, node->symbol.decl))
+ cgraph_release_function_body (node);
+ else if (!node->clone_of)
+ gcc_assert (in_lto_p || DECL_RESULT (node->symbol.decl));
+ if (node->symbol.definition)
{
- cgraph_remove_node (node);
+ if (file)
+ fprintf (file, " %s", cgraph_node_name (node));
+ node->symbol.analyzed = false;
+ node->symbol.definition = false;
+ node->symbol.cpp_implicit_alias = false;
+ node->symbol.alias = false;
+ node->symbol.weakref = false;
+ if (!node->symbol.in_other_partition)
+ node->local.local = false;
+ cgraph_node_remove_callees (node);
+ ipa_remove_all_references (&node->symbol.ref_list);
changed = true;
}
}
+ else
+ gcc_assert (node->clone_of || !cgraph_function_with_gimple_body_p (node)
+ || in_lto_p || DECL_RESULT (node->symbol.decl));
}
- for (node = cgraph_nodes; node; node = node->next)
+
+ /* Inline clones might be kept around so their materializing allows further
+ cloning. If the function the clone is inlined into is removed, we need
+ to turn it into normal cone. */
+ FOR_EACH_FUNCTION (node)
{
- /* Inline clones might be kept around so their materializing allows further
- cloning. If the function the clone is inlined into is removed, we need
- to turn it into normal cone. */
if (node->global.inlined_to
&& !node->callers)
{
node->global.inlined_to = NULL;
update_inlined_to_pointer (node, node);
}
- node->aux = NULL;
+ node->symbol.aux = NULL;
}
+ /* Remove unreachable variables. */
if (file)
- fprintf (file, "\n");
-
- /* We must release unused extern inlines or sanity checking will fail. Rest of transformations
- are undesirable at -O0 since we do not want to remove anything. */
- if (!optimize)
- return changed;
-
- if (file)
- fprintf (file, "Reclaiming variables:");
- for (vnode = varpool_nodes; vnode; vnode = vnext)
+ fprintf (file, "\nReclaiming variables:");
+ for (vnode = varpool_first_variable (); vnode; vnode = vnext)
{
- vnext = vnode->next;
- if (!vnode->needed)
- {
+ vnext = varpool_next_variable (vnode);
+ if (!vnode->symbol.aux
+ /* For can_refer_decl_in_current_unit_p we want to track for
+ all external variables if they are defined in other partition
+ or not. */
+ && (!flag_ltrans || !DECL_EXTERNAL (vnode->symbol.decl)))
+ {
if (file)
fprintf (file, " %s", varpool_node_name (vnode));
varpool_remove_node (vnode);
changed = true;
}
+ else if (!pointer_set_contains (reachable, vnode))
+ {
+ tree init;
+ if (vnode->symbol.definition)
+ {
+ if (file)
+ fprintf (file, " %s", varpool_node_name (vnode));
+ changed = true;
+ }
+ vnode->symbol.definition = false;
+ vnode->symbol.analyzed = false;
+ vnode->symbol.aux = NULL;
+
+ /* Keep body if it may be useful for constant folding. */
+ if ((init = ctor_for_folding (vnode->symbol.decl)) == error_mark_node)
+ varpool_remove_initializer (vnode);
+ else
+ DECL_INITIAL (vnode->symbol.decl) = init;
+ ipa_remove_all_references (&vnode->symbol.ref_list);
+ }
+ else
+ vnode->symbol.aux = NULL;
}
- /* Now update address_taken flags and try to promote functions to be local. */
+ pointer_set_destroy (reachable);
+ pointer_set_destroy (body_needed_for_clonning);
+ /* Now update address_taken flags and try to promote functions to be local. */
if (file)
fprintf (file, "\nClearing address taken flags:");
- for (node = cgraph_nodes; node; node = node->next)
- if (node->address_taken
- && !node->reachable_from_other_partition)
+ FOR_EACH_DEFINED_FUNCTION (node)
+ if (node->symbol.address_taken
+ && !node->symbol.used_from_other_partition)
{
- int i;
- struct ipa_ref *ref;
- bool found = false;
- for (i = 0; ipa_ref_list_refering_iterate (&node->ref_list, i, ref)
- && !found; i++)
- {
- gcc_assert (ref->use == IPA_REF_ADDR);
- found = true;
- }
- if (!found)
+ if (!cgraph_for_node_and_aliases (node, has_addr_references_p, NULL, true))
{
if (file)
fprintf (file, " %s", cgraph_node_name (node));
- node->address_taken = false;
+ node->symbol.address_taken = false;
changed = true;
if (cgraph_local_node_p (node))
{
}
}
}
+ if (file)
+ fprintf (file, "\n");
#ifdef ENABLE_CHECKING
- verify_cgraph ();
+ verify_symtab ();
#endif
- /* Reclaim alias pairs for functions that have disappeared from the
- call graph. */
- remove_unreachable_alias_pairs ();
+ /* If we removed something, perhaps profile could be improved. */
+ if (changed && optimize && inline_edge_summary_vec.exists ())
+ FOR_EACH_DEFINED_FUNCTION (node)
+ cgraph_propagate_frequency (node);
return changed;
}
struct varpool_node *vnode;
if (dump_file)
fprintf (dump_file, "Clearing variable flags:");
- for (vnode = varpool_nodes; vnode; vnode = vnode->next)
- if (vnode->finalized && varpool_all_refs_explicit_p (vnode)
- && (TREE_ADDRESSABLE (vnode->decl) || !TREE_READONLY (vnode->decl)))
+ FOR_EACH_VARIABLE (vnode)
+ if (vnode->symbol.definition && varpool_all_refs_explicit_p (vnode)
+ && (TREE_ADDRESSABLE (vnode->symbol.decl)
+ || !TREE_READONLY (vnode->symbol.decl)))
{
bool written = false;
bool address_taken = false;
int i;
struct ipa_ref *ref;
- for (i = 0; ipa_ref_list_refering_iterate (&vnode->ref_list, i, ref)
+ for (i = 0; ipa_ref_list_referring_iterate (&vnode->symbol.ref_list,
+ i, ref)
&& (!written || !address_taken); i++)
switch (ref->use)
{
written = true;
break;
}
- if (TREE_ADDRESSABLE (vnode->decl) && !address_taken)
+ if (TREE_ADDRESSABLE (vnode->symbol.decl) && !address_taken)
{
if (dump_file)
fprintf (dump_file, " %s (addressable)", varpool_node_name (vnode));
- TREE_ADDRESSABLE (vnode->decl) = 0;
+ TREE_ADDRESSABLE (vnode->symbol.decl) = 0;
}
- if (!TREE_READONLY (vnode->decl) && !address_taken && !written
+ if (!TREE_READONLY (vnode->symbol.decl) && !address_taken && !written
/* Making variable in explicit section readonly can cause section
type conflict.
See e.g. gcc.c-torture/compile/pr23237.c */
- && DECL_SECTION_NAME (vnode->decl) == NULL)
+ && DECL_SECTION_NAME (vnode->symbol.decl) == NULL)
{
if (dump_file)
fprintf (dump_file, " %s (read-only)", varpool_node_name (vnode));
- TREE_READONLY (vnode->decl) = 1;
+ TREE_READONLY (vnode->symbol.decl) = 1;
}
}
if (dump_file)
fprintf (dump_file, "\n");
}
+/* Return true when there is a reference to node and it is not vtable. */
+static bool
+address_taken_from_non_vtable_p (symtab_node node)
+{
+ int i;
+ struct ipa_ref *ref;
+ for (i = 0; ipa_ref_list_referring_iterate (&node->symbol.ref_list,
+ i, ref); i++)
+ if (ref->use == IPA_REF_ADDR)
+ {
+ struct varpool_node *node;
+ if (is_a <cgraph_node> (ref->referring))
+ return true;
+ node = ipa_ref_referring_varpool_node (ref);
+ if (!DECL_VIRTUAL_P (node->symbol.decl))
+ return true;
+ }
+ return false;
+}
+
+/* A helper for comdat_can_be_unshared_p. */
+
+static bool
+comdat_can_be_unshared_p_1 (symtab_node node)
+{
+ /* When address is taken, we don't know if equality comparison won't
+ break eventually. Exception are virutal functions and vtables,
+ where this is not possible by language standard. */
+ if (!DECL_VIRTUAL_P (node->symbol.decl)
+ && address_taken_from_non_vtable_p (node))
+ return false;
+
+ /* If the symbol is used in some weird way, better to not touch it. */
+ if (node->symbol.force_output)
+ return false;
+
+ /* Explicit instantiations needs to be output when possibly
+ used externally. */
+ if (node->symbol.forced_by_abi
+ && TREE_PUBLIC (node->symbol.decl)
+ && (node->symbol.resolution != LDPR_PREVAILING_DEF_IRONLY
+ && !flag_whole_program))
+ return false;
+
+ /* Non-readonly and volatile variables can not be duplicated. */
+ if (is_a <varpool_node> (node)
+ && (!TREE_READONLY (node->symbol.decl)
+ || TREE_THIS_VOLATILE (node->symbol.decl)))
+ return false;
+ return true;
+}
+
+/* COMDAT functions must be shared only if they have address taken,
+ otherwise we can produce our own private implementation with
+ -fwhole-program.
+ Return true when turning COMDAT functoin static can not lead to wrong
+ code when the resulting object links with a library defining same COMDAT.
+
+ Virtual functions do have their addresses taken from the vtables,
+ but in C++ there is no way to compare their addresses for equality. */
+
+static bool
+comdat_can_be_unshared_p (symtab_node node)
+{
+ if (!comdat_can_be_unshared_p_1 (node))
+ return false;
+ if (node->symbol.same_comdat_group)
+ {
+ symtab_node next;
+
+ /* If more than one function is in the same COMDAT group, it must
+ be shared even if just one function in the comdat group has
+ address taken. */
+ for (next = node->symbol.same_comdat_group;
+ next != node; next = next->symbol.same_comdat_group)
+ if (!comdat_can_be_unshared_p_1 (next))
+ return false;
+ }
+ return true;
+}
+
/* Return true when function NODE should be considered externally visible. */
static bool
-cgraph_externally_visible_p (struct cgraph_node *node, bool whole_program, bool aliased)
+cgraph_externally_visible_p (struct cgraph_node *node,
+ bool whole_program)
{
- if (!node->local.finalized)
+ if (!node->symbol.definition)
return false;
- if (!DECL_COMDAT (node->decl)
- && (!TREE_PUBLIC (node->decl) || DECL_EXTERNAL (node->decl)))
+ if (!TREE_PUBLIC (node->symbol.decl)
+ || DECL_EXTERNAL (node->symbol.decl))
return false;
- /* Do not even try to be smart about aliased nodes. Until we properly
- represent everything by same body alias, these are just evil. */
- if (aliased)
+ /* Do not try to localize built-in functions yet. One of problems is that we
+ end up mangling their asm for WHOPR that makes it impossible to call them
+ using the implicit built-in declarations anymore. Similarly this enables
+ us to remove them as unreachable before actual calls may appear during
+ expansion or folding. */
+ if (DECL_BUILT_IN (node->symbol.decl))
return true;
/* If linker counts on us, we must preserve the function. */
- if (cgraph_used_from_object_file_p (node))
+ if (symtab_used_from_object_file_p ((symtab_node) node))
+ return true;
+ if (DECL_PRESERVE_P (node->symbol.decl))
return true;
- if (DECL_PRESERVE_P (node->decl))
+ if (lookup_attribute ("externally_visible",
+ DECL_ATTRIBUTES (node->symbol.decl)))
return true;
- if (lookup_attribute ("externally_visible", DECL_ATTRIBUTES (node->decl)))
+ if (TARGET_DLLIMPORT_DECL_ATTRIBUTES
+ && lookup_attribute ("dllexport",
+ DECL_ATTRIBUTES (node->symbol.decl)))
return true;
+ if (node->symbol.resolution == LDPR_PREVAILING_DEF_IRONLY)
+ return false;
+ /* When doing LTO or whole program, we can bring COMDAT functoins static.
+ This improves code quality and we know we will duplicate them at most twice
+ (in the case that we are not using plugin and link with object file
+ implementing same COMDAT) */
+ if ((in_lto_p || whole_program)
+ && DECL_COMDAT (node->symbol.decl)
+ && comdat_can_be_unshared_p ((symtab_node) node))
+ return false;
/* When doing link time optimizations, hidden symbols become local. */
if (in_lto_p
- && (DECL_VISIBILITY (node->decl) == VISIBILITY_HIDDEN
- || DECL_VISIBILITY (node->decl) == VISIBILITY_INTERNAL)
+ && (DECL_VISIBILITY (node->symbol.decl) == VISIBILITY_HIDDEN
+ || DECL_VISIBILITY (node->symbol.decl) == VISIBILITY_INTERNAL)
/* Be sure that node is defined in IR file, not in other object
file. In that case we don't set used_from_other_object_file. */
- && node->analyzed)
+ && node->symbol.definition)
;
else if (!whole_program)
return true;
- /* COMDAT functions must be shared only if they have address taken,
- otherwise we can produce our own private implementation with
- -fwhole-program. */
- else if (DECL_COMDAT (node->decl))
- {
- if (node->address_taken || !node->analyzed)
- return true;
- if (node->same_comdat_group)
- {
- struct cgraph_node *next;
-
- /* If more than one function is in the same COMDAT group, it must
- be shared even if just one function in the comdat group has
- address taken. */
- for (next = node->same_comdat_group;
- next != node;
- next = next->same_comdat_group)
- if (next->address_taken || !next->analyzed)
- return true;
- }
- }
- if (MAIN_NAME_P (DECL_NAME (node->decl)))
+ if (MAIN_NAME_P (DECL_NAME (node->symbol.decl)))
return true;
return false;
/* Return true when variable VNODE should be considered externally visible. */
-static bool
-varpool_externally_visible_p (struct varpool_node *vnode, bool aliased)
+bool
+varpool_externally_visible_p (struct varpool_node *vnode)
{
- if (!DECL_COMDAT (vnode->decl) && !TREE_PUBLIC (vnode->decl))
- return false;
-
- /* Do not even try to be smart about aliased nodes. Until we properly
- represent everything by same body alias, these are just evil. */
- if (aliased)
+ if (DECL_EXTERNAL (vnode->symbol.decl))
return true;
+ if (!TREE_PUBLIC (vnode->symbol.decl))
+ return false;
+
/* If linker counts on us, we must preserve the function. */
- if (varpool_used_from_object_file_p (vnode))
+ if (symtab_used_from_object_file_p ((symtab_node) vnode))
return true;
- if (DECL_PRESERVE_P (vnode->decl))
+ if (DECL_HARD_REGISTER (vnode->symbol.decl))
+ return true;
+ if (DECL_PRESERVE_P (vnode->symbol.decl))
return true;
if (lookup_attribute ("externally_visible",
- DECL_ATTRIBUTES (vnode->decl)))
+ DECL_ATTRIBUTES (vnode->symbol.decl)))
+ return true;
+ if (TARGET_DLLIMPORT_DECL_ATTRIBUTES
+ && lookup_attribute ("dllexport",
+ DECL_ATTRIBUTES (vnode->symbol.decl)))
return true;
/* See if we have linker information about symbol not being used or
Even if the linker clams the symbol is unused, never bring internal
symbols that are declared by user as used or externally visible.
This is needed for i.e. references from asm statements. */
- if (varpool_used_from_object_file_p (vnode))
+ if (symtab_used_from_object_file_p ((symtab_node) vnode))
return true;
+ if (vnode->symbol.resolution == LDPR_PREVAILING_DEF_IRONLY)
+ return false;
+
+ /* As a special case, the COMDAT virtual tables can be unshared.
+ In LTO mode turn vtables into static variables. The variable is readonly,
+ so this does not enable more optimization, but referring static var
+ is faster for dynamic linking. Also this match logic hidding vtables
+ from LTO symbol tables. */
+ if ((in_lto_p || flag_whole_program)
+ && DECL_COMDAT (vnode->symbol.decl)
+ && comdat_can_be_unshared_p ((symtab_node) vnode))
+ return false;
/* When doing link time optimizations, hidden symbols become local. */
if (in_lto_p
- && (DECL_VISIBILITY (vnode->decl) == VISIBILITY_HIDDEN
- || DECL_VISIBILITY (vnode->decl) == VISIBILITY_INTERNAL)
+ && (DECL_VISIBILITY (vnode->symbol.decl) == VISIBILITY_HIDDEN
+ || DECL_VISIBILITY (vnode->symbol.decl) == VISIBILITY_INTERNAL)
/* Be sure that node is defined in IR file, not in other object
file. In that case we don't set used_from_other_object_file. */
- && vnode->finalized)
+ && vnode->symbol.definition)
;
else if (!flag_whole_program)
return true;
FIXME: We can do so for readonly vars with no address taken and
possibly also for vtables since no direct pointer comparsion is done.
It might be interesting to do so to reduce linking overhead. */
- if (DECL_COMDAT (vnode->decl) || DECL_WEAK (vnode->decl))
+ if (DECL_COMDAT (vnode->symbol.decl) || DECL_WEAK (vnode->symbol.decl))
return true;
return false;
}
-/* Dissolve the same_comdat_group list in which NODE resides. */
+/* Return true if reference to NODE can be replaced by a local alias.
+ Local aliases save dynamic linking overhead and enable more optimizations.
+ */
-static void
-dissolve_same_comdat_group_list (struct cgraph_node *node)
+bool
+can_replace_by_local_alias (symtab_node node)
{
- struct cgraph_node *n = node, *next;
- do
- {
- next = n->same_comdat_group;
- n->same_comdat_group = NULL;
- n = next;
- }
- while (n != node);
+ return (symtab_node_availability (node) > AVAIL_OVERWRITABLE
+ && !DECL_EXTERNAL (node->symbol.decl)
+ && (!DECL_ONE_ONLY (node->symbol.decl)
+ || node->symbol.resolution == LDPR_PREVAILING_DEF
+ || node->symbol.resolution == LDPR_PREVAILING_DEF_IRONLY
+ || node->symbol.resolution == LDPR_PREVAILING_DEF_IRONLY_EXP));
}
/* Mark visibility of all functions.
{
struct cgraph_node *node;
struct varpool_node *vnode;
- struct pointer_set_t *aliased_nodes = pointer_set_create ();
- struct pointer_set_t *aliased_vnodes = pointer_set_create ();
- unsigned i;
- alias_pair *p;
- /* Discover aliased nodes. */
- FOR_EACH_VEC_ELT (alias_pair, alias_pairs, i, p)
- {
- if (dump_file)
- fprintf (dump_file, "Alias %s->%s",
- IDENTIFIER_POINTER (DECL_ASSEMBLER_NAME (p->decl)),
- IDENTIFIER_POINTER (p->target));
-
- if ((node = cgraph_node_for_asm (p->target)) != NULL)
- {
- gcc_assert (node->needed);
- pointer_set_insert (aliased_nodes, node);
- if (dump_file)
- fprintf (dump_file, " node %s/%i",
- cgraph_node_name (node), node->uid);
- }
- else if ((vnode = varpool_node_for_asm (p->target)) != NULL)
- {
- gcc_assert (vnode->needed);
- pointer_set_insert (aliased_vnodes, vnode);
- if (dump_file)
- fprintf (dump_file, " varpool node %s",
- varpool_node_name (vnode));
- }
- if (dump_file)
- fprintf (dump_file, "\n");
- }
+ /* All aliases should be procssed at this point. */
+ gcc_checking_assert (!alias_pairs || !alias_pairs->length());
- for (node = cgraph_nodes; node; node = node->next)
+ FOR_EACH_FUNCTION (node)
{
+ int flags = flags_from_decl_or_type (node->symbol.decl);
+
+ /* Optimize away PURE and CONST constructors and destructors. */
+ if (optimize
+ && (flags & (ECF_CONST | ECF_PURE))
+ && !(flags & ECF_LOOPING_CONST_OR_PURE))
+ {
+ DECL_STATIC_CONSTRUCTOR (node->symbol.decl) = 0;
+ DECL_STATIC_DESTRUCTOR (node->symbol.decl) = 0;
+ }
+
+ /* Frontends and alias code marks nodes as needed before parsing is finished.
+ We may end up marking as node external nodes where this flag is meaningless
+ strip it. */
+ if (DECL_EXTERNAL (node->symbol.decl) || !node->symbol.definition)
+ {
+ node->symbol.force_output = 0;
+ node->symbol.forced_by_abi = 0;
+ }
+
/* C++ FE on lack of COMDAT support create local COMDAT functions
(that ought to be shared but can not due to object format
- limitations). It is neccesary to keep the flag to make rest of C++ FE
+ limitations). It is necessary to keep the flag to make rest of C++ FE
happy. Clear the flag here to avoid confusion in middle-end. */
- if (DECL_COMDAT (node->decl) && !TREE_PUBLIC (node->decl))
- DECL_COMDAT (node->decl) = 0;
- /* For external decls stop tracking same_comdat_group, it doesn't matter
- what comdat group they are in when they won't be emitted in this TU,
- and simplifies later passes. */
- if (node->same_comdat_group && DECL_EXTERNAL (node->decl))
+ if (DECL_COMDAT (node->symbol.decl) && !TREE_PUBLIC (node->symbol.decl))
+ DECL_COMDAT (node->symbol.decl) = 0;
+
+ /* For external decls stop tracking same_comdat_group. It doesn't matter
+ what comdat group they are in when they won't be emitted in this TU. */
+ if (node->symbol.same_comdat_group && DECL_EXTERNAL (node->symbol.decl))
{
#ifdef ENABLE_CHECKING
- struct cgraph_node *n;
+ symtab_node n;
- for (n = node->same_comdat_group;
- n != node;
- n = n->same_comdat_group)
+ for (n = node->symbol.same_comdat_group;
+ n != (symtab_node)node;
+ n = n->symbol.same_comdat_group)
/* If at least one of same comdat group functions is external,
all of them have to be, otherwise it is a front-end bug. */
- gcc_assert (DECL_EXTERNAL (n->decl));
+ gcc_assert (DECL_EXTERNAL (n->symbol.decl));
#endif
- dissolve_same_comdat_group_list (node);
+ symtab_dissolve_same_comdat_group_list ((symtab_node) node);
}
- gcc_assert ((!DECL_WEAK (node->decl) && !DECL_COMDAT (node->decl))
- || TREE_PUBLIC (node->decl) || DECL_EXTERNAL (node->decl));
- if (cgraph_externally_visible_p (node, whole_program,
- pointer_set_contains (aliased_nodes,
- node)))
+ gcc_assert ((!DECL_WEAK (node->symbol.decl)
+ && !DECL_COMDAT (node->symbol.decl))
+ || TREE_PUBLIC (node->symbol.decl)
+ || node->symbol.weakref
+ || DECL_EXTERNAL (node->symbol.decl));
+ if (cgraph_externally_visible_p (node, whole_program))
{
gcc_assert (!node->global.inlined_to);
- node->local.externally_visible = true;
+ node->symbol.externally_visible = true;
}
else
- node->local.externally_visible = false;
- if (!node->local.externally_visible && node->analyzed
- && !DECL_EXTERNAL (node->decl))
{
- struct cgraph_node *alias;
- gcc_assert (whole_program || in_lto_p || !TREE_PUBLIC (node->decl));
- cgraph_make_decl_local (node->decl);
- node->resolution = LDPR_PREVAILING_DEF_IRONLY;
- for (alias = node->same_body; alias; alias = alias->next)
- cgraph_make_decl_local (alias->decl);
- if (node->same_comdat_group)
+ node->symbol.externally_visible = false;
+ node->symbol.forced_by_abi = false;
+ }
+ if (!node->symbol.externally_visible
+ && node->symbol.definition && !node->symbol.weakref
+ && !DECL_EXTERNAL (node->symbol.decl))
+ {
+ gcc_assert (whole_program || in_lto_p
+ || !TREE_PUBLIC (node->symbol.decl));
+ node->symbol.unique_name = ((node->symbol.resolution == LDPR_PREVAILING_DEF_IRONLY
+ || node->symbol.resolution == LDPR_PREVAILING_DEF_IRONLY_EXP)
+ && TREE_PUBLIC (node->symbol.decl));
+ symtab_make_decl_local (node->symbol.decl);
+ node->symbol.resolution = LDPR_PREVAILING_DEF_IRONLY;
+ if (node->symbol.same_comdat_group)
/* cgraph_externally_visible_p has already checked all other nodes
in the group and they will all be made local. We need to
dissolve the group at once so that the predicate does not
segfault though. */
- dissolve_same_comdat_group_list (node);
+ symtab_dissolve_same_comdat_group_list ((symtab_node) node);
+ }
+
+ if (node->thunk.thunk_p
+ && TREE_PUBLIC (node->symbol.decl))
+ {
+ struct cgraph_node *decl_node = node;
+
+ decl_node = cgraph_function_node (decl_node->callees->callee, NULL);
+
+ /* Thunks have the same visibility as function they are attached to.
+ Make sure the C++ front end set this up properly. */
+ if (DECL_ONE_ONLY (decl_node->symbol.decl))
+ {
+ gcc_checking_assert (DECL_COMDAT (node->symbol.decl)
+ == DECL_COMDAT (decl_node->symbol.decl));
+ gcc_checking_assert (DECL_COMDAT_GROUP (node->symbol.decl)
+ == DECL_COMDAT_GROUP (decl_node->symbol.decl));
+ gcc_checking_assert (node->symbol.same_comdat_group);
+ }
+ if (DECL_EXTERNAL (decl_node->symbol.decl))
+ DECL_EXTERNAL (node->symbol.decl) = 1;
}
- node->local.local = cgraph_local_node_p (node);
}
- for (vnode = varpool_nodes; vnode; vnode = vnode->next)
+ FOR_EACH_DEFINED_FUNCTION (node)
+ {
+ node->local.local |= cgraph_local_node_p (node);
+
+ /* If we know that function can not be overwritten by a different semantics
+ and moreover its section can not be discarded, replace all direct calls
+ by calls to an nonoverwritable alias. This make dynamic linking
+ cheaper and enable more optimization.
+
+ TODO: We can also update virtual tables. */
+ if (node->callers && can_replace_by_local_alias ((symtab_node)node))
+ {
+ struct cgraph_node *alias = cgraph (symtab_nonoverwritable_alias ((symtab_node) node));
+
+ if (alias != node)
+ {
+ while (node->callers)
+ {
+ struct cgraph_edge *e = node->callers;
+
+ cgraph_redirect_edge_callee (e, alias);
+ if (!flag_wpa)
+ {
+ push_cfun (DECL_STRUCT_FUNCTION (e->caller->symbol.decl));
+ cgraph_redirect_edge_call_stmt_to_callee (e);
+ pop_cfun ();
+ }
+ }
+ }
+ }
+ }
+ FOR_EACH_VARIABLE (vnode)
{
/* weak flag makes no sense on local variables. */
- gcc_assert (!DECL_WEAK (vnode->decl)
- || TREE_PUBLIC (vnode->decl) || DECL_EXTERNAL (vnode->decl));
+ gcc_assert (!DECL_WEAK (vnode->symbol.decl)
+ || vnode->symbol.weakref
+ || TREE_PUBLIC (vnode->symbol.decl)
+ || DECL_EXTERNAL (vnode->symbol.decl));
/* In several cases declarations can not be common:
- when declaration has initializer
static int a __attribute__ ((common))
Canonicalize things here and clear the redundant flag. */
- if (DECL_COMMON (vnode->decl)
- && (!(TREE_PUBLIC (vnode->decl) || DECL_EXTERNAL (vnode->decl))
- || (DECL_INITIAL (vnode->decl)
- && DECL_INITIAL (vnode->decl) != error_mark_node)
- || DECL_WEAK (vnode->decl)
- || DECL_SECTION_NAME (vnode->decl) != NULL
+ if (DECL_COMMON (vnode->symbol.decl)
+ && (!(TREE_PUBLIC (vnode->symbol.decl)
+ || DECL_EXTERNAL (vnode->symbol.decl))
+ || (DECL_INITIAL (vnode->symbol.decl)
+ && DECL_INITIAL (vnode->symbol.decl) != error_mark_node)
+ || DECL_WEAK (vnode->symbol.decl)
+ || DECL_SECTION_NAME (vnode->symbol.decl) != NULL
|| ! (ADDR_SPACE_GENERIC_P
- (TYPE_ADDR_SPACE (TREE_TYPE (vnode->decl))))))
- DECL_COMMON (vnode->decl) = 0;
+ (TYPE_ADDR_SPACE (TREE_TYPE (vnode->symbol.decl))))))
+ DECL_COMMON (vnode->symbol.decl) = 0;
}
- for (vnode = varpool_nodes_queue; vnode; vnode = vnode->next_needed)
+ FOR_EACH_DEFINED_VARIABLE (vnode)
{
- if (!vnode->finalized)
+ if (!vnode->symbol.definition)
continue;
- if (vnode->needed
- && varpool_externally_visible_p
- (vnode,
- pointer_set_contains (aliased_vnodes, vnode)))
- vnode->externally_visible = true;
+ if (varpool_externally_visible_p (vnode))
+ vnode->symbol.externally_visible = true;
else
- vnode->externally_visible = false;
- if (!vnode->externally_visible)
{
- gcc_assert (in_lto_p || whole_program || !TREE_PUBLIC (vnode->decl));
- cgraph_make_decl_local (vnode->decl);
- vnode->resolution = LDPR_PREVAILING_DEF_IRONLY;
+ vnode->symbol.externally_visible = false;
+ vnode->symbol.forced_by_abi = false;
+ }
+ if (!vnode->symbol.externally_visible
+ && !vnode->symbol.weakref)
+ {
+ gcc_assert (in_lto_p || whole_program || !TREE_PUBLIC (vnode->symbol.decl));
+ symtab_make_decl_local (vnode->symbol.decl);
+ vnode->symbol.unique_name = ((vnode->symbol.resolution == LDPR_PREVAILING_DEF_IRONLY
+ || vnode->symbol.resolution == LDPR_PREVAILING_DEF_IRONLY_EXP)
+ && TREE_PUBLIC (vnode->symbol.decl));
+ if (vnode->symbol.same_comdat_group)
+ symtab_dissolve_same_comdat_group_list ((symtab_node) vnode);
+ vnode->symbol.resolution = LDPR_PREVAILING_DEF_IRONLY;
}
- gcc_assert (TREE_STATIC (vnode->decl));
}
- pointer_set_destroy (aliased_nodes);
- pointer_set_destroy (aliased_vnodes);
if (dump_file)
{
fprintf (dump_file, "\nMarking local functions:");
- for (node = cgraph_nodes; node; node = node->next)
+ FOR_EACH_DEFINED_FUNCTION (node)
if (node->local.local)
fprintf (dump_file, " %s", cgraph_node_name (node));
fprintf (dump_file, "\n\n");
fprintf (dump_file, "\nMarking externally visible functions:");
- for (node = cgraph_nodes; node; node = node->next)
- if (node->local.externally_visible)
+ FOR_EACH_DEFINED_FUNCTION (node)
+ if (node->symbol.externally_visible)
fprintf (dump_file, " %s", cgraph_node_name (node));
fprintf (dump_file, "\n\n");
fprintf (dump_file, "\nMarking externally visible variables:");
- for (vnode = varpool_nodes_queue; vnode; vnode = vnode->next_needed)
- if (vnode->externally_visible)
+ FOR_EACH_DEFINED_VARIABLE (vnode)
+ if (vnode->symbol.externally_visible)
fprintf (dump_file, " %s", varpool_node_name (vnode));
fprintf (dump_file, "\n\n");
}
static unsigned int
local_function_and_variable_visibility (void)
{
- return function_and_variable_visibility (flag_whole_program && !flag_lto && !flag_whopr);
+ return function_and_variable_visibility (flag_whole_program && !flag_lto);
}
-struct simple_ipa_opt_pass pass_ipa_function_and_variable_visibility =
-{
- {
- SIMPLE_IPA_PASS,
- "visibility", /* name */
- NULL, /* gate */
- local_function_and_variable_visibility,/* execute */
- NULL, /* sub */
- NULL, /* next */
- 0, /* static_pass_number */
- TV_CGRAPHOPT, /* tv_id */
- 0, /* properties_required */
- 0, /* properties_provided */
- 0, /* properties_destroyed */
- 0, /* todo_flags_start */
- TODO_remove_functions | TODO_dump_cgraph
- | TODO_ggc_collect /* todo_flags_finish */
- }
-};
-
-/* Do not re-run on ltrans stage. */
+namespace {
-static bool
-gate_whole_program_function_and_variable_visibility (void)
+const pass_data pass_data_ipa_function_and_variable_visibility =
{
- return !flag_ltrans;
-}
-
-/* Bring functionss local at LTO time whith -fwhole-program. */
+ SIMPLE_IPA_PASS, /* type */
+ "visibility", /* name */
+ OPTGROUP_NONE, /* optinfo_flags */
+ false, /* has_gate */
+ true, /* has_execute */
+ TV_CGRAPHOPT, /* tv_id */
+ 0, /* properties_required */
+ 0, /* properties_provided */
+ 0, /* properties_destroyed */
+ 0, /* todo_flags_start */
+ ( TODO_remove_functions | TODO_dump_symtab ), /* todo_flags_finish */
+};
-static unsigned int
-whole_program_function_and_variable_visibility (void)
+class pass_ipa_function_and_variable_visibility : public simple_ipa_opt_pass
{
- struct cgraph_node *node;
- struct varpool_node *vnode;
+public:
+ pass_ipa_function_and_variable_visibility(gcc::context *ctxt)
+ : simple_ipa_opt_pass(pass_data_ipa_function_and_variable_visibility, ctxt)
+ {}
- function_and_variable_visibility (flag_whole_program);
+ /* opt_pass methods: */
+ unsigned int execute () {
+ return local_function_and_variable_visibility ();
+ }
- for (node = cgraph_nodes; node; node = node->next)
- if ((node->local.externally_visible && !DECL_COMDAT (node->decl))
- && node->local.finalized)
- cgraph_mark_needed_node (node);
- for (vnode = varpool_nodes_queue; vnode; vnode = vnode->next_needed)
- if (vnode->externally_visible && !DECL_COMDAT (vnode->decl))
- varpool_mark_needed_node (vnode);
- if (dump_file)
- {
- fprintf (dump_file, "\nNeeded variables:");
- for (vnode = varpool_nodes_queue; vnode; vnode = vnode->next_needed)
- if (vnode->needed)
- fprintf (dump_file, " %s", varpool_node_name (vnode));
- fprintf (dump_file, "\n\n");
- }
- if (optimize)
- ipa_discover_readonly_nonaddressable_vars ();
- return 0;
-}
-
-struct ipa_opt_pass_d pass_ipa_whole_program_visibility =
-{
- {
- IPA_PASS,
- "whole-program", /* name */
- gate_whole_program_function_and_variable_visibility,/* gate */
- whole_program_function_and_variable_visibility,/* execute */
- NULL, /* sub */
- NULL, /* next */
- 0, /* static_pass_number */
- TV_CGRAPHOPT, /* tv_id */
- 0, /* properties_required */
- 0, /* properties_provided */
- 0, /* properties_destroyed */
- 0, /* todo_flags_start */
- TODO_remove_functions | TODO_dump_cgraph
- | TODO_ggc_collect /* todo_flags_finish */
- },
- NULL, /* generate_summary */
- NULL, /* write_summary */
- NULL, /* read_summary */
- NULL, /* write_optimization_summary */
- NULL, /* read_optimization_summary */
- NULL, /* stmt_fixup */
- 0, /* TODOs */
- NULL, /* function_transform */
- NULL, /* variable_transform */
-};
+}; // class pass_ipa_function_and_variable_visibility
-/* Hash a cgraph node set element. */
+} // anon namespace
-static hashval_t
-hash_cgraph_node_set_element (const void *p)
+simple_ipa_opt_pass *
+make_pass_ipa_function_and_variable_visibility (gcc::context *ctxt)
{
- const_cgraph_node_set_element element = (const_cgraph_node_set_element) p;
- return htab_hash_pointer (element->node);
+ return new pass_ipa_function_and_variable_visibility (ctxt);
}
-/* Compare two cgraph node set elements. */
+/* Free inline summary. */
-static int
-eq_cgraph_node_set_element (const void *p1, const void *p2)
+static unsigned
+free_inline_summary (void)
{
- const_cgraph_node_set_element e1 = (const_cgraph_node_set_element) p1;
- const_cgraph_node_set_element e2 = (const_cgraph_node_set_element) p2;
-
- return e1->node == e2->node;
+ inline_free_summary ();
+ return 0;
}
-/* Create a new cgraph node set. */
+namespace {
-cgraph_node_set
-cgraph_node_set_new (void)
+const pass_data pass_data_ipa_free_inline_summary =
{
- cgraph_node_set new_node_set;
-
- new_node_set = ggc_alloc_cgraph_node_set_def ();
- new_node_set->hashtab = htab_create_ggc (10,
- hash_cgraph_node_set_element,
- eq_cgraph_node_set_element,
- NULL);
- new_node_set->nodes = NULL;
- return new_node_set;
-}
-
-/* Add cgraph_node NODE to cgraph_node_set SET. */
+ SIMPLE_IPA_PASS, /* type */
+ "*free_inline_summary", /* name */
+ OPTGROUP_NONE, /* optinfo_flags */
+ false, /* has_gate */
+ true, /* has_execute */
+ TV_IPA_FREE_INLINE_SUMMARY, /* tv_id */
+ 0, /* properties_required */
+ 0, /* properties_provided */
+ 0, /* properties_destroyed */
+ 0, /* todo_flags_start */
+ 0, /* todo_flags_finish */
+};
-void
-cgraph_node_set_add (cgraph_node_set set, struct cgraph_node *node)
+class pass_ipa_free_inline_summary : public simple_ipa_opt_pass
{
- void **slot;
- cgraph_node_set_element element;
- struct cgraph_node_set_element_def dummy;
+public:
+ pass_ipa_free_inline_summary(gcc::context *ctxt)
+ : simple_ipa_opt_pass(pass_data_ipa_free_inline_summary, ctxt)
+ {}
- dummy.node = node;
- slot = htab_find_slot (set->hashtab, &dummy, INSERT);
+ /* opt_pass methods: */
+ unsigned int execute () { return free_inline_summary (); }
- if (*slot != HTAB_EMPTY_ENTRY)
- {
- element = (cgraph_node_set_element) *slot;
- gcc_assert (node == element->node
- && (VEC_index (cgraph_node_ptr, set->nodes, element->index)
- == node));
- return;
- }
+}; // class pass_ipa_free_inline_summary
- /* Insert node into hash table. */
- element = ggc_alloc_cgraph_node_set_element_def ();
- element->node = node;
- element->index = VEC_length (cgraph_node_ptr, set->nodes);
- *slot = element;
+} // anon namespace
- /* Insert into node vector. */
- VEC_safe_push (cgraph_node_ptr, gc, set->nodes, node);
+simple_ipa_opt_pass *
+make_pass_ipa_free_inline_summary (gcc::context *ctxt)
+{
+ return new pass_ipa_free_inline_summary (ctxt);
}
-/* Remove cgraph_node NODE from cgraph_node_set SET. */
+/* Do not re-run on ltrans stage. */
-void
-cgraph_node_set_remove (cgraph_node_set set, struct cgraph_node *node)
+static bool
+gate_whole_program_function_and_variable_visibility (void)
{
- void **slot, **last_slot;
- cgraph_node_set_element element, last_element;
- struct cgraph_node *last_node;
- struct cgraph_node_set_element_def dummy;
-
- dummy.node = node;
- slot = htab_find_slot (set->hashtab, &dummy, NO_INSERT);
- if (slot == NULL)
- return;
-
- element = (cgraph_node_set_element) *slot;
- gcc_assert (VEC_index (cgraph_node_ptr, set->nodes, element->index)
- == node);
-
- /* Remove from vector. We do this by swapping node with the last element
- of the vector. */
- last_node = VEC_pop (cgraph_node_ptr, set->nodes);
- if (last_node != node)
- {
- dummy.node = last_node;
- last_slot = htab_find_slot (set->hashtab, &dummy, NO_INSERT);
- last_element = (cgraph_node_set_element) *last_slot;
- gcc_assert (last_element);
-
- /* Move the last element to the original spot of NODE. */
- last_element->index = element->index;
- VEC_replace (cgraph_node_ptr, set->nodes, last_element->index,
- last_node);
- }
-
- /* Remove element from hash table. */
- htab_clear_slot (set->hashtab, slot);
- ggc_free (element);
+ return !flag_ltrans;
}
-/* Find NODE in SET and return an iterator to it if found. A null iterator
- is returned if NODE is not in SET. */
+/* Bring functionss local at LTO time with -fwhole-program. */
-cgraph_node_set_iterator
-cgraph_node_set_find (cgraph_node_set set, struct cgraph_node *node)
+static unsigned int
+whole_program_function_and_variable_visibility (void)
{
- void **slot;
- struct cgraph_node_set_element_def dummy;
- cgraph_node_set_element element;
- cgraph_node_set_iterator csi;
-
- dummy.node = node;
- slot = htab_find_slot (set->hashtab, &dummy, NO_INSERT);
- if (slot == NULL)
- csi.index = (unsigned) ~0;
- else
- {
- element = (cgraph_node_set_element) *slot;
- gcc_assert (VEC_index (cgraph_node_ptr, set->nodes, element->index)
- == node);
- csi.index = element->index;
- }
- csi.set = set;
-
- return csi;
+ function_and_variable_visibility (flag_whole_program);
+ if (optimize)
+ ipa_discover_readonly_nonaddressable_vars ();
+ return 0;
}
-/* Dump content of SET to file F. */
+namespace {
-void
-dump_cgraph_node_set (FILE *f, cgraph_node_set set)
+const pass_data pass_data_ipa_whole_program_visibility =
{
- cgraph_node_set_iterator iter;
+ IPA_PASS, /* type */
+ "whole-program", /* name */
+ OPTGROUP_NONE, /* optinfo_flags */
+ true, /* has_gate */
+ true, /* has_execute */
+ TV_CGRAPHOPT, /* tv_id */
+ 0, /* properties_required */
+ 0, /* properties_provided */
+ 0, /* properties_destroyed */
+ 0, /* todo_flags_start */
+ ( TODO_remove_functions | TODO_dump_symtab ), /* todo_flags_finish */
+};
- for (iter = csi_start (set); !csi_end_p (iter); csi_next (&iter))
- {
- struct cgraph_node *node = csi_node (iter);
- fprintf (f, " %s/%i", cgraph_node_name (node), node->uid);
- }
- fprintf (f, "\n");
+class pass_ipa_whole_program_visibility : public ipa_opt_pass_d
+{
+public:
+ pass_ipa_whole_program_visibility(gcc::context *ctxt)
+ : ipa_opt_pass_d(pass_data_ipa_whole_program_visibility, ctxt,
+ NULL, /* generate_summary */
+ NULL, /* write_summary */
+ NULL, /* read_summary */
+ NULL, /* write_optimization_summary */
+ NULL, /* read_optimization_summary */
+ NULL, /* stmt_fixup */
+ 0, /* function_transform_todo_flags_start */
+ NULL, /* function_transform */
+ NULL) /* variable_transform */
+ {}
+
+ /* opt_pass methods: */
+ bool gate () {
+ return gate_whole_program_function_and_variable_visibility ();
+ }
+ unsigned int execute () {
+ return whole_program_function_and_variable_visibility ();
+ }
+
+}; // class pass_ipa_whole_program_visibility
+
+} // anon namespace
+
+ipa_opt_pass_d *
+make_pass_ipa_whole_program_visibility (gcc::context *ctxt)
+{
+ return new pass_ipa_whole_program_visibility (ctxt);
}
-/* Dump content of SET to stderr. */
+/* Entry in the histogram. */
-DEBUG_FUNCTION void
-debug_cgraph_node_set (cgraph_node_set set)
+struct histogram_entry
{
- dump_cgraph_node_set (stderr, set);
-}
+ gcov_type count;
+ int time;
+ int size;
+};
-/* Hash a varpool node set element. */
+/* Histogram of profile values.
+ The histogram is represented as an ordered vector of entries allocated via
+ histogram_pool. During construction a separate hashtable is kept to lookup
+ duplicate entries. */
-static hashval_t
-hash_varpool_node_set_element (const void *p)
-{
- const_varpool_node_set_element element = (const_varpool_node_set_element) p;
- return htab_hash_pointer (element->node);
-}
+vec<histogram_entry *> histogram;
+static alloc_pool histogram_pool;
-/* Compare two varpool node set elements. */
+/* Hashtable support for storing SSA names hashed by their SSA_NAME_VAR. */
-static int
-eq_varpool_node_set_element (const void *p1, const void *p2)
+struct histogram_hash : typed_noop_remove <histogram_entry>
{
- const_varpool_node_set_element e1 = (const_varpool_node_set_element) p1;
- const_varpool_node_set_element e2 = (const_varpool_node_set_element) p2;
+ typedef histogram_entry value_type;
+ typedef histogram_entry compare_type;
+ static inline hashval_t hash (const value_type *);
+ static inline int equal (const value_type *, const compare_type *);
+};
- return e1->node == e2->node;
+inline hashval_t
+histogram_hash::hash (const histogram_entry *val)
+{
+ return val->count;
}
-/* Create a new varpool node set. */
-
-varpool_node_set
-varpool_node_set_new (void)
+inline int
+histogram_hash::equal (const histogram_entry *val, const histogram_entry *val2)
{
- varpool_node_set new_node_set;
-
- new_node_set = ggc_alloc_varpool_node_set_def ();
- new_node_set->hashtab = htab_create_ggc (10,
- hash_varpool_node_set_element,
- eq_varpool_node_set_element,
- NULL);
- new_node_set->nodes = NULL;
- return new_node_set;
+ return val->count == val2->count;
}
-/* Add varpool_node NODE to varpool_node_set SET. */
+/* Account TIME and SIZE executed COUNT times into HISTOGRAM.
+ HASHTABLE is the on-side hash kept to avoid duplicates. */
-void
-varpool_node_set_add (varpool_node_set set, struct varpool_node *node)
+static void
+account_time_size (hash_table <histogram_hash> hashtable,
+ vec<histogram_entry *> &histogram,
+ gcov_type count, int time, int size)
{
- void **slot;
- varpool_node_set_element element;
- struct varpool_node_set_element_def dummy;
-
- dummy.node = node;
- slot = htab_find_slot (set->hashtab, &dummy, INSERT);
+ histogram_entry key = {count, 0, 0};
+ histogram_entry **val = hashtable.find_slot (&key, INSERT);
- if (*slot != HTAB_EMPTY_ENTRY)
+ if (!*val)
{
- element = (varpool_node_set_element) *slot;
- gcc_assert (node == element->node
- && (VEC_index (varpool_node_ptr, set->nodes, element->index)
- == node));
- return;
+ *val = (histogram_entry *) pool_alloc (histogram_pool);
+ **val = key;
+ histogram.safe_push (*val);
}
-
- /* Insert node into hash table. */
- element = ggc_alloc_varpool_node_set_element_def ();
- element->node = node;
- element->index = VEC_length (varpool_node_ptr, set->nodes);
- *slot = element;
-
- /* Insert into node vector. */
- VEC_safe_push (varpool_node_ptr, gc, set->nodes, node);
+ (*val)->time += time;
+ (*val)->size += size;
}
-/* Remove varpool_node NODE from varpool_node_set SET. */
-
-void
-varpool_node_set_remove (varpool_node_set set, struct varpool_node *node)
+int
+cmp_counts (const void *v1, const void *v2)
{
- void **slot, **last_slot;
- varpool_node_set_element element, last_element;
- struct varpool_node *last_node;
- struct varpool_node_set_element_def dummy;
-
- dummy.node = node;
- slot = htab_find_slot (set->hashtab, &dummy, NO_INSERT);
- if (slot == NULL)
- return;
+ const histogram_entry *h1 = *(const histogram_entry * const *)v1;
+ const histogram_entry *h2 = *(const histogram_entry * const *)v2;
+ if (h1->count < h2->count)
+ return 1;
+ if (h1->count > h2->count)
+ return -1;
+ return 0;
+}
- element = (varpool_node_set_element) *slot;
- gcc_assert (VEC_index (varpool_node_ptr, set->nodes, element->index)
- == node);
+/* Dump HISTOGRAM to FILE. */
- /* Remove from vector. We do this by swapping node with the last element
- of the vector. */
- last_node = VEC_pop (varpool_node_ptr, set->nodes);
- if (last_node != node)
+static void
+dump_histogram (FILE *file, vec<histogram_entry *> histogram)
+{
+ unsigned int i;
+ gcov_type overall_time = 0, cumulated_time = 0, cumulated_size = 0, overall_size = 0;
+
+ fprintf (dump_file, "Histogram:\n");
+ for (i = 0; i < histogram.length (); i++)
{
- dummy.node = last_node;
- last_slot = htab_find_slot (set->hashtab, &dummy, NO_INSERT);
- last_element = (varpool_node_set_element) *last_slot;
- gcc_assert (last_element);
-
- /* Move the last element to the original spot of NODE. */
- last_element->index = element->index;
- VEC_replace (varpool_node_ptr, set->nodes, last_element->index,
- last_node);
+ overall_time += histogram[i]->count * histogram[i]->time;
+ overall_size += histogram[i]->size;
}
-
- /* Remove element from hash table. */
- htab_clear_slot (set->hashtab, slot);
- ggc_free (element);
+ if (!overall_time)
+ overall_time = 1;
+ if (!overall_size)
+ overall_size = 1;
+ for (i = 0; i < histogram.length (); i++)
+ {
+ cumulated_time += histogram[i]->count * histogram[i]->time;
+ cumulated_size += histogram[i]->size;
+ fprintf (file, " "HOST_WIDEST_INT_PRINT_DEC": time:%i (%2.2f) size:%i (%2.2f)\n",
+ (HOST_WIDEST_INT) histogram[i]->count,
+ histogram[i]->time,
+ cumulated_time * 100.0 / overall_time,
+ histogram[i]->size,
+ cumulated_size * 100.0 / overall_size);
+ }
}
-/* Find NODE in SET and return an iterator to it if found. A null iterator
- is returned if NODE is not in SET. */
+/* Collect histogram from CFG profiles. */
-varpool_node_set_iterator
-varpool_node_set_find (varpool_node_set set, struct varpool_node *node)
+static void
+ipa_profile_generate_summary (void)
{
- void **slot;
- struct varpool_node_set_element_def dummy;
- varpool_node_set_element element;
- varpool_node_set_iterator vsi;
-
- dummy.node = node;
- slot = htab_find_slot (set->hashtab, &dummy, NO_INSERT);
- if (slot == NULL)
- vsi.index = (unsigned) ~0;
- else
- {
- element = (varpool_node_set_element) *slot;
- gcc_assert (VEC_index (varpool_node_ptr, set->nodes, element->index)
- == node);
- vsi.index = element->index;
- }
- vsi.set = set;
-
- return vsi;
+ struct cgraph_node *node;
+ gimple_stmt_iterator gsi;
+ hash_table <histogram_hash> hashtable;
+ basic_block bb;
+
+ hashtable.create (10);
+ histogram_pool = create_alloc_pool ("IPA histogram", sizeof (struct histogram_entry),
+ 10);
+
+ FOR_EACH_FUNCTION_WITH_GIMPLE_BODY (node)
+ FOR_EACH_BB_FN (bb, DECL_STRUCT_FUNCTION (node->symbol.decl))
+ {
+ int time = 0;
+ int size = 0;
+ for (gsi = gsi_start_bb (bb); !gsi_end_p (gsi); gsi_next (&gsi))
+ {
+ time += estimate_num_insns (gsi_stmt (gsi), &eni_time_weights);
+ size += estimate_num_insns (gsi_stmt (gsi), &eni_size_weights);
+ }
+ account_time_size (hashtable, histogram, bb->count, time, size);
+ }
+ hashtable.dispose ();
+ histogram.qsort (cmp_counts);
}
-/* Dump content of SET to file F. */
+/* Serialize the ipa info for lto. */
-void
-dump_varpool_node_set (FILE *f, varpool_node_set set)
+static void
+ipa_profile_write_summary (void)
{
- varpool_node_set_iterator iter;
+ struct lto_simple_output_block *ob
+ = lto_create_simple_output_block (LTO_section_ipa_profile);
+ unsigned int i;
- for (iter = vsi_start (set); !vsi_end_p (iter); vsi_next (&iter))
+ streamer_write_uhwi_stream (ob->main_stream, histogram.length());
+ for (i = 0; i < histogram.length (); i++)
{
- struct varpool_node *node = vsi_node (iter);
- fprintf (f, " %s", varpool_node_name (node));
+ streamer_write_gcov_count_stream (ob->main_stream, histogram[i]->count);
+ streamer_write_uhwi_stream (ob->main_stream, histogram[i]->time);
+ streamer_write_uhwi_stream (ob->main_stream, histogram[i]->size);
}
- fprintf (f, "\n");
+ lto_destroy_simple_output_block (ob);
}
-/* Dump content of SET to stderr. */
+/* Deserialize the ipa info for lto. */
-DEBUG_FUNCTION void
-debug_varpool_node_set (varpool_node_set set)
+static void
+ipa_profile_read_summary (void)
{
- dump_varpool_node_set (stderr, set);
-}
+ struct lto_file_decl_data ** file_data_vec
+ = lto_get_file_decl_data ();
+ struct lto_file_decl_data * file_data;
+ hash_table <histogram_hash> hashtable;
+ int j = 0;
+ hashtable.create (10);
+ histogram_pool = create_alloc_pool ("IPA histogram", sizeof (struct histogram_entry),
+ 10);
+
+ while ((file_data = file_data_vec[j++]))
+ {
+ const char *data;
+ size_t len;
+ struct lto_input_block *ib
+ = lto_create_simple_input_block (file_data,
+ LTO_section_ipa_profile,
+ &data, &len);
+ if (ib)
+ {
+ unsigned int num = streamer_read_uhwi (ib);
+ unsigned int n;
+ for (n = 0; n < num; n++)
+ {
+ gcov_type count = streamer_read_gcov_count (ib);
+ int time = streamer_read_uhwi (ib);
+ int size = streamer_read_uhwi (ib);
+ account_time_size (hashtable, histogram,
+ count, time, size);
+ }
+ lto_destroy_simple_input_block (file_data,
+ LTO_section_ipa_profile,
+ ib, data, len);
+ }
+ }
+ hashtable.dispose ();
+ histogram.qsort (cmp_counts);
+}
/* Simple ipa profile pass propagating frequencies across the callgraph. */
int order_pos;
bool something_changed = false;
int i;
+ gcov_type overall_time = 0, cutoff = 0, cumulated = 0, overall_size = 0;
- order_pos = cgraph_postorder (order);
+ if (dump_file)
+ dump_histogram (dump_file, histogram);
+ for (i = 0; i < (int)histogram.length (); i++)
+ {
+ overall_time += histogram[i]->count * histogram[i]->time;
+ overall_size += histogram[i]->size;
+ }
+ if (overall_time)
+ {
+ gcov_type threshold;
+
+ gcc_assert (overall_size);
+ if (dump_file)
+ {
+ gcov_type min, cumulated_time = 0, cumulated_size = 0;
+
+ fprintf (dump_file, "Overall time: "HOST_WIDEST_INT_PRINT_DEC"\n",
+ (HOST_WIDEST_INT)overall_time);
+ min = get_hot_bb_threshold ();
+ for (i = 0; i < (int)histogram.length () && histogram[i]->count >= min;
+ i++)
+ {
+ cumulated_time += histogram[i]->count * histogram[i]->time;
+ cumulated_size += histogram[i]->size;
+ }
+ fprintf (dump_file, "GCOV min count: "HOST_WIDEST_INT_PRINT_DEC
+ " Time:%3.2f%% Size:%3.2f%%\n",
+ (HOST_WIDEST_INT)min,
+ cumulated_time * 100.0 / overall_time,
+ cumulated_size * 100.0 / overall_size);
+ }
+ cutoff = (overall_time * PARAM_VALUE (HOT_BB_COUNT_WS_PERMILLE) + 500) / 1000;
+ threshold = 0;
+ for (i = 0; cumulated < cutoff; i++)
+ {
+ cumulated += histogram[i]->count * histogram[i]->time;
+ threshold = histogram[i]->count;
+ }
+ if (!threshold)
+ threshold = 1;
+ if (dump_file)
+ {
+ gcov_type cumulated_time = 0, cumulated_size = 0;
+
+ for (i = 0;
+ i < (int)histogram.length () && histogram[i]->count >= threshold;
+ i++)
+ {
+ cumulated_time += histogram[i]->count * histogram[i]->time;
+ cumulated_size += histogram[i]->size;
+ }
+ fprintf (dump_file, "Determined min count: "HOST_WIDEST_INT_PRINT_DEC
+ " Time:%3.2f%% Size:%3.2f%%\n",
+ (HOST_WIDEST_INT)threshold,
+ cumulated_time * 100.0 / overall_time,
+ cumulated_size * 100.0 / overall_size);
+ }
+ if (threshold > get_hot_bb_threshold ()
+ || in_lto_p)
+ {
+ if (dump_file)
+ fprintf (dump_file, "Threshold updated.\n");
+ set_hot_bb_threshold (threshold);
+ }
+ }
+ histogram.release();
+ free_alloc_pool (histogram_pool);
+
+ order_pos = ipa_reverse_postorder (order);
for (i = order_pos - 1; i >= 0; i--)
{
if (order[i]->local.local && cgraph_propagate_frequency (order[i]))
{
for (e = order[i]->callees; e; e = e->next_callee)
- if (e->callee->local.local && !e->callee->aux)
+ if (e->callee->local.local && !e->callee->symbol.aux)
{
something_changed = true;
- e->callee->aux = (void *)1;
+ e->callee->symbol.aux = (void *)1;
}
}
- order[i]->aux = NULL;
+ order[i]->symbol.aux = NULL;
}
while (something_changed)
something_changed = false;
for (i = order_pos - 1; i >= 0; i--)
{
- if (order[i]->aux && cgraph_propagate_frequency (order[i]))
+ if (order[i]->symbol.aux && cgraph_propagate_frequency (order[i]))
{
for (e = order[i]->callees; e; e = e->next_callee)
- if (e->callee->local.local && !e->callee->aux)
+ if (e->callee->local.local && !e->callee->symbol.aux)
{
something_changed = true;
- e->callee->aux = (void *)1;
+ e->callee->symbol.aux = (void *)1;
}
}
- order[i]->aux = NULL;
+ order[i]->symbol.aux = NULL;
}
}
free (order);
return flag_ipa_profile;
}
-struct ipa_opt_pass_d pass_ipa_profile =
+namespace {
+
+const pass_data pass_data_ipa_profile =
{
- {
- IPA_PASS,
- "ipa-profile", /* name */
- gate_ipa_profile, /* gate */
- ipa_profile, /* execute */
- NULL, /* sub */
- NULL, /* next */
- 0, /* static_pass_number */
- TV_IPA_PROFILE, /* tv_id */
- 0, /* properties_required */
- 0, /* properties_provided */
- 0, /* properties_destroyed */
- 0, /* todo_flags_start */
- 0 /* todo_flags_finish */
- },
- NULL, /* generate_summary */
- NULL, /* write_summary */
- NULL, /* read_summary */
- NULL, /* write_optimization_summary */
- NULL, /* read_optimization_summary */
- NULL, /* stmt_fixup */
- 0, /* TODOs */
- NULL, /* function_transform */
- NULL /* variable_transform */
+ IPA_PASS, /* type */
+ "profile_estimate", /* name */
+ OPTGROUP_NONE, /* optinfo_flags */
+ true, /* has_gate */
+ true, /* has_execute */
+ TV_IPA_PROFILE, /* tv_id */
+ 0, /* properties_required */
+ 0, /* properties_provided */
+ 0, /* properties_destroyed */
+ 0, /* todo_flags_start */
+ 0, /* todo_flags_finish */
};
+class pass_ipa_profile : public ipa_opt_pass_d
+{
+public:
+ pass_ipa_profile(gcc::context *ctxt)
+ : ipa_opt_pass_d(pass_data_ipa_profile, ctxt,
+ ipa_profile_generate_summary, /* generate_summary */
+ ipa_profile_write_summary, /* write_summary */
+ ipa_profile_read_summary, /* read_summary */
+ NULL, /* write_optimization_summary */
+ NULL, /* read_optimization_summary */
+ NULL, /* stmt_fixup */
+ 0, /* function_transform_todo_flags_start */
+ NULL, /* function_transform */
+ NULL) /* variable_transform */
+ {}
+
+ /* opt_pass methods: */
+ bool gate () { return gate_ipa_profile (); }
+ unsigned int execute () { return ipa_profile (); }
+
+}; // class pass_ipa_profile
+
+} // anon namespace
+
+ipa_opt_pass_d *
+make_pass_ipa_profile (gcc::context *ctxt)
+{
+ return new pass_ipa_profile (ctxt);
+}
+
/* Generate and emit a static constructor or destructor. WHICH must
be one of 'I' (for a constructor) or 'D' (for a destructor). BODY
is a STATEMENT_LIST containing GENERIC statements. PRIORITY is the
- initialization priority for this constructor or destructor. */
+ initialization priority for this constructor or destructor.
-void
-cgraph_build_static_cdtor (char which, tree body, int priority)
+ FINAL specify whether the externally visible name for collect2 should
+ be produced. */
+
+static void
+cgraph_build_static_cdtor_1 (char which, tree body, int priority, bool final)
{
static int counter = 0;
char which_buf[16];
/* The priority is encoded in the constructor or destructor name.
collect2 will sort the names and arrange that they are called at
program startup. */
- sprintf (which_buf, "%c_%.5d_%d", which, priority, counter++);
+ if (final)
+ sprintf (which_buf, "%c_%.5d_%d", which, priority, counter++);
+ else
+ /* Proudce sane name but one not recognizable by collect2, just for the
+ case we fail to inline the function. */
+ sprintf (which_buf, "sub_%c_%.5d_%d", which, priority, counter++);
name = get_file_function_name (which_buf);
decl = build_decl (input_location, FUNCTION_DECL, name,
DECL_ARTIFICIAL (decl) = 1;
DECL_NO_INSTRUMENT_FUNCTION_ENTRY_EXIT (decl) = 1;
DECL_SAVED_TREE (decl) = body;
- if (!targetm.have_ctors_dtors)
+ if (!targetm.have_ctors_dtors && final)
{
TREE_PUBLIC (decl) = 1;
DECL_PRESERVE_P (decl) = 1;
current_function_decl = NULL;
}
+/* Generate and emit a static constructor or destructor. WHICH must
+ be one of 'I' (for a constructor) or 'D' (for a destructor). BODY
+ is a STATEMENT_LIST containing GENERIC statements. PRIORITY is the
+ initialization priority for this constructor or destructor. */
+
+void
+cgraph_build_static_cdtor (char which, tree body, int priority)
+{
+ cgraph_build_static_cdtor_1 (which, body, priority, false);
+}
/* A vector of FUNCTION_DECLs declared as static constructors. */
-static VEC(tree, heap) *static_ctors;
+static vec<tree> static_ctors;
/* A vector of FUNCTION_DECLs declared as static destructors. */
-static VEC(tree, heap) *static_dtors;
+static vec<tree> static_dtors;
/* When target does not have ctors and dtors, we call all constructor
and destructor by special initialization/destruction function
static void
record_cdtor_fn (struct cgraph_node *node)
{
- if (DECL_STATIC_CONSTRUCTOR (node->decl))
- VEC_safe_push (tree, heap, static_ctors, node->decl);
- if (DECL_STATIC_DESTRUCTOR (node->decl))
- VEC_safe_push (tree, heap, static_dtors, node->decl);
- node = cgraph_node (node->decl);
- node->local.disregard_inline_limits = 1;
+ if (DECL_STATIC_CONSTRUCTOR (node->symbol.decl))
+ static_ctors.safe_push (node->symbol.decl);
+ if (DECL_STATIC_DESTRUCTOR (node->symbol.decl))
+ static_dtors.safe_push (node->symbol.decl);
+ node = cgraph_get_node (node->symbol.decl);
+ DECL_DISREGARD_INLINE_LIMITS (node->symbol.decl) = 1;
}
/* Define global constructors/destructor functions for the CDTORS, of
they are destructors. */
static void
-build_cdtor (bool ctor_p, VEC (tree, heap) *cdtors)
+build_cdtor (bool ctor_p, vec<tree> cdtors)
{
size_t i,j;
- size_t len = VEC_length (tree, cdtors);
+ size_t len = cdtors.length ();
i = 0;
while (i < len)
do
{
priority_type p;
- fn = VEC_index (tree, cdtors, j);
+ fn = cdtors[j];
p = ctor_p ? DECL_INIT_PRIORITY (fn) : DECL_FINI_PRIORITY (fn);
if (j == i)
priority = p;
for (;i < j; i++)
{
tree call;
- fn = VEC_index (tree, cdtors, i);
+ fn = cdtors[i];
call = build_call_expr (fn, 0);
if (ctor_p)
DECL_STATIC_CONSTRUCTOR (fn) = 0;
gcc_assert (body != NULL_TREE);
/* Generate a function to call all the function of like
priority. */
- cgraph_build_static_cdtor (ctor_p ? 'I' : 'D', body, priority);
+ cgraph_build_static_cdtor_1 (ctor_p ? 'I' : 'D', body, priority, true);
}
}
static void
build_cdtor_fns (void)
{
- if (!VEC_empty (tree, static_ctors))
+ if (!static_ctors.is_empty ())
{
gcc_assert (!targetm.have_ctors_dtors || in_lto_p);
- VEC_qsort (tree, static_ctors, compare_ctor);
+ static_ctors.qsort (compare_ctor);
build_cdtor (/*ctor_p=*/true, static_ctors);
}
- if (!VEC_empty (tree, static_dtors))
+ if (!static_dtors.is_empty ())
{
gcc_assert (!targetm.have_ctors_dtors || in_lto_p);
- VEC_qsort (tree, static_dtors, compare_dtor);
+ static_dtors.qsort (compare_dtor);
build_cdtor (/*ctor_p=*/false, static_dtors);
}
}
/* Look for constructors and destructors and produce function calling them.
This is needed for targets not supporting ctors or dtors, but we perform the
- transformation also at linktime to merge possibly numberous
+ transformation also at linktime to merge possibly numerous
constructors/destructors into single function to improve code locality and
reduce size. */
ipa_cdtor_merge (void)
{
struct cgraph_node *node;
- for (node = cgraph_nodes; node; node = node->next)
- if (node->analyzed
- && (DECL_STATIC_CONSTRUCTOR (node->decl)
- || DECL_STATIC_DESTRUCTOR (node->decl)))
+ FOR_EACH_DEFINED_FUNCTION (node)
+ if (DECL_STATIC_CONSTRUCTOR (node->symbol.decl)
+ || DECL_STATIC_DESTRUCTOR (node->symbol.decl))
record_cdtor_fn (node);
build_cdtor_fns ();
- VEC_free (tree, heap, static_ctors);
- VEC_free (tree, heap, static_dtors);
+ static_ctors.release ();
+ static_dtors.release ();
return 0;
}
return !targetm.have_ctors_dtors || (optimize && in_lto_p);
}
-struct ipa_opt_pass_d pass_ipa_cdtor_merge =
+namespace {
+
+const pass_data pass_data_ipa_cdtor_merge =
{
- {
- IPA_PASS,
- "cdtor", /* name */
- gate_ipa_cdtor_merge, /* gate */
- ipa_cdtor_merge, /* execute */
- NULL, /* sub */
- NULL, /* next */
- 0, /* static_pass_number */
- TV_CGRAPHOPT, /* tv_id */
- 0, /* properties_required */
- 0, /* properties_provided */
- 0, /* properties_destroyed */
- 0, /* todo_flags_start */
- 0 /* todo_flags_finish */
- },
- NULL, /* generate_summary */
- NULL, /* write_summary */
- NULL, /* read_summary */
- NULL, /* write_optimization_summary */
- NULL, /* read_optimization_summary */
- NULL, /* stmt_fixup */
- 0, /* TODOs */
- NULL, /* function_transform */
- NULL /* variable_transform */
+ IPA_PASS, /* type */
+ "cdtor", /* name */
+ OPTGROUP_NONE, /* optinfo_flags */
+ true, /* has_gate */
+ true, /* has_execute */
+ TV_CGRAPHOPT, /* tv_id */
+ 0, /* properties_required */
+ 0, /* properties_provided */
+ 0, /* properties_destroyed */
+ 0, /* todo_flags_start */
+ 0, /* todo_flags_finish */
};
+
+class pass_ipa_cdtor_merge : public ipa_opt_pass_d
+{
+public:
+ pass_ipa_cdtor_merge(gcc::context *ctxt)
+ : ipa_opt_pass_d(pass_data_ipa_cdtor_merge, ctxt,
+ NULL, /* generate_summary */
+ NULL, /* write_summary */
+ NULL, /* read_summary */
+ NULL, /* write_optimization_summary */
+ NULL, /* read_optimization_summary */
+ NULL, /* stmt_fixup */
+ 0, /* function_transform_todo_flags_start */
+ NULL, /* function_transform */
+ NULL) /* variable_transform */
+ {}
+
+ /* opt_pass methods: */
+ bool gate () { return gate_ipa_cdtor_merge (); }
+ unsigned int execute () { return ipa_cdtor_merge (); }
+
+}; // class pass_ipa_cdtor_merge
+
+} // anon namespace
+
+ipa_opt_pass_d *
+make_pass_ipa_cdtor_merge (gcc::context *ctxt)
+{
+ return new pass_ipa_cdtor_merge (ctxt);
+}
git://gcc.gnu.org / gcc.git / blobdiff