Fix gcc/testsuite/*/gomp/pr113436* [PR113436]

Testcases in gcc/testsuite/ may not '#include <omp.h>' or 'use omp_lib';
instead, now a local declaration of the enum/Fortran-parameter values is
used.

gcc/testsuite/ChangeLog:

	PR middle-end/113436
	* c-c++-common/gomp/pr113436-1.c: Replace '#include <omp.h>' by
	local declaration for omp_allocator_handle_t.
	* c-c++-common/gomp/pr113436-2.c: Likewise.
	* g++.dg/gomp/pr113436.C: Likewise.
	* gfortran.dg/gomp/pr113436-1.f90: Replace 'use omp_lib' by local
	omp_*_mem_alloc parameter declarations.
	* gfortran.dg/gomp/pr113436-2.f90: Likewise.
	* gfortran.dg/gomp/pr113436-3.f90: Likewise.
	* gfortran.dg/gomp/pr113436-4.f90: Likewise.

diff --git a/gcc/testsuite/c-c++-common/gomp/pr113436-1.c b/gcc/testsuite/c-c++-common/gomp/pr113436-1.c
index 985cc212863e7fa0346ac9d14d6aefb66a0a07b2..db9bb81cb74f0f878a0f8a748041cae7585fd65c 100644 (file)
--- a/gcc/testsuite/c-c++-common/gomp/pr113436-1.c
+++ b/gcc/testsuite/c-c++-common/gomp/pr113436-1.c
@@ -2,7 +2,31 @@
 /* { dg-do compile } */
 /* { dg-options "-fopenmp -fdump-tree-omplower" } */
 
-#include <omp.h>
+// #include <omp.h>
+typedef __UINTPTR_TYPE__ omp_uintptr_t;
+
+#if __cplusplus >= 201103L
+# define __GOMP_UINTPTR_T_ENUM : omp_uintptr_t
+#else
+# define __GOMP_UINTPTR_T_ENUM
+#endif
+
+typedef enum omp_allocator_handle_t __GOMP_UINTPTR_T_ENUM
+{
+  omp_null_allocator = 0,
+  omp_default_mem_alloc = 1,
+  omp_large_cap_mem_alloc = 2,
+  omp_const_mem_alloc = 3,
+  omp_high_bw_mem_alloc = 4,
+  omp_low_lat_mem_alloc = 5,
+  omp_cgroup_mem_alloc = 6,
+  omp_pteam_mem_alloc = 7,
+  omp_thread_mem_alloc = 8,
+  ompx_gnu_pinned_mem_alloc = 200,
+  ompx_gnu_managed_mem_alloc = 201,
+  __omp_allocator_handle_t_max__ = __UINTPTR_MAX__
+} omp_allocator_handle_t;
+
 
 void
 f()

diff --git a/gcc/testsuite/c-c++-common/gomp/pr113436-2.c b/gcc/testsuite/c-c++-common/gomp/pr113436-2.c
index 1755b6bd209679e77f18021c34177a50141d8da6..cb4a807dcccb6a9395190b765d594df2f096619b 100644 (file)
--- a/gcc/testsuite/c-c++-common/gomp/pr113436-2.c
+++ b/gcc/testsuite/c-c++-common/gomp/pr113436-2.c
@@ -2,7 +2,31 @@
 /* { dg-do compile } */
 /* { dg-options "-fopenmp -fdump-tree-omplower" } */
 
-#include <omp.h>
+// #include <omp.h>
+typedef __UINTPTR_TYPE__ omp_uintptr_t;
+
+#if __cplusplus >= 201103L
+# define __GOMP_UINTPTR_T_ENUM : omp_uintptr_t
+#else
+# define __GOMP_UINTPTR_T_ENUM
+#endif
+
+typedef enum omp_allocator_handle_t __GOMP_UINTPTR_T_ENUM
+{
+  omp_null_allocator = 0,
+  omp_default_mem_alloc = 1,
+  omp_large_cap_mem_alloc = 2,
+  omp_const_mem_alloc = 3,
+  omp_high_bw_mem_alloc = 4,
+  omp_low_lat_mem_alloc = 5,
+  omp_cgroup_mem_alloc = 6,
+  omp_pteam_mem_alloc = 7,
+  omp_thread_mem_alloc = 8,
+  ompx_gnu_pinned_mem_alloc = 200,
+  ompx_gnu_managed_mem_alloc = 201,
+  __omp_allocator_handle_t_max__ = __UINTPTR_MAX__
+} omp_allocator_handle_t;
+
 
 void
 g()

