From: "Martin Liška" <mliska@suse.cz>
To: gcc-patches@gcc.gnu.org
Subject: Re: [BUILDROBOT] MPS430 build problem due to new enum
Date: Mon, 13 Jun 2016 07:25:00 -0000 [thread overview]
Message-ID: <c8272453-0b7e-f5c6-a0b4-d4eed8d4575c@suse.cz> (raw)
In-Reply-To: <20160612115530.GD4454@lug-owl.de>
[-- Attachment #1: Type: text/plain, Size: 304 bytes --]
On 06/12/2016 01:55 PM, Jan-Benedict Glaw wrote:
> The new `NONE' from your enum clashes with a NONE used in a MSP430
> private enum.
>
> MfG, JBG
Hi.
Thanks for having heads up, I've been testing following patch. The patch
survives with --target=msp430-elf.
Ready after it finishes?
Thanks,
Martin
[-- Attachment #2: 0001-Change-enum-value-to-not-to-clash-with-a-MSP430-priv.patch --]
[-- Type: text/x-patch, Size: 2637 bytes --]
From 540c82e618ef6b38b69160c77533705d4e160895 Mon Sep 17 00:00:00 2001
From: marxin <mliska@suse.cz>
Date: Mon, 13 Jun 2016 09:20:10 +0200
Subject: [PATCH] Change enum value to not to clash with a MSP430 private enum
gcc/ChangeLog:
2016-06-13 Martin Liska <mliska@suse.cz>
* predict.c (enum predictor_reason): Rename NONE to VALID.
(combine_predictions_for_insn): Likewise.
(combine_predictions_for_bb): Likewise.
---
gcc/predict.c | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/gcc/predict.c b/gcc/predict.c
index 0fa8c5b..e1d161a 100644
--- a/gcc/predict.c
+++ b/gcc/predict.c
@@ -59,7 +59,7 @@ along with GCC; see the file COPYING3. If not see
enum predictor_reason
{
- NONE,
+ VALID,
IGNORED,
SINGLE_EDGE_DUPLICATE,
EDGE_PAIR_DUPLICATE
@@ -739,7 +739,7 @@ invert_br_probabilities (rtx insn)
static void
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 = VALID,
edge ep_edge = NULL)
{
edge e = ep_edge;
@@ -864,9 +864,9 @@ combine_predictions_for_insn (rtx_insn *insn, basic_block bb)
else
{
dump_prediction (dump_file, PRED_DS_THEORY, combined_probability,
- bb, !first_match ? NONE : IGNORED);
+ bb, !first_match ? VALID : IGNORED);
dump_prediction (dump_file, PRED_FIRST_MATCH, best_probability,
- bb, first_match ? NONE: IGNORED);
+ bb, first_match ? VALID : IGNORED);
}
if (first_match)
@@ -883,7 +883,7 @@ combine_predictions_for_insn (rtx_insn *insn, basic_block bb)
dump_prediction (dump_file, predictor, probability, bb,
(!first_match || best_predictor == predictor)
- ? NONE : IGNORED);
+ ? VALID : IGNORED);
*pnote = XEXP (*pnote, 1);
}
else
@@ -1150,9 +1150,9 @@ combine_predictions_for_bb (basic_block bb, bool dry_run)
else
{
dump_prediction (dump_file, PRED_DS_THEORY, combined_probability, bb,
- !first_match ? NONE : IGNORED);
+ !first_match ? VALID : IGNORED);
dump_prediction (dump_file, PRED_FIRST_MATCH, best_probability, bb,
- first_match ? NONE : IGNORED);
+ first_match ? VALID : IGNORED);
}
if (first_match)
@@ -1168,7 +1168,7 @@ combine_predictions_for_bb (basic_block bb, bool dry_run)
dump_prediction (dump_file, predictor, probability, bb,
(!first_match || best_predictor == predictor)
- ? NONE : IGNORED, pred->ep_edge);
+ ? VALID : IGNORED, pred->ep_edge);
}
}
clear_bb_predictions (bb);
--
2.8.3
next prev parent reply other threads:[~2016-06-13 7:25 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-06-02 11:57 [PATCH 0/2] Deduplicate edge predictors marxin
2016-06-02 11:57 ` [PATCH 2/2] Add edge predictions pruning marxin
2016-06-08 12:25 ` Martin Liška
2016-06-08 12:41 ` Jan Hubicka
2016-06-09 11:24 ` Martin Liška
2016-06-12 11:55 ` [BUILDROBOT] MPS430 build problem due to new enum (was: [PATCH 2/2] Add edge predictions pruning) Jan-Benedict Glaw
2016-06-13 7:25 ` Martin Liška [this message]
2016-06-13 8:47 ` Jan Hubicka
2016-06-13 10:01 ` [BUILDROBOT] MPS430 build problem due to new enum Martin Liška
2016-06-02 11:57 ` [PATCH 1/2] Introduce filtering for edge_predictions marxin
2016-06-08 12:26 ` [PATCH 3/N] Add sorting support to analyze_brprob script Martin Liška
2016-06-08 15:02 ` Jan Hubicka
2016-06-08 12:29 ` [PATCH 4/N] Add new analyze_brprob_spec.py script Martin Liška
2016-06-08 15:12 ` Jan Hubicka
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=c8272453-0b7e-f5c6-a0b4-d4eed8d4575c@suse.cz \
--to=mliska@suse.cz \
--cc=gcc-patches@gcc.gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).