diff mbox

[COMMITTED,1/2] Just enumerate all GF_OMP_FOR_KIND_* and GF_OMP_TARGET_KIND_*.

Message ID 1400844780-26290-1-git-send-email-thomas@codesourcery.com
State New
Headers show

Commit Message

Thomas Schwinge May 23, 2014, 11:32 a.m. UTC 
From: tschwinge <tschwinge@138bc75d-0d04-0410-961f-82ee72b054a4>

	gcc/
	* gimple.h (enum gf_mask): Rewrite "<< 0" shift expressions used
	for GF_OMP_FOR_KIND_MASK, GF_OMP_FOR_KIND_FOR,
	GF_OMP_FOR_KIND_DISTRIBUTE, GF_OMP_FOR_KIND_SIMD,
	GF_OMP_FOR_KIND_CILKSIMD, GF_OMP_TARGET_KIND_MASK,
	GF_OMP_TARGET_KIND_REGION, GF_OMP_TARGET_KIND_DATA,
	GF_OMP_TARGET_KIND_UPDATE.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@210854 138bc75d-0d04-0410-961f-82ee72b054a4
---
 gcc/ChangeLog |  7 +++++++
 gcc/gimple.h  | 18 +++++++++---------
 2 files changed, 16 insertions(+), 9 deletions(-)

Comments

Richard Biener May 23, 2014, 11:50 a.m. UTC | #1 
I think it was supposed to note that it uses two bits in the mask.

Did Jakub approve these patches you are committing now?

Thanks,
Richard.

