diff options
author | Richard Biener <rguenther@suse.de> | 2022-03-25 14:31:25 +0100 |
---|---|---|
committer | Richard Biener <rguenther@suse.de> | 2022-03-25 15:26:29 +0100 |
commit | fe705dce2e1e3e4e5e0c69d7f9adaf7f2777cdc8 (patch) | |
tree | ab50e8c9b7f804a24763220dd91f3e68dfc899de /gcc | |
parent | d0b938a7612fb7acf1f181da9577235c83ede59e (diff) |
tree-optimization/105053 - fix reduction chain epilogue generation
When we optimize permutations in a reduction chain we have to
be careful to select the correct live-out stmt, otherwise the
reduction result will be unused and the retained scalar code will
execute only the number of vector iterations.
2022-03-25 Richard Biener <rguenther@suse.de>
PR tree-optimization/105053
* tree-vect-loop.cc (vect_create_epilog_for_reduction): Pick
the correct live-out stmt for a reduction chain.
* g++.dg/vect/pr105053.cc: New testcase.
Diffstat (limited to 'gcc')
-rw-r--r-- | gcc/testsuite/g++.dg/vect/pr105053.cc | 25 | ||||
-rw-r--r-- | gcc/tree-vect-loop.cc | 14 |
2 files changed, 36 insertions, 3 deletions
diff --git a/gcc/testsuite/g++.dg/vect/pr105053.cc b/gcc/testsuite/g++.dg/vect/pr105053.cc new file mode 100644 index 00000000000..6deef8458fc --- /dev/null +++ b/gcc/testsuite/g++.dg/vect/pr105053.cc @@ -0,0 +1,25 @@ +// { dg-require-effective-target c++11 } +// { dg-require-effective-target int32plus } + +#include <vector> +#include <tuple> +#include <algorithm> + +int main() +{ + const int n = 4; + std::vector<std::tuple<int,int,double>> vec + = { { 1597201307, 1817606674, 0. }, + { 1380347796, 1721941769, 0.}, + {837975613, 1032707773, 0.}, + {1173654292, 2020064272, 0.} } ; + int sup1 = 0; + for(int i=0;i<n;++i) + sup1=std::max(sup1,std::max(std::get<0>(vec[i]),std::get<1>(vec[i]))); + int sup2 = 0; + for(int i=0;i<n;++i) + sup2=std::max(std::max(sup2,std::get<0>(vec[i])),std::get<1>(vec[i])); + if (sup1 != sup2) + std::abort (); + return 0; +} diff --git a/gcc/tree-vect-loop.cc b/gcc/tree-vect-loop.cc index 7a74633e0b4..d7bc34636bd 100644 --- a/gcc/tree-vect-loop.cc +++ b/gcc/tree-vect-loop.cc @@ -5271,9 +5271,17 @@ vect_create_epilog_for_reduction (loop_vec_info loop_vinfo, /* All statements produce live-out values. */ live_out_stmts = SLP_TREE_SCALAR_STMTS (slp_node); else if (slp_node) - /* The last statement in the reduction chain produces the live-out - value. */ - single_live_out_stmt[0] = SLP_TREE_SCALAR_STMTS (slp_node)[group_size - 1]; + { + /* The last statement in the reduction chain produces the live-out + value. Note SLP optimization can shuffle scalar stmts to + optimize permutations so we have to search for the last stmt. */ + for (k = 0; k < group_size; ++k) + if (!REDUC_GROUP_NEXT_ELEMENT (SLP_TREE_SCALAR_STMTS (slp_node)[k])) + { + single_live_out_stmt[0] = SLP_TREE_SCALAR_STMTS (slp_node)[k]; + break; + } + } unsigned vec_num; int ncopies; |