diff options
| author | Tom de Vries <tdevries@suse.de> | 2018-07-30 08:17:16 +0000 |
|---|---|---|
| committer | Tom de Vries <vries@gcc.gnu.org> | 2018-07-30 08:17:16 +0000 |
| commit | 0b210c43bbb6eddac8ba550d9c45bf679d4328c5 (patch) | |
| tree | e1bcd506790a08b90ee41cf71f48bb7da3c969ab /libgomp/plugin | |
| parent | 605219e7c74bc8039a994847729fb948230d66d3 (diff) | |
| download | gcc-0b210c43bbb6eddac8ba550d9c45bf679d4328c5.zip gcc-0b210c43bbb6eddac8ba550d9c45bf679d4328c5.tar.gz gcc-0b210c43bbb6eddac8ba550d9c45bf679d4328c5.tar.bz2 | |
[libgomp, nvptx] Calculate default dims per device
The default dimensions are calculated using per-device properties, but
initialized once and used on all devices.
This patch fixes this problem by introducing per-device default dimensions.
2018-07-30 Tom de Vries <tdevries@suse.de>
* plugin/plugin-nvptx.c (struct ptx_device): Add default_dims field.
(nvptx_open_device): Init default_dims for device.
(nvptx_exec): Use default_dims from device.
From-SVN: r263061
Diffstat (limited to 'libgomp/plugin')
| -rw-r--r-- | libgomp/plugin/plugin-nvptx.c | 28 |
1 files changed, 21 insertions, 7 deletions
diff --git a/libgomp/plugin/plugin-nvptx.c b/libgomp/plugin/plugin-nvptx.c index 3a4077a..5c522aa 100644 --- a/libgomp/plugin/plugin-nvptx.c +++ b/libgomp/plugin/plugin-nvptx.c @@ -417,6 +417,7 @@ struct ptx_device int warp_size; int max_threads_per_block; int max_threads_per_multiprocessor; + int default_dims[GOMP_DIM_MAX]; struct ptx_image_data *images; /* Images loaded on device. */ pthread_mutex_t image_lock; /* Lock for above list. */ @@ -818,6 +819,9 @@ nvptx_open_device (int n) if (r != CUDA_SUCCESS) async_engines = 1; + for (int i = 0; i != GOMP_DIM_MAX; i++) + ptx_dev->default_dims[i] = 0; + ptx_dev->images = NULL; pthread_mutex_init (&ptx_dev->image_lock, NULL); @@ -1152,15 +1156,22 @@ nvptx_exec (void (*fn), size_t mapnum, void **hostaddrs, void **devaddrs, if (seen_zero) { - /* See if the user provided GOMP_OPENACC_DIM environment - variable to specify runtime defaults. */ - static int default_dims[GOMP_DIM_MAX]; - pthread_mutex_lock (&ptx_dev_lock); - if (!default_dims[0]) + + static int gomp_openacc_dims[GOMP_DIM_MAX]; + if (!gomp_openacc_dims[0]) + { + /* See if the user provided GOMP_OPENACC_DIM environment + variable to specify runtime defaults. */ + for (int i = 0; i < GOMP_DIM_MAX; ++i) + gomp_openacc_dims[i] = GOMP_PLUGIN_acc_default_dim (i); + } + + if (!nvthd->ptx_dev->default_dims[0]) { + int default_dims[GOMP_DIM_MAX]; for (int i = 0; i < GOMP_DIM_MAX; ++i) - default_dims[i] = GOMP_PLUGIN_acc_default_dim (i); + default_dims[i] = gomp_openacc_dims[i]; int gang, worker, vector; { @@ -1196,12 +1207,15 @@ nvptx_exec (void (*fn), size_t mapnum, void **hostaddrs, void **devaddrs, default_dims[GOMP_DIM_GANG], default_dims[GOMP_DIM_WORKER], default_dims[GOMP_DIM_VECTOR]); + + for (i = 0; i != GOMP_DIM_MAX; i++) + nvthd->ptx_dev->default_dims[i] = default_dims[i]; } pthread_mutex_unlock (&ptx_dev_lock); for (i = 0; i != GOMP_DIM_MAX; i++) if (!dims[i]) - dims[i] = default_dims[i]; + dims[i] = nvthd->ptx_dev->default_dims[i]; } /* Check if the accelerator has sufficient hardware resources to |