diff options
| author | Jakub Jelinek <jakub@redhat.com> | 2013-10-12 09:52:15 +0200 |
|---|---|---|
| committer | Jakub Jelinek <jakub@gcc.gnu.org> | 2013-10-12 09:52:15 +0200 |
| commit | f89163fd487c99f264ebcc9cd07b679b62b87870 (patch) | |
| tree | 5760fed5f9e50ee90f8b5a5eeaf2cff3e8f4abcf /libgomp/team.c | |
| parent | 6e1d5961cea09a63ce6ed2d0ebf443a1eaf39958 (diff) | |
| download | gcc-f89163fd487c99f264ebcc9cd07b679b62b87870.zip gcc-f89163fd487c99f264ebcc9cd07b679b62b87870.tar.gz gcc-f89163fd487c99f264ebcc9cd07b679b62b87870.tar.bz2 | |
re PR libgomp/58691 (OpenMP 4: Surprising results with OMP_PLACES=)
PR libgomp/58691
* config/linux/proc.c (gomp_cpuset_popcount): Add unused attribute
to check variable.
(gomp_init_num_threads): Move i variable declaration into
#ifdef CPU_ALLOC_SIZE block.
* config/linux/affinity.c (gomp_affinity_init_level): Test
gomp_places_list_len == 0 rather than gomp_places_list == 0
when checking for topology reading error.
* team.c (gomp_team_start): Don't handle bind == omp_proc_bind_false.
* env.c (parse_affinity): Add ignore argument, if true, don't populate
gomp_places_list, only parse env var and always return false.
(parse_places_var): Likewise. Don't check gomp_global_icv.bind_var.
(initialize_env): Always parse OMP_PLACES and GOMP_CPU_AFFINITY env
vars, default to OMP_PROC_BIND=true if OMP_PROC_BIND wasn't specified
and either of these variables were parsed correctly into a places
list.
From-SVN: r203479
Diffstat (limited to 'libgomp/team.c')
| -rw-r--r-- | libgomp/team.c | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/libgomp/team.c b/libgomp/team.c index f4c47f7..20f5f91 100644 --- a/libgomp/team.c +++ b/libgomp/team.c @@ -339,8 +339,6 @@ gomp_team_start (void (*fn) (void *), void *data, unsigned nthreads, if (__builtin_expect (gomp_places_list != NULL, 0)) { - if (bind == omp_proc_bind_false) - bind = omp_proc_bind_true; /* Depending on chosen proc_bind model, set subpartition for the master thread and initialize helper variables P and optionally S, K and/or REST used by later place @@ -348,9 +346,6 @@ gomp_team_start (void (*fn) (void *), void *data, unsigned nthreads, p = thr->place - 1; switch (bind) { - case omp_proc_bind_false: - bind = omp_proc_bind_true; - /* FALLTHRU */ case omp_proc_bind_true: case omp_proc_bind_close: if (nthreads > thr->ts.place_partition_len) |