Commit 46c1cff6 by Martin Liska Committed by Martin Liska

Change enum value to not to clash with a MSP430 private enum

	* predict.c (enum predictor_reason): Prefix enum with REASON_.
	(combine_predictions_for_insn): Likewise.
	(prune_predictions_for_bb): Likewise.
	(combine_predictions_for_bb): Likewise.

From-SVN: r237370
parent 7a5824c6
2016-06-13 Martin Liska <mliska@suse.cz>
* predict.c (enum predictor_reason): Prefix enum with REASON_.
(combine_predictions_for_insn): Likewise.
(prune_predictions_for_bb): Likewise.
(combine_predictions_for_bb): Likewise.
2016-06-13 Richard Biener <rguenther@suse.de> 2016-06-13 Richard Biener <rguenther@suse.de>
PR tree-optimization/71505 PR tree-optimization/71505
......
...@@ -59,10 +59,10 @@ along with GCC; see the file COPYING3. If not see ...@@ -59,10 +59,10 @@ along with GCC; see the file COPYING3. If not see
enum predictor_reason enum predictor_reason
{ {
NONE, REASON_NONE,
IGNORED, REASON_IGNORED,
SINGLE_EDGE_DUPLICATE, REASON_SINGLE_EDGE_DUPLICATE,
EDGE_PAIR_DUPLICATE REASON_EDGE_PAIR_DUPLICATE
}; };
/* String messages for the aforementioned enum. */ /* String messages for the aforementioned enum. */
...@@ -739,7 +739,7 @@ invert_br_probabilities (rtx insn) ...@@ -739,7 +739,7 @@ invert_br_probabilities (rtx insn)
static void static void
dump_prediction (FILE *file, enum br_predictor predictor, int probability, dump_prediction (FILE *file, enum br_predictor predictor, int probability,
basic_block bb, enum predictor_reason reason = NONE, basic_block bb, enum predictor_reason reason = REASON_NONE,
edge ep_edge = NULL) edge ep_edge = NULL)
{ {
edge e = ep_edge; edge e = ep_edge;
...@@ -864,9 +864,9 @@ combine_predictions_for_insn (rtx_insn *insn, basic_block bb) ...@@ -864,9 +864,9 @@ combine_predictions_for_insn (rtx_insn *insn, basic_block bb)
else else
{ {
dump_prediction (dump_file, PRED_DS_THEORY, combined_probability, dump_prediction (dump_file, PRED_DS_THEORY, combined_probability,
bb, !first_match ? NONE : IGNORED); bb, !first_match ? REASON_NONE : REASON_IGNORED);
dump_prediction (dump_file, PRED_FIRST_MATCH, best_probability, dump_prediction (dump_file, PRED_FIRST_MATCH, best_probability,
bb, first_match ? NONE: IGNORED); bb, first_match ? REASON_NONE : REASON_IGNORED);
} }
if (first_match) if (first_match)
...@@ -883,7 +883,7 @@ combine_predictions_for_insn (rtx_insn *insn, basic_block bb) ...@@ -883,7 +883,7 @@ combine_predictions_for_insn (rtx_insn *insn, basic_block bb)
dump_prediction (dump_file, predictor, probability, bb, dump_prediction (dump_file, predictor, probability, bb,
(!first_match || best_predictor == predictor) (!first_match || best_predictor == predictor)
? NONE : IGNORED); ? REASON_NONE : REASON_IGNORED);
*pnote = XEXP (*pnote, 1); *pnote = XEXP (*pnote, 1);
} }
else else
...@@ -996,7 +996,7 @@ prune_predictions_for_bb (basic_block bb) ...@@ -996,7 +996,7 @@ prune_predictions_for_bb (basic_block bb)
/* Remove a duplicate predictor. */ /* Remove a duplicate predictor. */
dump_prediction (dump_file, pred->ep_predictor, dump_prediction (dump_file, pred->ep_predictor,
pred->ep_probability, bb, pred->ep_probability, bb,
SINGLE_EDGE_DUPLICATE, pred->ep_edge); REASON_SINGLE_EDGE_DUPLICATE, pred->ep_edge);
remove.add (pred); remove.add (pred);
} }
...@@ -1008,11 +1008,11 @@ prune_predictions_for_bb (basic_block bb) ...@@ -1008,11 +1008,11 @@ prune_predictions_for_bb (basic_block bb)
for both edges. */ for both edges. */
dump_prediction (dump_file, existing->ep_predictor, dump_prediction (dump_file, existing->ep_predictor,
pred->ep_probability, bb, pred->ep_probability, bb,
EDGE_PAIR_DUPLICATE, REASON_EDGE_PAIR_DUPLICATE,
existing->ep_edge); existing->ep_edge);
dump_prediction (dump_file, pred->ep_predictor, dump_prediction (dump_file, pred->ep_predictor,
pred->ep_probability, bb, pred->ep_probability, bb,
EDGE_PAIR_DUPLICATE, REASON_EDGE_PAIR_DUPLICATE,
pred->ep_edge); pred->ep_edge);
remove.add (existing); remove.add (existing);
...@@ -1150,9 +1150,9 @@ combine_predictions_for_bb (basic_block bb, bool dry_run) ...@@ -1150,9 +1150,9 @@ combine_predictions_for_bb (basic_block bb, bool dry_run)
else else
{ {
dump_prediction (dump_file, PRED_DS_THEORY, combined_probability, bb, dump_prediction (dump_file, PRED_DS_THEORY, combined_probability, bb,
!first_match ? NONE : IGNORED); !first_match ? REASON_NONE : REASON_IGNORED);
dump_prediction (dump_file, PRED_FIRST_MATCH, best_probability, bb, dump_prediction (dump_file, PRED_FIRST_MATCH, best_probability, bb,
first_match ? NONE : IGNORED); first_match ? REASON_NONE : REASON_IGNORED);
} }
if (first_match) if (first_match)
...@@ -1168,7 +1168,7 @@ combine_predictions_for_bb (basic_block bb, bool dry_run) ...@@ -1168,7 +1168,7 @@ combine_predictions_for_bb (basic_block bb, bool dry_run)
dump_prediction (dump_file, predictor, probability, bb, dump_prediction (dump_file, predictor, probability, bb,
(!first_match || best_predictor == predictor) (!first_match || best_predictor == predictor)
? NONE : IGNORED, pred->ep_edge); ? REASON_NONE : REASON_IGNORED, pred->ep_edge);
} }
} }
clear_bb_predictions (bb); clear_bb_predictions (bb);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment