/* Calculate branch probabilities, and basic block execution counts.
Copyright (C) 1990, 1991, 1992, 1993, 1994, 1996, 1997, 1998, 1999,
- 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
+ 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2010
Free Software Foundation, Inc.
Contributed by James E. Wilson, UC Berkeley/Cygnus Support;
based on some ideas from Dain Samples of UC Berkeley.
#include "system.h"
#include "coretypes.h"
#include "tm.h"
-#include "rtl.h"
#include "flags.h"
-#include "output.h"
#include "regs.h"
#include "expr.h"
#include "function.h"
#include "tree-pass.h"
#include "timevar.h"
#include "value-prof.h"
-#include "ggc.h"
#include "cgraph.h"
static GTY(()) tree gcov_type_node;
tree gcov_type_ptr;
ptr_void = build_pointer_type (void_type_node);
-
- ic_void_ptr_var
- = build_decl (VAR_DECL,
- get_identifier ("__gcov_indirect_call_callee"),
+
+ ic_void_ptr_var
+ = build_decl (UNKNOWN_LOCATION, VAR_DECL,
+ get_identifier ("__gcov_indirect_call_callee"),
ptr_void);
TREE_STATIC (ic_void_ptr_var) = 1;
TREE_PUBLIC (ic_void_ptr_var) = 0;
DECL_ARTIFICIAL (ic_void_ptr_var) = 1;
DECL_INITIAL (ic_void_ptr_var) = NULL;
- assemble_variable (ic_void_ptr_var, 0, 0, 0);
+ varpool_finalize_decl (ic_void_ptr_var);
+ varpool_mark_needed_node (varpool_node (ic_void_ptr_var));
gcov_type_ptr = build_pointer_type (get_gcov_type ());
- ic_gcov_type_ptr_var
- = build_decl (VAR_DECL,
- get_identifier ("__gcov_indirect_call_counters"),
+ ic_gcov_type_ptr_var
+ = build_decl (UNKNOWN_LOCATION, VAR_DECL,
+ get_identifier ("__gcov_indirect_call_counters"),
gcov_type_ptr);
TREE_STATIC (ic_gcov_type_ptr_var) = 1;
TREE_PUBLIC (ic_gcov_type_ptr_var) = 0;
DECL_ARTIFICIAL (ic_gcov_type_ptr_var) = 1;
DECL_INITIAL (ic_gcov_type_ptr_var) = NULL;
- assemble_variable (ic_gcov_type_ptr_var, 0, 0, 0);
+ varpool_finalize_decl (ic_gcov_type_ptr_var);
+ varpool_mark_needed_node (varpool_node (ic_gcov_type_ptr_var));
}
static void
one_value_profiler_fn_type);
tree_init_ic_make_global_vars ();
-
+
/* void (*) (gcov_type *, gcov_type, void *, void *) */
ic_profiler_fn_type
= build_function_type_list (void_type_node,
tree_ior_profiler_fn
= build_fn_decl ("__gcov_ior_profiler",
average_profiler_fn_type);
+ /* LTO streamer needs assembler names. Because we create these decls
+ late, we need to initialize them by hand. */
+ DECL_ASSEMBLER_NAME (tree_interval_profiler_fn);
+ DECL_ASSEMBLER_NAME (tree_pow2_profiler_fn);
+ DECL_ASSEMBLER_NAME (tree_one_value_profiler_fn);
+ DECL_ASSEMBLER_NAME (tree_indirect_call_profiler_fn);
+ DECL_ASSEMBLER_NAME (tree_average_profiler_fn);
+ DECL_ASSEMBLER_NAME (tree_ior_profiler_fn);
}
}
-/* Output instructions as GIMPLE trees to increment the edge
- execution count, and insert them on E. We rely on
+/* New call was added, make goto call edges if neccesary. */
+
+static void
+add_abnormal_goto_call_edges (gimple_stmt_iterator gsi)
+{
+ gimple stmt = gsi_stmt (gsi);
+
+ if (!stmt_can_make_abnormal_goto (stmt))
+ return;
+ if (!gsi_end_p (gsi))
+ split_block (gimple_bb (stmt), stmt);
+ make_abnormal_goto_edges (gimple_bb (stmt), true);
+}
+
+/* Output instructions as GIMPLE trees to increment the edge
+ execution count, and insert them on E. We rely on
gsi_insert_on_edge to preserve the order. */
static void
prepare_instrumented_value (gimple_stmt_iterator *gsi, histogram_value value)
{
tree val = value->hvalue.value;
+ if (POINTER_TYPE_P (TREE_TYPE (val)))
+ val = fold_convert (sizetype, val);
return force_gimple_operand_gsi (gsi, fold_convert (gcov_type_node, val),
true, NULL_TREE, true, GSI_SAME_STMT);
}
-/* Output instructions as GIMPLE trees to increment the interval histogram
- counter. VALUE is the expression whose value is profiled. TAG is the
+/* Output instructions as GIMPLE trees to increment the interval histogram
+ counter. VALUE is the expression whose value is profiled. TAG is the
tag of the section for counters, BASE is offset of the counter position. */
static void
value->hdata.intvl.int_start);
tree steps = build_int_cst_type (unsigned_type_node,
value->hdata.intvl.steps);
-
+
ref_ptr = force_gimple_operand_gsi (&gsi,
build_addr (ref, current_function_decl),
true, NULL_TREE, true, GSI_SAME_STMT);
val = prepare_instrumented_value (&gsi, value);
call = gimple_build_call (tree_interval_profiler_fn, 4,
ref_ptr, val, start, steps);
- gsi_insert_before (&gsi, call, GSI_SAME_STMT);
+ gsi_insert_before (&gsi, call, GSI_NEW_STMT);
+ add_abnormal_goto_call_edges (gsi);
}
-/* Output instructions as GIMPLE trees to increment the power of two histogram
- counter. VALUE is the expression whose value is profiled. TAG is the tag
+/* Output instructions as GIMPLE trees to increment the power of two histogram
+ counter. VALUE is the expression whose value is profiled. TAG is the tag
of the section for counters, BASE is offset of the counter position. */
static void
tree ref_ptr = tree_coverage_counter_addr (tag, base);
gimple call;
tree val;
-
+
ref_ptr = force_gimple_operand_gsi (&gsi, ref_ptr,
true, NULL_TREE, true, GSI_SAME_STMT);
val = prepare_instrumented_value (&gsi, value);
call = gimple_build_call (tree_pow2_profiler_fn, 2, ref_ptr, val);
- gsi_insert_before (&gsi, call, GSI_SAME_STMT);
+ gsi_insert_before (&gsi, call, GSI_NEW_STMT);
+ add_abnormal_goto_call_edges (gsi);
}
/* Output instructions as GIMPLE trees for code to find the most common value.
tree ref_ptr = tree_coverage_counter_addr (tag, base);
gimple call;
tree val;
-
+
ref_ptr = force_gimple_operand_gsi (&gsi, ref_ptr,
true, NULL_TREE, true, GSI_SAME_STMT);
val = prepare_instrumented_value (&gsi, value);
call = gimple_build_call (tree_one_value_profiler_fn, 2, ref_ptr, val);
- gsi_insert_before (&gsi, call, GSI_SAME_STMT);
+ gsi_insert_before (&gsi, call, GSI_NEW_STMT);
+ add_abnormal_goto_call_edges (gsi);
}
/* Output instructions as GIMPLE trees for code to find the most
- common called function in indirect call.
+ common called function in indirect call.
VALUE is the call expression whose indirect callee is profiled.
TAG is the tag of the section for counters, BASE is offset of the
counter position. */
true, NULL_TREE, true, GSI_SAME_STMT);
/* Insert code:
-
- __gcov_indirect_call_counters = get_relevant_counter_ptr ();
+
+ __gcov_indirect_call_counters = get_relevant_counter_ptr ();
__gcov_indirect_call_callee = (void *) indirect call argument;
*/
gimple stmt1, stmt2;
tree tree_uid, cur_func;
- if (!c_node->needed)
+ if (cgraph_only_called_directly_p (c_node))
return;
-
+
tree_init_edge_profiler ();
-
+
FOR_EACH_EDGE (e, ei, ENTRY_BLOCK_PTR->succs)
{
tree void0;
gsi = gsi_start_bb (bb);
cur_func = force_gimple_operand_gsi (&gsi,
- build_addr (current_function_decl,
+ build_addr (current_function_decl,
current_function_decl),
true, NULL_TREE,
true, GSI_SAME_STMT);
cur_func,
ic_void_ptr_var);
gsi_insert_after (&gsi, stmt1, GSI_NEW_STMT);
-
gcc_assert (EDGE_COUNT (bb->succs) == 1);
bb = split_edge (EDGE_I (bb->succs, 0));
+ add_abnormal_goto_call_edges (gsi);
+
gsi = gsi_start_bb (bb);
/* Set __gcov_indirect_call_callee to 0,
so that calls from other modules won't get misattributed
}
}
-/* Output instructions as GIMPLE trees for code to find the most common value
+/* Output instructions as GIMPLE trees for code to find the most common value
of a difference between two evaluations of an expression.
VALUE is the expression whose value is profiled. TAG is the tag of the
section for counters, BASE is offset of the counter position. */
gcc_unreachable ();
}
-/* Output instructions as GIMPLE trees to increment the average histogram
- counter. VALUE is the expression whose value is profiled. TAG is the
+/* Output instructions as GIMPLE trees to increment the average histogram
+ counter. VALUE is the expression whose value is profiled. TAG is the
tag of the section for counters, BASE is offset of the counter position. */
static void
tree ref_ptr = tree_coverage_counter_addr (tag, base);
gimple call;
tree val;
-
+
ref_ptr = force_gimple_operand_gsi (&gsi, ref_ptr,
true, NULL_TREE,
true, GSI_SAME_STMT);
val = prepare_instrumented_value (&gsi, value);
call = gimple_build_call (tree_average_profiler_fn, 2, ref_ptr, val);
- gsi_insert_before (&gsi, call, GSI_SAME_STMT);
+ gsi_insert_before (&gsi, call, GSI_NEW_STMT);
+ add_abnormal_goto_call_edges (gsi);
}
-/* Output instructions as GIMPLE trees to increment the ior histogram
- counter. VALUE is the expression whose value is profiled. TAG is the
+/* Output instructions as GIMPLE trees to increment the ior histogram
+ counter. VALUE is the expression whose value is profiled. TAG is the
tag of the section for counters, BASE is offset of the counter position. */
static void
tree ref_ptr = tree_coverage_counter_addr (tag, base);
gimple call;
tree val;
-
+
ref_ptr = force_gimple_operand_gsi (&gsi, ref_ptr,
true, NULL_TREE, true, GSI_SAME_STMT);
val = prepare_instrumented_value (&gsi, value);
call = gimple_build_call (tree_ior_profiler_fn, 2, ref_ptr, val);
- gsi_insert_before (&gsi, call, GSI_SAME_STMT);
+ gsi_insert_before (&gsi, call, GSI_NEW_STMT);
+ add_abnormal_goto_call_edges (gsi);
}
/* Return 1 if tree-based profiling is in effect, else 0.
branch_prob ();
- if (! flag_branch_probabilities
+ if (! flag_branch_probabilities
&& flag_profile_values)
tree_gen_ic_func_profiler ();
return 0;
}
-struct gimple_opt_pass pass_tree_profile =
+struct gimple_opt_pass pass_tree_profile =
{
{
GIMPLE_PASS,
0, /* static_pass_number */
TV_BRANCH_PROB, /* tv_id */
PROP_gimple_leh | PROP_cfg, /* properties_required */
- PROP_gimple_leh | PROP_cfg, /* properties_provided */
+ 0, /* properties_provided */
0, /* properties_destroyed */
0, /* todo_flags_start */
TODO_verify_stmts | TODO_dump_func /* todo_flags_finish */
OSDN Git Service
