Fix vectorizable_operation destination vector type

Message ID alpine.LSU.2.20.1806131701380.5043@zhemvz.fhfr.qr
State New
Headers show
Series
  • Fix vectorizable_operation destination vector type
Related show

Commit Message

Richard Biener June 13, 2018, 3:02 p.m.
This is needed for the ABSU_EXPR changes.  It fixes a latent issue
in vect_recog_vector_vector_shift_pattern as well.

Bootstrapped and tested on x86_64-unknown-linux-gnu, applied.

Richard.

2018-06-13  Richard Biener  <rguenther@suse.de>

	* tree-vect-patterns.c (vect_recog_vector_vector_shift_pattern):
	Properly set vector type of the intermediate stmt.
	* tree-vect-stmts.c (vectorizable_operation): The destination
	var always has vectype_out type.

Patch

diff --git a/gcc/tree-vect-patterns.c b/gcc/tree-vect-patterns.c
index 507c5b94f07..6786ffcd4c6 100644
--- a/gcc/tree-vect-patterns.c
+++ b/gcc/tree-vect-patterns.c
@@ -2185,6 +2185,11 @@  vect_recog_vector_vector_shift_pattern (vec<gimple *> *stmts,
 				       TYPE_PRECISION (TREE_TYPE (oprnd1)));
 	      def = vect_recog_temp_ssa_var (TREE_TYPE (rhs1), NULL);
 	      def_stmt = gimple_build_assign (def, BIT_AND_EXPR, rhs1, mask);
+	      stmt_vec_info new_stmt_info
+		= new_stmt_vec_info (def_stmt, vinfo);
+	      set_vinfo_for_stmt (def_stmt, new_stmt_info);
+	      STMT_VINFO_VECTYPE (new_stmt_info)
+		= get_vectype_for_scalar_type (TREE_TYPE (rhs1));
 	      new_pattern_def_seq (stmt_vinfo, def_stmt);
 	    }
 	}
diff --git a/gcc/tree-vect-stmts.c b/gcc/tree-vect-stmts.c
index da4cb0737ed..9f365e31e49 100644
--- a/gcc/tree-vect-stmts.c
+++ b/gcc/tree-vect-stmts.c
@@ -5981,16 +5981,19 @@  vectorizable_operation (gimple *stmt, gimple_stmt_iterator *gsi,
     dump_printf_loc (MSG_NOTE, vect_location,
                      "transform binary/unary operation.\n");
 
-  /* Handle def.  */
-  vec_dest = vect_create_destination_var (scalar_dest, vectype);
-
   /* POINTER_DIFF_EXPR has pointer arguments which are vectorized as
      vectors with unsigned elements, but the result is signed.  So, we
      need to compute the MINUS_EXPR into vectype temporary and
      VIEW_CONVERT_EXPR it into the final vectype_out result.  */
   tree vec_cvt_dest = NULL_TREE;
   if (orig_code == POINTER_DIFF_EXPR)
-    vec_cvt_dest = vect_create_destination_var (scalar_dest, vectype_out);
+    {
+      vec_dest = vect_create_destination_var (scalar_dest, vectype);
+      vec_cvt_dest = vect_create_destination_var (scalar_dest, vectype_out);
+    }
+  /* Handle def.  */
+  else
+    vec_dest = vect_create_destination_var (scalar_dest, vectype_out);
 
   /* In case the vectorization factor (VF) is bigger than the number
      of elements that we can fit in a vectype (nunits), we have to generate