diff options
| author | Richard Biener <rguenther@suse.de> | 2017-04-21 08:12:27 +0000 |
|---|---|---|
| committer | Richard Biener <rguenth@gcc.gnu.org> | 2017-04-21 08:12:27 +0000 |
| commit | 7fd1a7474a04fdf68e3b1645de16bcfa45a915d0 (patch) | |
| tree | bf12092837149c783d0f8f9f6414f5a29a9857a6 /gcc/tree-ssa-loop-ivcanon.c | |
| parent | 2f23a412086f3ecaee7007ae85033e5bc3b70609 (diff) | |
| download | gcc-7fd1a7474a04fdf68e3b1645de16bcfa45a915d0.zip gcc-7fd1a7474a04fdf68e3b1645de16bcfa45a915d0.tar.gz gcc-7fd1a7474a04fdf68e3b1645de16bcfa45a915d0.tar.bz2 | |
tree-ssa-loop-ivcanon.c (constant_after_peeling): Do not require sth as strict as a simple_iv but a chrec without symbols and an...
2016-04-21 Richard Biener <rguenther@suse.de>
* tree-ssa-loop-ivcanon.c (constant_after_peeling): Do not require
sth as strict as a simple_iv but a chrec without symbols and an
operand defined in the loop we are peeling (and not some subloop).
(propagate_constants_for_unrolling): Propagate all constants.
* gcc.dg/vect/no-scevccp-outer-13.c: Adjust to prevent unrolling
of inner loops.
* gcc.dg/vect/no-scevccp-outer-7.c: Likewise.
* gcc.dg/vect/vect-104.c: Likewise.
From-SVN: r247048
Diffstat (limited to 'gcc/tree-ssa-loop-ivcanon.c')
| -rw-r--r-- | gcc/tree-ssa-loop-ivcanon.c | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/gcc/tree-ssa-loop-ivcanon.c b/gcc/tree-ssa-loop-ivcanon.c index 0c3b0d2..31dc616 100644 --- a/gcc/tree-ssa-loop-ivcanon.c +++ b/gcc/tree-ssa-loop-ivcanon.c @@ -157,8 +157,6 @@ struct loop_size static bool constant_after_peeling (tree op, gimple *stmt, struct loop *loop) { - affine_iv iv; - if (is_gimple_min_invariant (op)) return true; @@ -188,12 +186,12 @@ constant_after_peeling (tree op, gimple *stmt, struct loop *loop) return false; } - /* Induction variables are constants. */ - if (!simple_iv (loop, loop_containing_stmt (stmt), op, &iv, false)) - return false; - if (!is_gimple_min_invariant (iv.base)) + /* Induction variables are constants when defined in loop. */ + if (loop_containing_stmt (stmt) != loop) return false; - if (!is_gimple_min_invariant (iv.step)) + tree ev = analyze_scalar_evolution (loop, op); + if (chrec_contains_undetermined (ev) + || chrec_contains_symbols (ev)) return false; return true; } @@ -1259,7 +1257,7 @@ propagate_constants_for_unrolling (basic_block bb) if (! SSA_NAME_OCCURS_IN_ABNORMAL_PHI (result) && gimple_phi_num_args (phi) == 1 - && TREE_CODE (arg) == INTEGER_CST) + && CONSTANT_CLASS_P (arg)) { replace_uses_by (result, arg); gsi_remove (&gsi, true); @@ -1276,7 +1274,7 @@ propagate_constants_for_unrolling (basic_block bb) tree lhs; if (is_gimple_assign (stmt) - && gimple_assign_rhs_code (stmt) == INTEGER_CST + && TREE_CODE_CLASS (gimple_assign_rhs_code (stmt)) == tcc_constant && (lhs = gimple_assign_lhs (stmt), TREE_CODE (lhs) == SSA_NAME) && !SSA_NAME_OCCURS_IN_ABNORMAL_PHI (lhs)) { |