FreeChainXenon/gcc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
gcc/libgomp/testsuite/libgomp.c/doacross-5.c

199 lines
4.8 KiB
C
Raw Permalink Normal View History

openmp: Implement doacross(sink: omp_cur_iteration - 1) This patch implements doacross(sink: omp_cur_iteration - 1) that the previous patchset emitted a sorry on during omp expansion. It can be implemented with existing library functions. To recap, depend(source)/doacross(source:)/doacross(source:omp_cur_iteration) is implemented calling GOMP_doacross_post or GOMP_doacross_ull_post, called with an array of long or unsigned long long elements, one for all collapsed loops together and one for each further ordered loop if any. We initialize that array in each thread when grabbing further set of iterations and update it at the end of loops, so that it represents the current iteration (as 0 based counters). When the worksharing loop is created, we tell the library through another similar array the counts (the loop needs to be rectangular) in each dimension, first element is count of all logical iterations in the collapsed loops. depend(sink:v1 op N1, v2 op N2, ...) is then implemented by conditionally calling GOMP_doacross_wait/GOMP_doacross_ull_wait. For N? of 0 there is no check, otherwise if it wants to wait in a particular dimension for a previous iteration, we check that the corresponding iterator isn't the first one (or first few), where the previous iterator in that dimension would be out of range, and similarly for checking of next iteration in a dimension that it isn't the last one (or last few) where it would be similarly out of bounds. Then the collapsed loop counters are folded into a single 0 based counter (first argument) and then other 0 based iterations counters on what iteration it should wait for. Now, doacross(sink: omp_cur_iteration - 1) is supposed to wait for the previous logical iteration in the combined iteration space of all ordered loops. For the very first iteration in that combined iteration space it does nothing, there is no previous iteration. And similarly it does nothing if there are more ordered loops than collapsed loop and it isn't the first logical iteration of the combined loops inside of the collapsed loops, because as implemented we know the previous iteration in that case is always executed by the same thread as the current one. In the implementation, we use the same value as is stored in the first element of the array for GOMP_doacross_post/GOMP_doacross_ull_post, if that value is 0, we do nothing. The rest is different based on if ordered argument is equal to collapse or not. If it is, then we otherwise call GOMP_doacross_wait/GOMP_doacross_ull_wait with a single argument, one less than that counter we compare against 0. If ordered argument is bigger than collapse, we add a per-thread boolean variable .first.N, which we set to true at the start of the outermost ordered loop inside of the collapsed set of loops and set to false at the end of the innermost ordered loop. If .first.N is false, we don't do anything (we know the previous iteration was handled by the current thread and by my reading of the spec we don't need to emit even a memory barrier in that case, because it is just synchronization with the same thread), otherwise we call GOMP_doacross_wait/GOMP_doacross_ull_wait with the first argument one less than the counter we compare against 0, and then one less than 2nd and following counts if iterations we pass to the workshare initialization. If say .counts.N passed to the workshare initialization is { 256, 13, 5, 2 } for collapse(3) ordered(6) loop, then GOMP_doacross_post/GOMP_doacross_ull_post is called with arguments equal to .ordereda.N[0] - 1, 12, 4, 1. 2022-09-08 Jakub Jelinek <jakub@redhat.com> gcc/ * omp-expand.cc (expand_omp_ordered_sink): Add CONT_BB argument. Add doacross(sink:omp_cur_iteration-1) support. (expand_omp_ordered_source_sink): Clear counts[fd->ordered + 1]. Adjust expand_omp_ordered_sink caller. (expand_omp_for_ordered_loops): If counts[fd->ordered + 1] is non-NULL, set that variable to true at the start of outermost non-collapsed loop and set it to false at the end of innermost ordered loop. (expand_omp_for_generic): If fd->ordered, allocate 1 + (fd->ordered - fd->collapse) further elements in counts array. Copy to counts + 2 + fd->ordered the counts of fd->collapse .. fd->ordered - 1 loop if any. gcc/testsuite/ * c-c++-common/gomp/doacross-7.c: New test. libgomp/ * libgomp.texi (OpenMP 5.2): Mention that omp_cur_iteration is now fully supported. * testsuite/libgomp.c/doacross-4.c: New test. * testsuite/libgomp.c/doacross-5.c: New test. * testsuite/libgomp.c/doacross-6.c: New test. * testsuite/libgomp.c/doacross-7.c: New test.
2022-09-08 13:08:22 +02:00
extern void abort (void);
#define N 256
int a[N], b[N / 16][8][4], c[N / 32][8][8];
volatile int d, e;
int
main ()
{
int i, j, k, l, m;
#pragma omp parallel private (l)
{
#pragma omp for schedule(static, 1) ordered (1) nowait
for (i = 0; i < N; i++)
{
#pragma omp atomic write
a[i] = 1;
#pragma omp ordered doacross(sink: omp_cur_iteration - 1)
if (i)
{
#pragma omp atomic read
l = a[i - 1];
if (l < 2)
abort ();
}
#pragma omp atomic write
a[i] = 2;
if (i < N - 1)
{
#pragma omp atomic read
l = a[i + 1];
if (l == 3)
abort ();
}
#pragma omp ordered doacross(source :)
#pragma omp atomic write
a[i] = 3;
}
#pragma omp for schedule(static) ordered (3) nowait
for (i = 2; i < N / 16 - 1; i++)
for (j = 0; j < 8; j += 2)
for (k = 1; k <= 3; k++)
{
#pragma omp atomic write
b[i][j][k] = 1;
#pragma omp ordered doacross(sink: omp_cur_iteration - 1) \
doacross(sink: i - 2, j - 2, k + 1)
#pragma omp ordered doacross(sink: i - 3, j + 2, k - 2)
if (i != 2 || j || k != 1)
{
if (k != 1)
#pragma omp atomic read
l = b[i][j][k - 1];
else if (j)
#pragma omp atomic read
l = b[i][j - 2][3];
else
#pragma omp atomic read
l = b[i - 1][6][3];
if (l < 2)
abort ();
}
#pragma omp atomic write
b[i][j][k] = 2;
if (i >= 4 && j >= 2 && k < 3)
{
#pragma omp atomic read
l = b[i - 2][j - 2][k + 1];
if (l < 2)
abort ();
}
if (i >= 5 && j < N / 16 - 3 && k == 3)
{
#pragma omp atomic read
l = b[i - 3][j + 2][k - 2];
if (l < 2)
abort ();
}
#pragma omp ordered doacross(source : omp_cur_iteration)
#pragma omp atomic write
b[i][j][k] = 3;
}
#define A(n) int n;
#define B(n) A(n##0) A(n##1) A(n##2) A(n##3)
#define C(n) B(n##0) B(n##1) B(n##2) B(n##3)
#define D(n) C(n##0) C(n##1) C(n##2) C(n##3)
D(m)
#undef A
#pragma omp for collapse (2) ordered(61) schedule(dynamic, 15)
for (i = 0; i < N / 32; i++)
for (j = 7; j > 1; j--)
for (k = 6; k >= 0; k -= 2)
#define A(n) for (n = 4; n < 5; n++)
D(m)
#undef A
{
#pragma omp atomic write
c[i][j][k] = 1;
#define A(n) ,n
#define E(n) C(n##0) C(n##1) C(n##2) B(n##30) B(n##31) A(n##320) A(n##321)
#pragma omp ordered doacross (sink: i, j, k + 2 E(m)) \
doacross (sink:omp_cur_iteration - 1) \
doacross(sink: i - 1, j - 2, k - 2 E(m))
if (k <= 4)
{
#pragma omp atomic read
l = c[i][j][k + 2];
if (l < 2)
abort ();
}
#pragma omp atomic write
c[i][j][k] = 2;
if (i || j != 7 && k != 6)
{
if (k != 6)
#pragma omp atomic read
l = c[i][j][k + 2];
else if (j != 7)
#pragma omp atomic read
l = c[i][j + 1][0];
else
#pragma omp atomic read
l = c[i - 1][2][0];
if (l < 2)
abort ();
}
if (i >= 1 && j >= 4 && k >= 2)
{
#pragma omp atomic read
l = c[i - 1][j - 2][k - 2];
if (l < 2)
abort ();
}
#pragma omp ordered doacross (source: )
#pragma omp atomic write
c[i][j][k] = 3;
}
#pragma omp for collapse(2) ordered(4) lastprivate (i, j, k)
for (i = 0; i < d + 1; i++)
for (j = d + 1; j >= 0; j--)
for (k = 0; k < d; k++)
for (l = 0; l < d + 2; l++)
{
#pragma omp ordered doacross (source : omp_cur_iteration)
#pragma omp ordered doacross (sink: omp_cur_iteration - 1)
if (!e)
abort ();
}
#pragma omp single
{
if (i != 1 || j != -1 || k != 0)
abort ();
i = 8; j = 9; k = 10;
}
#pragma omp for collapse(2) ordered(4) lastprivate (i, j, k, m)
for (i = 0; i < d + 1; i++)
for (j = d + 1; j >= 0; j--)
for (k = 0; k < d + 2; k++)
for (m = 0; m < d; m++)
{
#pragma omp ordered doacross (source : )
#pragma omp ordered doacross (sink:omp_cur_iteration - 1)
abort ();
}
#pragma omp single
if (i != 1 || j != -1 || k != 2 || m != 0)
abort ();
#pragma omp for collapse(2) ordered(4) nowait
for (i = 0; i < d + 1; i++)
for (j = d; j > 0; j--)
for (k = 0; k < d + 2; k++)
for (l = 0; l < d + 4; l++)
{
#pragma omp ordered doacross (source : omp_cur_iteration)
#pragma omp ordered doacross (sink:omp_cur_iteration - 1)
if (!e)
abort ();
}
#pragma omp for nowait
for (i = 0; i < N; i++)
if (a[i] != 3)
abort ();
#pragma omp for collapse(2) private(k) nowait
for (i = 0; i < N / 16; i++)
for (j = 0; j < 8; j++)
for (k = 0; k < 4; k++)
if (b[i][j][k] != 3 * (i >= 2 && i < N / 16 - 1 && (j & 1) == 0 && k >= 1))
abort ();
#pragma omp for collapse(3) nowait
for (i = 0; i < N / 32; i++)
for (j = 0; j < 8; j++)
for (k = 0; k < 8; k++)
if (c[i][j][k] != 3 * (j >= 2 && (k & 1) == 0))
abort ();
}
return 0;
}
Reference in a new issue Copy permalink