From 5f1635e2e69fedaace1b7c77f2a02137b9c38ba4 Mon Sep 17 00:00:00 2001 From: Thomas Schwinge Date: Wed, 2 Nov 2022 16:49:13 +0100 Subject: [PATCH] Fortran "declare create"/allocate support for OpenACC: adjust 'libgomp.oacc-fortran/declare-allocatable-1*.f90' libgomp/ * testsuite/libgomp.oacc-fortran/declare-allocatable-1-directive.f90: Adjust. * testsuite/libgomp.oacc-fortran/declare-allocatable-1-runtime.f90: Likewise. * testsuite/libgomp.oacc-fortran/declare-allocatable-1.f90: Likewise. --- libgomp/ChangeLog.omp | 7 +++++++ .../declare-allocatable-1-directive.f90 | 7 +++---- .../libgomp.oacc-fortran/declare-allocatable-1-runtime.f90 | 7 +++---- .../libgomp.oacc-fortran/declare-allocatable-1.f90 | 5 +---- 4 files changed, 14 insertions(+), 12 deletions(-) diff --git a/libgomp/ChangeLog.omp b/libgomp/ChangeLog.omp index 38048785174a..03867008500b 100644 --- a/libgomp/ChangeLog.omp +++ b/libgomp/ChangeLog.omp @@ -1,5 +1,12 @@ 2022-11-02 Thomas Schwinge + * testsuite/libgomp.oacc-fortran/declare-allocatable-1-directive.f90: + Adjust. + * testsuite/libgomp.oacc-fortran/declare-allocatable-1-runtime.f90: + Likewise. + * testsuite/libgomp.oacc-fortran/declare-allocatable-1.f90: + Likewise. + * testsuite/libgomp.oacc-fortran/declare-allocatable-1-directive.f90: XFAIL some OpenACC 'kernels' confusion. * testsuite/libgomp.oacc-fortran/declare-allocatable-1-runtime.f90: diff --git a/libgomp/testsuite/libgomp.oacc-fortran/declare-allocatable-1-directive.f90 b/libgomp/testsuite/libgomp.oacc-fortran/declare-allocatable-1-directive.f90 index 6dd6f4805199..6c5d6d873551 100644 --- a/libgomp/testsuite/libgomp.oacc-fortran/declare-allocatable-1-directive.f90 +++ b/libgomp/testsuite/libgomp.oacc-fortran/declare-allocatable-1-directive.f90 @@ -2,11 +2,10 @@ ! { dg-do run } -!TODO-OpenACC-declare-allocate -! Missing support for OpenACC "Changes from Version 2.0 to 2.5": +! We've got support for OpenACC "Changes from Version 2.0 to 2.5": ! "The 'declare create' directive with a Fortran 'allocatable' has new behavior". -! Thus, after 'allocate'/before 'deallocate', do -! '!$acc enter data create'/'!$acc exit data delete' manually. +! Yet, after 'allocate'/before 'deallocate', do +! '!$acc enter data create'/'!$acc exit data delete' manually, too. !TODO { dg-additional-options -fno-inline } for stable results regarding OpenACC 'routine'. diff --git a/libgomp/testsuite/libgomp.oacc-fortran/declare-allocatable-1-runtime.f90 b/libgomp/testsuite/libgomp.oacc-fortran/declare-allocatable-1-runtime.f90 index f86413b6b11f..66a87e8850f6 100644 --- a/libgomp/testsuite/libgomp.oacc-fortran/declare-allocatable-1-runtime.f90 +++ b/libgomp/testsuite/libgomp.oacc-fortran/declare-allocatable-1-runtime.f90 @@ -2,11 +2,10 @@ ! { dg-do run } -!TODO-OpenACC-declare-allocate -! Missing support for OpenACC "Changes from Version 2.0 to 2.5": +! We've got support for OpenACC "Changes from Version 2.0 to 2.5": ! "The 'declare create' directive with a Fortran 'allocatable' has new behavior". -! Thus, after 'allocate'/before 'deallocate', call 'acc_create'/'acc_delete' -! manually. +! Yet, after 'allocate'/before 'deallocate', call 'acc_create'/'acc_delete' +! manually, too. !TODO { dg-additional-options -fno-inline } for stable results regarding OpenACC 'routine'. diff --git a/libgomp/testsuite/libgomp.oacc-fortran/declare-allocatable-1.f90 b/libgomp/testsuite/libgomp.oacc-fortran/declare-allocatable-1.f90 index fb2ede134659..01275c693466 100644 --- a/libgomp/testsuite/libgomp.oacc-fortran/declare-allocatable-1.f90 +++ b/libgomp/testsuite/libgomp.oacc-fortran/declare-allocatable-1.f90 @@ -2,11 +2,8 @@ ! { dg-do run } -!TODO-OpenACC-declare-allocate -! Not currently implementing correct '-DACC_MEM_SHARED=0' behavior: -! Missing support for OpenACC "Changes from Version 2.0 to 2.5": +! We've got support for OpenACC "Changes from Version 2.0 to 2.5": ! "The 'declare create' directive with a Fortran 'allocatable' has new behavior". -! { dg-xfail-run-if TODO { *-*-* } { -DACC_MEM_SHARED=0 } } !TODO { dg-additional-options -fno-inline } for stable results regarding OpenACC 'routine'. -- 2.47.2