diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 89827172fc0..e0c5c322b72 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,26 @@ +2013-05-15 Richard Biener + + * tree-vect-loop.c (vect_transform_loop): Use MSG_NOTE instead + of MSG_OPTIMIZED_LOCATIONS. + * tree-vect-slp.c (vect_make_slp_decision): Likewise. + (vect_slp_transform_bb): Indicate location in MSG_OPTIMIZED_LOCATIONS + message. + * tree-vectorizer.c (vectorize_loops): Use MSG_NOTE instead + of MSG_OPTIMIZED_LOCATIONS. + (execute_vect_slp): Likewise. + * tree-vect-loop-manip.c (vect_do_peeling_for_loop_bound): Likewise. + (vect_create_cond_for_alias_checks): Likewise. + * tree-vect-patterns.c (vect_recog_dot_prod_pattern): Likewise. + (vect_recog_widen_mult_pattern): Likewise. + (vect_recog_widen_sum_pattern): Likewise. + (vect_recog_over_widening_pattern): Likewise. + (vect_recog_widen_shift_pattern): Likewise. + (vect_recog_vector_vector_shift_pattern): Likewise. + (vect_recog_divmod_pattern): Likewise. + (vect_recog_mixed_size_cond_pattern): Likewise. + (vect_recog_bool_pattern): Likewise. + (vect_pattern_recog_1): Likewise. + 2013-05-15 Martin Jambor * ipa-prop.c (ipa_make_edge_direct_to_target): Redirect calls to diff --git a/gcc/tree-vect-loop-manip.c b/gcc/tree-vect-loop-manip.c index 82e724f1d9c..a0d67697126 100644 --- a/gcc/tree-vect-loop-manip.c +++ b/gcc/tree-vect-loop-manip.c @@ -1761,7 +1761,7 @@ vect_do_peeling_for_loop_bound (loop_vec_info loop_vinfo, tree *ratio, gimple_seq cond_expr_stmt_list = NULL; if (dump_enabled_p ()) - dump_printf_loc (MSG_OPTIMIZED_LOCATIONS, vect_location, + dump_printf_loc (MSG_NOTE, vect_location, "=== vect_do_peeling_for_loop_bound ==="); initialize_original_copy_tables (); @@ -1815,7 +1815,7 @@ vect_do_peeling_for_loop_bound (loop_vec_info loop_vinfo, tree *ratio, if (check_profitability) max_iter = MAX (max_iter, (int) th - 1); record_niter_bound (new_loop, double_int::from_shwi (max_iter), false, true); - dump_printf (MSG_OPTIMIZED_LOCATIONS, + dump_printf (MSG_NOTE, "Setting upper bound of nb iterations for epilogue " "loop to %d\n", max_iter); @@ -1880,7 +1880,7 @@ vect_gen_niters_for_prolog_loop (loop_vec_info loop_vinfo, tree loop_niters, int int npeel = LOOP_PEELING_FOR_ALIGNMENT (loop_vinfo); if (dump_enabled_p ()) - dump_printf_loc (MSG_OPTIMIZED_LOCATIONS, vect_location, + dump_printf_loc (MSG_NOTE, vect_location, "known peeling = %d.", npeel); iters = build_int_cst (niters_type, npeel); @@ -1935,9 +1935,9 @@ vect_gen_niters_for_prolog_loop (loop_vec_info loop_vinfo, tree loop_niters, int if (dump_enabled_p ()) { - dump_printf_loc (MSG_OPTIMIZED_LOCATIONS, vect_location, + dump_printf_loc (MSG_NOTE, vect_location, "niters for prolog loop: "); - dump_generic_expr (MSG_OPTIMIZED_LOCATIONS, TDF_SLIM, iters); + dump_generic_expr (MSG_NOTE, TDF_SLIM, iters); } var = create_tmp_var (niters_type, "prolog_loop_niters"); @@ -1992,7 +1992,7 @@ vect_update_inits_of_drs (loop_vec_info loop_vinfo, tree niters) struct data_reference *dr; if (dump_enabled_p ()) - dump_printf_loc (MSG_OPTIMIZED_LOCATIONS, vect_location, + dump_printf_loc (MSG_NOTE, vect_location, "=== vect_update_inits_of_dr ==="); FOR_EACH_VEC_ELT (datarefs, i, dr) @@ -2021,7 +2021,7 @@ vect_do_peeling_for_alignment (loop_vec_info loop_vinfo, int bound = 0; if (dump_enabled_p ()) - dump_printf_loc (MSG_OPTIMIZED_LOCATIONS, vect_location, + dump_printf_loc (MSG_NOTE, vect_location, "=== vect_do_peeling_for_alignment ==="); initialize_original_copy_tables (); @@ -2049,7 +2049,7 @@ vect_do_peeling_for_alignment (loop_vec_info loop_vinfo, if (check_profitability) max_iter = MAX (max_iter, (int) th - 1); record_niter_bound (new_loop, double_int::from_shwi (max_iter), false, true); - dump_printf (MSG_OPTIMIZED_LOCATIONS, + dump_printf (MSG_NOTE, "Setting upper bound of nb iterations for prologue " "loop to %d\n", max_iter); @@ -2332,11 +2332,11 @@ vect_create_cond_for_alias_checks (loop_vec_info loop_vinfo, tree * cond_expr) if (dump_enabled_p ()) { - dump_printf_loc (MSG_OPTIMIZED_LOCATIONS, vect_location, + dump_printf_loc (MSG_NOTE, vect_location, "create runtime check for data references "); - dump_generic_expr (MSG_OPTIMIZED_LOCATIONS, TDF_SLIM, DR_REF (dr_a)); - dump_printf (MSG_OPTIMIZED_LOCATIONS, " and "); - dump_generic_expr (MSG_OPTIMIZED_LOCATIONS, TDF_SLIM, DR_REF (dr_b)); + dump_generic_expr (MSG_NOTE, TDF_SLIM, DR_REF (dr_a)); + dump_printf (MSG_NOTE, " and "); + dump_generic_expr (MSG_NOTE, TDF_SLIM, DR_REF (dr_b)); } seg_a_min = addr_base_a; @@ -2362,7 +2362,7 @@ vect_create_cond_for_alias_checks (loop_vec_info loop_vinfo, tree * cond_expr) } if (dump_enabled_p ()) - dump_printf_loc (MSG_OPTIMIZED_LOCATIONS, vect_location, + dump_printf_loc (MSG_NOTE, vect_location, "created %u versioning for alias checks.\n", may_alias_ddrs.length ()); } diff --git a/gcc/tree-vect-loop.c b/gcc/tree-vect-loop.c index 0fb2daed370..058e4a4ec54 100644 --- a/gcc/tree-vect-loop.c +++ b/gcc/tree-vect-loop.c @@ -5788,8 +5788,11 @@ vect_transform_loop (loop_vec_info loop_vinfo) } if (dump_enabled_p ()) - dump_printf_loc (MSG_OPTIMIZED_LOCATIONS, vect_location, "LOOP VECTORIZED."); - if (loop->inner && dump_enabled_p ()) - dump_printf_loc (MSG_OPTIMIZED_LOCATIONS, vect_location, - "OUTER LOOP VECTORIZED."); + { + dump_printf_loc (MSG_OPTIMIZED_LOCATIONS, vect_location, + "LOOP VECTORIZED\n"); + if (loop->inner) + dump_printf_loc (MSG_NOTE, vect_location, + "OUTER LOOP VECTORIZED\n"); + } } diff --git a/gcc/tree-vect-patterns.c b/gcc/tree-vect-patterns.c index e8275d9d2a4..e389dec3771 100644 --- a/gcc/tree-vect-patterns.c +++ b/gcc/tree-vect-patterns.c @@ -417,9 +417,9 @@ vect_recog_dot_prod_pattern (vec *stmts, tree *type_in, if (dump_enabled_p ()) { - dump_printf_loc (MSG_OPTIMIZED_LOCATIONS, vect_location, + dump_printf_loc (MSG_NOTE, vect_location, "vect_recog_dot_prod_pattern: detected: "); - dump_gimple_stmt (MSG_OPTIMIZED_LOCATIONS, TDF_SLIM, pattern_stmt, 0); + dump_gimple_stmt (MSG_NOTE, TDF_SLIM, pattern_stmt, 0); } /* We don't allow changing the order of the computation in the inner-loop @@ -676,7 +676,7 @@ vect_recog_widen_mult_pattern (vec *stmts, /* Pattern detected. */ if (dump_enabled_p ()) - dump_printf_loc (MSG_OPTIMIZED_LOCATIONS, vect_location, + dump_printf_loc (MSG_NOTE, vect_location, "vect_recog_widen_mult_pattern: detected: "); /* Check target support */ @@ -913,9 +913,9 @@ vect_recog_widen_sum_pattern (vec *stmts, tree *type_in, if (dump_enabled_p ()) { - dump_printf_loc (MSG_OPTIMIZED_LOCATIONS, vect_location, + dump_printf_loc (MSG_NOTE, vect_location, "vect_recog_widen_sum_pattern: detected: "); - dump_gimple_stmt (MSG_OPTIMIZED_LOCATIONS, TDF_SLIM, pattern_stmt, 0); + dump_gimple_stmt (MSG_NOTE, TDF_SLIM, pattern_stmt, 0); } /* We don't allow changing the order of the computation in the inner-loop @@ -1218,9 +1218,9 @@ vect_recog_over_widening_pattern (vec *stmts, if (dump_enabled_p ()) { - dump_printf_loc (MSG_OPTIMIZED_LOCATIONS, vect_location, + dump_printf_loc (MSG_NOTE, vect_location, "created pattern stmt: "); - dump_gimple_stmt (MSG_OPTIMIZED_LOCATIONS, TDF_SLIM, pattern_stmt, 0); + dump_gimple_stmt (MSG_NOTE, TDF_SLIM, pattern_stmt, 0); } type = gimple_expr_type (stmt); @@ -1286,9 +1286,9 @@ vect_recog_over_widening_pattern (vec *stmts, /* Pattern detected. */ if (dump_enabled_p ()) { - dump_printf_loc (MSG_OPTIMIZED_LOCATIONS, vect_location, + dump_printf_loc (MSG_NOTE, vect_location, "vect_recog_over_widening_pattern: detected: "); - dump_gimple_stmt (MSG_OPTIMIZED_LOCATIONS, TDF_SLIM, pattern_stmt, 0); + dump_gimple_stmt (MSG_NOTE, TDF_SLIM, pattern_stmt, 0); } return pattern_stmt; @@ -1421,7 +1421,7 @@ vect_recog_widen_shift_pattern (vec *stmts, /* Pattern detected. */ if (dump_enabled_p ()) - dump_printf_loc (MSG_OPTIMIZED_LOCATIONS, vect_location, + dump_printf_loc (MSG_NOTE, vect_location, "vect_recog_widen_shift_pattern: detected: "); /* Check target support. */ @@ -1567,7 +1567,7 @@ vect_recog_vector_vector_shift_pattern (vec *stmts, /* Pattern detected. */ if (dump_enabled_p ()) - dump_printf_loc (MSG_OPTIMIZED_LOCATIONS, vect_location, + dump_printf_loc (MSG_NOTE, vect_location, "vect_recog_vector_vector_shift_pattern: detected: "); /* Pattern supported. Create a stmt to be used to replace the pattern. */ @@ -1685,7 +1685,7 @@ vect_recog_divmod_pattern (vec *stmts, /* Pattern detected. */ if (dump_enabled_p ()) - dump_printf_loc (MSG_OPTIMIZED_LOCATIONS, vect_location, + dump_printf_loc (MSG_NOTE, vect_location, "vect_recog_divmod_pattern: detected: "); cond = build2 (LT_EXPR, boolean_type_node, oprnd0, @@ -2032,9 +2032,9 @@ vect_recog_divmod_pattern (vec *stmts, /* Pattern detected. */ if (dump_enabled_p ()) { - dump_printf_loc (MSG_OPTIMIZED_LOCATIONS, vect_location, + dump_printf_loc (MSG_NOTE, vect_location, "vect_recog_divmod_pattern: detected: "); - dump_gimple_stmt (MSG_OPTIMIZED_LOCATIONS, TDF_SLIM, pattern_stmt, 0); + dump_gimple_stmt (MSG_NOTE, TDF_SLIM, pattern_stmt, 0); } stmts->safe_push (last_stmt); @@ -2199,7 +2199,7 @@ vect_recog_mixed_size_cond_pattern (vec *stmts, tree *type_in, *type_out = vectype; if (dump_enabled_p ()) - dump_printf_loc (MSG_OPTIMIZED_LOCATIONS, vect_location, + dump_printf_loc (MSG_NOTE, vect_location, "vect_recog_mixed_size_cond_pattern: detected: "); return pattern_stmt; @@ -2592,7 +2592,7 @@ vect_recog_bool_pattern (vec *stmts, tree *type_in, *type_in = vectype; stmts->safe_push (last_stmt); if (dump_enabled_p ()) - dump_printf_loc (MSG_OPTIMIZED_LOCATIONS, vect_location, + dump_printf_loc (MSG_NOTE, vect_location, "vect_recog_bool_pattern: detected: "); return pattern_stmt; @@ -2638,7 +2638,7 @@ vect_recog_bool_pattern (vec *stmts, tree *type_in, *type_in = vectype; stmts->safe_push (last_stmt); if (dump_enabled_p ()) - dump_printf_loc (MSG_OPTIMIZED_LOCATIONS, vect_location, + dump_printf_loc (MSG_NOTE, vect_location, "vect_recog_bool_pattern: detected: "); return pattern_stmt; } @@ -2789,9 +2789,9 @@ vect_pattern_recog_1 (vect_recog_func_ptr vect_recog_func, /* Found a vectorizable pattern. */ if (dump_enabled_p ()) { - dump_printf_loc (MSG_OPTIMIZED_LOCATIONS, vect_location, + dump_printf_loc (MSG_NOTE, vect_location, "pattern recognized: "); - dump_gimple_stmt (MSG_OPTIMIZED_LOCATIONS, TDF_SLIM, pattern_stmt, 0); + dump_gimple_stmt (MSG_NOTE, TDF_SLIM, pattern_stmt, 0); } /* Mark the stmts that are involved in the pattern. */ @@ -2815,9 +2815,9 @@ vect_pattern_recog_1 (vect_recog_func_ptr vect_recog_func, pattern_stmt = STMT_VINFO_RELATED_STMT (stmt_info); if (dump_enabled_p ()) { - dump_printf_loc (MSG_OPTIMIZED_LOCATIONS, vect_location, + dump_printf_loc (MSG_NOTE, vect_location, "additional pattern stmt: "); - dump_gimple_stmt (MSG_OPTIMIZED_LOCATIONS, TDF_SLIM, pattern_stmt, 0); + dump_gimple_stmt (MSG_NOTE, TDF_SLIM, pattern_stmt, 0); } vect_mark_pattern_stmts (stmt, pattern_stmt, NULL_TREE); diff --git a/gcc/tree-vect-slp.c b/gcc/tree-vect-slp.c index b83e6404130..e3b38ff2d52 100644 --- a/gcc/tree-vect-slp.c +++ b/gcc/tree-vect-slp.c @@ -1698,7 +1698,7 @@ vect_make_slp_decision (loop_vec_info loop_vinfo) LOOP_VINFO_SLP_UNROLLING_FACTOR (loop_vinfo) = unrolling_factor; if (decided_to_slp && dump_enabled_p ()) - dump_printf_loc (MSG_OPTIMIZED_LOCATIONS, vect_location, + dump_printf_loc (MSG_NOTE, vect_location, "Decided to SLP %d instances. Unrolling factor %d", decided_to_slp, unrolling_factor); @@ -3132,7 +3132,8 @@ vect_slp_transform_bb (basic_block bb) } if (dump_enabled_p ()) - dump_printf (MSG_OPTIMIZED_LOCATIONS, "BASIC BLOCK VECTORIZED\n"); + dump_printf_loc (MSG_OPTIMIZED_LOCATIONS, vect_location, + "BASIC BLOCK VECTORIZED\n"); destroy_bb_vec_info (bb_vinfo); } diff --git a/gcc/tree-vectorizer.c b/gcc/tree-vectorizer.c index 843a03ca85c..814f96c3017 100644 --- a/gcc/tree-vectorizer.c +++ b/gcc/tree-vectorizer.c @@ -107,7 +107,7 @@ vectorize_loops (void) vect_location = find_loop_location (loop); if (LOCATION_LOCUS (vect_location) != UNKNOWN_LOC && dump_enabled_p ()) - dump_printf (MSG_ALL, "\nAnalyzing loop at %s:%d\n", + dump_printf (MSG_NOTE, "\nAnalyzing loop at %s:%d\n", LOC_FILE (vect_location), LOC_LINE (vect_location)); loop_vinfo = vect_analyze_loop (loop); @@ -118,7 +118,7 @@ vectorize_loops (void) if (LOCATION_LOCUS (vect_location) != UNKNOWN_LOC && dump_enabled_p ()) - dump_printf (MSG_ALL, "\n\nVectorizing loop at %s:%d\n", + dump_printf (MSG_NOTE, "\n\nVectorizing loop at %s:%d\n", LOC_FILE (vect_location), LOC_LINE (vect_location)); vect_transform_loop (loop_vinfo); num_vectorized_loops++; @@ -129,7 +129,7 @@ vectorize_loops (void) statistics_counter_event (cfun, "Vectorized loops", num_vectorized_loops); if (dump_enabled_p () || (num_vectorized_loops > 0 && dump_enabled_p ())) - dump_printf_loc (MSG_ALL, vect_location, + dump_printf_loc (MSG_NOTE, vect_location, "vectorized %u loops in function.\n", num_vectorized_loops); @@ -179,7 +179,7 @@ execute_vect_slp (void) { vect_slp_transform_bb (bb); if (dump_enabled_p ()) - dump_printf_loc (MSG_OPTIMIZED_LOCATIONS, vect_location, + dump_printf_loc (MSG_NOTE, vect_location, "basic block vectorized using SLP\n"); } }