diff options
| author | Jonathan Peyton <jonathan.l.peyton@intel.com> | 2018-07-30 17:50:35 +0000 |
|---|---|---|
| committer | Jonathan Peyton <jonathan.l.peyton@intel.com> | 2018-07-30 17:50:35 +0000 |
| commit | d961fcb0dbe643821eeeaeadd6bb695d0f65fd19 (patch) | |
| tree | dd80ceee1d5c5b09422faa1f8b97c183548d9f2d | |
| parent | 4aa544bb41d8c995b6bac4f38cb5563d746c0641 (diff) | |
[OpenMP] Add GOMP version symbols for OMP_4.5 API
This patch adds the appropriate version symbols to the relevant API functions
Differential Revision: https://reviews.llvm.org/D49859
git-svn-id: https://llvm.org/svn/llvm-project/openmp/trunk@338281 91177308-0d34-0410-b5e6-96231b3b80d8
| -rw-r--r-- | runtime/src/exports_so.txt | 2 | ||||
| -rw-r--r-- | runtime/src/kmp_ftn_entry.h | 23 |
2 files changed, 18 insertions, 7 deletions
diff --git a/runtime/src/exports_so.txt b/runtime/src/exports_so.txt index 3e22324..fc7c5f9 100644 --- a/runtime/src/exports_so.txt +++ b/runtime/src/exports_so.txt @@ -107,6 +107,8 @@ OMP_3.1 { } OMP_3.0; OMP_4.0 { } OMP_3.1; +OMP_4.5 { +} OMP_4.0; # sets up GCC GOMP_ version dependency chain GOMP_1.0 { diff --git a/runtime/src/kmp_ftn_entry.h b/runtime/src/kmp_ftn_entry.h index 0f09828..80db92d 100644 --- a/runtime/src/kmp_ftn_entry.h +++ b/runtime/src/kmp_ftn_entry.h @@ -599,7 +599,7 @@ kmp_proc_bind_t FTN_STDCALL KMP_EXPAND_NAME(FTN_GET_PROC_BIND)(void) { } #if OMP_45_ENABLED -int FTN_STDCALL FTN_GET_NUM_PLACES(void) { +int FTN_STDCALL KMP_EXPAND_NAME(FTN_GET_NUM_PLACES)(void) { #if defined(KMP_STUB) || !KMP_AFFINITY_SUPPORTED return 0; #else @@ -612,7 +612,7 @@ int FTN_STDCALL FTN_GET_NUM_PLACES(void) { #endif } -int FTN_STDCALL FTN_GET_PLACE_NUM_PROCS(int place_num) { +int FTN_STDCALL KMP_EXPAND_NAME(FTN_GET_PLACE_NUM_PROCS)(int place_num) { #if defined(KMP_STUB) || !KMP_AFFINITY_SUPPORTED return 0; #else @@ -637,7 +637,8 @@ int FTN_STDCALL FTN_GET_PLACE_NUM_PROCS(int place_num) { #endif } -void FTN_STDCALL FTN_GET_PLACE_PROC_IDS(int place_num, int *ids) { +void FTN_STDCALL KMP_EXPAND_NAME(FTN_GET_PLACE_PROC_IDS)(int place_num, + int *ids) { #if defined(KMP_STUB) || !KMP_AFFINITY_SUPPORTED // Nothing. #else @@ -661,7 +662,7 @@ void FTN_STDCALL FTN_GET_PLACE_PROC_IDS(int place_num, int *ids) { #endif } -int FTN_STDCALL FTN_GET_PLACE_NUM(void) { +int FTN_STDCALL KMP_EXPAND_NAME(FTN_GET_PLACE_NUM)(void) { #if defined(KMP_STUB) || !KMP_AFFINITY_SUPPORTED return -1; #else @@ -680,7 +681,7 @@ int FTN_STDCALL FTN_GET_PLACE_NUM(void) { #endif } -int FTN_STDCALL FTN_GET_PARTITION_NUM_PLACES(void) { +int FTN_STDCALL KMP_EXPAND_NAME(FTN_GET_PARTITION_NUM_PLACES)(void) { #if defined(KMP_STUB) || !KMP_AFFINITY_SUPPORTED return 0; #else @@ -708,7 +709,8 @@ int FTN_STDCALL FTN_GET_PARTITION_NUM_PLACES(void) { #endif } -void FTN_STDCALL FTN_GET_PARTITION_PLACE_NUMS(int *place_nums) { +void + FTN_STDCALL KMP_EXPAND_NAME(FTN_GET_PARTITION_PLACE_NUMS)(int *place_nums) { #if defined(KMP_STUB) || !KMP_AFFINITY_SUPPORTED // Nothing. #else @@ -1192,7 +1194,7 @@ int FTN_STDCALL FTN_GET_CANCELLATION_STATUS(int cancel_kind) { #if OMP_45_ENABLED /* returns the maximum allowed task priority */ -int FTN_STDCALL FTN_GET_MAX_TASK_PRIORITY(void) { +int FTN_STDCALL KMP_EXPAND_NAME(FTN_GET_MAX_TASK_PRIORITY)(void) { #ifdef KMP_STUB return 0; #else @@ -1291,6 +1293,13 @@ KMP_VERSION_SYMBOL(FTN_IS_INITIAL_DEVICE, 40, "OMP_4.0"); #if OMP_45_ENABLED // OMP_4.5 versioned symbols +KMP_VERSION_SYMBOL(FTN_GET_MAX_TASK_PRIORITY, 45, "OMP_4.5"); +KMP_VERSION_SYMBOL(FTN_GET_NUM_PLACES, 45, "OMP_4.5"); +KMP_VERSION_SYMBOL(FTN_GET_PLACE_NUM_PROCS, 45, "OMP_4.5"); +KMP_VERSION_SYMBOL(FTN_GET_PLACE_PROC_IDS, 45, "OMP_4.5"); +KMP_VERSION_SYMBOL(FTN_GET_PLACE_NUM, 45, "OMP_4.5"); +KMP_VERSION_SYMBOL(FTN_GET_PARTITION_NUM_PLACES, 45, "OMP_4.5"); +KMP_VERSION_SYMBOL(FTN_GET_PARTITION_PLACE_NUMS, 45, "OMP_4.5"); #endif #if OMP_50_ENABLED |