This is an archive of the discontinued LLVM Phabricator instance.

Differential D24761

Fixed incorrect OpenMP version in Fortran module.
ClosedPublic

Authored by omalyshe on Sep 20 2016, 6:32 AM.

Details

Reviewers
jlpeyton
hbae
tlwilmar
AndreyChurbanov
Commits
rG74f3ffce2475: Fix incorrect OpenMP version in Fortran module.
rOMP282868: Fix incorrect OpenMP version in Fortran module.
rL282868: Fix incorrect OpenMP version in Fortran module.
Summary

Added check for "45" version to use "201511" string for OpenMP 4.5, otherwise "200505" is used in Fortran module.
Also fixed kmp_openmp_version variable (used for the debugger, e.g.) and kmp_version_omp_api that is used in KMP_VERSION=1 output.

Diff Detail

Repository
rL LLVM

Event Timeline

omalyshe updated this revision to Diff 71920.Sep 20 2016, 6:32 AM
omalyshe retitled this revision from to Fixed incorrect OpenMP version in Fortran module. .
omalyshe updated this object.
omalyshe added reviewers: jlpeyton, AndreyChurbanov, tlwilmar, hbae.
omalyshe set the repository for this revision to rL LLVM.
omalyshe added a subscriber: openmp-commits.
Herald added subscribers: mgorny, beanz. · View Herald TranscriptSep 20 2016, 6:32 AM
tlwilmar accepted this revision.Sep 20 2016, 11:47 AM
tlwilmar edited edge metadata.

LGTM

This revision is now accepted and ready to land.Sep 20 2016, 11:47 AM
Closed by commit rL282868: Fix incorrect OpenMP version in Fortran module. (authored by jlpeyton). · Explain WhySep 30 2016, 8:59 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents

PathSize
openmp/
trunk/
runtime/
4 lines
src/
4 lines
4 lines

Diff 73063

openmp/trunk/runtime/CMakeLists.txt

Show First 20 Lines • Show All 90 Lines • ▼ Show 20 Lines
set(LIBOMP_OMP_VERSION 45 CACHE STRING set(LIBOMP_OMP_VERSION 45 CACHE STRING
"The OpenMP version (45/40/30)") "The OpenMP version (45/40/30)")
if(LIBOMP_OMP_VERSION EQUAL 41) if(LIBOMP_OMP_VERSION EQUAL 41)
libomp_warning_say("LIBOMP_OMP_VERSION=41 is deprecated and will be removed in a later version. Please use 45.") libomp_warning_say("LIBOMP_OMP_VERSION=41 is deprecated and will be removed in a later version. Please use 45.")
set(LIBOMP_OMP_VERSION 45) set(LIBOMP_OMP_VERSION 45)
endif() endif()
libomp_check_variable(LIBOMP_OMP_VERSION 45 40 30) libomp_check_variable(LIBOMP_OMP_VERSION 45 40 30)
# Set the OpenMP Year and Month assiociated with version # Set the OpenMP Year and Month assiociated with version
if(${LIBOMP_OMP_VERSION} GREATER 40 OR ${LIBOMP_OMP_VERSION} EQUAL 40) if(${LIBOMP_OMP_VERSION} GREATER 45 OR ${LIBOMP_OMP_VERSION} EQUAL 45)
set(LIBOMP_OMP_YEAR_MONTH 201511)
elseif(${LIBOMP_OMP_VERSION} GREATER 40 OR ${LIBOMP_OMP_VERSION} EQUAL 40)
set(LIBOMP_OMP_YEAR_MONTH 201307) set(LIBOMP_OMP_YEAR_MONTH 201307)
elseif(${LIBOMP_OMP_VERSION} GREATER 30 OR ${LIBOMP_OMP_VERSION} EQUAL 30) elseif(${LIBOMP_OMP_VERSION} GREATER 30 OR ${LIBOMP_OMP_VERSION} EQUAL 30)
set(LIBOMP_OMP_YEAR_MONTH 201107) set(LIBOMP_OMP_YEAR_MONTH 201107)
else() else()
set(LIBOMP_OMP_YEAR_MONTH 200505) set(LIBOMP_OMP_YEAR_MONTH 200505)
endif() endif()
set(LIBOMP_MIC_ARCH knc CACHE STRING set(LIBOMP_MIC_ARCH knc CACHE STRING
"Intel(R) Many Integrated Core Architecture (Intel(R) MIC Architecture) (knf/knc). Ignored if not Intel(R) MIC Architecture build.") "Intel(R) Many Integrated Core Architecture (Intel(R) MIC Architecture) (knf/knc). Ignored if not Intel(R) MIC Architecture build.")
▲ Show 20 Lines • Show All 274 Lines • Show Last 20 Lines

