From patchwork Mon Jun 1 16:14:45 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom de Vries X-Patchwork-Id: 479105 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 3C76F1412E2 for ; Tue, 2 Jun 2015 02:15:23 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=gcc.gnu.org header.i=@gcc.gnu.org header.b=NCa5wQk8; 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 :message-id:date:from:mime-version:to:cc:subject:references :in-reply-to:content-type; q=dns; s=default; b=axGOcuN/IE7GoGdvk iMOJ8+Kkxdyo/C9XpdV0DbYvWJBpJLMToFCzJvTmH1mYlNto0GGFN8EwPl/zhpYD Rc54MOlSYY34u//6enQazixZVvVaw5743MNxazGYteRbe84ayIxWZqLTUMfTzq8c sRBnHfXtjbN/Or7UZGAa+dltEY= 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 :message-id:date:from:mime-version:to:cc:subject:references :in-reply-to:content-type; s=default; bh=2yaCdOSB/S4VA0u8Qg8dHJT CmQo=; b=NCa5wQk8RpGXALbfaSp8RdB9/+U3MpyLJe6vuWfWeTTd9OfsWqvvat4 oNyjc5fEYYdA7wd9YTeO0dlieifM7Q0SHij74bRY2XW6XCxmWaNIqdTWBlpZ8Pp+ jJ/rXeOMqTPzrImCGtqatuLjQg948O+rBpdYKLtjPxIjtTpzmwnk= Received: (qmail 109870 invoked by alias); 1 Jun 2015 16:14:59 -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 109786 invoked by uid 89); 1 Jun 2015 16:14:59 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-2.3 required=5.0 tests=AWL, BAYES_00, RCVD_IN_DNSWL_LOW, SPF_PASS autolearn=ham version=3.3.2 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; Mon, 01 Jun 2015 16:14:55 +0000 Received: from nat-ies.mentorg.com ([192.94.31.2] helo=SVR-IES-FEM-01.mgc.mentorg.com) by relay1.mentorg.com with esmtp id 1YzSMU-0003TD-9A from Tom_deVries@mentor.com ; Mon, 01 Jun 2015 09:14:50 -0700 Received: from [127.0.0.1] (137.202.0.76) by SVR-IES-FEM-01.mgc.mentorg.com (137.202.0.104) with Microsoft SMTP Server id 14.3.224.2; Mon, 1 Jun 2015 17:14:48 +0100 Message-ID: <556C84F5.2000209@mentor.com> Date: Mon, 1 Jun 2015 18:14:45 +0200 From: Tom de Vries User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:31.0) Gecko/20100101 Thunderbird/31.7.0 MIME-Version: 1.0 To: GCC Patches CC: Jakub Jelinek , Richard Biener Subject: Re: [gomp4, committed] Only use transform_to_exit_first_loop_alt for kernels References: <556C6581.9000706@mentor.com> In-Reply-To: <556C6581.9000706@mentor.com> On 01/06/15 16:00, Tom de Vries wrote: > Furthermore, the patch replaces pass_copy_prop with pass_fre. I found > this necessary at some point and added it to the patch, but I can't > reproduce the necessity now, so I'll revert that bit asap. Attached revert patch committed to gomp-4_0-branch. Thanks, - Tom Undo adding pass_fre in kernels pass group 2015-06-01 Tom de Vries Revert: 2015-05-28 Tom de Vries * passes.def: Replace pass_copy_prop with pass_fre. Surround with pass_tree_loop_done and pass_tree_loop_init. 2015-06-01 Thomas Schwinge * g++.dg/ipa/devirt-37.C: Look at "fre4" instead of "fre3". * g++.dg/ipa/devirt-40.C: Likewise. * g++.dg/tree-ssa/pr61034.C: Likewise. * gcc.dg/ipa/ipa-pta-13.c: Likewise. * gcc.dg/ipa/ipa-pta-3.c: Likewise. * gcc.dg/ipa/ipa-pta-4.c: Likewise. --- gcc/passes.def | 4 +--- gcc/testsuite/g++.dg/ipa/devirt-37.C | 12 ++++++------ gcc/testsuite/g++.dg/ipa/devirt-40.C | 6 +++--- gcc/testsuite/g++.dg/tree-ssa/pr61034.C | 10 +++++----- gcc/testsuite/gcc.dg/ipa/ipa-pta-13.c | 6 +++--- gcc/testsuite/gcc.dg/ipa/ipa-pta-3.c | 6 +++--- gcc/testsuite/gcc.dg/ipa/ipa-pta-4.c | 6 +++--- 7 files changed, 24 insertions(+), 26 deletions(-) diff --git a/gcc/passes.def b/gcc/passes.def index 6be71db3..da497ed 100644 --- a/gcc/passes.def +++ b/gcc/passes.def @@ -96,9 +96,7 @@ along with GCC; see the file COPYING3. If not see NEXT_PASS (pass_fre); NEXT_PASS (pass_tree_loop_init); NEXT_PASS (pass_lim); - NEXT_PASS (pass_tree_loop_done); - NEXT_PASS (pass_fre); - NEXT_PASS (pass_tree_loop_init); + NEXT_PASS (pass_copy_prop); NEXT_PASS (pass_scev_cprop); NEXT_PASS (pass_parallelize_loops_oacc_kernels); NEXT_PASS (pass_expand_omp_ssa); diff --git a/gcc/testsuite/g++.dg/ipa/devirt-37.C b/gcc/testsuite/g++.dg/ipa/devirt-37.C index 5b77343..eb2c7f2 100644 --- a/gcc/testsuite/g++.dg/ipa/devirt-37.C +++ b/gcc/testsuite/g++.dg/ipa/devirt-37.C @@ -1,4 +1,4 @@ -/* { dg-options "-fpermissive -O2 -fno-indirect-inlining -fno-devirtualize-speculatively -fdump-tree-fre4-details -fno-early-inlining" } */ +/* { dg-options "-fpermissive -O2 -fno-indirect-inlining -fno-devirtualize-speculatively -fdump-tree-fre3-details -fno-early-inlining" } */ #include struct A {virtual void test() {abort ();}}; struct B:A @@ -30,8 +30,8 @@ t() /* After inlining the call within constructor needs to be checked to not go into a basetype. We should see the vtbl store and we should notice extcall as possibly clobbering the type but ignore it because b is in static storage. */ -/* { dg-final { scan-tree-dump "No dynamic type change found." "fre4" } } */ -/* { dg-final { scan-tree-dump "Checking vtbl store:" "fre4" } } */ -/* { dg-final { scan-tree-dump "Function call may change dynamic type:extcall" "fre4" } } */ -/* { dg-final { scan-tree-dump "converting indirect call to function virtual void" "fre4" } } */ -/* { dg-final { cleanup-tree-dump "fre4" } } */ +/* { dg-final { scan-tree-dump "No dynamic type change found." "fre3" } } */ +/* { dg-final { scan-tree-dump "Checking vtbl store:" "fre3" } } */ +/* { dg-final { scan-tree-dump "Function call may change dynamic type:extcall" "fre3" } } */ +/* { dg-final { scan-tree-dump "converting indirect call to function virtual void" "fre3" } } */ +/* { dg-final { cleanup-tree-dump "fre3" } } */ diff --git a/gcc/testsuite/g++.dg/ipa/devirt-40.C b/gcc/testsuite/g++.dg/ipa/devirt-40.C index 86f6f25..7e4ae7c 100644 --- a/gcc/testsuite/g++.dg/ipa/devirt-40.C +++ b/gcc/testsuite/g++.dg/ipa/devirt-40.C @@ -1,4 +1,4 @@ -/* { dg-options "-O2 -fdump-tree-fre4-details" } */ +/* { dg-options "-O2 -fdump-tree-fre3-details" } */ typedef enum { } UErrorCode; @@ -19,5 +19,5 @@ A::m_fn1 (UnicodeString &, int &p2, UErrorCode &) const UnicodeString a[2]; } -/* { dg-final { scan-tree-dump-not "\\n OBJ_TYPE_REF" "fre4" } } */ -/* { dg-final { cleanup-tree-dump "fre4" } } */ +/* { dg-final { scan-tree-dump-not "\\n OBJ_TYPE_REF" "fre3" } } */ +/* { dg-final { cleanup-tree-dump "fre3" } } */ diff --git a/gcc/testsuite/g++.dg/tree-ssa/pr61034.C b/gcc/testsuite/g++.dg/tree-ssa/pr61034.C index 4a46bc4..1ef1938 100644 --- a/gcc/testsuite/g++.dg/tree-ssa/pr61034.C +++ b/gcc/testsuite/g++.dg/tree-ssa/pr61034.C @@ -1,5 +1,5 @@ // { dg-do compile } -// { dg-options "-O3 -fdump-tree-fre4" } +// { dg-options "-O3 -fdump-tree-fre3" } #define assume(x) if(!(x))__builtin_unreachable() @@ -42,7 +42,7 @@ bool f(I a, I b, I c, I d) { // a bunch of conditional free()s and unreachable()s. // This works only if everything is inlined into 'f'. -// { dg-final { scan-tree-dump-times ";; Function" 1 "fre4" } } -// { dg-final { scan-tree-dump-times "free" 18 "fre4" } } -// { dg-final { scan-tree-dump-times "unreachable" 11 "fre4" } } -// { dg-final { cleanup-tree-dump "fre4" } } +// { dg-final { scan-tree-dump-times ";; Function" 1 "fre3" } } +// { dg-final { scan-tree-dump-times "free" 18 "fre3" } } +// { dg-final { scan-tree-dump-times "unreachable" 11 "fre3" } } +// { dg-final { cleanup-tree-dump "fre3" } } diff --git a/gcc/testsuite/gcc.dg/ipa/ipa-pta-13.c b/gcc/testsuite/gcc.dg/ipa/ipa-pta-13.c index 7d0feb9..8d73900 100644 --- a/gcc/testsuite/gcc.dg/ipa/ipa-pta-13.c +++ b/gcc/testsuite/gcc.dg/ipa/ipa-pta-13.c @@ -1,5 +1,5 @@ /* { dg-do link } */ -/* { dg-options "-O2 -fipa-pta -fdump-ipa-pta-details -fdump-tree-fre4 -fno-ipa-icf" } */ +/* { dg-options "-O2 -fipa-pta -fdump-ipa-pta-details -fdump-tree-fre3 -fno-ipa-icf" } */ static int x, y; @@ -54,9 +54,9 @@ int main() local_address_taken (&y); /* As we are computing flow- and context-insensitive we may not CSE the load of x here. */ - /* { dg-final { scan-tree-dump " = x;" "fre4" } } */ + /* { dg-final { scan-tree-dump " = x;" "fre3" } } */ return x; } /* { dg-final { cleanup-ipa-dump "pta" } } */ -/* { dg-final { cleanup-tree-dump "fre4" } } */ +/* { dg-final { cleanup-tree-dump "fre3" } } */ diff --git a/gcc/testsuite/gcc.dg/ipa/ipa-pta-3.c b/gcc/testsuite/gcc.dg/ipa/ipa-pta-3.c index ed0c40b..2398a21 100644 --- a/gcc/testsuite/gcc.dg/ipa/ipa-pta-3.c +++ b/gcc/testsuite/gcc.dg/ipa/ipa-pta-3.c @@ -1,5 +1,5 @@ /* { dg-do run } */ -/* { dg-options "-O2 -fipa-pta -fdump-ipa-pta-details -fdump-tree-fre4-details" } */ +/* { dg-options "-O2 -fipa-pta -fdump-ipa-pta-details -fdump-tree-fre3-details" } */ static int __attribute__((noinline,noclone)) foo (int *p, int *q) @@ -23,6 +23,6 @@ int main() /* { dg-final { scan-ipa-dump "foo.arg0 = &a" "pta" } } */ /* { dg-final { scan-ipa-dump "foo.arg1 = &b" "pta" } } */ -/* { dg-final { scan-tree-dump "Replaced \\\*p_2\\\(D\\\) with 1" "fre4" } } */ -/* { dg-final { cleanup-tree-dump "fre4" } } */ +/* { dg-final { scan-tree-dump "Replaced \\\*p_2\\\(D\\\) with 1" "fre3" } } */ +/* { dg-final { cleanup-tree-dump "fre3" } } */ /* { dg-final { cleanup-ipa-dump "pta" } } */ diff --git a/gcc/testsuite/gcc.dg/ipa/ipa-pta-4.c b/gcc/testsuite/gcc.dg/ipa/ipa-pta-4.c index a0f68a0..b72489f 100644 --- a/gcc/testsuite/gcc.dg/ipa/ipa-pta-4.c +++ b/gcc/testsuite/gcc.dg/ipa/ipa-pta-4.c @@ -1,5 +1,5 @@ /* { dg-do run } */ -/* { dg-options "-O2 -fipa-pta -fdump-ipa-pta-details -fdump-tree-fre4-details" } */ +/* { dg-options "-O2 -fipa-pta -fdump-ipa-pta-details -fdump-tree-fre3-details" } */ int a, b; @@ -28,6 +28,6 @@ int main() /* { dg-final { scan-ipa-dump "foo.arg0 = &a" "pta" } } */ /* { dg-final { scan-ipa-dump "foo.arg1 = &b" "pta" } } */ -/* { dg-final { scan-tree-dump "Replaced \\\*p_2\\\(D\\\) with 1" "fre4" } } */ -/* { dg-final { cleanup-tree-dump "fre4" } } */ +/* { dg-final { scan-tree-dump "Replaced \\\*p_2\\\(D\\\) with 1" "fre3" } } */ +/* { dg-final { cleanup-tree-dump "fre3" } } */ /* { dg-final { cleanup-ipa-dump "pta" } } */ -- 1.9.1