diff options
| author | Dimitry Andric <dim@FreeBSD.org> | 2019-08-20 20:52:04 +0000 |
|---|---|---|
| committer | Dimitry Andric <dim@FreeBSD.org> | 2019-08-20 20:52:04 +0000 |
| commit | 1756886afc900127720de68088f9adff3108ef61 (patch) | |
| tree | d4c46dc43cbf2f632d3c575a6d01716370a7b45b /runtime/src/kmp_taskdeps.cpp | |
| parent | 4254a3821b2072ba01f8f7e3347ac862d324babc (diff) | |
vendor/llvm-openmp/openmp-trunk-r366426vendor/llvm-openmp/openmp-release_900-r372316vendor/llvm-openmp/openmp-release_90-r371301vendor/llvm-openmp/openmp-release_90-r370514vendor/llvm-openmp/openmp-release_90-r369369vendor/llvm-openmp-90
Diffstat (limited to 'runtime/src/kmp_taskdeps.cpp')
| -rw-r--r-- | runtime/src/kmp_taskdeps.cpp | 15 |
1 files changed, 3 insertions, 12 deletions
diff --git a/runtime/src/kmp_taskdeps.cpp b/runtime/src/kmp_taskdeps.cpp index fcdd632c972b9..db79deac3127f 100644 --- a/runtime/src/kmp_taskdeps.cpp +++ b/runtime/src/kmp_taskdeps.cpp @@ -4,10 +4,9 @@ //===----------------------------------------------------------------------===// // -// The LLVM Compiler Infrastructure -// -// This file is dual licensed under the MIT and the University of Illinois Open -// Source Licenses. See LICENSE.txt for details. +// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. +// See https://llvm.org/LICENSE.txt for license information. +// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // //===----------------------------------------------------------------------===// @@ -21,8 +20,6 @@ #include "ompt-specific.h" #endif -#if OMP_40_ENABLED - // TODO: Improve memory allocation? keep a list of pre-allocated structures? // allocate in blocks? re-use list finished list entries? // TODO: don't use atomic ref counters for stack-allocated nodes. @@ -536,10 +533,8 @@ kmp_int32 __kmpc_omp_task_with_deps(ident_t *loc_ref, kmp_int32 gtid, bool serial = current_task->td_flags.team_serial || current_task->td_flags.tasking_ser || current_task->td_flags.final; -#if OMP_45_ENABLED kmp_task_team_t *task_team = thread->th.th_task_team; serial = serial && !(task_team && task_team->tt.tt_found_proxy_tasks); -#endif if (!serial && (ndeps > 0 || ndeps_noalias > 0)) { /* if no dependencies have been tracked yet, create the dependence hash */ @@ -624,10 +619,8 @@ void __kmpc_omp_wait_deps(ident_t *loc_ref, kmp_int32 gtid, kmp_int32 ndeps, bool ignore = current_task->td_flags.team_serial || current_task->td_flags.tasking_ser || current_task->td_flags.final; -#if OMP_45_ENABLED ignore = ignore && thread->th.th_task_team != NULL && thread->th.th_task_team->tt.tt_found_proxy_tasks == FALSE; -#endif ignore = ignore || current_task->td_dephash == NULL; if (ignore) { @@ -660,5 +653,3 @@ void __kmpc_omp_wait_deps(ident_t *loc_ref, kmp_int32 gtid, kmp_int32 ndeps, KA_TRACE(10, ("__kmpc_omp_wait_deps(exit): T#%d finished waiting : loc=%p\n", gtid, loc_ref)); } - -#endif /* OMP_40_ENABLED */ |