From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from esa1.mentor.iphmx.com (esa1.mentor.iphmx.com [68.232.129.153]) by sourceware.org (Postfix) with ESMTPS id E52713858439 for ; Thu, 9 Feb 2023 11:26:55 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org E52713858439 Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=codesourcery.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=mentor.com X-IronPort-AV: E=Sophos;i="5.97,283,1669104000"; d="scan'208,223";a="100170766" Received: from orw-gwy-02-in.mentorg.com ([192.94.38.167]) by esa1.mentor.iphmx.com with ESMTP; 09 Feb 2023 03:26:55 -0800 IronPort-SDR: bj3HuHhyhXCxYg+nqC+md9YI+TtE70wuieZuwt58szfsCnCmF2IWWFV1QajGALEdZLTdybti02 6rpg54zsSkms5zN67t/91IAPb/z1BIGtpBMH7Ul7SEK5BMVy4SVIWMI4ETnHV9p8UI0v8lS7hK +4m6ovY0SwN7950lm5fhf7Fg2u1gnF2OM8R63IT0nyQCmz+WNGuovcNHVtWxg5xtXftDbaSnSq PAwgYi+Y1zb34wsNS+UghzwfB8dnLgXGuoQWx5xDPvWWLJrz9CM5NPAt2Nck7VFVe3M0CCvLN9 LKI= From: Thomas Schwinge To: Chung-Lin Tang , CC: Jakub Jelinek , Tobias Burnus , Andrew Stubbs , "Hafiz Abid Qadeer" Subject: [og12] '{c-c++-common,gfortran.dg}/gomp/uses_allocators-*' -> 'libgomp.{c-c++-common,fortran}/uses_allocators-*' (was: [PATCH, OpenMP] Implement uses_allocators clause for target regions) In-Reply-To: <46d77e14-080c-db6c-4032-e12899c5d059@codesourcery.com> References: <46d77e14-080c-db6c-4032-e12899c5d059@codesourcery.com> User-Agent: Notmuch/0.29.3+94~g74c3f1b (https://notmuchmail.org) Emacs/28.2 (x86_64-pc-linux-gnu) Date: Thu, 9 Feb 2023 12:26:41 +0100 Message-ID: <87bkm313m6.fsf@euler.schwinge.homeip.net> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" X-Originating-IP: [137.202.0.90] X-ClientProxiedBy: svr-ies-mbx-11.mgc.mentorg.com (139.181.222.11) To svr-ies-mbx-10.mgc.mentorg.com (139.181.222.10) X-Spam-Status: No, score=-11.9 required=5.0 tests=BAYES_00,GIT_PATCH_0,HEADER_FROM_DIFFERENT_DOMAINS,KAM_DMARC_STATUS,SPF_HELO_PASS,SPF_PASS,TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org List-Id: --=-=-= Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Hi! On 2022-05-06T21:20:48+0800, Chung-Lin Tang wrote= : > [...] > --- /dev/null > +++ b/gcc/testsuite/c-c++-common/gomp/uses_allocators-1.c > +#include Etc. > --- /dev/null > +++ b/gcc/testsuite/gfortran.dg/gomp/uses_allocators-1.f90 > + use omp_lib Etc. Pushed to devel/omp/gcc-12 branch commit 6e0ba07ff1859bc822c7220bfff18e7e9a147206 "'{c-c++-common,gfortran.dg}/gomp/uses_allocators-*' -> 'libgomp.{c-c++-com= mon,fortran}/uses_allocators-*'", see attached. Gr=C3=BC=C3=9Fe Thomas ----------------- Siemens Electronic Design Automation GmbH; Anschrift: Arnulfstra=C3=9Fe 201= , 80634 M=C3=BCnchen; Gesellschaft mit beschr=C3=A4nkter Haftung; Gesch=C3= =A4ftsf=C3=BChrer: Thomas Heurung, Frank Th=C3=BCrauf; Sitz der Gesellschaf= t: M=C3=BCnchen; Registergericht M=C3=BCnchen, HRB 106955 --=-=-= Content-Type: text/x-diff Content-Disposition: inline; filename="0001-c-c-common-gfortran.dg-gomp-uses_allocators-libgomp..patch" >From 6e0ba07ff1859bc822c7220bfff18e7e9a147206 Mon Sep 17 00:00:00 2001 From: Thomas Schwinge Date: Mon, 30 Jan 2023 17:55:13 +0100 Subject: [PATCH] '{c-c++-common,gfortran.dg}/gomp/uses_allocators-*' -> 'libgomp.{c-c++-common,fortran}/uses_allocators-*' Otherwise, for build-tree testing: [...]/gcc/testsuite/c-c++-common/gomp/uses_allocators-1.c:4:10: fatal error: omp.h: No such file or directory [...]/gcc/testsuite/c-c++-common/gomp/uses_allocators-2.c:3:10: fatal error: omp.h: No such file or directory [...]/gcc/testsuite/c-c++-common/gomp/uses_allocators-3.c:4:10: fatal error: omp.h: No such file or directory [...]/gcc/testsuite/gfortran.dg/gomp/uses_allocators-1.f90:5:7: Fatal Error: Cannot open module file 'omp_lib.mod' for reading at (1): No such file or directory [...]/gcc/testsuite/gfortran.dg/gomp/uses_allocators-2.f90:4:7: Fatal Error: Cannot open module file 'omp_lib.mod' for reading at (1): No such file or directory [...]/gcc/testsuite/gfortran.dg/gomp/uses_allocators-3.f90:4:7: Fatal Error: Cannot open module file 'omp_lib.mod' for reading at (1): No such file or directory ..., and thus corresponding FAILs, UNRESOLVEDs. Fix-up for og12 commit dbc770c4351c8824e8083f8aff6117a6b4ba3c0d "openmp: Implement uses_allocators clause". gcc/testsuite/ * c-c++-common/gomp/uses_allocators-1.c: Cut. * c-c++-common/gomp/uses_allocators-2.c: Likewise. * c-c++-common/gomp/uses_allocators-3.c: Likewise. * gfortran.dg/gomp/uses_allocators-1.f90: Likewise. * gfortran.dg/gomp/uses_allocators-2.f90: Likewise. * gfortran.dg/gomp/uses_allocators-3.f90: Likewise. libgomp/ * testsuite/libgomp.c++/c++.exp (check_effective_target_c) (check_effective_target_c++): New. * testsuite/libgomp.c/c.exp (check_effective_target_c) (check_effective_target_c++): Likewise. * testsuite/libgomp.c-c++-common/uses_allocators-1.c: Paste. * testsuite/libgomp.c-c++-common/uses_allocators-2.c: Likewise. * testsuite/libgomp.c-c++-common/uses_allocators-3.c: Likewise. * testsuite/libgomp.fortran/uses_allocators-1.f90: Likewise. * testsuite/libgomp.fortran/uses_allocators-2.f90: Likewise. * testsuite/libgomp.fortran/uses_allocators-3.f90: Likewise. --- gcc/testsuite/ChangeLog.omp | 7 +++++++ libgomp/ChangeLog.omp | 11 +++++++++++ libgomp/testsuite/libgomp.c++/c++.exp | 7 +++++++ .../libgomp.c-c++-common}/uses_allocators-1.c | 0 .../libgomp.c-c++-common}/uses_allocators-2.c | 0 .../libgomp.c-c++-common}/uses_allocators-3.c | 0 libgomp/testsuite/libgomp.c/c.exp | 7 +++++++ .../testsuite/libgomp.fortran}/uses_allocators-1.f90 | 0 .../testsuite/libgomp.fortran}/uses_allocators-2.f90 | 0 .../testsuite/libgomp.fortran}/uses_allocators-3.f90 | 0 10 files changed, 32 insertions(+) rename {gcc/testsuite/c-c++-common/gomp => libgomp/testsuite/libgomp.c-c++-common}/uses_allocators-1.c (100%) rename {gcc/testsuite/c-c++-common/gomp => libgomp/testsuite/libgomp.c-c++-common}/uses_allocators-2.c (100%) rename {gcc/testsuite/c-c++-common/gomp => libgomp/testsuite/libgomp.c-c++-common}/uses_allocators-3.c (100%) rename {gcc/testsuite/gfortran.dg/gomp => libgomp/testsuite/libgomp.fortran}/uses_allocators-1.f90 (100%) rename {gcc/testsuite/gfortran.dg/gomp => libgomp/testsuite/libgomp.fortran}/uses_allocators-2.f90 (100%) rename {gcc/testsuite/gfortran.dg/gomp => libgomp/testsuite/libgomp.fortran}/uses_allocators-3.f90 (100%) diff --git a/gcc/testsuite/ChangeLog.omp b/gcc/testsuite/ChangeLog.omp index 9f9d5a10ac3..936e7af0945 100644 --- a/gcc/testsuite/ChangeLog.omp +++ b/gcc/testsuite/ChangeLog.omp @@ -1,5 +1,12 @@ 2023-02-09 Thomas Schwinge + * c-c++-common/gomp/uses_allocators-1.c: Cut. + * c-c++-common/gomp/uses_allocators-2.c: Likewise. + * c-c++-common/gomp/uses_allocators-3.c: Likewise. + * gfortran.dg/gomp/uses_allocators-1.f90: Likewise. + * gfortran.dg/gomp/uses_allocators-2.f90: Likewise. + * gfortran.dg/gomp/uses_allocators-3.f90: Likewise. + * c-c++-common/gomp/alloc-pinned-1.c: Cut. * gfortran.dg/gomp/allocate-4.f90: Fix 'omp_allocator_handle_kind' diff --git a/libgomp/ChangeLog.omp b/libgomp/ChangeLog.omp index 39165173884..0a3d53602da 100644 --- a/libgomp/ChangeLog.omp +++ b/libgomp/ChangeLog.omp @@ -1,5 +1,16 @@ 2023-02-09 Thomas Schwinge + * testsuite/libgomp.c++/c++.exp (check_effective_target_c) + (check_effective_target_c++): New. + * testsuite/libgomp.c/c.exp (check_effective_target_c) + (check_effective_target_c++): Likewise. + * testsuite/libgomp.c-c++-common/uses_allocators-1.c: Paste. + * testsuite/libgomp.c-c++-common/uses_allocators-2.c: Likewise. + * testsuite/libgomp.c-c++-common/uses_allocators-3.c: Likewise. + * testsuite/libgomp.fortran/uses_allocators-1.f90: Likewise. + * testsuite/libgomp.fortran/uses_allocators-2.f90: Likewise. + * testsuite/libgomp.fortran/uses_allocators-3.f90: Likewise. + * testsuite/libgomp.c-c++-common/alloc-pinned-1.c: Paste. 2023-02-08 Tobias Burnus diff --git a/libgomp/testsuite/libgomp.c++/c++.exp b/libgomp/testsuite/libgomp.c++/c++.exp index f4884e2ffa7..1bcf21f034e 100644 --- a/libgomp/testsuite/libgomp.c++/c++.exp +++ b/libgomp/testsuite/libgomp.c++/c++.exp @@ -1,6 +1,13 @@ load_lib libgomp-dg.exp load_gcc_lib gcc-dg.exp +proc check_effective_target_c { } { + return 0 +} +proc check_effective_target_c++ { } { + return 1 +} + global shlib_ext set shlib_ext [get_shlib_extension] diff --git a/gcc/testsuite/c-c++-common/gomp/uses_allocators-1.c b/libgomp/testsuite/libgomp.c-c++-common/uses_allocators-1.c similarity index 100% rename from gcc/testsuite/c-c++-common/gomp/uses_allocators-1.c rename to libgomp/testsuite/libgomp.c-c++-common/uses_allocators-1.c diff --git a/gcc/testsuite/c-c++-common/gomp/uses_allocators-2.c b/libgomp/testsuite/libgomp.c-c++-common/uses_allocators-2.c similarity index 100% rename from gcc/testsuite/c-c++-common/gomp/uses_allocators-2.c rename to libgomp/testsuite/libgomp.c-c++-common/uses_allocators-2.c diff --git a/gcc/testsuite/c-c++-common/gomp/uses_allocators-3.c b/libgomp/testsuite/libgomp.c-c++-common/uses_allocators-3.c similarity index 100% rename from gcc/testsuite/c-c++-common/gomp/uses_allocators-3.c rename to libgomp/testsuite/libgomp.c-c++-common/uses_allocators-3.c diff --git a/libgomp/testsuite/libgomp.c/c.exp b/libgomp/testsuite/libgomp.c/c.exp index 31bdd5795dc..3b4cdd05ac5 100644 --- a/libgomp/testsuite/libgomp.c/c.exp +++ b/libgomp/testsuite/libgomp.c/c.exp @@ -12,6 +12,13 @@ if [info exists lang_include_flags] then { load_lib libgomp-dg.exp load_gcc_lib gcc-dg.exp +proc check_effective_target_c { } { + return 1 +} +proc check_effective_target_c++ { } { + return 0 +} + # If a testcase doesn't have special options, use these. if ![info exists DEFAULT_CFLAGS] then { set DEFAULT_CFLAGS "-O2" diff --git a/gcc/testsuite/gfortran.dg/gomp/uses_allocators-1.f90 b/libgomp/testsuite/libgomp.fortran/uses_allocators-1.f90 similarity index 100% rename from gcc/testsuite/gfortran.dg/gomp/uses_allocators-1.f90 rename to libgomp/testsuite/libgomp.fortran/uses_allocators-1.f90 diff --git a/gcc/testsuite/gfortran.dg/gomp/uses_allocators-2.f90 b/libgomp/testsuite/libgomp.fortran/uses_allocators-2.f90 similarity index 100% rename from gcc/testsuite/gfortran.dg/gomp/uses_allocators-2.f90 rename to libgomp/testsuite/libgomp.fortran/uses_allocators-2.f90 diff --git a/gcc/testsuite/gfortran.dg/gomp/uses_allocators-3.f90 b/libgomp/testsuite/libgomp.fortran/uses_allocators-3.f90 similarity index 100% rename from gcc/testsuite/gfortran.dg/gomp/uses_allocators-3.f90 rename to libgomp/testsuite/libgomp.fortran/uses_allocators-3.f90 -- 2.25.1 --=-=-=--