This is an archive of the discontinued LLVM Phabricator instance.

Differential D77333

OpenMP: Support FreeBSD on AArch64.
ClosedPublic

Authored by brooks on Apr 2 2020, 12:53 PM.

Details

Reviewers
jdoerfert
Group Reviewers
Restricted Project
Summary

This incidentlly makes FreeBSD's x86_64 support follow Linux. This seems
to work fine and is probably simpler than the current divergence.

This work was submitted by Greg V in FreeBSD's phabricator
https://reviews.freebsd.org/D21167 and I have applied a slightly
different version to our packaged version of llvm10.

Diff Detail

Event Timeline

brooks created this revision.Apr 2 2020, 12:53 PM
Herald added a reviewer: jdoerfert. · View Herald TranscriptApr 2 2020, 12:53 PM
Herald added a project: Restricted Project. · View Herald Transcript
Herald added subscribers: openmp-commits, guansong, kristof.beyls and 4 others. · View Herald Transcript
AndreyChurbanov added a subscriber: AndreyChurbanov.Apr 2 2020, 1:21 PM

Could you please run clang-format on the changes (new lines are too long). Thanks.

Harbormaster failed remote builds in B51535: Diff 254604!Apr 2 2020, 1:33 PM
myfreeweb added a subscriber: myfreeweb.Apr 11 2020, 3:53 AM
brooks updated this revision to Diff 270410.Jun 12 2020, 8:26 AM
  • clang-format patched lines.
Herald added subscribers: sstefan1, danielkiss. · View Herald TranscriptJun 12 2020, 8:26 AM
Harbormaster failed remote builds in B60126: Diff 270410!Jun 12 2020, 9:12 AM
emaste added a comment.Jun 12 2020, 11:27 AM

LGTM

jdoerfert accepted this revision.Jun 13 2020, 9:08 AM

LGTM

This revision is now accepted and ready to land.Jun 13 2020, 9:08 AM
emaste added a comment.Aug 22 2020, 7:25 AM

See D86397

brooks mentioned this in D86397: Move special va_list handling to kmp_os.h.Aug 24 2020, 11:55 AM
dim closed this revision.Aug 24 2020, 1:47 PM
dim added a subscriber: dim.

This has been obsoleted by D86397 (committed as rGcde8f4c164a2 with follow-up rG47b0262d3f82).

Revision Contents

PathSize
openmp/
runtime/
src/
3 lines
6 lines
3 lines
15 lines

Diff 270410

openmp/runtime/src/kmp.h

/*! \file */ /*! \file */
Lint: Lint
Inline Actions

clang-format-diff not found in user's PATH; not linting file.

