2008-03-23 H.J. Lu <hongjiu.lu@intel.com>

[pf3gnuchains/gcc-fork.git] / gcc / profile.c

diff --git a/gcc/profile.c b/gcc/profile.c
index 2f6d8aa..a4f46b3 100644 (file)
--- a/gcc/profile.c
+++ b/gcc/profile.c
@@ -1,6 +1,7 @@
 /* Calculate branch probabilities, and basic block execution counts.
    Copyright (C) 1990, 1991, 1992, 1993, 1994, 1996, 1997, 1998, 1999,
 /* 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  Free Software Foundation, Inc.
+   2000, 2001, 2002, 2003, 2004, 2005, 2007, 2008
+   Free Software Foundation, Inc.

    Contributed by James E. Wilson, UC Berkeley/Cygnus Support;
    based on some ideas from Dain Samples of UC Berkeley.
    Further mangling by Bob Manson, Cygnus Support.
    Contributed by James E. Wilson, UC Berkeley/Cygnus Support;
    based on some ideas from Dain Samples of UC Berkeley.
    Further mangling by Bob Manson, Cygnus Support.


@@ -9,7 +10,7 @@ This file is part of GCC.
 
 GCC is free software; you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free
 
 GCC is free software; you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free

-Software Foundation; either version 2, or (at your option) any later
+Software Foundation; either version 3, or (at your option) any later

 version.
 
 GCC is distributed in the hope that it will be useful, but WITHOUT ANY
 version.
 
 GCC is distributed in the hope that it will be useful, but WITHOUT ANY


@@ -18,9 +19,8 @@ FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
 for more details.
 
 You should have received a copy of the GNU General Public License
 for more details.
 
 You should have received a copy of the GNU General Public License

-along with GCC; see the file COPYING.  If not, write to the Free
-Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA
-02110-1301, USA.  */
+along with GCC; see the file COPYING3.  If not see
+<http://www.gnu.org/licenses/>.  */

 
 /* Generate basic block profile instrumentation and auxiliary files.
    Profile generation is optimized, so that not all arcs in the basic
 
 /* Generate basic block profile instrumentation and auxiliary files.
    Profile generation is optimized, so that not all arcs in the basic


@@ -192,6 +192,18 @@ instrument_values (histogram_values values)
          t = GCOV_COUNTER_V_DELTA;
          break;
 
          t = GCOV_COUNTER_V_DELTA;
          break;
 

+       case HIST_TYPE_INDIR_CALL:
+         t = GCOV_COUNTER_V_INDIR;
+         break;
+
+       case HIST_TYPE_AVERAGE:
+         t = GCOV_COUNTER_AVERAGE;
+         break;
+
+       case HIST_TYPE_IOR:
+         t = GCOV_COUNTER_IOR;
+         break;
+

        default:
          gcc_unreachable ();
        }
        default:
          gcc_unreachable ();
        }


@@ -216,11 +228,22 @@ instrument_values (histogram_values values)
          (profile_hooks->gen_const_delta_profiler) (hist, t, 0);
          break;
 
          (profile_hooks->gen_const_delta_profiler) (hist, t, 0);
          break;
 

+       case HIST_TYPE_INDIR_CALL:
+         (profile_hooks->gen_ic_profiler) (hist, t, 0);
+         break;
+
+       case HIST_TYPE_AVERAGE:
+         (profile_hooks->gen_average_profiler) (hist, t, 0);
+         break;
+
+       case HIST_TYPE_IOR:
+         (profile_hooks->gen_ior_profiler) (hist, t, 0);
+         break;
+

        default:
          gcc_unreachable ();
        }
     }
        default:
          gcc_unreachable ();
        }
     }

-  VEC_free (histogram_value, heap, values);

 }
 \f
 
 }
 \f
 


@@ -490,7 +513,6 @@ compute_branch_probabilities (void)
     {
       edge e;
       edge_iterator ei;
     {
       edge e;
       edge_iterator ei;

-      rtx note;

 
       if (bb->count < 0)
        {
 
       if (bb->count < 0)
        {


@@ -546,37 +568,9 @@ compute_branch_probabilities (void)
                index = 19;
              hist_br_prob[index]++;
 
                index = 19;
              hist_br_prob[index]++;
 

-             /* Do this for RTL only.  */
-             if (!ir_type ())
-               {
-                 note = find_reg_note (BB_END (bb), REG_BR_PROB, 0);
-                 /* There may be already note put by some other pass, such
-                    as builtin_expect expander.  */
-                 if (note)
-                   XEXP (note, 0) = GEN_INT (prob);
-                 else
-                   REG_NOTES (BB_END (bb))
-                     = gen_rtx_EXPR_LIST (REG_BR_PROB, GEN_INT (prob),
-                                          REG_NOTES (BB_END (bb)));
-               }

              num_branches++;
            }
        }
              num_branches++;
            }
        }