diff --git a/gcc/testsuite/g++.dg/gomp/pr113436.C b/gcc/testsuite/g++.dg/gomp/pr113436.C
index ad1cc2f83c6d10d8b118cc4e0eedc5592893101e..7078d88ccffd4b879502ad8f84616193eec00a0d 100644 (file)
--- a/gcc/testsuite/g++.dg/gomp/pr113436.C
+++ b/gcc/testsuite/g++.dg/gomp/pr113436.C
@@ -2,7 +2,31 @@
 // { dg-do "compile" }
 // { dg-options "-std=gnu++20 -fopenmp -fdump-tree-omplower" }
 
-#include <omp.h>
+// #include <omp.h>
+typedef __UINTPTR_TYPE__ omp_uintptr_t;
+
+#if __cplusplus >= 201103L
+# define __GOMP_UINTPTR_T_ENUM : omp_uintptr_t
+#else
+# define __GOMP_UINTPTR_T_ENUM
+#endif
+
+typedef enum omp_allocator_handle_t __GOMP_UINTPTR_T_ENUM
+{
+  omp_null_allocator = 0,
+  omp_default_mem_alloc = 1,
+  omp_large_cap_mem_alloc = 2,
+  omp_const_mem_alloc = 3,
+  omp_high_bw_mem_alloc = 4,
+  omp_low_lat_mem_alloc = 5,
+  omp_cgroup_mem_alloc = 6,
+  omp_pteam_mem_alloc = 7,
+  omp_thread_mem_alloc = 8,
+  ompx_gnu_pinned_mem_alloc = 200,
+  ompx_gnu_managed_mem_alloc = 201,
+  __omp_allocator_handle_t_max__ = __UINTPTR_MAX__
+} omp_allocator_handle_t;
+
 
 void f()
 {

diff --git a/gcc/testsuite/gfortran.dg/gomp/pr113436-1.f90 b/gcc/testsuite/gfortran.dg/gomp/pr113436-1.f90
index da757ed720edc72401e92b081a7ab0c46bd033a0..1d47a9a00f3ca996b2e4e7d9860114878341135c 100644 (file)
--- a/gcc/testsuite/gfortran.dg/gomp/pr113436-1.f90
+++ b/gcc/testsuite/gfortran.dg/gomp/pr113436-1.f90
@@ -2,8 +2,33 @@
 ! { dg-do compile }
 ! { dg-options "-fopenmp -fdump-tree-omplower" }
 
+module m
+use iso_c_binding
+integer, parameter :: omp_allocator_handle_kind = c_intptr_t
+        integer (kind=omp_allocator_handle_kind), &
+                 parameter :: omp_null_allocator = 0
+        integer (kind=omp_allocator_handle_kind), &
+                 parameter :: omp_default_mem_alloc = 1
+        integer (kind=omp_allocator_handle_kind), &
+                 parameter :: omp_large_cap_mem_alloc = 2
+        integer (kind=omp_allocator_handle_kind), &
+                 parameter :: omp_const_mem_alloc = 3
+        integer (kind=omp_allocator_handle_kind), &
+                 parameter :: omp_high_bw_mem_alloc = 4
+        integer (kind=omp_allocator_handle_kind), &
+                 parameter :: omp_low_lat_mem_alloc = 5
+        integer (kind=omp_allocator_handle_kind), &
+                 parameter :: omp_cgroup_mem_alloc = 6
+        integer (kind=omp_allocator_handle_kind), &
+                 parameter :: omp_pteam_mem_alloc = 7
+        integer (kind=omp_allocator_handle_kind), &
+                 parameter :: omp_thread_mem_alloc = 8
+end
+
+
 program g
-  use omp_lib
+!  use omp_lib
+  use m
   implicit none
 
   integer :: A, B(10)

diff --git a/gcc/testsuite/gfortran.dg/gomp/pr113436-2.f90 b/gcc/testsuite/gfortran.dg/gomp/pr113436-2.f90
index 0eaf8b5d36d272882afceb6dbc9e1e3cec466e3b..265a0d98636bc06841cb9d9fa10577c92f0c9324 100644 (file)
--- a/gcc/testsuite/gfortran.dg/gomp/pr113436-2.f90
+++ b/gcc/testsuite/gfortran.dg/gomp/pr113436-2.f90
@@ -2,8 +2,32 @@
 ! { dg-do compile }
 ! { dg-options "-fopenmp -fdump-tree-omplower" }
 
+module m
+use iso_c_binding
+integer, parameter :: omp_allocator_handle_kind = c_intptr_t
+        integer (kind=omp_allocator_handle_kind), &
+                 parameter :: omp_null_allocator = 0
+        integer (kind=omp_allocator_handle_kind), &
+                 parameter :: omp_default_mem_alloc = 1
+        integer (kind=omp_allocator_handle_kind), &
+                 parameter :: omp_large_cap_mem_alloc = 2
+        integer (kind=omp_allocator_handle_kind), &
+                 parameter :: omp_const_mem_alloc = 3
+        integer (kind=omp_allocator_handle_kind), &
+                 parameter :: omp_high_bw_mem_alloc = 4
+        integer (kind=omp_allocator_handle_kind), &
+                 parameter :: omp_low_lat_mem_alloc = 5
+        integer (kind=omp_allocator_handle_kind), &
+                 parameter :: omp_cgroup_mem_alloc = 6
+        integer (kind=omp_allocator_handle_kind), &
+                 parameter :: omp_pteam_mem_alloc = 7
+        integer (kind=omp_allocator_handle_kind), &
+                 parameter :: omp_thread_mem_alloc = 8
+end
+
 program g
-  use omp_lib
+!  use omp_lib
+  use m
   implicit none
 
   integer :: A, B(10)

diff --git a/gcc/testsuite/gfortran.dg/gomp/pr113436-3.f90 b/gcc/testsuite/gfortran.dg/gomp/pr113436-3.f90
index f04200f0624ba4bbcf60a385f7447fb06e4b07f4..27592533a4aeeccb58dd574cf3ff002ec7998f9b 100644 (file)
--- a/gcc/testsuite/gfortran.dg/gomp/pr113436-3.f90
+++ b/gcc/testsuite/gfortran.dg/gomp/pr113436-3.f90
@@ -2,8 +2,32 @@
 ! { dg-do compile }
 ! { dg-options "-fopenmp -fno-automatic -fdump-tree-omplower" }
 
+module m
+use iso_c_binding
+integer, parameter :: omp_allocator_handle_kind = c_intptr_t
+        integer (kind=omp_allocator_handle_kind), &
+                 parameter :: omp_null_allocator = 0
+        integer (kind=omp_allocator_handle_kind), &
+                 parameter :: omp_default_mem_alloc = 1
+        integer (kind=omp_allocator_handle_kind), &
+                 parameter :: omp_large_cap_mem_alloc = 2
+        integer (kind=omp_allocator_handle_kind), &
+                 parameter :: omp_const_mem_alloc = 3
+        integer (kind=omp_allocator_handle_kind), &
+                 parameter :: omp_high_bw_mem_alloc = 4
+        integer (kind=omp_allocator_handle_kind), &
+                 parameter :: omp_low_lat_mem_alloc = 5
+        integer (kind=omp_allocator_handle_kind), &
+                 parameter :: omp_cgroup_mem_alloc = 6
+        integer (kind=omp_allocator_handle_kind), &
+                 parameter :: omp_pteam_mem_alloc = 7
+        integer (kind=omp_allocator_handle_kind), &
+                 parameter :: omp_thread_mem_alloc = 8
+end
+
 program g
-  use omp_lib
+!  use omp_lib
+  use m
   implicit none
 
   integer :: A(10)

diff --git a/gcc/testsuite/gfortran.dg/gomp/pr113436-4.f90 b/gcc/testsuite/gfortran.dg/gomp/pr113436-4.f90
index 19889d21fdf927f55a963d530f9ced51c1e4f410..98aa5bfb46a093b98d012f0c357eeb239c52b950 100644 (file)
--- a/gcc/testsuite/gfortran.dg/gomp/pr113436-4.f90
+++ b/gcc/testsuite/gfortran.dg/gomp/pr113436-4.f90
@@ -2,8 +2,32 @@
 ! { dg-do compile }
 ! { dg-options "-fopenmp -fno-automatic -fdump-tree-omplower" }
 
+module m
+use iso_c_binding
+integer, parameter :: omp_allocator_handle_kind = c_intptr_t
+        integer (kind=omp_allocator_handle_kind), &
+                 parameter :: omp_null_allocator = 0
+        integer (kind=omp_allocator_handle_kind), &
+                 parameter :: omp_default_mem_alloc = 1
+        integer (kind=omp_allocator_handle_kind), &
+                 parameter :: omp_large_cap_mem_alloc = 2
+        integer (kind=omp_allocator_handle_kind), &
+                 parameter :: omp_const_mem_alloc = 3
+        integer (kind=omp_allocator_handle_kind), &
+                 parameter :: omp_high_bw_mem_alloc = 4
+        integer (kind=omp_allocator_handle_kind), &
+                 parameter :: omp_low_lat_mem_alloc = 5
+        integer (kind=omp_allocator_handle_kind), &
+                 parameter :: omp_cgroup_mem_alloc = 6
+        integer (kind=omp_allocator_handle_kind), &
+                 parameter :: omp_pteam_mem_alloc = 7
+        integer (kind=omp_allocator_handle_kind), &
+                 parameter :: omp_thread_mem_alloc = 8
+end
+
 program g
-  use omp_lib
+!  use omp_lib
+  use m
   implicit none
 
   integer :: A(10)