Skip to content

Commit 5f69583

Browse files
jprotzejprotze
committed
Merge branch 'master' into ompd
Conflicts: runtime/src/kmp_csupport.c runtime/src/kmp_gsupport.c runtime/src/kmp_runtime.c
2 parents f20f03a + 1d64a30 commit 5f69583

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

55 files changed

+2465
-651
lines changed

‎runtime/CMakeLists.txt‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,8 @@ else() # Part of LLVM build
6565
set(LIBOMP_ARCH x86_64)
6666
elseif(LIBOMP_NATIVE_ARCH STREQUAL "x86_64")
6767
set(LIBOMP_ARCH x86_64)
68+
elseif(LIBOMP_NATIVE_ARCH MATCHES "powerpc64le")
69+
set(LIBOMP_ARCH ppc64le)
6870
elseif(LIBOMP_NATIVE_ARCH MATCHES "powerpc")
6971
set(LIBOMP_ARCH ppc64)
7072
elseif(LIBOMP_NATIVE_ARCH MATCHES "aarch64")
@@ -94,7 +96,9 @@ if(LIBOMP_OMP_VERSION EQUAL 41)
9496
endif()
9597
libomp_check_variable(LIBOMP_OMP_VERSION 45 40 30)
9698
# Set the OpenMP Year and Month assiociated with version
97-
if(${LIBOMP_OMP_VERSION} GREATER 40 OR ${LIBOMP_OMP_VERSION} EQUAL 40)
99+
if(${LIBOMP_OMP_VERSION} GREATER 45 OR ${LIBOMP_OMP_VERSION} EQUAL 45)
100+
set(LIBOMP_OMP_YEAR_MONTH 201511)
101+
elseif(${LIBOMP_OMP_VERSION} GREATER 40 OR ${LIBOMP_OMP_VERSION} EQUAL 40)
98102
set(LIBOMP_OMP_YEAR_MONTH 201307)
99103
elseif(${LIBOMP_OMP_VERSION} GREATER 30 OR ${LIBOMP_OMP_VERSION} EQUAL 30)
100104
set(LIBOMP_OMP_YEAR_MONTH 201107)
@@ -349,6 +353,10 @@ endif()
349353

350354
set(LIBOMP_LIB_FILE ${LIBOMP_LIB_NAME}${LIBOMP_LIBRARY_SUFFIX})
351355

356+
# Optional backwards compatibility aliases.
357+
set(LIBOMP_INSTALL_ALIASES TRUE CACHE BOOL
358+
"Install libgomp and libiomp5 library aliases for backwards compatibility")
359+
352360
# Print configuration after all variables are set.
353361
if(${LIBOMP_STANDALONE_BUILD})
354362
libomp_say("Operating System -- ${CMAKE_SYSTEM_NAME}")

‎runtime/cmake/LibompExports.cmake‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,10 +64,12 @@ endif()
6464
if(${LIBOMP_FORTRAN_MODULES})
6565
add_custom_command(TARGET libomp-mod POST_BUILD
6666
COMMAND ${CMAKE_COMMAND} -E make_directory ${LIBOMP_EXPORTS_MOD_DIR}
67-
COMMAND ${CMAKE_COMMAND} -E copy omp_lib.h ${LIBOMP_EXPORTS_CMN_DIR}
6867
COMMAND ${CMAKE_COMMAND} -E copy omp_lib.mod ${LIBOMP_EXPORTS_MOD_DIR}
6968
COMMAND ${CMAKE_COMMAND} -E copy omp_lib_kinds.mod ${LIBOMP_EXPORTS_MOD_DIR}
7069
)
70+
add_custom_command(TARGET omp POST_BUILD
71+
COMMAND ${CMAKE_COMMAND} -E copy omp_lib.h ${LIBOMP_EXPORTS_CMN_DIR}
72+
)
7173
endif()
7274

7375
# Copy OpenMP library into exports/ directory post build

‎runtime/src/CMakeLists.txt‎

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -307,13 +307,15 @@ else()
307307

308308
install(TARGETS omp ${LIBOMP_INSTALL_KIND} DESTINATION lib${LIBOMP_LIBDIR_SUFFIX})
309309

