1dc65003b6
Before commit r12-5295-g47de0b56ee455e, all gimple_build_cond in expand_omp_for_* were inserted with gsi_insert_before (gsi_p, cond_stmt, GSI_SAME_STMT); except the one dealing with the multiplicative factor that was gsi_insert_after (gsi, cond_stmt, GSI_CONTINUE_LINKING); That commit for PR103208 fixed the issue of some missing regimplify of operands of GIMPLE_CONDs by moving the condition handling to the new function expand_omp_build_cond. While that function has an 'bool after = false' argument to switch between the two variants. However, all callers ommited this argument. This commit reinstates the prior behavior by passing 'true' for the factor != 0 condition, fixing the included testcase. PR middle-end/111017 gcc/ * omp-expand.cc (expand_omp_for_init_vars): Pass after=true to expand_omp_build_cond for 'factor != 0' condition, resulting in pre-r12-5295-g47de0b56ee455e code for the gimple insert. libgomp/ * testsuite/libgomp.c-c++-common/non-rect-loop-1.c: New test.
72 lines
1.7 KiB
C
72 lines
1.7 KiB
C
/* PR middle-end/111017 */
|
|
|
|
#include <omp.h>
|
|
|
|
#define DIM 32
|
|
#define N (DIM*DIM)
|
|
|
|
int
|
|
main ()
|
|
{
|
|
int a[N], b[N], c[N];
|
|
int dim = DIM;
|
|
|
|
for (int i = 0; i < N; i++)
|
|
{
|
|
a[i] = 3*i;
|
|
b[i] = 7*i;
|
|
c[i] = 42;
|
|
}
|
|
|
|
#pragma omp parallel for collapse(2)
|
|
for (int i = 0; i < DIM; i++)
|
|
for (int j = (i*DIM); j < (i*DIM + DIM); j++)
|
|
c[j] = a[j] + b[j];
|
|
|
|
for (int i = 0; i < DIM; i++)
|
|
for (int j = (i*DIM); j < (i*DIM + DIM); j++)
|
|
if (c[j] != a[j] + b[j] || c[j] != 3*j +7*j)
|
|
__builtin_abort ();
|
|
for (int i = 0; i < N; i++)
|
|
c[i] = 42;
|
|
|
|
#pragma omp parallel for collapse(2)
|
|
for (int i = 0; i < dim; i++)
|
|
for (int j = (i*dim); j < (i*dim + dim); j++)
|
|
c[j] = a[j] + b[j];
|
|
|
|
for (int i = 0; i < DIM; i++)
|
|
for (int j = (i*DIM); j < (i*DIM + DIM); j++)
|
|
if (c[j] != a[j] + b[j] || c[j] != 3*j +7*j)
|
|
__builtin_abort ();
|
|
for (int i = 0; i < N; i++)
|
|
c[i] = 42;
|
|
|
|
for (int dev = 0; dev <= omp_get_num_devices(); dev++)
|
|
{
|
|
#pragma omp target teams loop device(dev) map(to:a,b) map(from:c)
|
|
for (int i = 0; i < DIM; i++)
|
|
for (int j = (i*DIM); j < (i*DIM + DIM); j++)
|
|
c[j] = a[j] + b[j];
|
|
|
|
for (int i = 0; i < DIM; i++)
|
|
for (int j = (i*DIM); j < (i*DIM + DIM); j++)
|
|
if (c[j] != a[j] + b[j] || c[j] != 3*j +7*j)
|
|
__builtin_abort ();
|
|
for (int i = 0; i < N; i++)
|
|
c[i] = 42;
|
|
|
|
#pragma omp target teams loop device(dev) map(to:a,b) map(from:c)
|
|
for (int i = 0; i < dim; i++)
|
|
for (int j = (i*dim); j < (i*dim + dim); j++)
|
|
c[j] = a[j] + b[j];
|
|
|
|
for (int i = 0; i < DIM; i++)
|
|
for (int j = (i*DIM); j < (i*DIM + DIM); j++)
|
|
if (c[j] != a[j] + b[j] || c[j] != 3*j +7*j)
|
|
__builtin_abort ();
|
|
for (int i = 0; i < N; i++)
|
|
c[i] = 42;
|
|
}
|
|
return 0;
|
|
}
|