This is the mail archive of the
gcc-patches@gcc.gnu.org
mailing list for the GCC project.
Re: [PATCH] edge profiler considering liveness
- From: Andreas Krebbel <krebbel1 at de dot ibm dot com>
- To: jh at suse dot cz
- Cc: gcc-patches at gcc dot gnu dot org
- Date: Thu, 28 Oct 2004 17:59:39 +0200
- Subject: Re: [PATCH] edge profiler considering liveness
- Organization: IBM Deutschland Entwicklung GmbH
Hi Jan,
I've made the changes you suggested and checked the patch with
profiledbootstrap on s390, s390x and i386.
Please commit the patch to mainline if you think it's ok.
Bye,
-Andreas-
2004-10-28 Andreas Krebbel <krebbel1@de.ibm.com>
* profile.c (branch_prob): Call to init_edge_profiler added.
* rtl-profile.c (rtl_init_edge_profiler): New function.
(rtl_gen_edge_profiler): Replaced call to insert_insn_on_edge with
call to safe_insert_insn_on_edge.
(rtl_profile_hooks): rtl_init_edge_profiler added.
* tree-profile.c (tree_init_edge_profiler): New function.
(tree_profile_hooks): tree_init_edge_profiler added.
* value-prof.h (profile_hooks) init_edge_profiler prototype added.
Index: gcc/profile.c
===================================================================
RCS file: /cvs/gcc/gcc/gcc/profile.c,v
retrieving revision 1.149
diff -p -c -r1.149 profile.c
*** gcc/profile.c 29 Sep 2004 06:42:24 -0000 1.149
--- gcc/profile.c 26 Oct 2004 13:57:51 -0000
*************** branch_prob (void)
*** 1095,1101 ****
if (profile_arc_flag
&& coverage_counter_alloc (GCOV_COUNTER_ARCS, num_instrumented))
{
! unsigned n_instrumented = instrument_edges (el);
if (n_instrumented != num_instrumented)
abort ();
--- 1095,1105 ----
if (profile_arc_flag
&& coverage_counter_alloc (GCOV_COUNTER_ARCS, num_instrumented))
{
! unsigned n_instrumented;
!
! profile_hooks->init_edge_profiler ();
!
! n_instrumented = instrument_edges (el);
if (n_instrumented != num_instrumented)
abort ();
Index: gcc/rtl-profile.c
===================================================================
RCS file: /cvs/gcc/gcc/gcc/rtl-profile.c,v
retrieving revision 2.2
diff -p -c -r2.2 rtl-profile.c
*** gcc/rtl-profile.c 1 Sep 2004 20:58:52 -0000 2.2
--- gcc/rtl-profile.c 26 Oct 2004 13:57:51 -0000
*************** Software Foundation, 59 Temple Place - S
*** 64,69 ****
--- 64,79 ----
#include "tree.h"
#include "ggc.h"
+ /* Do initialization work for the edge profiler. */
+
+ static void
+ rtl_init_edge_profiler (void)
+ {
+ /* gen_edge_profiler calls safe_insert_insn_on_edge which needs
+ register liveness data to be available. */
+ life_analysis (NULL, 0);
+ }
+
/* Output instructions as RTL to increment the edge execution count. */
static void
*************** rtl_gen_edge_profiler (int edgeno, edge
*** 85,91 ****
sequence = get_insns ();
end_sequence ();
! insert_insn_on_edge (sequence, e);
rebuild_jump_labels (e->insns.r);
}
--- 95,101 ----
sequence = get_insns ();
end_sequence ();
! safe_insert_insn_on_edge (sequence, e);
rebuild_jump_labels (e->insns.r);
}
*************** static FILE *rtl_profile_dump_file (void
*** 413,418 ****
--- 423,429 ----
struct profile_hooks rtl_profile_hooks =
{
+ rtl_init_edge_profiler,
rtl_gen_edge_profiler,
rtl_gen_interval_profiler,
rtl_gen_pow2_profiler,
Index: gcc/tree-profile.c
===================================================================
RCS file: /cvs/gcc/gcc/gcc/tree-profile.c,v
retrieving revision 2.6
diff -p -c -r2.6 tree-profile.c
*** gcc/tree-profile.c 25 Sep 2004 10:06:17 -0000 2.6
--- gcc/tree-profile.c 26 Oct 2004 13:57:51 -0000
*************** Software Foundation, 59 Temple Place - S
*** 69,74 ****
--- 69,82 ----
#include "value-prof.h"
+
+ /* Do initialization work for the edge profiler. */
+
+ static void
+ tree_init_edge_profiler (void)
+ {
+ }
+
/* Output instructions as GIMPLE trees to increment the edge
execution count, and insert them on E. We rely on
bsi_insert_on_edge to preserve the order. */
*************** struct tree_opt_pass pass_tree_profile =
*** 195,200 ****
--- 203,209 ----
struct profile_hooks tree_profile_hooks =
{
+ tree_init_edge_profiler, /* init_edge_profiler */
tree_gen_edge_profiler, /* gen_edge_profiler */
tree_gen_interval_profiler, /* gen_interval_profiler */
tree_gen_pow2_profiler, /* gen_pow2_profiler */
Index: gcc/value-prof.h
===================================================================
RCS file: /cvs/gcc/gcc/gcc/value-prof.h,v
retrieving revision 1.9
diff -p -c -r1.9 value-prof.h
*** gcc/value-prof.h 15 Oct 2004 14:47:12 -0000 1.9
--- gcc/value-prof.h 26 Oct 2004 13:57:51 -0000
*************** extern bool value_profile_transformation
*** 80,85 ****
--- 80,89 ----
/* External declarations for edge-based profiling. */
struct profile_hooks {
+
+ /* Insert code to initialize edge profiler. */
+ void (*init_edge_profiler) (void);
+
/* Insert code to increment an edge count. */
void (*gen_edge_profiler) (int, edge);