mirror/gcc
2
0
Fork 0
mirror of git://gcc.gnu.org/git/gcc.git synced 2025-02-19 19:30:54 +08:00
Code Issues Packages Projects Releases Wiki Activity

openmp: Mark deprecated symbols in OpenMP 5.0

Browse Source 
2020-11-05  Ulrich Drepper  <drepper@redhat.com>
	    Kwok Cheung Yeung  <kcy@codesourcery.com>

	libgomp/
	* Makefile.am (%.mod): Add -cpp and -fopenmp to compile flags.
	* Makefile.in: Regenerate.
	* fortran.c: Wrap uses of omp_set_nested and omp_get_nested with
	pragmas to ignore -Wdeprecated-declarations warnings.
	* icv.c: Likewise.
	* omp.h.in (__GOMP_DEPRECATED_5_0): Define.
	Mark omp_lock_hint_* enum values, omp_lock_hint_t, omp_set_nested,
	and omp_get_nested with __GOMP_DEPRECATED_5_0.
	* omp_lib.f90.in: Mark omp_get_nested and omp_set_nested as
	deprecated.
	* testsuite/libgomp.c++/affinity-1.C: Add -Wno-deprecated-declarations
	to test options.
	* testsuite/libgomp.c/affinity-1.c: Likewise.
	* testsuite/libgomp.c/affinity-2.c: Likewise.
	* testsuite/libgomp.c/appendix-a/a.15.1.c: Likewise.
	* testsuite/libgomp.c/lib-1.c: Likewise.
	* testsuite/libgomp.c/nested-1.c: Likewise.
	* testsuite/libgomp.c/nested-2.c: Likewise.
	* testsuite/libgomp.c/nested-3.c: Likewise.
	* testsuite/libgomp.c/pr32362-1.c: Likewise.
	* testsuite/libgomp.c/pr32362-2.c: Likewise.
	* testsuite/libgomp.c/pr32362-3.c: Likewise.
	* testsuite/libgomp.c/pr35549.c: Likewise.
	* testsuite/libgomp.c/pr42942.c: Likewise.
	* testsuite/libgomp.c/pr61200.c: Likewise.
	* testsuite/libgomp.c/sort-1.c: Likewise.
	* testsuite/libgomp.c/target-5.c: Likewise.
	* testsuite/libgomp.c/target-6.c: Likewise.
	* testsuite/libgomp.c/teams-1.c: Likewise.
	* testsuite/libgomp.c/thread-limit-1.c: Likewise.
	* testsuite/libgomp.c/thread-limit-2.c: Likewise.
	* testsuite/libgomp.c/thread-limit-4.c: Likewise.
	* testsuite/libgomp.fortran/affinity1.f90: Likewise.
	* testsuite/libgomp.fortran/lib1.f90: Likewise.
	* testsuite/libgomp.fortran/lib2.f: Likewise.
	* testsuite/libgomp.fortran/nested1.f90: Likewise.
	* testsuite/libgomp.fortran/teams1.f90: Likewise.
This commit is contained in:
Kwok Cheung Yeung 2020-11-05 10:11:23 -08:00
parent 7fa1b2c8da
commit 10508db867
32 changed files with 77 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libgomp/Makefile.am
View File

@ -92,7 +92,7 @@ openacc_kinds.mod: openacc.mod
openacc.mod: openacc.lo
:
%.mod: %.f90
$(FC) $(FCFLAGS) -fsyntax-only $<
$(FC) $(FCFLAGS) -cpp -fopenmp -fsyntax-only $<
fortran.lo: libgomp_f.h
fortran.o: libgomp_f.h
env.lo: libgomp_f.h

2
libgomp/Makefile.in
View File

@ -1382,7 +1382,7 @@ openacc_kinds.mod: openacc.mod
openacc.mod: openacc.lo
:
%.mod: %.f90
$(FC) $(FCFLAGS) -fsyntax-only $<
$(FC) $(FCFLAGS) -cpp -fopenmp -fsyntax-only $<
fortran.lo: libgomp_f.h
fortran.o: libgomp_f.h
env.lo: libgomp_f.h

13
libgomp/fortran.c
View File

