diff options
Diffstat (limited to 'gcc/tree-vect-loop-manip.c')
| -rw-r--r-- | gcc/tree-vect-loop-manip.c | 246 |
1 files changed, 123 insertions, 123 deletions
diff --git a/gcc/tree-vect-loop-manip.c b/gcc/tree-vect-loop-manip.c index c0b15cd98a5..ea1a4d6bcff 100644 --- a/gcc/tree-vect-loop-manip.c +++ b/gcc/tree-vect-loop-manip.c @@ -1,7 +1,7 @@ -/* Vectorizer Specific Loop Manipulations +/* Vectorizer Specific Loop Manipulations Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc. - Contributed by Dorit Naishlos <dorit@il.ibm.com> + Contributed by Dorit Naishlos <dorit@il.ibm.com> and Ira Rosen <irar@il.ibm.com> This file is part of GCC. @@ -154,7 +154,7 @@ slpeel_update_phis_for_duplicate_loop (struct loop *orig_loop, phi nodes, organized in the same order. case 2: NEW_LOOP was placed after ORIG_LOOP: - The successor block of NEW_LOOP is the original exit block of + The successor block of NEW_LOOP is the original exit block of ORIG_LOOP - the phis to be updated are the loop-closed-ssa phis. We postpone updating these phis to a later stage (when loop guards are added). @@ -303,8 +303,8 @@ slpeel_update_phis_for_duplicate_loop (struct loop *orig_loop, Generally slpeel_update_phi_nodes_for_guard1 creates phis for variables that change between iterations of a loop (and therefore have a phi-node at the loop entry), whereas slpeel_update_phi_nodes_for_guard2 creates - phis for variables that are used out of the loop (and therefore have - loop-closed exit phis). Some variables may be both updated between + phis for variables that are used out of the loop (and therefore have + loop-closed exit phis). Some variables may be both updated between iterations and used after the loop. This is why in loop1_exit_bb we may need both entry_phis (created by slpeel_update_phi_nodes_for_guard1) and exit phis (created by slpeel_update_phi_nodes_for_guard2). @@ -335,15 +335,15 @@ slpeel_update_phis_for_duplicate_loop (struct loop *orig_loop, */ /* Function slpeel_update_phi_nodes_for_guard1 - + Input: - GUARD_EDGE, LOOP, IS_NEW_LOOP, NEW_EXIT_BB - as explained above. - DEFS - a bitmap of ssa names to mark new names for which we recorded - information. - + information. + In the context of the overall structure, we have: - loop1_preheader_bb: + loop1_preheader_bb: guard1 (goto loop1/merge1_bb) LOOP-> loop1 loop1_exit_bb: @@ -399,12 +399,12 @@ slpeel_update_phi_nodes_for_guard1 (edge guard_edge, struct loop *loop, /* 1.2. NEW_MERGE_BB has two incoming edges: GUARD_EDGE and the exit-edge of LOOP. Set the two phi args in NEW_PHI for these edges: */ loop_arg = PHI_ARG_DEF_FROM_EDGE (orig_phi, EDGE_SUCC (loop->latch, 0)); - loop_locus = gimple_phi_arg_location_from_edge (orig_phi, - EDGE_SUCC (loop->latch, + loop_locus = gimple_phi_arg_location_from_edge (orig_phi, + EDGE_SUCC (loop->latch, 0)); guard_arg = PHI_ARG_DEF_FROM_EDGE (orig_phi, loop_preheader_edge (loop)); - guard_locus - = gimple_phi_arg_location_from_edge (orig_phi, + guard_locus + = gimple_phi_arg_location_from_edge (orig_phi, loop_preheader_edge (loop)); add_phi_arg (new_phi, loop_arg, new_exit_e, loop_locus); @@ -470,10 +470,10 @@ slpeel_update_phi_nodes_for_guard1 (edge guard_edge, struct loop *loop, In the context of the overall structure, we have: - loop1_preheader_bb: + loop1_preheader_bb: guard1 (goto loop1/merge1_bb) loop1 - loop1_exit_bb: + loop1_exit_bb: guard2 (goto merge1_bb/merge2_bb) merge1_bb LOOP-> loop2 @@ -483,7 +483,7 @@ LOOP-> loop2 For each name used out side the loop (i.e - for each name that has an exit phi in next_bb) we create a new phi in: - 1. merge2_bb (to account for the edge from guard_bb) + 1. merge2_bb (to account for the edge from guard_bb) 2. loop2_exit_bb (an exit-phi to keep LOOP in loop-closed form) 3. guard2 bb (an exit phi to keep the preceding loop in loop-closed form), if needed (if it wasn't handled by slpeel_update_phis_nodes_for_phi1). @@ -516,7 +516,7 @@ slpeel_update_phi_nodes_for_guard2 (edge guard_edge, struct loop *loop, orig_phi = update_phi; orig_def = PHI_ARG_DEF_FROM_EDGE (orig_phi, e); /* This loop-closed-phi actually doesn't represent a use - out of the loop - the phi arg is a constant. */ + out of the loop - the phi arg is a constant. */ if (TREE_CODE (orig_def) != SSA_NAME) continue; orig_def_new_name = get_current_def (orig_def); @@ -541,7 +541,7 @@ slpeel_update_phi_nodes_for_guard2 (edge guard_edge, struct loop *loop, new_name2 = get_current_def (get_current_def (orig_name)). */ new_name2 = get_current_def (new_name); } - + if (is_new_loop) { guard_arg = orig_def; @@ -554,7 +554,7 @@ slpeel_update_phi_nodes_for_guard2 (edge guard_edge, struct loop *loop, } if (new_name2) guard_arg = new_name2; - + add_phi_arg (new_phi, loop_arg, new_exit_e, UNKNOWN_LOCATION); add_phi_arg (new_phi, guard_arg, guard_edge, UNKNOWN_LOCATION); @@ -606,7 +606,7 @@ slpeel_update_phi_nodes_for_guard2 (edge guard_edge, struct loop *loop, /* 3.3. GUARD_BB has one incoming edge: */ gcc_assert (EDGE_COUNT (guard_edge->src->preds) == 1); - add_phi_arg (new_phi, arg, EDGE_PRED (guard_edge->src, 0), + add_phi_arg (new_phi, arg, EDGE_PRED (guard_edge->src, 0), UNKNOWN_LOCATION); /* 3.4. Update phi in successor of GUARD_BB: */ @@ -673,7 +673,7 @@ slpeel_make_loop_iterate_ntimes (struct loop *loop, tree niters) } -/* Given LOOP this function generates a new copy of it and puts it +/* Given LOOP this function generates a new copy of it and puts it on E which is either the entry or exit of LOOP. */ struct loop * @@ -683,13 +683,13 @@ slpeel_tree_duplicate_loop_to_edge_cfg (struct loop *loop, edge e) basic_block *new_bbs, *bbs; bool at_exit; bool was_imm_dom; - basic_block exit_dest; + basic_block exit_dest; gimple phi; tree phi_arg; edge exit, new_exit; gimple_stmt_iterator gsi; - at_exit = (e == single_exit (loop)); + at_exit = (e == single_exit (loop)); if (!at_exit && e != loop_preheader_edge (loop)) return NULL; @@ -711,8 +711,8 @@ slpeel_tree_duplicate_loop_to_edge_cfg (struct loop *loop, edge e) } exit_dest = single_exit (loop)->dest; - was_imm_dom = (get_immediate_dominator (CDI_DOMINATORS, - exit_dest) == loop->header ? + was_imm_dom = (get_immediate_dominator (CDI_DOMINATORS, + exit_dest) == loop->header ? true : false); new_bbs = XNEWVEC (basic_block, loop->num_nodes); @@ -722,7 +722,7 @@ slpeel_tree_duplicate_loop_to_edge_cfg (struct loop *loop, edge e) &exit, 1, &new_exit, NULL, e->src); - /* Duplicating phi args at exit bbs as coming + /* Duplicating phi args at exit bbs as coming also from exit of duplicated loop. */ for (gsi = gsi_start_phis (exit_dest); !gsi_end_p (gsi); gsi_next (&gsi)) { @@ -738,11 +738,11 @@ slpeel_tree_duplicate_loop_to_edge_cfg (struct loop *loop, edge e) new_loop_exit_edge = EDGE_SUCC (new_loop->header, 1); else new_loop_exit_edge = EDGE_SUCC (new_loop->header, 0); - - add_phi_arg (phi, phi_arg, new_loop_exit_edge, locus); + + add_phi_arg (phi, phi_arg, new_loop_exit_edge, locus); } - } - + } + if (at_exit) /* Add the loop copy at exit. */ { redirect_edge_and_branch_force (e, new_loop->header); @@ -756,19 +756,19 @@ slpeel_tree_duplicate_loop_to_edge_cfg (struct loop *loop, edge e) edge new_exit_e; edge entry_e = loop_preheader_edge (loop); basic_block preheader = entry_e->src; - - if (!flow_bb_inside_loop_p (new_loop, + + if (!flow_bb_inside_loop_p (new_loop, EDGE_SUCC (new_loop->header, 0)->dest)) new_exit_e = EDGE_SUCC (new_loop->header, 0); else - new_exit_e = EDGE_SUCC (new_loop->header, 1); + new_exit_e = EDGE_SUCC (new_loop->header, 1); redirect_edge_and_branch_force (new_exit_e, loop->header); PENDING_STMT (new_exit_e) = NULL; set_immediate_dominator (CDI_DOMINATORS, loop->header, new_exit_e->src); - /* We have to add phi args to the loop->header here as coming + /* We have to add phi args to the loop->header here as coming from new_exit_e edge. */ for (gsi = gsi_start_phis (loop->header); !gsi_end_p (gsi); @@ -778,8 +778,8 @@ slpeel_tree_duplicate_loop_to_edge_cfg (struct loop *loop, edge e) phi_arg = PHI_ARG_DEF_FROM_EDGE (phi, entry_e); if (phi_arg) add_phi_arg (phi, phi_arg, new_exit_e, - gimple_phi_arg_location_from_edge (phi, entry_e)); - } + gimple_phi_arg_location_from_edge (phi, entry_e)); + } redirect_edge_and_branch_force (entry_e, new_loop->header); PENDING_STMT (entry_e) = NULL; @@ -795,7 +795,7 @@ slpeel_tree_duplicate_loop_to_edge_cfg (struct loop *loop, edge e) /* Given the condition statement COND, put it as the last statement of GUARD_BB; EXIT_BB is the basic block to skip the loop; - Assumes that this is the single exit of the guarded loop. + Assumes that this is the single exit of the guarded loop. Returns the skip edge, inserts new stmts on the COND_EXPR_STMT_LIST. */ static edge @@ -881,19 +881,19 @@ slpeel_verify_cfg_after_peeling (struct loop *first_loop, after second_loop. */ gcc_assert (EDGE_COUNT (loop1_exit_bb->succs) == 2); - + /* 1. Verify that one of the successors of first_loop->exit is the preheader of second_loop. */ - + /* The preheader of new_loop is expected to have two predecessors: first_loop->exit and the block that precedes first_loop. */ - gcc_assert (EDGE_COUNT (loop2_entry_bb->preds) == 2 + gcc_assert (EDGE_COUNT (loop2_entry_bb->preds) == 2 && ((EDGE_PRED (loop2_entry_bb, 0)->src == loop1_exit_bb && EDGE_PRED (loop2_entry_bb, 1)->src == loop1_entry_bb) || (EDGE_PRED (loop2_entry_bb, 1)->src == loop1_exit_bb && EDGE_PRED (loop2_entry_bb, 0)->src == loop1_entry_bb))); - + /* Verify that the other successor of first_loop->exit is after the second_loop. */ /* TODO */ @@ -920,7 +920,7 @@ set_prologue_iterations (basic_block bb_before_first_loop, gimple cond_stmt; gimple_seq gimplify_stmt_list = NULL, stmts = NULL; tree cost_pre_condition = NULL_TREE; - tree scalar_loop_iters = + tree scalar_loop_iters = unshare_expr (LOOP_VINFO_NITERS_UNCHANGED (loop_vec_info_for_loop (loop))); e = single_pred_edge (bb_before_first_loop); @@ -941,7 +941,7 @@ set_prologue_iterations (basic_block bb_before_first_loop, e_fallthru = EDGE_SUCC (then_bb, 0); cost_pre_condition = - fold_build2 (LE_EXPR, boolean_type_node, scalar_loop_iters, + fold_build2 (LE_EXPR, boolean_type_node, scalar_loop_iters, build_int_cst (TREE_TYPE (scalar_loop_iters), th)); cost_pre_condition = force_gimple_operand (cost_pre_condition, &gimplify_stmt_list, @@ -956,11 +956,11 @@ set_prologue_iterations (basic_block bb_before_first_loop, gsi = gsi_last_bb (cond_bb); gsi_insert_after (&gsi, cond_stmt, GSI_NEW_STMT); - + var = create_tmp_var (TREE_TYPE (scalar_loop_iters), "prologue_after_cost_adjust"); add_referenced_var (var); - prologue_after_cost_adjust_name = + prologue_after_cost_adjust_name = force_gimple_operand (scalar_loop_iters, &stmts, false, var); gsi = gsi_last_bb (then_bb); @@ -968,7 +968,7 @@ set_prologue_iterations (basic_block bb_before_first_loop, gsi_insert_seq_after (&gsi, stmts, GSI_NEW_STMT); newphi = create_phi_node (var, bb_before_first_loop); - add_phi_arg (newphi, prologue_after_cost_adjust_name, e_fallthru, + add_phi_arg (newphi, prologue_after_cost_adjust_name, e_fallthru, UNKNOWN_LOCATION); add_phi_arg (newphi, first_niters, e_false, UNKNOWN_LOCATION); @@ -982,7 +982,7 @@ set_prologue_iterations (basic_block bb_before_first_loop, that is placed on the entry (exit) edge E of LOOP. After this transformation we have two loops one after the other - first-loop iterates FIRST_NITERS times, and second-loop iterates the remainder NITERS - FIRST_NITERS times. - If the cost model indicates that it is profitable to emit a scalar + If the cost model indicates that it is profitable to emit a scalar loop instead of the vector one, then the prolog (epilog) loop will iterate for the entire unchanged scalar iterations of the loop. @@ -1002,10 +1002,10 @@ set_prologue_iterations (basic_block bb_before_first_loop, - TH: cost model profitability threshold of iterations for vectorization. - CHECK_PROFITABILITY: specify whether cost model check has not occurred during versioning and hence needs to occur during - prologue generation or whether cost model check + prologue generation or whether cost model check has not occurred during prologue generation and hence needs to occur during epilogue generation. - + Output: The function returns a pointer to the new loop-copy, or NULL if it failed @@ -1028,8 +1028,8 @@ set_prologue_iterations (basic_block bb_before_first_loop, */ static struct loop* -slpeel_tree_peel_loop_to_edge (struct loop *loop, - edge e, tree first_niters, +slpeel_tree_peel_loop_to_edge (struct loop *loop, + edge e, tree first_niters, tree niters, bool update_first_loop_count, unsigned int th, bool check_profitability, tree cond_expr, gimple_seq cond_expr_stmt_list) @@ -1045,12 +1045,12 @@ slpeel_tree_peel_loop_to_edge (struct loop *loop, edge exit_e = single_exit (loop); LOC loop_loc; tree cost_pre_condition = NULL_TREE; - + if (!slpeel_can_duplicate_loop_p (loop, e)) return NULL; - + /* We have to initialize cfg_hooks. Then, when calling - cfg_hooks->split_edge, the function tree_split_edge + cfg_hooks->split_edge, the function tree_split_edge is actually called and, when calling cfg_hooks->duplicate_block, the function tree_duplicate_bb is called. */ gimple_register_cfg_hooks (); @@ -1069,7 +1069,7 @@ slpeel_tree_peel_loop_to_edge (struct loop *loop, orig_exit_bb: */ - + if (!(new_loop = slpeel_tree_duplicate_loop_to_edge_cfg (loop, e))) { loop_loc = find_loop_location (loop); @@ -1082,7 +1082,7 @@ slpeel_tree_peel_loop_to_edge (struct loop *loop, } return NULL; } - + if (e == exit_e) { /* NEW_LOOP was placed after LOOP. */ @@ -1193,15 +1193,15 @@ slpeel_tree_peel_loop_to_edge (struct loop *loop, if (!update_first_loop_count) { pre_condition = - fold_build2 (LE_EXPR, boolean_type_node, first_niters, + fold_build2 (LE_EXPR, boolean_type_node, first_niters, build_int_cst (TREE_TYPE (first_niters), 0)); if (check_profitability) { tree scalar_loop_iters = unshare_expr (LOOP_VINFO_NITERS_UNCHANGED (loop_vec_info_for_loop (loop))); - cost_pre_condition = - fold_build2 (LE_EXPR, boolean_type_node, scalar_loop_iters, + cost_pre_condition = + fold_build2 (LE_EXPR, boolean_type_node, scalar_loop_iters, build_int_cst (TREE_TYPE (scalar_loop_iters), th)); pre_condition = fold_build2 (TRUTH_OR_EXPR, boolean_type_node, @@ -1217,7 +1217,7 @@ slpeel_tree_peel_loop_to_edge (struct loop *loop, } } - /* Prologue peeling. */ + /* Prologue peeling. */ else { if (check_profitability) @@ -1225,7 +1225,7 @@ slpeel_tree_peel_loop_to_edge (struct loop *loop, loop, th); pre_condition = - fold_build2 (LE_EXPR, boolean_type_node, first_niters, + fold_build2 (LE_EXPR, boolean_type_node, first_niters, build_int_cst (TREE_TYPE (first_niters), 0)); } @@ -1266,7 +1266,7 @@ slpeel_tree_peel_loop_to_edge (struct loop *loop, bb_between_loops = new_exit_bb; bb_after_second_loop = split_edge (single_exit (second_loop)); - pre_condition = + pre_condition = fold_build2 (EQ_EXPR, boolean_type_node, first_niters, niters); skip_e = slpeel_add_loop_guard (bb_between_loops, pre_condition, NULL, bb_after_second_loop, bb_before_first_loop); @@ -1367,10 +1367,10 @@ vect_build_loop_niters (loop_vec_info loop_vinfo, gimple_seq seq) and places them at the loop preheader edge or in COND_EXPR_STMT_LIST if that is non-NULL. */ -static void -vect_generate_tmps_on_preheader (loop_vec_info loop_vinfo, +static void +vect_generate_tmps_on_preheader (loop_vec_info loop_vinfo, tree *ni_name_ptr, - tree *ratio_mult_vf_name_ptr, + tree *ratio_mult_vf_name_ptr, tree *ratio_name_ptr, gimple_seq cond_expr_stmt_list) { @@ -1389,7 +1389,7 @@ vect_generate_tmps_on_preheader (loop_vec_info loop_vinfo, pe = loop_preheader_edge (loop); - /* Generate temporary variable that contains + /* Generate temporary variable that contains number of iterations loop executes. */ ni_name = vect_build_loop_niters (loop_vinfo, cond_expr_stmt_list); @@ -1414,7 +1414,7 @@ vect_generate_tmps_on_preheader (loop_vec_info loop_vinfo, gcc_assert (!new_bb); } } - + /* Create: ratio_mult_vf = ratio << log2 (vf). */ ratio_mult_vf_name = fold_build2 (LSHIFT_EXPR, TREE_TYPE (ratio_name), @@ -1440,20 +1440,20 @@ vect_generate_tmps_on_preheader (loop_vec_info loop_vinfo, *ni_name_ptr = ni_name; *ratio_mult_vf_name_ptr = ratio_mult_vf_name; *ratio_name_ptr = ratio_name; - - return; + + return; } /* Function vect_can_advance_ivs_p - In case the number of iterations that LOOP iterates is unknown at compile - time, an epilog loop will be generated, and the loop induction variables - (IVs) will be "advanced" to the value they are supposed to take just before + In case the number of iterations that LOOP iterates is unknown at compile + time, an epilog loop will be generated, and the loop induction variables + (IVs) will be "advanced" to the value they are supposed to take just before the epilog loop. Here we check that the access function of the loop IVs and the expression that represents the loop bound are simple enough. These restrictions will be relaxed in the future. */ -bool +bool vect_can_advance_ivs_p (loop_vec_info loop_vinfo) { struct loop *loop = LOOP_VINFO_LOOP (loop_vinfo); @@ -1516,19 +1516,19 @@ vect_can_advance_ivs_p (loop_vec_info loop_vinfo) } evolution_part = evolution_part_in_loop_num (access_fn, loop->num); - + if (evolution_part == NULL_TREE) { if (vect_print_dump_info (REPORT_DETAILS)) fprintf (vect_dump, "No evolution."); return false; } - - /* FORNOW: We do not transform initial conditions of IVs + + /* FORNOW: We do not transform initial conditions of IVs which evolution functions are a polynomial of degree >= 2. */ if (tree_is_chrec (evolution_part)) - return false; + return false; } return true; @@ -1570,14 +1570,14 @@ vect_can_advance_ivs_p (loop_vec_info loop_vinfo) vect_can_advance_ivs_p). This assumption will be relaxed in the future. Assumption 4: Exactly one of the successors of LOOP exit-bb is on a path - coming out of LOOP on which the ivs of LOOP are used (this is the path + coming out of LOOP on which the ivs of LOOP are used (this is the path that leads to the epilog loop; other paths skip the epilog loop). This path starts with the edge UPDATE_E, and its destination (denoted update_bb) needs to have its phis updated. */ static void -vect_update_ivs_after_vectorizer (loop_vec_info loop_vinfo, tree niters, +vect_update_ivs_after_vectorizer (loop_vec_info loop_vinfo, tree niters, edge update_e) { struct loop *loop = LOOP_VINFO_LOOP (loop_vinfo); @@ -1621,13 +1621,13 @@ vect_update_ivs_after_vectorizer (loop_vec_info loop_vinfo, tree niters, /* Skip reduction phis. */ if (STMT_VINFO_DEF_TYPE (vinfo_for_stmt (phi)) == vect_reduction_def) - { + { if (vect_print_dump_info (REPORT_DETAILS)) fprintf (vect_dump, "reduc phi. skip."); continue; - } + } - access_fn = analyze_scalar_evolution (loop, PHI_RESULT (phi)); + access_fn = analyze_scalar_evolution (loop, PHI_RESULT (phi)); gcc_assert (access_fn); /* We can end up with an access_fn like (short int) {(short unsigned int) i_49, +, 1}_1 @@ -1638,13 +1638,13 @@ vect_update_ivs_after_vectorizer (loop_vec_info loop_vinfo, tree niters, evolution_part = unshare_expr (evolution_part_in_loop_num (access_fn, loop->num)); gcc_assert (evolution_part != NULL_TREE); - + /* FORNOW: We do not support IVs whose evolution function is a polynomial of degree >= 2 or exponential. */ gcc_assert (!tree_is_chrec (evolution_part)); step_expr = evolution_part; - init_expr = unshare_expr (initial_condition_in_loop_num (access_fn, + init_expr = unshare_expr (initial_condition_in_loop_num (access_fn, loop->num)); init_expr = fold_convert (type, init_expr); @@ -1652,7 +1652,7 @@ vect_update_ivs_after_vectorizer (loop_vec_info loop_vinfo, tree niters, fold_convert (TREE_TYPE (step_expr), niters), step_expr); if (POINTER_TYPE_P (TREE_TYPE (init_expr))) - ni = fold_build2 (POINTER_PLUS_EXPR, TREE_TYPE (init_expr), + ni = fold_build2 (POINTER_PLUS_EXPR, TREE_TYPE (init_expr), init_expr, fold_convert (sizetype, off)); else @@ -1666,7 +1666,7 @@ vect_update_ivs_after_vectorizer (loop_vec_info loop_vinfo, tree niters, last_gsi = gsi_last_bb (exit_bb); ni_name = force_gimple_operand_gsi (&last_gsi, ni, false, var, true, GSI_SAME_STMT); - + /* Fix phi expressions in the successor bb. */ SET_PHI_ARG_DEF (phi1, update_e->dest_idx, ni_name); } @@ -1703,17 +1703,17 @@ conservative_cost_threshold (loop_vec_info loop_vinfo, /* Function vect_do_peeling_for_loop_bound Peel the last iterations of the loop represented by LOOP_VINFO. - The peeled iterations form a new epilog loop. Given that the loop now + The peeled iterations form a new epilog loop. Given that the loop now iterates NITERS times, the new epilog loop iterates NITERS % VECTORIZATION_FACTOR times. - - The original loop will later be made to iterate + + The original loop will later be made to iterate NITERS / VECTORIZATION_FACTOR times (this value is placed into RATIO). COND_EXPR and COND_EXPR_STMT_LIST are combined with a new generated test. */ -void +void vect_do_peeling_for_loop_bound (loop_vec_info loop_vinfo, tree *ratio, tree cond_expr, gimple_seq cond_expr_stmt_list) { @@ -1733,7 +1733,7 @@ vect_do_peeling_for_loop_bound (loop_vec_info loop_vinfo, tree *ratio, initialize_original_copy_tables (); /* Generate the following variables on the preheader of original loop: - + ni_name = number of iteration the original loop executes ratio = ni_name / vf ratio_mult_vf_name = ratio * vf */ @@ -1741,9 +1741,9 @@ vect_do_peeling_for_loop_bound (loop_vec_info loop_vinfo, tree *ratio, &ratio_mult_vf_name, ratio, cond_expr_stmt_list); - loop_num = loop->num; + loop_num = loop->num; - /* If cost model check not done during versioning and + /* If cost model check not done during versioning and peeling for alignment. */ if (!LOOP_REQUIRES_VERSIONING_FOR_ALIGNMENT (loop_vinfo) && !LOOP_REQUIRES_VERSIONING_FOR_ALIAS (loop_vinfo) @@ -1755,7 +1755,7 @@ vect_do_peeling_for_loop_bound (loop_vec_info loop_vinfo, tree *ratio, /* Get profitability threshold for vectorized loop. */ min_profitable_iters = LOOP_VINFO_COST_MODEL_MIN_ITERS (loop_vinfo); - th = conservative_cost_threshold (loop_vinfo, + th = conservative_cost_threshold (loop_vinfo, min_profitable_iters); } @@ -1781,9 +1781,9 @@ vect_do_peeling_for_loop_bound (loop_vec_info loop_vinfo, tree *ratio, else update_e = EDGE_PRED (preheader, 1); - /* Update IVs of original loop as if they were advanced + /* Update IVs of original loop as if they were advanced by ratio_mult_vf_name steps. */ - vect_update_ivs_after_vectorizer (loop_vinfo, ratio_mult_vf_name, update_e); + vect_update_ivs_after_vectorizer (loop_vinfo, ratio_mult_vf_name, update_e); /* After peeling we have to reset scalar evolution analyzer. */ scev_reset (); @@ -1797,7 +1797,7 @@ vect_do_peeling_for_loop_bound (loop_vec_info loop_vinfo, tree *ratio, Set the number of iterations for the loop represented by LOOP_VINFO to the minimum between LOOP_NITERS (the original iteration count of the loop) and the misalignment of DR - the data reference recorded in - LOOP_VINFO_UNALIGNED_DR (LOOP_VINFO). As a result, after the execution of + LOOP_VINFO_UNALIGNED_DR (LOOP_VINFO). As a result, after the execution of this loop, the data reference DR will refer to an aligned location. The following computation is generated: @@ -1822,7 +1822,7 @@ vect_do_peeling_for_loop_bound (loop_vec_info loop_vinfo, tree *ratio, the number of elements that fit in the vector. Therefore, instead of VF we use TYPE_VECTOR_SUBPARTS. */ -static tree +static tree vect_gen_niters_for_prolog_loop (loop_vec_info loop_vinfo, tree loop_niters) { struct data_reference *dr = LOOP_VINFO_UNALIGNED_DR (loop_vinfo); @@ -1844,7 +1844,7 @@ vect_gen_niters_for_prolog_loop (loop_vec_info loop_vinfo, tree loop_niters) if (STMT_VINFO_STRIDED_ACCESS (stmt_info)) step = DR_GROUP_SIZE (vinfo_for_stmt (DR_GROUP_FIRST_DR (stmt_info))); - pe = loop_preheader_edge (loop); + pe = loop_preheader_edge (loop); if (LOOP_PEELING_FOR_ALIGNMENT (loop_vinfo) > 0) { @@ -1860,7 +1860,7 @@ vect_gen_niters_for_prolog_loop (loop_vec_info loop_vinfo, tree loop_niters) else { gimple_seq new_stmts = NULL; - tree start_addr = vect_create_addr_base_for_vector_ref (dr_stmt, + tree start_addr = vect_create_addr_base_for_vector_ref (dr_stmt, &new_stmts, NULL_TREE, loop); tree ptr_type = TREE_TYPE (start_addr); tree size = TYPE_SIZE (ptr_type); @@ -1875,11 +1875,11 @@ vect_gen_niters_for_prolog_loop (loop_vec_info loop_vinfo, tree loop_niters) new_bb = gsi_insert_seq_on_edge_immediate (pe, new_stmts); gcc_assert (!new_bb); - + /* Create: byte_misalign = addr & (vectype_size - 1) */ - byte_misalign = + byte_misalign = fold_build2 (BIT_AND_EXPR, type, fold_convert (type, start_addr), vectype_size_minus_1); - + /* Create: elem_misalign = byte_misalign / element_size */ elem_misalign = fold_build2 (RSHIFT_EXPR, type, byte_misalign, elem_size_log); @@ -1915,7 +1915,7 @@ vect_gen_niters_for_prolog_loop (loop_vec_info loop_vinfo, tree loop_niters) gcc_assert (!new_bb); } - return iters_name; + return iters_name; } @@ -1923,14 +1923,14 @@ vect_gen_niters_for_prolog_loop (loop_vec_info loop_vinfo, tree loop_niters) NITERS iterations were peeled from LOOP. DR represents a data reference in LOOP. This function updates the information recorded in DR to - account for the fact that the first NITERS iterations had already been + account for the fact that the first NITERS iterations had already been executed. Specifically, it updates the OFFSET field of DR. */ static void vect_update_init_of_dr (struct data_reference *dr, tree niters) { tree offset = DR_OFFSET (dr); - + niters = fold_build2 (MULT_EXPR, sizetype, fold_convert (sizetype, niters), fold_convert (sizetype, DR_STEP (dr))); @@ -1942,9 +1942,9 @@ vect_update_init_of_dr (struct data_reference *dr, tree niters) /* Function vect_update_inits_of_drs - NITERS iterations were peeled from the loop represented by LOOP_VINFO. - This function updates the information recorded for the data references in - the loop to account for the fact that the first NITERS iterations had + NITERS iterations were peeled from the loop represented by LOOP_VINFO. + This function updates the information recorded for the data references in + the loop to account for the fact that the first NITERS iterations had already been executed. Specifically, it updates the initial_condition of the access_function of all the data_references in the loop. */ @@ -1988,7 +1988,7 @@ vect_do_peeling_for_alignment (loop_vec_info loop_vinfo) ni_name = vect_build_loop_niters (loop_vinfo, NULL); niters_of_prolog_loop = vect_gen_niters_for_prolog_loop (loop_vinfo, ni_name); - + /* Get profitability threshold for vectorized loop. */ min_profitable_iters = LOOP_VINFO_COST_MODEL_MIN_ITERS (loop_vinfo); @@ -2221,7 +2221,7 @@ vect_create_cond_for_alias_checks (loop_vec_info loop_vinfo, /* Create expression ((store_ptr_0 + store_segment_length_0) < load_ptr_0) || (load_ptr_0 + load_segment_length_0) < store_ptr_0)) - && + && ... && ((store_ptr_n + store_segment_length_n) < load_ptr_n) @@ -2276,7 +2276,7 @@ vect_create_cond_for_alias_checks (loop_vec_info loop_vinfo, } - part_cond_expr = + part_cond_expr = fold_build2 (TRUTH_OR_EXPR, boolean_type_node, fold_build2 (LT_EXPR, boolean_type_node, fold_build2 (POINTER_PLUS_EXPR, TREE_TYPE (addr_base_a), @@ -2288,7 +2288,7 @@ vect_create_cond_for_alias_checks (loop_vec_info loop_vinfo, addr_base_b, segment_length_b), addr_base_a)); - + if (*cond_expr) *cond_expr = fold_build2 (TRUTH_AND_EXPR, boolean_type_node, *cond_expr, part_cond_expr); @@ -2303,7 +2303,7 @@ vect_create_cond_for_alias_checks (loop_vec_info loop_vinfo, /* Function vect_loop_versioning. - + If the loop has data references that may or may not be aligned or/and has data reference relations whose independence was not proven then two versions of the loop need to be generated, one which is vectorized @@ -2311,11 +2311,11 @@ vect_create_cond_for_alias_checks (loop_vec_info loop_vinfo, loops is executed. The test checks for the alignment of all of the data references that may or may not be aligned. An additional sequence of runtime tests is generated for each pairs of DDRs whose - independence was not proven. The vectorized version of loop is - executed only if both alias and alignment tests are passed. - + independence was not proven. The vectorized version of loop is + executed only if both alias and alignment tests are passed. + The test generated to check which version of loop is executed - is modified to also check for profitability as indicated by the + is modified to also check for profitability as indicated by the cost model initially. The versioning precondition(s) are placed in *COND_EXPR and @@ -2348,7 +2348,7 @@ vect_loop_versioning (loop_vec_info loop_vinfo, bool do_versioning, min_profitable_iters); *cond_expr = - fold_build2 (GT_EXPR, boolean_type_node, scalar_loop_iters, + fold_build2 (GT_EXPR, boolean_type_node, scalar_loop_iters, build_int_cst (TREE_TYPE (scalar_loop_iters), th)); *cond_expr = force_gimple_operand (*cond_expr, cond_expr_stmt_list, @@ -2378,14 +2378,14 @@ vect_loop_versioning (loop_vec_info loop_vinfo, bool do_versioning, prob, prob, REG_BR_PROB_BASE - prob, true); free_original_copy_tables(); - /* Loop versioning violates an assumption we try to maintain during + /* Loop versioning violates an assumption we try to maintain during vectorization - that the loop exit block has a single predecessor. After versioning, the exit block of both loop versions is the same basic block (i.e. it has two predecessors). Just in order to simplify following transformations in the vectorizer, we fix this situation here by adding a new (empty) block on the exit-edge of the loop, with the proper loop-exit phis to maintain loop-closed-form. */ - + merge_bb = single_exit (loop)->dest; gcc_assert (EDGE_COUNT (merge_bb->preds) == 2); new_exit_bb = split_edge (single_exit (loop)); @@ -2398,10 +2398,10 @@ vect_loop_versioning (loop_vec_info loop_vinfo, bool do_versioning, new_phi = create_phi_node (SSA_NAME_VAR (PHI_RESULT (orig_phi)), new_exit_bb); arg = PHI_ARG_DEF_FROM_EDGE (orig_phi, e); - add_phi_arg (new_phi, arg, new_exit_e, + add_phi_arg (new_phi, arg, new_exit_e, gimple_phi_arg_location_from_edge (orig_phi, e)); SET_PHI_ARG_DEF (orig_phi, e->dest_idx, PHI_RESULT (new_phi)); - } + } /* End loop-exit-fixes after versioning. */ |