From patchwork Tue Feb 28 08:49:48 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Thomas Schwinge X-Patchwork-Id: 733364 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from sourceware.org (server1.sourceware.org [209.132.180.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3vXXMr5FLcz9s8x for ; Tue, 28 Feb 2017 19:50:16 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=gcc.gnu.org header.i=@gcc.gnu.org header.b="BjCZZtwE"; dkim-atps=neutral DomainKey-Signature: a=rsa-sha1; c=nofws; d=gcc.gnu.org; h=list-id :list-unsubscribe:list-archive:list-post:list-help:sender:from :to:cc:subject:in-reply-to:references:date:message-id :mime-version:content-type:content-transfer-encoding; q=dns; s= default; b=m2qRZJE47wqLp4FKC1EEx3GsIpjzBb0TveVDPui4QyKUmegnW/dGZ iTRqPqCQZumlHqp8SB7Uddi3MvTOULz9z+FsC+SssLjjLuNxnljgBE9E+tcOqrKh 2jr6I3cMJHH/EFPWFQEoN+oa6KOEkXjnCtT5P1bSBudKm+dzkspmQY= DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=gcc.gnu.org; h=list-id :list-unsubscribe:list-archive:list-post:list-help:sender:from :to:cc:subject:in-reply-to:references:date:message-id :mime-version:content-type:content-transfer-encoding; s=default; bh=+ELdAeLgXa4zyon8mA+mlBA6HEs=; b=BjCZZtwEZd3cRjjNN3RRLeXVDvxC xgz7oftES29bfynUf0RYoeYXCbs3buA7m8Q7PrW8H80fjxdrLNKljApE+bwvCSmk TYACOLWlEvzEx6o9eDKup7gihtBmbyPR4YUjOTkJC7WjRujNy+3LJSye/01aG5mB HnLqSdoZpzMYVgI= Received: (qmail 23611 invoked by alias); 28 Feb 2017 08:50:05 -0000 Mailing-List: contact gcc-patches-help@gcc.gnu.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Archive: List-Post: List-Help: Sender: gcc-patches-owner@gcc.gnu.org Delivered-To: mailing list gcc-patches@gcc.gnu.org Received: (qmail 23576 invoked by uid 89); 28 Feb 2017 08:50:04 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-24.4 required=5.0 tests=AWL, BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, RCVD_IN_DNSWL_NONE, SPF_PASS, URIBL_RED autolearn=ham version=3.3.2 spammy=U*thomas, thomas@codesourcery.com, sk:thomas@, Multi X-HELO: relay1.mentorg.com Received: from relay1.mentorg.com (HELO relay1.mentorg.com) (192.94.38.131) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Tue, 28 Feb 2017 08:50:01 +0000 Received: from nat-ies.mentorg.com ([192.94.31.2] helo=svr-ies-mbx-01.mgc.mentorg.com) by relay1.mentorg.com with esmtp id 1cidTq-0003tx-Hc from Thomas_Schwinge@mentor.com ; Tue, 28 Feb 2017 00:49:58 -0800 Received: from hertz.schwinge.homeip.net (137.202.0.87) by svr-ies-mbx-01.mgc.mentorg.com (139.181.222.1) with Microsoft SMTP Server (TLS) id 15.0.1210.3; Tue, 28 Feb 2017 08:49:55 +0000 From: Thomas Schwinge To: Martin Jambor , GCC Patches CC: Jakub Jelinek , Cesar Philippidis Subject: Rename the "openmp" group of optimizations to "omp" (was: Miscellaneous optimization group fixes) In-Reply-To: <20170222093802.um7iheqi53j7qmhy@virgil.suse.cz> References: <20161118103856.GR3541@tucnak.redhat.com> <20160316141251.GF9566@virgil.suse.cz> <20161122134302.osvu6emlrmb3htqe@virgil.suse.cz> <8737f68y3r.fsf@euler.schwinge.homeip.net> <87zihe7j3l.fsf@euler.schwinge.homeip.net> <20170222093802.um7iheqi53j7qmhy@virgil.suse.cz> User-Agent: Notmuch/0.9-101-g81dad07 (http://notmuchmail.org) Emacs/24.5.1 (x86_64-pc-linux-gnu) Date: Tue, 28 Feb 2017 09:49:48 +0100 Message-ID: <87varud7ir.fsf@hertz.schwinge.homeip.net> MIME-Version: 1.0 X-ClientProxiedBy: svr-ies-mbx-01.mgc.mentorg.com (139.181.222.1) To svr-ies-mbx-01.mgc.mentorg.com (139.181.222.1) Hi! On Wed, 22 Feb 2017 10:38:02 +0100, Martin Jambor 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 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(-) Grüße Thomas diff --git gcc/ChangeLog gcc/ChangeLog index 9c1025d..b699944 100644 --- gcc/ChangeLog +++ gcc/ChangeLog @@ -1,3 +1,10 @@ +2017-02-28 Thomas Schwinge + + * 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 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 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 + + Backport from trunk r245768: + 2017-02-28 Thomas Schwinge + + * 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 Cesar Philippidis 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 + + * 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 * 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