Tested for avr with --target_board=atmega128-sim and native on i686-pc-linuc-gnu.

2013-07-05  Joern Rennecke <joern.renne...@embecosm.com>

        * gcc.dg/strlenopt-10.c [avr*-*-*]: Reduce number of expected
        memcpy by one.
        * gcc.dg/strlenopt-11.c [avr*-*-*]: Likewise.
        Expect l to be optimized away.
        * gcc.dg/strlenopt-13.c [avr*-*-*]: Likewise.

Index: gcc.dg/strlenopt-10.c
===================================================================
--- gcc.dg/strlenopt-10.c       (revision 201032)
+++ gcc.dg/strlenopt-10.c       (working copy)
@@ -70,7 +70,10 @@ main ()
 }
 
 /* { dg-final { scan-tree-dump-times "strlen \\(" 2 "strlen" } } */
-/* { dg-final { scan-tree-dump-times "memcpy \\(" 8 "strlen" } } */
+/* avr has BIGGEST_ALIGNMENT 8, allowing fold_builtin_memory_op
+   to expand the memcpy call at the end of fn2.  */
+/* { dg-final { scan-tree-dump-times "memcpy \\(" 8 "strlen" { target { ! 
avr*-*-* } } } } */
+/* { dg-final { scan-tree-dump-times "memcpy \\(" 7 "strlen" { target { 
avr*-*-* } } } } */
 /* { dg-final { scan-tree-dump-times "strcpy \\(" 0 "strlen" } } */
 /* { dg-final { scan-tree-dump-times "strcat \\(" 0 "strlen" } } */
 /* { dg-final { scan-tree-dump-times "strchr \\(" 0 "strlen" } } */
Index: gcc.dg/strlenopt-11.c
===================================================================
--- gcc.dg/strlenopt-11.c       (revision 201032)
+++ gcc.dg/strlenopt-11.c       (working copy)
@@ -59,12 +59,18 @@ main ()
 }
 
 /* { dg-final { scan-tree-dump-times "strlen \\(" 3 "strlen" } } */
-/* { dg-final { scan-tree-dump-times "memcpy \\(" 7 "strlen" } } */
+/* avr has BIGGEST_ALIGNMENT 8, allowing fold_builtin_memory_op
+   to expand the memcpy call at the end of fn1.  */
+/* { dg-final { scan-tree-dump-times "memcpy \\(" 7 "strlen" { target { ! 
avr*-*-* } } } } */
+/* { dg-final { scan-tree-dump-times "memcpy \\(" 6 "strlen" { target { 
avr*-*-* } } } } */
 /* { dg-final { scan-tree-dump-times "strcpy \\(" 0 "strlen" } } */
 /* { dg-final { scan-tree-dump-times "strcat \\(" 0 "strlen" } } */
 /* { dg-final { scan-tree-dump-times "strchr \\(" 0 "strlen" } } */
 /* { dg-final { scan-tree-dump-times "stpcpy \\(" 0 "strlen" } } */
-/* { dg-final { scan-tree-dump-times "  _\[0-9\]* = strlen 
\\(\[^\n\r\]*;\[\n\r\]*  l.0. = " 1 "strlen" } } */
-/* { dg-final { scan-tree-dump-times "  _\[0-9\]* = strlen 
\\(\[^\n\r\]*;\[\n\r\]*  l.6. = " 1 "strlen" } } */
-/* { dg-final { scan-tree-dump-times "  _\[0-9\]* = strlen 
\\(\[^\n\r\]*;\[\n\r\]*  l.9. = " 1 "strlen" } } */
+/* Where the memcpy is expanded, the assignemts to elements of l are
+   propagated.  */
+/* { dg-final { scan-tree-dump-times "  _\[0-9\]* = strlen 
\\(\[^\n\r\]*;\[\n\r\]*  l.0. = " 1 "strlen" { target { ! avr*-*-* } } } } */
+/* { dg-final { scan-tree-dump-times "  _\[0-9\]* = strlen 
\\(\[^\n\r\]*;\[\n\r\]*  l.6. = " 1 "strlen" { target { ! avr*-*-* } } } } */
+/* { dg-final { scan-tree-dump-times "  _\[0-9\]* = strlen 
\\(\[^\n\r\]*;\[\n\r\]*  l.9. = " 1 "strlen" { target { ! avr*-*-* } } } } */
+/* { dg-final { scan-tree-dump-times "  _\[0-9\]* = strlen \\(\[^\n\r\]*;" 3 
"strlen" { target { avr*-*-* } } } } */
 /* { dg-final { cleanup-tree-dump "strlen" } } */
