Hi, Several goacc/acc_on_device tests fail for a few targets:
hppa2.0w-hp-hpux11.11 (PR testsuite/64850) https://gcc.gnu.org/ml/gcc-testresults/2015-01/msg02659.html m68k-unknown-linux-gnu https://gcc.gnu.org/ml/gcc-testresults/2015-01/msg02960.html sh4-unknown-linux-gnu https://gcc.gnu.org/ml/gcc-testresults/2015-01/msg02930.html Also they fail with special options x86_64-unknown-linux-gnu -fpic -mcmodel=large https://gcc.gnu.org/ml/gcc-testresults/2015-02/msg00198.html Those tests scan .expand rtl dumps to get the number of calls for acc_on_device function. For almost targets, the call rtx looks something like (call (mem:QI (symbol_ref:SI ("acc_on_device") [flags 0x41] <function_decl 0xb7614100 acc_on_device>) [0 acc_on_device S1 A8]) and tests use the regular expression "\\\(call \[^\\n\]*\\\"acc_on_device" to detect it. This expression doesn't match with the corresponding call rtx (call (mem:SI (symbol_ref/v:SI ("@acc_on_device") [flags 0x41] <function_decl 0xb764d900 acc_on_device>) [0 acc_on_device S4 A32]) for hppa and something like (call (mem:QI (reg/f:SI 33) [0 acc_on_device S1 A8]) for m68k and sh. All call rtxes have the function name in the alias set of its mem rtx and it seems that the regular expression "\\\(call \[^\\n\]* acc_on_device" works for all cases. The attached patch is tested on i686-pc-linux-gnu and sh4-unknown-linux-gnu. Regards, kaz -- 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. diff --git a/c-c++-common/goacc/acc_on_device-2-off.c b/c-c++-common/goacc/acc_on_device-2-off.c index 25d21ad..ea31047 100644 --- a/c-c++-common/goacc/acc_on_device-2-off.c +++ b/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/c-c++-common/goacc/acc_on_device-2.c b/c-c++-common/goacc/acc_on_device-2.c index d5389a9..2f4ee2b 100644 --- a/c-c++-common/goacc/acc_on_device-2.c +++ b/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 <openacc.h>. - { 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.dg/goacc/acc_on_device-1.c b/gcc.dg/goacc/acc_on_device-1.c index 1a0276e..d0dbc82 100644 --- a/gcc.dg/goacc/acc_on_device-1.c +++ b/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/gfortran.dg/goacc/acc_on_device-1.f95 b/gfortran.dg/goacc/acc_on_device-1.f95 index 9dfde26..0126d9c 100644 --- a/gfortran.dg/goacc/acc_on_device-1.f95 +++ b/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/gfortran.dg/goacc/acc_on_device-2-off.f95 b/gfortran.dg/goacc/acc_on_device-2-off.f95 index cf28264..0a4978e 100644 --- a/gfortran.dg/goacc/acc_on_device-2-off.f95 +++ b/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/gfortran.dg/goacc/acc_on_device-2.f95 b/gfortran.dg/goacc/acc_on_device-2.f95 index 7730a60..43ad022 100644 --- a/gfortran.dg/goacc/acc_on_device-2.f95 +++ b/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" } }
