diff options
| author | Julian Brown <julian@codesourcery.com> | 2019-09-03 08:57:39 -0700 |
|---|---|---|
| committer | Thomas Schwinge <thomas@codesourcery.com> | 2020-03-03 12:50:41 +0100 |
| commit | 05ec021fd503c3dabf5c87f43113103e806def43 (patch) | |
| tree | d6526c15d86a107061ce59aed3dad1edeed87869 | |
| parent | ca3308a527a4ca8d1e48f8bd9055289553136154 (diff) | |
| download | gcc-05ec021fd503c3dabf5c87f43113103e806def43.zip gcc-05ec021fd503c3dabf5c87f43113103e806def43.tar.gz gcc-05ec021fd503c3dabf5c87f43113103e806def43.tar.bz2 | |
[og9] Enable worker partitioning for AMD GCN
gcc/
* config/gcn/gcn.c (gcn_goacc_validate_dims): Remove
no-flag_worker-partitioning assertion.
(TARGET_GOACC_WORKER_PARTITIONING): Define target hook to true.
* config/gcn/gcn.opt (flag_worker_partitioning): Change default to 1.
libgomp/
* plugin/plugin-gcn.c (gcn_exec): Change default number of workers to
16.
(cherry picked from openacc-gcc-9-branch commit
79e7692178509467f622ecc649cda6aa8717406a)
| -rw-r--r-- | gcc/ChangeLog.omp | 7 | ||||
| -rw-r--r-- | gcc/config/gcn/gcn.c | 4 | ||||
| -rw-r--r-- | gcc/config/gcn/gcn.opt | 2 | ||||
| -rw-r--r-- | libgomp/ChangeLog.omp | 5 | ||||
| -rw-r--r-- | libgomp/plugin/plugin-gcn.c | 4 |
5 files changed, 16 insertions, 6 deletions
diff --git a/gcc/ChangeLog.omp b/gcc/ChangeLog.omp index 2b7f616..dde474d 100644 --- a/gcc/ChangeLog.omp +++ b/gcc/ChangeLog.omp @@ -1,3 +1,10 @@ +2019-09-05 Julian Brown <julian@codesourcery.com> + + * config/gcn/gcn.c (gcn_goacc_validate_dims): Remove + no-flag_worker-partitioning assertion. + (TARGET_GOACC_WORKER_PARTITIONING): Define target hook to true. + * config/gcn/gcn.opt (flag_worker_partitioning): Change default to 1. + 2019-09-05 Cesar Philippidis <cesar@codesourcery.com> Julian Brown <julian@codesourcery.com> diff --git a/gcc/config/gcn/gcn.c b/gcc/config/gcn/gcn.c index ca9321b..b7cf6f0 100644 --- a/gcc/config/gcn/gcn.c +++ b/gcc/config/gcn/gcn.c @@ -4659,8 +4659,6 @@ gcn_goacc_validate_dims (tree decl, int dims[], int fn_level, /* FIXME: remove -facc-experimental-workers when they're ready. */ int max_workers = flag_worker_partitioning ? 16 : 1; - gcc_assert (!flag_worker_partitioning); - /* The vector size must appear to be 64, to the user, unless this is a SEQ routine. The real, internal value is always 1, which means use autovectorization, but the user should not see that. */ @@ -6035,6 +6033,8 @@ print_operand (FILE *file, rtx x, int code) #define TARGET_GOACC_REDUCTION gcn_goacc_reduction #undef TARGET_GOACC_VALIDATE_DIMS #define TARGET_GOACC_VALIDATE_DIMS gcn_goacc_validate_dims +#undef TARGET_GOACC_WORKER_PARTITIONING +#define TARGET_GOACC_WORKER_PARTITIONING true #undef TARGET_HARD_REGNO_MODE_OK #define TARGET_HARD_REGNO_MODE_OK gcn_hard_regno_mode_ok #undef TARGET_HARD_REGNO_NREGS diff --git a/gcc/config/gcn/gcn.opt b/gcc/config/gcn/gcn.opt index 90d35f42..2fd3996 100644 --- a/gcc/config/gcn/gcn.opt +++ b/gcc/config/gcn/gcn.opt @@ -62,7 +62,7 @@ Target Report RejectNegative Var(flag_bypass_init_error) bool flag_worker_partitioning = false macc-experimental-workers -Target Report Var(flag_worker_partitioning) Init(0) +Target Report Var(flag_worker_partitioning) Init(1) int stack_size_opt = -1 diff --git a/libgomp/ChangeLog.omp b/libgomp/ChangeLog.omp index c7ef40e..438bd59 100644 --- a/libgomp/ChangeLog.omp +++ b/libgomp/ChangeLog.omp @@ -1,5 +1,10 @@ 2019-09-05 Julian Brown <julian@codesourcery.com> + * plugin/plugin-gcn.c (gcn_exec): Change default number of workers to + 16. + +2019-09-05 Julian Brown <julian@codesourcery.com> + * testsuite/libgomp.oacc-fortran/lib-13.f90: End data region after wait API calls. diff --git a/libgomp/plugin/plugin-gcn.c b/libgomp/plugin/plugin-gcn.c index 099f70b..f0b22eb 100644 --- a/libgomp/plugin/plugin-gcn.c +++ b/libgomp/plugin/plugin-gcn.c @@ -3244,10 +3244,8 @@ gcn_exec (struct kernel_info *kernel, size_t mapnum, void **hostaddrs, problem size, so let's do a reasonable number of single-worker gangs. 64 gangs matches a typical Fiji device. */ - /* NOTE: Until support for middle-end worker partitioning is merged, use 1 - for the default number of workers. */ if (dims[0] == 0) dims[0] = 64; /* Gangs. */ - if (dims[1] == 0) dims[1] = 1; /* Workers. */ + if (dims[1] == 0) dims[1] = 16; /* Workers. */ /* The incoming dimensions are expressed in terms of gangs, workers, and vectors. The HSA dimensions are expressed in terms of "work-items", |