From patchwork Tue Jul 28 08:13: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: 501068 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 7E3B11402AC for ; Tue, 28 Jul 2015 18:14:24 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=gcc.gnu.org header.i=@gcc.gnu.org header.b=j4DTtFfN; 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:content-type; q=dns; s=default; b=nckcLdGwP0AdDBBl6WR0ulCT4StBZ3Q1sZIwv1HKW8n IAlqfNqXeGJ7dLn41qEv3ESplgBes4fwroazTCDeOSOHtIaX32DEvLuzDMgjAVMs iQmzMVZ4fsAMvQR4vHCAazOZKapWjSSK2qImQyvk4bz2kk4PcIQpTZGAK0TwSzCE = 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:content-type; s=default; bh=vColuCWawWsJQ9mEPjNScTvmn7k=; b=j4DTtFfNKVhstq6xC P3WFUAvcV+l/1/qNX9TU9rATEOdBtgVMWfkTmjObgA8lyhPw6FdVLFPBXcXdoxUc p3KMfu3ceYdXQ8OOEKPNvA3Umx3O+zsYlmWjp27z799kwxhtlwvBry4dzS5ctSsO dqhaWaa7yJCiNQBgR/y8Cydixo= Received: (qmail 4421 invoked by alias); 28 Jul 2015 08:14:16 -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 4408 invoked by uid 89); 28 Jul 2015 08:14:16 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-2.7 required=5.0 tests=AWL, BAYES_00, RP_MATCHES_RCVD, SPF_PASS autolearn=ham version=3.3.2 X-HELO: fencepost.gnu.org Received: from fencepost.gnu.org (HELO fencepost.gnu.org) (208.118.235.10) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with (AES128-SHA encrypted) ESMTPS; Tue, 28 Jul 2015 08:14:14 +0000 Received: from eggs.gnu.org ([2001:4830:134:3::10]:39363) by fencepost.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1ZK01c-0007vu-G1 for gcc-patches@gnu.org; Tue, 28 Jul 2015 04:14:12 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZK01Y-0005t3-5K for gcc-patches@gnu.org; Tue, 28 Jul 2015 04:14:12 -0400 Received: from relay1.mentorg.com ([192.94.38.131]:45042) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZK01X-0005sa-Ry for gcc-patches@gnu.org; Tue, 28 Jul 2015 04:14:08 -0400 Received: from nat-ies.mentorg.com ([192.94.31.2] helo=SVR-IES-FEM-02.mgc.mentorg.com) by relay1.mentorg.com with esmtp id 1ZK01W-0004vG-Qj from Tom_deVries@mentor.com ; Tue, 28 Jul 2015 01:14:07 -0700 Received: from [127.0.0.1] (137.202.0.76) by SVR-IES-FEM-02.mgc.mentorg.com (137.202.0.106) with Microsoft SMTP Server id 14.3.224.2; Tue, 28 Jul 2015 09:14:05 +0100 Message-ID: <55B739B9.2050600@mentor.com> Date: Tue, 28 Jul 2015 10:13: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@gnu.org" CC: Jakub Jelinek Subject: [gomp4, committed] Replace pass_fre with pass_copy_prop in kernels pass group X-detected-operating-system: by eggs.gnu.org: Windows NT kernel [generic] [fuzzy] X-Received-From: 192.94.38.131 Hi, I couldn't reproduce the need for pass_fre in the oacc kernels pass group, so I've replaced it with an instance of pass_copy_prop. Bootstrapped and reg-tested on x86_64. Committed to gomp-4_0-branch. Thanks, - Tom Replace pass_fre with pass_copy_prop in kernels pass group 2015-07-28 Tom de Vries * passes.def: Replace pass_fre with pass_copy_prop in oacc kernels pass group. * g++.dg/ipa/devirt-37.C: Update for removal of pass_fre. * g++.dg/ipa/devirt-40.C: Same. * g++.dg/tree-ssa/pr61034.C: Same. * gcc.dg/ipa/ipa-pta-13.c: Same. * gcc.dg/ipa/ipa-pta-3.c: Same. * gcc.dg/ipa/ipa-pta-4.c: Same. --- gcc/passes.def | 4 +--- gcc/testsuite/g++.dg/ipa/devirt-37.C | 10 +++++----- gcc/testsuite/g++.dg/ipa/devirt-40.C | 4 ++-- gcc/testsuite/g++.dg/tree-ssa/pr61034.C | 8 ++++---- gcc/testsuite/gcc.dg/ipa/ipa-pta-13.c | 4 ++-- gcc/testsuite/gcc.dg/ipa/ipa-pta-3.c | 4 ++-- gcc/testsuite/gcc.dg/ipa/ipa-pta-4.c | 4 ++-- 7 files changed, 18 insertions(+), 20 deletions(-) diff --git a/gcc/passes.def b/gcc/passes.def index 6a2b095..ae91ed1 100644 --- a/gcc/passes.def +++ b/gcc/passes.def @@ -95,9 +95,7 @@ along with GCC; see the file COPYING3. If not see NEXT_PASS (pass_ch_oacc_kernels); 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 b7f52a0..9c5287e 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-fre3-details -fno-early-inlining" } */ +/* { dg-options "-fpermissive -O2 -fno-indirect-inlining -fno-devirtualize-speculatively -fdump-tree-fre2-details -fno-early-inlining" } */ #include struct A {virtual void test() {abort ();}}; struct B:A @@ -30,7 +30,7 @@ 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." "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 { scan-tree-dump "No dynamic type change found." "fre2" } } */ +/* { dg-final { scan-tree-dump "Checking vtbl store:" "fre2" } } */ +/* { dg-final { scan-tree-dump "Function call may change dynamic type:extcall" "fre2" } } */ +/* { dg-final { scan-tree-dump "converting indirect call to function virtual void" "fre2" } } */ diff --git a/gcc/testsuite/g++.dg/ipa/devirt-40.C b/gcc/testsuite/g++.dg/ipa/devirt-40.C index 5107c29..279a228 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-fre3-details" } */ +/* { dg-options "-O2 -fdump-tree-fre2-details" } */ typedef enum { } UErrorCode; @@ -19,4 +19,4 @@ A::m_fn1 (UnicodeString &, int &p2, UErrorCode &) const UnicodeString a[2]; } -/* { dg-final { scan-tree-dump-not "\\n OBJ_TYPE_REF" "fre3" } } */ +/* { dg-final { scan-tree-dump-not "\\n OBJ_TYPE_REF" "fre2" } } */ diff --git a/gcc/testsuite/g++.dg/tree-ssa/pr61034.C b/gcc/testsuite/g++.dg/tree-ssa/pr61034.C index c019830..14fd85a 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-fre3" } +// { dg-options "-O3 -fdump-tree-fre2" } #define assume(x) if(!(x))__builtin_unreachable() @@ -42,6 +42,6 @@ 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 "fre3" } } -// { dg-final { scan-tree-dump-times "free" 18 "fre3" } } -// { dg-final { scan-tree-dump-times "unreachable" 11 "fre3" } } +// { dg-final { scan-tree-dump-times ";; Function" 1 "fre2" } } +// { dg-final { scan-tree-dump-times "free" 18 "fre2" } } +// { dg-final { scan-tree-dump-times "unreachable" 11 "fre2" } } diff --git a/gcc/testsuite/gcc.dg/ipa/ipa-pta-13.c b/gcc/testsuite/gcc.dg/ipa/ipa-pta-13.c index 71b31c4..f558df3 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-fre3 -fno-ipa-icf" } */ +/* { dg-options "-O2 -fipa-pta -fdump-ipa-pta-details -fdump-tree-fre2 -fno-ipa-icf" } */ static int x, y; @@ -54,7 +54,7 @@ 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;" "fre3" } } */ + /* { dg-final { scan-tree-dump " = x;" "fre2" } } */ return x; } diff --git a/gcc/testsuite/gcc.dg/ipa/ipa-pta-3.c b/gcc/testsuite/gcc.dg/ipa/ipa-pta-3.c index 8655794..ff6fa57 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-fre3-details" } */ +/* { dg-options "-O2 -fipa-pta -fdump-ipa-pta-details -fdump-tree-fre2-details" } */ static int __attribute__((noinline,noclone)) foo (int *p, int *q) @@ -23,4 +23,4 @@ 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" "fre3" } } */ +/* { dg-final { scan-tree-dump "Replaced \\\*p_2\\\(D\\\) with 1" "fre2" } } */ diff --git a/gcc/testsuite/gcc.dg/ipa/ipa-pta-4.c b/gcc/testsuite/gcc.dg/ipa/ipa-pta-4.c index c42762a..106e325 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-fre3-details" } */ +/* { dg-options "-O2 -fipa-pta -fdump-ipa-pta-details -fdump-tree-fre2-details" } */ int a, b; @@ -28,4 +28,4 @@ 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" "fre3" } } */ +/* { dg-final { scan-tree-dump "Replaced \\\*p_2\\\(D\\\) with 1" "fre2" } } */ -- 1.9.1