This fixes -fopt-info-vec-optimized to be less of an unreadable
mess ... in fact the following tames it down to just print
LOOP VECTORIZED and BASIC BLOCK VECTORIZED messages, nothing else.
In particular not messages from analysis time. Eventually
a "verbose" flavor could enable some more messages from transform
time (the old -ftree-vectorizer-verbose has a few more than
remaining after this patch).
Unvectorized locations not fixed, they are an even bigger mess.
Bootstrapped and tested on x86_64-unknown-linux-gnu, applied to trunk.
Richard.
2013-05-15 Richard Biener <rguent...@suse.de>
* 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.
Index: trunk/gcc/tree-vect-loop.c
===================================================================
*** trunk.orig/gcc/tree-vect-loop.c 2013-05-14 14:46:13.000000000 +0200
--- trunk/gcc/tree-vect-loop.c 2013-05-14 16:39:44.159664558 +0200
*************** vect_transform_loop (loop_vec_info loop_
*** 5794,5801 ****
}
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.");
}
--- 5794,5804 ----
}
if (dump_enabled_p ())
! {
! 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");
! }
}
Index: trunk/gcc/tree-vect-slp.c
===================================================================
*** trunk.orig/gcc/tree-vect-slp.c 2013-05-14 14:46:13.000000000 +0200
--- trunk/gcc/tree-vect-slp.c 2013-05-14 16:43:38.351291026 +0200
*************** vect_make_slp_decision (loop_vec_info lo
*** 1698,1704 ****
LOOP_VINFO_SLP_UNROLLING_FACTOR (loop_vinfo) = unrolling_factor;
if (decided_to_slp && dump_enabled_p ())
! dump_printf_loc (MSG_OPTIMIZED_LOCATIONS, vect_location,
"Decided to SLP %d instances. Unrolling factor %d",
decided_to_slp, unrolling_factor);
--- 1698,1704 ----
LOOP_VINFO_SLP_UNROLLING_FACTOR (loop_vinfo) = unrolling_factor;
if (decided_to_slp && dump_enabled_p ())
! dump_printf_loc (MSG_NOTE, vect_location,
"Decided to SLP %d instances. Unrolling factor %d",
decided_to_slp, unrolling_factor);
*************** vect_slp_transform_bb (basic_block bb)
*** 3136,3142 ****
}
if (dump_enabled_p ())
! dump_printf (MSG_OPTIMIZED_LOCATIONS, "BASIC BLOCK VECTORIZED\n");
destroy_bb_vec_info (bb_vinfo);
}
--- 3136,3143 ----
}
if (dump_enabled_p ())
! dump_printf_loc (MSG_OPTIMIZED_LOCATIONS, vect_location,
! "BASIC BLOCK VECTORIZED\n");
destroy_bb_vec_info (bb_vinfo);
}
Index: trunk/gcc/tree-vectorizer.c
===================================================================
*** trunk.orig/gcc/tree-vectorizer.c 2013-05-14 14:46:13.000000000 +0200
--- trunk/gcc/tree-vectorizer.c 2013-05-14 16:43:42.904342074 +0200
*************** vectorize_loops (void)
*** 107,113 ****
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",
LOC_FILE (vect_location), LOC_LINE (vect_location));
loop_vinfo = vect_analyze_loop (loop);
--- 107,113 ----
vect_location = find_loop_location (loop);
if (LOCATION_LOCUS (vect_location) != UNKNOWN_LOC
&& dump_enabled_p ())
! dump_printf (MSG_NOTE, "\nAnalyzing loop at %s:%d\n",
LOC_FILE (vect_location), LOC_LINE (vect_location));
loop_vinfo = vect_analyze_loop (loop);
*************** vectorize_loops (void)
*** 118,124 ****
if (LOCATION_LOCUS (vect_location) != UNKNOWN_LOC
&& dump_enabled_p ())
! dump_printf (MSG_ALL, "\n\nVectorizing loop at %s:%d\n",
LOC_FILE (vect_location), LOC_LINE (vect_location));
vect_transform_loop (loop_vinfo);
num_vectorized_loops++;
--- 118,124 ----
if (LOCATION_LOCUS (vect_location) != UNKNOWN_LOC
&& dump_enabled_p ())
! 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++;
*************** vectorize_loops (void)
*** 129,135 ****
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,
"vectorized %u loops in function.\n",
num_vectorized_loops);
--- 129,135 ----
statistics_counter_event (cfun, "Vectorized loops", num_vectorized_loops);
if (dump_enabled_p ()
|| (num_vectorized_loops > 0 && dump_enabled_p ()))
! dump_printf_loc (MSG_NOTE, vect_location,
"vectorized %u loops in function.\n",
num_vectorized_loops);
*************** execute_vect_slp (void)
*** 179,185 ****
{
vect_slp_transform_bb (bb);
if (dump_enabled_p ())
! dump_printf_loc (MSG_OPTIMIZED_LOCATIONS, vect_location,
"basic block vectorized using SLP\n");
}
}
--- 179,185 ----
{
vect_slp_transform_bb (bb);
if (dump_enabled_p ())
! dump_printf_loc (MSG_NOTE, vect_location,
"basic block vectorized using SLP\n");
}
}
Index: trunk/gcc/tree-vect-loop-manip.c
===================================================================
*** trunk.orig/gcc/tree-vect-loop-manip.c 2013-05-10 09:54:57.000000000
+0200
--- trunk/gcc/tree-vect-loop-manip.c 2013-05-14 16:59:01.458645860 +0200
*************** vect_do_peeling_for_loop_bound (loop_vec
*** 1761,1767 ****
gimple_seq cond_expr_stmt_list = NULL;
if (dump_enabled_p ())
! dump_printf_loc (MSG_OPTIMIZED_LOCATIONS, vect_location,
"=== vect_do_peeling_for_loop_bound ===");
initialize_original_copy_tables ();
--- 1761,1767 ----
gimple_seq cond_expr_stmt_list = NULL;
if (dump_enabled_p ())
! dump_printf_loc (MSG_NOTE, vect_location,
"=== vect_do_peeling_for_loop_bound ===");
initialize_original_copy_tables ();
*************** vect_do_peeling_for_loop_bound (loop_vec
*** 1815,1821 ****
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,
"Setting upper bound of nb iterations for epilogue "
"loop to %d\n", max_iter);
--- 1815,1821 ----
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_NOTE,
"Setting upper bound of nb iterations for epilogue "
"loop to %d\n", max_iter);
*************** vect_gen_niters_for_prolog_loop (loop_ve
*** 1880,1886 ****
int npeel = LOOP_PEELING_FOR_ALIGNMENT (loop_vinfo);
if (dump_enabled_p ())
! dump_printf_loc (MSG_OPTIMIZED_LOCATIONS, vect_location,
"known peeling = %d.", npeel);
iters = build_int_cst (niters_type, npeel);
--- 1880,1886 ----
int npeel = LOOP_PEELING_FOR_ALIGNMENT (loop_vinfo);
if (dump_enabled_p ())
! dump_printf_loc (MSG_NOTE, vect_location,
"known peeling = %d.", npeel);
iters = build_int_cst (niters_type, npeel);
*************** vect_gen_niters_for_prolog_loop (loop_ve
*** 1935,1943 ****
if (dump_enabled_p ())
{
! dump_printf_loc (MSG_OPTIMIZED_LOCATIONS, vect_location,
"niters for prolog loop: ");
! dump_generic_expr (MSG_OPTIMIZED_LOCATIONS, TDF_SLIM, iters);
}
var = create_tmp_var (niters_type, "prolog_loop_niters");
--- 1935,1943 ----
if (dump_enabled_p ())
{
! dump_printf_loc (MSG_NOTE, vect_location,
"niters for prolog loop: ");
! dump_generic_expr (MSG_NOTE, TDF_SLIM, iters);
}
var = create_tmp_var (niters_type, "prolog_loop_niters");
*************** vect_update_inits_of_drs (loop_vec_info
*** 1992,1998 ****
struct data_reference *dr;
if (dump_enabled_p ())
! dump_printf_loc (MSG_OPTIMIZED_LOCATIONS, vect_location,
"=== vect_update_inits_of_dr ===");
FOR_EACH_VEC_ELT (datarefs, i, dr)
--- 1992,1998 ----
struct data_reference *dr;
if (dump_enabled_p ())
! dump_printf_loc (MSG_NOTE, vect_location,
"=== vect_update_inits_of_dr ===");
FOR_EACH_VEC_ELT (datarefs, i, dr)
*************** vect_do_peeling_for_alignment (loop_vec_
*** 2021,2027 ****
int bound = 0;
if (dump_enabled_p ())
! dump_printf_loc (MSG_OPTIMIZED_LOCATIONS, vect_location,
"=== vect_do_peeling_for_alignment ===");
initialize_original_copy_tables ();
--- 2021,2027 ----
int bound = 0;
if (dump_enabled_p ())
! dump_printf_loc (MSG_NOTE, vect_location,
"=== vect_do_peeling_for_alignment ===");
initialize_original_copy_tables ();
*************** vect_do_peeling_for_alignment (loop_vec_
*** 2049,2055 ****
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,
"Setting upper bound of nb iterations for prologue "
"loop to %d\n", max_iter);
--- 2049,2055 ----
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_NOTE,
"Setting upper bound of nb iterations for prologue "
"loop to %d\n", max_iter);
*************** vect_create_cond_for_alias_checks (loop_
*** 2332,2342 ****
if (dump_enabled_p ())
{
! dump_printf_loc (MSG_OPTIMIZED_LOCATIONS, 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));
}
seg_a_min = addr_base_a;
--- 2332,2342 ----
if (dump_enabled_p ())
{
! dump_printf_loc (MSG_NOTE, vect_location,
"create runtime check for data references ");
! 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;
*************** vect_create_cond_for_alias_checks (loop_
*** 2362,2368 ****
}
if (dump_enabled_p ())
! dump_printf_loc (MSG_OPTIMIZED_LOCATIONS, vect_location,
"created %u versioning for alias checks.\n",
may_alias_ddrs.length ());
}
--- 2362,2368 ----
}
if (dump_enabled_p ())
! dump_printf_loc (MSG_NOTE, vect_location,
"created %u versioning for alias checks.\n",
may_alias_ddrs.length ());
}
Index: trunk/gcc/tree-vect-patterns.c
===================================================================
*** trunk.orig/gcc/tree-vect-patterns.c 2013-01-11 10:54:56.000000000 +0100
--- trunk/gcc/tree-vect-patterns.c 2013-05-14 16:59:24.786907611 +0200
*************** vect_recog_dot_prod_pattern (vec<gimple>
*** 417,425 ****
if (dump_enabled_p ())
{
! dump_printf_loc (MSG_OPTIMIZED_LOCATIONS, vect_location,
"vect_recog_dot_prod_pattern: detected: ");
! dump_gimple_stmt (MSG_OPTIMIZED_LOCATIONS, TDF_SLIM, pattern_stmt, 0);
}
/* We don't allow changing the order of the computation in the inner-loop
--- 417,425 ----
if (dump_enabled_p ())
{
! dump_printf_loc (MSG_NOTE, vect_location,
"vect_recog_dot_prod_pattern: detected: ");
! dump_gimple_stmt (MSG_NOTE, TDF_SLIM, pattern_stmt, 0);
}
/* We don't allow changing the order of the computation in the inner-loop
*************** vect_recog_widen_mult_pattern (vec<gimpl
*** 676,682 ****
/* Pattern detected. */
if (dump_enabled_p ())
! dump_printf_loc (MSG_OPTIMIZED_LOCATIONS, vect_location,
"vect_recog_widen_mult_pattern: detected: ");
/* Check target support */
--- 676,682 ----
/* Pattern detected. */
if (dump_enabled_p ())
! dump_printf_loc (MSG_NOTE, vect_location,
"vect_recog_widen_mult_pattern: detected: ");
/* Check target support */
*************** vect_recog_widen_sum_pattern (vec<gimple
*** 913,921 ****
if (dump_enabled_p ())
{
! dump_printf_loc (MSG_OPTIMIZED_LOCATIONS, vect_location,
"vect_recog_widen_sum_pattern: detected: ");
! dump_gimple_stmt (MSG_OPTIMIZED_LOCATIONS, TDF_SLIM, pattern_stmt, 0);
}
/* We don't allow changing the order of the computation in the inner-loop
--- 913,921 ----
if (dump_enabled_p ())
{
! dump_printf_loc (MSG_NOTE, vect_location,
"vect_recog_widen_sum_pattern: detected: ");
! dump_gimple_stmt (MSG_NOTE, TDF_SLIM, pattern_stmt, 0);
}
/* We don't allow changing the order of the computation in the inner-loop
*************** vect_recog_over_widening_pattern (vec<gi
*** 1218,1226 ****
if (dump_enabled_p ())
{
! dump_printf_loc (MSG_OPTIMIZED_LOCATIONS, vect_location,
"created pattern stmt: ");
! dump_gimple_stmt (MSG_OPTIMIZED_LOCATIONS, TDF_SLIM, pattern_stmt,
0);
}
type = gimple_expr_type (stmt);
--- 1218,1226 ----
if (dump_enabled_p ())
{
! dump_printf_loc (MSG_NOTE, vect_location,
"created pattern stmt: ");
! dump_gimple_stmt (MSG_NOTE, TDF_SLIM, pattern_stmt, 0);
}
type = gimple_expr_type (stmt);
*************** vect_recog_over_widening_pattern (vec<gi
*** 1286,1294 ****
/* Pattern detected. */
if (dump_enabled_p ())
{
! dump_printf_loc (MSG_OPTIMIZED_LOCATIONS, vect_location,
"vect_recog_over_widening_pattern: detected: ");
! dump_gimple_stmt (MSG_OPTIMIZED_LOCATIONS, TDF_SLIM, pattern_stmt, 0);
}
return pattern_stmt;
--- 1286,1294 ----
/* Pattern detected. */
if (dump_enabled_p ())
{
! dump_printf_loc (MSG_NOTE, vect_location,
"vect_recog_over_widening_pattern: detected: ");
! dump_gimple_stmt (MSG_NOTE, TDF_SLIM, pattern_stmt, 0);
}
return pattern_stmt;
*************** vect_recog_widen_shift_pattern (vec<gimp
*** 1421,1427 ****
/* Pattern detected. */
if (dump_enabled_p ())
! dump_printf_loc (MSG_OPTIMIZED_LOCATIONS, vect_location,
"vect_recog_widen_shift_pattern: detected: ");
/* Check target support. */
--- 1421,1427 ----
/* Pattern detected. */
if (dump_enabled_p ())
! dump_printf_loc (MSG_NOTE, vect_location,
"vect_recog_widen_shift_pattern: detected: ");
/* Check target support. */
*************** vect_recog_vector_vector_shift_pattern (
*** 1567,1573 ****
/* Pattern detected. */
if (dump_enabled_p ())
! dump_printf_loc (MSG_OPTIMIZED_LOCATIONS, vect_location,
"vect_recog_vector_vector_shift_pattern: detected: ");
/* Pattern supported. Create a stmt to be used to replace the pattern. */
--- 1567,1573 ----
/* Pattern detected. */
if (dump_enabled_p ())
! 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. */
*************** vect_recog_divmod_pattern (vec<gimple> *
*** 1685,1691 ****
/* Pattern detected. */
if (dump_enabled_p ())
! dump_printf_loc (MSG_OPTIMIZED_LOCATIONS, vect_location,
"vect_recog_divmod_pattern: detected: ");
cond = build2 (LT_EXPR, boolean_type_node, oprnd0,
--- 1685,1691 ----
/* Pattern detected. */
if (dump_enabled_p ())
! dump_printf_loc (MSG_NOTE, vect_location,
"vect_recog_divmod_pattern: detected: ");
cond = build2 (LT_EXPR, boolean_type_node, oprnd0,
*************** vect_recog_divmod_pattern (vec<gimple> *
*** 2032,2040 ****
/* Pattern detected. */
if (dump_enabled_p ())
{
! dump_printf_loc (MSG_OPTIMIZED_LOCATIONS, vect_location,
"vect_recog_divmod_pattern: detected: ");
! dump_gimple_stmt (MSG_OPTIMIZED_LOCATIONS, TDF_SLIM, pattern_stmt, 0);
}
stmts->safe_push (last_stmt);
--- 2032,2040 ----
/* Pattern detected. */
if (dump_enabled_p ())
{
! dump_printf_loc (MSG_NOTE, vect_location,
"vect_recog_divmod_pattern: detected: ");
! dump_gimple_stmt (MSG_NOTE, TDF_SLIM, pattern_stmt, 0);
}
stmts->safe_push (last_stmt);
*************** vect_recog_mixed_size_cond_pattern (vec<
*** 2199,2205 ****
*type_out = vectype;
if (dump_enabled_p ())
! dump_printf_loc (MSG_OPTIMIZED_LOCATIONS, vect_location,
"vect_recog_mixed_size_cond_pattern: detected: ");
return pattern_stmt;
--- 2199,2205 ----
*type_out = vectype;
if (dump_enabled_p ())
! dump_printf_loc (MSG_NOTE, vect_location,
"vect_recog_mixed_size_cond_pattern: detected: ");
return pattern_stmt;
*************** vect_recog_bool_pattern (vec<gimple> *st
*** 2592,2598 ****
*type_in = vectype;
stmts->safe_push (last_stmt);
if (dump_enabled_p ())
! dump_printf_loc (MSG_OPTIMIZED_LOCATIONS, vect_location,
"vect_recog_bool_pattern: detected: ");
return pattern_stmt;
--- 2592,2598 ----
*type_in = vectype;
stmts->safe_push (last_stmt);
if (dump_enabled_p ())
! dump_printf_loc (MSG_NOTE, vect_location,
"vect_recog_bool_pattern: detected: ");
return pattern_stmt;
*************** vect_recog_bool_pattern (vec<gimple> *st
*** 2638,2644 ****
*type_in = vectype;
stmts->safe_push (last_stmt);
if (dump_enabled_p ())
! dump_printf_loc (MSG_OPTIMIZED_LOCATIONS, vect_location,
"vect_recog_bool_pattern: detected: ");
return pattern_stmt;
}
--- 2638,2644 ----
*type_in = vectype;
stmts->safe_push (last_stmt);
if (dump_enabled_p ())
! dump_printf_loc (MSG_NOTE, vect_location,
"vect_recog_bool_pattern: detected: ");
return pattern_stmt;
}
*************** vect_pattern_recog_1 (vect_recog_func_pt
*** 2789,2797 ****
/* Found a vectorizable pattern. */
if (dump_enabled_p ())
{
! dump_printf_loc (MSG_OPTIMIZED_LOCATIONS, vect_location,
"pattern recognized: ");
! dump_gimple_stmt (MSG_OPTIMIZED_LOCATIONS, TDF_SLIM, pattern_stmt, 0);
}
/* Mark the stmts that are involved in the pattern. */
--- 2789,2797 ----
/* Found a vectorizable pattern. */
if (dump_enabled_p ())
{
! dump_printf_loc (MSG_NOTE, vect_location,
"pattern recognized: ");
! dump_gimple_stmt (MSG_NOTE, TDF_SLIM, pattern_stmt, 0);
}
/* Mark the stmts that are involved in the pattern. */
*************** vect_pattern_recog_1 (vect_recog_func_pt
*** 2815,2823 ****
pattern_stmt = STMT_VINFO_RELATED_STMT (stmt_info);
if (dump_enabled_p ())
{
! dump_printf_loc (MSG_OPTIMIZED_LOCATIONS, vect_location,
"additional pattern stmt: ");
! dump_gimple_stmt (MSG_OPTIMIZED_LOCATIONS, TDF_SLIM, pattern_stmt,
0);
}
vect_mark_pattern_stmts (stmt, pattern_stmt, NULL_TREE);
--- 2815,2823 ----
pattern_stmt = STMT_VINFO_RELATED_STMT (stmt_info);
if (dump_enabled_p ())
{
! dump_printf_loc (MSG_NOTE, vect_location,
"additional pattern stmt: ");
! dump_gimple_stmt (MSG_NOTE, TDF_SLIM, pattern_stmt, 0);
}
vect_mark_pattern_stmts (stmt, pattern_stmt, NULL_TREE);
