git
/
gcc
mirror of git://gcc.gnu.org/git/gcc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

re PR tree-optimization/81303 (410.bwaves regression caused by r249919) 

2017-07-21  Richard Biener  <rguenther@suse.de>

	PR tree-optimization/81303
	* tree-vect-data-refs.c (vect_get_peeling_costs_all_drs): Pass
	in datarefs vector.  Allow NULL dr0 for no peeling cost estimate.
	(vect_peeling_hash_get_lowest_cost): Adjust.
	(vect_enhance_data_refs_alignment): Likewise.  Use
	vect_get_peeling_costs_all_drs to compute the penalty for no
	peeling to match up costs.

From-SVN: r250424
This commit is contained in:
Richard Biener 2017-07-21 11:32:39 +00:00 committed by Richard Biener
parent 9af7f3731b
commit d629ab4496
2 changed files with 25 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
gcc/ChangeLog
View File

@ -1,4 +1,14 @@
2017-06-21 Richard Biener <rguenther@suse.de> 2017-07-21 Richard Biener <rguenther@suse.de>
PR tree-optimization/81303
* tree-vect-data-refs.c (vect_get_peeling_costs_all_drs): Pass
in datarefs vector. Allow NULL dr0 for no peeling cost estimate.
(vect_peeling_hash_get_lowest_cost): Adjust.
(vect_enhance_data_refs_alignment): Likewise. Use
vect_get_peeling_costs_all_drs to compute the penalty for no
peeling to match up costs.
2017-07-21 Richard Biener <rguenther@suse.de>
PR tree-optimization/81500 PR tree-optimization/81500
* tree-vect-loop.c (vect_is_simple_reduction): Properly fail if * tree-vect-loop.c (vect_is_simple_reduction): Properly fail if

32
gcc/tree-vect-data-refs.c
View File

@ -1159,25 +1159,21 @@ vect_peeling_hash_get_most_frequent (_vect_peel_info **slot,
misalignment will be zero after peeling. */ misalignment will be zero after peeling. */
static void static void
vect_get_peeling_costs_all_drs (struct data_reference *dr0, vect_get_peeling_costs_all_drs (vec<data_reference_p> datarefs,
struct data_reference *dr0,
unsigned int *inside_cost, unsigned int *inside_cost,
unsigned int *outside_cost, unsigned int *outside_cost,
stmt_vector_for_cost *body_cost_vec, stmt_vector_for_cost *body_cost_vec,
unsigned int npeel, unsigned int npeel,
bool unknown_misalignment) bool unknown_misalignment)
{ {
gimple *stmt = DR_STMT (dr0);
stmt_vec_info stmt_info = vinfo_for_stmt (stmt);
loop_vec_info loop_vinfo = STMT_VINFO_LOOP_VINFO (stmt_info);
vec<data_reference_p> datarefs = LOOP_VINFO_DATAREFS (loop_vinfo);
unsigned i; unsigned i;
data_reference *dr; data_reference *dr;
FOR_EACH_VEC_ELT (datarefs, i, dr) FOR_EACH_VEC_ELT (datarefs, i, dr)
{ {
stmt = DR_STMT (dr); gimple *stmt = DR_STMT (dr);
stmt_info = vinfo_for_stmt (stmt); stmt_vec_info stmt_info = vinfo_for_stmt (stmt);
/* For interleaving, only the alignment of the first access /* For interleaving, only the alignment of the first access
matters. */ matters. */
if (STMT_VINFO_GROUPED_ACCESS (stmt_info) if (STMT_VINFO_GROUPED_ACCESS (stmt_info)
@ -1192,7 +1188,9 @@ vect_get_peeling_costs_all_drs (struct data_reference *dr0,
int save_misalignment; int save_misalignment;
save_misalignment = DR_MISALIGNMENT (dr); save_misalignment = DR_MISALIGNMENT (dr);
if (unknown_misalignment && dr == dr0) if (npeel == 0)
;
else if (unknown_misalignment && dr == dr0)
SET_DR_MISALIGNMENT (dr, 0); SET_DR_MISALIGNMENT (dr, 0);
else else
vect_update_misalignment_for_peel (dr, dr0, npeel); vect_update_misalignment_for_peel (dr, dr0, npeel);
@ -1222,7 +1220,8 @@ vect_peeling_hash_get_lowest_cost (_vect_peel_info **slot,
body_cost_vec.create (2); body_cost_vec.create (2);
epilogue_cost_vec.create (2); epilogue_cost_vec.create (2);
vect_get_peeling_costs_all_drs (elem->dr, &inside_cost, &outside_cost, vect_get_peeling_costs_all_drs (LOOP_VINFO_DATAREFS (loop_vinfo),
elem->dr, &inside_cost, &outside_cost,
&body_cost_vec, elem->npeel, false); &body_cost_vec, elem->npeel, false);
body_cost_vec.release (); body_cost_vec.release ();
@ -1651,7 +1650,7 @@ vect_enhance_data_refs_alignment (loop_vec_info loop_vinfo)
stmt_vector_for_cost dummy; stmt_vector_for_cost dummy;
dummy.create (2); dummy.create (2);
vect_get_peeling_costs_all_drs (dr0, vect_get_peeling_costs_all_drs (datarefs, dr0,
&load_inside_cost, &load_inside_cost,
&load_outside_cost, &load_outside_cost,
&dummy, vf / 2, true); &dummy, vf / 2, true);
@ -1660,7 +1659,7 @@ vect_enhance_data_refs_alignment (loop_vec_info loop_vinfo)
if (first_store) if (first_store)
{ {
dummy.create (2); dummy.create (2);
vect_get_peeling_costs_all_drs (first_store, vect_get_peeling_costs_all_drs (datarefs, first_store,
&store_inside_cost, &store_inside_cost,
&store_outside_cost, &store_outside_cost,
&dummy, vf / 2, true); &dummy, vf / 2, true);
@ -1744,18 +1743,15 @@ vect_enhance_data_refs_alignment (loop_vec_info loop_vinfo)
dr0 = unsupportable_dr; dr0 = unsupportable_dr;
else if (do_peeling) else if (do_peeling)
{ {
/* Calculate the penalty for no peeling, i.e. leaving everything /* Calculate the penalty for no peeling, i.e. leaving everything as-is.
unaligned.
TODO: Adapt vect_get_peeling_costs_all_drs and use here.
TODO: Use nopeel_outside_cost or get rid of it? */ TODO: Use nopeel_outside_cost or get rid of it? */
unsigned nopeel_inside_cost = 0; unsigned nopeel_inside_cost = 0;
unsigned nopeel_outside_cost = 0; unsigned nopeel_outside_cost = 0;
stmt_vector_for_cost dummy; stmt_vector_for_cost dummy;
dummy.create (2); dummy.create (2);
FOR_EACH_VEC_ELT (datarefs, i, dr) vect_get_peeling_costs_all_drs (datarefs, NULL, &nopeel_inside_cost,
vect_get_data_access_cost (dr, &nopeel_inside_cost, &nopeel_outside_cost, &dummy, 0, false);
&nopeel_outside_cost, &dummy);
dummy.release (); dummy.release ();
/* Add epilogue costs. As we do not peel for alignment here, no prologue /* Add epilogue costs. As we do not peel for alignment here, no prologue