diff options
| author | Richard Biener <rguenther@suse.de> | 2020-05-25 13:06:03 +0200 |
|---|---|---|
| committer | Richard Biener <rguenther@suse.de> | 2020-05-25 16:02:08 +0200 |
| commit | dc0c0196340f7ac58b10d0042d7cea776d6f7864 (patch) | |
| tree | 425e9163bd308810320d7aaa65f4d891524c2fea | |
| parent | 431e762fae0faf10c6a115cd4e36d7c8867c5c17 (diff) | |
| download | gcc-dc0c0196340f7ac58b10d0042d7cea776d6f7864.zip gcc-dc0c0196340f7ac58b10d0042d7cea776d6f7864.tar.gz gcc-dc0c0196340f7ac58b10d0042d7cea776d6f7864.tar.bz2 | |
tree-optimization/95309 - fix invariant SLP node costing
This makes sure to compute SLP_TREE_NUMBER_OF_VEC_STMTS during SLP
analysis even for invariant / external nodes so costing properly
knows what to cost.
2020-05-25 Richard Biener <rguenther@suse.de>
PR tree-optimization/95309
* tree-vect-slp.c (vect_get_constant_vectors): Move number
of vector computation ...
(vect_slp_analyze_node_operations): ... to analysis phase.
| -rw-r--r-- | gcc/ChangeLog | 7 | ||||
| -rw-r--r-- | gcc/tree-vect-slp.c | 41 |
2 files changed, 35 insertions, 13 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index a83cc4b..ac8ab3e 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,10 @@ +2020-05-25 Richard Biener <rguenther@suse.de> + + PR tree-optimization/95309 + * tree-vect-slp.c (vect_get_constant_vectors): Move number + of vector computation ... + (vect_slp_analyze_node_operations): ... to analysis phase. + 2020-05-25 Jan Hubicka <hubicka@ucw.cz> * lto-streamer-out.c (lto_output_tree): Add streamer_debugging check. diff --git a/gcc/tree-vect-slp.c b/gcc/tree-vect-slp.c index ec3675e..c4fd045 100644 --- a/gcc/tree-vect-slp.c +++ b/gcc/tree-vect-slp.c @@ -2856,17 +2856,37 @@ vect_slp_analyze_node_operations (vec_info *vinfo, slp_tree node, other referrers. */ if (res) FOR_EACH_VEC_ELT (SLP_TREE_CHILDREN (node), j, child) - if (SLP_TREE_DEF_TYPE (child) != vect_internal_def) + if ((SLP_TREE_DEF_TYPE (child) == vect_constant_def + || SLP_TREE_DEF_TYPE (child) == vect_external_def) + /* Perform usual caching, note code-generation still + code-gens these nodes multiple times but we expect + to CSE them later. */ + && !visited.contains (child) + && !lvisited.add (child)) { /* ??? After auditing more code paths make a "default" and push the vector type from NODE to all children if it is not already set. */ - /* Perform usual caching, note code-generation still - code-gens these nodes multiple times but we expect - to CSE them later. */ - if (!visited.contains (child) - && !lvisited.add (child)) - vect_prologue_cost_for_slp (vinfo, child, cost_vec); + /* Compute the number of vectors to be generated. */ + tree vector_type = SLP_TREE_VECTYPE (child); + if (!vector_type) + { + /* For shifts with a scalar argument we don't need + to cost or code-generate anything. + ??? Represent this more explicitely. */ + gcc_assert ((STMT_VINFO_TYPE (SLP_TREE_SCALAR_STMTS (node)[0]) + == shift_vec_info_type) + && j == 1); + continue; + } + unsigned group_size = SLP_TREE_SCALAR_OPS (child).length (); + poly_uint64 vf = 1; + if (loop_vec_info loop_vinfo = dyn_cast <loop_vec_info> (vinfo)) + vf = loop_vinfo->vectorization_factor; + SLP_TREE_NUMBER_OF_VEC_STMTS (child) + = vect_get_num_vectors (vf * group_size, vector_type); + /* And cost them. */ + vect_prologue_cost_for_slp (vinfo, child, cost_vec); } /* If this node can't be vectorized, try pruning the tree here rather @@ -3638,12 +3658,7 @@ vect_get_constant_vectors (vec_info *vinfo, (vinfo, TREE_TYPE (op), op_node))); } - poly_uint64 vf = 1; - if (loop_vec_info loop_vinfo = dyn_cast <loop_vec_info> (vinfo)) - vf = loop_vinfo->vectorization_factor; - unsigned int number_of_vectors - = vect_get_num_vectors (vf * group_size, vector_type); - + unsigned int number_of_vectors = SLP_TREE_NUMBER_OF_VEC_STMTS (op_node); vec_oprnds->create (number_of_vectors); auto_vec<tree> voprnds (number_of_vectors); |