Fix scalar costing issue introduced by PR84512 fix.
This fixes double-scaling of the inner loop scalar cost caused by routing the scalar costs through the add_stmt_cost hook and using vect_body as the location. The issue makes almost every outer loop vectorization profitable. 2021-08-23 Richard Biener <rguenther@suse.de> * tree-vect-loop.c (vect_compute_single_scalar_iteration_cost): Properly scale the inner loop cost only once.
This commit is contained in:
parent
537878152d
commit
12dc8ab983
@ -1284,6 +1284,8 @@ vect_compute_single_scalar_iteration_cost (loop_vec_info loop_vinfo)
|
||||
else
|
||||
kind = scalar_stmt;
|
||||
|
||||
/* We are using vect_prologue here to avoid scaling twice
|
||||
by the inner loop factor. */
|
||||
record_stmt_cost (&LOOP_VINFO_SCALAR_ITERATION_COST (loop_vinfo),
|
||||
factor, kind, stmt_info, 0, vect_prologue);
|
||||
}
|
||||
@ -1297,11 +1299,13 @@ vect_compute_single_scalar_iteration_cost (loop_vec_info loop_vinfo)
|
||||
j, si)
|
||||
(void) add_stmt_cost (loop_vinfo, target_cost_data, si->count,
|
||||
si->kind, si->stmt_info, si->vectype,
|
||||
si->misalign, vect_body);
|
||||
unsigned dummy, body_cost = 0;
|
||||
finish_cost (target_cost_data, &dummy, &body_cost, &dummy);
|
||||
si->misalign, si->where);
|
||||
unsigned prologue_cost = 0, body_cost = 0, epilogue_cost = 0;
|
||||
finish_cost (target_cost_data, &prologue_cost, &body_cost,
|
||||
&epilogue_cost);
|
||||
destroy_cost_data (target_cost_data);
|
||||
LOOP_VINFO_SINGLE_SCALAR_ITERATION_COST (loop_vinfo) = body_cost;
|
||||
LOOP_VINFO_SINGLE_SCALAR_ITERATION_COST (loop_vinfo)
|
||||
= prologue_cost + body_cost + epilogue_cost;
|
||||
}
|
||||
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user