aboutsummaryrefslogtreecommitdiff
path: root/gcc
diff options
context:
space:
mode:
authorTobias Burnus <tobias@codesourcery.com>2022-05-24 10:41:43 +0200
committerTobias Burnus <tobias@codesourcery.com>2022-05-24 10:45:26 +0200
commit4fb2b4f7ea6b80ae75d3efb6f86e7c6179080535 (patch)
treed47491145e4e0ef0d7fcb234c6c1d6599b9d7638 /gcc
parentb646d7d279ae0c0d35564542d09866bf3e8afac0 (diff)
downloadgcc-4fb2b4f7ea6b80ae75d3efb6f86e7c6179080535.zip
gcc-4fb2b4f7ea6b80ae75d3efb6f86e7c6179080535.tar.gz
gcc-4fb2b4f7ea6b80ae75d3efb6f86e7c6179080535.tar.bz2
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.
Diffstat (limited to 'gcc')
-rw-r--r--gcc/fortran/openmp.cc3
-rw-r--r--gcc/testsuite/gfortran.dg/gomp/taskwait-depend-nowait-1.f9014
2 files changed, 16 insertions, 1 deletions
diff --git a/gcc/fortran/openmp.cc b/gcc/fortran/openmp.cc
index 63fd4dd..6172ec2 100644
--- a/gcc/fortran/openmp.cc
+++ b/gcc/fortran/openmp.cc
@@ -5701,7 +5701,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/gfortran.dg/gomp/taskwait-depend-nowait-1.f90 b/gcc/testsuite/gfortran.dg/gomp/taskwait-depend-nowait-1.f90
new file mode 100644
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