aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonathan Peyton <jonathan.l.peyton@intel.com>2023-07-06 15:05:59 -0500
committerJonathan Peyton <jonathan.l.peyton@intel.com>2023-07-24 16:02:03 -0500
commit4e680ae5f22ad5de65e9019e8ad51d1494d1b6bd (patch)
tree162bf5495534e0d79bc3c450c7ed65ec8b10fd6c
parentfda297729d00a0a9caef3d43531acdd58c282059 (diff)
downloadllvm-4e680ae5f22ad5de65e9019e8ad51d1494d1b6bd.zip
llvm-4e680ae5f22ad5de65e9019e8ad51d1494d1b6bd.tar.gz
llvm-4e680ae5f22ad5de65e9019e8ad51d1494d1b6bd.tar.bz2
[OpenMP] Move KMP_VERSION printout logic to post-serial-init
Get the KMP_VERSION printout logic out of environment variable file (kmp_settings.cpp) and move to end of serial initialization where KMP_SETTINGS and OMP_DISPLAY_ENV are. Differential Revision: https://reviews.llvm.org/D154652
-rw-r--r--openmp/runtime/src/kmp_runtime.cpp4
-rw-r--r--openmp/runtime/src/kmp_settings.cpp4
2 files changed, 4 insertions, 4 deletions
diff --git a/openmp/runtime/src/kmp_runtime.cpp b/openmp/runtime/src/kmp_runtime.cpp
index 695bb5e..e55798d 100644
--- a/openmp/runtime/src/kmp_runtime.cpp
+++ b/openmp/runtime/src/kmp_runtime.cpp
@@ -7287,6 +7287,10 @@ static void __kmp_do_serial_initialize(void) {
__kmp_init_serial = TRUE;
+ if (__kmp_version) {
+ __kmp_print_version_1();
+ }
+
if (__kmp_settings) {
__kmp_env_print();
}
diff --git a/openmp/runtime/src/kmp_settings.cpp b/openmp/runtime/src/kmp_settings.cpp
index eb92de1..b81376d 100644
--- a/openmp/runtime/src/kmp_settings.cpp
+++ b/openmp/runtime/src/kmp_settings.cpp
@@ -6362,10 +6362,6 @@ void __kmp_env_initialize(char const *string) {
#endif /* KMP_AFFINITY_SUPPORTED */
- if (__kmp_version) {
- __kmp_print_version_1();
- }
-
// Post-initialization step: some env. vars need their value's further
// processing
if (string != NULL) { // kmp_set_defaults() was called