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_omp.h | |
| 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_omp.h')
| -rw-r--r-- | runtime/src/kmp_omp.h | 15 |
1 files changed, 4 insertions, 11 deletions
diff --git a/runtime/src/kmp_omp.h b/runtime/src/kmp_omp.h index 8dcb7d2634c05..27b550d1f663b 100644 --- a/runtime/src/kmp_omp.h +++ b/runtime/src/kmp_omp.h @@ -6,10 +6,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 // //===----------------------------------------------------------------------===// @@ -107,16 +106,14 @@ typedef struct { th_task_state; // alternating 0/1 for task team identification offset_and_size_t th_bar; offset_and_size_t th_b_worker_arrived; // the worker increases it by 1 when it -// arrives to the barrier + // arrives to the barrier -#if OMP_40_ENABLED /* teams information */ offset_and_size_t th_teams_microtask; // entry address for teams construct offset_and_size_t th_teams_level; // initial level of teams construct offset_and_size_t th_teams_nteams; // number of teams in a league offset_and_size_t th_teams_nth; // number of threads in each team of the league -#endif /* kmp_desc structure (for info field above) */ kmp_int32 ds_sizeof_struct; @@ -136,9 +133,7 @@ typedef struct { offset_and_size_t t_pkfn; offset_and_size_t t_task_team; // task team structure offset_and_size_t t_implicit_task; // taskdata for the thread's implicit task -#if OMP_40_ENABLED offset_and_size_t t_cancel_request; -#endif offset_and_size_t t_bar; offset_and_size_t t_b_master_arrived; // increased by 1 when master arrives to a barrier @@ -204,7 +199,6 @@ typedef struct { offset_and_size_t td_taskwait_thread; // gtid + 1 of thread encountered taskwait -#if OMP_40_ENABLED /* Taskgroup */ offset_and_size_t td_taskgroup; // pointer to the current taskgroup offset_and_size_t @@ -220,7 +214,6 @@ typedef struct { offset_and_size_t dn_task; offset_and_size_t dn_npredecessors; offset_and_size_t dn_nrefs; -#endif offset_and_size_t dn_routine; /* kmp_thread_data_t */ |