From: Richard Biener <rguenther@suse.de>
Date: Wed, 23 Oct 2019 10:29:36 +0000 (+0000)
Subject: re PR tree-optimization/92179 (r277288 causes ICEs compiling several test cases)
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=6bd7e7069504668eb37b2b9c976f4f0942666ef2;p=gcc.git

re PR tree-optimization/92179 (r277288 causes ICEs compiling several test cases)

2019-10-23  Richard Biener  <rguenther@suse.de>

	PR tree-optimization/92179
	* tree-vect-stmts.c (vectorizable_shift): For shift args
	that are all the same remove type restriction in the SLP case.
	Adjust SLP code to handle converting of the shift arg to
	only apply in case the modes are different.

From-SVN: r277310
---

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 85cd7a023c2..cfc1bdceab9 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,11 @@
+2019-10-23  Richard Biener  <rguenther@suse.de>
+
+	PR tree-optimization/92179
+	* tree-vect-stmts.c (vectorizable_shift): For shift args
+	that are all the same remove type restriction in the SLP case.
+	Adjust SLP code to handle converting of the shift arg to
+	only apply in case the modes are different.
+
 2019-10-23  Martin Liska  <mliska@suse.cz>
 
 	PR ipa/91969
diff --git a/gcc/tree-vect-stmts.c b/gcc/tree-vect-stmts.c
index a44c3deb082..02b95f51abb 100644
--- a/gcc/tree-vect-stmts.c
+++ b/gcc/tree-vect-stmts.c
@@ -5661,6 +5661,7 @@ vectorizable_shift (stmt_vec_info stmt_info, gimple_stmt_iterator *gsi,
     }
 
   /* Vector shifted by vector.  */
+  bool was_scalar_shift_arg = scalar_shift_arg;
   if (!scalar_shift_arg)
     {
       optab = optab_for_tree_code (code, vectype, optab_vector);
@@ -5720,16 +5721,6 @@ vectorizable_shift (stmt_vec_info stmt_info, gimple_stmt_iterator *gsi,
 	      else if (!useless_type_conversion_p (TREE_TYPE (vectype),
 						   TREE_TYPE (op1)))
 		{
-		  if (slp_node
-		      && TYPE_MODE (TREE_TYPE (vectype))
-			 != TYPE_MODE (TREE_TYPE (op1)))
-		    {
-                      if (dump_enabled_p ())
-                        dump_printf_loc (MSG_MISSED_OPTIMIZATION, vect_location,
-                                         "unusable type for last operand in"
-                                         " vector/vector shift/rotate.\n");
-		      return false;
-		    }
 		  if (vec_stmt && !slp_node)
 		    {
 		      op1 = fold_convert (TREE_TYPE (vectype), op1);
@@ -5831,18 +5822,36 @@ vectorizable_shift (stmt_vec_info stmt_info, gimple_stmt_iterator *gsi,
 		   && !useless_type_conversion_p (TREE_TYPE (vectype),
 						  TREE_TYPE (op1)))
 	    {
-	      /* Convert the scalar constant shift amounts in-place.  */
-	      slp_tree shift = SLP_TREE_CHILDREN (slp_node)[1];
-	      gcc_assert (SLP_TREE_DEF_TYPE (shift) == vect_constant_def);
-	      for (unsigned i = 0;
-		   i < SLP_TREE_SCALAR_OPS (shift).length (); ++i)
+	      if (was_scalar_shift_arg)
 		{
-		  SLP_TREE_SCALAR_OPS (shift)[i]
-		    = fold_convert (TREE_TYPE (vectype),
-				    SLP_TREE_SCALAR_OPS (shift)[i]);
-		  gcc_assert ((TREE_CODE (SLP_TREE_SCALAR_OPS (shift)[i])
-			       == INTEGER_CST));
+		  /* If the argument was the same in all lanes create
+		     the correctly typed vector shift amount directly.  */
+		  op1 = fold_convert (TREE_TYPE (vectype), op1);
+		  op1 = vect_init_vector (stmt_info, op1, TREE_TYPE (vectype),
+					  !loop_vinfo ? gsi : NULL);
+		  vec_oprnd1 = vect_init_vector (stmt_info, op1, vectype,
+						 !loop_vinfo ? gsi : NULL);
+                  vec_oprnds1.create (slp_node->vec_stmts_size);
+		  for (k = 0; k < slp_node->vec_stmts_size; k++)
+		    vec_oprnds1.quick_push (vec_oprnd1);
 		}
+	      else if (dt[1] == vect_constant_def)
+		{
+		  /* Convert the scalar constant shift amounts in-place.  */
+		  slp_tree shift = SLP_TREE_CHILDREN (slp_node)[1];
+		  gcc_assert (SLP_TREE_DEF_TYPE (shift) == vect_constant_def);
+		  for (unsigned i = 0;
+		       i < SLP_TREE_SCALAR_OPS (shift).length (); ++i)
+		    {
+		      SLP_TREE_SCALAR_OPS (shift)[i]
+			  = fold_convert (TREE_TYPE (vectype),
+					  SLP_TREE_SCALAR_OPS (shift)[i]);
+		      gcc_assert ((TREE_CODE (SLP_TREE_SCALAR_OPS (shift)[i])
+				   == INTEGER_CST));
+		    }
+		}
+	      else
+		gcc_assert (TYPE_MODE (op1_vectype) == TYPE_MODE (vectype));
 	    }
 
           /* vec_oprnd1 is available if operand 1 should be of a scalar-type