Index: gcc.dg/strlenopt-13.c
===================================================================
--- gcc.dg/strlenopt-13.c       (revision 201032)
+++ gcc.dg/strlenopt-13.c       (working copy)
@@ -56,13 +56,19 @@ main ()
 }
 
 /* { dg-final { scan-tree-dump-times "strlen \\(" 4 "strlen" } } */
-/* { dg-final { scan-tree-dump-times "memcpy \\(" 7 "strlen" } } */
+/* avr has BIGGEST_ALIGNMENT 8, allowing fold_builtin_memory_op
+   to expand the memcpy call at the end of fn1.  */
+/* { dg-final { scan-tree-dump-times "memcpy \\(" 7 "strlen" { target { ! 
avr*-*-* } } } } */
+/* { dg-final { scan-tree-dump-times "memcpy \\(" 6 "strlen" { target { 
avr*-*-* } } } } */
 /* { dg-final { scan-tree-dump-times "strcpy \\(" 0 "strlen" } } */
 /* { dg-final { scan-tree-dump-times "strcat \\(" 0 "strlen" } } */
 /* { dg-final { scan-tree-dump-times "strchr \\(" 0 "strlen" } } */
 /* { dg-final { scan-tree-dump-times "stpcpy \\(" 0 "strlen" } } */
-/* { dg-final { scan-tree-dump-times "  _\[0-9\]* = strlen 
\\(\[^\n\r\]*;\[\n\r\]*  l.0. = " 1 "strlen" } } */
-/* { dg-final { scan-tree-dump-times "  _\[0-9\]* = strlen 
\\(\[^\n\r\]*;\[\n\r\]*  l.1. = " 1 "strlen" } } */
-/* { dg-final { scan-tree-dump-times "  _\[0-9\]* = strlen 
\\(\[^\n\r\]*;\[\n\r\]*  l.5. = " 1 "strlen" } } */
-/* { dg-final { scan-tree-dump-times "  _\[0-9\]* = strlen 
\\(\[^\n\r\]*;\[\n\r\]*  l.6. = " 1 "strlen" } } */
+/* Where the memcpy is expanded, the assignemts to elements of l are
+   propagated.  */
+/* { dg-final { scan-tree-dump-times "  _\[0-9\]* = strlen 
\\(\[^\n\r\]*;\[\n\r\]*  l.0. = " 1 "strlen" { target { ! avr*-*-* } } } } */
+/* { dg-final { scan-tree-dump-times "  _\[0-9\]* = strlen 
\\(\[^\n\r\]*;\[\n\r\]*  l.1. = " 1 "strlen" { target { ! avr*-*-* } } } } */
+/* { dg-final { scan-tree-dump-times "  _\[0-9\]* = strlen 
\\(\[^\n\r\]*;\[\n\r\]*  l.5. = " 1 "strlen" { target { ! avr*-*-* } } } } */
+/* { dg-final { scan-tree-dump-times "  _\[0-9\]* = strlen 
\\(\[^\n\r\]*;\[\n\r\]*  l.6. = " 1 "strlen" { target { ! avr*-*-* } } } } */
+/* { dg-final { scan-tree-dump-times "  _\[0-9\]* = strlen \\(\[^\n\r\]*;" 4 
"strlen" { target { avr*-*-* } } } } */
 /* { dg-final { cleanup-tree-dump "strlen" } } */

Reply via email to