mirror of git://gcc.gnu.org/git/gcc.git
fa4fcb111a
When thinking about GOMP_teams3, I've realized that using global variables for the values returned by omp_get_num_teams()/omp_get_team_num() calls is incorrect even with our right now dumb way of implementing host teams. The problems are two, one is if host teams is used from multiple pthread_create created threads - the spec says that host teams can't be nested inside of explicit parallel or other teams constructs, but with pthread_create the standard says obviously nothing about it. Another more important thing is host fallback, right now we don't do anything for omp_get_num_teams() or omp_get_team_num() which was fine before host teams was introduced and the 5.1 requirement that num_teams clause specifies minimum of teams, but with the global vars it means inside of target teams num_teams (2) we happily return omp_get_num_teams() == 4 if the target teams is inside of host teams with num_teams(4). With target fallback being invoked from parallel regions global vars simply can't work right on the host. So, this patch moves them to struct gomp_thread and propagates those for parallel to child threads. For host fallback, the implicit zeroing of *thr results in us returning omp_get_num_teams () == 1 and omp_get_team_num () == 0 which is fine for target teams without num_teams clause, for target teams with num_teams clause something to work on and for target without teams nested in it I've asked on omp-lang what should be done. 2021-11-11 Jakub Jelinek <jakub@redhat.com> * libgomp.h (struct gomp_thread): Add num_teams and team_num members. * team.c (struct gomp_thread_start_data): Likewise. (gomp_thread_start): Initialize thr->num_teams and thr->team_num. (gomp_team_start): Initialize start_data->num_teams and start_data->team_num. Update nthr->num_teams and nthr->team_num. * teams.c (gomp_num_teams, gomp_team_num): Remove. (GOMP_teams_reg): Set and restore thr->num_teams and thr->team_num instead of gomp_num_teams and gomp_team_num. (omp_get_num_teams): Use thr->num_teams + 1 instead of gomp_num_teams. (omp_get_team_num): Use thr->team_num instead of gomp_team_num. * testsuite/libgomp.c/teams-4.c: New test. |
||
|---|---|---|
| .. | ||
| config | ||
| plugin | ||
| testsuite | ||
| .gitattributes | ||
| ChangeLog | ||
| ChangeLog.graphite | ||
| Makefile.am | ||
| Makefile.in | ||
| acc_prof.h | ||
| acinclude.m4 | ||
| aclocal.m4 | ||
| affinity-fmt.c | ||
| affinity.c | ||
| alloc.c | ||
| allocator.c | ||
| atomic.c | ||
| barrier.c | ||
| config.h.in | ||
| configure | ||
| configure.ac | ||
| configure.tgt | ||
| critical.c | ||
| env.c | ||
| error.c | ||
| fortran.c | ||
| hashtab.h | ||
| icv-device.c | ||
| icv.c | ||
| iter.c | ||
| iter_ull.c | ||
| libgomp-plugin.c | ||
| libgomp-plugin.h | ||
| libgomp.h | ||
| libgomp.map | ||
| libgomp.spec.in | ||
| libgomp.texi | ||
| libgomp_f.h.in | ||
| libgomp_g.h | ||
| lock.c | ||
| loop.c | ||
| loop_ull.c | ||
| oacc-async.c | ||
| oacc-cuda.c | ||
| oacc-host.c | ||
| oacc-init.c | ||
| oacc-int.h | ||
| oacc-mem.c | ||
| oacc-parallel.c | ||
| oacc-plugin.c | ||
| oacc-plugin.h | ||
| oacc-profiling.c | ||
| oacc-target.c | ||
| omp.h.in | ||
| omp_lib.f90.in | ||
| omp_lib.h.in | ||
| openacc.f90 | ||
| openacc.h | ||
| openacc_lib.h | ||
| ordered.c | ||
| parallel.c | ||
| priority_queue.c | ||
| priority_queue.h | ||
| scope.c | ||
| sections.c | ||
| secure_getenv.h | ||
| single.c | ||
| splay-tree.c | ||
| splay-tree.h | ||
| target.c | ||
| task.c | ||
| taskloop.c | ||
| team.c | ||
| teams.c | ||
| work.c | ||