| Message ID | 20170321001607.75169-3-luc.vanoostenryck@gmail.com (mailing list archive) |
|---|---|
| State | Superseded, archived |
| Headers | show |
On Mon, Mar 20, 2017 at 5:15 PM, Luc Van Oostenryck <luc.vanoostenryck@gmail.com> wrote: > Signed-off-by: Luc Van Oostenryck <luc.vanoostenryck@gmail.com> > --- > simplify.c | 20 +++++++++----------- > 1 file changed, 9 insertions(+), 11 deletions(-) Looks good. It would be nice to have some test code to show the effect of this change. Chris -- To unsubscribe from this list: send the line "unsubscribe linux-sparse" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Thu, Mar 23, 2017 at 10:00:17PM -0700, Christopher Li wrote: > On Mon, Mar 20, 2017 at 5:15 PM, Luc Van Oostenryck > <luc.vanoostenryck@gmail.com> wrote: > > Signed-off-by: Luc Van Oostenryck <luc.vanoostenryck@gmail.com> > > --- > > simplify.c | 20 +++++++++----------- > > 1 file changed, 9 insertions(+), 11 deletions(-) > > Looks good. It would be nice to have some test code to show the effect > of this change. There is no visible effect to show, in fact it would be an error if there any. Before the patch if some simplication was made, we returned directly to the CSE/simplification loop and canonicalization was done at some later cycles, once all simplifications had been made. But the goal of canonicalization is to limit the number of cases/patterns we need to check/handle during ... simplification. So canonicalization need to be done before the simplification. The fact that this patch also allow us to spare one cycle of CSE/simplification is just a nice side-effect. The real motivation was to prepare code for the following patch. Yes, I've been lazy in the message log, I'll update it. -- Luc -- To unsubscribe from this list: send the line "unsubscribe linux-sparse" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/simplify.c b/simplify.c index 5d00937f1..66035bbce 100644 --- a/simplify.c +++ b/simplify.c @@ -735,13 +735,13 @@ static int canonical_order(pseudo_t p1, pseudo_t p2) return 1; } -static int simplify_commutative_binop(struct instruction *insn) +static int canonicalize_commutative(struct instruction *insn) { - if (!canonical_order(insn->src1, insn->src2)) { - switch_pseudo(insn, &insn->src1, insn, &insn->src2); - return REPEAT_CSE; - } - return 0; + if (canonical_order(insn->src1, insn->src2)) + return 0; + + switch_pseudo(insn, &insn->src1, insn, &insn->src2); + return repeat_phase |= REPEAT_CSE; } static inline int simple_pseudo(pseudo_t pseudo) @@ -1129,17 +1129,15 @@ int simplify_instruction(struct instruction *insn) case OP_ADD: case OP_MULS: case OP_AND: case OP_OR: case OP_XOR: case OP_AND_BOOL: case OP_OR_BOOL: + canonicalize_commutative(insn); if (simplify_binop(insn)) return REPEAT_CSE; - if (simplify_commutative_binop(insn)) - return REPEAT_CSE; return simplify_associative_binop(insn); case OP_MULU: case OP_SET_EQ: case OP_SET_NE: - if (simplify_binop(insn)) - return REPEAT_CSE; - return simplify_commutative_binop(insn); + canonicalize_commutative(insn); + return simplify_binop(insn); case OP_SUB: case OP_DIVU: case OP_DIVS:
Signed-off-by: Luc Van Oostenryck <luc.vanoostenryck@gmail.com> --- simplify.c | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-)