| Message ID | db699f15-2fbf-a940-865f-4cb140258322@codesourcery.com |
|---|---|
| State | New |
| Headers | show |
| Series | [og10] Fix goacc/loop-2-kernels.f95 testcase | expand |
Hi Kwok! On 2020-07-22T16:08:20+0100, Kwok Cheung Yeung <kcy@codesourcery.com> wrote: > This test fails because the "'seq' overrides other OpenACC loop specifiers" > error is not appearing in the compiler output. The C-equivalent version of the > test (c-c++-common/goacc/loop-2-kernels.c) has these tests XFAILed in the commit > 'Make new OpenACC kernels conversion the default; adjust and add tests' (commit > 757f56ddc43fd80bb8740222ec352111b26d66e9), so the Fortran version should > probably be XFAILed too. > > Okay for OG10? OK, thanks. > From 87cf165b9b45f4cedd9cda362d9238486024a527 Mon Sep 17 00:00:00 2001 > From: Kwok Cheung Yeung <kcy@codesourcery.com> > Date: Thu, 25 Jun 2020 12:05:18 -0700 > Subject: [PATCH 5/6] XFAIL tests in gfortran.dg/goacc/loop-2-kernels.f95 > > 2020-07-21 Kwok Cheung Yeung <kcy@codesourcery.com> > > gcc/testsuite/ > * gfortran.dg/goacc/loop-2-kernels.f95: Add XFAILs. Again, in the commit log please reference the commit this should've been part of. Actually, just include your rationale from the patch submission email. :-) Grüße Thomas > gcc/testsuite/gfortran.dg/goacc/loop-2-kernels.f95 | 16 ++++++++-------- > 1 file changed, 8 insertions(+), 8 deletions(-) > > diff --git a/gcc/testsuite/gfortran.dg/goacc/loop-2-kernels.f95 b/gcc/testsuite/gfortran.dg/goacc/loop-2-kernels.f95 > index 874c62d..a4cf11c 100644 > --- a/gcc/testsuite/gfortran.dg/goacc/loop-2-kernels.f95 > +++ b/gcc/testsuite/gfortran.dg/goacc/loop-2-kernels.f95 > @@ -35,7 +35,7 @@ program test > DO j = 1,10 > ENDDO > ENDDO > - !$acc loop seq gang ! { dg-error "'seq' overrides other OpenACC loop specifiers" } > + !$acc loop seq gang ! { dg-error "'seq' overrides other OpenACC loop specifiers" "TODO" { xfail *-*-* } } > DO i = 1,10 > ENDDO > > @@ -60,7 +60,7 @@ program test > DO j = 1,10 > ENDDO > ENDDO > - !$acc loop seq worker ! { dg-error "'seq' overrides other OpenACC loop specifiers" } > + !$acc loop seq worker ! { dg-error "'seq' overrides other OpenACC loop specifiers" "TODO" { xfail *-*-* } } > DO i = 1,10 > ENDDO > !$acc loop gang worker > @@ -88,7 +88,7 @@ program test > DO j = 1,10 > ENDDO > ENDDO > - !$acc loop seq vector ! { dg-error "'seq' overrides other OpenACC loop specifiers" } > + !$acc loop seq vector ! { dg-error "'seq' overrides other OpenACC loop specifiers" "TODO" { xfail *-*-* } } > DO i = 1,10 > ENDDO > !$acc loop gang vector > @@ -101,7 +101,7 @@ program test > !$acc loop auto > DO i = 1,10 > ENDDO > - !$acc loop seq auto ! { dg-error "'seq' overrides other OpenACC loop specifiers" } > + !$acc loop seq auto ! { dg-error "'seq' overrides other OpenACC loop specifiers" "TODO" { xfail *-*-* } } > DO i = 1,10 > ENDDO > !$acc loop gang auto ! { dg-error "'auto' conflicts with other OpenACC loop specifiers" } > @@ -133,7 +133,7 @@ program test > !$acc kernels loop gang(static:*) > DO i = 1,10 > ENDDO > - !$acc kernels loop seq gang ! { dg-error "'seq' overrides other OpenACC loop specifiers" } > + !$acc kernels loop seq gang ! { dg-error "'seq' overrides other OpenACC loop specifiers" "TODO" { xfail *-*-* } } > DO i = 1,10 > ENDDO > > @@ -146,7 +146,7 @@ program test > !$acc kernels loop worker(num:5) > DO i = 1,10 > ENDDO > - !$acc kernels loop seq worker ! { dg-error "'seq' overrides other OpenACC loop specifiers" } > + !$acc kernels loop seq worker ! { dg-error "'seq' overrides other OpenACC loop specifiers" "TODO" { xfail *-*-* } } > DO i = 1,10 > ENDDO > !$acc kernels loop gang worker > @@ -162,7 +162,7 @@ program test > !$acc kernels loop vector(length:5) > DO i = 1,10 > ENDDO > - !$acc kernels loop seq vector ! { dg-error "'seq' overrides other OpenACC loop specifiers" } > + !$acc kernels loop seq vector ! { dg-error "'seq' overrides other OpenACC loop specifiers" "TODO" { xfail *-*-* } } > DO i = 1,10 > ENDDO > !$acc kernels loop gang vector > @@ -175,7 +175,7 @@ program test > !$acc kernels loop auto > DO i = 1,10 > ENDDO > - !$acc kernels loop seq auto ! { dg-error "'seq' overrides other OpenACC loop specifiers" } > + !$acc kernels loop seq auto ! { dg-error "'seq' overrides other OpenACC loop specifiers" "TODO" { xfail *-*-* } } > DO i = 1,10 > ENDDO > !$acc kernels loop gang auto ! { dg-error "'auto' conflicts with other OpenACC loop specifiers" } ----------------- Mentor Graphics (Deutschland) GmbH, Arnulfstraße 201, 80634 München / Germany Registergericht München HRB 106955, Geschäftsführer: Thomas Heurung, Alexander Walter
diff --git a/gcc/testsuite/gfortran.dg/goacc/loop-2-kernels.f95 b/gcc/testsuite/gfortran.dg/goacc/loop-2-kernels.f95 index 874c62d..a4cf11c 100644 --- a/gcc/testsuite/gfortran.dg/goacc/loop-2-kernels.f95 +++ b/gcc/testsuite/gfortran.dg/goacc/loop-2-kernels.f95 @@ -35,7 +35,7 @@ program test DO j = 1,10 ENDDO ENDDO - !$acc loop seq gang ! { dg-error "'seq' overrides other OpenACC loop specifiers" } + !$acc loop seq gang ! { dg-error "'seq' overrides other OpenACC loop specifiers" "TODO" { xfail *-*-* } } DO i = 1,10 ENDDO @@ -60,7 +60,7 @@ program test DO j = 1,10 ENDDO ENDDO - !$acc loop seq worker ! { dg-error "'seq' overrides other OpenACC loop specifiers" } + !$acc loop seq worker ! { dg-error "'seq' overrides other OpenACC loop specifiers" "TODO" { xfail *-*-* } } DO i = 1,10 ENDDO !$acc loop gang worker @@ -88,7 +88,7 @@ program test DO j = 1,10 ENDDO ENDDO - !$acc loop seq vector ! { dg-error "'seq' overrides other OpenACC loop specifiers" } + !$acc loop seq vector ! { dg-error "'seq' overrides other OpenACC loop specifiers" "TODO" { xfail *-*-* } } DO i = 1,10 ENDDO !$acc loop gang vector @@ -101,7 +101,7 @@ program test !$acc loop auto DO i = 1,10 ENDDO - !$acc loop seq auto ! { dg-error "'seq' overrides other OpenACC loop specifiers" } + !$acc loop seq auto ! { dg-error "'seq' overrides other OpenACC loop specifiers" "TODO" { xfail *-*-* } } DO i = 1,10 ENDDO !$acc loop gang auto ! { dg-error "'auto' conflicts with other OpenACC loop specifiers" } @@ -133,7 +133,7 @@ program test !$acc kernels loop gang(static:*) DO i = 1,10 ENDDO - !$acc kernels loop seq gang ! { dg-error "'seq' overrides other OpenACC loop specifiers" } + !$acc kernels loop seq gang ! { dg-error "'seq' overrides other OpenACC loop specifiers" "TODO" { xfail *-*-* } } DO i = 1,10 ENDDO @@ -146,7 +146,7 @@ program test !$acc kernels loop worker(num:5) DO i = 1,10 ENDDO - !$acc kernels loop seq worker ! { dg-error "'seq' overrides other OpenACC loop specifiers" } + !$acc kernels loop seq worker ! { dg-error "'seq' overrides other OpenACC loop specifiers" "TODO" { xfail *-*-* } } DO i = 1,10 ENDDO !$acc kernels loop gang worker @@ -162,7 +162,7 @@ program test !$acc kernels loop vector(length:5) DO i = 1,10 ENDDO - !$acc kernels loop seq vector ! { dg-error "'seq' overrides other OpenACC loop specifiers" } + !$acc kernels loop seq vector ! { dg-error "'seq' overrides other OpenACC loop specifiers" "TODO" { xfail *-*-* } } DO i = 1,10 ENDDO !$acc kernels loop gang vector @@ -175,7 +175,7 @@ program test !$acc kernels loop auto DO i = 1,10 ENDDO - !$acc kernels loop seq auto ! { dg-error "'seq' overrides other OpenACC loop specifiers" } + !$acc kernels loop seq auto ! { dg-error "'seq' overrides other OpenACC loop specifiers" "TODO" { xfail *-*-* } } DO i = 1,10 ENDDO !$acc kernels loop gang auto ! { dg-error "'auto' conflicts with other OpenACC loop specifiers" }
This test fails because the "'seq' overrides other OpenACC loop specifiers" error is not appearing in the compiler output. The C-equivalent version of the test (c-c++-common/goacc/loop-2-kernels.c) has these tests XFAILed in the commit 'Make new OpenACC kernels conversion the default; adjust and add tests' (commit 757f56ddc43fd80bb8740222ec352111b26d66e9), so the Fortran version should probably be XFAILed too. Okay for OG10? Kwok From 87cf165b9b45f4cedd9cda362d9238486024a527 Mon Sep 17 00:00:00 2001 From: Kwok Cheung Yeung <kcy@codesourcery.com> Date: Thu, 25 Jun 2020 12:05:18 -0700 Subject: [PATCH 5/6] XFAIL tests in gfortran.dg/goacc/loop-2-kernels.f95 2020-07-21 Kwok Cheung Yeung <kcy@codesourcery.com> gcc/testsuite/ * gfortran.dg/goacc/loop-2-kernels.f95: Add XFAILs. --- gcc/testsuite/gfortran.dg/goacc/loop-2-kernels.f95 | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-)