From d68d56b57f736d362c066bc12d44ae76cbb2fb9f Mon Sep 17 00:00:00 2001 From: Richard Guenther Date: Wed, 25 Apr 2012 11:19:08 +0000 Subject: [PATCH] tree-vectorizer.h (vect_loop_versioning): Adjust prototype. 2012-04-25 Richard Guenther * tree-vectorizer.h (vect_loop_versioning): Adjust prototype. * tree-vect-loop.c (vect_transform_loop): Adjust. * tree-vect-loop-manip.c (vect_do_peeling_for_loop_bound): Record the maximum number of iterations for the epilogue loop. (vect_loop_versioning): Remove case re-using the peeled epilogue loop. From-SVN: r186813 --- gcc/ChangeLog | 9 ++++++ gcc/tree-vect-loop-manip.c | 58 ++++++++++++++++---------------------- gcc/tree-vect-loop.c | 16 ++++------- gcc/tree-vectorizer.h | 2 +- 4 files changed, 39 insertions(+), 46 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index a7de119f9d56..3770d39aa16f 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,12 @@ +2012-04-25 Richard Guenther + + * tree-vectorizer.h (vect_loop_versioning): Adjust prototype. + * tree-vect-loop.c (vect_transform_loop): Adjust. + * tree-vect-loop-manip.c (vect_do_peeling_for_loop_bound): Record + the maximum number of iterations for the epilogue loop. + (vect_loop_versioning): Remove case re-using the peeled + epilogue loop. + 2012-04-25 Jakub Jelinek PR c/52880 diff --git a/gcc/tree-vect-loop-manip.c b/gcc/tree-vect-loop-manip.c index 5e5d6ef3121f..63885f9578a2 100644 --- a/gcc/tree-vect-loop-manip.c +++ b/gcc/tree-vect-loop-manip.c @@ -1907,6 +1907,7 @@ vect_do_peeling_for_loop_bound (loop_vec_info loop_vinfo, tree *ratio, bool check_profitability = false; unsigned int th = 0; int min_profitable_iters; + int max_iter; if (vect_print_dump_info (REPORT_DETAILS)) fprintf (vect_dump, "=== vect_do_peeling_for_loop_bound ==="); @@ -1966,15 +1967,11 @@ vect_do_peeling_for_loop_bound (loop_vec_info loop_vinfo, tree *ratio, by ratio_mult_vf_name steps. */ vect_update_ivs_after_vectorizer (loop_vinfo, ratio_mult_vf_name, update_e); - if (!LOOP_REQUIRES_VERSIONING_FOR_ALIGNMENT (loop_vinfo) - && !LOOP_REQUIRES_VERSIONING_FOR_ALIAS (loop_vinfo)) - { - int max_iter = MAX (LOOP_VINFO_VECT_FACTOR (loop_vinfo) - 1, (int) th); - record_niter_bound (new_loop, shwi_to_double_int (max_iter), false, true); - if (dump_file && (dump_flags & TDF_DETAILS)) - fprintf (dump_file, "Setting upper bound of nb iterations for epilogue " - "loop to %d\n", max_iter); - } + max_iter = MAX (LOOP_VINFO_VECT_FACTOR (loop_vinfo) - 1, (int) th); + record_niter_bound (new_loop, shwi_to_double_int (max_iter), false, true); + if (dump_file && (dump_flags & TDF_DETAILS)) + fprintf (dump_file, "Setting upper bound of nb iterations for epilogue " + "loop to %d\n", max_iter); /* After peeling we have to reset scalar evolution analyzer. */ scev_reset (); @@ -2547,12 +2544,10 @@ vect_create_cond_for_alias_checks (loop_vec_info loop_vinfo, cost model initially. The versioning precondition(s) are placed in *COND_EXPR and - *COND_EXPR_STMT_LIST. If DO_VERSIONING is true versioning is - also performed, otherwise only the conditions are generated. */ + *COND_EXPR_STMT_LIST. */ void -vect_loop_versioning (loop_vec_info loop_vinfo, bool do_versioning, - tree *cond_expr, gimple_seq *cond_expr_stmt_list) +vect_loop_versioning (loop_vec_info loop_vinfo) { struct loop *loop = LOOP_VINFO_LOOP (loop_vinfo); basic_block condition_bb; @@ -2561,6 +2556,8 @@ vect_loop_versioning (loop_vec_info loop_vinfo, bool do_versioning, basic_block new_exit_bb; edge new_exit_e, e; gimple orig_phi, new_phi; + tree cond_expr; + gimple_seq cond_expr_stmt_list = NULL; tree arg; unsigned prob = 4 * REG_BR_PROB_BASE / 5; gimple_seq gimplify_stmt_list = NULL; @@ -2574,30 +2571,25 @@ vect_loop_versioning (loop_vec_info loop_vinfo, bool do_versioning, th = conservative_cost_threshold (loop_vinfo, min_profitable_iters); - *cond_expr = fold_build2 (GT_EXPR, boolean_type_node, scalar_loop_iters, - build_int_cst (TREE_TYPE (scalar_loop_iters), th)); - *cond_expr = force_gimple_operand_1 (*cond_expr, cond_expr_stmt_list, - is_gimple_condexpr, NULL_TREE); + cond_expr = fold_build2 (GT_EXPR, boolean_type_node, scalar_loop_iters, + build_int_cst (TREE_TYPE (scalar_loop_iters), th)); + cond_expr = force_gimple_operand_1 (cond_expr, &cond_expr_stmt_list, + is_gimple_condexpr, NULL_TREE); if (LOOP_REQUIRES_VERSIONING_FOR_ALIGNMENT (loop_vinfo)) - vect_create_cond_for_align_checks (loop_vinfo, cond_expr, - cond_expr_stmt_list); + vect_create_cond_for_align_checks (loop_vinfo, &cond_expr, + &cond_expr_stmt_list); if (LOOP_REQUIRES_VERSIONING_FOR_ALIAS (loop_vinfo)) - vect_create_cond_for_alias_checks (loop_vinfo, cond_expr, - cond_expr_stmt_list); + vect_create_cond_for_alias_checks (loop_vinfo, &cond_expr, + &cond_expr_stmt_list); - *cond_expr = force_gimple_operand_1 (*cond_expr, &gimplify_stmt_list, - is_gimple_condexpr, NULL_TREE); - gimple_seq_add_seq (cond_expr_stmt_list, gimplify_stmt_list); - - /* If we only needed the extra conditions and a new loop copy - bail out here. */ - if (!do_versioning) - return; + cond_expr = force_gimple_operand_1 (cond_expr, &gimplify_stmt_list, + is_gimple_condexpr, NULL_TREE); + gimple_seq_add_seq (&cond_expr_stmt_list, gimplify_stmt_list); initialize_original_copy_tables (); - loop_version (loop, *cond_expr, &condition_bb, + loop_version (loop, cond_expr, &condition_bb, prob, prob, REG_BR_PROB_BASE - prob, true); free_original_copy_tables(); @@ -2629,13 +2621,11 @@ vect_loop_versioning (loop_vec_info loop_vinfo, bool do_versioning, /* End loop-exit-fixes after versioning. */ update_ssa (TODO_update_ssa); - if (*cond_expr_stmt_list) + if (cond_expr_stmt_list) { cond_exp_gsi = gsi_last_bb (condition_bb); - gsi_insert_seq_before (&cond_exp_gsi, *cond_expr_stmt_list, + gsi_insert_seq_before (&cond_exp_gsi, cond_expr_stmt_list, GSI_SAME_STMT); - *cond_expr_stmt_list = NULL; } - *cond_expr = NULL_TREE; } diff --git a/gcc/tree-vect-loop.c b/gcc/tree-vect-loop.c index 264eda20593c..fa38c524f09e 100644 --- a/gcc/tree-vect-loop.c +++ b/gcc/tree-vect-loop.c @@ -5229,7 +5229,6 @@ vect_transform_loop (loop_vec_info loop_vinfo) unsigned int nunits; tree cond_expr = NULL_TREE; gimple_seq cond_expr_stmt_list = NULL; - bool do_peeling_for_loop_bound; gimple stmt, pattern_stmt; gimple_seq pattern_def_seq = NULL; gimple_stmt_iterator pattern_def_si = gsi_start (NULL); @@ -5244,17 +5243,9 @@ vect_transform_loop (loop_vec_info loop_vinfo) if (LOOP_PEELING_FOR_ALIGNMENT (loop_vinfo)) vect_do_peeling_for_alignment (loop_vinfo); - do_peeling_for_loop_bound - = (!LOOP_VINFO_NITERS_KNOWN_P (loop_vinfo) - || (LOOP_VINFO_NITERS_KNOWN_P (loop_vinfo) - && LOOP_VINFO_INT_NITERS (loop_vinfo) % vectorization_factor != 0) - || LOOP_VINFO_PEELING_FOR_GAPS (loop_vinfo)); - if (LOOP_REQUIRES_VERSIONING_FOR_ALIGNMENT (loop_vinfo) || LOOP_REQUIRES_VERSIONING_FOR_ALIAS (loop_vinfo)) - vect_loop_versioning (loop_vinfo, - !do_peeling_for_loop_bound, - &cond_expr, &cond_expr_stmt_list); + vect_loop_versioning (loop_vinfo); /* If the loop has a symbolic number of iterations 'n' (i.e. it's not a compile time constant), or it is a constant that doesn't divide by the @@ -5264,7 +5255,10 @@ vect_transform_loop (loop_vec_info loop_vinfo) will remain scalar and will compute the remaining (n%VF) iterations. (VF is the vectorization factor). */ - if (do_peeling_for_loop_bound) + if (!LOOP_VINFO_NITERS_KNOWN_P (loop_vinfo) + || (LOOP_VINFO_NITERS_KNOWN_P (loop_vinfo) + && LOOP_VINFO_INT_NITERS (loop_vinfo) % vectorization_factor != 0) + || LOOP_VINFO_PEELING_FOR_GAPS (loop_vinfo)) vect_do_peeling_for_loop_bound (loop_vinfo, &ratio, cond_expr, cond_expr_stmt_list); else diff --git a/gcc/tree-vectorizer.h b/gcc/tree-vectorizer.h index 5d9960940474..095af9373588 100644 --- a/gcc/tree-vectorizer.h +++ b/gcc/tree-vectorizer.h @@ -807,7 +807,7 @@ extern LOC vect_loop_location; in tree-vect-loop-manip.c. */ extern void slpeel_make_loop_iterate_ntimes (struct loop *, tree); extern bool slpeel_can_duplicate_loop_p (const struct loop *, const_edge); -extern void vect_loop_versioning (loop_vec_info, bool, tree *, gimple_seq *); +extern void vect_loop_versioning (loop_vec_info); extern void vect_do_peeling_for_loop_bound (loop_vec_info, tree *, tree, gimple_seq); extern void vect_do_peeling_for_alignment (loop_vec_info); -- 2.43.5