[Openmp-commits] [PATCH] D24761: Fixed incorrect OpenMP version in Fortran module.

[Olga Malysheva via Openmp-commits]

omalyshe created this revision.
omalyshe added reviewers: jlpeyton, AndreyChurbanov, tlwilmar, hbae.
omalyshe added a subscriber: openmp-commits.
omalyshe set the repository for this revision to rL LLVM.
Herald added subscribers: mgorny, beanz.

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.

Repository:
  rL LLVM

https://reviews.llvm.org/D24761

Files:
  runtime/CMakeLists.txt
  runtime/src/kmp_runtime.c
  runtime/src/kmp_version.c

Index: runtime/CMakeLists.txt
===================================================================
--- runtime/CMakeLists.txt
+++ runtime/CMakeLists.txt
@@ -96,7 +96,9 @@
 endif()
 libomp_check_variable(LIBOMP_OMP_VERSION 45 40 30)
 # 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)
 elseif(${LIBOMP_OMP_VERSION} GREATER 30 OR ${LIBOMP_OMP_VERSION} EQUAL 30)
   set(LIBOMP_OMP_YEAR_MONTH 201107)
Index: runtime/src/kmp_runtime.c
===================================================================
--- runtime/src/kmp_runtime.c
+++ runtime/src/kmp_runtime.c
@@ -43,7 +43,9 @@
 #endif /* defined(KMP_GOMP_COMPAT) */
 
 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)";
 #else
     "3.1 (201107)";
Index: runtime/src/kmp_version.c
===================================================================
--- runtime/src/kmp_version.c
+++ runtime/src/kmp_version.c
@@ -89,7 +89,9 @@
 int const __kmp_version_minor = KMP_VERSION_MINOR;
 int const __kmp_version_build = KMP_VERSION_BUILD;
 int const __kmp_openmp_version =
-    #if OMP_40_ENABLED
+    #if OMP_45_ENABLED
+        201511;
+    #elif OMP_40_ENABLED
         201307;
     #else
         201107;


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D24761.71920.patch
Type: text/x-patch
Size: 1574 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/openmp-commits/attachments/20160920/8e6ac1aa/attachment.bin>