2f6bb511d1
* tree-core.h (enum omp_clause_code): Add OMP_CLAUSE__SCANTEMP_ clause. * tree.h (OMP_CLAUSE_DECL): Use OMP_CLAUSE__SCANTEMP_ instead of OMP_CLAUSE__CONDTEMP_ as range's upper bound. (OMP_CLAUSE__SCANTEMP__ALLOC, OMP_CLAUSE__SCANTEMP__CONTROL): Define. * tree.c (omp_clause_num_ops, omp_clause_code_name): Add OMP_CLAUSE__SCANTEMP_ entry. (walk_tree_1): Handle OMP_CLAUSE__SCANTEMP_. * tree-pretty-print.c (dump_omp_clause): Likewise. * tree-nested.c (convert_nonlocal_omp_clauses, convert_local_omp_clauses): Likewise. * omp-general.h (struct omp_for_data): Add have_scantemp and have_nonctrl_scantemp members. * omp-general.c (omp_extract_for_data): Initialize them. * omp-low.c (struct omp_context): Add scan_exclusive member. (scan_omp_1_stmt): Don't unnecessarily mask gimple_omp_for_kind result again with GF_OMP_FOR_KIND_MASK. Initialize also ctx->scan_exclusive. (lower_rec_simd_input_clauses): Use ctx->scan_exclusive instead of !ctx->scan_inclusive. (lower_rec_input_clauses): Simplify gimplification of dtors using gimplify_and_add. For non-is_simd test OMP_CLAUSE_REDUCTION_INSCAN rather than rvarp. Handle OMP_CLAUSE_REDUCTION_INSCAN in worksharing loops. Don't add barrier for reduction_omp_orig_ref if ctx->scan_??xclusive. (lower_reduction_clauses): Don't do anything for ctx->scan_??xclusive. (lower_omp_scan): Use ctx->scan_exclusive instead of !ctx->scan_inclusive. Handle worksharing loops with inscan reductions. Use new_vard != new_var instead of repeated omp_is_reference calls. (omp_find_scan, lower_omp_for_scan): New functions. (lower_omp_for): Call lower_omp_for_scan for worksharing loops with inscan reductions. * omp-expand.c (expand_omp_scantemp_alloc): New function. (expand_omp_for_static_nochunk): Handle fd->have_nonctrl_scantemp and fd->have_scantemp. * c-c++-common/gomp/scan-3.c (f1): Don't expect a sorry message. * c-c++-common/gomp/scan-5.c (foo): Likewise. * testsuite/libgomp.c++/scan-1.C: New test. * testsuite/libgomp.c++/scan-2.C: New test. * testsuite/libgomp.c++/scan-3.C: New test. * testsuite/libgomp.c++/scan-4.C: New test. * testsuite/libgomp.c++/scan-5.C: New test. * testsuite/libgomp.c++/scan-6.C: New test. * testsuite/libgomp.c++/scan-7.C: New test. * testsuite/libgomp.c++/scan-8.C: New test. * testsuite/libgomp.c/scan-1.c: New test. * testsuite/libgomp.c/scan-2.c: New test. * testsuite/libgomp.c/scan-3.c: New test. * testsuite/libgomp.c/scan-4.c: New test. * testsuite/libgomp.c/scan-5.c: New test. * testsuite/libgomp.c/scan-6.c: New test. * testsuite/libgomp.c/scan-7.c: New test. * testsuite/libgomp.c/scan-8.c: New test. From-SVN: r272958
151 lines
2.3 KiB
C
151 lines
2.3 KiB
C
// { dg-require-effective-target size32plus }
|
|
|
|
extern "C" void abort ();
|
|
|
|
struct S {
|
|
inline S ();
|
|
inline ~S ();
|
|
inline S (const S &);
|
|
inline S & operator= (const S &);
|
|
int s;
|
|
};
|
|
|
|
S::S () : s (0)
|
|
{
|
|
}
|
|
|
|
S::~S ()
|
|
{
|
|
}
|
|
|
|
S::S (const S &x)
|
|
{
|
|
s = x.s;
|
|
}
|
|
|
|
S &
|
|
S::operator= (const S &x)
|
|
{
|
|
s = x.s;
|
|
return *this;
|
|
}
|
|
|
|
static inline void
|
|
ini (S &x)
|
|
{
|
|
x.s = 0;
|
|
}
|
|
|
|
S r, a[1024], b[1024];
|
|
|
|
#pragma omp declare reduction (+: S: omp_out.s += omp_in.s)
|
|
#pragma omp declare reduction (plus: S: omp_out.s += omp_in.s) initializer (ini (omp_priv))
|
|
|
|
__attribute__((noipa)) void
|
|
foo (S *a, S *b, S &r)
|
|
{
|
|
#pragma omp for reduction (inscan, +:r)
|
|
for (int i = 0; i < 1024; i++)
|
|
{
|
|
b[i] = r;
|
|
#pragma omp scan exclusive(r)
|
|
r.s += a[i].s;
|
|
}
|
|
}
|
|
|
|
__attribute__((noipa)) S
|
|
bar (void)
|
|
{
|
|
S s;
|
|
#pragma omp parallel
|
|
#pragma omp for reduction (inscan, plus:s)
|
|
for (int i = 0; i < 1024; i++)
|
|
{
|
|
b[i] = s;
|
|
#pragma omp scan exclusive(s)
|
|
s.s += 2 * a[i].s;
|
|
}
|
|
return s;
|
|
}
|
|
|
|
__attribute__((noipa)) void
|
|
baz (S *a, S *b, S &r)
|
|
{
|
|
#pragma omp parallel for reduction (inscan, +:r)
|
|
for (int i = 0; i < 1024; i++)
|
|
{
|
|
b[i] = r;
|
|
#pragma omp scan exclusive(r)
|
|
r.s += a[i].s;
|
|
}
|
|
}
|
|
|
|
__attribute__((noipa)) S
|
|
qux (void)
|
|
{
|
|
S s;
|
|
#pragma omp parallel for reduction (inscan, plus:s)
|
|
for (int i = 0; i < 1024; i++)
|
|
{
|
|
b[i] = s;
|
|
#pragma omp scan exclusive(s)
|
|
s.s += 2 * a[i].s;
|
|
}
|
|
return s;
|
|
}
|
|
|
|
int
|
|
main ()
|
|
{
|
|
S s;
|
|
for (int i = 0; i < 1024; ++i)
|
|
{
|
|
a[i].s = i;
|
|
b[i].s = -1;
|
|
asm ("" : "+g" (i));
|
|
}
|
|
#pragma omp parallel
|
|
foo (a, b, r);
|
|
if (r.s != 1024 * 1023 / 2)
|
|
abort ();
|
|
for (int i = 0; i < 1024; ++i)
|
|
{
|
|
if (b[i].s != s.s)
|
|
abort ();
|
|
else
|
|
b[i].s = 25;
|
|
s.s += i;
|
|
}
|
|
if (bar ().s != 1024 * 1023)
|
|
abort ();
|
|
s.s = 0;
|
|
for (int i = 0; i < 1024; ++i)
|
|
{
|
|
if (b[i].s != s.s)
|
|
abort ();
|
|
s.s += 2 * i;
|
|
}
|
|
r.s = 0;
|
|
baz (a, b, r);
|
|
if (r.s != 1024 * 1023 / 2)
|
|
abort ();
|
|
s.s = 0;
|
|
for (int i = 0; i < 1024; ++i)
|
|
{
|
|
if (b[i].s != s.s)
|
|
abort ();
|
|
else
|
|
b[i].s = 25;
|
|
s.s += i;
|
|
}
|
|
if (qux ().s != 1024 * 1023)
|
|
abort ();
|
|
s.s = 0;
|
|
for (int i = 0; i < 1024; ++i)
|
|
{
|
|
if (b[i].s != s.s)
|
|
abort ();
|
|
s.s += 2 * i;
|
|
}
|
|
}
|