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.

(cherry picked from commit 82ec4cb3c43c7429be6b902d96770a6435fa068b)

diff --git a/gcc/fortran/ChangeLog.omp b/gcc/fortran/ChangeLog.omp
index 7f71f1f6a7314b2ed10919b48dd4c140e403f35a..f78aa5e366fa0eede279accad461d5e1f8ff582e 100644 (file)
--- a/gcc/fortran/ChangeLog.omp
+++ b/gcc/fortran/ChangeLog.omp
@@ -1,3 +1,12 @@
+2022-02-27  Tobias Burnus  <tobias@codesourcery.com>
+
+       Backported from master:
+       2021-11-15  Tobias Burnus  <tobias@codesourcery.com>
+
+       * openmp.c (OMP_TARGET_CLAUSES): Add thread_limit.
+       * trans-openmp.c (gfc_split_omp_clauses): Add thread_limit also to
+       teams.
+
 2022-02-27  Tobias Burnus  <tobias@codesourcery.com>
 
        Backported from master:

diff --git a/gcc/fortran/openmp.c b/gcc/fortran/openmp.c
index ecc3844f9f542972bd21ae91ec9b87cb5c3e95fb..13cbab1b42a9d4049f6191eb6fbbde02d77d49ea 100644 (file)
--- a/gcc/fortran/openmp.c
+++ b/gcc/fortran/openmp.c
@@ -3570,7 +3570,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 99da12f908877c0f6dccd5dfe797136a47c5157a..a4eec2d7b98babc81ff8798f3d37a592c7ab59e2 100644 (file)
--- a/gcc/fortran/trans-openmp.c
+++ b/gcc/fortran/trans-openmp.c
@@ -5902,6 +5902,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/ChangeLog.omp b/libgomp/ChangeLog.omp
index 3149d78027be23329519b3ca42ef229e386d8c38..5d186464017e4964c316020e7b5551b1b6fa8f22 100644 (file)
--- a/libgomp/ChangeLog.omp
+++ b/libgomp/ChangeLog.omp
@@ -1,3 +1,10 @@
+2022-02-27  Tobias Burnus  <tobias@codesourcery.com>
+
+       Backported from master:
+       2021-11-15  Tobias Burnus  <tobias@codesourcery.com>
+
+       * testsuite/libgomp.fortran/thread-limit-1.f90: New test.
+
 2022-02-27  Tobias Burnus  <tobias@codesourcery.com>
 
        Backported from master:

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