Hi!
On Wed, 22 Feb 2017 10:38:02 +0100, Martin Jambor <mjam...@suse.cz> wrote:
> On Wed, Feb 22, 2017 at 08:58:06AM +0100, Thomas Schwinge wrote:
> > >
> > > 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".
>
>
> I am of course fine with OPTGROUP_OMP.
Committed to trunk in r245768:
commit f57c8178d89b6b428853767657590c4fb907d1b8
Author: tschwinge <tschwinge@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Tue Feb 28 08:41:55 2017 +0000
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".
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@245768
138bc75d-0d04-0410-961f-82ee72b054a4
---
gcc/ChangeLog | 7 +++++++
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 +++---
7 files changed, 20 insertions(+), 11 deletions(-)
diff --git gcc/ChangeLog gcc/ChangeLog
index 9c1025d..b699944 100644
--- gcc/ChangeLog
+++ gcc/ChangeLog
@@ -1,3 +1,10 @@
+2017-02-28 Thomas Schwinge <tho...@codesourcery.com>
+
+ * dumpfile.h (OPTGROUP_OPENMP): Rename to OPTGROUP_OMP. Adjust
+ all users.
+ * dumpfile.c (optgroup_options): Instead of "openmp", associate
+ OPTGROUP_OMP with "omp".
+
2017-02-27 Pat Haugen <pthau...@us.ibm.com>
PR target/79544
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 */
Backported to gomp-4_0-branch in r245770:
commit aa3c3ba6ca554614f69fe8e28b07165fc7ba31e6
Author: tschwinge <tschwinge@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Tue Feb 28 08:45:53 2017 +0000
Rename the "openmp" group of optimizations to "omp"
Backport from trunk r245768:
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/testsuite/
* c-c++-common/goacc/note-parallelism.c: Use "-fopt-info-note-omp"
instead of "-fopt-info-note-openmp".
* gfortran.dg/goacc/note-parallelism.f90: Likewise.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/gomp-4_0-branch@245770
138bc75d-0d04-0410-961f-82ee72b054a4
---
gcc/ChangeLog.gomp | 10 ++++++++++
gcc/doc/optinfo.texi | 5 +++--
gcc/dumpfile.c | 2 +-
gcc/dumpfile.h | 3 ++-
gcc/omp-low.c | 12 ++++++------
gcc/testsuite/ChangeLog.gomp | 6 ++++++
gcc/testsuite/c-c++-common/goacc/note-parallelism.c | 4 ++--
gcc/testsuite/gfortran.dg/goacc/note-parallelism.f90 | 4 ++--
8 files changed, 32 insertions(+), 14 deletions(-)
diff --git gcc/ChangeLog.gomp gcc/ChangeLog.gomp
index 4492823..00a5b49 100644
--- gcc/ChangeLog.gomp
+++ gcc/ChangeLog.gomp
@@ -1,3 +1,13 @@
+2017-02-28 Thomas Schwinge <tho...@codesourcery.com>
+
+ Backport from trunk r245768:
+ 2017-02-28 Thomas Schwinge <tho...@codesourcery.com>
+
+ * dumpfile.h (OPTGROUP_OPENMP): Rename to OPTGROUP_OMP. Adjust
+ all users.
+ * dumpfile.c (optgroup_options): Instead of "openmp", associate
+ OPTGROUP_OMP with "omp".
+
2017-02-27 Chung-Lin Tang <clt...@codesourcery.com>
Cesar Philippidis <ce...@codesourcery.com>
diff --git gcc/doc/optinfo.texi gcc/doc/optinfo.texi
index 20ca560..1cf3f41 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 f2430f3..007433d 100644
--- gcc/dumpfile.c
+++ gcc/dumpfile.c
@@ -136,7 +136,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 72f696b..eb10db3 100644
--- gcc/dumpfile.h
+++ gcc/dumpfile.h
@@ -97,7 +97,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-low.c gcc/omp-low.c
index 73666d4..a646272 100644
--- gcc/omp-low.c
+++ gcc/omp-low.c
@@ -14783,7 +14783,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 */
@@ -14830,7 +14830,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 */
@@ -19099,7 +19099,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, /* properties_provided */
@@ -19581,7 +19581,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 */
@@ -21264,7 +21264,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 */
@@ -21309,7 +21309,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 */
diff --git gcc/testsuite/ChangeLog.gomp gcc/testsuite/ChangeLog.gomp
index 4e02ca0..f930824 100644
--- gcc/testsuite/ChangeLog.gomp
+++ gcc/testsuite/ChangeLog.gomp
@@ -1,3 +1,9 @@
+2017-02-28 Thomas Schwinge <tho...@codesourcery.com>
+
+ * c-c++-common/goacc/note-parallelism.c: Use "-fopt-info-note-omp"
+ instead of "-fopt-info-note-openmp".
+ * gfortran.dg/goacc/note-parallelism.f90: Likewise.
+
2017-02-23 Cesar Philippidis <ce...@codesourcery.com>
* c-c++-common/goacc/note-parallelism.c: New test.
diff --git gcc/testsuite/c-c++-common/goacc/note-parallelism.c
gcc/testsuite/c-c++-common/goacc/note-parallelism.c
index ddbce99..485990e 100644
--- gcc/testsuite/c-c++-common/goacc/note-parallelism.c
+++ gcc/testsuite/c-c++-common/goacc/note-parallelism.c
@@ -1,6 +1,6 @@
-/* Test the output of -fopt-info-not-openmp. */
+/* Test the output of -fopt-info-note-omp. */
-/* { dg-additional-options "-fopt-info-note-openmp" } */
+/* { dg-additional-options "-fopt-info-note-omp" } */
int
main ()
diff --git gcc/testsuite/gfortran.dg/goacc/note-parallelism.f90
gcc/testsuite/gfortran.dg/goacc/note-parallelism.f90
index ae6f341..93fb6a0 100644
--- gcc/testsuite/gfortran.dg/goacc/note-parallelism.f90
+++ gcc/testsuite/gfortran.dg/goacc/note-parallelism.f90
@@ -1,6 +1,6 @@
-! Test the output of -fopt-info-note-openmp.
+! Test the output of -fopt-info-note-omp.
-! { dg-additional-options "-fopt-info-note-openmp" }
+! { dg-additional-options "-fopt-info-note-omp" }
program test
implicit none
Grüße
Thomas
