[PATCH 2/3] Remove non-SLP path from vectorizable_operation

[Richard Biener]

Step 2, fold trivial conditions
---
 gcc/tree-vect-stmts.cc | 30 +++++++-----------------------
 1 file changed, 7 insertions(+), 23 deletions(-)

diff --git a/gcc/tree-vect-stmts.cc b/gcc/tree-vect-stmts.cc
index 7a6a10ee0e6..bfbece56464 100644
--- a/gcc/tree-vect-stmts.cc
+++ b/gcc/tree-vect-stmts.cc
@@ -6985,16 +6985,8 @@ vectorizable_operation (vec_info *vinfo,
   /* Multiple types in SLP are handled by creating the appropriate number of
      vectorized stmts for each SLP node.  Hence, NCOPIES is always 1 in
      case of SLP.  */
-  if (1)
-    {
-      ncopies = 1;
-      vec_num = SLP_TREE_NUMBER_OF_VEC_STMTS (slp_node);
-    }
-  else
-    {
-      ncopies = vect_get_num_copies (loop_vinfo, vectype);
-      vec_num = 1;
-    }
+  ncopies = 1;
+  vec_num = SLP_TREE_NUMBER_OF_VEC_STMTS (slp_node);
 
   gcc_assert (ncopies >= 1);
 
@@ -7098,10 +7090,9 @@ vectorizable_operation (vec_info *vinfo,
        }
 
       /* Put types on constant and invariant SLP children.  */
-      if (1
-         && (!vect_maybe_update_slp_op_vectype (slp_op0, vectype)
-             || !vect_maybe_update_slp_op_vectype (slp_op1, vectype)
-             || !vect_maybe_update_slp_op_vectype (slp_op2, vectype)))
+      if (!vect_maybe_update_slp_op_vectype (slp_op0, vectype)
+         || !vect_maybe_update_slp_op_vectype (slp_op1, vectype)
+         || !vect_maybe_update_slp_op_vectype (slp_op2, vectype))
        {
          if (dump_enabled_p ())
            dump_printf_loc (MSG_MISSED_OPTIMIZATION, vect_location,
@@ -7119,8 +7110,7 @@ vectorizable_operation (vec_info *vinfo,
             in the prologue and (mis-)costs one of the stmts as
             vector stmt.  See below for the actual lowering that will
             be applied.  */
-         unsigned n
-           = 1 ? SLP_TREE_NUMBER_OF_VEC_STMTS (slp_node) : ncopies;
+         unsigned n = SLP_TREE_NUMBER_OF_VEC_STMTS (slp_node);
          switch (code)
            {
            case PLUS_EXPR:
@@ -7428,15 +7418,9 @@ vectorizable_operation (vec_info *vinfo,
                                       new_stmt, gsi);
        }
 
-      if (1)
-       slp_node->push_vec_def (new_stmt);
-      else
-       STMT_VINFO_VEC_STMTS (stmt_info).safe_push (new_stmt);
+      slp_node->push_vec_def (new_stmt);
     }
 
-  if (0)
-    *vec_stmt = STMT_VINFO_VEC_STMTS (stmt_info)[0];
-
   vec_oprnds0.release ();
   vec_oprnds1.release ();
   vec_oprnds2.release ();
-- 
2.43.0