gcc/

2015-11-10  Ilya Enkovich  <enkovich.gnu@gmail.com>

	* optabs-query.h (get_vcond_mask_icode): New.
	* optabs-tree.c (expand_vec_cond_expr_p): Use
	get_vcond_mask_icode for VEC_COND_EXPR with mask.
	* optabs.c (expand_vec_cond_mask_expr): New.
	(expand_vec_cond_expr): Use get_vcond_mask_icode
	when possible.
	* optabs.def (vcond_mask_optab): New.
	* tree-vect-patterns.c (vect_recog_bool_pattern): Don't
	generate redundant comparison for COND_EXPR.
	* tree-vect-stmts.c (vect_is_simple_cond): Allow SSA_NAME
	as a condition.
	(vectorizable_condition): Likewise.
	* tree-vect-slp.c (vect_get_and_check_slp_defs): Allow
	cond_exp with no embedded comparison.
	(vect_build_slp_tree_1): Likewise.


git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@230101 138bc75d-0d04-0410-961f-82ee72b054a4

1 files changed, 11 insertions, 19 deletions

diff --git a/gcc/tree-vect-patterns.c b/gcc/tree-vect-patterns.c
index e91c6e008a0..917eeb799b6 100644
--- a/gcc/tree-vect-patterns.c
+++ b/gcc/tree-vect-patterns.c
@@ -3302,7 +3302,7 @@ vect_recog_bool_pattern (vec<gimple *> *stmts, tree *type_in,
       else
 	{
 	  tree type = search_type_for_mask (var, vinfo);
-	  tree cst0, cst1, cmp, tmp;
+	  tree cst0, cst1, tmp;
 
 	  if (!type)
 	    return NULL;
@@ -3318,9 +3318,7 @@ vect_recog_bool_pattern (vec<gimple *> *stmts, tree *type_in,
 	  cst0 = build_int_cst (type, 0);
 	  cst1 = build_int_cst (type, 1);
 	  tmp = vect_recog_temp_ssa_var (type, NULL);
-	  cmp = build2 (NE_EXPR, boolean_type_node,
-			var, build_int_cst (TREE_TYPE (var), 0));
-	  pattern_stmt = gimple_build_assign (tmp, COND_EXPR, cmp, cst1, cst0);
+	  pattern_stmt = gimple_build_assign (tmp, COND_EXPR, var, cst1, cst0);
 
 	  if (!useless_type_conversion_p (type, TREE_TYPE (lhs)))
 	    {
@@ -3363,19 +3361,16 @@ vect_recog_bool_pattern (vec<gimple *> *stmts, tree *type_in,
       if (get_vectype_for_scalar_type (type) == NULL_TREE)
 	return NULL;
 
-      if (check_bool_pattern (var, vinfo))
-	{
-	  rhs = adjust_bool_pattern (var, type, NULL_TREE, stmts);
-	  rhs = build2 (NE_EXPR, boolean_type_node,
-			rhs, build_int_cst (type, 0));
-	}
-      else
-	rhs = build2 (NE_EXPR, boolean_type_node,
-		      var, build_int_cst (TREE_TYPE (var), 0)),
+      if (!check_bool_pattern (var, vinfo))
+	return NULL;
+
+      rhs = adjust_bool_pattern (var, type, NULL_TREE, stmts);
 
       lhs = vect_recog_temp_ssa_var (TREE_TYPE (lhs), NULL);
       pattern_stmt 
-	  = gimple_build_assign (lhs, COND_EXPR, rhs,
+	  = gimple_build_assign (lhs, COND_EXPR,
+				 build2 (NE_EXPR, boolean_type_node,
+					 rhs, build_int_cst (type, 0)),
 				 gimple_assign_rhs2 (last_stmt),
 				 gimple_assign_rhs3 (last_stmt));
       *type_out = vectype;
@@ -3402,7 +3397,7 @@ vect_recog_bool_pattern (vec<gimple *> *stmts, tree *type_in,
       else
 	{
 	  tree type = search_type_for_mask (var, vinfo);
-	  tree cst0, cst1, cmp, new_vectype;
+	  tree cst0, cst1, new_vectype;
 
 	  if (!type)
 	    return NULL;
@@ -3415,10 +3410,7 @@ vect_recog_bool_pattern (vec<gimple *> *stmts, tree *type_in,
 	  new_vectype = get_vectype_for_scalar_type (type);
 
 	  rhs = vect_recog_temp_ssa_var (type, NULL);
-	  cmp = build2 (NE_EXPR, boolean_type_node,
-			var, build_int_cst (TREE_TYPE (var), 0));
-	  pattern_stmt = gimple_build_assign (rhs, COND_EXPR,
-					      cmp, cst1, cst0);
+	  pattern_stmt = gimple_build_assign (rhs, COND_EXPR, var, cst1, cst0);
 
 	  pattern_stmt_info = new_stmt_vec_info (pattern_stmt, vinfo);
 	  set_vinfo_for_stmt (pattern_stmt, pattern_stmt_info);