@ -47,10 +47,13 @@ ialias_redirect (omp_test_lock)
ialias_redirect (omp_test_nest_lock)
# endif
ialias_redirect (omp_set_dynamic)
ialias_redirect (omp_set_nested)
ialias_redirect (omp_set_num_threads)
ialias_redirect (omp_get_dynamic)
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
ialias_redirect (omp_set_nested)
ialias_redirect (omp_get_nested)
#pragma GCC diagnostic pop
ialias_redirect (omp_set_num_threads)
ialias_redirect (omp_in_parallel)
ialias_redirect (omp_get_max_threads)
ialias_redirect (omp_get_num_procs)
@ -281,6 +284,8 @@ omp_set_dynamic_8_ (const int64_t *set)
omp_set_dynamic (!!*set);
}
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
void
omp_set_nested_ (const int32_t *set)
{
@ -292,6 +297,7 @@ omp_set_nested_8_ (const int64_t *set)
{
omp_set_nested (!!*set);
}
#pragma GCC diagnostic pop
void
omp_set_num_threads_ (const int32_t *set)
@ -311,11 +317,14 @@ omp_get_dynamic_ (void)
return omp_get_dynamic ();
}
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
int32_t
omp_get_nested_ (void)
{
return omp_get_nested ();
}
#pragma GCC diagnostic pop
int32_t
omp_in_parallel_ (void)

10
libgomp/icv.c
View File

@ -51,6 +51,8 @@ omp_get_dynamic (void)
return icv->dyn_var;
}
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
void
omp_set_nested (int val)
{
@ -64,6 +66,7 @@ omp_get_nested (void)
struct gomp_task_icv *icv = gomp_icv (false);
return icv->nest_var;
}
#pragma GCC diagnostic pop
void
omp_set_schedule (omp_sched_t kind, int chunk_size)
@ -222,10 +225,13 @@ omp_get_default_allocator (void)
}
ialias (omp_set_dynamic)
ialias (omp_set_nested)
ialias (omp_set_num_threads)
ialias (omp_get_dynamic)
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
ialias (omp_set_nested)
ialias (omp_get_nested)
#pragma GCC diagnostic pop
ialias (omp_set_num_threads)
ialias (omp_set_schedule)
ialias (omp_get_schedule)
ialias (omp_get_max_threads)

23
libgomp/omp.h.in
View File

@ -26,6 +26,12 @@
#ifndef _OMP_H
#define _OMP_H 1
#if defined(__GNUC__) && _OPENMP >= 201811
# define __GOMP_DEPRECATED_5_0 __attribute__((__deprecated__))
#else
# define __GOMP_DEPRECATED_5_0
#endif
#ifndef _LIBGOMP_OMP_LOCK_DEFINED
#define _LIBGOMP_OMP_LOCK_DEFINED 1
/* These two structures get edited by the libgomp build process to
@ -66,18 +72,19 @@ typedef enum omp_proc_bind_t
typedef enum omp_sync_hint_t
{
omp_sync_hint_none = 0,
omp_lock_hint_none = omp_sync_hint_none,
omp_lock_hint_none __GOMP_DEPRECATED_5_0 = omp_sync_hint_none,
omp_sync_hint_uncontended = 1,
omp_lock_hint_uncontended = omp_sync_hint_uncontended,
omp_lock_hint_uncontended __GOMP_DEPRECATED_5_0 = omp_sync_hint_uncontended,
omp_sync_hint_contended = 2,
omp_lock_hint_contended = omp_sync_hint_contended,
omp_lock_hint_contended __GOMP_DEPRECATED_5_0 = omp_sync_hint_contended,
omp_sync_hint_nonspeculative = 4,
omp_lock_hint_nonspeculative = omp_sync_hint_nonspeculative,
omp_lock_hint_nonspeculative __GOMP_DEPRECATED_5_0
= omp_sync_hint_nonspeculative,
omp_sync_hint_speculative = 8,
omp_lock_hint_speculative = omp_sync_hint_speculative
omp_lock_hint_speculative __GOMP_DEPRECATED_5_0 = omp_sync_hint_speculative
} omp_sync_hint_t;
typedef omp_sync_hint_t omp_lock_hint_t;
typedef __GOMP_DEPRECATED_5_0 omp_sync_hint_t omp_lock_hint_t;
typedef struct __attribute__((__aligned__ (sizeof (void *)))) omp_depend_t
{
@ -184,8 +191,8 @@ extern int omp_in_parallel (void) __GOMP_NOTHROW;
extern void omp_set_dynamic (int) __GOMP_NOTHROW;
extern int omp_get_dynamic (void) __GOMP_NOTHROW;
extern void omp_set_nested (int) __GOMP_NOTHROW;
extern int omp_get_nested (void) __GOMP_NOTHROW;
extern void omp_set_nested (int) __GOMP_NOTHROW __GOMP_DEPRECATED_5_0;
extern int omp_get_nested (void) __GOMP_NOTHROW __GOMP_DEPRECATED_5_0;
extern void omp_init_lock (omp_lock_t *) __GOMP_NOTHROW;
extern void omp_init_lock_with_hint (omp_lock_t *, omp_sync_hint_t)

4
libgomp/omp_lib.f90.in
View File

@ -644,4 +644,8 @@
end function
end interface
#if _OPENMP >= 201811
!GCC$ ATTRIBUTES DEPRECATED :: omp_get_nested, omp_set_nested
#endif
end module omp_lib

1
libgomp/testsuite/libgomp.c++/affinity-1.C
View File

@ -1,4 +1,5 @@
// { dg-do run }
// { dg-set-target-env-var OMP_PROC_BIND "true" }
// { dg-additional-options "-Wno-deprecated-declarations" }
#include "../libgomp.c/affinity-1.c"

3
libgomp/testsuite/libgomp.c/affinity-1.c
View File

@ -17,7 +17,8 @@
/* { dg-do run } */
/* { dg-set-target-env-var OMP_PROC_BIND "false" } */
/* { dg-additional-options "-DINTERPOSE_GETAFFINITY -DDO_FORK -ldl" { target *-*-linux* } } */
/* { dg-additional-options "-Wno-deprecated-declarations" } */
/* { dg-additional-options "-DINTERPOSE_GETAFFINITY -DDO_FORK -ldl -Wno-deprecated-declarations" { target *-*-linux* } } */
#ifndef _GNU_SOURCE
#define _GNU_SOURCE