-      /* Otherwise try to preserve the existing REG_BR_PROB probabilities
-         tree based profile guessing put into code.  BB can be the
-        ENTRY_BLOCK, and it can have multiple (fake) successors in
-        EH cases, but it still has no code; don't crash in this case.  */
-      else if (profile_status == PROFILE_ABSENT
-              && !ir_type ()
-              && EDGE_COUNT (bb->succs) > 1
-              && BB_END (bb)
-              && (note = find_reg_note (BB_END (bb), REG_BR_PROB, 0)))
-       {
-         int prob = INTVAL (XEXP (note, 0));
-
-         BRANCH_EDGE (bb)->probability = prob;
-         FALLTHRU_EDGE (bb)->probability = REG_BR_PROB_BASE - prob;
-       }

       /* As a last resort, distribute the probabilities evenly.
         Use simple heuristics that if there are normal edges,
         give all abnormals frequency of 0, otherwise distribute the
       /* As a last resort, distribute the probabilities evenly.
         Use simple heuristics that if there are normal edges,
         give all abnormals frequency of 0, otherwise distribute the


@@ -678,15 +672,13 @@ compute_value_histograms (histogram_values values)
     {
       histogram_value hist = VEC_index (histogram_value, values, i);
       tree stmt = hist->hvalue.stmt;
     {
       histogram_value hist = VEC_index (histogram_value, values, i);
       tree stmt = hist->hvalue.stmt;

-      stmt_ann_t ann = get_stmt_ann (stmt);

 
       t = (int) hist->type;
 
       aact_count = act_count[t];
       act_count[t] += hist->n_counters;
 
 
       t = (int) hist->type;
 
       aact_count = act_count[t];
       act_count[t] += hist->n_counters;
 

-      hist->hvalue.next = ann->histograms;
-      ann->histograms = hist;
+      gimple_add_histogram_value (cfun, stmt, hist);

       hist->hvalue.counters =  XNEWVEC (gcov_type, hist->n_counters);
       for (j = 0; j < hist->n_counters; j++)
        hist->hvalue.counters[j] = aact_count[j];
       hist->hvalue.counters =  XNEWVEC (gcov_type, hist->n_counters);
       for (j = 0; j < hist->n_counters; j++)
        hist->hvalue.counters[j] = aact_count[j];


@@ -822,15 +814,10 @@ branch_prob (void)
          if (last && EXPR_LOCUS (last)
              && e->goto_locus
              && !single_succ_p (bb)
          if (last && EXPR_LOCUS (last)
              && e->goto_locus
              && !single_succ_p (bb)

-#ifdef USE_MAPPED_LOCATION

              && (LOCATION_FILE (e->goto_locus)
                  != LOCATION_FILE (EXPR_LOCATION  (last))
                  || (LOCATION_LINE (e->goto_locus)
                      != LOCATION_LINE (EXPR_LOCATION  (last)))))
              && (LOCATION_FILE (e->goto_locus)
                  != LOCATION_FILE (EXPR_LOCATION  (last))
                  || (LOCATION_LINE (e->goto_locus)
                      != LOCATION_LINE (EXPR_LOCATION  (last)))))

-#else
-             && (e->goto_locus->file != EXPR_LOCUS (last)->file
-                 || (e->goto_locus->line != EXPR_LOCUS (last)->line)))
-#endif

            {
              basic_block new = split_edge (e);
              single_succ_edge (new)->goto_locus = e->goto_locus;
            {
              basic_block new = split_edge (e);
              single_succ_edge (new)->goto_locus = e->goto_locus;


@@ -972,8 +959,7 @@ branch_prob (void)
                    flag_bits |= GCOV_ARC_FALLTHROUGH;
                  /* On trees we don't have fallthru flags, but we can
                     recompute them from CFG shape.  */
                    flag_bits |= GCOV_ARC_FALLTHROUGH;
                  /* On trees we don't have fallthru flags, but we can
                     recompute them from CFG shape.  */

