From 0a2c51498215e3e881b40bab388242390a8b4678 Mon Sep 17 00:00:00 2001 From: Jakub Jelinek Date: Mon, 11 Dec 2017 23:20:27 +0100 Subject: recog.c (store_data_bypass_p_1): New function. * recog.c (store_data_bypass_p_1): New function. (store_data_bypass_p): Handle USE in a PARALLEL like CLOBBER. Use store_data_bypass_p_1 to avoid code duplication. Formatting fixes. From-SVN: r255553 --- gcc/recog.c | 116 +++++++++++++++++++++++------------------------------------- 1 file changed, 44 insertions(+), 72 deletions(-) (limited to 'gcc/recog.c') diff --git a/gcc/recog.c b/gcc/recog.c index 4f11c57..cdcff8f 100644 --- a/gcc/recog.c +++ b/gcc/recog.c @@ -3657,93 +3657,65 @@ peephole2_optimize (void) /* Common predicates for use with define_bypass. */ -/* True if the dependency between OUT_INSN and IN_INSN is on the store - data not the address operand(s) of the store. IN_INSN and OUT_INSN - must be either a single_set or a PARALLEL with SETs inside. */ +/* Helper function for store_data_bypass_p, handle just a single SET + IN_SET. */ -int -store_data_bypass_p (rtx_insn *out_insn, rtx_insn *in_insn) +static bool +store_data_bypass_p_1 (rtx_insn *out_insn, rtx in_set) { - rtx out_set, in_set; - rtx out_pat, in_pat; - rtx out_exp, in_exp; - int i, j; + if (!MEM_P (SET_DEST (in_set))) + return false; - in_set = single_set (in_insn); - if (in_set) + rtx out_set = single_set (out_insn); + if (out_set) + return !reg_mentioned_p (SET_DEST (out_set), SET_DEST (in_set)); + + rtx out_pat = PATTERN (out_insn); + if (GET_CODE (out_pat) != PARALLEL) + return false; + + for (int i = 0; i < XVECLEN (out_pat, 0); i++) { - if (!MEM_P (SET_DEST (in_set))) - return false; + rtx out_exp = XVECEXP (out_pat, 0, i); - out_set = single_set (out_insn); - if (out_set) - { - if (reg_mentioned_p (SET_DEST (out_set), SET_DEST (in_set))) - return false; - } - else - { - out_pat = PATTERN (out_insn); + if (GET_CODE (out_exp) == CLOBBER || GET_CODE (out_exp) == USE) + continue; - if (GET_CODE (out_pat) != PARALLEL) - return false; + gcc_assert (GET_CODE (out_exp) == SET); - for (i = 0; i < XVECLEN (out_pat, 0); i++) - { - out_exp = XVECEXP (out_pat, 0, i); + if (reg_mentioned_p (SET_DEST (out_exp), SET_DEST (in_set))) + return false; + } - if (GET_CODE (out_exp) == CLOBBER) - continue; + return true; +} - gcc_assert (GET_CODE (out_exp) == SET); +/* True if the dependency between OUT_INSN and IN_INSN is on the store + data not the address operand(s) of the store. IN_INSN and OUT_INSN + must be either a single_set or a PARALLEL with SETs inside. */ - if (reg_mentioned_p (SET_DEST (out_exp), SET_DEST (in_set))) - return false; - } - } - } - else - { - in_pat = PATTERN (in_insn); - gcc_assert (GET_CODE (in_pat) == PARALLEL); +int +store_data_bypass_p (rtx_insn *out_insn, rtx_insn *in_insn) +{ + rtx in_set = single_set (in_insn); + if (in_set) + return store_data_bypass_p_1 (out_insn, in_set); - for (i = 0; i < XVECLEN (in_pat, 0); i++) - { - in_exp = XVECEXP (in_pat, 0, i); + rtx in_pat = PATTERN (in_insn); + if (GET_CODE (in_pat) != PARALLEL) + return false; - if (GET_CODE (in_exp) == CLOBBER) - continue; + for (int i = 0; i < XVECLEN (in_pat, 0); i++) + { + rtx in_exp = XVECEXP (in_pat, 0, i); - gcc_assert (GET_CODE (in_exp) == SET); + if (GET_CODE (in_exp) == CLOBBER || GET_CODE (in_exp) == USE) + continue; - if (!MEM_P (SET_DEST (in_exp))) - return false; + gcc_assert (GET_CODE (in_exp) == SET); - out_set = single_set (out_insn); - if (out_set) - { - if (reg_mentioned_p (SET_DEST (out_set), SET_DEST (in_exp))) - return false; - } - else - { - out_pat = PATTERN (out_insn); - gcc_assert (GET_CODE (out_pat) == PARALLEL); - - for (j = 0; j < XVECLEN (out_pat, 0); j++) - { - out_exp = XVECEXP (out_pat, 0, j); - - if (GET_CODE (out_exp) == CLOBBER) - continue; - - gcc_assert (GET_CODE (out_exp) == SET); - - if (reg_mentioned_p (SET_DEST (out_exp), SET_DEST (in_exp))) - return false; - } - } - } + if (!store_data_bypass_p_1 (out_insn, in_exp)) + return false; } return true; -- cgit v1.1