1
libgomp/testsuite/libgomp.c/affinity-2.c
View File

@ -2,6 +2,7 @@
/* { dg-set-target-env-var OMP_PROC_BIND "spread,close" } */
/* { dg-set-target-env-var OMP_PLACES "{6,7}:4:-2,!{2,3}" } */
/* { dg-set-target-env-var OMP_NUM_THREADS "2" } */
/* { dg-additional-options "-Wno-deprecated-declarations" } */
#include <omp.h>
#include <stdlib.h>

1
libgomp/testsuite/libgomp.c/appendix-a/a.15.1.c
View File

@ -1,4 +1,5 @@
/* { dg-do run } */
/* { dg-additional-options "-Wno-deprecated-declarations" } */
#include <omp.h>
#include <stdio.h>

2
libgomp/testsuite/libgomp.c/lib-1.c
View File

@ -1,3 +1,5 @@
/* { dg-additional-options "-Wno-deprecated-declarations" } */
#include <stdlib.h>
#include <omp.h>

2
libgomp/testsuite/libgomp.c/nested-1.c
View File

@ -1,3 +1,5 @@
/* { dg-additional-options "-Wno-deprecated-declarations" } */
#include <omp.h>
#include <stdlib.h>

2
libgomp/testsuite/libgomp.c/nested-2.c
View File

@ -1,3 +1,5 @@
/* { dg-additional-options "-Wno-deprecated-declarations" } */
#include <omp.h>
#include <stdlib.h>

2
libgomp/testsuite/libgomp.c/nested-3.c
View File

@ -1,3 +1,5 @@
/* { dg-additional-options "-Wno-deprecated-declarations" } */
#include <omp.h>
#include <stdlib.h>
#include <string.h>

1
libgomp/testsuite/libgomp.c/pr32362-1.c
View File

@ -1,5 +1,6 @@
/* PR middle-end/32362 */
/* { dg-do run } */
/* { dg-additional-options "-Wno-deprecated-declarations" } */
#include <omp.h>
#include <stdlib.h>

1
libgomp/testsuite/libgomp.c/pr32362-2.c
View File

@ -1,5 +1,6 @@
/* PR middle-end/32362 */
/* { dg-do run } */
/* { dg-additional-options "-Wno-deprecated-declarations" } */
#include <omp.h>
#include <stdlib.h>

1
libgomp/testsuite/libgomp.c/pr32362-3.c
View File

@ -1,5 +1,6 @@
/* PR middle-end/32362 */
/* { dg-do run } */
/* { dg-additional-options "-Wno-deprecated-declarations" } */
#include <omp.h>
#include <stdlib.h>

