/* Lower vector operations to scalar operations.
- Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010
+ Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012
Free Software Foundation, Inc.
This file is part of GCC.
do_binop (gimple_stmt_iterator *gsi, tree inner_type, tree a, tree b,
tree bitpos, tree bitsize, enum tree_code code)
{
- a = tree_vec_extract (gsi, inner_type, a, bitsize, bitpos);
- b = tree_vec_extract (gsi, inner_type, b, bitsize, bitpos);
+ if (TREE_CODE (TREE_TYPE (a)) == VECTOR_TYPE)
+ a = tree_vec_extract (gsi, inner_type, a, bitsize, bitpos);
+ if (TREE_CODE (TREE_TYPE (b)) == VECTOR_TYPE)
+ b = tree_vec_extract (gsi, inner_type, b, bitsize, bitpos);
return gimplify_build2 (gsi, code, inner_type, a, b);
}
gimple_assign_rhs2 (assign), code);
}
\f
-/* Return a type for the widest vector mode whose components are of mode
- INNER_MODE, or NULL_TREE if none is found.
- SATP is true for saturating fixed-point types. */
+/* Return a type for the widest vector mode whose components are of type
+ TYPE, or NULL_TREE if none is found. */
static tree
-type_for_widest_vector_mode (enum machine_mode inner_mode, optab op, int satp)
+type_for_widest_vector_mode (tree type, optab op)
{
+ enum machine_mode inner_mode = TYPE_MODE (type);
enum machine_mode best_mode = VOIDmode, mode;
int best_nunits = 0;
if (best_mode == VOIDmode)
return NULL_TREE;
else
- {
- /* For fixed-point modes, we need to pass satp as the 2nd parameter. */
- if (ALL_FIXED_POINT_MODE_P (best_mode))
- return lang_hooks.types.type_for_mode (best_mode, satp);
-
- return lang_hooks.types.type_for_mode (best_mode, 1);
- }
+ return build_vector_type_for_mode (type, best_mode);
}
else
{
tree size = TYPE_SIZE (vect_elt_type);
- tree pos = fold_build2 (MULT_EXPR, TREE_TYPE (idx), idx, size);
- return fold_build3 (BIT_FIELD_REF, vect_elt_type, vect, size, pos);
+ tree pos = fold_build2 (MULT_EXPR, bitsizetype, bitsize_int (index),
+ size);
+ return fold_build3 (BIT_FIELD_REF, vect_elt_type, vect, size, pos);
}
}
location_t loc = gimple_location (gsi_stmt (*gsi));
unsigned i;
- if (can_vec_perm_expr_p (vect_type, mask))
+ if (TREE_CODE (mask) == VECTOR_CST)
+ {
+ unsigned char *sel_int = XALLOCAVEC (unsigned char, elements);
+ tree vals = TREE_VECTOR_CST_ELTS (mask);
+
+ for (i = 0; i < elements; ++i, vals = TREE_CHAIN (vals))
+ sel_int[i] = TREE_INT_CST_LOW (TREE_VALUE (vals)) & (2 * elements - 1);
+
+ if (can_vec_perm_p (TYPE_MODE (vect_type), false, sel_int))
+ return;
+ }
+ else if (can_vec_perm_p (TYPE_MODE (vect_type), true, NULL))
return;
warning_at (loc, OPT_Wvector_operation_performance,
"vector shuffling operation will be expanded piecewise");
-
v = VEC_alloc (constructor_elt, gc, elements);
for (i = 0; i < elements; i++)
{
|| code == LROTATE_EXPR
|| code == RROTATE_EXPR)
{
+ optab opv;
+
/* Check whether we have vector <op> {x,x,x,x} where x
could be a scalar variable or a constant. Transform
vector <op> {x,x,x,x} ==> vector <op> scalar. */
- if (VECTOR_MODE_P (TYPE_MODE (TREE_TYPE (rhs2))))
+ if (VECTOR_INTEGER_TYPE_P (TREE_TYPE (rhs2)))
{
tree first;
gimple def_stmt;
}
}
- if (VECTOR_MODE_P (TYPE_MODE (TREE_TYPE (rhs2))))
- op = optab_for_tree_code (code, type, optab_vector);
+ opv = optab_for_tree_code (code, type, optab_vector);
+ if (VECTOR_INTEGER_TYPE_P (TREE_TYPE (rhs2)))
+ op = opv;
else
{
op = optab_for_tree_code (code, type, optab_scalar);
/* The rtl expander will expand vector/scalar as vector/vector
if necessary. Don't bother converting the stmt here. */
- if (op == NULL
- || optab_handler (op, TYPE_MODE (type)) == CODE_FOR_nothing)
- op = optab_for_tree_code (code, type, optab_vector);
+ if (optab_handler (op, TYPE_MODE (type)) == CODE_FOR_nothing
+ && optab_handler (opv, TYPE_MODE (type)) != CODE_FOR_nothing)
+ return;
}
}
else
|| code == VEC_UNPACK_LO_EXPR
|| code == VEC_PACK_TRUNC_EXPR
|| code == VEC_PACK_SAT_EXPR
- || code == VEC_PACK_FIX_TRUNC_EXPR)
+ || code == VEC_PACK_FIX_TRUNC_EXPR
+ || code == VEC_WIDEN_LSHIFT_HI_EXPR
+ || code == VEC_WIDEN_LSHIFT_LO_EXPR)
type = TREE_TYPE (rhs1);
/* Optabs will try converting a negation into a subtraction, so
/* For very wide vectors, try using a smaller vector mode. */
compute_type = type;
- if (TYPE_MODE (type) == BLKmode && op)
+ if (!VECTOR_MODE_P (TYPE_MODE (type)) && op)
{
tree vector_compute_type
- = type_for_widest_vector_mode (TYPE_MODE (TREE_TYPE (type)), op,
- TYPE_SATURATING (TREE_TYPE (type)));
+ = type_for_widest_vector_mode (TREE_TYPE (type), op);
if (vector_compute_type != NULL_TREE
&& (TYPE_VECTOR_SUBPARTS (vector_compute_type)
- < TYPE_VECTOR_SUBPARTS (compute_type)))
+ < TYPE_VECTOR_SUBPARTS (compute_type))
+ && (optab_handler (op, TYPE_MODE (vector_compute_type))
+ != CODE_FOR_nothing))
compute_type = vector_compute_type;
}