-                 if (ir_type ()
-                     && e->flags & (EDGE_TRUE_VALUE | EDGE_FALSE_VALUE)
+                 if (e->flags & (EDGE_TRUE_VALUE | EDGE_FALSE_VALUE)

                      && e->src->next_bb == e->dest)
                    flag_bits |= GCOV_ARC_FALLTHROUGH;
 
                      && e->src->next_bb == e->dest)
                    flag_bits |= GCOV_ARC_FALLTHROUGH;
 


@@ -989,116 +975,60 @@ branch_prob (void)
   /* Line numbers.  */
   if (coverage_begin_output ())
     {
   /* Line numbers.  */
   if (coverage_begin_output ())
     {

+      gcov_position_t offset;
+

       /* Initialize the output.  */
       output_location (NULL, 0, NULL, NULL);
 
       /* Initialize the output.  */
       output_location (NULL, 0, NULL, NULL);
 

-      if (!ir_type ())
+      FOR_EACH_BB (bb)

        {
        {

-         gcov_position_t offset;
-
-         FOR_EACH_BB (bb)
-           {
-             rtx insn = BB_HEAD (bb);
-             int ignore_next_note = 0;
-
-             offset = 0;
-
-             /* We are looking for line number notes.  Search backward
-                before basic block to find correct ones.  */
-             insn = prev_nonnote_insn (insn);
-             if (!insn)
-               insn = get_insns ();
-             else
-               insn = NEXT_INSN (insn);
+         block_stmt_iterator bsi;

 
 

-             while (insn != BB_END (bb))
-               {
-                 if (NOTE_P (insn))
-                   {
-                     /* Must ignore the line number notes that
-                        immediately follow the end of an inline function
-                        to avoid counting it twice.  There is a note
-                        before the call, and one after the call.  */
-                     if (NOTE_LINE_NUMBER (insn)
-                         == NOTE_INSN_REPEATED_LINE_NUMBER)
-                       ignore_next_note = 1;
-                     else if (NOTE_LINE_NUMBER (insn) <= 0)
-                       /*NOP*/;
-                     else if (ignore_next_note)
-                       ignore_next_note = 0;
-                     else
-                       {
-                         expanded_location s;
-                         NOTE_EXPANDED_LOCATION (s, insn);
-                         output_location (s.file, s.line, &offset, bb);
-                       }
-                   }
-                 insn = NEXT_INSN (insn);
-               }
+         offset = 0;

 
 

-             if (offset)
-               {
-                 /* A file of NULL indicates the end of run.  */
-                 gcov_write_unsigned (0);
-                 gcov_write_string (NULL);
-                 gcov_write_length (offset);
-               }
+         if (bb == ENTRY_BLOCK_PTR->next_bb)
+           {
+             expanded_location curr_location = 
+               expand_location (DECL_SOURCE_LOCATION (current_function_decl));
+             output_location (curr_location.file, curr_location.line,
+                              &offset, bb);

            }
            }

-       }
-      else
-       {
-         gcov_position_t offset;

 
 

-         FOR_EACH_BB (bb)
+         for (bsi = bsi_start (bb); !bsi_end_p (bsi); bsi_next (&bsi))

            {
            {

-             block_stmt_iterator bsi;
-
-             offset = 0;
-
-             if (bb == ENTRY_BLOCK_PTR->next_bb)
-               {
-                 expanded_location curr_location = 
-                   expand_location (DECL_SOURCE_LOCATION
-                                    (current_function_decl));
-                 output_location (curr_location.file, curr_location.line,
-                                  &offset, bb);
-               }
-
-             for (bsi = bsi_start (bb); !bsi_end_p (bsi); bsi_next (&bsi))
-               {
-                 tree stmt = bsi_stmt (bsi);
-                 if (EXPR_HAS_LOCATION (stmt))
-                   output_location (EXPR_FILENAME (stmt), 
-                                    EXPR_LINENO (stmt),
-                                    &offset, bb);
-               }
+             tree stmt = bsi_stmt (bsi);
+             if (EXPR_HAS_LOCATION (stmt))
+               output_location (EXPR_FILENAME (stmt), EXPR_LINENO (stmt),
+                                &offset, bb);
+             /* Take into account modify statements nested in return
+                produced by C++ NRV transformation.  */
+             if (TREE_CODE (stmt) == RETURN_EXPR
+                 && TREE_OPERAND (stmt, 0)
+                 && TREE_CODE (TREE_OPERAND (stmt, 0)) == MODIFY_EXPR
+                 && EXPR_HAS_LOCATION (TREE_OPERAND (stmt, 0)))
+               output_location (EXPR_FILENAME (TREE_OPERAND (stmt, 0)),
+                                EXPR_LINENO (TREE_OPERAND (stmt, 0)),
+                                &offset, bb);
+           }

 
 

-             /* Notice GOTO expressions we eliminated while constructing the
-                CFG.  */
-             if (single_succ_p (bb) && single_succ_edge (bb)->goto_locus)
-               {
-                 /* ??? source_locus type is marked deprecated in input.h.  */
-                 source_locus curr_location = single_succ_edge (bb)->goto_locus;
-                 /* ??? The FILE/LINE API is inconsistent for these cases.  */
-#ifdef USE_MAPPED_LOCATION 
-                 output_location (LOCATION_FILE (curr_location),
-                                  LOCATION_LINE (curr_location),
-                                  &offset, bb);
-#else
-                 output_location (curr_location->file, curr_location->line,
-                                  &offset, bb);
-#endif
-               }
+         /* Notice GOTO expressions we eliminated while constructing the
+            CFG.  */
+         if (single_succ_p (bb) && single_succ_edge (bb)->goto_locus)
+           {
+             location_t curr_location = single_succ_edge (bb)->goto_locus;
+             /* ??? The FILE/LINE API is inconsistent for these cases.  */
+             output_location (LOCATION_FILE (curr_location),
+                              LOCATION_LINE (curr_location), &offset, bb);
+           }

 
 

-             if (offset)
-               {
-                 /* A file of NULL indicates the end of run.  */
-                 gcov_write_unsigned (0);
-                 gcov_write_string (NULL);
-                 gcov_write_length (offset);
-               }
+         if (offset)
+           {
+             /* A file of NULL indicates the end of run.  */
+             gcov_write_unsigned (0);
+             gcov_write_string (NULL);
+             gcov_write_length (offset);

            }
            }

-        }
+       }

     }
 
   ENTRY_BLOCK_PTR->index = ENTRY_BLOCK;
     }
 
   ENTRY_BLOCK_PTR->index = ENTRY_BLOCK;


