diff options
| author | Andre Vieira <andre.simoesdiasvieira@arm.com> | 2019-11-11 12:07:04 +0000 |
|---|---|---|
| committer | Andre Vieira <avieira@gcc.gnu.org> | 2019-11-11 12:07:04 +0000 |
| commit | 87b47251924c7539a9a8e191587d118a14496473 (patch) | |
| tree | a75f70ee7521d8e1409a7babf689fcb2838a5e59 | |
| parent | 3f246567a44ba034c0b48f929c4d4586a4b914ed (diff) | |
| download | gcc-87b47251924c7539a9a8e191587d118a14496473.zip gcc-87b47251924c7539a9a8e191587d118a14496473.tar.gz gcc-87b47251924c7539a9a8e191587d118a14496473.tar.bz2 | |
[vect]Account for epilogue's peeling for gaps when checking if we have enough
niters for epilogue
gcc/ChangeLog:
2019-11-11 Andre Vieira <andre.simoesdiasvieira@arm.com>
* tree-vect-loop-manip.c (vect_do_peeling): Take epilogue gaps into
account when checking if there are enough iterations to vectorize
epilogue.
gcc/testsuite/ChangeLog:
2019-11-11 Andre Vieira <andre.simoesdiasvieira@arm.com>
* gcc.dg/vect/vect-reduc-epilogue-gaps.c: New test.
From-SVN: r278049
| -rw-r--r-- | gcc/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 4 | ||||
| -rw-r--r-- | gcc/testsuite/gcc.dg/vect/vect-reduc-epilogue-gaps.c | 45 | ||||
| -rw-r--r-- | gcc/tree-vect-loop-manip.c | 5 |
4 files changed, 59 insertions, 1 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 2c2c456..852322b 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,9 @@ +2019-11-11 Andre Vieira <andre.simoesdiasvieira@arm.com> + + * tree-vect-loop-manip.c (vect_do_peeling): Take epilogue gaps into + account when checking if there are enough iterations to vectorize + epilogue. + 2019-11-11 Tobias Burnus <tobias@codesourcery.com> Kwok Cheung Yeung <kcy@codesourcery.com> diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index d03a6fd..66de94f 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,7 @@ +2019-11-11 Andre Vieira <andre.simoesdiasvieira@arm.com> + + * gcc.dg/vect/vect-reduc-epilogue-gaps.c: New test. + 2019-11-11 José Rui Faustino de Sousa <jrfsousa@gmail.com> PR fortran/92142 diff --git a/gcc/testsuite/gcc.dg/vect/vect-reduc-epilogue-gaps.c b/gcc/testsuite/gcc.dg/vect/vect-reduc-epilogue-gaps.c new file mode 100644 index 0000000..dc5704f --- /dev/null +++ b/gcc/testsuite/gcc.dg/vect/vect-reduc-epilogue-gaps.c @@ -0,0 +1,45 @@ +/* { dg-options "-O3 -fno-vect-cost-model" } */ +struct { + float real; + float img; +} g[11]; + +float __attribute__ ((noclone)) +foo_11 (void) +{ + float sum = 0.0; + for (int i = 0; i < 11; ++i) + sum += g[i].real; + return sum; +} + +float __attribute__ ((noclone)) +foo_10 (void) +{ + float sum = 0.0; + for (int i = 0; i < 10; ++i) + sum += g[i].real; + return sum; +} + +int main (void) +{ + float check_10 = 0.0; + float check_11 = 0.0; + for (int i = 0; i < 11; ++i) + { + asm volatile ("" : : : "memory"); + g[i].real = (float) i; + g[i].img = (float) -i; + if (i < 10) + check_10 += (float) i; + check_11 += (float) i; + } + + if (foo_10 () != check_10) + __builtin_abort (); + if (foo_11 () != check_11) + __builtin_abort (); + + return 0; +} diff --git a/gcc/tree-vect-loop-manip.c b/gcc/tree-vect-loop-manip.c index 54f3ccf..559d59b 100644 --- a/gcc/tree-vect-loop-manip.c +++ b/gcc/tree-vect-loop-manip.c @@ -2530,9 +2530,11 @@ vect_do_peeling (loop_vec_info loop_vinfo, tree niters, tree nitersm1, = eiters % lowest_vf + LOOP_VINFO_PEELING_FOR_GAPS (loop_vinfo); unsigned int ratio; + unsigned int epilogue_gaps + = LOOP_VINFO_PEELING_FOR_GAPS (epilogue_vinfo); while (!(constant_multiple_p (loop_vinfo->vector_size, epilogue_vinfo->vector_size, &ratio) - && eiters >= lowest_vf / ratio)) + && eiters >= lowest_vf / ratio + epilogue_gaps)) { delete epilogue_vinfo; epilogue_vinfo = NULL; @@ -2543,6 +2545,7 @@ vect_do_peeling (loop_vec_info loop_vinfo, tree niters, tree nitersm1, } epilogue_vinfo = loop_vinfo->epilogue_vinfos[0]; loop_vinfo->epilogue_vinfos.ordered_remove (0); + epilogue_gaps = LOOP_VINFO_PEELING_FOR_GAPS (epilogue_vinfo); } } /* Prolog loop may be skipped. */ |