We can't yet vectorise conditional internal functions whose boolean
condition is fed by a data access (or more generally, by a tree of logic
ops in which all the leaves are data accesses). Although we should add
that eventually, we'd need further work to generate good-quality code.
Unlike vectorizable_load and vectorizalbe_streo, vectorizable_call
wasn't checking whether the mask had a suitable type, leading to an
ICE on the testcases.
Tested on aarch64-linux-gnu and x86_64-linux-gnu. OK to install?
Richard
2019-12-23 Richard Sandiford <richard.sandif...@arm.com>
gcc/
* tree-vect-stmts.c (vect_check_load_store_mask): Rename to...
(vect_check_scalar_mask): ...this.
(vectorizable_store, vectorizable_load): Update call accordingly.
(vectorizable_call): Use vect_check_scalar_mask to check the mask
argument in calls to conditional internal functions.
gcc/testsuite/
* gcc.dg/vect/vect-cond-arith-8.c: New test.
* gcc.target/aarch64/sve/cond_fmul_5.c: Likewise.
Index: gcc/tree-vect-stmts.c
===================================================================
--- gcc/tree-vect-stmts.c 2019-12-10 12:20:03.569816222 +0000
+++ gcc/tree-vect-stmts.c 2019-12-23 14:41:40.761667889 +0000
@@ -2534,14 +2534,14 @@ get_load_store_type (stmt_vec_info stmt_
}
/* Return true if boolean argument MASK is suitable for vectorizing
- conditional load or store STMT_INFO. When returning true, store the type
+ conditional operation STMT_INFO. When returning true, store the type
of the definition in *MASK_DT_OUT and the type of the vectorized mask
in *MASK_VECTYPE_OUT. */
static bool
-vect_check_load_store_mask (stmt_vec_info stmt_info, tree mask,
- vect_def_type *mask_dt_out,
- tree *mask_vectype_out)
+vect_check_scalar_mask (stmt_vec_info stmt_info, tree mask,
+ vect_def_type *mask_dt_out,
+ tree *mask_vectype_out)
{
vec_info *vinfo = stmt_info->vinfo;
if (!VECT_SCALAR_BOOLEAN_TYPE_P (TREE_TYPE (mask)))
@@ -3262,6 +3262,14 @@ vectorizable_call (stmt_vec_info stmt_in
for (i = 0; i < nargs; i++)
{
op = gimple_call_arg (stmt, i);
+
+ if ((int) i == mask_opno)
+ {
+ if (!vect_check_scalar_mask (stmt_info, op, &dt[i], &vectypes[i]))
+ return false;
+ continue;
+ }
+
if (!vect_is_simple_use (op, vinfo, &dt[i], &vectypes[i]))
{
if (dump_enabled_p ())
@@ -3270,11 +3278,6 @@ vectorizable_call (stmt_vec_info stmt_in
return false;
}
- /* Skip the mask argument to an internal function. This operand
- has been converted via a pattern if necessary. */
- if ((int) i == mask_opno)
- continue;
-
/* We can only handle calls with arguments of the same type. */
if (rhs_type
&& !types_compatible_p (rhs_type, TREE_TYPE (op)))
@@ -3544,12 +3547,6 @@ vectorizable_call (stmt_vec_info stmt_in
continue;
}
- if (mask_opno >= 0 && !vectypes[mask_opno])
- {
- gcc_assert (modifier != WIDEN);
- vectypes[mask_opno] = truth_type_for (vectype_in);
- }
-
for (i = 0; i < nargs; i++)
{
op = gimple_call_arg (stmt, i);
@@ -7378,8 +7375,8 @@ vectorizable_store (stmt_vec_info stmt_i
if (mask_index >= 0)
{
mask = gimple_call_arg (call, mask_index);
- if (!vect_check_load_store_mask (stmt_info, mask, &mask_dt,
- &mask_vectype))
+ if (!vect_check_scalar_mask (stmt_info, mask, &mask_dt,
+ &mask_vectype))
return false;
}
}
@@ -8598,8 +8595,8 @@ vectorizable_load (stmt_vec_info stmt_in
if (mask_index >= 0)
{
mask = gimple_call_arg (call, mask_index);
- if (!vect_check_load_store_mask (stmt_info, mask, &mask_dt,
- &mask_vectype))
+ if (!vect_check_scalar_mask (stmt_info, mask, &mask_dt,
+ &mask_vectype))
return false;
}
}
Index: gcc/testsuite/gcc.dg/vect/vect-cond-arith-8.c
===================================================================
--- /dev/null 2019-09-17 11:41:18.176664108 +0100
+++ gcc/testsuite/gcc.dg/vect/vect-cond-arith-8.c 2019-12-23
14:41:40.757667915 +0000
@@ -0,0 +1,8 @@
+/* { dg-do compile } */
+
+void
+f (float *x, _Bool *cond, float *y)
+{
+ for (int i = 0; i < 100; ++i)
+ x[i] = cond[i] ? y[i] * 100 : y[i];
+}
Index: gcc/testsuite/gcc.target/aarch64/sve/cond_fmul_5.c
===================================================================
--- /dev/null 2019-09-17 11:41:18.176664108 +0100
+++ gcc/testsuite/gcc.target/aarch64/sve/cond_fmul_5.c 2019-12-23
14:41:40.757667915 +0000
@@ -0,0 +1,9 @@
+/* { dg-do compile } */
+/* { dg-options "-O3" } */
+
+void
+f (float *x, _Bool *cond, float *y)
+{
+ for (int i = 0; i < 100; ++i)
+ x[i] = cond[i] ? y[i] * 100 : y[i];
+}
