Rename the "openmp" group of optimizations to "omp" (was: [PATCH 3/4] OpenMP lowering changes from the hsa branch)

[Thomas Schwinge <thomas at codesourcery dot com>]

Hi!

On Tue, 22 Nov 2016 14:43:02 +0100, Martin Jambor <mjambor@suse.cz> wrote:
> On Fri, Nov 18, 2016 at 11:38:56AM +0100, Jakub Jelinek wrote:
> > On Sun, Nov 13, 2016 at 10:42:01PM +0100, Martin Jambor wrote:
> > > @@ -14133,7 +14183,7 @@ const pass_data pass_data_expand_omp =
> > >  {
> > >    GIMPLE_PASS, /* type */
> > >    "ompexp", /* name */
> > > -  OPTGROUP_NONE, /* optinfo_flags */
> > > +  OPTGROUP_OPENMP, /* optinfo_flags */
> > >    TV_NONE, /* tv_id */
> > >    PROP_gimple_any, /* properties_required */
> > >    PROP_gimple_eomp, /* properties_provided */

Thanks for that!  (I noticed there is no testsuite coverage, though.)

This will be useful for what Cesar is currently working on,
<bbc0b25b-bf92-998b-99ee-cae20ace1fab@codesourcery.com">http://mid.mail-archive.com/bbc0b25b-bf92-998b-99ee-cae20ace1fab@codesourcery.com>
"[gomp4] add -finform-parallelism".  That is, instead of adding a new
"-finform-parallelism" flag, this should just build on top of the
existing "-fopt-info".

> > What about the simdclone, omptargetlink, diagnose_omp_blocks passes?  What about
> > openacc specific passes (oaccdevlow)?  And Alex is hopefully going to add
> > ompdevlow pass soon.
> 
> I was not sure about those at first, but I suppose all of them should
> also be in the same group (though I hope the name is still fine)

According to similar "rebrandings" regarding "omp", OK to commit the
following (not yet tested)?

commit e878bc10881810adf64891f76c503fd1d83fb536
Author: Thomas Schwinge <thomas@codesourcery.com>
Date:   Wed Feb 22 08:25:32 2017 +0100

    Rename the "openmp" group of optimizations to "omp"
    
            gcc/
            * dumpfile.h (OPTGROUP_OPENMP): Rename to OPTGROUP_OMP.  Adjust
            all users.
            * dumpfile.c (optgroup_options): Instead of "openmp", associate
            OPTGROUP_OMP with "omp".
---
 gcc/doc/optinfo.texi | 5 +++--
 gcc/dumpfile.c       | 2 +-
 gcc/dumpfile.h       | 3 ++-
 gcc/omp-expand.c     | 4 ++--
 gcc/omp-low.c        | 4 ++--
 gcc/omp-offload.c    | 6 +++---
 6 files changed, 13 insertions(+), 11 deletions(-)

diff --git gcc/doc/optinfo.texi gcc/doc/optinfo.texi
index 415e9a9..cf6ce00 100644
--- gcc/doc/optinfo.texi
+++ gcc/doc/optinfo.texi
@@ -59,8 +59,9 @@ Loop optimization passes. Enabled by @option{-loop}.
 @item OPTGROUP_INLINE
 Inlining passes. Enabled by @option{-inline}.
 
-@item OPTGROUP_OPENMP
-OpenMP passes. Enabled by @option{-openmp}.
+@item OPTGROUP_OMP
+OMP (Offloading and Multi Processing) passes. Enabled by
+@option{-omp}.
 
 @item OPTGROUP_VEC
 Vectorization passes. Enabled by @option{-vec}.
diff --git gcc/dumpfile.c gcc/dumpfile.c
index 2c5dce2..6b9a47c 100644
--- gcc/dumpfile.c
+++ gcc/dumpfile.c
@@ -140,7 +140,7 @@ static const struct dump_option_value_info optgroup_options[] =
   {"ipa", OPTGROUP_IPA},
   {"loop", OPTGROUP_LOOP},
   {"inline", OPTGROUP_INLINE},
-  {"openmp", OPTGROUP_OPENMP},
+  {"omp", OPTGROUP_OMP},
   {"vec", OPTGROUP_VEC},
   {"optall", OPTGROUP_ALL},
   {NULL, 0}
diff --git gcc/dumpfile.h gcc/dumpfile.h
index 7c8f7a2..3886f98 100644
--- gcc/dumpfile.h
+++ gcc/dumpfile.h
@@ -99,7 +99,8 @@ enum tree_dump_index
 #define OPTGROUP_LOOP        (1 << 2)   /* Loop optimization passes */
 #define OPTGROUP_INLINE      (1 << 3)   /* Inlining passes */
 #define OPTGROUP_VEC         (1 << 4)   /* Vectorization passes */
-#define OPTGROUP_OPENMP      (1 << 5)	/* OpenMP specific transformations */
+#define OPTGROUP_OMP         (1 << 5)   /* OMP (Offloading and Multi
+					   Processing) transformations */
 #define OPTGROUP_OTHER       (1 << 6)   /* All other passes */
 #define OPTGROUP_ALL	     (OPTGROUP_IPA | OPTGROUP_LOOP | OPTGROUP_INLINE \
                               | OPTGROUP_VEC | OPTGROUP_OTHER)