openmp/trunk/runtime/src/kmp_runtime.c

  • This file is larger than 256 KB, so syntax highlighting is disabled by default.
Show All 37 Lines
#endif #endif
#if defined(KMP_GOMP_COMPAT) #if defined(KMP_GOMP_COMPAT)
char const __kmp_version_alt_comp[] = KMP_VERSION_PREFIX "alternative compiler support: yes"; char const __kmp_version_alt_comp[] = KMP_VERSION_PREFIX "alternative compiler support: yes";
#endif /* defined(KMP_GOMP_COMPAT) */ #endif /* defined(KMP_GOMP_COMPAT) */
char const __kmp_version_omp_api[] = KMP_VERSION_PREFIX "API version: " char const __kmp_version_omp_api[] = KMP_VERSION_PREFIX "API version: "
#if OMP_40_ENABLED #if OMP_45_ENABLED
"4.5 (201511)";
#elif OMP_40_ENABLED
"4.0 (201307)"; "4.0 (201307)";
#else #else
"3.1 (201107)"; "3.1 (201107)";
#endif #endif
#ifdef KMP_DEBUG #ifdef KMP_DEBUG
char const __kmp_version_lock[] = KMP_VERSION_PREFIX "lock type: run time selectable"; char const __kmp_version_lock[] = KMP_VERSION_PREFIX "lock type: run time selectable";
#endif /* KMP_DEBUG */ #endif /* KMP_DEBUG */
▲ Show 20 Lines • Show All 7,600 Lines • Show Last 20 Lines

openmp/trunk/runtime/src/kmp_version.c

Show First 20 Lines • Show All 83 Lines • ▼ Show 20 Lines
// Finally, define strings. // Finally, define strings.
#define KMP_LIBRARY KMP_LIB_TYPE " library (" KMP_LINK_TYPE ")" #define KMP_LIBRARY KMP_LIB_TYPE " library (" KMP_LINK_TYPE ")"
#define KMP_COPYRIGHT "" #define KMP_COPYRIGHT ""
int const __kmp_version_major = KMP_VERSION_MAJOR; int const __kmp_version_major = KMP_VERSION_MAJOR;
int const __kmp_version_minor = KMP_VERSION_MINOR; int const __kmp_version_minor = KMP_VERSION_MINOR;
int const __kmp_version_build = KMP_VERSION_BUILD; int const __kmp_version_build = KMP_VERSION_BUILD;
int const __kmp_openmp_version = int const __kmp_openmp_version =
#if OMP_40_ENABLED #if OMP_45_ENABLED
201511;
#elif OMP_40_ENABLED
201307; 201307;
#else #else
201107; 201107;
#endif #endif
/* Do NOT change the format of this string! Intel(R) Thread Profiler checks for a /* Do NOT change the format of this string! Intel(R) Thread Profiler checks for a
specific format some changes in the recognition routine there need to specific format some changes in the recognition routine there need to
be made before this is changed. be made before this is changed.
▲ Show 20 Lines • Show All 112 Lines • Show Last 20 Lines