| Message ID | 20151222111256.GA25715@linux.vnet.ibm.com |
|---|---|
| State | New |
| Headers | show |
Dominik Vogt <vogt@linux.vnet.ibm.com> writes: > On Fri, Dec 18, 2015 at 09:55:54AM +0000, Richard Sandiford wrote: >> Dominik Vogt <vogt@linux.vnet.ibm.com> writes: >> > The attached patch fixes the handling of LABEL_REF in genrecog and >> > genpreds. >> > >> > The current code assumes that X can have only a mode than PRED (X, >> > MODE) if X is CONST_INT, CONST_DOUBLE or CONST_WIDE_INT, but >> > actually that can be also the case for a LABEL_REF with VOIDmode. >> > Due to this it is necessary to add "const_int" (or similar) to >> > match_code of some predicates handling label_ref but not >> > const_int. >> >> OK, thanks. >> >> As mentioned in the other thread, I think LABEL_REFs shouldn't have >> VOIDmode, so long-term we should be fixing the targets. I agree this >> is the correct workaround until that happens though. > > All right, in the mean time the patch has passed the test suite on > x86_64, s390x and s390. See attached version 2 of the patch > (added just an additional comment in genpreds.c). This is OK too, thanks. "matches_const_scalar_int_p" is now a bit of a misnomer (it was supposed to be tied to CONST_SCALAR_INT_P) but I think we can live with that. (Especially since this is supposed to be "temporary"...) Richard
On 12/22/2015 12:12 PM, Dominik Vogt wrote: > All right, in the mean time the patch has passed the test suite on > x86_64, s390x and s390. See attached version 2 of the patch > (added just an additional comment in genpreds.c). Applied. Thanks! -Andreas-
From 84c51fbb773cb62a24b150063428ba74e42f4146 Mon Sep 17 00:00:00 2001 From: Dominik Vogt <vogt@linux.vnet.ibm.com> Date: Fri, 11 Dec 2015 17:14:25 +0100 Subject: [PATCH] Fix handling of LABEL_REF in safe_predicate_mode. The old code assumes that X can have only a mode than PRED (X, MODE) if X is CONST_INT, CONST_DOUBLE or CONST_WIDE_INT, but actually that can be also the case for LABEL_REF. Due to this it was necessary to add "const_int" (or similar) to match_code of some predicates handling label_ref but not const_int. --- gcc/config/s390/predicates.md | 5 +---- gcc/genpreds.c | 2 ++ gcc/genrecog.c | 3 ++- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/gcc/config/s390/predicates.md b/gcc/config/s390/predicates.md index 02a1e4e..1211cf01 100644 --- a/gcc/config/s390/predicates.md +++ b/gcc/config/s390/predicates.md @@ -122,10 +122,7 @@ ;; Return true if OP a valid operand for the LARL instruction. (define_predicate "larl_operand" -; Note: Although CONST_INT and CONST_DOUBLE are not handled in this predicate, -; at least one of them needs to appear or otherwise safe_predicate_mode will -; assume that a VOIDmode LABEL_REF is not accepted either (see genrecog.c). - (match_code "label_ref, symbol_ref, const, const_int, const_double") + (match_code "label_ref, symbol_ref, const") { /* Allow labels and local symbols. */ if (GET_CODE (op) == LABEL_REF) diff --git a/gcc/genpreds.c b/gcc/genpreds.c index eac2180..c82113d 100644 --- a/gcc/genpreds.c +++ b/gcc/genpreds.c @@ -320,6 +320,8 @@ add_mode_tests (struct pred_data *p) { case CONST_INT: case CONST_WIDE_INT: + /* Special handling for (VOIDmode) LABEL_REFs. */ + case LABEL_REF: matches_const_scalar_int_p = true; break; diff --git a/gcc/genrecog.c b/gcc/genrecog.c index 599121f..81ea35b 100644 --- a/gcc/genrecog.c +++ b/gcc/genrecog.c @@ -3382,7 +3382,8 @@ safe_predicate_mode (const struct pred_data *pred, machine_mode mode) if (GET_MODE_CLASS (mode) == MODE_INT && (pred->codes[CONST_INT] || pred->codes[CONST_DOUBLE] - || pred->codes[CONST_WIDE_INT])) + || pred->codes[CONST_WIDE_INT] + || pred->codes[LABEL_REF])) return false; return !pred->special && mode != VOIDmode; -- 2.3.0