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
299 lines
8.5 KiB
C
299 lines
8.5 KiB
C
// { dg-do run }
|
|
|
|
typedef __PTRDIFF_TYPE__ ptrdiff_t;
|
|
extern "C" void abort ();
|
|
|
|
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; }
|
|
|
|
int results[2000];
|
|
|
|
template <typename T>
|
|
static inline void
|
|
baz (I<T> &i)
|
|
{
|
|
results[*i]++;
|
|
}
|
|
|
|
void
|
|
f1 (const I<int> &x, const I<int> &y)
|
|
{
|
|
#pragma omp parallel loop order(concurrent)
|
|
for (I<int> i = x; i <= y; i += 6)
|
|
baz (i);
|
|
}
|
|
|
|
void
|
|
f2 (const I<int> &x, const I<int> &y)
|
|
{
|
|
I<int> i;
|
|
#pragma omp loop private(i) bind(parallel)
|
|
for (i = x; i < y - 1; i = 1 - 6 + 7 + i)
|
|
baz (i);
|
|
}
|
|
|
|
template <typename T>
|
|
void
|
|
f3 (const I<int> &x, const I<int> &y)
|
|
{
|
|
#pragma omp loop bind(thread) order(concurrent)
|
|
for (I<int> i = x; i <= y; i = i + 9 - 8)
|
|
baz (i);
|
|
}
|
|
|
|
template <typename T>
|
|
void
|
|
f4 (const I<int> &x, const I<int> &y)
|
|
{
|
|
I<int> i;
|
|
#pragma omp parallel loop lastprivate(i)
|
|
for (i = x + 2000 - 64; i > y + 10; --i)
|
|
baz (i);
|
|
}
|
|
|
|
void
|
|
f5 (const I<int> &x, const I<int> &y)
|
|
{
|
|
#pragma omp loop bind(teams)
|
|
for (I<int> i = x + 2000 - 64; i > y + 10; i -= 10)
|
|
baz (i);
|
|
}
|
|
|
|
template <int N>
|
|
void
|
|
f6 (const I<int> &x, const I<int> &y)
|
|
{
|
|
I<int> i;
|
|
#pragma omp teams loop order(concurrent)
|
|
for (i = x + 2000 - 64; i > y + 10; i = i - 12 + 2)
|
|
{
|
|
I<int> j = i + N;
|
|
baz (j);
|
|
}
|
|
}
|
|
|
|
template <int N>
|
|
void
|
|
f7 (I<int> i, const I<int> &x, const I<int> &y)
|
|
{
|
|
#pragma omp master
|
|
#pragma omp loop
|
|
for (i = x - 10; i <= y + 10; i += N)
|
|
baz (i);
|
|
}
|
|
|
|
template <int N>
|
|
void
|
|
f8 (J<int> j)
|
|
{
|
|
I<int> i;
|
|
#pragma omp parallel loop
|
|
for (i = j.begin (); i <= j.end () + N; i += 2)
|
|
baz (i);
|
|
}
|
|
|
|
template <typename T, int N>
|
|
void
|
|
f9 (const I<T> &x, const I<T> &y)
|
|
{
|
|
I<T> i;
|
|
#pragma omp loop bind(teams) private(i)
|
|
for (i = x; i <= y; i = i + N)
|
|
baz (i);
|
|
}
|
|
|
|
template <typename T, int N>
|
|
void
|
|
f10 (const I<T> &x, const I<T> &y)
|
|
{
|
|
I<T> i;
|
|
#pragma omp loop bind(thread) private(i)
|
|
for (i = x; i > y; i = i + N)
|
|
baz (i);
|
|
}
|
|
|
|
template <typename T>
|
|
void
|
|
f11 (const T &x, const T &y)
|
|
{
|
|
#pragma omp parallel
|
|
{
|
|
#pragma omp loop
|
|
for (T i = x; i <= y; i += 3)
|
|
baz (i);
|
|
#pragma omp single
|
|
{
|
|
T j = y + 3;
|
|
baz (j);
|
|
}
|
|
}
|
|
}
|
|
|
|
template <typename T>
|
|
void
|
|
f12 (const T &x, const T &y)
|
|
{
|
|
T i;
|
|
#pragma omp loop lastprivate(i) bind(thread)
|
|
for (i = x; i > y; --i)
|
|
baz (i);
|
|
}
|
|
|
|
template <int N>
|
|
struct K
|
|
{
|
|
template <typename T>
|
|
static void
|
|
f13 (const T &x, const T &y)
|
|
{
|
|
T i;
|
|
#pragma omp teams loop order(concurrent) bind(teams) lastprivate (i)
|
|
for (i = x; i <= y + N; i += N)
|
|
baz (i);
|
|
}
|
|
};
|
|
|
|
#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 ()
|
|
{
|
|
int a[2000];
|
|
long b[2000];
|
|
for (int i = 0; i < 2000; i++)
|
|
{
|
|
a[i] = i;
|
|
b[i] = i;
|
|
}
|
|
f1 (&a[10], &a[1990]);
|
|
check (i >= 10 && i <= 1990 && (i - 10) % 6 == 0);
|
|
#pragma omp parallel
|
|
f2 (&a[0], &a[1999]);
|
|
check (i < 1998 && (i & 1) == 0);
|
|
f3<char> (&a[20], &a[1837]);
|
|
check (i >= 20 && i <= 1837);
|
|
f4<int> (&a[0], &a[30]);
|
|
check (i > 40 && i <= 2000 - 64);
|
|
#pragma omp teams
|
|
f5 (&a[0], &a[100]);
|
|
check (i >= 116 && i <= 2000 - 64 && (i - 116) % 10 == 0);
|
|
f6<-10> (&a[10], &a[110]);
|
|
check (i >= 116 && i <= 2000 - 64 && (i - 116) % 10 == 0);
|
|
#pragma omp parallel num_threads(2)
|
|
f7<6> (I<int> (), &a[12], &a[1800]);
|
|
check (i >= 2 && i <= 1808 && (i - 2) % 6 == 0);
|
|
f8<121> (J<int> (&a[14], &a[1803]));
|
|
check (i >= 14 && i <= 1924 && (i & 1) == 0);
|
|
#pragma omp teams
|
|
f9<int, 7> (&a[33], &a[1967]);
|
|
check (i >= 33 && i <= 1967 && (i - 33) % 7 == 0);
|
|
f10<int, -7> (&a[1939], &a[17]);
|
|
check (i >= 21 && i <= 1939 && (i - 21) % 7 == 0);
|
|
f11<I<int> > (&a[16], &a[1981]);
|
|
check (i >= 16 && i <= 1984 && (i - 16) % 3 == 0);
|
|
f12<I<int> > (&a[1761], &a[37]);
|
|
check (i > 37 && i <= 1761);
|
|
K<5>::f13<I<int> > (&a[1], &a[1935]);
|
|
check (i >= 1 && i <= 1936 && (i - 1) % 5 == 0);
|
|
#pragma omp teams
|
|
f9<long, 7> (&b[33], &b[1967]);
|
|
check (i >= 33 && i <= 1967 && (i - 33) % 7 == 0);
|
|
f10<long, -7> (&b[1939], &b[17]);
|
|
check (i >= 21 && i <= 1939 && (i - 21) % 7 == 0);
|
|
f11<I<long> > (&b[16], &b[1981]);
|
|
check (i >= 16 && i <= 1984 && (i - 16) % 3 == 0);
|
|
f12<I<long> > (&b[1761], &b[37]);
|
|
check (i > 37 && i <= 1761);
|
|
K<5>::f13<I<long> > (&b[1], &b[1935]);
|
|
check (i >= 1 && i <= 1936 && (i - 1) % 5 == 0);
|
|
}
|