310-
# Create aliases (symlinks) of the library for backwards compatibility
311-
set(LIBOMP_ALIASES "libgomp;libiomp5")
312-
foreach(alias IN LISTS LIBOMP_ALIASES)
313-
install(CODE "execute_process(COMMAND \"\${CMAKE_COMMAND}\" -E create_symlink \"${LIBOMP_LIB_FILE}\"
314-
\"${alias}${LIBOMP_LIBRARY_SUFFIX}\" WORKING_DIRECTORY
315-
\$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/lib${LIBOMP_LIBDIR_SUFFIX})")
316-
endforeach()
310+
if(${LIBOMP_INSTALL_ALIASES})
311+
# Create aliases (symlinks) of the library for backwards compatibility
312+
set(LIBOMP_ALIASES "libgomp;libiomp5")
313+
foreach(alias IN LISTS LIBOMP_ALIASES)
314+
install(CODE "execute_process(COMMAND \"\${CMAKE_COMMAND}\" -E create_symlink \"${LIBOMP_LIB_FILE}\"
315+
\"${alias}${LIBOMP_LIBRARY_SUFFIX}\" WORKING_DIRECTORY
316+
\$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/lib${LIBOMP_LIBDIR_SUFFIX})")
317+
endforeach()
318+
endif()
317319
endif()
318320
install(
319321
FILES

‎runtime/src/dllexports‎

Lines changed: 167 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -162,9 +162,11 @@
162162
__kmp_wait_yield_4
163163
__kmp_fork_call
164164
__kmp_invoke_microtask
165+
%ifdef KMP_USE_MONITOR
165166
__kmp_launch_monitor
166-
__kmp_launch_worker
167167
__kmp_reap_monitor
168+
%endif
169+
__kmp_launch_worker
168170
__kmp_reap_worker
169171
__kmp_acquire_tas_lock
170172
__kmp_acquire_nested_tas_lock
@@ -494,9 +496,9 @@ kmp_set_warnings_off 780
494496
omp_get_cancellation 867
495497
kmp_get_cancellation_status 868
496498
omp_is_initial_device 869
499+
omp_set_default_device 879
500+
omp_get_default_device 880
497501
%ifdef stub
498-
omp_set_default_device 879
499-
omp_get_default_device 880
500502
omp_get_num_devices 881
501503
%endif
502504
%endif # OMP_40
@@ -922,6 +924,59 @@ kmp_set_disp_num_buffers 890
922924
__kmpc_atomic_start 2410
923925
__kmpc_atomic_end 2411
924926

927+
%ifdef HAVE_QUAD
928+
__kmpc_atomic_fixed1_add_cpt_fp
929+
__kmpc_atomic_fixed1_sub_cpt_fp
930+
__kmpc_atomic_fixed1_mul_cpt_fp
931+
__kmpc_atomic_fixed1_div_cpt_fp
932+
__kmpc_atomic_fixed1u_add_cpt_fp
933+
__kmpc_atomic_fixed1u_sub_cpt_fp
934+
__kmpc_atomic_fixed1u_mul_cpt_fp
935+
__kmpc_atomic_fixed1u_div_cpt_fp
936+
937+
__kmpc_atomic_fixed2_add_cpt_fp
938+
__kmpc_atomic_fixed2_sub_cpt_fp
939+
__kmpc_atomic_fixed2_mul_cpt_fp
940+
__kmpc_atomic_fixed2_div_cpt_fp
941+
__kmpc_atomic_fixed2u_add_cpt_fp
942+
__kmpc_atomic_fixed2u_sub_cpt_fp
943+
__kmpc_atomic_fixed2u_mul_cpt_fp
944+
__kmpc_atomic_fixed2u_div_cpt_fp
945+
946+
__kmpc_atomic_fixed4_add_cpt_fp
947+
__kmpc_atomic_fixed4_sub_cpt_fp
948+
__kmpc_atomic_fixed4_mul_cpt_fp
949+
__kmpc_atomic_fixed4_div_cpt_fp
950+
__kmpc_atomic_fixed4u_add_cpt_fp
951+
__kmpc_atomic_fixed4u_sub_cpt_fp
952+
__kmpc_atomic_fixed4u_mul_cpt_fp
953+
__kmpc_atomic_fixed4u_div_cpt_fp
954+
955+
__kmpc_atomic_fixed8_add_cpt_fp
956+
__kmpc_atomic_fixed8_sub_cpt_fp
957+
__kmpc_atomic_fixed8_mul_cpt_fp
958+
__kmpc_atomic_fixed8_div_cpt_fp
959+
__kmpc_atomic_fixed8u_add_cpt_fp
960+
__kmpc_atomic_fixed8u_sub_cpt_fp
961+
__kmpc_atomic_fixed8u_mul_cpt_fp
962+
__kmpc_atomic_fixed8u_div_cpt_fp
963+
964+
__kmpc_atomic_float4_add_cpt_fp
965+
__kmpc_atomic_float4_sub_cpt_fp
966+
__kmpc_atomic_float4_mul_cpt_fp
967+
__kmpc_atomic_float4_div_cpt_fp
968+
969+
__kmpc_atomic_float8_add_cpt_fp
970+
__kmpc_atomic_float8_sub_cpt_fp
971+
__kmpc_atomic_float8_mul_cpt_fp
972+
__kmpc_atomic_float8_div_cpt_fp
973+
974+
__kmpc_atomic_float10_add_cpt_fp
975+
__kmpc_atomic_float10_sub_cpt_fp
976+
__kmpc_atomic_float10_mul_cpt_fp
977+
__kmpc_atomic_float10_div_cpt_fp
978+
%endif
979+
925980
%ifdef OMP_40
926981

927982
# ATOMIC extensions for OpenMP 4.0 spec (x86 and x64 only)
@@ -1000,11 +1055,120 @@ kmp_set_disp_num_buffers 890
10001055
%endif
10011056
%endif
10021057

1058+
__kmpc_atomic_fixed1_sub_rev 2470
1059+
__kmpc_atomic_fixed1_div_rev 2471
1060+
__kmpc_atomic_fixed1u_div_rev 2472
1061+
__kmpc_atomic_fixed1_shl_rev 2473
1062+
__kmpc_atomic_fixed1_shr_rev 2474
1063+
__kmpc_atomic_fixed1u_shr_rev 2475
1064+
__kmpc_atomic_fixed2_sub_rev 2476
1065+
__kmpc_atomic_fixed2_div_rev 2477
1066+
__kmpc_atomic_fixed2u_div_rev 2478
1067+
__kmpc_atomic_fixed2_shl_rev 2479
1068+
__kmpc_atomic_fixed2_shr_rev 2480
1069+
__kmpc_atomic_fixed2u_shr_rev 2481
1070+
__kmpc_atomic_fixed4_sub_rev 2482
1071+
__kmpc_atomic_fixed4_div_rev 2483
1072+
__kmpc_atomic_fixed4u_div_rev 2484
1073+
__kmpc_atomic_fixed4_shl_rev 2485
1074+
__kmpc_atomic_fixed4_shr_rev 2486
1075+
__kmpc_atomic_fixed4u_shr_rev 2487
1076+
__kmpc_atomic_fixed8_sub_rev 2488
1077+
__kmpc_atomic_fixed8_div_rev 2489
1078+
__kmpc_atomic_fixed8u_div_rev 2490
1079+
__kmpc_atomic_fixed8_shl_rev 2491
1080+
__kmpc_atomic_fixed8_shr_rev 2492
1081+
__kmpc_atomic_fixed8u_shr_rev 2493
1082+
__kmpc_atomic_float4_sub_rev 2494
1083+
__kmpc_atomic_float4_div_rev 2495
1084+
__kmpc_atomic_float8_sub_rev 2496
1085+
__kmpc_atomic_float8_div_rev 2497
1086+
__kmpc_atomic_float10_sub_rev 2498
1087+
__kmpc_atomic_float10_div_rev 2499
1088+
%ifdef HAVE_QUAD
1089+
__kmpc_atomic_float16_sub_rev 2500
1090+
__kmpc_atomic_float16_div_rev 2501
1091+
%endif
1092+
__kmpc_atomic_cmplx4_sub_rev 2502
1093+
__kmpc_atomic_cmplx4_div_rev 2503
1094+
__kmpc_atomic_cmplx8_sub_rev 2504
1095+
__kmpc_atomic_cmplx8_div_rev 2505
1096+
__kmpc_atomic_cmplx10_sub_rev 2506
1097+
__kmpc_atomic_cmplx10_div_rev 2507
1098+
%ifdef HAVE_QUAD
1099+
__kmpc_atomic_cmplx16_sub_rev 2508
1100+
__kmpc_atomic_cmplx16_div_rev 2509
1101+
%ifdef arch_32
1102+
__kmpc_atomic_float16_sub_a16_rev 2510
1103+
__kmpc_atomic_float16_div_a16_rev 2511
1104+
__kmpc_atomic_cmplx16_sub_a16_rev 2512
1105+
__kmpc_atomic_cmplx16_div_a16_rev 2513
1106+
%endif
1107+
%endif
1108+
1109+
%ifdef HAVE_QUAD
1110+
__kmpc_atomic_fixed1_sub_rev_fp
1111+
__kmpc_atomic_fixed1_div_rev_fp
1112+
__kmpc_atomic_fixed1u_div_rev_fp
1113+
__kmpc_atomic_fixed2_sub_rev_fp
1114+
__kmpc_atomic_fixed2_div_rev_fp
1115+
__kmpc_atomic_fixed2u_div_rev_fp
1116+
__kmpc_atomic_fixed4_sub_rev_fp
1117+
__kmpc_atomic_fixed4_div_rev_fp
1118+
__kmpc_atomic_fixed4u_div_rev_fp
1119+
__kmpc_atomic_fixed8_sub_rev_fp
1120+
__kmpc_atomic_fixed8_div_rev_fp
1121+
__kmpc_atomic_fixed8u_div_rev_fp
1122+
__kmpc_atomic_float4_sub_rev_fp
1123+
__kmpc_atomic_float4_div_rev_fp
1124+
__kmpc_atomic_float8_sub_rev_fp
1125+
__kmpc_atomic_float8_div_rev_fp
1126+
__kmpc_atomic_float10_sub_rev_fp
1127+
__kmpc_atomic_float10_div_rev_fp
1128+
1129+
__kmpc_atomic_fixed1_sub_cpt_rev_fp
1130+
__kmpc_atomic_fixed1u_sub_cpt_rev_fp
1131+
__kmpc_atomic_fixed1_div_cpt_rev_fp
1132+
__kmpc_atomic_fixed1u_div_cpt_rev_fp
1133+
__kmpc_atomic_fixed2_sub_cpt_rev_fp
1134+
__kmpc_atomic_fixed2u_sub_cpt_rev_fp
1135+
__kmpc_atomic_fixed2_div_cpt_rev_fp
1136+
__kmpc_atomic_fixed2u_div_cpt_rev_fp
1137+
__kmpc_atomic_fixed4_sub_cpt_rev_fp
1138+
__kmpc_atomic_fixed4u_sub_cpt_rev_fp
1139+
__kmpc_atomic_fixed4_div_cpt_rev_fp
1140+
__kmpc_atomic_fixed4u_div_cpt_rev_fp
1141+
__kmpc_atomic_fixed8_sub_cpt_rev_fp
1142+
__kmpc_atomic_fixed8u_sub_cpt_rev_fp
1143+
__kmpc_atomic_fixed8_div_cpt_rev_fp
1144+
__kmpc_atomic_fixed8u_div_cpt_rev_fp
1145+
__kmpc_atomic_float4_sub_cpt_rev_fp
1146+
__kmpc_atomic_float4_div_cpt_rev_fp
1147+
__kmpc_atomic_float8_sub_cpt_rev_fp
1148+
__kmpc_atomic_float8_div_cpt_rev_fp
1149+
__kmpc_atomic_float10_sub_cpt_rev_fp
1150+
__kmpc_atomic_float10_div_cpt_rev_fp
1151+
%endif
10031152
%endif # OMP_40
10041153

10051154

10061155
%endif # arch_64
10071156

1157+
%ifdef HAVE_QUAD
1158+
__kmpc_atomic_fixed1u_add_fp
1159+
__kmpc_atomic_fixed1u_sub_fp
1160+
__kmpc_atomic_fixed1u_mul_fp
1161+
__kmpc_atomic_fixed2u_add_fp
1162+
__kmpc_atomic_fixed2u_sub_fp
1163+
__kmpc_atomic_fixed2u_mul_fp
1164+
__kmpc_atomic_fixed4u_add_fp
1165+
__kmpc_atomic_fixed4u_sub_fp
1166+
__kmpc_atomic_fixed4u_mul_fp
1167+
__kmpc_atomic_fixed8u_add_fp
1168+
__kmpc_atomic_fixed8u_sub_fp
1169+
__kmpc_atomic_fixed8u_mul_fp
1170+
%endif
1171+
10081172
%endif
10091173

10101174
# end of file #

‎runtime/src/exports_so.txt‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,9 +85,11 @@ VERSION {
8585
__kmp_invoke_microtask;
8686
__kmp_itt_fini_ittlib;
8787
__kmp_itt_init_ittlib;
88+
#if KMP_USE_MONITOR
8889
__kmp_launch_monitor;
89-
__kmp_launch_worker;
9090
__kmp_reap_monitor;
91+
#endif
92+
__kmp_launch_worker;
9193
__kmp_reap_worker;
9294
__kmp_release_64;
9395
__kmp_wait_64;

‎runtime/src/i18n/en_US.txt‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ Language "English"
3838
Country "USA"
3939
LangId "1033"
4040
Version "2"
41-
Revision "20160405"
41+
Revision "20160714"
4242

4343

4444

@@ -410,6 +410,7 @@ AffIgnoringHwloc "%1$s: Ignoring hwloc mechanism."
410410
AffHwlocErrorOccurred "%1$s: Hwloc failed in %2$s. Relying on internal affinity mechanisms."
411411
EnvSerialWarn "%1$s must be set prior to OpenMP runtime library initialization; ignored."
412412
EnvVarDeprecated "%1$s variable deprecated, please use %2$s instead."
413+
RedMethodNotSupported "KMP_FORCE_REDUCTION: %1$s method is not supported; using critical."
413414

414415

415416
# --------------------------------------------------------------------------------------------------

0 commit comments

Comments
 (0)