From 0683fd27deb878be38f120cce3acbe4d32132b20 Mon Sep 17 00:00:00 2001 From: Kyrylo Tkachov Date: Wed, 24 Feb 2016 13:00:10 +0000 Subject: [PATCH] [gcse] PR rtl-optimization/69886: Check target mode in can_assign_to_reg_without_clobbers_p PR rtl-optimization/69886 * gcse.c (can_assign_to_reg_without_clobbers_p): Accept mode argument. Use it when checking validity of set instructions. (want_to_gcse_p): Pass mode to can_assign_to_reg_without_clobbers_p. (compute_ld_motion_mems): Update can_assign_to_reg_without_clobbers_p callsite. * rtl.h (can_assign_to_reg_without_clobbers_p): Update prototype. * store-motion.c (find_moveable_store): Update can_assign_to_reg_without_clobbers_p callsite. * gcc.dg/torture/pr69886.c: New test. From-SVN: r233662 --- gcc/ChangeLog | 12 ++++++++++++ gcc/gcse.c | 19 ++++++++++--------- gcc/rtl.h | 2 +- gcc/store-motion.c | 3 ++- gcc/testsuite/ChangeLog | 5 +++++ gcc/testsuite/gcc.dg/torture/pr69886.c | 15 +++++++++++++++ 6 files changed, 45 insertions(+), 11 deletions(-) create mode 100644 gcc/testsuite/gcc.dg/torture/pr69886.c diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 9dab27af9aa..9f6ae5e1e1a 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,15 @@ +2016-02-24 Kyrylo Tkachov + + PR rtl-optimization/69886 + * gcse.c (can_assign_to_reg_without_clobbers_p): Accept mode + argument. Use it when checking validity of set instructions. + (want_to_gcse_p): Pass mode to can_assign_to_reg_without_clobbers_p. + (compute_ld_motion_mems): Update can_assign_to_reg_without_clobbers_p + callsite. + * rtl.h (can_assign_to_reg_without_clobbers_p): Update prototype. + * store-motion.c (find_moveable_store): Update + can_assign_to_reg_without_clobbers_p callsite. + 2016-02-24 Richard Biener PR middle-end/68963 diff --git a/gcc/gcse.c b/gcc/gcse.c index 500de7a95ce..51277a1cb61 100644 --- a/gcc/gcse.c +++ b/gcc/gcse.c @@ -810,7 +810,7 @@ want_to_gcse_p (rtx x, machine_mode mode, int *max_distance_ptr) *max_distance_ptr = max_distance; } - return can_assign_to_reg_without_clobbers_p (x); + return can_assign_to_reg_without_clobbers_p (x, mode); } } @@ -818,9 +818,9 @@ want_to_gcse_p (rtx x, machine_mode mode, int *max_distance_ptr) static GTY(()) rtx_insn *test_insn; -/* Return true if we can assign X to a pseudo register such that the - resulting insn does not result in clobbering a hard register as a - side-effect. +/* Return true if we can assign X to a pseudo register of mode MODE + such that the resulting insn does not result in clobbering a hard + register as a side-effect. Additionally, if the target requires it, check that the resulting insn can be copied. If it cannot, this means that X is special and probably @@ -831,14 +831,14 @@ static GTY(()) rtx_insn *test_insn; maybe live hard regs. */ bool -can_assign_to_reg_without_clobbers_p (rtx x) +can_assign_to_reg_without_clobbers_p (rtx x, machine_mode mode) { int num_clobbers = 0; int icode; bool can_assign = false; /* If this is a valid operand, we are OK. If it's VOIDmode, we aren't. */ - if (general_operand (x, GET_MODE (x))) + if (general_operand (x, mode)) return 1; else if (GET_MODE (x) == VOIDmode) return 0; @@ -857,7 +857,7 @@ can_assign_to_reg_without_clobbers_p (rtx x) /* Now make an insn like the one we would make when GCSE'ing and see if valid. */ - PUT_MODE (SET_DEST (PATTERN (test_insn)), GET_MODE (x)); + PUT_MODE (SET_DEST (PATTERN (test_insn)), mode); SET_SRC (PATTERN (test_insn)) = x; icode = recog (PATTERN (test_insn), test_insn, &num_clobbers); @@ -3830,12 +3830,13 @@ compute_ld_motion_mems (void) if (MEM_P (dest) && simple_mem (dest)) { ptr = ldst_entry (dest); - + machine_mode src_mode = GET_MODE (src); if (! MEM_P (src) && GET_CODE (src) != ASM_OPERANDS /* Check for REG manually since want_to_gcse_p returns 0 for all REGs. */ - && can_assign_to_reg_without_clobbers_p (src)) + && can_assign_to_reg_without_clobbers_p (src, + src_mode)) ptr->stores = alloc_INSN_LIST (insn, ptr->stores); else ptr->invalid = 1; diff --git a/gcc/rtl.h b/gcc/rtl.h index 2f5be5f010a..c91d60d3c90 100644 --- a/gcc/rtl.h +++ b/gcc/rtl.h @@ -3592,7 +3592,7 @@ extern void init_lower_subreg (void); /* In gcse.c */ extern bool can_copy_p (machine_mode); -extern bool can_assign_to_reg_without_clobbers_p (rtx); +extern bool can_assign_to_reg_without_clobbers_p (rtx, machine_mode); extern rtx fis_get_condition (rtx_insn *); /* In ira.c */ diff --git a/gcc/store-motion.c b/gcc/store-motion.c index c3b4d463df0..fffdffc3c34 100644 --- a/gcc/store-motion.c +++ b/gcc/store-motion.c @@ -557,7 +557,8 @@ find_moveable_store (rtx_insn *insn, int *regs_set_before, int *regs_set_after) assumes that we can do this. But sometimes the target machine has oddities like MEM read-modify-write instruction. See for example PR24257. */ - if (!can_assign_to_reg_without_clobbers_p (SET_SRC (set))) + if (!can_assign_to_reg_without_clobbers_p (SET_SRC (set), + GET_MODE (SET_SRC (set)))) return; ptr = st_expr_entry (dest); diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index ad48962d723..710dd11d770 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2016-02-24 Kyrylo Tkachov + + PR rtl-optimization/69886 + * gcc.dg/torture/pr69886.c: New test. + 2016-02-24 Richard Biener PR middle-end/68963 diff --git a/gcc/testsuite/gcc.dg/torture/pr69886.c b/gcc/testsuite/gcc.dg/torture/pr69886.c new file mode 100644 index 00000000000..d896d4fec9b --- /dev/null +++ b/gcc/testsuite/gcc.dg/torture/pr69886.c @@ -0,0 +1,15 @@ +/* PR rtl-optimization/69886. */ +/* { dg-do compile } */ +/* { dg-options "--param=gcse-unrestricted-cost=0" } */ +/* { dg-additional-options "-mavx" { target { i?86-*-* x86_64-*-* } } } */ + +typedef unsigned v32su __attribute__ ((vector_size (32))); + +unsigned +foo (v32su v32su_0, v32su v32su_1, v32su v32su_2, v32su v32su_3, v32su v32su_4) +{ + v32su_3 += v32su_2 *= v32su_2[3]; + if (v32su_4[3]) + v32su_2 &= (v32su){ v32su_1[3], 0xbb72, 64 }; + return v32su_0[2] + v32su_2[4] + v32su_3[1]; +}