OpenMP: Support nowait with Fortran [PR105378]

Fortran part to C/C++/libgomp
commit r13-724-gb43836914bdc2a37563cf31359b2c4803bfe4374

gcc/fortran/

	PR c/105378
	* openmp.cc (gfc_match_omp_taskwait): Accept nowait.

gcc/testsuite/

	PR c/105378
	* gfortran.dg/gomp/taskwait-depend-nowait-1.f90: New.

libgomp/

	PR c/105378
	* libgomp.texi (OpenMP 5.1): Set 'taskwait nowait' to 'Y'.
	* testsuite/libgomp.fortran/taskwait-depend-nowait-1.f90: New.

(cherry picked from commit 4fb2b4f7ea6b80ae75d3efb6f86e7c6179080535)

diff --git a/gcc/fortran/ChangeLog.omp b/gcc/fortran/ChangeLog.omp
index 6da0dce78ab0740a07b689f115f1119f5c7162fd..9a7cebb45c7be766a78a7f594a58d47a07f38fef 100644 (file)
--- a/gcc/fortran/ChangeLog.omp
+++ b/gcc/fortran/ChangeLog.omp
@@ -1,3 +1,11 @@
+2022-07-05  Tobias Burnus  <tobias@codesourcery.com>
+
+       Backport from mainline:
+       2022-05-24  Tobias Burnus  <tobias@codesourcery.com>
+
+       PR c/105378
+       * openmp.cc (gfc_match_omp_taskwait): Accept nowait.
+
 2022-07-05  Tobias Burnus  <tobias@codesourcery.com>
 
        Backport from mainline:

diff --git a/gcc/fortran/openmp.cc b/gcc/fortran/openmp.cc
index ff7545089b64e1082b23550861200362cba5f5de..76b25a82ec9e5bbcd73163880cc92d08892eb537 100644 (file)
--- a/gcc/fortran/openmp.cc
+++ b/gcc/fortran/openmp.cc
@@ -6427,7 +6427,8 @@ gfc_match_omp_taskwait (void)
       new_st.ext.omp_clauses = NULL;
       return MATCH_YES;
     }
-  return match_omp (EXEC_OMP_TASKWAIT, omp_mask (OMP_CLAUSE_DEPEND));
+  return match_omp (EXEC_OMP_TASKWAIT,
+                   omp_mask (OMP_CLAUSE_DEPEND) | OMP_CLAUSE_NOWAIT);
 }
 
 

diff --git a/gcc/testsuite/ChangeLog.omp b/gcc/testsuite/ChangeLog.omp
index 6523bed1dd54a299c25cfd465f6a60b408094ea4..473bd6ba061e39f549e2abf4a758845eed75bc9f 100644 (file)
--- a/gcc/testsuite/ChangeLog.omp
+++ b/gcc/testsuite/ChangeLog.omp
@@ -1,3 +1,11 @@
+2022-07-05  Tobias Burnus  <tobias@codesourcery.com>
+
+       Backport from mainline:
+       2022-05-24  Tobias Burnus  <tobias@codesourcery.com>
+
+       PR c/105378
+       * gfortran.dg/gomp/taskwait-depend-nowait-1.f90: New.
+
 2022-07-05  Tobias Burnus  <tobias@codesourcery.com>
 
        Backport from mainline:

diff --git a/gcc/testsuite/gfortran.dg/gomp/taskwait-depend-nowait-1.f90 b/gcc/testsuite/gfortran.dg/gomp/taskwait-depend-nowait-1.f90
new file mode 100644 (file)
index 0000000..cd2f1d2
--- /dev/null
+++ b/gcc/testsuite/gfortran.dg/gomp/taskwait-depend-nowait-1.f90
@@ -0,0 +1,14 @@
+subroutine foo (p)
+  integer :: p(*)
+  !$omp taskwait depend(iterator(i = 1:17) , in : p(i)) nowait depend(out : p(32))
+end
+
+subroutine bar (p)
+  implicit none
+  integer :: p(*)
+  !$omp taskwait depend(mutexinoutset : p(1)) nowait   ! { dg-error "'mutexinoutset' kind in 'depend' clause on a 'taskwait' construct" }
+end
+
+subroutine baz
+  !$omp taskwait nowait        ! { dg-error "'taskwait' construct with 'nowait' clause but no 'depend' clauses" }
+end

