diff options
| author | Richard Sandiford <richard.sandiford@arm.com> | 2019-12-10 12:20:02 +0000 |
|---|---|---|
| committer | Richard Sandiford <rsandifo@gcc.gnu.org> | 2019-12-10 12:20:02 +0000 |
| commit | 9ec35478ccf0f3539988a054b7996278706a7710 (patch) | |
| tree | 9974f682114645a158aad0e51d9eb6a784cdc345 /gcc | |
| parent | ca49c831ca9c042db6cea746c21040c1ada18abb (diff) | |
| download | gcc-9ec35478ccf0f3539988a054b7996278706a7710.zip gcc-9ec35478ccf0f3539988a054b7996278706a7710.tar.gz gcc-9ec35478ccf0f3539988a054b7996278706a7710.tar.bz2 | |
Fix EXTRACT_LAST_REDUCTION handling of pattern stmts
Unlike most vector ops, extract-last reductions replace the original
scalar code in-situ rather than adding an adjacent vector implementation.
I.e.:
dest_1 = COND_EXPR <...>;
becomes:
dest_1 = .EXTRACT_LAST (...);
gcc.dg/vect/vect-cond-reduc-4.c was ICEing for SVE because we tried
to replace the pattern statement in this way, rather than replacing
the original scalar statement.
2019-12-10 Richard Sandiford <richard.sandiford@arm.com>
gcc/
* tree-vect-stmts.c (vect_finish_replace_stmt): Always use the
original scalar statement rather than a pattern statement.
(vectorizable_condition): Likewise, in the handling of extract-last
reductions.
From-SVN: r279162
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/ChangeLog | 7 | ||||
| -rw-r--r-- | gcc/tree-vect-stmts.c | 16 |
2 files changed, 16 insertions, 7 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 42d1418..1c1501e 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,5 +1,12 @@ 2019-12-10 Richard Sandiford <richard.sandiford@arm.com> + * tree-vect-stmts.c (vect_finish_replace_stmt): Always use the + original scalar statement rather than a pattern statement. + (vectorizable_condition): Likewise, in the handling of extract-last + reductions. + +2019-12-10 Richard Sandiford <richard.sandiford@arm.com> + * tree-vect-loop.c (vectorizable_reduction): Don't use EXTRACT_LAST_REDUCTION for chained reductions. diff --git a/gcc/tree-vect-stmts.c b/gcc/tree-vect-stmts.c index 396ff15..08ffb72 100644 --- a/gcc/tree-vect-stmts.c +++ b/gcc/tree-vect-stmts.c @@ -1779,9 +1779,10 @@ vect_finish_stmt_generation_1 (stmt_vec_info stmt_info, gimple *vec_stmt) stmt_vec_info vect_finish_replace_stmt (stmt_vec_info stmt_info, gimple *vec_stmt) { - gcc_assert (gimple_get_lhs (stmt_info->stmt) == gimple_get_lhs (vec_stmt)); + gimple *scalar_stmt = vect_orig_stmt (stmt_info)->stmt; + gcc_assert (gimple_get_lhs (scalar_stmt) == gimple_get_lhs (vec_stmt)); - gimple_stmt_iterator gsi = gsi_for_stmt (stmt_info->stmt); + gimple_stmt_iterator gsi = gsi_for_stmt (scalar_stmt); gsi_replace (&gsi, vec_stmt, true); return vect_finish_stmt_generation_1 (stmt_info, vec_stmt); @@ -10324,20 +10325,21 @@ vectorizable_condition (stmt_vec_info stmt_info, gimple_stmt_iterator *gsi, if (reduction_type == EXTRACT_LAST_REDUCTION) { + gimple *old_stmt = vect_orig_stmt (stmt_info)->stmt; + tree lhs = gimple_get_lhs (old_stmt); gcall *new_stmt = gimple_build_call_internal (IFN_FOLD_EXTRACT_LAST, 3, else_clause, vec_compare, vec_then_clause); - gimple_call_set_lhs (new_stmt, scalar_dest); - SSA_NAME_DEF_STMT (scalar_dest) = new_stmt; - if (stmt_info->stmt == gsi_stmt (*gsi)) + gimple_call_set_lhs (new_stmt, lhs); + SSA_NAME_DEF_STMT (lhs) = new_stmt; + if (old_stmt == gsi_stmt (*gsi)) new_stmt_info = vect_finish_replace_stmt (stmt_info, new_stmt); else { /* In this case we're moving the definition to later in the block. That doesn't matter because the only uses of the lhs are in phi statements. */ - gimple_stmt_iterator old_gsi - = gsi_for_stmt (stmt_info->stmt); + gimple_stmt_iterator old_gsi = gsi_for_stmt (old_stmt); gsi_remove (&old_gsi, true); new_stmt_info = vect_finish_stmt_generation (stmt_info, new_stmt, gsi); |