diff options
| -rw-r--r-- | gcc/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/tree-vect-loop.c | 32 |
2 files changed, 24 insertions, 13 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index de5bee5..87683a4 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,5 +1,10 @@ 2013-04-11 Richard Biener <rguenther@suse.de> + * tree-vect-loop.c (get_initial_def_for_induction): Properly + generate vector constants. + +2013-04-11 Richard Biener <rguenther@suse.de> + PR tree-optimization/56878 * tree-flow.h (outermost_invariant_loop_for_expr): Declare. * tree-ssa-loop-ivopts.c (outermost_invariant_loop_for_expr): diff --git a/gcc/tree-vect-loop.c b/gcc/tree-vect-loop.c index 2fc20f3..a684c9f 100644 --- a/gcc/tree-vect-loop.c +++ b/gcc/tree-vect-loop.c @@ -3226,30 +3226,36 @@ get_initial_def_for_induction (gimple iv_phi) } vec_alloc (v, nunits); + bool constant_p = is_gimple_min_invariant (new_name); CONSTRUCTOR_APPEND_ELT (v, NULL_TREE, new_name); for (i = 1; i < nunits; i++) { /* Create: new_name_i = new_name + step_expr */ enum tree_code code = POINTER_TYPE_P (scalar_type) ? POINTER_PLUS_EXPR : PLUS_EXPR; - init_stmt = gimple_build_assign_with_ops (code, new_var, - new_name, step_expr); - new_name = make_ssa_name (new_var, init_stmt); - gimple_assign_set_lhs (init_stmt, new_name); - - new_bb = gsi_insert_on_edge_immediate (pe, init_stmt); - gcc_assert (!new_bb); - - if (dump_enabled_p ()) + new_name = fold_build2 (code, scalar_type, new_name, step_expr); + if (!is_gimple_min_invariant (new_name)) { - dump_printf_loc (MSG_NOTE, vect_location, - "created new init_stmt: "); - dump_gimple_stmt (MSG_NOTE, TDF_SLIM, init_stmt, 0); + init_stmt = gimple_build_assign (new_var, new_name); + new_name = make_ssa_name (new_var, init_stmt); + gimple_assign_set_lhs (init_stmt, new_name); + new_bb = gsi_insert_on_edge_immediate (pe, init_stmt); + gcc_assert (!new_bb); + if (dump_enabled_p ()) + { + dump_printf_loc (MSG_NOTE, vect_location, + "created new init_stmt: "); + dump_gimple_stmt (MSG_NOTE, TDF_SLIM, init_stmt, 0); + } + constant_p = false; } CONSTRUCTOR_APPEND_ELT (v, NULL_TREE, new_name); } /* Create a vector from [new_name_0, new_name_1, ..., new_name_nunits-1] */ - new_vec = build_constructor (vectype, v); + if (constant_p) + new_vec = build_vector_from_ctor (vectype, v); + else + new_vec = build_constructor (vectype, v); vec_init = vect_init_vector (iv_phi, new_vec, vectype, NULL); } |