From e923330e1bc5401844a5969f1fd0dab3cd985095 Mon Sep 17 00:00:00 2001 From: Tom de Vries Date: Sat, 7 Oct 2017 08:46:00 +0000 Subject: [PATCH] Fix libgomp.oacc-fortran/{firstprivate-1,parallel-reduction}.f90 for non-nvidia devices 2017-10-07 Tom de Vries * testsuite/libgomp.oacc-fortran/firstprivate-1.f90 (firstprivate): Remove acc_device_nvidia references. * testsuite/libgomp.oacc-fortran/parallel-reduction.f90 (reduction): Same. From-SVN: r253507 --- libgomp/ChangeLog | 7 +++++++ libgomp/testsuite/libgomp.oacc-fortran/firstprivate-1.f90 | 2 +- .../testsuite/libgomp.oacc-fortran/parallel-reduction.f90 | 4 ++-- 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/libgomp/ChangeLog b/libgomp/ChangeLog index fe97eeec790..afa373ec7bb 100644 --- a/libgomp/ChangeLog +++ b/libgomp/ChangeLog @@ -1,3 +1,10 @@ +2017-10-07 Tom de Vries + + * testsuite/libgomp.oacc-fortran/firstprivate-1.f90 (firstprivate): + Remove acc_device_nvidia references. + * testsuite/libgomp.oacc-fortran/parallel-reduction.f90 (reduction): + Same. + 2017-10-05 Tom de Vries * testsuite/libgomp.oacc-c-c++-common/loop-red-g-1.c (main): Remove diff --git a/libgomp/testsuite/libgomp.oacc-fortran/firstprivate-1.f90 b/libgomp/testsuite/libgomp.oacc-fortran/firstprivate-1.f90 index d3f909361fb..38660967aa7 100644 --- a/libgomp/testsuite/libgomp.oacc-fortran/firstprivate-1.f90 +++ b/libgomp/testsuite/libgomp.oacc-fortran/firstprivate-1.f90 @@ -5,7 +5,7 @@ program firstprivate integer :: a, b(Nupper), c, d, n include "openacc_lib.h" - if (acc_get_device_type () .eq. acc_device_nvidia) then + if (acc_get_device_type () .ne. acc_device_host) then n = Nupper else n = 1 diff --git a/libgomp/testsuite/libgomp.oacc-fortran/parallel-reduction.f90 b/libgomp/testsuite/libgomp.oacc-fortran/parallel-reduction.f90 index 31db7e12454..d0559a2adf7 100644 --- a/libgomp/testsuite/libgomp.oacc-fortran/parallel-reduction.f90 +++ b/libgomp/testsuite/libgomp.oacc-fortran/parallel-reduction.f90 @@ -15,7 +15,7 @@ program reduction s2 = s2 + 1 !$acc end parallel - if (acc_get_device_type () .eq. acc_device_nvidia) then + if (acc_get_device_type () .ne. acc_device_host) then if (s1 .ne. n) call abort if (s2 .ne. n) call abort else @@ -29,7 +29,7 @@ program reduction s2 = 0 call redsub (s1, s2, n) - if (acc_get_device_type () .eq. acc_device_nvidia) then + if (acc_get_device_type () .ne. acc_device_host) then if (s1 .ne. n) call abort else if (s2 .ne. 1) call abort -- 2.30.2