diff options
-rw-r--r-- | libgomp/ChangeLog.gomp | 2 | ||||
-rw-r--r-- | libgomp/ordered.c | 12 |
2 files changed, 7 insertions, 7 deletions
diff --git a/libgomp/ChangeLog.gomp b/libgomp/ChangeLog.gomp index 55c4be4cb04..4d74831ed39 100644 --- a/libgomp/ChangeLog.gomp +++ b/libgomp/ChangeLog.gomp @@ -2,7 +2,7 @@ * ordered.c (gomp_doacross_init, GOMP_doacross_post, GOMP_doacross_wait, gomp_doacross_ull_init, GOMP_doacross_ull_post, - GOMP_doacross_ull_wait): For GFS_DYNAMIC don't divide number of + GOMP_doacross_ull_wait): For GFS_GUIDED don't divide number of iterators or IV by chunk size. * testsuite/libgomp.c/doacross-3.c: New test. diff --git a/libgomp/ordered.c b/libgomp/ordered.c index 2f9233932a9..52df385e427 100644 --- a/libgomp/ordered.c +++ b/libgomp/ordered.c @@ -297,7 +297,7 @@ gomp_doacross_init (unsigned ncounts, long *counts, long chunk_size) if (ws->sched == GFS_STATIC) num_ents = team->nthreads; - else if (ws->sched == GFS_DYNAMIC) + else if (ws->sched == GFS_GUIDED) num_ents = counts[0]; else num_ents = (counts[0] - 1) / chunk_size + 1; @@ -368,7 +368,7 @@ GOMP_doacross_post (long *counts) if (__builtin_expect (ws->sched == GFS_STATIC, 1)) ent = thr->ts.team_id; - else if (ws->sched == GFS_DYNAMIC) + else if (ws->sched == GFS_GUIDED) ent = counts[0]; else ent = counts[0] / doacross->chunk_size; @@ -430,7 +430,7 @@ GOMP_doacross_wait (long first, ...) else ent = first / ws->chunk_size % thr->ts.team->nthreads; } - else if (ws->sched == GFS_DYNAMIC) + else if (ws->sched == GFS_GUIDED) ent = first; else ent = first / doacross->chunk_size; @@ -526,7 +526,7 @@ gomp_doacross_ull_init (unsigned ncounts, gomp_ull *counts, gomp_ull chunk_size) if (ws->sched == GFS_STATIC) num_ents = team->nthreads; - else if (ws->sched == GFS_DYNAMIC) + else if (ws->sched == GFS_GUIDED) num_ents = counts[0]; else num_ents = (counts[0] - 1) / chunk_size + 1; @@ -603,7 +603,7 @@ GOMP_doacross_ull_post (gomp_ull *counts) if (__builtin_expect (ws->sched == GFS_STATIC, 1)) ent = thr->ts.team_id; - else if (ws->sched == GFS_DYNAMIC) + else if (ws->sched == GFS_GUIDED) ent = counts[0]; else ent = counts[0] / doacross->chunk_size_ull; @@ -686,7 +686,7 @@ GOMP_doacross_ull_wait (gomp_ull first, ...) else ent = first / ws->chunk_size_ull % thr->ts.team->nthreads; } - else if (ws->sched == GFS_DYNAMIC) + else if (ws->sched == GFS_GUIDED) ent = first; else ent = first / doacross->chunk_size_ull; |