diff --git gcc/omp-expand.c gcc/omp-expand.c
index 55e54e4..ea951d6 100644
--- gcc/omp-expand.c
+++ gcc/omp-expand.c
@@ -8134,7 +8134,7 @@ const pass_data pass_data_expand_omp =
 {
   GIMPLE_PASS, /* type */
   "ompexp", /* name */
-  OPTGROUP_OPENMP, /* optinfo_flags */
+  OPTGROUP_OMP, /* optinfo_flags */
   TV_NONE, /* tv_id */
   PROP_gimple_any, /* properties_required */
   PROP_gimple_eomp, /* properties_provided */
@@ -8181,7 +8181,7 @@ const pass_data pass_data_expand_omp_ssa =
 {
   GIMPLE_PASS, /* type */
   "ompexpssa", /* name */
-  OPTGROUP_OPENMP, /* optinfo_flags */
+  OPTGROUP_OMP, /* optinfo_flags */
   TV_NONE, /* tv_id */
   PROP_cfg | PROP_ssa, /* properties_required */
   PROP_gimple_eomp, /* properties_provided */
diff --git gcc/omp-low.c gcc/omp-low.c
index 35df02c..c2c69cb 100644
--- gcc/omp-low.c
+++ gcc/omp-low.c
@@ -8920,7 +8920,7 @@ const pass_data pass_data_lower_omp =
 {
   GIMPLE_PASS, /* type */
   "omplower", /* name */
-  OPTGROUP_OPENMP, /* optinfo_flags */
+  OPTGROUP_OMP, /* optinfo_flags */
   TV_NONE, /* tv_id */
   PROP_gimple_any, /* properties_required */
   PROP_gimple_lomp | PROP_gimple_lomp_dev, /* properties_provided */
@@ -9232,7 +9232,7 @@ const pass_data pass_data_diagnose_omp_blocks =
 {
   GIMPLE_PASS, /* type */
   "*diagnose_omp_blocks", /* name */
-  OPTGROUP_OPENMP, /* optinfo_flags */
+  OPTGROUP_OMP, /* optinfo_flags */
   TV_NONE, /* tv_id */
   PROP_gimple_any, /* properties_required */
   0, /* properties_provided */
diff --git gcc/omp-offload.c gcc/omp-offload.c
index aed9e14..fad038f 100644
--- gcc/omp-offload.c
+++ gcc/omp-offload.c
@@ -1625,7 +1625,7 @@ const pass_data pass_data_oacc_device_lower =
 {
   GIMPLE_PASS, /* type */
   "oaccdevlow", /* name */
-  OPTGROUP_OPENMP, /* optinfo_flags */
+  OPTGROUP_OMP, /* optinfo_flags */
   TV_NONE, /* tv_id */
   PROP_cfg, /* properties_required */
   0 /* Possibly PROP_gimple_eomp.  */, /* properties_provided */
@@ -1727,7 +1727,7 @@ const pass_data pass_data_omp_device_lower =
 {
   GIMPLE_PASS, /* type */
   "ompdevlow", /* name */
-  OPTGROUP_OPENMP, /* optinfo_flags */
+  OPTGROUP_OMP, /* optinfo_flags */
   TV_NONE, /* tv_id */
   PROP_cfg, /* properties_required */
   PROP_gimple_lomp_dev, /* properties_provided */
@@ -1771,7 +1771,7 @@ const pass_data pass_data_omp_target_link =
 {
   GIMPLE_PASS,			/* type */
   "omptargetlink",		/* name */
-  OPTGROUP_OPENMP,		/* optinfo_flags */
+  OPTGROUP_OMP,			/* optinfo_flags */
   TV_NONE,			/* tv_id */
   PROP_ssa,			/* properties_required */
   0,				/* properties_provided */


Grüße
 Thomas