#include "flags.h"
#include "params.h"
#include "input.h"
-#include "varray.h"
#include "hashtab.h"
#include "langhooks.h"
#include "basic-block.h"
#include "lto-streamer.h"
#include "gcov-io.h"
+static void output_varpool (varpool_node_set);
+
+/* Cgraph streaming is organized as set of record whose type
+ is indicated by a tag. */
+enum LTO_cgraph_tags
+{
+ /* Must leave 0 for the stopper. */
+
+ /* Cgraph node without body available. */
+ LTO_cgraph_unavail_node = 1,
+ /* Cgraph node with function body. */
+ LTO_cgraph_analyzed_node,
+ /* Cgraph edges. */
+ LTO_cgraph_edge,
+ LTO_cgraph_indirect_edge
+};
+
/* Create a new cgraph encoder. */
lto_cgraph_encoder_t
return ref;
}
+#define LCC_NOT_FOUND (-1)
/* Look up NODE in encoder. Return NODE's reference if it has been encoded
or LCC_NOT_FOUND if it is not there. */
return VEC_length (cgraph_node_ptr, encoder->nodes);
}
+/* Create a new varpool encoder. */
+
+lto_varpool_encoder_t
+lto_varpool_encoder_new (void)
+{
+ lto_varpool_encoder_t encoder = XCNEW (struct lto_varpool_encoder_d);
+ encoder->map = pointer_map_create ();
+ encoder->initializer = pointer_set_create ();
+ encoder->nodes = NULL;
+ return encoder;
+}
+
+
+/* Delete ENCODER and its components. */
+
+void
+lto_varpool_encoder_delete (lto_varpool_encoder_t encoder)
+{
+ VEC_free (varpool_node_ptr, heap, encoder->nodes);
+ pointer_map_destroy (encoder->map);
+ pointer_set_destroy (encoder->initializer);
+ free (encoder);
+}
+
+
+/* Return the existing reference number of NODE in the varpool encoder in
+ output block OB. Assign a new reference if this is the first time
+ NODE is encoded. */
+
+int
+lto_varpool_encoder_encode (lto_varpool_encoder_t encoder,
+ struct varpool_node *node)
+{
+ int ref;
+ void **slot;
+
+ slot = pointer_map_contains (encoder->map, node);
+ if (!slot)
+ {
+ ref = VEC_length (varpool_node_ptr, encoder->nodes);
+ slot = pointer_map_insert (encoder->map, node);
+ *slot = (void *) (intptr_t) ref;
+ VEC_safe_push (varpool_node_ptr, heap, encoder->nodes, node);
+ }
+ else
+ ref = (int) (intptr_t) *slot;
+
+ return ref;
+}
+
+/* Look up NODE in encoder. Return NODE's reference if it has been encoded
+ or LCC_NOT_FOUND if it is not there. */
+
+int
+lto_varpool_encoder_lookup (lto_varpool_encoder_t encoder,
+ struct varpool_node *node)
+{
+ void **slot = pointer_map_contains (encoder->map, node);
+ return (slot ? (int) (intptr_t) *slot : LCC_NOT_FOUND);
+}
+
+
+/* Return the varpool node corresponding to REF using ENCODER. */
+
+struct varpool_node *
+lto_varpool_encoder_deref (lto_varpool_encoder_t encoder, int ref)
+{
+ if (ref == LCC_NOT_FOUND)
+ return NULL;
+
+ return VEC_index (varpool_node_ptr, encoder->nodes, ref);
+}
+
+
+/* Return number of encoded nodes in ENCODER. */
+
+static int
+lto_varpool_encoder_size (lto_varpool_encoder_t encoder)
+{
+ return VEC_length (varpool_node_ptr, encoder->nodes);
+}
+
+/* Return TRUE if we should encode initializer of NODE (if any). */
+
+bool
+lto_varpool_encoder_encode_initializer_p (lto_varpool_encoder_t encoder,
+ struct varpool_node *node)
+{
+ return pointer_set_contains (encoder->initializer, node);
+}
+
+/* Return TRUE if we should encode initializer of NODE (if any). */
+
+static void
+lto_set_varpool_encoder_encode_initializer (lto_varpool_encoder_t encoder,
+ struct varpool_node *node)
+{
+ pointer_set_insert (encoder->initializer, node);
+}
/* Output the cgraph EDGE to OB using ENCODER. */
{
unsigned int tag;
struct bitpack_d *bp;
- unsigned local, externally_visible, inlinable, analyzed;
bool boundary_p, wrote_decl_p;
intptr_t ref;
bool in_other_partition = false;
boundary_p = !cgraph_node_in_set_p (node, set);
wrote_decl_p = bitmap_bit_p (written_decls, DECL_UID (node->decl));
- switch (cgraph_function_body_availability (node))
- {
- case AVAIL_NOT_AVAILABLE:
- tag = LTO_cgraph_unavail_node;
- break;
-
- case AVAIL_AVAILABLE:
- case AVAIL_LOCAL:
- tag = LTO_cgraph_avail_node;
- break;
-
- case AVAIL_OVERWRITABLE:
- tag = LTO_cgraph_overwritable_node;
- break;
-
- default:
- gcc_unreachable ();
- }
-
- if (boundary_p)
+ if (node->analyzed && !boundary_p)
+ tag = LTO_cgraph_analyzed_node;
+ else
tag = LTO_cgraph_unavail_node;
lto_output_uleb128_stream (ob->main_stream, tag);
- local = node->local.local;
- externally_visible = node->local.externally_visible;
- inlinable = node->local.inlinable;
- analyzed = node->analyzed;
-
/* In WPA mode, we only output part of the call-graph. Also, we
fake cgraph node attributes. There are two cases that we care.
Cherry-picked nodes: These are nodes we pulled from other
translation units into SET during IPA-inlining. We make them as
local static nodes to prevent clashes with other local statics. */
- if (boundary_p)
+ if (boundary_p && node->analyzed)
{
/* Inline clones can not be part of boundary.
gcc_assert (!node->global.inlined_to);
needs a bit extra work and will be promplty done by cgraph_remove_node
after reading back. */
in_other_partition = 1;
- analyzed = 0;
}
lto_output_uleb128_stream (ob->main_stream, wrote_decl_p);
lto_output_sleb128_stream (ob->main_stream, node->count);
bp = bitpack_create ();
- bp_pack_value (bp, local, 1);
- bp_pack_value (bp, externally_visible, 1);
+ bp_pack_value (bp, node->local.local, 1);
+ bp_pack_value (bp, node->local.externally_visible, 1);
bp_pack_value (bp, node->local.finalized, 1);
- bp_pack_value (bp, inlinable, 1);
+ bp_pack_value (bp, node->local.inlinable, 1);
bp_pack_value (bp, node->local.disregard_inline_limits, 1);
bp_pack_value (bp, node->local.redefined_extern_inline, 1);
- bp_pack_value (bp, node->local.for_functions_valid, 1);
bp_pack_value (bp, node->local.vtable_method, 1);
bp_pack_value (bp, node->needed, 1);
bp_pack_value (bp, node->address_taken, 1);
bp_pack_value (bp, node->abstract_and_needed, 1);
- bp_pack_value (bp, node->reachable, 1);
- bp_pack_value (bp, analyzed && reachable_from_other_partition_p (node, set), 1);
+ bp_pack_value (bp, tag == LTO_cgraph_analyzed_node
+ && reachable_from_other_partition_p (node, set), 1);
bp_pack_value (bp, node->lowered, 1);
- bp_pack_value (bp, analyzed, 1);
bp_pack_value (bp, in_other_partition, 1);
- bp_pack_value (bp, node->process, 1);
bp_pack_value (bp, node->alias, 1);
bp_pack_value (bp, node->finalized_by_frontend, 1);
bp_pack_value (bp, node->frequency, 2);
lto_output_bitpack (ob->main_stream, bp);
bitpack_delete (bp);
- if (tag != LTO_cgraph_unavail_node)
+ if (tag == LTO_cgraph_analyzed_node)
{
lto_output_sleb128_stream (ob->main_stream,
node->local.inline_summary.estimated_self_stack_size);
node->local.inline_summary.self_time);
lto_output_sleb128_stream (ob->main_stream,
node->local.inline_summary.time_inlining_benefit);
- }
+ if (node->global.inlined_to)
+ {
+ ref = lto_cgraph_encoder_lookup (encoder, node->global.inlined_to);
+ gcc_assert (ref != LCC_NOT_FOUND);
+ }
+ else
+ ref = LCC_NOT_FOUND;
- /* FIXME lto: Outputting global info is not neccesary until after
- inliner was run. Global structure holds results of propagation
- done by inliner. */
- lto_output_sleb128_stream (ob->main_stream,
- node->global.estimated_stack_size);
- lto_output_sleb128_stream (ob->main_stream,
- node->global.stack_frame_offset);
- if (node->global.inlined_to && !boundary_p)
- {
- ref = lto_cgraph_encoder_lookup (encoder, node->global.inlined_to);
- gcc_assert (ref != LCC_NOT_FOUND);
+ lto_output_sleb128_stream (ob->main_stream, ref);
}
- else
- ref = LCC_NOT_FOUND;
- lto_output_sleb128_stream (ob->main_stream, ref);
- lto_output_sleb128_stream (ob->main_stream, node->global.time);
- lto_output_sleb128_stream (ob->main_stream, node->global.size);
- lto_output_sleb128_stream (ob->main_stream,
- node->global.estimated_growth);
- lto_output_uleb128_stream (ob->main_stream, node->global.inlined);
if (node->same_comdat_group && !boundary_p)
{
ref = lto_cgraph_encoder_lookup (encoder, node->same_comdat_group);
bp_pack_value (bp, node->externally_visible, 1);
bp_pack_value (bp, node->force_output, 1);
bp_pack_value (bp, node->finalized, 1);
+ bp_pack_value (bp, node->alias, 1);
+ gcc_assert (!node->alias || !node->extra_name);
gcc_assert (node->finalized || !node->analyzed);
gcc_assert (node->needed);
- gcc_assert (!node->alias);
- /* FIXME: We have no idea how we move references around. For moment assume that
- everything is used externally. */
- bp_pack_value (bp, flag_wpa, 1); /* used_from_other_parition. */
- bp_pack_value (bp, boundary_p, 1); /* in_other_partition. */
+ /* Constant pool initializers can be de-unified into individual ltrans units.
+ FIXME: Alternatively at -Os we may want to avoid generating for them the local
+ labels and share them across LTRANS partitions. */
+ if (DECL_IN_CONSTANT_POOL (node->decl))
+ {
+ bp_pack_value (bp, 0, 1); /* used_from_other_parition. */
+ bp_pack_value (bp, 0, 1); /* in_other_partition. */
+ }
+ else
+ {
+ /* FIXME: We have no idea how we move references around. For moment assume that
+ everything is used externally. */
+ bp_pack_value (bp, flag_wpa, 1); /* used_from_other_parition. */
+ bp_pack_value (bp, boundary_p, 1); /* in_other_partition. */
+ }
/* Also emit any extra name aliases. */
for (alias = node->extra_name; alias; alias = alias->next)
count++;
/* Output the part of the cgraph in SET. */
void
-output_cgraph (cgraph_node_set set)
+output_cgraph (cgraph_node_set set, varpool_node_set vset)
{
struct cgraph_node *node;
struct lto_simple_output_block *ob;
cgraph_node_set_iterator csi;
+ varpool_node_set_iterator vsi;
struct cgraph_edge *edge;
int i, n_nodes;
bitmap written_decls;
lto_cgraph_encoder_t encoder;
+ lto_varpool_encoder_t varpool_encoder;
struct cgraph_asm_node *can;
+ struct varpool_node *vnode;
ob = lto_create_simple_output_block (LTO_section_cgraph);
/* An encoder for cgraph nodes should have been created by
ipa_write_summaries_1. */
gcc_assert (ob->decl_state->cgraph_node_encoder);
+ gcc_assert (ob->decl_state->varpool_node_encoder);
encoder = ob->decl_state->cgraph_node_encoder;
+ varpool_encoder = ob->decl_state->varpool_node_encoder;
/* The FUNCTION_DECLs for which we have written a node. The first
node found is written as the "original" node, the remaining nodes
node = csi_node (csi);
add_node_to (encoder, node);
}
+ for (vsi = vsi_start (vset); !vsi_end_p (vsi); vsi_next (&vsi))
+ {
+ struct varpool_node *vnode = vsi_node (vsi);
+ gcc_assert (!vnode->alias);
+ lto_varpool_encoder_encode (varpool_encoder, vnode);
+ lto_set_varpool_encoder_encode_initializer (varpool_encoder, vnode);
+ }
+ /* FIXME: We do not track references, so for now we need to include all possibly
+ used variables in the encoder set. */
+ for (vnode = varpool_nodes; vnode; vnode = vnode->next)
+ if (vnode->needed)
+ lto_varpool_encoder_encode (varpool_encoder, vnode);
+ /* Pickle in also the initializer of all referenced readonly variables
+ to help folding. Constant pool variables are not shared, so we must
+ pickle those too. */
+ for (i = 0; i < lto_varpool_encoder_size (varpool_encoder); i++)
+ {
+ struct varpool_node *vnode = lto_varpool_encoder_deref (varpool_encoder, i);
+ if (DECL_INITIAL (vnode->decl)
+ && !lto_varpool_encoder_encode_initializer_p (varpool_encoder,
+ vnode)
+ && (DECL_IN_CONSTANT_POOL (vnode->decl)
+ || TREE_READONLY (vnode->decl)))
+ {
+ lto_set_varpool_encoder_encode_initializer (varpool_encoder, vnode);
+ }
+ }
/* Go over all the nodes again to include callees that are not in
SET. */
lto_output_uleb128_stream (ob->main_stream, 0);
lto_destroy_simple_output_block (ob);
+ output_varpool (vset);
}
/* Overwrite the information in NODE based on FILE_DATA, TAG, FLAGS,
node->local.inline_summary.size_inlining_benefit = size_inlining_benefit;
node->global.time = self_time;
node->global.size = self_size;
+ node->global.estimated_stack_size = stack_size;
+ node->global.estimated_growth = INT_MIN;
node->local.lto_file_data = file_data;
node->local.local = bp_unpack_value (bp, 1);
node->local.inlinable = bp_unpack_value (bp, 1);
node->local.disregard_inline_limits = bp_unpack_value (bp, 1);
node->local.redefined_extern_inline = bp_unpack_value (bp, 1);
- node->local.for_functions_valid = bp_unpack_value (bp, 1);
node->local.vtable_method = bp_unpack_value (bp, 1);
node->needed = bp_unpack_value (bp, 1);
node->address_taken = bp_unpack_value (bp, 1);
node->abstract_and_needed = bp_unpack_value (bp, 1);
- node->reachable = bp_unpack_value (bp, 1);
node->reachable_from_other_partition = bp_unpack_value (bp, 1);
node->lowered = bp_unpack_value (bp, 1);
- node->analyzed = bp_unpack_value (bp, 1);
+ node->analyzed = tag == LTO_cgraph_analyzed_node;
node->in_other_partition = bp_unpack_value (bp, 1);
- node->process = bp_unpack_value (bp, 1);
node->alias = bp_unpack_value (bp, 1);
node->finalized_by_frontend = bp_unpack_value (bp, 1);
node->frequency = (enum node_frequency)bp_unpack_value (bp, 2);
/* Output the part of the cgraph in SET. */
-void
-output_varpool (varpool_node_set set)
+static void
+output_varpool (varpool_node_set vset)
{
- struct varpool_node *node;
- struct lto_simple_output_block *ob;
- int len = 0;
-
- ob = lto_create_simple_output_block (LTO_section_varpool);
-
- for (node = varpool_nodes; node; node = node->next)
- if (node->needed && node->analyzed)
- len++;
+ struct lto_simple_output_block *ob = lto_create_simple_output_block (LTO_section_varpool);
+ lto_varpool_encoder_t varpool_encoder = ob->decl_state->varpool_node_encoder;
+ int len = lto_varpool_encoder_size (varpool_encoder), i;
lto_output_uleb128_stream (ob->main_stream, len);
/* Write out the nodes. We must first output a node and then its clones,
otherwise at a time reading back the node there would be nothing to clone
from. */
- for (node = varpool_nodes; node; node = node->next)
- if (node->needed && node->analyzed)
- lto_output_varpool_node (ob, node, set);
+ for (i = 0; i < len; i++)
+ {
+ lto_output_varpool_node (ob, lto_varpool_encoder_deref (varpool_encoder, i),
+ vset);
+ }
lto_destroy_simple_output_block (ob);
}
int stack_size = 0;
unsigned decl_index;
bool clone_p;
- int estimated_stack_size = 0;
- int stack_frame_offset = 0;
int ref = LCC_NOT_FOUND, ref2 = LCC_NOT_FOUND;
- int estimated_growth = 0;
- int time = 0;
- int size = 0;
int self_time = 0;
int self_size = 0;
int time_inlining_benefit = 0;
int size_inlining_benefit = 0;
unsigned long same_body_count = 0;
- bool inlined = false;
clone_p = (lto_input_uleb128 (ib) != 0);
node->count = lto_input_sleb128 (ib);
bp = lto_input_bitpack (ib);
- if (tag != LTO_cgraph_unavail_node)
+ if (tag == LTO_cgraph_analyzed_node)
{
stack_size = lto_input_sleb128 (ib);
self_size = lto_input_sleb128 (ib);
size_inlining_benefit = lto_input_sleb128 (ib);
self_time = lto_input_sleb128 (ib);
time_inlining_benefit = lto_input_sleb128 (ib);
+
+ ref = lto_input_sleb128 (ib);
}
- estimated_stack_size = lto_input_sleb128 (ib);
- stack_frame_offset = lto_input_sleb128 (ib);
- ref = lto_input_sleb128 (ib);
- time = lto_input_sleb128 (ib);
- size = lto_input_sleb128 (ib);
- estimated_growth = lto_input_sleb128 (ib);
- inlined = lto_input_uleb128 (ib);
ref2 = lto_input_sleb128 (ib);
same_body_count = lto_input_uleb128 (ib);
size_inlining_benefit);
bitpack_delete (bp);
- node->global.estimated_stack_size = estimated_stack_size;
- node->global.stack_frame_offset = stack_frame_offset;
- node->global.time = time;
- node->global.size = size;
-
/* Store a reference for now, and fix up later to be a pointer. */
node->global.inlined_to = (cgraph_node_ptr) (intptr_t) ref;
- node->global.estimated_growth = estimated_growth;
- node->global.inlined = inlined;
-
/* Store a reference for now, and fix up later to be a pointer. */
node->same_comdat_group = (cgraph_node_ptr) (intptr_t) ref2;
node->externally_visible = bp_unpack_value (bp, 1);
node->force_output = bp_unpack_value (bp, 1);
node->finalized = bp_unpack_value (bp, 1);
- node->analyzed = 1;
+ node->alias = bp_unpack_value (bp, 1);
+ node->analyzed = node->finalized;
node->used_from_other_partition = bp_unpack_value (bp, 1);
node->in_other_partition = bp_unpack_value (bp, 1);
aliases_p = bp_unpack_value (bp, 1);
/* Read a cgraph from IB using the info in FILE_DATA. */
-static void
+static VEC(cgraph_node_ptr, heap) *
input_cgraph_1 (struct lto_file_decl_data *file_data,
struct lto_input_block *ib)
{
else
node->same_comdat_group = NULL;
}
-
- VEC_free (cgraph_node_ptr, heap, nodes);
+ return nodes;
}
/* Read a varpool from IB using the info in FILE_DATA. */
-static void
+static VEC(varpool_node_ptr, heap) *
input_varpool_1 (struct lto_file_decl_data *file_data,
struct lto_input_block *ib)
{
unsigned HOST_WIDE_INT len;
+ VEC(varpool_node_ptr, heap) *varpool = NULL;
len = lto_input_uleb128 (ib);
while (len)
{
- input_varpool_node (file_data, ib);
+ VEC_safe_push (varpool_node_ptr, heap, varpool,
+ input_varpool_node (file_data, ib));
len--;
}
+ return varpool;
}
+
static struct gcov_ctr_summary lto_gcov_summary;
/* Input profile_info from IB. */
const char *data;
size_t len;
struct lto_input_block *ib;
+ VEC(cgraph_node_ptr, heap) *nodes;
+ VEC(varpool_node_ptr, heap) *varpool;
ib = lto_create_simple_input_block (file_data, LTO_section_cgraph,
&data, &len);
input_profile_summary (ib);
file_data->cgraph_node_encoder = lto_cgraph_encoder_new ();
- input_cgraph_1 (file_data, ib);
+ nodes = input_cgraph_1 (file_data, ib);
lto_destroy_simple_input_block (file_data, LTO_section_cgraph,
ib, data, len);
ib = lto_create_simple_input_block (file_data, LTO_section_varpool,
&data, &len);
- input_varpool_1 (file_data, ib);
+ varpool = input_varpool_1 (file_data, ib);
lto_destroy_simple_input_block (file_data, LTO_section_varpool,
ib, data, len);
- /* Assume that every file read needs to be processed by LTRANS. */
- if (flag_wpa)
- lto_mark_file_for_ltrans (file_data);
+ VEC_free (cgraph_node_ptr, heap, nodes);
+ VEC_free (varpool_node_ptr, heap, varpool);
}
/* Clear out the aux field that was used to store enough state to