Commit f3a27a61 by Richard Biener

tree-optimization/95717 - fix SSA update for vectorizer epilogue

This fixes yet another issue with the custom SSA updating in the
vectorizer when we copy from the non-if-converted loop.  We must
not mess with current defs before we updated the BB copies.

2020-06-17  Richard Biener  <rguenther@suse.de>

	PR tree-optimization/95717
	* tree-vect-loop-manip.c (slpeel_tree_duplicate_loop_to_edge_cfg):
	Move BB SSA updating before exit/latch PHI current def copying.

	* g++.dg/torture/pr95717.C: New testcase.

(cherry picked from commit d0909f5858ad81e6d8b73fa6193be19cb5e6ed7b)
parent 01c36eef
// { dg-do compile }
bool a;
extern bool b[];
long c, d;
int *f;
void g(bool h)
{
for (short e = 0; e < c; e = 4)
for (; d; d++)
b[d] = a = f[d] ? c ? h : 0 : h;
}
......@@ -1052,6 +1052,10 @@ slpeel_tree_duplicate_loop_to_edge_cfg (class loop *loop,
add_phi_args_after_copy (new_bbs, scalar_loop->num_nodes + 1, NULL);
/* Skip new preheader since it's deleted if copy loop is added at entry. */
for (unsigned i = (at_exit ? 0 : 1); i < scalar_loop->num_nodes + 1; i++)
rename_variables_in_bb (new_bbs[i], duplicate_outer_loop);
if (scalar_loop != loop)
{
/* If we copied from SCALAR_LOOP rather than LOOP, SSA_NAMEs from
......@@ -1129,10 +1133,6 @@ slpeel_tree_duplicate_loop_to_edge_cfg (class loop *loop,
loop_preheader_edge (new_loop)->src);
}
/* Skip new preheader since it's deleted if copy loop is added at entry. */
for (unsigned i = (at_exit ? 0 : 1); i < scalar_loop->num_nodes + 1; i++)
rename_variables_in_bb (new_bbs[i], duplicate_outer_loop);
if (scalar_loop != loop)
{
/* Update new_loop->header PHIs, so that on the preheader
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment