diff options
| author | Yvan Roux <yvan.roux@linaro.org> | 2015-08-23 22:15:50 +0200 |
|---|---|---|
| committer | Linaro Code Review <review@review.linaro.org> | 2015-08-27 20:58:43 +0000 |
| commit | 44683a100f8d97cb2722b0adad69d3c5b73d5d3d (patch) | |
| tree | fac2c8205a008c88d8b5026ad227150099b77309 | |
| parent | 360a5bda57277ed6fbf064893484c651459999c1 (diff) | |
gcc/
Backport from trunk r223402.
2015-05-19 David Sherwood <david.sherwood@arm.com>
* loop-invariant.c (create_new_invariant): Don't calculate address cost
if mode is not a scalar integer.
(get_inv_cost): Increase computational cost for unused invariants.
gcc/testsuite/
Backport from trunk r223402.
2015-05-19 David Sherwood <david.sherwood@arm.com>
* gcc.dg/loop-invariant.c: New testcase.
Change-Id: Id1d1ee65a2f20f76ca374de24c90e1e0324d0115
| -rw-r--r-- | gcc/loop-invariant.c | 8 | ||||
| -rw-r--r-- | gcc/testsuite/gcc.dg/loop-invariant.c | 43 |
2 files changed, 49 insertions, 2 deletions
diff --git a/gcc/loop-invariant.c b/gcc/loop-invariant.c index f79b497ea7f..420d2576081 100644 --- a/gcc/loop-invariant.c +++ b/gcc/loop-invariant.c @@ -740,8 +740,11 @@ create_new_invariant (struct def *def, rtx_insn *insn, bitmap depends_on, enough to not regress 410.bwaves either (by still moving reg+reg invariants). See http://gcc.gnu.org/ml/gcc-patches/2009-10/msg01210.html . */ - inv->cheap_address = address_cost (SET_SRC (set), word_mode, - ADDR_SPACE_GENERIC, speed) < 3; + if (SCALAR_INT_MODE_P (GET_MODE (SET_DEST (set)))) + inv->cheap_address = address_cost (SET_SRC (set), word_mode, + ADDR_SPACE_GENERIC, speed) < 3; + else + inv->cheap_address = false; } else { @@ -1174,6 +1177,7 @@ get_inv_cost (struct invariant *inv, int *comp_cost, unsigned *regs_needed, } if (!inv->cheap_address + || inv->def->n_uses == 0 || inv->def->n_addr_uses < inv->def->n_uses) (*comp_cost) += inv->cost * inv->eqno; diff --git a/gcc/testsuite/gcc.dg/loop-invariant.c b/gcc/testsuite/gcc.dg/loop-invariant.c new file mode 100644 index 00000000000..9571269084f --- /dev/null +++ b/gcc/testsuite/gcc.dg/loop-invariant.c @@ -0,0 +1,43 @@ +/* { dg-do compile { target x86_64-*-* } } */ +/* { dg-options "-O2 -fdump-rtl-loop2_invariant" } */ +/* NOTE: The target list above could be extended to other targets that have + conditional moves, but don't have zero registers. */ + +enum test_type +{ + TYPE0, + TYPE1 +}; + +struct type_node +{ + enum test_type type; +}; + +struct test_ref +{ + struct type_node *referring; +}; + +struct test_node +{ + struct test_node *next; +}; + +int iterate (struct test_node *, unsigned, struct test_ref **); + +int +loop_invar (struct test_node *node) +{ + struct test_ref *ref; + + for (unsigned i = 0; iterate (node, i, &ref); i++) + if (loop_invar ((ref->referring && ref->referring->type == TYPE0) + ? ((struct test_node *) (ref->referring)) : 0)) + return 1; + + return 0; +} + +/* { dg-final { scan-rtl-dump "Decided to move invariant" "loop2_invariant" } } */ +/* { dg-final { cleanup-rtl-dump "loop2_invariant" } } */ |