diff options
author | Richard Sandiford <richard.sandiford@arm.com> | 2018-06-30 13:56:34 +0000 |
---|---|---|
committer | Richard Sandiford <rsandifo@gcc.gnu.org> | 2018-06-30 13:56:34 +0000 |
commit | 3330053ecaafe8bca82cc3845be9b2d01a614eb1 (patch) | |
tree | 9ced16ed568b3208366e3c98d23fc84ffd77cacb /gcc/tree-vect-patterns.c | |
parent | 003479340f5ae6b7407b5c92e3e1915101552377 (diff) | |
download | gcc-3330053ecaafe8bca82cc3845be9b2d01a614eb1.zip gcc-3330053ecaafe8bca82cc3845be9b2d01a614eb1.tar.gz gcc-3330053ecaafe8bca82cc3845be9b2d01a614eb1.tar.bz2 |
[13/n] PR85694: Try to avoid vectorising casts of invariants
vect_recog_rotate_pattern had code to prevent operations
on invariants being vectorised unnecessarily:
if (dt == vect_external_def
&& TREE_CODE (oprnd1) == SSA_NAME
&& is_a <loop_vec_info> (vinfo))
{
struct loop *loop = as_a <loop_vec_info> (vinfo)->loop;
ext_def = loop_preheader_edge (loop);
if (!SSA_NAME_IS_DEFAULT_DEF (oprnd1))
{
basic_block bb = gimple_bb (SSA_NAME_DEF_STMT (oprnd1));
if (bb == NULL
|| !dominated_by_p (CDI_DOMINATORS, ext_def->dest, bb))
ext_def = NULL;
}
}
[..]
if (ext_def)
{
basic_block new_bb
= gsi_insert_on_edge_immediate (ext_def, def_stmt);
gcc_assert (!new_bb);
}
This patch reuses the same idea for casts of invariants created
during widening optimisations.
One hitch was that vect_loop_versioning asserted that the vector loop
preheader was still empty, although the cfg transformation it's doing
should be correct either way.
2018-06-30 Richard Sandiford <richard.sandiford@arm.com>
gcc/
* tree-vect-patterns.c (vect_get_external_def_edge): New function,
split out from...
(vect_recog_rotate_pattern): ...here.
(vect_convert_input): Try to insert casts of invariants in the
preheader.
* tree-vect-loop-manip.c (vect_loop_versioning): Don't require the
preheader to be empty.
gcc/testsuite/
* gcc.dg/vect/vect-widen-mult-extern-1.c: New test.
From-SVN: r262277
Diffstat (limited to 'gcc/tree-vect-patterns.c')
-rw-r--r-- | gcc/tree-vect-patterns.c | 49 |
1 files changed, 36 insertions, 13 deletions
diff --git a/gcc/tree-vect-patterns.c b/gcc/tree-vect-patterns.c index 2ac765e..2b1ab7b 100644 --- a/gcc/tree-vect-patterns.c +++ b/gcc/tree-vect-patterns.c @@ -123,6 +123,30 @@ new_pattern_def_seq (stmt_vec_info stmt_info, gimple *stmt) append_pattern_def_seq (stmt_info, stmt); } +/* The caller wants to perform new operations on vect_external variable + VAR, so that the result of the operations would also be vect_external. + Return the edge on which the operations can be performed, if one exists. + Return null if the operations should instead be treated as part of + the pattern that needs them. */ + +static edge +vect_get_external_def_edge (vec_info *vinfo, tree var) +{ + edge e = NULL; + if (loop_vec_info loop_vinfo = dyn_cast <loop_vec_info> (vinfo)) + { + e = loop_preheader_edge (loop_vinfo->loop); + if (!SSA_NAME_IS_DEFAULT_DEF (var)) + { + basic_block bb = gimple_bb (SSA_NAME_DEF_STMT (var)); + if (bb == NULL + || !dominated_by_p (CDI_DOMINATORS, e->dest, bb)) + e = NULL; + } + } + return e; +} + /* Return true if the target supports a vector version of CODE, where CODE is known to map to a direct optab. ITYPE specifies the type of (some of) the scalar inputs and OTYPE specifies the @@ -628,6 +652,16 @@ vect_convert_input (stmt_vec_info stmt_info, tree type, tree new_op = vect_recog_temp_ssa_var (type, NULL); gassign *new_stmt = gimple_build_assign (new_op, NOP_EXPR, unprom->op); + /* If OP is an external value, see if we can insert the new statement + on an incoming edge. */ + if (unprom->dt == vect_external_def) + if (edge e = vect_get_external_def_edge (stmt_info->vinfo, unprom->op)) + { + basic_block new_bb = gsi_insert_on_edge_immediate (e, new_stmt); + gcc_assert (!new_bb); + return new_op; + } + /* As a (common) last resort, add the statement to the pattern itself. */ append_pattern_def_seq (stmt_info, new_stmt, vectype); return new_op; @@ -1821,19 +1855,8 @@ vect_recog_rotate_pattern (vec<gimple *> *stmts, tree *type_out) *type_out = vectype; if (dt == vect_external_def - && TREE_CODE (oprnd1) == SSA_NAME - && is_a <loop_vec_info> (vinfo)) - { - struct loop *loop = as_a <loop_vec_info> (vinfo)->loop; - ext_def = loop_preheader_edge (loop); - if (!SSA_NAME_IS_DEFAULT_DEF (oprnd1)) - { - basic_block bb = gimple_bb (SSA_NAME_DEF_STMT (oprnd1)); - if (bb == NULL - || !dominated_by_p (CDI_DOMINATORS, ext_def->dest, bb)) - ext_def = NULL; - } - } + && TREE_CODE (oprnd1) == SSA_NAME) + ext_def = vect_get_external_def_edge (vinfo, oprnd1); def = NULL_TREE; scalar_int_mode mode = SCALAR_INT_TYPE_MODE (type); |