d81ab49d05
* tree.h (OMP_CLAUSE_LASTPRIVATE_TASKLOOP_IV): Rename to ... (OMP_CLAUSE_LASTPRIVATE_LOOP_IV): ... this. Adjust comment. * gimplify.c (gimple_add_tmp_var): In SIMD contexts, turn addressable new vars into GOVD_PRIVATE rather than GOVD_LOCAL. (gimplify_omp_for): Don't do C++ random access iterator clause adjustments on combined constructs from OMP_LOOP. For OMP_LOOP, don't predetermine the artificial iterator in case of C++ random access iterators as lastprivate, but private. For OMP_LOOP, force bind expr around simd body and force for_pre_body before the construct. Use OMP_CLAUSE_LASTPRIVATE_LOOP_IV instead of OMP_CLAUSE_LASTPRIVATE_TASKLOOP_IV. (gimplify_omp_loop): Add firstprivate clauses on OMP_PARALLEL for diff var of C++ random access iterators. Handle OMP_CLAUSE_FIRSTPRIVATE. For OMP_CLAUSE_LASTPRIVATE_LOOP_IV, if not outermost also add OMP_CLAUSE_FIRSTPRIVATE, and in both cases clear OMP_CLAUSE_LASTPRIVATE_LOOP_IV on the lastprivate clause on the OMP_FOR and OMP_DISTRIBUTE constructs if any. * omp-low.c (lower_rec_input_clauses): For OMP_CLAUSE_LASTPRIVATE_LOOP_IV on simd copy construct the private variables instead of default constructing them. (lower_lastprivate_clauses): Use OMP_CLAUSE_LASTPRIVATE_LOOP_IV instead of OMP_CLAUSE_LASTPRIVATE_TASKLOOP_IV and move the is_taskloop_ctx check from the assert to the guarding condition. gcc/cp/ * parser.c (cp_parser_omp_for_loop): For OMP_LOOP, ignore parallel clauses and predetermine iterator as lastprivate. * semantics.c (handle_omp_for_class_iterator): Use OMP_CLAUSE_LASTPRIVATE_LOOP_IV instead of OMP_CLAUSE_LASTPRIVATE_TASKLOOP_IV, set it for lastprivate also on OMP_LOOP construct. If a clause is missing for class iterator on OMP_LOOP, add firstprivate clause, and if there is private clause, turn it into firstprivate too. (finish_omp_for): Formatting fix. For OMP_LOOP, adjust OMP_CLAUSE_LASTPRIVATE_LOOP_IV clause CP_CLAUSE_INFO, so that it uses copy ctor instead of default ctor. * cp-gimplify.c (cp_gimplify_expr): Handle OMP_LOOP like OMP_DISTRIBUTE etc. (cp_fold_r): Likewise. (cp_genericize_r): Likewise. (cxx_omp_finish_clause): Also finish lastprivate clause with OMP_CLAUSE_LASTPRIVATE_LOOP_IV flag. * pt.c (tsubst_omp_clauses): Handle OMP_CLAUSE_BIND. (tsubst_omp_for_iterator): For OMP_LOOP, ignore parallel clauses and predetermine iterator as lastprivate. * constexpr.c (potential_constant_expression_1): Handle OMP_LOOP like OMP_DISTRIBUTE etc. libgomp/ * testsuite/libgomp.c++/loop-13.C: New test. * testsuite/libgomp.c++/loop-14.C: New test. * testsuite/libgomp.c++/loop-15.C: New test. From-SVN: r274138
418 lines
10 KiB
C
418 lines
10 KiB
C
// { dg-do run }
|
|
// { dg-additional-options "-std=c++17" }
|
|
|
|
typedef __PTRDIFF_TYPE__ ptrdiff_t;
|
|
extern "C" void abort ();
|
|
|
|
namespace std {
|
|
template<typename T> struct tuple_size;
|
|
template<int, typename> struct tuple_element;
|
|
}
|
|
|
|
template <typename T>
|
|
class I
|
|
{
|
|
public:
|
|
typedef ptrdiff_t difference_type;
|
|
I ();
|
|
~I ();
|
|
I (T *);
|
|
I (const I &);
|
|
T &operator * ();
|
|
T *operator -> ();
|
|
T &operator [] (const difference_type &) const;
|
|
I &operator = (const I &);
|
|
I &operator ++ ();
|
|
I operator ++ (int);
|
|
I &operator -- ();
|
|
I operator -- (int);
|
|
I &operator += (const difference_type &);
|
|
I &operator -= (const difference_type &);
|
|
I operator + (const difference_type &) const;
|
|
I operator - (const difference_type &) const;
|
|
template <typename S> friend bool operator == (I<S> &, I<S> &);
|
|
template <typename S> friend bool operator == (const I<S> &, const I<S> &);
|
|
template <typename S> friend bool operator < (I<S> &, I<S> &);
|
|
template <typename S> friend bool operator < (const I<S> &, const I<S> &);
|
|
template <typename S> friend bool operator <= (I<S> &, I<S> &);
|
|
template <typename S> friend bool operator <= (const I<S> &, const I<S> &);
|
|
template <typename S> friend bool operator > (I<S> &, I<S> &);
|
|
template <typename S> friend bool operator > (const I<S> &, const I<S> &);
|
|
template <typename S> friend bool operator >= (I<S> &, I<S> &);
|
|
template <typename S> friend bool operator >= (const I<S> &, const I<S> &);
|
|
template <typename S> friend typename I<S>::difference_type operator - (I<S> &, I<S> &);
|
|
template <typename S> friend typename I<S>::difference_type operator - (const I<S> &, const I<S> &);
|
|
template <typename S> friend I<S> operator + (typename I<S>::difference_type , const I<S> &);
|
|
private:
|
|
T *p;
|
|
};
|
|
template <typename T> I<T>::I () : p (0) {}
|
|
template <typename T> I<T>::~I () {}
|
|
template <typename T> I<T>::I (T *x) : p (x) {}
|
|
template <typename T> I<T>::I (const I &x) : p (x.p) {}
|
|
template <typename T> T &I<T>::operator * () { return *p; }
|
|
template <typename T> T *I<T>::operator -> () { return p; }
|
|
template <typename T> T &I<T>::operator [] (const difference_type &x) const { return p[x]; }
|
|
template <typename T> I<T> &I<T>::operator = (const I &x) { p = x.p; return *this; }
|
|
template <typename T> I<T> &I<T>::operator ++ () { ++p; return *this; }
|
|
template <typename T> I<T> I<T>::operator ++ (int) { return I (p++); }
|
|
template <typename T> I<T> &I<T>::operator -- () { --p; return *this; }
|
|
template <typename T> I<T> I<T>::operator -- (int) { return I (p--); }
|
|
template <typename T> I<T> &I<T>::operator += (const difference_type &x) { p += x; return *this; }
|
|
template <typename T> I<T> &I<T>::operator -= (const difference_type &x) { p -= x; return *this; }
|
|
template <typename T> I<T> I<T>::operator + (const difference_type &x) const { return I (p + x); }
|
|
template <typename T> I<T> I<T>::operator - (const difference_type &x) const { return I (p - x); }
|
|
template <typename T> bool operator == (I<T> &x, I<T> &y) { return x.p == y.p; }
|
|
template <typename T> bool operator == (const I<T> &x, const I<T> &y) { return x.p == y.p; }
|
|
template <typename T> bool operator != (I<T> &x, I<T> &y) { return !(x == y); }
|
|
template <typename T> bool operator != (const I<T> &x, const I<T> &y) { return !(x == y); }
|
|
template <typename T> bool operator < (I<T> &x, I<T> &y) { return x.p < y.p; }
|
|
template <typename T> bool operator < (const I<T> &x, const I<T> &y) { return x.p < y.p; }
|
|
template <typename T> bool operator <= (I<T> &x, I<T> &y) { return x.p <= y.p; }
|
|
template <typename T> bool operator <= (const I<T> &x, const I<T> &y) { return x.p <= y.p; }
|
|
template <typename T> bool operator > (I<T> &x, I<T> &y) { return x.p > y.p; }
|
|
template <typename T> bool operator > (const I<T> &x, const I<T> &y) { return x.p > y.p; }
|
|
template <typename T> bool operator >= (I<T> &x, I<T> &y) { return x.p >= y.p; }
|
|
template <typename T> bool operator >= (const I<T> &x, const I<T> &y) { return x.p >= y.p; }
|
|
template <typename T> typename I<T>::difference_type operator - (I<T> &x, I<T> &y) { return x.p - y.p; }
|
|
template <typename T> typename I<T>::difference_type operator - (const I<T> &x, const I<T> &y) { return x.p - y.p; }
|
|
template <typename T> I<T> operator + (typename I<T>::difference_type x, const I<T> &y) { return I<T> (x + y.p); }
|
|
|
|
template <typename T>
|
|
class J
|
|
{
|
|
public:
|
|
J(const I<T> &x, const I<T> &y) : b (x), e (y) {}
|
|
const I<T> &begin ();
|
|
const I<T> &end ();
|
|
private:
|
|
I<T> b, e;
|
|
};
|
|
|
|
template <typename T> const I<T> &J<T>::begin () { return b; }
|
|
template <typename T> const I<T> &J<T>::end () { return e; }
|
|
|
|
template <typename T>
|
|
class K
|
|
{
|
|
public:
|
|
K ();
|
|
~K ();
|
|
template <int N> T &get () { if (N == 0) return c; else if (N == 1) return b; return a; }
|
|
T a, b, c;
|
|
};
|
|
|
|
template <typename T> K<T>::K () : a {}, b {}, c {} {}
|
|
template <typename T> K<T>::~K () {}
|
|
template <typename T> struct std::tuple_size<K<T>> { static constexpr int value = 3; };
|
|
template <typename T, int N> struct std::tuple_element<N, K<T>> { using type = T; };
|
|
|
|
template <typename T>
|
|
class L
|
|
{
|
|
public:
|
|
L ();
|
|
~L ();
|
|
T a, b, c;
|
|
};
|
|
|
|
template <typename T> L<T>::L () : a {}, b {}, c {} {}
|
|
template <typename T> L<T>::~L () {}
|
|
|
|
int a[2000];
|
|
long b[40];
|
|
short c[50];
|
|
int d[1024];
|
|
K<int> e[1089];
|
|
L<int> f[1093];
|
|
int results[2000];
|
|
|
|
template <typename T>
|
|
static inline void
|
|
baz (I<T> &i)
|
|
{
|
|
results[*i]++;
|
|
}
|
|
|
|
static inline void
|
|
baz (int i)
|
|
{
|
|
results[i]++;
|
|
}
|
|
|
|
void
|
|
f1 ()
|
|
{
|
|
#pragma omp parallel loop shared(a) default(none)
|
|
for (auto i : a)
|
|
baz (i);
|
|
}
|
|
|
|
void
|
|
f2 ()
|
|
{
|
|
#pragma omp loop order(concurrent) bind(parallel)
|
|
for (auto &i : a)
|
|
if (&i != &a[i])
|
|
abort ();
|
|
else
|
|
baz (i);
|
|
}
|
|
|
|
void
|
|
f3 ()
|
|
{
|
|
#pragma omp teams loop collapse(3) default(none) shared(b, c)
|
|
for (auto &i : b)
|
|
for (int j = 9; j < 10; j++)
|
|
for (auto k : c)
|
|
if (&i != &b[i] || i < 0 || i >= 40 || j != 9 || k < 0 || k >= 50)
|
|
abort ();
|
|
else
|
|
baz (i * 50 + k);
|
|
}
|
|
|
|
void
|
|
f4 (J<int> j)
|
|
{
|
|
#pragma omp loop bind(teams)
|
|
for (auto &i : j)
|
|
if (&i != &a[i])
|
|
abort ();
|
|
else
|
|
baz (i);
|
|
}
|
|
|
|
void
|
|
f5 ()
|
|
{
|
|
#pragma omp loop bind(thread)
|
|
for (auto i : d)
|
|
results[i % 1024] += 2 * ((unsigned) i >> 10) + 1;
|
|
}
|
|
|
|
void
|
|
f6 (J<K<int>> j)
|
|
{
|
|
#pragma omp loop bind(parallel)
|
|
for (auto & [k, l, m] : j)
|
|
if (&k != &e[m].c || &l != &e[m].b || &m != &e[m].a || k != m * 3 || l != m * 2)
|
|
abort ();
|
|
else
|
|
baz (m);
|
|
}
|
|
|
|
void
|
|
f7 (J<L<int>> j)
|
|
{
|
|
#pragma omp parallel loop default(none) shared(j, f)
|
|
for (auto & [k, l, m] : j)
|
|
if (&k != &f[k].a || &l != &f[k].b || &m != &f[k].c || l != k * 4 || m != k * 5)
|
|
abort ();
|
|
else
|
|
baz (k);
|
|
}
|
|
|
|
void
|
|
f8 (J<K<int>> j)
|
|
{
|
|
#pragma omp parallel loop default(none) shared(j)
|
|
for (auto [k, l, m] : j)
|
|
if (k != m * 3 || l != m * 2)
|
|
abort ();
|
|
else
|
|
baz (m);
|
|
}
|
|
|
|
void
|
|
f9 (J<L<int>> j)
|
|
{
|
|
#pragma omp teams loop default(none) shared(j)
|
|
for (auto [k, l, m] : j)
|
|
if (l != k * 4 || m != k * 5)
|
|
abort ();
|
|
else
|
|
baz (k);
|
|
}
|
|
|
|
template <int N>
|
|
void
|
|
f10 ()
|
|
{
|
|
#pragma omp loop bind(teams)
|
|
for (auto i : a)
|
|
baz (i);
|
|
}
|
|
|
|
template <int N>
|
|
void
|
|
f11 ()
|
|
{
|
|
#pragma omp loop bind(thread)
|
|
for (auto &i : a)
|
|
if (&i != &a[i])
|
|
abort ();
|
|
else
|
|
baz (i);
|
|
}
|
|
|
|
template <int N>
|
|
void
|
|
f12 ()
|
|
{
|
|
#pragma omp parallel loop collapse(3) default(none) shared(a, b, c) bind(parallel)
|
|
for (auto &i : b)
|
|
for (I<int> j = I<int> (&a[9]); j < I<int> (&a[10]); j++)
|
|
for (auto k : c)
|
|
if (&i != &b[i] || i < 0 || i >= 40 || *j != 9 || k < 0 || k >= 50)
|
|
abort ();
|
|
else
|
|
baz (i * 50 + k);
|
|
}
|
|
|
|
template <typename T>
|
|
void
|
|
f13 (J<T> j)
|
|
{
|
|
#pragma omp loop bind(thread)
|
|
for (auto &i : j)
|
|
if (&i != &a[i])
|
|
abort ();
|
|
else
|
|
baz (i);
|
|
}
|
|
|
|
template <int N>
|
|
void
|
|
f14 ()
|
|
{
|
|
#pragma omp parallel loop default(none) shared(d, results)
|
|
for (auto i : d)
|
|
results[i % N] += 2 * ((unsigned) i >> 10) + 1;
|
|
}
|
|
|
|
template <typename T>
|
|
void
|
|
f15 (J<K<T>> j)
|
|
{
|
|
#pragma omp parallel loop default(none) shared(j, e) bind(parallel)
|
|
for (auto & [k, l, m] : j)
|
|
if (&k != &e[m].c || &l != &e[m].b || &m != &e[m].a || k != m * 3 || l != m * 2)
|
|
abort ();
|
|
else
|
|
baz (m);
|
|
}
|
|
|
|
template <typename T>
|
|
void
|
|
f16 (J<L<T>> j)
|
|
{
|
|
#pragma omp loop bind(parallel)
|
|
for (auto & [k, l, m] : j)
|
|
if (&k != &f[k].a || &l != &f[k].b || &m != &f[k].c || l != k * 4 || m != k * 5)
|
|
abort ();
|
|
else
|
|
baz (k);
|
|
}
|
|
|
|
template <int N>
|
|
void
|
|
f17 (J<K<int>> j)
|
|
{
|
|
#pragma omp parallel loop default(none) shared(j)
|
|
for (auto [k, l, m] : j)
|
|
if (k != m * 3 || l != m * 2)
|
|
abort ();
|
|
else
|
|
baz (m);
|
|
}
|
|
|
|
template <int N>
|
|
void
|
|
f18 (J<L<int>> j)
|
|
{
|
|
#pragma omp teams loop default(none) shared(j)
|
|
for (auto [k, l, m] : j)
|
|
if (l != k * 4 || m != k * 5)
|
|
abort ();
|
|
else
|
|
baz (k);
|
|
}
|
|
|
|
#define check(expr) \
|
|
for (int i = 0; i < 2000; i++) \
|
|
if (expr) \
|
|
{ \
|
|
if (results[i] != 1) \
|
|
abort (); \
|
|
results[i] = 0; \
|
|
} \
|
|
else if (results[i]) \
|
|
abort ()
|
|
|
|
int
|
|
main ()
|
|
{
|
|
for (int i = 0; i < 2000; i++)
|
|
a[i] = i;
|
|
for (int i = 0; i < 40; i++)
|
|
b[i] = i;
|
|
for (int i = 0; i < 50; i++)
|
|
c[i] = i;
|
|
for (int i = 0; i < 1024; i++)
|
|
d[i] = i;
|
|
for (int i = 0; i < 1089; i++)
|
|
{
|
|
e[i].a = i;
|
|
e[i].b = 2 * i;
|
|
e[i].c = 3 * i;
|
|
}
|
|
for (int i = 0; i < 1093; i++)
|
|
{
|
|
f[i].a = i;
|
|
f[i].b = 4 * i;
|
|
f[i].c = 5 * i;
|
|
}
|
|
f1 ();
|
|
check (1);
|
|
#pragma omp parallel
|
|
f2 ();
|
|
check (1);
|
|
f3 ();
|
|
check (1);
|
|
#pragma omp teams
|
|
f4 (J<int> (&a[14], &a[1803]));
|
|
check (i >= 14 && i < 1803);
|
|
f5 ();
|
|
check (i >= 0 && i < 1024);
|
|
#pragma omp parallel
|
|
f6 (J<K<int>> (&e[19], &e[1029]));
|
|
check (i >= 19 && i < 1029);
|
|
f7 (J<L<int>> (&f[15], &f[1091]));
|
|
check (i >= 15 && i < 1091);
|
|
f8 (J<K<int>> (&e[27], &e[1037]));
|
|
check (i >= 27 && i < 1037);
|
|
f9 (J<L<int>> (&f[1], &f[1012]));
|
|
check (i >= 1 && i < 1012);
|
|
#pragma omp teams
|
|
f10 <0> ();
|
|
check (1);
|
|
f11 <1> ();
|
|
check (1);
|
|
f12 <2> ();
|
|
check (1);
|
|
f13 (J<int> (&a[24], &a[1703]));
|
|
check (i >= 24 && i < 1703);
|
|
f14 <1024> ();
|
|
check (i >= 0 && i < 1024);
|
|
f15 (J<K<int>> (&e[39], &e[929]));
|
|
check (i >= 39 && i < 929);
|
|
#pragma omp parallel
|
|
f16 (J<L<int>> (&f[17], &f[1071]));
|
|
check (i >= 17 && i < 1071);
|
|
f17 <3> (J<K<int>> (&e[7], &e[1017]));
|
|
check (i >= 7 && i < 1017);
|
|
f18 <5> (J<L<int>> (&f[121], &f[1010]));
|
|
check (i >= 121 && i < 1010);
|
|
}
|