diff options
| author | Christophe Lyon <christophe.lyon@linaro.org> | 2016-04-07 14:20:51 +0200 |
|---|---|---|
| committer | Christophe Lyon <christophe.lyon@linaro.org> | 2016-04-07 14:20:51 +0200 |
| commit | 635bde251e0fa272b714c56ed6d662126540a9c0 (patch) | |
| tree | 2784d6b8412900090cd7e8f551b17b8dab290aea | |
| parent | f5c8075d36a1c290d063a3dfc0c1715737f8a5ba (diff) | |
gcc/
Backport from trunk r234792.
2016-04-06 Vladimir Makarov <vmakarov@redhat.com>
PR rtl-optimization/70398
* lra-constraints.c (process_address_1): Check zero scale and code
for reloading with zero scale.
gcc/testsuite/
Backport from trunk r234792.
2016-04-06 Vladimir Makarov <vmakarov@redhat.com>
PR rtl-optimization/70398
* testsuite/gcc.target/aarch64/pr70398.c: New.
Change-Id: Idbc40befed04ebd8c25deb0773ed1102c20d12a4
| -rw-r--r-- | gcc/lra-constraints.c | 16 | ||||
| -rw-r--r-- | gcc/testsuite/gcc.target/aarch64/pr70398.c | 26 |
2 files changed, 40 insertions, 2 deletions
diff --git a/gcc/lra-constraints.c b/gcc/lra-constraints.c index 424380bfa8a..a10bc772420 100644 --- a/gcc/lra-constraints.c +++ b/gcc/lra-constraints.c @@ -2884,6 +2884,7 @@ process_address_1 (int nop, bool check_only_p, { struct address_info ad; rtx new_reg; + HOST_WIDE_INT scale; rtx op = *curr_id->operand_loc[nop]; const char *constraint = curr_static_id->operand[nop].constraint; enum constraint_num cn = lookup_constraint (constraint); @@ -3113,14 +3114,14 @@ process_address_1 (int nop, bool check_only_p, *ad.inner = simplify_gen_binary (PLUS, GET_MODE (new_reg), new_reg, *ad.index); } - else if (get_index_scale (&ad) == 1) + else if ((scale = get_index_scale (&ad)) == 1) { /* The last transformation to one reg will be made in curr_insn_transform function. */ end_sequence (); return false; } - else + else if (scale != 0) { /* base + scale * index => base + new_reg, case (1) above. @@ -3132,6 +3133,17 @@ process_address_1 (int nop, bool check_only_p, *ad.inner = simplify_gen_binary (PLUS, GET_MODE (new_reg), *ad.base_term, new_reg); } + else + { + enum reg_class cl = base_reg_class (ad.mode, ad.as, + SCRATCH, SCRATCH); + rtx addr = *ad.inner; + + new_reg = lra_create_new_reg (Pmode, NULL_RTX, cl, "addr"); + /* addr => new_base. */ + lra_emit_move (new_reg, addr); + *ad.inner = new_reg; + } *before = get_insns (); end_sequence (); return true; diff --git a/gcc/testsuite/gcc.target/aarch64/pr70398.c b/gcc/testsuite/gcc.target/aarch64/pr70398.c new file mode 100644 index 00000000000..dbe5ad1b24f --- /dev/null +++ b/gcc/testsuite/gcc.target/aarch64/pr70398.c @@ -0,0 +1,26 @@ +/* { dg-do run } */ +/* { dg-options "-O -fno-tree-loop-optimize -fno-tree-ter -static" } */ +unsigned int in[8 * 8] = + { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, + 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63 }; + +unsigned char out[8 * 8]; + +int +main (void) +{ + int i; + for (i = 0; i < 8 * 4; i++) + { + out[i * 2] = (unsigned char) in[i * 2] + 1; + out[i * 2 + 1] = (unsigned char) in[i * 2 + 1] + 2; + } + __asm__("":::"memory"); + for (i = 0; i < 8 * 4; i++) + { + if (out[i * 2] != in[i * 2] + 1 + || out[i * 2 + 1] != in[i * 2 + 1] + 2) + __builtin_abort (); + } + return 0; +} |