f7468577f8
* tree.h (OMP_CLAUSE_LINEAR_GIMPLE_SEQ): Define. * gimplify.c (omp_is_private): Change last argument's type to int. Only diagnose lastprivate if the simd argument is 1, only diagnose linear if the simd argument is 2. (gimplify_omp_for): Adjust omp_is_private callers. When adding lastprivate or private, add the clause to OMP_FOR_CLAUSES. Pass GOVD_EXPLICIT to omp_add_variable. For simd with collapse == 1 create OMP_CLAUSE_LINEAR rather than OMP_CLAUSE_PRIVATE for var. If var != decl and decl is in OMP_CLAUSE_LINEAR, gimplify decl increment to OMP_CLAUSE_LINEAR_GIMPLE_SEQ. * omp-low.c (scan_sharing_clauses, lower_lastprivate_clauses): Handle OMP_CLAUSE_LINEAR_GIMPLE_SEQ. * tree-nested.c (convert_nonlocal_omp_clauses, convert_local_omp_clauses): Handle OMP_CLAUSE_LINEAR. * testsuite/libgomp.c/simd-7.c: New test. * testsuite/libgomp.c/simd-8.c: New test. * testsuite/libgomp.c/simd-9.c: New test. * testsuite/libgomp.c/loop-16.c: New test. From-SVN: r209760
71 lines
1.5 KiB
C
71 lines
1.5 KiB
C
/* { dg-do run } */
|
|
/* { dg-options "-O2" } */
|
|
/* { dg-additional-options "-msse2" { target sse2_runtime } } */
|
|
/* { dg-additional-options "-mavx" { target avx_runtime } } */
|
|
|
|
extern void abort ();
|
|
int a[32][32] __attribute__((aligned (32))) = { { 1 } };
|
|
struct S { int s; };
|
|
#pragma omp declare reduction (+:struct S:omp_out.s += omp_in.s)
|
|
#pragma omp declare reduction (foo:struct S:omp_out.s += omp_in.s)
|
|
#pragma omp declare reduction (foo:int:omp_out += omp_in)
|
|
|
|
__attribute__((noinline, noclone)) int
|
|
foo (void)
|
|
{
|
|
int i, j, u = 0;
|
|
struct S s, t;
|
|
s.s = 0; t.s = 0;
|
|
#pragma omp simd aligned(a : 32) lastprivate (i, j) reduction(+:s) reduction(foo:t, u) collapse(2)
|
|
for (i = 0; i < 32; i++)
|
|
for (j = 0; j < 32; j++)
|
|
{
|
|
int *q = &i;
|
|
int *r = &j;
|
|
int x = a[i][j];
|
|
s.s += x;
|
|
t.s += x;
|
|
u += x;
|
|
}
|
|
if (t.s != s.s || u != s.s || i != 32 || j != 32)
|
|
abort ();
|
|
return s.s;
|
|
}
|
|
|
|
__attribute__((noinline, noclone)) int
|
|
bar (void)
|
|
{
|
|
int i, j, u = 0;
|
|
struct S s, t;
|
|
s.s = 0; t.s = 0;
|
|
#pragma omp simd aligned(a:32)reduction(+:s)reduction(foo:t,u)collapse(2)
|
|
for (i = 0; i < 32; i++)
|
|
for (j = 0; j < 32; j++)
|
|
{
|
|
int *q = &i;
|
|
int *r = &j;
|
|
int x = a[i][j];
|
|
s.s += x;
|
|
t.s += x;
|
|
u += x;
|
|
}
|
|
if (t.s != s.s || u != s.s || i != 32 || j != 32)
|
|
abort ();
|
|
return s.s;
|
|
}
|
|
|
|
int
|
|
main ()
|
|
{
|
|
int i, j;
|
|
for (i = 0; i < 32; i++)
|
|
for (j = 0; j < 32; j++)
|
|
a[i][j] = j + (i / 4);
|
|
int s = foo ();
|
|
if (s != 19456)
|
|
abort ();
|
|
if (bar () != 19456)
|
|
abort ();
|
|
return 0;
|
|
}
|