From d3fb59c4b7f669053c82dfb85899a9a3728c695d Mon Sep 17 00:00:00 2001 From: Kaz Kojima Date: Sat, 14 Feb 2015 23:50:25 +0000 Subject: [PATCH] re PR testsuite/64850 (FAIL: gfortran.dg/goacc/acc_on_device-1.f95 -O scan-rtl-dump-times expand "\\(call [^\\n]*\\"acc_on_device" 4) PR testsuite/64850 Tweak acc_on_device* tests. From-SVN: r220711 --- gcc/testsuite/ChangeLog | 11 +++++++++++ .../c-c++-common/goacc/acc_on_device-2-off.c | 2 +- gcc/testsuite/c-c++-common/goacc/acc_on_device-2.c | 2 +- gcc/testsuite/gcc.dg/goacc/acc_on_device-1.c | 2 +- gcc/testsuite/gfortran.dg/goacc/acc_on_device-1.f95 | 2 +- .../gfortran.dg/goacc/acc_on_device-2-off.f95 | 2 +- gcc/testsuite/gfortran.dg/goacc/acc_on_device-2.f95 | 2 +- 7 files changed, 17 insertions(+), 6 deletions(-) diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index f58cfcc1272..587b7a36d75 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,14 @@ +2015--02-14 Kaz Kojima + + PR testsuite/64850 + * gcc.dg/goacc/acc_on_device-1.c: Use a space instead of \\\" in + the expression to find calls. + * c-c++-common/goacc/acc_on_device-2.c: Likewise. + * c-c++-common/goacc/acc_on_device-2-off.c: Likewise. + * gfortran.dg/goacc/acc_on_device-1.f95: Likewise. + * gfortran.dg/goacc/acc_on_device-2.f95: Likewise. + * gfortran.dg/goacc/acc_on_device-2-off.f95: Likewise. + 2015-02-14 Marek Polacek PR c/64768 diff --git a/gcc/testsuite/c-c++-common/goacc/acc_on_device-2-off.c b/gcc/testsuite/c-c++-common/goacc/acc_on_device-2-off.c index 25d21ad29c9..ea310470212 100644 --- a/gcc/testsuite/c-c++-common/goacc/acc_on_device-2-off.c +++ b/gcc/testsuite/c-c++-common/goacc/acc_on_device-2-off.c @@ -20,6 +20,6 @@ f (void) } /* Without -fopenacc, we're expecting one call. - { dg-final { scan-rtl-dump-times "\\\(call \[^\\n\]*\\\"acc_on_device" 1 "expand" } } */ + { dg-final { scan-rtl-dump-times "\\\(call \[^\\n\]* acc_on_device" 1 "expand" } } */ /* { dg-final { cleanup-rtl-dump "expand" } } */ diff --git a/gcc/testsuite/c-c++-common/goacc/acc_on_device-2.c b/gcc/testsuite/c-c++-common/goacc/acc_on_device-2.c index d5389a99072..2f4ee2bbbde 100644 --- a/gcc/testsuite/c-c++-common/goacc/acc_on_device-2.c +++ b/gcc/testsuite/c-c++-common/goacc/acc_on_device-2.c @@ -24,6 +24,6 @@ f (void) perturbs expansion as a builtin, which expects an int parameter. It's fine when changing acc_device_t to plain int, but that's not what we're doing in . - { dg-final { scan-rtl-dump-times "\\\(call \[^\\n\]*\\\"acc_on_device" 0 "expand" { xfail c++ } } } */ + { dg-final { scan-rtl-dump-times "\\\(call \[^\\n\]* acc_on_device" 0 "expand" { xfail c++ } } } */ /* { dg-final { cleanup-rtl-dump "expand" } } */ diff --git a/gcc/testsuite/gcc.dg/goacc/acc_on_device-1.c b/gcc/testsuite/gcc.dg/goacc/acc_on_device-1.c index 1a0276e04d2..d0dbc82670b 100644 --- a/gcc/testsuite/gcc.dg/goacc/acc_on_device-1.c +++ b/gcc/testsuite/gcc.dg/goacc/acc_on_device-1.c @@ -15,6 +15,6 @@ f (void) } /* Unsuitable to be handled as a builtin, so we're expecting four calls. - { dg-final { scan-rtl-dump-times "\\\(call \[^\\n\]*\\\"acc_on_device" 4 "expand" } } */ + { dg-final { scan-rtl-dump-times "\\\(call \[^\\n\]* acc_on_device" 4 "expand" } } */ /* { dg-final { cleanup-rtl-dump "expand" } } */ diff --git a/gcc/testsuite/gfortran.dg/goacc/acc_on_device-1.f95 b/gcc/testsuite/gfortran.dg/goacc/acc_on_device-1.f95 index 9dfde26f76b..0126d9c6d99 100644 --- a/gcc/testsuite/gfortran.dg/goacc/acc_on_device-1.f95 +++ b/gcc/testsuite/gfortran.dg/goacc/acc_on_device-1.f95 @@ -17,6 +17,6 @@ logical function f () end function f ! Unsuitable to be handled as a builtin, so we're expecting four calls. -! { dg-final { scan-rtl-dump-times "\\\(call \[^\\n\]*\\\"acc_on_device" 4 "expand" } } +! { dg-final { scan-rtl-dump-times "\\\(call \[^\\n\]* acc_on_device" 4 "expand" } } ! { dg-final { cleanup-rtl-dump "expand" } } diff --git a/gcc/testsuite/gfortran.dg/goacc/acc_on_device-2-off.f95 b/gcc/testsuite/gfortran.dg/goacc/acc_on_device-2-off.f95 index cf2826475a3..0a4978e3f6b 100644 --- a/gcc/testsuite/gfortran.dg/goacc/acc_on_device-2-off.f95 +++ b/gcc/testsuite/gfortran.dg/goacc/acc_on_device-2-off.f95 @@ -34,6 +34,6 @@ logical (4) function f () end function f ! Without -fopenacc, we're expecting one call. -! { dg-final { scan-rtl-dump-times "\\\(call \[^\\n\]*\\\"acc_on_device" 1 "expand" } } +! { dg-final { scan-rtl-dump-times "\\\(call \[^\\n\]* acc_on_device" 1 "expand" } } ! { dg-final { cleanup-rtl-dump "expand" } } diff --git a/gcc/testsuite/gfortran.dg/goacc/acc_on_device-2.f95 b/gcc/testsuite/gfortran.dg/goacc/acc_on_device-2.f95 index 7730a60a7dc..43ad022fb40 100644 --- a/gcc/testsuite/gfortran.dg/goacc/acc_on_device-2.f95 +++ b/gcc/testsuite/gfortran.dg/goacc/acc_on_device-2.f95 @@ -35,6 +35,6 @@ end function f ! With -fopenacc, we're expecting the builtin to be expanded, so no calls. ! TODO: not working. -! { dg-final { scan-rtl-dump-times "\\\(call \[^\\n\]*\\\"acc_on_device" 0 "expand" { xfail *-*-* } } } +! { dg-final { scan-rtl-dump-times "\\\(call \[^\\n\]* acc_on_device" 0 "expand" { xfail *-*-* } } } ! { dg-final { cleanup-rtl-dump "expand" } } -- 2.30.2