From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1534) id 5C60E385843F; Tue, 2 Nov 2021 15:02:03 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 5C60E385843F Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: Tobias Burnus To: gcc-cvs@gcc.gnu.org Subject: [gcc/devel/omp/gcc-11] openmp: Add testcase for threadprivate random access class iterators X-Act-Checkin: gcc X-Git-Author: Tobias Burnus X-Git-Refname: refs/heads/devel/omp/gcc-11 X-Git-Oldrev: 2b4bd2bdc049835ce6cb53a932239530e32f5708 X-Git-Newrev: 798ebb8cd58f643baa0579a631f19269a64843dd Message-Id: <20211102150203.5C60E385843F@sourceware.org> Date: Tue, 2 Nov 2021 15:02:03 +0000 (GMT) X-BeenThere: gcc-cvs@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gcc-cvs mailing list List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 02 Nov 2021 15:02:03 -0000 https://gcc.gnu.org/g:798ebb8cd58f643baa0579a631f19269a64843dd commit 798ebb8cd58f643baa0579a631f19269a64843dd Author: Tobias Burnus Date: Tue Nov 2 15:51:22 2021 +0100 openmp: Add testcase for threadprivate random access class iterators This adds a testcase for random access class iterators. The diagnostics can be different between templates and non-templates, as for some threadprivate vars finish_id_expression replaces them with call to their corresponding wrapper, but I think it is not that big deal, we reject it in either case. 2021-11-02 Jakub Jelinek * g++.dg/gomp/loop-8.C: New test. (cherry picked from commit fb7fee84813b23487baf0c1094860251229ab5dd) Diff: --- gcc/testsuite/ChangeLog.omp | 7 ++ gcc/testsuite/g++.dg/gomp/loop-8.C | 128 +++++++++++++++++++++++++++++++++++++ 2 files changed, 135 insertions(+) diff --git a/gcc/testsuite/ChangeLog.omp b/gcc/testsuite/ChangeLog.omp index 58304e7c1fa..f0036d95396 100644 --- a/gcc/testsuite/ChangeLog.omp +++ b/gcc/testsuite/ChangeLog.omp @@ -1,3 +1,10 @@ +2021-11-02 Tobias Burnus + + Backport from master: + 2021-11-02 Jakub Jelinek + + * g++.dg/gomp/loop-8.C: New test. + 2021-11-02 Tobias Burnus Backport from master: diff --git a/gcc/testsuite/g++.dg/gomp/loop-8.C b/gcc/testsuite/g++.dg/gomp/loop-8.C new file mode 100644 index 00000000000..41a1817fdd4 --- /dev/null +++ b/gcc/testsuite/g++.dg/gomp/loop-8.C @@ -0,0 +1,128 @@ +typedef __PTRDIFF_TYPE__ ptrdiff_t; + +template +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 friend bool operator == (I &, I &); + template friend bool operator == (const I &, const I &); + template friend bool operator < (I &, I &); + template friend bool operator < (const I &, const I &); + template friend bool operator <= (I &, I &); + template friend bool operator <= (const I &, const I &); + template friend bool operator > (I &, I &); + template friend bool operator > (const I &, const I &); + template friend bool operator >= (I &, I &); + template friend bool operator >= (const I &, const I &); + template friend typename I::difference_type operator - (I &, I &); + template friend typename I::difference_type operator - (const I &, const I &); + template friend I operator + (typename I::difference_type , const I &); +private: + T *p; +}; + +template bool operator == (I &, I &); +template bool operator == (const I &, const I &); +template bool operator != (I &, I &); +template bool operator != (const I &, const I &); +template bool operator < (I &, I &); +template bool operator < (const I &, const I &); +template bool operator <= (I &, I &); +template bool operator <= (const I &, const I &); +template bool operator > (I &, I &); +template bool operator > (const I &, const I &); +template bool operator >= (I &, I &); +template bool operator >= (const I &, const I &); +template typename I::difference_type operator - (I &, I &); +template typename I::difference_type operator - (const I &, const I &); +template I operator + (typename I::difference_type, const I &); + +extern I i, j; +#pragma omp threadprivate (i, j) +extern I k, l; +#pragma omp threadprivate (k, l) +I k, l; + +void +f1 (I &x, I &y) +{ + #pragma omp for collapse(2) + for (i = x; i < y; i++) // { dg-error "expected iteration declaration or initialization" } + for (j = x; j < y; j++) + ; +} + +void +f2 (I &x, I &y) +{ + #pragma omp for collapse(2) + for (k = x; k < y; k++) // { dg-error "expected iteration declaration or initialization" } + for (l = x; l < y; l++) + ; +} + +template +void +f3 (I &x, I &y) +{ + #pragma omp for collapse(2) + for (i = x; i < y; i++) // { dg-error "'i' is predetermined 'threadprivate' for 'private'" } + for (j = x; j < y; j++) // { dg-error "'j' is predetermined 'threadprivate' for 'private'" } + ; +} + +template +void +f4 (I &x, I &y) +{ + #pragma omp for collapse(2) + for (k = x; k < y; k++) // { dg-error "'k' is predetermined 'threadprivate' for 'private'" } + for (l = x; l < y; l++) // { dg-error "'l' is predetermined 'threadprivate' for 'private'" } + ; +} + +template +void +f5 (I &x, I &y) +{ + #pragma omp for collapse(2) // { dg-error "expected iteration declaration or initialization" } + for (i = x; i < y; i++) // { dg-error "'i' is predetermined 'threadprivate' for 'private'" } + for (j = x; j < y; j++) // { dg-error "'j' is predetermined 'threadprivate' for 'private'" } + ; +} + +template +void +f6 (I &x, I &y) +{ + #pragma omp for collapse(2) // { dg-error "expected iteration declaration or initialization" } + for (k = x; k < y; k++) // { dg-error "'k' is predetermined 'threadprivate' for 'private'" } + for (l = x; l < y; l++) // { dg-error "'l' is predetermined 'threadprivate' for 'private'" } + ; +} + +void +test (I &x, I &y) +{ + f3<0> (x, y); + f4<0> (x, y); + f5 (x, y); + f6 (x, y); +}