From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2153) id 922FA3858D38; Wed, 12 Oct 2022 16:42:05 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 922FA3858D38 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1665592926; bh=EzOZqRl8Av0x+b/TU53RBNRnM7ykP6xDnU/yOl3he5c=; h=From:To:Subject:Date:From; b=EX8cvPko6BE55R33HdYeJzgLeTEJw17r6qtmf2xTMIEivjC5ygi/6MG0Juv6rdAAH IGfuXaO7i5bb8IdZHtqiz5PGGyBc9rMcC4NzWMwxkHFvmASljw82cBIFSlnAdMmSgt LutYW+0KpVA/XxPW6hqQQpr73CIqc0wFSN4/IhUg= MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="utf-8" From: Jakub Jelinek To: gcc-cvs@gcc.gnu.org Subject: [gcc r13-3258] libgomp: Add omp_in_explicit_task support X-Act-Checkin: gcc X-Git-Author: Jakub Jelinek X-Git-Refname: refs/heads/master X-Git-Oldrev: a58a965eb73253759f6a3e1c7380392557da89c8 X-Git-Newrev: 0ec4e93fb9fa5e9d2424683c5fab1310c8ae2f76 Message-Id: <20221012164206.922FA3858D38@sourceware.org> Date: Wed, 12 Oct 2022 16:42:05 +0000 (GMT) List-Id: https://gcc.gnu.org/g:0ec4e93fb9fa5e9d2424683c5fab1310c8ae2f76 commit r13-3258-g0ec4e93fb9fa5e9d2424683c5fab1310c8ae2f76 Author: Jakub Jelinek Date: Wed Oct 12 18:39:20 2022 +0200 libgomp: Add omp_in_explicit_task support This is pretty straightforward, if gomp_thread ()->task is NULL, it can't be explicit task, otherwise if gomp_thread ()->task->kind == GOMP_TASK_IMPLICIT, it is an implicit task, otherwise explicit task. 2022-10-12 Jakub Jelinek * omp.h.in (omp_in_explicit_task): Declare. * omp_lib.h.in (omp_in_explicit_task): Likewise. * omp_lib.f90.in (omp_in_explicit_task): New interface. * libgomp.map (OMP_5.2): New symbol version, export omp_in_explicit_task and omp_in_explicit_task_. * task.c (omp_in_explicit_task): New function. * fortran.c (omp_in_explicit_task): Add ialias_redirect. (omp_in_explicit_task_): New function. * libgomp.texi (OpenMP 5.2): Mark omp_in_explicit_task as implemented. * testsuite/libgomp.c-c++-common/task-in-explicit-1.c: New test. * testsuite/libgomp.c-c++-common/task-in-explicit-2.c: New test. * testsuite/libgomp.c-c++-common/task-in-explicit-3.c: New test. Diff: --- libgomp/fortran.c | 7 ++ libgomp/libgomp.map | 6 ++ libgomp/libgomp.texi | 4 +- libgomp/omp.h.in | 1 + libgomp/omp_lib.f90.in | 6 ++ libgomp/omp_lib.h.in | 2 + libgomp/task.c | 10 ++ .../libgomp.c-c++-common/task-in-explicit-1.c | 106 +++++++++++++++++++++ .../libgomp.c-c++-common/task-in-explicit-2.c | 26 +++++ .../libgomp.c-c++-common/task-in-explicit-3.c | 36 +++++++ 10 files changed, 202 insertions(+), 2 deletions(-) diff --git a/libgomp/fortran.c b/libgomp/fortran.c index d984ce5c6f8..72784ec5dad 100644 --- a/libgomp/fortran.c +++ b/libgomp/fortran.c @@ -76,6 +76,7 @@ ialias_redirect (omp_get_ancestor_thread_num) ialias_redirect (omp_get_team_size) ialias_redirect (omp_get_active_level) ialias_redirect (omp_in_final) +ialias_redirect (omp_in_explicit_task) ialias_redirect (omp_get_cancellation) ialias_redirect (omp_get_proc_bind) ialias_redirect (omp_get_num_places) @@ -482,6 +483,12 @@ omp_in_final_ (void) return omp_in_final (); } +int32_t +omp_in_explicit_task_ (void) +{ + return omp_in_explicit_task (); +} + void omp_set_num_teams_ (const int32_t *num_teams) { diff --git a/libgomp/libgomp.map b/libgomp/libgomp.map index 46d5f10f3e1..e76c126128a 100644 --- a/libgomp/libgomp.map +++ b/libgomp/libgomp.map @@ -234,6 +234,12 @@ OMP_5.1.1 { omp_target_memcpy_rect_async; } OMP_5.1; +OMP_5.2 { + global: + omp_in_explicit_task; + omp_in_explicit_task_; +} OMP_5.1.1; + GOMP_1.0 { global: GOMP_atomic_end; diff --git a/libgomp/libgomp.texi b/libgomp/libgomp.texi index d8c798cf7a1..148728ed05f 100644 --- a/libgomp/libgomp.texi +++ b/libgomp/libgomp.texi @@ -360,8 +360,8 @@ to address of matching mapped list item per 5.1, Sect. 2.21.7.2 @tab N @tab @multitable @columnfractions .60 .10 .25 @headitem Description @tab Status @tab Comments -@item @code{omp_in_explicit_task} routine and @emph{implicit-task-var} ICV - @tab N @tab +@item @code{omp_in_explicit_task} routine and @emph{explicit-task-var} ICV + @tab Y @tab @item @code{omp}/@code{ompx}/@code{omx} sentinels and @code{omp_}/@code{ompx_} namespaces @tab N/A @tab warning for @code{ompx/omx} sentinels@footnote{The @code{ompx} diff --git a/libgomp/omp.h.in b/libgomp/omp.h.in index 925a650135e..bfa4e6a0f87 100644 --- a/libgomp/omp.h.in +++ b/libgomp/omp.h.in @@ -244,6 +244,7 @@ extern int omp_get_team_size (int) __GOMP_NOTHROW; extern int omp_get_active_level (void) __GOMP_NOTHROW; extern int omp_in_final (void) __GOMP_NOTHROW; +extern int omp_in_explicit_task (void) __GOMP_NOTHROW; extern int omp_get_cancellation (void) __GOMP_NOTHROW; extern omp_proc_bind_t omp_get_proc_bind (void) __GOMP_NOTHROW; diff --git a/libgomp/omp_lib.f90.in b/libgomp/omp_lib.f90.in index 7ba115f3a1a..04f32dbfd8a 100644 --- a/libgomp/omp_lib.f90.in +++ b/libgomp/omp_lib.f90.in @@ -444,6 +444,12 @@ end function omp_in_final end interface + interface + function omp_in_explicit_task () + logical (4) :: omp_in_explicit_task + end function omp_in_explicit_task + end interface + interface function omp_get_cancellation () logical (4) :: omp_get_cancellation diff --git a/libgomp/omp_lib.h.in b/libgomp/omp_lib.h.in index 36268363859..ecfb9348305 100644 --- a/libgomp/omp_lib.h.in +++ b/libgomp/omp_lib.h.in @@ -220,6 +220,8 @@ external omp_in_final logical(4) omp_in_final + external omp_in_explicit_task + logical(4) omp_in_explicit_task external omp_get_cancellation logical(4) omp_get_cancellation diff --git a/libgomp/task.c b/libgomp/task.c index 7766535d1aa..a7e67e8ea81 100644 --- a/libgomp/task.c +++ b/libgomp/task.c @@ -2687,6 +2687,16 @@ omp_in_final (void) ialias (omp_in_final) +int +omp_in_explicit_task (void) +{ + struct gomp_thread *thr = gomp_thread (); + struct gomp_task *task = thr->task; + return task && task->kind != GOMP_TASK_IMPLICIT; +} + +ialias (omp_in_explicit_task) + void omp_fulfill_event (omp_event_handle_t event) { diff --git a/libgomp/testsuite/libgomp.c-c++-common/task-in-explicit-1.c b/libgomp/testsuite/libgomp.c-c++-common/task-in-explicit-1.c new file mode 100644 index 00000000000..a228d93a776 --- /dev/null +++ b/libgomp/testsuite/libgomp.c-c++-common/task-in-explicit-1.c @@ -0,0 +1,106 @@ +/* { dg-do run } */ + +#include +#include + +int +main () +{ + if (omp_in_explicit_task ()) + abort (); + #pragma omp task + if (!omp_in_explicit_task ()) + abort (); + #pragma omp task final (1) + { + if (!omp_in_explicit_task ()) + abort (); + #pragma omp task + if (!omp_in_explicit_task ()) + abort (); + } + #pragma omp parallel + { + if (omp_in_explicit_task ()) + abort (); + #pragma omp task if (0) + { + if (!omp_in_explicit_task ()) + abort (); + #pragma omp task if (0) + if (!omp_in_explicit_task ()) + abort (); + } + #pragma omp task final (1) + if (!omp_in_explicit_task ()) + abort (); + #pragma omp barrier + if (omp_in_explicit_task ()) + abort (); + #pragma omp taskloop num_tasks (24) + for (int i = 0; i < 32; ++i) + if (!omp_in_explicit_task ()) + abort (); + #pragma omp masked + #pragma omp task + if (!omp_in_explicit_task ()) + abort (); + #pragma omp barrier + if (omp_in_explicit_task ()) + abort (); + } + #pragma omp target + { + if (omp_in_explicit_task ()) + abort (); + #pragma omp task if (0) + if (!omp_in_explicit_task ()) + abort (); + #pragma omp task + if (!omp_in_explicit_task ()) + abort (); + } + #pragma omp target teams + { + #pragma omp distribute + for (int i = 0; i < 4; ++i) + if (omp_in_explicit_task ()) + abort (); + else + { + #pragma omp parallel + { + if (omp_in_explicit_task ()) + abort (); + #pragma omp task + if (!omp_in_explicit_task ()) + abort (); + #pragma omp barrier + if (omp_in_explicit_task ()) + abort (); + } + } + } + #pragma omp teams + { + #pragma omp distribute + for (int i = 0; i < 4; ++i) + if (omp_in_explicit_task ()) + abort (); + else + { + #pragma omp parallel + { + if (omp_in_explicit_task ()) + abort (); + #pragma omp task + if (!omp_in_explicit_task ()) + abort (); + #pragma omp barrier + if (omp_in_explicit_task ()) + abort (); + } + } + } + return 0; +} diff --git a/libgomp/testsuite/libgomp.c-c++-common/task-in-explicit-2.c b/libgomp/testsuite/libgomp.c-c++-common/task-in-explicit-2.c new file mode 100644 index 00000000000..44df5967b69 --- /dev/null +++ b/libgomp/testsuite/libgomp.c-c++-common/task-in-explicit-2.c @@ -0,0 +1,26 @@ +/* { dg-do run } */ + +#include +#include + +int +main () +{ + #pragma omp task + { + if (!omp_in_explicit_task ()) + abort (); + #pragma omp task + { + if (!omp_in_explicit_task ()) + abort (); + #pragma omp target nowait + if (omp_in_explicit_task ()) + abort (); + if (!omp_in_explicit_task ()) + abort (); + #pragma omp taskwait + } + } + return 0; +} diff --git a/libgomp/testsuite/libgomp.c-c++-common/task-in-explicit-3.c b/libgomp/testsuite/libgomp.c-c++-common/task-in-explicit-3.c new file mode 100644 index 00000000000..40eb94d4dca --- /dev/null +++ b/libgomp/testsuite/libgomp.c-c++-common/task-in-explicit-3.c @@ -0,0 +1,36 @@ +/* { dg-do run } */ + +#include +#include + +int a; + +int +main () +{ + #pragma omp task + { + if (!omp_in_explicit_task ()) + abort (); + #pragma omp task + { + if (!omp_in_explicit_task ()) + abort (); + #pragma omp taskgroup task_reduction (+: a) + { + if (!omp_in_explicit_task ()) + abort (); + #pragma omp task in_reduction (+: a) + { + ++a; + if (!omp_in_explicit_task ()) + abort (); + } + } + if (!omp_in_explicit_task ()) + abort (); + #pragma omp taskwait + } + } + return 0; +}