Lint: Lint: clang-format-diff not found in user's PATH; not linting file.
/* /*
* kmp.h -- KPTS runtime header file. * kmp.h -- KPTS runtime header file.
*/ */
//===----------------------------------------------------------------------===// //===----------------------------------------------------------------------===//
// //
// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
▲ Show 20 Lines • Show All 3,450 Lines • ▼ Show 20 Lines fork_context_gnu, /**< Called from GNU generated code, so must not invoke the
microtask internally. */ microtask internally. */
fork_context_intel, /**< Called from Intel generated code. */ fork_context_intel, /**< Called from Intel generated code. */
fork_context_last fork_context_last
}; };
extern int __kmp_fork_call(ident_t *loc, int gtid, extern int __kmp_fork_call(ident_t *loc, int gtid,
enum fork_context_e fork_context, kmp_int32 argc, enum fork_context_e fork_context, kmp_int32 argc,
microtask_t microtask, launch_t invoker, microtask_t microtask, launch_t invoker,
/* TODO: revert workaround for Intel(R) 64 tracker #96 */ /* TODO: revert workaround for Intel(R) 64 tracker #96 */
#if (KMP_ARCH_ARM || KMP_ARCH_X86_64 || KMP_ARCH_AARCH64) && KMP_OS_LINUX #if (KMP_ARCH_ARM || KMP_ARCH_X86_64 || KMP_ARCH_AARCH64) && \
(KMP_OS_FREEBSD || KMP_OS_LINUX)
va_list *ap va_list *ap
#else #else
va_list ap va_list ap
#endif #endif
); );
extern void __kmp_join_call(ident_t *loc, int gtid extern void __kmp_join_call(ident_t *loc, int gtid
#if OMPT_SUPPORT #if OMPT_SUPPORT
▲ Show 20 Lines • Show All 442 Lines • Show Last 20 Lines

openmp/runtime/src/kmp_csupport.cpp

/* /*
Lint: Lint
Inline Actions

clang-format-diff not found in user's PATH; not linting file.

Lint: Lint: clang-format-diff not found in user's PATH; not linting file.
* kmp_csupport.cpp -- kfront linkage support for OpenMP. * kmp_csupport.cpp -- kfront linkage support for OpenMP.
*/ */
//===----------------------------------------------------------------------===// //===----------------------------------------------------------------------===//
// //
// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
// See https://llvm.org/LICENSE.txt for license information. // See https://llvm.org/LICENSE.txt for license information.
▲ Show 20 Lines • Show All 295 Lines • ▼ Show 20 Lines
#if INCLUDE_SSC_MARKS #if INCLUDE_SSC_MARKS
SSC_MARK_FORKING(); SSC_MARK_FORKING();
#endif #endif
__kmp_fork_call(loc, gtid, fork_context_intel, argc, __kmp_fork_call(loc, gtid, fork_context_intel, argc,
VOLATILE_CAST(microtask_t) microtask, // "wrapped" task VOLATILE_CAST(microtask_t) microtask, // "wrapped" task
VOLATILE_CAST(launch_t) __kmp_invoke_task_func, VOLATILE_CAST(launch_t) __kmp_invoke_task_func,
/* TODO: revert workaround for Intel(R) 64 tracker #96 */ /* TODO: revert workaround for Intel(R) 64 tracker #96 */
#if (KMP_ARCH_X86_64 || KMP_ARCH_ARM || KMP_ARCH_AARCH64) && KMP_OS_LINUX #if (KMP_ARCH_X86_64 || KMP_ARCH_ARM || KMP_ARCH_AARCH64) && \
(KMP_OS_FREEBSD || KMP_OS_LINUX)
&ap &ap
#else #else
ap ap
#endif #endif
); );
#if INCLUDE_SSC_MARKS #if INCLUDE_SSC_MARKS
SSC_MARK_JOINING(); SSC_MARK_JOINING();
#endif #endif
▲ Show 20 Lines • Show All 86 Lines • ▼ Show 20 Lines#endif
KMP_DEBUG_ASSERT(this_thr->th.th_set_nproc >= 1); KMP_DEBUG_ASSERT(this_thr->th.th_set_nproc >= 1);
KMP_DEBUG_ASSERT(this_thr->th.th_teams_size.nteams >= 1); KMP_DEBUG_ASSERT(this_thr->th.th_teams_size.nteams >= 1);
KMP_DEBUG_ASSERT(this_thr->th.th_teams_size.nth >= 1); KMP_DEBUG_ASSERT(this_thr->th.th_teams_size.nth >= 1);
__kmp_fork_call(loc, gtid, fork_context_intel, argc, __kmp_fork_call(loc, gtid, fork_context_intel, argc,
VOLATILE_CAST(microtask_t) VOLATILE_CAST(microtask_t)
__kmp_teams_master, // "wrapped" task __kmp_teams_master, // "wrapped" task
VOLATILE_CAST(launch_t) __kmp_invoke_teams_master, VOLATILE_CAST(launch_t) __kmp_invoke_teams_master,
#if (KMP_ARCH_X86_64 || KMP_ARCH_ARM || KMP_ARCH_AARCH64) && KMP_OS_LINUX #if (KMP_ARCH_X86_64 || KMP_ARCH_ARM || KMP_ARCH_AARCH64) && \
(KMP_OS_FREEBSD || KMP_OS_LINUX)
&ap &ap
#else #else
ap ap
#endif #endif
); );
__kmp_join_call(loc, gtid __kmp_join_call(loc, gtid
#if OMPT_SUPPORT #if OMPT_SUPPORT
, ,
▲ Show 20 Lines • Show All 3,783 Lines • Show Last 20 Lines

openmp/runtime/src/kmp_gsupport.cpp

/* /*
Lint: Lint
Inline Actions

clang-format-diff not found in user's PATH; not linting file.

Lint: Lint: clang-format-diff not found in user's PATH; not linting file.
* kmp_gsupport.cpp * kmp_gsupport.cpp
*/ */
//===----------------------------------------------------------------------===// //===----------------------------------------------------------------------===//
// //
// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
// See https://llvm.org/LICENSE.txt for license information. // See https://llvm.org/LICENSE.txt for license information.
▲ Show 20 Lines • Show All 363 Lines • ▼ Show 20 Lines#endif /* KMP_DEBUG */
kmp_team_t *team = thr->th.th_team; kmp_team_t *team = thr->th.th_team;
int tid = __kmp_tid_from_gtid(gtid); int tid = __kmp_tid_from_gtid(gtid);
va_list ap; va_list ap;
va_start(ap, argc); va_start(ap, argc);
rc = __kmp_fork_call(loc, gtid, fork_context_gnu, argc, wrapper, rc = __kmp_fork_call(loc, gtid, fork_context_gnu, argc, wrapper,
__kmp_invoke_task_func, __kmp_invoke_task_func,
#if (KMP_ARCH_X86_64 || KMP_ARCH_ARM || KMP_ARCH_AARCH64) && KMP_OS_LINUX #if (KMP_ARCH_X86_64 || KMP_ARCH_ARM || KMP_ARCH_AARCH64) && \
(KMP_OS_FREEBSD || KMP_OS_LINUX)
&ap &ap
#else #else
ap ap
#endif #endif
); );
va_end(ap); va_end(ap);
▲ Show 20 Lines • Show All 1,604 Lines • Show Last 20 Lines

openmp/runtime/src/kmp_runtime.cpp

  • This file is larger than 256 KB, so syntax highlighting is disabled by default.
/* /*
Lint: Lint
Inline Actions

clang-format-diff not found in user's PATH; not linting file.

Lint: Lint: clang-format-diff not found in user's PATH; not linting file.
* kmp_runtime.cpp -- KPTS runtime support library * kmp_runtime.cpp -- KPTS runtime support library
*/ */
//===----------------------------------------------------------------------===// //===----------------------------------------------------------------------===//
// //
// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
// See https://llvm.org/LICENSE.txt for license information. // See https://llvm.org/LICENSE.txt for license information.
▲ Show 20 Lines • Show All 1,376 Lines • ▼ Show 20 Lines
} }
/* most of the work for a fork */ /* most of the work for a fork */
/* return true if we really went parallel, false if serialized */ /* return true if we really went parallel, false if serialized */
int __kmp_fork_call(ident_t *loc, int gtid, int __kmp_fork_call(ident_t *loc, int gtid,
enum fork_context_e call_context, // Intel, GNU, ... enum fork_context_e call_context, // Intel, GNU, ...
kmp_int32 argc, microtask_t microtask, launch_t invoker, kmp_int32 argc, microtask_t microtask, launch_t invoker,
/* TODO: revert workaround for Intel(R) 64 tracker #96 */ /* TODO: revert workaround for Intel(R) 64 tracker #96 */
#if (KMP_ARCH_X86_64 || KMP_ARCH_ARM || KMP_ARCH_AARCH64) && KMP_OS_LINUX #if (KMP_ARCH_X86_64 || KMP_ARCH_ARM || KMP_ARCH_AARCH64) && \
(KMP_OS_FREEBSD || KMP_OS_LINUX)
va_list *ap va_list *ap
#else #else
va_list ap va_list ap
#endif #endif
) { ) {
void **argv; void **argv;
int i; int i;
int master_tid; int master_tid;
▲ Show 20 Lines • Show All 99 Lines • ▼ Show 20 Lines if (master_th->th.th_teams_microtask && ap &&
// The team is actual (hot), all workers are ready at the fork barrier. // The team is actual (hot), all workers are ready at the fork barrier.
// No lock needed to initialize the team a bit, then free workers. // No lock needed to initialize the team a bit, then free workers.
parent_team->t.t_ident = loc; parent_team->t.t_ident = loc;
__kmp_alloc_argv_entries(argc, parent_team, TRUE); __kmp_alloc_argv_entries(argc, parent_team, TRUE);
parent_team->t.t_argc = argc; parent_team->t.t_argc = argc;
argv = (void **)parent_team->t.t_argv; argv = (void **)parent_team->t.t_argv;
for (i = argc - 1; i >= 0; --i) for (i = argc - 1; i >= 0; --i)
/* TODO: revert workaround for Intel(R) 64 tracker #96 */ /* TODO: revert workaround for Intel(R) 64 tracker #96 */
#if (KMP_ARCH_X86_64 || KMP_ARCH_ARM || KMP_ARCH_AARCH64) && KMP_OS_LINUX #if (KMP_ARCH_X86_64 || KMP_ARCH_ARM || KMP_ARCH_AARCH64) && \
(KMP_OS_FREEBSD || KMP_OS_LINUX)
*argv++ = va_arg(*ap, void *); *argv++ = va_arg(*ap, void *);
#else #else
*argv++ = va_arg(ap, void *); *argv++ = va_arg(ap, void *);
#endif #endif
// Increment our nested depth levels, but not increase the serialization // Increment our nested depth levels, but not increase the serialization
if (parent_team == master_th->th.th_serial_team) { if (parent_team == master_th->th.th_serial_team) {
// AC: we are in serialized parallel // AC: we are in serialized parallel
__kmpc_serialized_parallel(loc, gtid); __kmpc_serialized_parallel(loc, gtid);
▲ Show 20 Lines • Show All 282 Lines • ▼ Show 20 Lines#endif
// team->t.t_pkfn = microtask; // team->t.t_pkfn = microtask;
team->t.t_invoke = invoker; team->t.t_invoke = invoker;
__kmp_alloc_argv_entries(argc, team, TRUE); __kmp_alloc_argv_entries(argc, team, TRUE);
team->t.t_argc = argc; team->t.t_argc = argc;
argv = (void **)team->t.t_argv; argv = (void **)team->t.t_argv;
if (ap) { if (ap) {
for (i = argc - 1; i >= 0; --i) for (i = argc - 1; i >= 0; --i)
// TODO: revert workaround for Intel(R) 64 tracker #96 // TODO: revert workaround for Intel(R) 64 tracker #96
#if (KMP_ARCH_X86_64 || KMP_ARCH_ARM || KMP_ARCH_AARCH64) && KMP_OS_LINUX #if (KMP_ARCH_X86_64 || KMP_ARCH_ARM || KMP_ARCH_AARCH64) && \
(KMP_OS_FREEBSD || KMP_OS_LINUX)
*argv++ = va_arg(*ap, void *); *argv++ = va_arg(*ap, void *);
#else #else
*argv++ = va_arg(ap, void *); *argv++ = va_arg(ap, void *);
#endif #endif
} else { } else {
for (i = 0; i < argc; ++i) for (i = 0; i < argc; ++i)
// Get args from parent team for teams construct // Get args from parent team for teams construct
argv[i] = parent_team->t.t_argv[i]; argv[i] = parent_team->t.t_argv[i];
Show All 19 Lines#if OMPT_SUPPORT
} }
master_th->th.ompt_thread_info.state = ompt_state_overhead; master_th->th.ompt_thread_info.state = ompt_state_overhead;
} }
#endif #endif
} else { } else {
argv = args; argv = args;
for (i = argc - 1; i >= 0; --i) for (i = argc - 1; i >= 0; --i)
// TODO: revert workaround for Intel(R) 64 tracker #96 // TODO: revert workaround for Intel(R) 64 tracker #96
#if (KMP_ARCH_X86_64 || KMP_ARCH_ARM || KMP_ARCH_AARCH64) && KMP_OS_LINUX #if (KMP_ARCH_X86_64 || KMP_ARCH_ARM || KMP_ARCH_AARCH64) && \
(KMP_OS_FREEBSD || KMP_OS_LINUX)
*argv++ = va_arg(*ap, void *); *argv++ = va_arg(*ap, void *);
#else #else
*argv++ = va_arg(ap, void *); *argv++ = va_arg(ap, void *);
#endif #endif
KMP_MB(); KMP_MB();
#if OMPT_SUPPORT #if OMPT_SUPPORT
void *dummy; void *dummy;
▲ Show 20 Lines • Show All 273 Lines • ▼ Show 20 Lines KMP_DEBUG_ASSERT(team != root->r.r_hot_team ||
team->t.t_parent->t.t_serialized))); team->t.t_parent->t.t_serialized)));
KMP_MB(); KMP_MB();
/* now, setup the arguments */ /* now, setup the arguments */
argv = (void **)team->t.t_argv; argv = (void **)team->t.t_argv;
if (ap) { if (ap) {
for (i = argc - 1; i >= 0; --i) { for (i = argc - 1; i >= 0; --i) {
// TODO: revert workaround for Intel(R) 64 tracker #96 // TODO: revert workaround for Intel(R) 64 tracker #96
#if (KMP_ARCH_X86_64 || KMP_ARCH_ARM || KMP_ARCH_AARCH64) && KMP_OS_LINUX #if (KMP_ARCH_X86_64 || KMP_ARCH_ARM || KMP_ARCH_AARCH64) && \
(KMP_OS_FREEBSD || KMP_OS_LINUX)
void *new_argv = va_arg(*ap, void *); void *new_argv = va_arg(*ap, void *);
#else #else
void *new_argv = va_arg(ap, void *); void *new_argv = va_arg(ap, void *);
#endif #endif
KMP_CHECK_UPDATE(*argv, new_argv); KMP_CHECK_UPDATE(*argv, new_argv);
argv++; argv++;
} }
} else { } else {
▲ Show 20 Lines • Show All 6,165 Lines • Show Last 20 Lines