[PATCH 1/8] Remove non-SLP path from vectorizable_recurr

[Richard Biener]

---
 gcc/tree-vect-loop.cc | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/gcc/tree-vect-loop.cc b/gcc/tree-vect-loop.cc
index 06fadeb570c..26d1486779b 100644
--- a/gcc/tree-vect-loop.cc
+++ b/gcc/tree-vect-loop.cc
@@ -8947,12 +8947,12 @@ vectorizable_recurr (loop_vec_info loop_vinfo, 
stmt_vec_info stmt_info,
 
   tree vectype = STMT_VINFO_VECTYPE (stmt_info);
   unsigned ncopies;
-  if (slp_node)
+  if (1)
     ncopies = SLP_TREE_NUMBER_OF_VEC_STMTS (slp_node);
   else
     ncopies = vect_get_num_copies (loop_vinfo, vectype);
   poly_int64 nunits = TYPE_VECTOR_SUBPARTS (vectype);
-  unsigned dist = slp_node ? SLP_TREE_LANES (slp_node) : 1;
+  unsigned dist = 1 ? SLP_TREE_LANES (slp_node) : 1;
   /* We need to be able to make progress with a single vector.  */
   if (maybe_gt (dist * 2, nunits))
     {
@@ -8976,7 +8976,7 @@ vectorizable_recurr (loop_vec_info loop_vinfo, 
stmt_vec_info stmt_info,
                                 indices))
        return false;
 
-      if (slp_node)
+      if (1)
        {
          /* We eventually need to set a vector type on invariant
             arguments.  */
@@ -8997,7 +8997,7 @@ vectorizable_recurr (loop_vec_info loop_vinfo, 
stmt_vec_info stmt_info,
       /* Verify we have set up compatible types.  */
       edge le = loop_latch_edge (LOOP_VINFO_LOOP (loop_vinfo));
       tree latch_vectype = NULL_TREE;
-      if (slp_node)
+      if (1)
        {
          slp_tree latch_def = SLP_TREE_CHILDREN (slp_node)[le->dest_idx];
          latch_vectype = SLP_TREE_VECTYPE (latch_def);
@@ -9019,7 +9019,7 @@ vectorizable_recurr (loop_vec_info loop_vinfo, 
stmt_vec_info stmt_info,
         for each copy.  With SLP the prologue value is explicitly
         represented and costed separately.  */
       unsigned prologue_cost = 0;
-      if (!slp_node)
+      if (!1)
        prologue_cost = record_stmt_cost (cost_vec, 1, scalar_to_vec,
                                          stmt_info, 0, vect_prologue);
       unsigned inside_cost = record_stmt_cost (cost_vec, ncopies, vector_stmt,
@@ -9073,13 +9073,13 @@ vectorizable_recurr (loop_vec_info loop_vinfo, 
stmt_vec_info stmt_info,
                                 NULL, perm);
       vect_finish_stmt_generation (loop_vinfo, stmt_info, vperm, &gsi2);
 
-      if (slp_node)
+      if (1)
        slp_node->push_vec_def (vperm);
       else
        STMT_VINFO_VEC_STMTS (stmt_info).safe_push (vperm);
     }
 
-  if (!slp_node)
+  if (!1)
     *vec_stmt = STMT_VINFO_VEC_STMTS (stmt_info)[0];
   return true;
 }
-- 
2.43.0