OpenE2K
/
gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Define 'OMP_REQUIRES_[...]', 'GOMP_REQUIRES_[...]' in a single place 

Clean up for recent commit 683f118439
"OpenMP: Move omp requires checks to libgomp".

	gcc/
	* omp-general.h (enum omp_requires): Use 'GOMP_REQUIRES_[...]'.
	include/
	* gomp-constants.h (OMP_REQUIRES_[...]): Update comment.

(cherry picked from commit 2f0d819a81)
This commit is contained in:
Thomas Schwinge 2022-07-07 08:51:50 +02:00 committed by Tobias Burnus
parent 6670b6cef3
commit 0c65939b4f
4 changed files with 19 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
gcc/ChangeLog.omp
View File

@ -1,3 +1,10 @@
2022-07-07 Tobias Burnus <tobias@codesourcery.com>
Backport from mainline:
2022-07-06 Thomas Schwinge <thomas@codesourcery.com>
* omp-general.h (enum omp_requires): Use 'GOMP_REQUIRES_[...]'.
2022-07-05 Tobias Burnus <tobias@codesourcery.com>
Backport from mainline:

8
gcc/omp-general.h
View File

@ -142,12 +142,12 @@ extern int oacc_get_ifn_dim_arg (const gimple *stmt);
enum omp_requires {
OMP_REQUIRES_ATOMIC_DEFAULT_MEM_ORDER = 0xf,
OMP_REQUIRES_UNIFIED_ADDRESS = 0x10,
OMP_REQUIRES_UNIFIED_SHARED_MEMORY = 0x20,
OMP_REQUIRES_UNIFIED_ADDRESS = GOMP_REQUIRES_UNIFIED_ADDRESS,
OMP_REQUIRES_UNIFIED_SHARED_MEMORY = GOMP_REQUIRES_UNIFIED_SHARED_MEMORY,
OMP_REQUIRES_DYNAMIC_ALLOCATORS = 0x40,
OMP_REQUIRES_REVERSE_OFFLOAD = 0x80,
OMP_REQUIRES_REVERSE_OFFLOAD = GOMP_REQUIRES_REVERSE_OFFLOAD,
OMP_REQUIRES_ATOMIC_DEFAULT_MEM_ORDER_USED = 0x100,
OMP_REQUIRES_TARGET_USED = 0x200
OMP_REQUIRES_TARGET_USED = GOMP_REQUIRES_TARGET_USED,
};
extern GTY(()) enum omp_requires omp_requires_mask;

7
include/ChangeLog.omp
View File

@ -1,3 +1,10 @@
2022-07-07 Tobias Burnus <tobias@codesourcery.com>
Backport from mainline:
2022-07-06 Thomas Schwinge <thomas@codesourcery.com>
* gomp-constants.h (OMP_REQUIRES_[...]): Update comment.
2022-07-05 Tobias Burnus <tobias@codesourcery.com>
Backport from mainline:

3
include/gomp-constants.h
View File

@ -368,8 +368,7 @@ enum gomp_map_kind
#define GOMP_DEPEND_MUTEXINOUTSET 4
#define GOMP_DEPEND_INOUTSET 5
/* Flag values for requires-directive features, must match corresponding
OMP_REQUIRES_* values in gcc/omp-general.h. */
/* Flag values for OpenMP 'requires' directive features. */
#define GOMP_REQUIRES_UNIFIED_ADDRESS 0x10
#define GOMP_REQUIRES_UNIFIED_SHARED_MEMORY 0x20
#define GOMP_REQUIRES_REVERSE_OFFLOAD 0x80