Merge tree-ssa-20020619-branch into mainline.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@81764 138bc75d-0d04-0410-961f-82ee72b054a4

1 files changed, 49 insertions, 3 deletions

diff --git a/gcc/value-prof.h b/gcc/value-prof.h
index afbeb916eb8..16276f2b7de 100644
--- a/gcc/value-prof.h
+++ b/gcc/value-prof.h
@@ -18,6 +18,9 @@ along with GCC; see the file COPYING.  If not, write to the Free
 Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 02111-1307, USA.  */
 
+#ifndef GCC_VALUE_PROF_H
+#define GCC_VALUE_PROF_H
+
 /* Supported histogram types.  */
 enum hist_type
 {
@@ -35,12 +38,13 @@ enum hist_type
   ((enum hist_type) ((COUNTER) - GCOV_FIRST_VALUE_COUNTER))
 
 /* The value to measure.  */
+/* The void *'s are either rtx or tree, depending on which IR is in use.  */
 struct histogram_value
 {
-  rtx value;		/* The value to profile.  */
+  void * value;		/* The value to profile.  */
   enum machine_mode mode; /* And its mode.  */
-  rtx seq;		/* Insns required to count the profiled value.  */
-  rtx insn;		/* Insn before that to measure.  */
+  void * seq;		/* Insns required to count the profiled value.  */
+  void * insn;		/* Insn before that to measure.  */
   enum hist_type type;	/* Type of information to measure.  */
   unsigned n_counters;	/* Number of required counters.  */
   union
@@ -59,6 +63,48 @@ struct histogram_value
     } hdata;		/* Profiled information specific data.  */
 };
 
+/* Hooks registration.  */
+extern void rtl_register_value_prof_hooks (void);
+extern void tree_register_value_prof_hooks (void);
+
+/* IR-independent entry points.  */
 extern void find_values_to_profile (unsigned *, struct histogram_value **);
 extern void free_profiled_values (unsigned, struct histogram_value *);
 extern bool value_profile_transformations (void);
+
+/* External declarations for edge-based profiling.  */
+struct profile_hooks {
+  /* Insert code to increment an edge count. */
+  void (*gen_edge_profiler) (int, edge);
+
+  /* Insert code to increment the interval histogram counter.  */
+  void (*gen_interval_profiler) (struct histogram_value *, unsigned, unsigned);
+
+  /* Insert code to increment the power of two histogram counter.  */
+  void (*gen_pow2_profiler) (struct histogram_value *, unsigned, unsigned);
+
+  /* Insert code to find the most common value. */
+  void (*gen_one_value_profiler) (struct histogram_value *, unsigned, unsigned);
+
+  /* Insert code to find the most common value of a difference between two
+     evaluations of an expression.  */
+  void (*gen_const_delta_profiler) (struct histogram_value *, unsigned, 
+				    unsigned);
+  FILE * (*profile_dump_file) (void);
+};
+
+/* In profile.c.  */
+extern void init_branch_prob (void);
+extern void branch_prob (void);
+extern void end_branch_prob (void);
+extern void tree_register_profile_hooks (void);
+extern void rtl_register_profile_hooks (void);
+
+/* In tree-profile.c.  */
+extern struct profile_hooks tree_profile_hooks;
+
+/* In rtl-profile.c.  */
+extern struct profile_hooks rtl_profile_hooks;
+
+#endif	/* GCC_VALUE_PROF_H */
+