From patchwork Mon Jun 1 09:18:49 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Thomas Schwinge X-Patchwork-Id: 478870 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 9B858140F90 for ; Mon, 1 Jun 2015 19:19:20 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=gcc.gnu.org header.i=@gcc.gnu.org header.b=mi9UClds; 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; q=dns; s=default; b=OkpI3Av/tbnFgmmg 8mNTjb0UrwiyUE9WdyaGGhb1IpHeSgR3Rgttwq1uABP0jDQ9ZoKDuB7uapEhWC8Z JWzc+Ht68e2G/pR9PAgTmX/TJJjxvy0uUsZb2lDuDnC0+Vi1KTR44AcH2NTsARYg 1w7rf9kwqNApFBAqiqYMgDIS6Vo= 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; s=default; bh=MRvKLsv+dAkN9nrt3G4j0d H99WE=; b=mi9UCldslYWjxB7TUPa5LdVxV16UxSTJCwJ/uOccQcPAUpxHIVBJx9 +hzMce1MA60B0j4abAiXuNRGnexA+UofqPG3hoJT2J/4pCSUTF+8uLc5qUcrOvST 5dCYHUbeXWFCID+1wh8JDKvU0a8BL2qydJveKdbiiaIx3cFiRmpZc= Received: (qmail 69571 invoked by alias); 1 Jun 2015 09:19:13 -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 69561 invoked by uid 89); 1 Jun 2015 09:19:12 -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 09:19:04 +0000 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 1YzLs4-00007H-Hr from Thomas_Schwinge@mentor.com for gcc-patches@gcc.gnu.org; Mon, 01 Jun 2015 02:19:01 -0700 Received: from feldtkeller.schwinge.homeip.net (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; Mon, 1 Jun 2015 10:18:59 +0100 From: Thomas Schwinge To: CC: Subject: [gomp4] Update test cases for new pass_fre (was: r223849 - in /branches/gomp-4_0-branch: gcc/Cha...) In-Reply-To: <20150528212404.79715.qmail@sourceware.org> References: <20150528212404.79715.qmail@sourceware.org> User-Agent: Notmuch/0.9-101-g81dad07 (http://notmuchmail.org) Emacs/24.4.1 (i586-pc-linux-gnu) Date: Mon, 1 Jun 2015 11:18:49 +0200 Message-ID: <87h9qrlrba.fsf@kepler.schwinge.homeip.net> MIME-Version: 1.0 Hi! On Thu, 28 May 2015 21:24:04 -0000, vries@gcc.gnu.org wrote: > Author: vries > Date: Thu May 28 21:24:04 2015 > New Revision: 223849 > > URL: https://gcc.gnu.org/viewcvs?rev=223849&root=gcc&view=rev > Log: > Only use transform_to_exit_first_loop_alt for kernels > > 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. > * [...] Committed to gomp-4_0-branch in r223923: commit 01fa2e1461b3133d001fe7a763b6b3f8df5c8de2 Author: tschwinge Date: Mon Jun 1 09:15:43 2015 +0000 Update test cases for new pass_fre ... that has been added in 223849. This resolves the following regressions: XFAIL: gcc.dg/ipa/ipa-pta-13.c scan-ipa-dump pta "local_address_taken.arg0 = { ESCAPED NONLOCAL y x }" XFAIL: gcc.dg/ipa/ipa-pta-13.c scan-ipa-dump pta "local_address_taken.clobber = { ESCAPED NONLOCAL y x }" XFAIL: gcc.dg/ipa/ipa-pta-13.c scan-ipa-dump pta "local_address_taken.use = { }" [-PASS:-]{+UNRESOLVED:+} gcc.dg/ipa/ipa-pta-13.c scan-tree-dump fre3 " = x;" PASS: gcc.dg/ipa/ipa-pta-3.c execution test PASS: gcc.dg/ipa/ipa-pta-3.c scan-ipa-dump pta "foo.arg0 = &a" PASS: gcc.dg/ipa/ipa-pta-3.c scan-ipa-dump pta "foo.arg1 = &b" [-PASS:-]{+UNRESOLVED:+} gcc.dg/ipa/ipa-pta-3.c scan-tree-dump fre3 "Replaced \\*p_2\\(D\\) with 1" PASS: gcc.dg/ipa/ipa-pta-4.c execution test PASS: gcc.dg/ipa/ipa-pta-4.c scan-ipa-dump pta "foo.arg0 = &a" PASS: gcc.dg/ipa/ipa-pta-4.c scan-ipa-dump pta "foo.arg1 = &b" [-PASS:-]{+UNRESOLVED:+} gcc.dg/ipa/ipa-pta-4.c scan-tree-dump fre3 "Replaced \\*p_2\\(D\\) with 1" [-PASS:-]{+UNRESOLVED:+} g++.dg/ipa/devirt-37.C -std=gnu++11 scan-tree-dump fre3 "Checking vtbl store:" [-PASS:-]{+UNRESOLVED:+} g++.dg/ipa/devirt-37.C -std=gnu++11 scan-tree-dump fre3 "Function call may change dynamic type:extcall" [-PASS:-]{+UNRESOLVED:+} g++.dg/ipa/devirt-37.C -std=gnu++11 scan-tree-dump fre3 "No dynamic type change found." [-PASS:-]{+UNRESOLVED:+} g++.dg/ipa/devirt-37.C -std=gnu++11 scan-tree-dump fre3 "converting indirect call to function virtual void" PASS: g++.dg/ipa/devirt-37.C -std=gnu++11 (test for excess errors) [-PASS:-]{+UNRESOLVED:+} g++.dg/ipa/devirt-37.C -std=gnu++14 scan-tree-dump fre3 "Checking vtbl store:" [-PASS:-]{+UNRESOLVED:+} g++.dg/ipa/devirt-37.C -std=gnu++14 scan-tree-dump fre3 "Function call may change dynamic type:extcall" [-PASS:-]{+UNRESOLVED:+} g++.dg/ipa/devirt-37.C -std=gnu++14 scan-tree-dump fre3 "No dynamic type change found." [-PASS:-]{+UNRESOLVED:+} g++.dg/ipa/devirt-37.C -std=gnu++14 scan-tree-dump fre3 "converting indirect call to function virtual void" PASS: g++.dg/ipa/devirt-37.C -std=gnu++14 (test for excess errors) [-PASS:-]{+UNRESOLVED:+} g++.dg/ipa/devirt-37.C -std=gnu++98 scan-tree-dump fre3 "Checking vtbl store:" [-PASS:-]{+UNRESOLVED:+} g++.dg/ipa/devirt-37.C -std=gnu++98 scan-tree-dump fre3 "Function call may change dynamic type:extcall" [-PASS:-]{+UNRESOLVED:+} g++.dg/ipa/devirt-37.C -std=gnu++98 scan-tree-dump fre3 "No dynamic type change found." [-PASS:-]{+UNRESOLVED:+} g++.dg/ipa/devirt-37.C -std=gnu++98 scan-tree-dump fre3 "converting indirect call to function virtual void" PASS: g++.dg/ipa/devirt-37.C -std=gnu++98 (test for excess errors) [-PASS:-]{+UNRESOLVED:+} g++.dg/ipa/devirt-40.C -std=gnu++11 scan-tree-dump-not fre3 "\\n OBJ_TYPE_REF" PASS: g++.dg/ipa/devirt-40.C -std=gnu++11 (test for excess errors) [-PASS:-]{+UNRESOLVED:+} g++.dg/ipa/devirt-40.C -std=gnu++14 scan-tree-dump-not fre3 "\\n OBJ_TYPE_REF" PASS: g++.dg/ipa/devirt-40.C -std=gnu++14 (test for excess errors) [-PASS:-]{+UNRESOLVED:+} g++.dg/ipa/devirt-40.C -std=gnu++98 scan-tree-dump-not fre3 "\\n OBJ_TYPE_REF" PASS: g++.dg/ipa/devirt-40.C -std=gnu++98 (test for excess errors) [-PASS:-]{+UNRESOLVED:+} g++.dg/tree-ssa/pr61034.C -std=gnu++11 scan-tree-dump-times fre3 ";; Function" 1 [-PASS:-]{+UNRESOLVED:+} g++.dg/tree-ssa/pr61034.C -std=gnu++11 scan-tree-dump-times fre3 "free" 18 [-PASS:-]{+UNRESOLVED:+} g++.dg/tree-ssa/pr61034.C -std=gnu++11 scan-tree-dump-times fre3 "unreachable" 11 PASS: g++.dg/tree-ssa/pr61034.C -std=gnu++11 (test for excess errors) [-PASS:-]{+UNRESOLVED:+} g++.dg/tree-ssa/pr61034.C -std=gnu++14 scan-tree-dump-times fre3 ";; Function" 1 [-PASS:-]{+UNRESOLVED:+} g++.dg/tree-ssa/pr61034.C -std=gnu++14 scan-tree-dump-times fre3 "free" 18 [-PASS:-]{+UNRESOLVED:+} g++.dg/tree-ssa/pr61034.C -std=gnu++14 scan-tree-dump-times fre3 "unreachable" 11 PASS: g++.dg/tree-ssa/pr61034.C -std=gnu++14 (test for excess errors) [-PASS:-]{+UNRESOLVED:+} g++.dg/tree-ssa/pr61034.C -std=gnu++98 scan-tree-dump-times fre3 ";; Function" 1 [-PASS:-]{+UNRESOLVED:+} g++.dg/tree-ssa/pr61034.C -std=gnu++98 scan-tree-dump-times fre3 "free" 18 [-PASS:-]{+UNRESOLVED:+} g++.dg/tree-ssa/pr61034.C -std=gnu++98 scan-tree-dump-times fre3 "unreachable" 11 PASS: g++.dg/tree-ssa/pr61034.C -std=gnu++98 (test for excess errors) gcc/testsuite/ * 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. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/gomp-4_0-branch@223923 138bc75d-0d04-0410-961f-82ee72b054a4 --- gcc/testsuite/ChangeLog.gomp | 9 +++++++++ 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, 32 insertions(+), 23 deletions(-) Grüße, Thomas diff --git gcc/testsuite/ChangeLog.gomp gcc/testsuite/ChangeLog.gomp index baec211..fa5100c 100644 --- gcc/testsuite/ChangeLog.gomp +++ gcc/testsuite/ChangeLog.gomp @@ -1,3 +1,12 @@ +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. + 2015-05-28 Tom de Vries * c-c++-common/goacc/kernels-counter-vars-function-scope.c: Add check diff --git gcc/testsuite/g++.dg/ipa/devirt-37.C gcc/testsuite/g++.dg/ipa/devirt-37.C index eb2c7f2..5b77343 100644 --- gcc/testsuite/g++.dg/ipa/devirt-37.C +++ 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-fre4-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." "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" } } */ +/* { 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" } } */ diff --git gcc/testsuite/g++.dg/ipa/devirt-40.C gcc/testsuite/g++.dg/ipa/devirt-40.C index 7e4ae7c..86f6f25 100644 --- gcc/testsuite/g++.dg/ipa/devirt-40.C +++ gcc/testsuite/g++.dg/ipa/devirt-40.C @@ -1,4 +1,4 @@ -/* { dg-options "-O2 -fdump-tree-fre3-details" } */ +/* { dg-options "-O2 -fdump-tree-fre4-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" "fre3" } } */ -/* { dg-final { cleanup-tree-dump "fre3" } } */ +/* { dg-final { scan-tree-dump-not "\\n OBJ_TYPE_REF" "fre4" } } */ +/* { dg-final { cleanup-tree-dump "fre4" } } */ diff --git gcc/testsuite/g++.dg/tree-ssa/pr61034.C gcc/testsuite/g++.dg/tree-ssa/pr61034.C index 1ef1938..4a46bc4 100644 --- gcc/testsuite/g++.dg/tree-ssa/pr61034.C +++ 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-fre4" } #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 "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" } } +// { 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" } } diff --git gcc/testsuite/gcc.dg/ipa/ipa-pta-13.c gcc/testsuite/gcc.dg/ipa/ipa-pta-13.c index 8d73900..7d0feb9 100644 --- gcc/testsuite/gcc.dg/ipa/ipa-pta-13.c +++ 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-fre4 -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;" "fre3" } } */ + /* { dg-final { scan-tree-dump " = x;" "fre4" } } */ return x; } /* { dg-final { cleanup-ipa-dump "pta" } } */ -/* { dg-final { cleanup-tree-dump "fre3" } } */ +/* { dg-final { cleanup-tree-dump "fre4" } } */ diff --git gcc/testsuite/gcc.dg/ipa/ipa-pta-3.c gcc/testsuite/gcc.dg/ipa/ipa-pta-3.c index 2398a21..ed0c40b 100644 --- gcc/testsuite/gcc.dg/ipa/ipa-pta-3.c +++ 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-fre4-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" "fre3" } } */ -/* { dg-final { cleanup-tree-dump "fre3" } } */ +/* { dg-final { scan-tree-dump "Replaced \\\*p_2\\\(D\\\) with 1" "fre4" } } */ +/* { dg-final { cleanup-tree-dump "fre4" } } */ /* { dg-final { cleanup-ipa-dump "pta" } } */ diff --git gcc/testsuite/gcc.dg/ipa/ipa-pta-4.c gcc/testsuite/gcc.dg/ipa/ipa-pta-4.c index b72489f..a0f68a0 100644 --- gcc/testsuite/gcc.dg/ipa/ipa-pta-4.c +++ 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-fre4-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" "fre3" } } */ -/* { dg-final { cleanup-tree-dump "fre3" } } */ +/* { dg-final { scan-tree-dump "Replaced \\\*p_2\\\(D\\\) with 1" "fre4" } } */ +/* { dg-final { cleanup-tree-dump "fre4" } } */ /* { dg-final { cleanup-ipa-dump "pta" } } */