From 157e8afa90f795c17a18fa702fe1b9e6ffde44e3 Mon Sep 17 00:00:00 2001 From: Andrew Stubbs Date: Tue, 3 Aug 2021 13:45:35 +0100 Subject: [PATCH] libgomp amdgcn: Fix issues with dynamic OpenMP thread scaling libgomp/ChangeLog: * config/gcn/bar.h (gomp_barrier_init): Limit thread count to the actual physical number. * config/gcn/team.c (gomp_team_start): Don't attempt to set up threads that do not exist. --- libgomp/ChangeLog.omp | 7 +++++++ libgomp/config/gcn/bar.h | 3 +++ libgomp/config/gcn/team.c | 4 ++++ 3 files changed, 14 insertions(+) diff --git a/libgomp/ChangeLog.omp b/libgomp/ChangeLog.omp index aed8dc03211f..5a8a4687ade5 100644 --- a/libgomp/ChangeLog.omp +++ b/libgomp/ChangeLog.omp @@ -1,3 +1,10 @@ +2021-08-03 Andrew Stubbs + + * config/gcn/bar.h (gomp_barrier_init): Limit thread count to the + actual physical number. + * config/gcn/team.c (gomp_team_start): Don't attempt to set up + threads that do not exist. + 2021-06-02 Julian Brown * testsuite/libgomp.oacc-c-c++-common/deep-copy-15.c: New test. diff --git a/libgomp/config/gcn/bar.h b/libgomp/config/gcn/bar.h index 19d3a6204bc1..b4b2286af412 100644 --- a/libgomp/config/gcn/bar.h +++ b/libgomp/config/gcn/bar.h @@ -55,6 +55,9 @@ typedef unsigned int gomp_barrier_state_t; static inline void gomp_barrier_init (gomp_barrier_t *bar, unsigned count) { + unsigned actual_thread_count = __builtin_gcn_dim_size (1); + if (count > actual_thread_count) + count = actual_thread_count; bar->total = count; bar->awaited = count; bar->awaited_final = count; diff --git a/libgomp/config/gcn/team.c b/libgomp/config/gcn/team.c index 254dd4da2349..70fbf6f48227 100644 --- a/libgomp/config/gcn/team.c +++ b/libgomp/config/gcn/team.c @@ -187,6 +187,10 @@ gomp_team_start (void (*fn) (void *), void *data, unsigned nthreads, if (nthreads == 1) return; + unsigned actual_thread_count = __builtin_gcn_dim_size (1); + if (nthreads > actual_thread_count) + nthreads = actual_thread_count; + /* Release existing idle threads. */ for (unsigned i = 1; i < nthreads; ++i) { -- 2.47.2