From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1534) id 05E773858292; Tue, 5 Jul 2022 08:10:08 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 05E773858292 Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: Tobias Burnus To: gcc-cvs@gcc.gnu.org Subject: [gcc/devel/omp/gcc-12] OpenMP: Skip target-nesting warning for reverse offload X-Act-Checkin: gcc X-Git-Author: Tobias Burnus X-Git-Refname: refs/heads/devel/omp/gcc-12 X-Git-Oldrev: bf4e0a66d0027fc20f216afc8e84d8ae35baf0ca X-Git-Newrev: d89bf164516d06684f120a42d9f8d351f8e5dd2f Message-Id: <20220705081008.05E773858292@sourceware.org> Date: Tue, 5 Jul 2022 08:10:08 +0000 (GMT) X-BeenThere: gcc-cvs@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gcc-cvs mailing list List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 05 Jul 2022 08:10:08 -0000 https://gcc.gnu.org/g:d89bf164516d06684f120a42d9f8d351f8e5dd2f commit d89bf164516d06684f120a42d9f8d351f8e5dd2f Author: Tobias Burnus Date: Tue Jul 5 08:36:42 2022 +0200 OpenMP: Skip target-nesting warning for reverse offload gcc/ChangeLog: * omp-low.cc (check_omp_nesting_restrictions): Skip warning for target inside target if inner is reverse offload. gcc/testsuite/ChangeLog: * c-c++-common/gomp/target-device-ancestor-5.c: New test. (cherry picked from commit 47554478a13f64bff1ee4b9bb0319ae63d42ca52) Diff: --- gcc/ChangeLog.omp | 8 +++++++ gcc/omp-low.cc | 10 ++++++++ gcc/testsuite/ChangeLog.omp | 7 ++++++ .../c-c++-common/gomp/target-device-ancestor-5.c | 28 ++++++++++++++++++++++ 4 files changed, 53 insertions(+) diff --git a/gcc/ChangeLog.omp b/gcc/ChangeLog.omp index e146e14e6f8..06a194e744c 100644 --- a/gcc/ChangeLog.omp +++ b/gcc/ChangeLog.omp @@ -1,3 +1,11 @@ +2022-07-05 Tobias Burnus + + Backport from mainline: + 2022-05-17 Tobias Burnus + + * omp-low.cc (check_omp_nesting_restrictions): Skip warning for + target inside target if inner is reverse offload. + 2022-07-04 Tobias Burnus Backport from mainline: diff --git a/gcc/omp-low.cc b/gcc/omp-low.cc index c366fb55c80..adefaa527a7 100644 --- a/gcc/omp-low.cc +++ b/gcc/omp-low.cc @@ -4377,6 +4377,16 @@ check_omp_nesting_restrictions (gimple *stmt, omp_context *ctx) } else { + if ((gimple_omp_target_kind (ctx->stmt) + == GF_OMP_TARGET_KIND_REGION) + && (gimple_omp_target_kind (stmt) + == GF_OMP_TARGET_KIND_REGION)) + { + c = omp_find_clause (gimple_omp_target_clauses (stmt), + OMP_CLAUSE_DEVICE); + if (c && OMP_CLAUSE_DEVICE_ANCESTOR (c)) + break; + } warning_at (gimple_location (stmt), 0, "%qs construct inside of %qs region", stmt_name, ctx_stmt_name); diff --git a/gcc/testsuite/ChangeLog.omp b/gcc/testsuite/ChangeLog.omp index 0bfd4f2a3b7..4bd6d97f8a0 100644 --- a/gcc/testsuite/ChangeLog.omp +++ b/gcc/testsuite/ChangeLog.omp @@ -1,3 +1,10 @@ +2022-07-05 Tobias Burnus + + Backport from mainline: + 2022-05-17 Tobias Burnus + + * c-c++-common/gomp/target-device-ancestor-5.c: New test. + 2022-07-04 Tobias Burnus Backport from mainline: diff --git a/gcc/testsuite/c-c++-common/gomp/target-device-ancestor-5.c b/gcc/testsuite/c-c++-common/gomp/target-device-ancestor-5.c new file mode 100644 index 00000000000..b6ff84bcdab --- /dev/null +++ b/gcc/testsuite/c-c++-common/gomp/target-device-ancestor-5.c @@ -0,0 +1,28 @@ +#pragma omp requires reverse_offload /* { dg-message "sorry, unimplemented: 'reverse_offload' clause on 'requires' directive not supported yet" } */ + +void +foo () +{ + /* Good nesting - as reverse offload */ + #pragma omp target + #pragma omp target device(ancestor:1) /* valid -> no warning */ /* { dg-bogus "'target' construct inside of 'target' region" } */ + { } + + /* Bad nesting */ + #pragma omp target + #pragma omp target /* { dg-warning "'target' construct inside of 'target' region" } */ + #pragma omp target /* { dg-warning "'target' construct inside of 'target' region" } */ + { } + + /* Good nesting - as reverse offload */ + #pragma omp target + #pragma omp target /* { dg-warning "'target' construct inside of 'target' region" } */ + #pragma omp target device(ancestor:1) /* valid -> no warning */ /* { dg-bogus "'target' construct inside of 'target' region" } */ + { } + + #pragma omp target + #pragma omp target device(ancestor:1) /* valid -> no warning */ /* { dg-bogus "'target' construct inside of 'target' region" } */ + #pragma omp target device(ancestor:1) /* { dg-error "OpenMP constructs are not allowed in target region with 'ancestor'" } */ + { } + +}