1
libgomp/testsuite/libgomp.c/pr35549.c
View File

@ -1,5 +1,6 @@
/* PR middle-end/35549 */
/* { dg-do run } */
/* { dg-additional-options "-Wno-deprecated-declarations" } */
#include <omp.h>
#include <stdlib.h>

1
libgomp/testsuite/libgomp.c/pr42942.c
View File

@ -1,5 +1,6 @@
/* PR libgomp/42942 */
/* { dg-do run } */
/* { dg-additional-options "-Wno-deprecated-declarations" } */
#include <omp.h>
#include <stdlib.h>

1
libgomp/testsuite/libgomp.c/pr61200.c
View File

@ -1,5 +1,6 @@
/* PR libgomp/61200 */
/* { dg-do run } */
/* { dg-additional-options "-Wno-deprecated-declarations" } */
#include <omp.h>
#include <stdlib.h>

2
libgomp/testsuite/libgomp.c/sort-1.c
View File

@ -15,6 +15,8 @@
along with GCC; see the file COPYING3. If not see
<http://www.gnu.org/licenses/>. */
/* { dg-additional-options "-Wno-deprecated-declarations" } */
#include <limits.h>
#include <omp.h>
#include <stdbool.h>

2
libgomp/testsuite/libgomp.c/target-5.c
View File

@ -1,3 +1,5 @@
/* { dg-additional-options "-Wno-deprecated-declarations" } */
#include <omp.h>
#include <stdlib.h>

2
libgomp/testsuite/libgomp.c/target-6.c
View File

@ -1,3 +1,5 @@
/* { dg-additional-options "-Wno-deprecated-declarations" } */
#include <omp.h>
#include <stdlib.h>

2
libgomp/testsuite/libgomp.c/teams-1.c
View File

@ -1,3 +1,5 @@
/* { dg-additional-options "-Wno-deprecated-declarations" } */
#include <omp.h>
#include <stdlib.h>

1
libgomp/testsuite/libgomp.c/thread-limit-1.c
View File

@ -1,5 +1,6 @@
/* { dg-do run } */
/* { dg-set-target-env-var OMP_THREAD_LIMIT "6" } */
/* { dg-additional-options "-Wno-deprecated-declarations" } */
#include <stdlib.h>
#include <unistd.h>

1
libgomp/testsuite/libgomp.c/thread-limit-2.c
View File

@ -1,5 +1,6 @@
/* { dg-do run } */
/* { dg-set-target-env-var OMP_THREAD_LIMIT "9" } */
/* { dg-additional-options "-Wno-deprecated-declarations" } */
#include <stdlib.h>
#include <unistd.h>

1
libgomp/testsuite/libgomp.c/thread-limit-4.c
View File

@ -1,5 +1,6 @@
/* { dg-do run } */
/* { dg-set-target-env-var OMP_THREAD_LIMIT "9" } */
/* { dg-additional-options "-Wno-deprecated-declarations" } */
#include <stdlib.h>
#include <unistd.h>

1
libgomp/testsuite/libgomp.fortran/affinity1.f90
View File

@ -3,6 +3,7 @@
! { dg-set-target-env-var OMP_PROC_BIND "spread,close" }
! { dg-set-target-env-var OMP_PLACES "{6,7}:4:-2,!{2,3}" }
! { dg-set-target-env-var OMP_NUM_THREADS "2" }
! { dg-additional-options "-Wno-deprecated-declarations" }
use omp_lib
integer :: num, i, nump

1
libgomp/testsuite/libgomp.fortran/lib1.f90
View File

@ -1,4 +1,5 @@
! { dg-do run }
! { dg-additional-options "-Wno-deprecated-declarations" }
use omp_lib

1
libgomp/testsuite/libgomp.fortran/lib2.f
View File

@ -1,4 +1,5 @@
C { dg-do run }
C { dg-additional-options "-Wno-deprecated-declarations" }
USE OMP_LIB

2
libgomp/testsuite/libgomp.fortran/nested1.f90
View File

@ -1,4 +1,6 @@
! { dg-do run }
! { dg-additional-options "-Wno-deprecated-declarations" }
program nested1
use omp_lib
integer :: e1, e2, e3, e

2
libgomp/testsuite/libgomp.fortran/teams1.f90
View File

@ -1,3 +1,5 @@
! { dg-additional-options "-Wno-deprecated-declarations" }
program teams1
use omp_lib
!$omp teams thread_limit (2)