From 40b6bff965d004095b06ad3827e8221ae5bcc25e Mon Sep 17 00:00:00 2001 From: Richard Biener Date: Fri, 27 Jan 2017 13:56:59 +0000 Subject: [PATCH] re PR tree-optimization/79245 (Inefficient loop distribution to memcpy) 2017-01-27 Richard Biener PR tree-optimization/79245 * tree-loop-distribution.c (distribute_loop): Apply cost modeling also to detected patterns. * gcc.dg/tree-ssa/ldist-23.c: XFAIL. * gcc.dg/tree-ssa/ldist-25.c: New testcase. From-SVN: r244976 --- gcc/ChangeLog | 6 ++++++ gcc/testsuite/ChangeLog | 6 ++++++ gcc/testsuite/gcc.dg/tree-ssa/ldist-23.c | 5 +++-- gcc/testsuite/gcc.dg/tree-ssa/ldist-25.c | 25 ++++++++++++++++++++++++ gcc/tree-loop-distribution.c | 3 +-- 5 files changed, 41 insertions(+), 4 deletions(-) create mode 100644 gcc/testsuite/gcc.dg/tree-ssa/ldist-25.c diff --git a/gcc/ChangeLog b/gcc/ChangeLog index a9f24216368..3ed05643df3 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,9 @@ +2017-01-27 Richard Biener + + PR tree-optimization/79245 + * tree-loop-distribution.c (distribute_loop): Apply cost + modeling also to detected patterns. + 2017-01-27 Richard Biener PR tree-optimization/71433 diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index aaa5972f3bc..5a68e58f028 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,9 @@ +2017-01-27 Richard Biener + + PR tree-optimization/79245 + * gcc.dg/tree-ssa/ldist-23.c: XFAIL. + * gcc.dg/tree-ssa/ldist-25.c: New testcase. + 2017-01-27 Jakub Jelinek PR c/79199 diff --git a/gcc/testsuite/gcc.dg/tree-ssa/ldist-23.c b/gcc/testsuite/gcc.dg/tree-ssa/ldist-23.c index d58914eee16..74701b434d5 100644 --- a/gcc/testsuite/gcc.dg/tree-ssa/ldist-23.c +++ b/gcc/testsuite/gcc.dg/tree-ssa/ldist-23.c @@ -29,5 +29,6 @@ int main() return 0; } -/* { dg-final { scan-tree-dump "split to 1 loops and 1 library call" "ldist" } } */ -/* { dg-final { scan-tree-dump "generated memcpy" "ldist" } } */ +/* XFAILed due to the fix for PR79245. */ +/* { dg-final { scan-tree-dump "split to 1 loops and 1 library call" "ldist" { xfail *-*-* } } } */ +/* { dg-final { scan-tree-dump "generated memcpy" "ldist" { xfail *-*-* } } } */ diff --git a/gcc/testsuite/gcc.dg/tree-ssa/ldist-25.c b/gcc/testsuite/gcc.dg/tree-ssa/ldist-25.c new file mode 100644 index 00000000000..699bf38ab03 --- /dev/null +++ b/gcc/testsuite/gcc.dg/tree-ssa/ldist-25.c @@ -0,0 +1,25 @@ +/* { dg-do compile } */ +/* { dg-options "-O3 -ftree-loop-distribute-patterns -fdump-tree-ldist-details" } */ + +#define k 1335 +double a[k][k]; +double b[k][k]; +double c[k][k]; + +int x; +int y; + +void +foo (void) +{ + for (int j = 0; j < x; j++) + { + for (int i = 0; i < y; i++) + { + c[j][i] = b[j][i] - a[j][i]; + a[j][i] = b[j][i]; + } + } +} + +/* { dg-final { scan-tree-dump "Loop . is the same" "ldist" } } */ diff --git a/gcc/tree-loop-distribution.c b/gcc/tree-loop-distribution.c index a38cf7e752b..0fec1d6121c 100644 --- a/gcc/tree-loop-distribution.c +++ b/gcc/tree-loop-distribution.c @@ -1548,8 +1548,7 @@ distribute_loop (struct loop *loop, vec stmts, for (int j = i + 1; partitions.iterate (j, &partition); ++j) { - if (!partition_builtin_p (partition) - && similar_memory_accesses (rdg, into, partition)) + if (similar_memory_accesses (rdg, into, partition)) { if (dump_file && (dump_flags & TDF_DETAILS)) { -- 2.30.2