From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <kcy@sourceware.org>
Received: by sourceware.org (Postfix, from userid 1729)
 id 0D7293858C27; Mon, 18 Oct 2021 21:19:51 +0000 (GMT)
DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 0D7293858C27
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Content-Type: text/plain; charset="utf-8"
From: Kwok Yeung <kcy@gcc.gnu.org>
To: gcc-cvs@gcc.gnu.org
Subject: [gcc r12-4485] openmp: Add additional tests for declare variant in
 Fortran
X-Act-Checkin: gcc
X-Git-Author: Kwok Cheung Yeung <kcy@codesourcery.com>
X-Git-Refname: refs/heads/master
X-Git-Oldrev: 4abc0c196b10251dc80d0743ba9e8ab3e56c61ed
X-Git-Newrev: 38733234024697d2144613c4a992e970f40afad8
Message-Id: <20211018211951.0D7293858C27@sourceware.org>
Date: Mon, 18 Oct 2021 21:19:51 +0000 (GMT)
X-BeenThere: gcc-cvs@gcc.gnu.org
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: Gcc-cvs mailing list <gcc-cvs.gcc.gnu.org>
List-Unsubscribe: <https://gcc.gnu.org/mailman/options/gcc-cvs>,
 <mailto:gcc-cvs-request@gcc.gnu.org?subject=unsubscribe>
List-Archive: <https://gcc.gnu.org/pipermail/gcc-cvs/>
List-Help: <mailto:gcc-cvs-request@gcc.gnu.org?subject=help>
List-Subscribe: <https://gcc.gnu.org/mailman/listinfo/gcc-cvs>,
 <mailto:gcc-cvs-request@gcc.gnu.org?subject=subscribe>
X-List-Received-Date: Mon, 18 Oct 2021 21:19:51 -0000

https://gcc.gnu.org/g:38733234024697d2144613c4a992e970f40afad8

commit r12-4485-g38733234024697d2144613c4a992e970f40afad8
Author: Kwok Cheung Yeung <kcy@codesourcery.com>
Date:   Mon Oct 18 13:56:59 2021 -0700

    openmp: Add additional tests for declare variant in Fortran
    
    Add tests to check that explicitly specifying the containing procedure as the
    base name for declare variant works.
    
    2021-10-18  Kwok Cheung Yeung  <kcy@codesourcery.com>
    
    gcc/testsuite/
    
            * gfortran.dg/gomp/declare-variant-15.f90 (variant2, base2, test2):
            Add tests.
            * gfortran.dg/gomp/declare-variant-16.f90 (base2, variant2, test2):
            Add tests.

Diff:
---
 gcc/testsuite/gfortran.dg/gomp/declare-variant-15.f90 | 13 +++++++++++++
 gcc/testsuite/gfortran.dg/gomp/declare-variant-16.f90 | 14 +++++++++++++-
 2 files changed, 26 insertions(+), 1 deletion(-)

diff --git a/gcc/testsuite/gfortran.dg/gomp/declare-variant-15.f90 b/gcc/testsuite/gfortran.dg/gomp/declare-variant-15.f90
index b2ad96a8998..4a88e3e46c7 100644
--- a/gcc/testsuite/gfortran.dg/gomp/declare-variant-15.f90
+++ b/gcc/testsuite/gfortran.dg/gomp/declare-variant-15.f90
@@ -14,6 +14,13 @@ contains
   subroutine base ()
   end subroutine
 
+  subroutine variant2 ()
+  end subroutine
+
+  subroutine base2 ()
+    !$omp declare variant (base2: variant2) match (construct={parallel})
+  end subroutine
+
   subroutine test1 ()
     !$omp target
       !$omp parallel
@@ -21,4 +28,10 @@ contains
       !$omp end parallel
     !$omp end target
   end subroutine
+
+  subroutine test2 ()
+    !$omp parallel
+	call base2 ()	! { dg-final { scan-tree-dump-times "variant2 \\\(\\\);" 1 "gimple" } }
+    !$omp end parallel
+  end subroutine
 end module
diff --git a/gcc/testsuite/gfortran.dg/gomp/declare-variant-16.f90 b/gcc/testsuite/gfortran.dg/gomp/declare-variant-16.f90
index fc97322e667..5e34d474da4 100644
--- a/gcc/testsuite/gfortran.dg/gomp/declare-variant-16.f90
+++ b/gcc/testsuite/gfortran.dg/gomp/declare-variant-16.f90
@@ -10,15 +10,27 @@ module main
     subroutine base ()
       !$omp declare variant (variant) match (construct={parallel})
     end subroutine
+    
+    subroutine base2 ()
+      !$omp declare variant (base2: variant2) match (construct={target})
+    end subroutine
   end interface
-
 contains
   subroutine variant ()
   end subroutine
 
+  subroutine variant2 ()
+  end subroutine
+
   subroutine test ()
     !$omp parallel
       call base ()  ! { dg-final { scan-tree-dump-times "variant \\\(\\\);" 1 "gimple" } }
     !$omp end parallel
   end subroutine
+
+  subroutine test2 ()
+    !$omp target
+      call base2 ()  ! { dg-final { scan-tree-dump-times "variant2 \\\(\\\);" 1 "gimple" } }
+    !$omp end target
+  end subroutine
 end module