diff --git a/libgomp/ChangeLog.omp b/libgomp/ChangeLog.omp
index e1c16cb8f6b7e186c46f0a4800aa5450461645a9..dd0db03a02d7d698f73abd046e16f778c4e09f2e 100644 (file)
--- a/libgomp/ChangeLog.omp
+++ b/libgomp/ChangeLog.omp
@@ -1,3 +1,12 @@
+2022-07-05  Tobias Burnus  <tobias@codesourcery.com>
+
+       Backport from mainline:
+       2022-05-24  Tobias Burnus  <tobias@codesourcery.com>
+
+       PR c/105378
+       * libgomp.texi (OpenMP 5.1): Set 'taskwait nowait' to 'Y'.
+       * testsuite/libgomp.fortran/taskwait-depend-nowait-1.f90: New.
+
 2022-07-05  Tobias Burnus  <tobias@codesourcery.com>
 
        Backport from mainline:

diff --git a/libgomp/libgomp.texi b/libgomp/libgomp.texi
index 8f30f6ed4b5fb3903a05ac85bd76abf572ed80c7..1f2f848ba7317ee31abd449c0e864933df85d412 100644 (file)
--- a/libgomp/libgomp.texi
+++ b/libgomp/libgomp.texi
@@ -303,7 +303,7 @@ The OpenMP 4.5 specification is fully supported.
       @code{target} regions @tab N @tab
 @item @code{interop} directive @tab N @tab
 @item @code{omp_interop_t} object support in runtime routines @tab N @tab
-@item @code{nowait} clause in @code{taskwait} directive @tab N @tab
+@item @code{nowait} clause in @code{taskwait} directive @tab Y @tab
 @item Extensions to the @code{atomic} directive @tab Y @tab
 @item @code{seq_cst} clause on a @code{flush} construct @tab Y @tab
 @item @code{inoutset} argument to the @code{depend} clause @tab Y @tab

diff --git a/libgomp/testsuite/libgomp.fortran/taskwait-depend-nowait-1.f90 b/libgomp/testsuite/libgomp.fortran/taskwait-depend-nowait-1.f90
new file mode 100644 (file)
index 0000000..a5b058d
--- /dev/null
+++ b/libgomp/testsuite/libgomp.fortran/taskwait-depend-nowait-1.f90
@@ -0,0 +1,42 @@
+program main
+  implicit none
+  integer :: a(0:63), b = 1
+  !$omp parallel num_threads (4)
+  block
+    !$omp single
+    block
+      integer :: i
+      !$omp taskwait depend(in: a) nowait
+      !$omp taskwait depend(in: a) nowait
+      !$omp taskwait
+      !$omp taskgroup
+      block
+        !$omp taskwait depend(in: a) nowait
+        !$omp taskwait depend(in: a) nowait
+      end block
+      do i = 0, 63
+        !$omp task depend(in: a) shared(a)
+        block
+          a(i) = i
+        end block
+      end do
+      !$omp taskwait depend(inout: a) nowait
+      do i = 0, 63
+        !$omp task depend(inoutset: a) shared(a)
+        block
+          if (a(i) /= i) then
+            error stop
+          else
+            a(i) = 2 * i + 1
+          end if
+        end block
+      end do
+      !$omp taskwait nowait depend(out: a) depend(in: b)
+      !$omp taskwait depend(inout: b)
+      do i = 0, 63
+        if (a(i) /= 2 * i + 1) &
+          error stop
+      end do
+    end block
+  end block
+end program