diff options
| author | Richard Biener <rguenther@suse.de> | 2020-11-04 09:41:48 +0100 |
|---|---|---|
| committer | Richard Biener <rguenther@suse.de> | 2020-11-04 10:59:55 +0100 |
| commit | 092cdbd9198497593fb034971d0f80fc931ab145 (patch) | |
| tree | 8c139f7e5f8a991b418696bdd96a0c097b0fbd6c /gcc/tree-vect-loop.c | |
| parent | 14ddf41acb96f28815b9fffe9a408be255e1ca2c (diff) | |
| download | gcc-092cdbd9198497593fb034971d0f80fc931ab145.zip gcc-092cdbd9198497593fb034971d0f80fc931ab145.tar.gz gcc-092cdbd9198497593fb034971d0f80fc931ab145.tar.bz2 | |
Re-instantiate SLP induction IV CSE
This re-instantiates the previously removed CSE, fixing the
FAIL of gcc.dg/vect/costmodel/x86_64/costmodel-pr30843.c
It turns out the previous approach still works.
2020-11-04 Richard Biener <rguenther@suse.de>
* tree-vect-loop.c (vectorizable_induction): Re-instantiate
previously removed CSE of SLP IVs.
Diffstat (limited to 'gcc/tree-vect-loop.c')
| -rw-r--r-- | gcc/tree-vect-loop.c | 21 |
1 files changed, 19 insertions, 2 deletions
diff --git a/gcc/tree-vect-loop.c b/gcc/tree-vect-loop.c index 41e2e2a..c09aa39 100644 --- a/gcc/tree-vect-loop.c +++ b/gcc/tree-vect-loop.c @@ -7874,8 +7874,16 @@ vectorizable_induction (loop_vec_info loop_vinfo, if (nested_in_vect_loop) nivs = nvects; else - nivs = least_common_multiple (group_size, - const_nunits) / const_nunits; + { + /* Compute the number of distinct IVs we need. First reduce + group_size if it is a multiple of const_nunits so we get + one IV for a group_size of 4 but const_nunits 2. */ + unsigned group_sizep = group_size; + if (group_sizep % const_nunits == 0) + group_sizep = group_sizep / const_nunits; + nivs = least_common_multiple (group_sizep, + const_nunits) / const_nunits; + } tree stept = TREE_TYPE (step_vectype); tree lupdate_mul = NULL_TREE; if (!nested_in_vect_loop) @@ -7975,6 +7983,15 @@ vectorizable_induction (loop_vec_info loop_vinfo, SLP_TREE_VEC_STMTS (slp_node).quick_push (induction_phi); } + if (!nested_in_vect_loop) + { + /* Fill up to the number of vectors we need for the whole group. */ + nivs = least_common_multiple (group_size, + const_nunits) / const_nunits; + for (; ivn < nivs; ++ivn) + SLP_TREE_VEC_STMTS (slp_node) + .quick_push (SLP_TREE_VEC_STMTS (slp_node)[0]); + } /* Re-use IVs when we can. We are generating further vector stmts by adding VF' * stride to the IVs generated above. */ |