From patchwork Thu Feb 7 09:54:41 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jakub Jelinek X-Patchwork-Id: 218873 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]) by ozlabs.org (Postfix) with SMTP id CB7DF2C00DC for ; Thu, 7 Feb 2013 20:55:00 +1100 (EST) Comment: DKIM? See http://www.dkim.org DKIM-Signature: v=1; a=rsa-sha1; c=relaxed/relaxed; d=gcc.gnu.org; s=default; x=1360835701; h=Comment: DomainKey-Signature:Received:Received:Received:Received:Received: Received:Received:Date:From:To:Cc:Subject:Message-ID:Reply-To: References:MIME-Version:Content-Type:Content-Disposition: In-Reply-To:User-Agent:Mailing-List:Precedence:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:Sender: Delivered-To; bh=aaSyOWv1cqp4mETbJmsdsu/GseQ=; b=dKst/Pd4FbCX67x 1zRn+dTbRDUUAauSKng12JM8DhBG3/k7zuoeyjRpZ3mlmEfxxNMCzAP+TPQl/jhZ LJFBRiqzfeY5KhV3/u+vo/JFY+x4VtPhjHZb3a+zKlGEDjQlbn9KLswnNGxbyM3h keFZuzF455UqvFplruV1a9b/jY3c= Comment: DomainKeys? See http://antispam.yahoo.com/domainkeys DomainKey-Signature: a=rsa-sha1; q=dns; c=nofws; s=default; d=gcc.gnu.org; h=Received:Received:X-SWARE-Spam-Status:X-Spam-Check-By:Received:Received:Received:Received:Received:Date:From:To:Cc:Subject:Message-ID:Reply-To:References:MIME-Version:Content-Type:Content-Disposition:In-Reply-To:User-Agent:X-IsSubscribed:Mailing-List:Precedence:List-Id:List-Unsubscribe:List-Archive:List-Post:List-Help:Sender:Delivered-To; b=dgkbl1PMCXndCJZWniay3tIHZM0ILi60bZVH3zZd36m0CsZztglTrFRe/kpuaL 2w/nmH56oVU3SZfxpGUfGdYYO6Y+FlBhlsLFiIlCPjA6oH8RbRocclE9VkA6Ffli B5Hih0/s0UHU5A7qb7lySGBrW6/3tD2iojgMusZ3YWeI8=; Received: (qmail 15874 invoked by alias); 7 Feb 2013 09:54:53 -0000 Received: (qmail 15842 invoked by uid 22791); 7 Feb 2013 09:54:52 -0000 X-SWARE-Spam-Status: No, hits=-6.3 required=5.0 tests=AWL, BAYES_00, KHOP_RCVD_UNTRUST, KHOP_SPAMHAUS_DROP, RCVD_IN_DNSWL_HI, RCVD_IN_HOSTKARMA_W, RP_MATCHES_RCVD, SPF_HELO_PASS X-Spam-Check-By: sourceware.org Received: from mx1.redhat.com (HELO mx1.redhat.com) (209.132.183.28) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Thu, 07 Feb 2013 09:54:45 +0000 Received: from int-mx10.intmail.prod.int.phx2.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id r179si3B029130 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Thu, 7 Feb 2013 04:54:44 -0500 Received: from zalov.redhat.com (vpn1-6-46.ams2.redhat.com [10.36.6.46]) by int-mx10.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id r179sgQY028103 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Thu, 7 Feb 2013 04:54:44 -0500 Received: from zalov.cz (localhost [127.0.0.1]) by zalov.redhat.com (8.14.5/8.14.5) with ESMTP id r179sfFg031371; Thu, 7 Feb 2013 10:54:42 +0100 Received: (from jakub@localhost) by zalov.cz (8.14.5/8.14.5/Submit) id r179sffa031370; Thu, 7 Feb 2013 10:54:41 +0100 Date: Thu, 7 Feb 2013 10:54:41 +0100 From: Jakub Jelinek To: Richard Biener , Jan Hubicka Cc: gcc-patches@gcc.gnu.org Subject: Re: Fix inline-1.C and inline-3.C testcases Message-ID: <20130207095440.GZ4385@tucnak.redhat.com> Reply-To: Jakub Jelinek References: <20130205152714.GA14902@kam.mff.cuni.cz> <20130205155136.GO4385@tucnak.redhat.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20130205155136.GO4385@tucnak.redhat.com> User-Agent: Mutt/1.5.21 (2010-09-15) X-IsSubscribed: yes 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 On Tue, Feb 05, 2013 at 04:51:36PM +0100, Jakub Jelinek wrote: > On Tue, Feb 05, 2013 at 04:27:15PM +0100, Jan Hubicka wrote: > > I managed to get an accidental commit on those two testcases without an ChangeLog entry. > > I just commit the missing ChangeLog and the following patch that should make them pass. > > > > just in a case you wonder what are the tests about. I disabled iteration on early inliner > > that makes it to mis some cases of indirect inlining that are now handled by later > > inliner. The tree-ssa/inline-?.C testcases tests that early inliner with large enough > > iteration counts still does the optimization, while ipa/inline-?.C are the same > > testcases with no iteration and test that late inline picks the optimization too. > > > > The motivation for the change was early inliner doing funny things on non-trivial recursion > > especially with early-inlining-insns bumped up. > > Doesn't seem to be enough. > > gcc/testsuite/g++.dg/ipa/inline-3.C > has > /* { dg-final { cleanup-tree-dump "inline" } } */ > while supposedly it should have: > /* { dg-final { cleanup-ipa-dump "inline" } } */ > > Also, > gcc/testsuite/gcc.dg/tree-ssa/inline-3.c > is now failing, supposedly it should have --param added ? Now in a form of patch. Tested on x86_64-linux, ok for trunk? 2013-02-07 Jakub Jelinek PR tree-optimization/55789 * g++.dg/ipa/inline-3.C: Use cleanup-ipa-dump instead of cleanup-tree-dump. * gcc.dg/tree-ssa/inline-3.c: Add --param max-early-inliner-iterations=2 option. Jakub --- gcc/testsuite/g++.dg/ipa/inline-3.C.jj 2013-02-05 12:06:08.000000000 +0100 +++ gcc/testsuite/g++.dg/ipa/inline-3.C 2013-02-07 10:51:46.619509404 +0100 @@ -26,4 +26,4 @@ int main(int argc, char **argv) /* { dg-final { scan-ipa-dump-times "Considering void inline_me\\(" 1 "inline"} } */ /* { dg-final { scan-ipa-dump-times "Considering void inline_me_too\\(" 1 "inline"} } */ -/* { dg-final { cleanup-tree-dump "inline" } } */ +/* { dg-final { cleanup-ipa-dump "inline" } } */ --- gcc/testsuite/gcc.dg/tree-ssa/inline-3.c.jj 2010-10-07 19:44:57.000000000 +0200 +++ gcc/testsuite/gcc.dg/tree-ssa/inline-3.c 2013-02-07 10:51:00.653777552 +0100 @@ -1,5 +1,5 @@ /* { dg-do compile } */ -/* { dg-options "-O2 -fdump-tree-einline" } */ +/* { dg-options "-O2 -fdump-tree-einline --param max-early-inliner-iterations=2" } */ /* { dg-add-options bind_pic_locally } */ extern void inlined ();