From: Thomas Schwinge <thomas@codesourcery.com>
To: Chung-Lin Tang <cltang@codesourcery.com>, <gcc-patches@gcc.gnu.org>
Cc: Jakub Jelinek <jakub@redhat.com>,
Tobias Burnus <tobias@codesourcery.com>,
Andrew Stubbs <ams@codesourcery.com>,
"Hafiz Abid Qadeer" <abidh@codesourcery.com>
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)
Date: Thu, 9 Feb 2023 12:26:41 +0100 [thread overview]
Message-ID: <87bkm313m6.fsf@euler.schwinge.homeip.net> (raw)
In-Reply-To: <46d77e14-080c-db6c-4032-e12899c5d059@codesourcery.com>
[-- Attachment #1: Type: text/plain, Size: 821 bytes --]
Hi!
On 2022-05-06T21:20:48+0800, Chung-Lin Tang <cltang@codesourcery.com> wrote:
> [...]
> --- /dev/null
> +++ b/gcc/testsuite/c-c++-common/gomp/uses_allocators-1.c
> +#include <omp.h>
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++-common,fortran}/uses_allocators-*'",
see attached.
Grüße
Thomas
-----------------
Siemens Electronic Design Automation GmbH; Anschrift: Arnulfstraße 201, 80634 München; Gesellschaft mit beschränkter Haftung; Geschäftsführer: Thomas Heurung, Frank Thürauf; Sitz der Gesellschaft: München; Registergericht München, HRB 106955
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-c-c-common-gfortran.dg-gomp-uses_allocators-libgomp..patch --]
[-- Type: text/x-diff, Size: 7867 bytes --]
From 6e0ba07ff1859bc822c7220bfff18e7e9a147206 Mon Sep 17 00:00:00 2001
From: Thomas Schwinge <thomas@codesourcery.com>
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 <thomas@codesourcery.com>
+ * 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 <thomas@codesourcery.com>
+ * 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 <tobias@codesourcery.com>
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
prev parent reply other threads:[~2023-02-09 11:26 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-05-06 13:20 [PATCH, OpenMP] Implement uses_allocators clause for target regions Chung-Lin Tang
2022-05-06 16:40 ` Tobias Burnus
2022-05-10 11:29 ` [PATCH, OpenMP, v2] " Chung-Lin Tang
2022-05-19 16:00 ` Jakub Jelinek
2022-05-19 17:02 ` Andrew Stubbs
2022-05-19 17:55 ` Jakub Jelinek
2022-05-20 6:59 ` Tobias Burnus
2022-05-19 17:46 ` Jakub Jelinek
2022-05-30 14:43 ` Chung-Lin Tang
2022-05-30 17:23 ` Jakub Jelinek
2022-05-31 10:02 ` Jakub Jelinek
2022-06-06 13:19 ` Chung-Lin Tang
2022-06-06 13:22 ` Jakub Jelinek
2022-06-06 13:38 ` Chung-Lin Tang
2022-06-06 13:42 ` Jakub Jelinek
2022-06-09 6:21 ` [PATCH, OpenMP, v4] " Chung-Lin Tang
2022-06-09 12:22 ` Jakub Jelinek
2022-06-13 13:29 ` Chung-Lin Tang
2022-06-13 14:04 ` Jakub Jelinek
2023-02-09 11:26 ` Thomas Schwinge [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=87bkm313m6.fsf@euler.schwinge.homeip.net \
--to=thomas@codesourcery.com \
--cc=abidh@codesourcery.com \
--cc=ams@codesourcery.com \
--cc=cltang@codesourcery.com \
--cc=gcc-patches@gcc.gnu.org \
--cc=jakub@redhat.com \
--cc=tobias@codesourcery.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).