Fortran: openmp: Add support for thread_limit clause on target

gcc/fortran/ChangeLog:

	* openmp.c (OMP_TARGET_CLAUSES): Add thread_limit.
	* trans-openmp.c (gfc_split_omp_clauses): Add thread_limit also to
	teams.

libgomp/ChangeLog:

	* testsuite/libgomp.fortran/thread-limit-1.f90: New test.

diff --git a/gcc/fortran/openmp.c b/gcc/fortran/openmp.c
index 2893ab2befb3301b16c8e3f4a02af09f3abeda42..d120be814677e4d70be6828b75e39affeaf28502 100644 (file)
--- a/gcc/fortran/openmp.c
+++ b/gcc/fortran/openmp.c
@@ -3563,7 +3563,8 @@ cleanup:
   (omp_mask (OMP_CLAUSE_DEVICE) | OMP_CLAUSE_MAP | OMP_CLAUSE_IF       \
    | OMP_CLAUSE_DEPEND | OMP_CLAUSE_NOWAIT | OMP_CLAUSE_PRIVATE                \
    | OMP_CLAUSE_FIRSTPRIVATE | OMP_CLAUSE_DEFAULTMAP                   \
-   | OMP_CLAUSE_IS_DEVICE_PTR | OMP_CLAUSE_IN_REDUCTION)
+   | OMP_CLAUSE_IS_DEVICE_PTR | OMP_CLAUSE_IN_REDUCTION                        \
+   | OMP_CLAUSE_THREAD_LIMIT)
 #define OMP_TARGET_DATA_CLAUSES \
   (omp_mask (OMP_CLAUSE_DEVICE) | OMP_CLAUSE_MAP | OMP_CLAUSE_IF       \
    | OMP_CLAUSE_USE_DEVICE_PTR | OMP_CLAUSE_USE_DEVICE_ADDR)

diff --git a/gcc/fortran/trans-openmp.c b/gcc/fortran/trans-openmp.c
index b86c7cf98330ac2484095432230ba71696eb4c7a..5b3c310ba5945e73ff61d1178a3bb09dd6f68dbf 100644 (file)
--- a/gcc/fortran/trans-openmp.c
+++ b/gcc/fortran/trans-openmp.c
@@ -5870,6 +5870,8 @@ gfc_split_omp_clauses (gfc_code *code,
            = code->ext.omp_clauses->lists[OMP_LIST_IS_DEVICE_PTR];
          clausesa[GFC_OMP_SPLIT_TARGET].device
            = code->ext.omp_clauses->device;
+         clausesa[GFC_OMP_SPLIT_TARGET].thread_limit
+           = code->ext.omp_clauses->thread_limit;
          for (int i = 0; i < OMP_DEFAULTMAP_CAT_NUM; i++)
            clausesa[GFC_OMP_SPLIT_TARGET].defaultmap[i]
              = code->ext.omp_clauses->defaultmap[i];

diff --git a/libgomp/testsuite/libgomp.fortran/thread-limit-1.f90 b/libgomp/testsuite/libgomp.fortran/thread-limit-1.f90
new file mode 100644 (file)
index 0000000..bca69fb
--- /dev/null
+++ b/libgomp/testsuite/libgomp.fortran/thread-limit-1.f90
@@ -0,0 +1,41 @@
+! { dg-additional-options "-fdump-tree-original" }
+
+! { dg-final { scan-tree-dump-times "#pragma omp teams thread_limit\\(9\\)" 1 "original" } }
+! { dg-final { scan-tree-dump-times "#pragma omp target thread_limit\\(9\\)" 1 "original" } }
+
+! { dg-final { scan-tree-dump-times "#pragma omp target nowait thread_limit\\(4\\)" 1 "original" } }
+! { dg-final { scan-tree-dump-times "#pragma omp parallel num_threads\\(1\\)" 1 "original" } }
+
+! { dg-final { scan-tree-dump-times "#pragma omp target thread_limit\\(6\\)" 1 "original" } }
+
+
+module m
+  use omp_lib
+  implicit none
+contains
+
+subroutine uncalled()
+    !$omp target teams thread_limit (9)
+    !$omp end target teams
+end
+
+subroutine foo ()
+  block
+    !$omp target parallel nowait thread_limit (4) num_threads (1)
+    if (omp_get_thread_limit () > 4) &
+      stop 1
+    !$omp end target parallel
+  end block
+  !$omp taskwait
+end
+end module
+
+program main
+  use m
+  implicit none
+  !$omp target thread_limit (6)
+    if (omp_get_thread_limit () > 6) &
+      stop 2
+  !$omp end target
+  call foo ()
+end