On Fri, May 23, 2014 at 1:32 PM, Thomas Schwinge
<thomas@codesourcery.com> wrote:
> From: tschwinge <tschwinge@138bc75d-0d04-0410-961f-82ee72b054a4>
>
>         gcc/
>         * gimple.h (enum gf_mask): Rewrite "<< 0" shift expressions used
>         for GF_OMP_FOR_KIND_MASK, GF_OMP_FOR_KIND_FOR,
>         GF_OMP_FOR_KIND_DISTRIBUTE, GF_OMP_FOR_KIND_SIMD,
>         GF_OMP_FOR_KIND_CILKSIMD, GF_OMP_TARGET_KIND_MASK,
>         GF_OMP_TARGET_KIND_REGION, GF_OMP_TARGET_KIND_DATA,
>         GF_OMP_TARGET_KIND_UPDATE.
>
> git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@210854 138bc75d-0d04-0410-961f-82ee72b054a4
> ---
>  gcc/ChangeLog |  7 +++++++
>  gcc/gimple.h  | 18 +++++++++---------
>  2 files changed, 16 insertions(+), 9 deletions(-)
>
> diff --git gcc/ChangeLog gcc/ChangeLog
> index d351c0b..fa2f3c3 100644
> --- gcc/ChangeLog
> +++ gcc/ChangeLog
> @@ -1,5 +1,12 @@
>  2014-05-23  Thomas Schwinge  <thomas@codesourcery.com>
>
> +       * gimple.h (enum gf_mask): Rewrite "<< 0" shift expressions used
> +       for GF_OMP_FOR_KIND_MASK, GF_OMP_FOR_KIND_FOR,
> +       GF_OMP_FOR_KIND_DISTRIBUTE, GF_OMP_FOR_KIND_SIMD,
> +       GF_OMP_FOR_KIND_CILKSIMD, GF_OMP_TARGET_KIND_MASK,
> +       GF_OMP_TARGET_KIND_REGION, GF_OMP_TARGET_KIND_DATA,
> +       GF_OMP_TARGET_KIND_UPDATE.
> +
>         * gimplify.c (omp_notice_variable) <case OMP_CLAUSE_DEFAULT_NONE>:
>         Explicitly enumerate the expected region types.
>
> diff --git gcc/gimple.h gcc/gimple.h
> index 9df45de..b1970e5 100644
> --- gcc/gimple.h
> +++ gcc/gimple.h
> @@ -91,17 +91,17 @@ enum gf_mask {
>      GF_CALL_ALLOCA_FOR_VAR     = 1 << 5,
>      GF_CALL_INTERNAL           = 1 << 6,
>      GF_OMP_PARALLEL_COMBINED   = 1 << 0,
> -    GF_OMP_FOR_KIND_MASK       = 3 << 0,
> -    GF_OMP_FOR_KIND_FOR                = 0 << 0,
> -    GF_OMP_FOR_KIND_DISTRIBUTE = 1 << 0,
> -    GF_OMP_FOR_KIND_SIMD       = 2 << 0,
> -    GF_OMP_FOR_KIND_CILKSIMD   = 3 << 0,
> +    GF_OMP_FOR_KIND_MASK       = (1 << 2) - 1,
> +    GF_OMP_FOR_KIND_FOR                = 0,
> +    GF_OMP_FOR_KIND_DISTRIBUTE = 1,
> +    GF_OMP_FOR_KIND_SIMD       = 2,
> +    GF_OMP_FOR_KIND_CILKSIMD   = 3,
>      GF_OMP_FOR_COMBINED                = 1 << 2,
>      GF_OMP_FOR_COMBINED_INTO   = 1 << 3,
> -    GF_OMP_TARGET_KIND_MASK    = 3 << 0,
> -    GF_OMP_TARGET_KIND_REGION  = 0 << 0,
> -    GF_OMP_TARGET_KIND_DATA    = 1 << 0,
> -    GF_OMP_TARGET_KIND_UPDATE  = 2 << 0,
> +    GF_OMP_TARGET_KIND_MASK    = (1 << 2) - 1,
> +    GF_OMP_TARGET_KIND_REGION  = 0,
> +    GF_OMP_TARGET_KIND_DATA    = 1,
> +    GF_OMP_TARGET_KIND_UPDATE  = 2,
>
>      /* True on an GIMPLE_OMP_RETURN statement if the return does not require
>         a thread synchronization via some sort of barrier.  The exact barrier
> --
> 1.9.1
>
Thomas Schwinge May 23, 2014, 12:12 p.m. UTC | #2 
Hi!

On Fri, 23 May 2014 13:50:40 +0200, Richard Biener <richard.guenther@gmail.com> wrote:
> I think it was supposed to note that it uses two bits in the mask.

That is, you'd like me to add a comment saying that?  (Which I can
certainly do.)

> Did Jakub approve these patches you are committing now?

For the two in this thread, that's how I understood his 2014-03-20 email,
<http://news.gmane.org/find-root.php?message_id=%3C20140320144512.GK1817%40tucnak.redhat.com%3E>.

The others I committed today as well as yesterday evening, I considered
obvious cleanups and fixes.

> On Fri, May 23, 2014 at 1:32 PM, Thomas Schwinge
> <thomas@codesourcery.com> wrote:
> > From: tschwinge <tschwinge@138bc75d-0d04-0410-961f-82ee72b054a4>
> >
> >         gcc/
> >         * gimple.h (enum gf_mask): Rewrite "<< 0" shift expressions used
> >         for GF_OMP_FOR_KIND_MASK, GF_OMP_FOR_KIND_FOR,
> >         GF_OMP_FOR_KIND_DISTRIBUTE, GF_OMP_FOR_KIND_SIMD,
> >         GF_OMP_FOR_KIND_CILKSIMD, GF_OMP_TARGET_KIND_MASK,
> >         GF_OMP_TARGET_KIND_REGION, GF_OMP_TARGET_KIND_DATA,
> >         GF_OMP_TARGET_KIND_UPDATE.
> >
> > git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@210854 138bc75d-0d04-0410-961f-82ee72b054a4
> > ---
> >  gcc/ChangeLog |  7 +++++++
> >  gcc/gimple.h  | 18 +++++++++---------
> >  2 files changed, 16 insertions(+), 9 deletions(-)
> >
> > diff --git gcc/ChangeLog gcc/ChangeLog
> > index d351c0b..fa2f3c3 100644
> > --- gcc/ChangeLog
> > +++ gcc/ChangeLog
> > @@ -1,5 +1,12 @@
> >  2014-05-23  Thomas Schwinge  <thomas@codesourcery.com>
> >
> > +       * gimple.h (enum gf_mask): Rewrite "<< 0" shift expressions used
> > +       for GF_OMP_FOR_KIND_MASK, GF_OMP_FOR_KIND_FOR,
> > +       GF_OMP_FOR_KIND_DISTRIBUTE, GF_OMP_FOR_KIND_SIMD,
> > +       GF_OMP_FOR_KIND_CILKSIMD, GF_OMP_TARGET_KIND_MASK,
> > +       GF_OMP_TARGET_KIND_REGION, GF_OMP_TARGET_KIND_DATA,
> > +       GF_OMP_TARGET_KIND_UPDATE.
> > +
> >         * gimplify.c (omp_notice_variable) <case OMP_CLAUSE_DEFAULT_NONE>:
> >         Explicitly enumerate the expected region types.
> >
> > diff --git gcc/gimple.h gcc/gimple.h
> > index 9df45de..b1970e5 100644
> > --- gcc/gimple.h
> > +++ gcc/gimple.h
> > @@ -91,17 +91,17 @@ enum gf_mask {
> >      GF_CALL_ALLOCA_FOR_VAR     = 1 << 5,
> >      GF_CALL_INTERNAL           = 1 << 6,
> >      GF_OMP_PARALLEL_COMBINED   = 1 << 0,
> > -    GF_OMP_FOR_KIND_MASK       = 3 << 0,
> > -    GF_OMP_FOR_KIND_FOR                = 0 << 0,
> > -    GF_OMP_FOR_KIND_DISTRIBUTE = 1 << 0,
> > -    GF_OMP_FOR_KIND_SIMD       = 2 << 0,
> > -    GF_OMP_FOR_KIND_CILKSIMD   = 3 << 0,
> > +    GF_OMP_FOR_KIND_MASK       = (1 << 2) - 1,
> > +    GF_OMP_FOR_KIND_FOR                = 0,
> > +    GF_OMP_FOR_KIND_DISTRIBUTE = 1,
> > +    GF_OMP_FOR_KIND_SIMD       = 2,
> > +    GF_OMP_FOR_KIND_CILKSIMD   = 3,
> >      GF_OMP_FOR_COMBINED                = 1 << 2,
> >      GF_OMP_FOR_COMBINED_INTO   = 1 << 3,
> > -    GF_OMP_TARGET_KIND_MASK    = 3 << 0,
> > -    GF_OMP_TARGET_KIND_REGION  = 0 << 0,
> > -    GF_OMP_TARGET_KIND_DATA    = 1 << 0,
> > -    GF_OMP_TARGET_KIND_UPDATE  = 2 << 0,
> > +    GF_OMP_TARGET_KIND_MASK    = (1 << 2) - 1,
> > +    GF_OMP_TARGET_KIND_REGION  = 0,
> > +    GF_OMP_TARGET_KIND_DATA    = 1,
> > +    GF_OMP_TARGET_KIND_UPDATE  = 2,


Grüße,
 Thomas
diff mbox

Patch

diff --git gcc/ChangeLog gcc/ChangeLog
index d351c0b..fa2f3c3 100644
--- gcc/ChangeLog
+++ gcc/ChangeLog
@@ -1,5 +1,12 @@ 
 2014-05-23  Thomas Schwinge  <thomas@codesourcery.com>
 
+	* gimple.h (enum gf_mask): Rewrite "<< 0" shift expressions used
+	for GF_OMP_FOR_KIND_MASK, GF_OMP_FOR_KIND_FOR,
+	GF_OMP_FOR_KIND_DISTRIBUTE, GF_OMP_FOR_KIND_SIMD,
+	GF_OMP_FOR_KIND_CILKSIMD, GF_OMP_TARGET_KIND_MASK,
+	GF_OMP_TARGET_KIND_REGION, GF_OMP_TARGET_KIND_DATA,
+	GF_OMP_TARGET_KIND_UPDATE.
+
 	* gimplify.c (omp_notice_variable) <case OMP_CLAUSE_DEFAULT_NONE>:
 	Explicitly enumerate the expected region types.
 
diff --git gcc/gimple.h gcc/gimple.h
index 9df45de..b1970e5 100644
--- gcc/gimple.h
+++ gcc/gimple.h
@@ -91,17 +91,17 @@  enum gf_mask {
     GF_CALL_ALLOCA_FOR_VAR	= 1 << 5,
     GF_CALL_INTERNAL		= 1 << 6,
     GF_OMP_PARALLEL_COMBINED	= 1 << 0,
-    GF_OMP_FOR_KIND_MASK	= 3 << 0,
-    GF_OMP_FOR_KIND_FOR		= 0 << 0,
-    GF_OMP_FOR_KIND_DISTRIBUTE	= 1 << 0,
-    GF_OMP_FOR_KIND_SIMD	= 2 << 0,
-    GF_OMP_FOR_KIND_CILKSIMD	= 3 << 0,
+    GF_OMP_FOR_KIND_MASK	= (1 << 2) - 1,
+    GF_OMP_FOR_KIND_FOR		= 0,
+    GF_OMP_FOR_KIND_DISTRIBUTE	= 1,
+    GF_OMP_FOR_KIND_SIMD	= 2,
+    GF_OMP_FOR_KIND_CILKSIMD	= 3,
     GF_OMP_FOR_COMBINED		= 1 << 2,
     GF_OMP_FOR_COMBINED_INTO	= 1 << 3,
-    GF_OMP_TARGET_KIND_MASK	= 3 << 0,
-    GF_OMP_TARGET_KIND_REGION	= 0 << 0,
-    GF_OMP_TARGET_KIND_DATA	= 1 << 0,
-    GF_OMP_TARGET_KIND_UPDATE	= 2 << 0,
+    GF_OMP_TARGET_KIND_MASK	= (1 << 2) - 1,
+    GF_OMP_TARGET_KIND_REGION	= 0,
+    GF_OMP_TARGET_KIND_DATA	= 1,
+    GF_OMP_TARGET_KIND_UPDATE	= 2,
 
     /* True on an GIMPLE_OMP_RETURN statement if the return does not require
        a thread synchronization via some sort of barrier.  The exact barrier