30656822b3
... which currently has *not* been forced to 'num_workers (1)'.
In addition to the testcases modified here, this also fixes:
FAIL: libgomp.oacc-c/../libgomp.oacc-c-c++-common/mode-transitions.c -DACC_DEVICE_TYPE_radeon=1 -DACC_MEM_SHARED=0 -foffload=amdgcn-amdhsa -O0 execution test
[Etc.]
mode-transitions.exe: [...]/libgomp.oacc-c-c++-common/mode-transitions.c:702: t17: Assertion `arr_b[i] == (i ^ 31) * 8' failed.
libgomp/
* plugin/plugin-gcn.c (gcn_exec): Force 'num_workers (1)'
unconditionally.
* testsuite/libgomp.oacc-c-c++-common/acc_prof-kernels-1.c:
Update.
* testsuite/libgomp.oacc-c-c++-common/parallel-dims.c: Likewise.
* testsuite/libgomp.oacc-c-c++-common/routine-wv-2.c: Likewise.
82 lines
1.9 KiB
C
82 lines
1.9 KiB
C
/* { dg-additional-options "-Wopenacc-parallelism" } for testing/documenting
|
|
aspects of that functionality. */
|
|
|
|
#include <stdio.h>
|
|
#include <openacc.h>
|
|
#include <gomp-constants.h>
|
|
|
|
#ifdef ACC_DEVICE_TYPE_radeon
|
|
/* Temporarily set this to 1 until multiple workers are permitted. */
|
|
#define NUM_WORKERS 1
|
|
#define NUM_VECTORS 1
|
|
#else
|
|
#define NUM_WORKERS 16
|
|
#define NUM_VECTORS 32
|
|
#endif
|
|
#define WIDTH 64
|
|
#define HEIGHT 32
|
|
|
|
#define WORK_ID(I,N) \
|
|
(acc_on_device (acc_device_not_host) \
|
|
? __builtin_goacc_parlevel_id (GOMP_DIM_WORKER) \
|
|
: (I % N))
|
|
#define VEC_ID(I,N) \
|
|
(acc_on_device (acc_device_not_host) \
|
|
? __builtin_goacc_parlevel_id (GOMP_DIM_VECTOR) \
|
|
: (I % N))
|
|
|
|
#pragma acc routine worker
|
|
void __attribute__ ((noinline))
|
|
WorkVec (int *ptr, int w, int h, int nw, int nv)
|
|
{
|
|
#pragma acc loop worker
|
|
for (int i = 0; i < h; i++)
|
|
#pragma acc loop vector
|
|
for (int j = 0; j < w; j++)
|
|
ptr[i*w + j] = (WORK_ID (i, nw) << 8) | VEC_ID(j, nv);
|
|
}
|
|
|
|
int DoWorkVec (int nw)
|
|
{
|
|
int ary[HEIGHT][WIDTH];
|
|
int err = 0;
|
|
|
|
for (int ix = 0; ix != HEIGHT; ix++)
|
|
for (int jx = 0; jx != WIDTH; jx++)
|
|
ary[ix][jx] = 0xdeadbeef;
|
|
|
|
printf ("spawning %d ...", nw); fflush (stdout);
|
|
|
|
#pragma acc parallel num_workers(nw) vector_length (NUM_VECTORS) copy (ary)
|
|
/* { dg-warning "region contains vector partitioned code but is not vector partitioned" "" { target openacc_radeon_accel_selected } .-1 } */
|
|
{
|
|
WorkVec ((int *)ary, WIDTH, HEIGHT, nw, NUM_VECTORS);
|
|
}
|
|
|
|
for (int ix = 0; ix != HEIGHT; ix++)
|
|
for (int jx = 0; jx != WIDTH; jx++)
|
|
{
|
|
int exp = ((ix % nw) << 8) | (jx % NUM_VECTORS);
|
|
|
|
if (ary[ix][jx] != exp)
|
|
{
|
|
printf ("\nary[%d][%d] = %#x expected %#x", ix, jx,
|
|
ary[ix][jx], exp);
|
|
err = 1;
|
|
}
|
|
}
|
|
printf (err ? " failed\n" : " ok\n");
|
|
|
|
return err;
|
|
}
|
|
|
|
int main ()
|
|
{
|
|
int err = 0;
|
|
|
|
for (int W = 1; W <= NUM_WORKERS; W <<= 1)
|
|
err |= DoWorkVec (W);
|
|
|
|
return err;
|
|
}
|