cc'ing Jakub due to email address typo in original patch submission.
Apologies,
Victor
Victor Do Nascimento <victor.donascime...@arm.com> writes:
> gcc/testsuite/ChangeLog:
>
> * c-c++-common/gomp/declare-variant-14.c: Make i?86 and x86_64 target
> only test.
> * gfortran.dg/gomp/declare-variant-14.f90: Likewise.
> ---
> gcc/testsuite/c-c++-common/gomp/declare-variant-14.c | 12 +++++-------
> .../gfortran.dg/gomp/declare-variant-14.f90 | 10 ++++------
> 2 files changed, 9 insertions(+), 13 deletions(-)
>
> diff --git a/gcc/testsuite/c-c++-common/gomp/declare-variant-14.c
> b/gcc/testsuite/c-c++-common/gomp/declare-variant-14.c
> index e3668893afe..2b71869787e 100644
> --- a/gcc/testsuite/c-c++-common/gomp/declare-variant-14.c
> +++ b/gcc/testsuite/c-c++-common/gomp/declare-variant-14.c
> @@ -1,6 +1,6 @@
> -/* { dg-do compile { target vect_simd_clones } } */
> +/* { dg-do compile { target { { i?86-*-* x86_64-*-* } && vect_simd_clones }
> } } */
> /* { dg-additional-options "-fdump-tree-gimple -fdump-tree-optimized" } */
> -/* { dg-additional-options "-mno-sse3" { target { i?86-*-* x86_64-*-* } } }
> */
> +/* { dg-additional-options "-mno-sse3" } */
>
> int f01 (int);
> int f02 (int);
> @@ -15,15 +15,13 @@ int
> test1 (int x)
> {
> /* At gimplification time, we can't decide yet which function to call. */
> - /* { dg-final { scan-tree-dump-times "f04 \\\(x" 2 "gimple" { target {
> !aarch64*-*-* } } } } */
> + /* { dg-final { scan-tree-dump-times "f04 \\\(x" 2 "gimple" } } */
> /* After simd clones are created, the original non-clone test1 shall
> call f03 (score 6), the sse2/avx/avx2 clones too, but avx512f clones
> shall call f01 with score 8. */
> /* { dg-final { scan-tree-dump-not "f04 \\\(x" "optimized" } } */
> - /* { dg-final { scan-tree-dump-times "f03 \\\(x" 14 "optimized" { target {
> !aarch64*-*-* } } } } */
> - /* { dg-final { scan-tree-dump-times "f03 \\\(x" 10 "optimized" { target {
> aarch64*-*-* } } } } */
> - /* { dg-final { scan-tree-dump-times "f01 \\\(x" 4 "optimized" { target {
> !aarch64*-*-* } } } } */
> - /* { dg-final { scan-tree-dump-times "f01 \\\(x" 0 "optimized" { target {
> aarch64*-*-* } } } } */
> + /* { dg-final { scan-tree-dump-times "f03 \\\(x" 14 "optimized" } } */
> + /* { dg-final { scan-tree-dump-times "f01 \\\(x" 4 "optimized" } } */
> int a = f04 (x);
> int b = f04 (x);
> return a + b;
> diff --git a/gcc/testsuite/gfortran.dg/gomp/declare-variant-14.f90
> b/gcc/testsuite/gfortran.dg/gomp/declare-variant-14.f90
> index 6319df0558f..8db341fd153 100644
> --- a/gcc/testsuite/gfortran.dg/gomp/declare-variant-14.f90
> +++ b/gcc/testsuite/gfortran.dg/gomp/declare-variant-14.f90
> @@ -1,6 +1,6 @@
> -! { dg-do compile { target vect_simd_clones } }
> +! { dg-do compile { target { { i?86-*-* x86_64-*-* } && vect_simd_clones } }
> } */
> ! { dg-additional-options "-O0 -fdump-tree-gimple -fdump-tree-optimized" }
> -! { dg-additional-options "-mno-sse3" { target { i?86-*-* x86_64-*-* } } }
> +! { dg-additional-options "-mno-sse3" }
>
> module main
> implicit none
> @@ -40,10 +40,8 @@ contains
> ! call f03 (score 6), the sse2/avx/avx2 clones too, but avx512f clones
> ! shall call f01 with score 8.
> ! { dg-final { scan-tree-dump-not "f04 \\\(x" "optimized" } }
> - ! { dg-final { scan-tree-dump-times "f03 \\\(x" 14 "optimized" { target
> { !aarch64*-*-* } } } }
> - ! { dg-final { scan-tree-dump-times "f03 \\\(x" 6 "optimized" { target {
> aarch64*-*-* } } } }
> - ! { dg-final { scan-tree-dump-times "f01 \\\(x" 4 "optimized" { target {
> !aarch64*-*-* } } } }
> - ! { dg-final { scan-tree-dump-times "f01 \\\(x" 0 "optimized" { target {
> aarch64*-*-* } } } }
> + ! { dg-final { scan-tree-dump-times "f03 \\\(x" 14 "optimized" } }
> + ! { dg-final { scan-tree-dump-times "f01 \\\(x" 4 "optimized" } }
> a = f04 (x)
> b = f04 (x)
> test1 = a + b
