OpenE2K/gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Check mask argument's type when vectorising conditional functions

Browse Source 
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_store, vectorizable_call
wasn't checking whether the mask had a suitable type, leading to an
ICE on the testcases.

2020-01-06  Richard Sandiford  <richard.sandiford@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.

From-SVN: r279907
This commit is contained in:
Richard Sandiford 2020-01-06 17:58:57 +00:00 committed by Richard Sandiford
parent d54fc77076
commit 8a0ae3c130
5 changed files with 46 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
gcc/ChangeLog
View File

@ -1,3 +1,11 @@
2020-01-06 Richard Sandiford <richard.sandiford@arm.com>
* 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.
2020-01-06 Andrew Stubbs <ams@codesourcery.com>
* config/gcn/gcn-valu.md (subv64di3): Use separate alternatives for

5
gcc/testsuite/ChangeLog
View File

@ -1,3 +1,8 @@
2020-01-06 Richard Sandiford <richard.sandiford@arm.com>
* gcc.dg/vect/vect-cond-arith-8.c: New test.
* gcc.target/aarch64/sve/cond_fmul_5.c: Likewise.
2020-01-06 Nathan Sidwell <nathan@acm.org>
PR c++/79592

8
gcc/testsuite/gcc.dg/vect/vect-cond-arith-8.c Normal file
View File

@ -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];
}

9
gcc/testsuite/gcc.target/aarch64/sve/cond_fmul_5.c Normal file
View File

@ -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];
}

35
gcc/tree-vect-stmts.c
View File

@ -2534,14 +2534,14 @@ get_load_store_type (stmt_vec_info stmt_info, tree vectype, bool slp,
}
/* 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_info, gimple_stmt_iterator *gsi,
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_info, gimple_stmt_iterator *gsi,
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_info, gimple_stmt_iterator *gsi,
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_info, gimple_stmt_iterator *gsi,
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_info, gimple_stmt_iterator *gsi,
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;
}
}