diff mbox series

[committed] testsuite: Unify gcc.target/i386/memcpy scan strings.

Message ID CAFULd4aSDepSQ57_YhkYnhqpHovAr7ErZySyDhUXXH40F2x6dw@mail.gmail.com
State New
Headers show
Series [committed] testsuite: Unify gcc.target/i386/memcpy scan strings. | expand

Commit Message

Uros Bizjak Feb. 6, 2020, 5:24 p.m. UTC 
After -fno-common became the default, we can unify various
scan strings between 64bit and 32bit targets.

Tested on x86_64-linux-gnu {,-m32}.

2020-02-06  Uroš Bizjak  <ubizjak@gmail.com>

    * gcc.target/i386/memcpy-strategy-1.c (dg-final):
    Unify scan-assembler strings for all targets.
    * gcc.target/i386/memcpy-strategy-2.c (dg-final): Ditto.
    * gcc.target/i386/memcpy-strategy-3.c (dg-final): Ditto.
    * gcc.target/i386/memcpy-vector_loop-1.c (dg-final): Ditto.

Committed to mainline.

Uros.
diff mbox series

Patch

diff --git a/gcc/testsuite/gcc.target/i386/memcpy-strategy-1.c b/gcc/testsuite/gcc.target/i386/memcpy-strategy-1.c
index 48d0b77da58..6ac80c91053 100644
--- a/gcc/testsuite/gcc.target/i386/memcpy-strategy-1.c
+++ b/gcc/testsuite/gcc.target/i386/memcpy-strategy-1.c
@@ -1,8 +1,7 @@ 
 /* { dg-do compile } */
 /* { dg-skip-if "" { *-*-* } { "-march=*" } { "-march=atom" } } */
 /* { dg-options "-O2 -march=atom -mmemcpy-strategy=vector_loop:-1:align" } */
-/* { dg-final { scan-assembler-times "movdqa" 8 { target { ! ia32 } } } } */
-/* { dg-final { scan-assembler-times "movdqa" 4 { target ia32 } } } */
+/* { dg-final { scan-assembler-times "movdqa" 8 } } */
 
 char a[2048];
 char b[2048];
diff --git a/gcc/testsuite/gcc.target/i386/memcpy-strategy-2.c b/gcc/testsuite/gcc.target/i386/memcpy-strategy-2.c
index 9e26ea996d7..c103896a110 100644
--- a/gcc/testsuite/gcc.target/i386/memcpy-strategy-2.c
+++ b/gcc/testsuite/gcc.target/i386/memcpy-strategy-2.c
@@ -1,8 +1,7 @@ 
 /* { dg-do compile } */
 /* { dg-skip-if "" { *-*-* } { "-march=*" } { "-march=atom" } } */
 /* { dg-options "-O2 -march=atom -mmemcpy-strategy=vector_loop:3000:align,libcall:-1:align" } */
-/* { dg-final { scan-assembler-times "movdqa" 8 { target { ! ia32 } } } } */
-/* { dg-final { scan-assembler-times "movdqa" 4 { target ia32 } } } */
+/* { dg-final { scan-assembler-times "movdqa" 8 } } */
 
 char a[2048];
 char b[2048];
diff --git a/gcc/testsuite/gcc.target/i386/memcpy-strategy-3.c b/gcc/testsuite/gcc.target/i386/memcpy-strategy-3.c
index 11687e8c9b5..2d72155bb2e 100644
--- a/gcc/testsuite/gcc.target/i386/memcpy-strategy-3.c
+++ b/gcc/testsuite/gcc.target/i386/memcpy-strategy-3.c
@@ -1,9 +1,6 @@ 
 /* { dg-do compile } */
 /* { dg-options "-O2 -march=atom -mmemcpy-strategy=vector_loop:2000:align,libcall:-1:align" } */
-/* On ELF platforms, one hit comes from the .file directive.  */
-/* { dg-final { scan-assembler-times "memcpy" 2 { target { ! *-*-darwin* } } } } */
-/* But not on Darwin, which doesn't have a .file directive by default.  */
-/* { dg-final { scan-assembler-times "_memcpy" 1  { target *-*-darwin* } } } */
+/* { dg-final { scan-assembler-times "call\[\\t \]*_?memcpy" 1 } } */
 
 char a[2048];
 char b[2048];
diff --git a/gcc/testsuite/gcc.target/i386/memcpy-vector_loop-1.c b/gcc/testsuite/gcc.target/i386/memcpy-vector_loop-1.c
index 113c876c324..93f428acc85 100644
--- a/gcc/testsuite/gcc.target/i386/memcpy-vector_loop-1.c
+++ b/gcc/testsuite/gcc.target/i386/memcpy-vector_loop-1.c
@@ -1,8 +1,7 @@ 
 /* { dg-do compile } */
 /* { dg-skip-if "" { *-*-* } { "-march=*" } { "-march=atom" } } */
 /* { dg-options "-O2 -march=atom -minline-all-stringops -mstringop-strategy=vector_loop" } */
-/* { dg-final { scan-assembler-times "movdqa" 8 { target { ! ia32 } } } } */
-/* { dg-final { scan-assembler-times "movdqa" 4 { target ia32 } } } */
+/* { dg-final { scan-assembler-times "movdqa" 8 } } */
 
 char a[2048];
 char b[2048];