@@ -1133,26 +1063,12 @@ branch_prob (void)
        instrument_values (values);
 
       /* Commit changes done by instrumentation.  */
        instrument_values (values);
 
       /* Commit changes done by instrumentation.  */

-      if (ir_type ())
-       bsi_commit_edge_inserts ();
-      else
-       {
-          commit_edge_insertions_watch_calls ();
-         allocate_reg_info (max_reg_num (), FALSE, FALSE);
-       }
+      bsi_commit_edge_inserts ();

     }
 
   free_aux_for_edges ();
 
     }
 
   free_aux_for_edges ();
 

-  if (!ir_type ())
-    {
-      /* Re-merge split basic blocks and the mess introduced by
-        insert_insn_on_edge.  */
-      cleanup_cfg (profile_arc_flag ? CLEANUP_EXPENSIVE : 0);
-      if (dump_file)
-       dump_flow_info (dump_file, dump_flags);
-    }
-
+  VEC_free (histogram_value, heap, values);

   free_edge_list (el);
   if (flag_branch_probabilities)
     profile_status = PROFILE_READ;
   free_edge_list (el);
   if (flag_branch_probabilities)
     profile_status = PROFILE_READ;


@@ -1332,7 +1248,7 @@ end_branch_prob (void)
 void
 tree_register_profile_hooks (void)
 {
 void
 tree_register_profile_hooks (void)
 {

-  gcc_assert (ir_type ());
+  gcc_assert (current_ir_type () == IR_GIMPLE);

   profile_hooks = &tree_profile_hooks;
 }
 
   profile_hooks = &tree_profile_hooks;
 }