From patchwork Wed Nov 7 11:24:58 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christian Bruel X-Patchwork-Id: 197648 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 91D602C0172 for ; Wed, 7 Nov 2012 22:25:14 +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=1352892314; h=Comment: DomainKey-Signature:Received:Received:Received:Received:Received: Received:Received:Message-ID:Date:From:User-Agent:MIME-Version: To:Subject:Content-Type:Mailing-List:Precedence:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:Sender: Delivered-To; bh=HYHJakuCO4TCKH8qsnumdZjK/hc=; b=qXYLgTu3aAsgSEU aVRwbrGL+fwTeSnGSGFUT46a/+3fl2t6AaTReTOPxd6meMt/AeJIe7FkYpluAwaa GWYq9F2WHU35Y7HFv96xc+vkYoFr+obEZXBZaqAEefk/QusSwMx+jzmo/E+mZFwd JTSAilgJnzb5gShEAeyn3PJv7eJU= 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:Message-ID:Date:From:User-Agent:MIME-Version:To:Subject:Content-Type:X-IsSubscribed:Mailing-List:Precedence:List-Id:List-Unsubscribe:List-Archive:List-Post:List-Help:Sender:Delivered-To; b=YaRK4trWq4NszSluigDM7BvcQi8gEXRipeTlWx6HVSYBKFGmRt1a5Bjp0UQfMS xTy4+tItvw/6jK2PlzaV2NvJjvNzeoBH1SGMW3PUNMb041xttgiaWoZdN+JiAZMF MI6B0WQBKGEy9ABqPnDe+9JSTYOkOp+2lv8lgTNxCWG8Y=; Received: (qmail 19350 invoked by alias); 7 Nov 2012 11:25:11 -0000 Received: (qmail 19336 invoked by uid 22791); 7 Nov 2012 11:25:10 -0000 X-SWARE-Spam-Status: No, hits=-1.7 required=5.0 tests=AWL, BAYES_00, KHOP_SPAMHAUS_DROP, RCVD_IN_HOSTKARMA_YE X-Spam-Check-By: sourceware.org Received: from eu1sys200aog107.obsmtp.com (HELO eu1sys200aog107.obsmtp.com) (207.126.144.123) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Wed, 07 Nov 2012 11:25:06 +0000 Received: from beta.dmz-eu.st.com ([164.129.1.35]) (using TLSv1) by eu1sys200aob107.postini.com ([207.126.147.11]) with SMTP ID DSNKUJpFERP1nBkYAzhuApuQE8Xs6pbjBm6l@postini.com; Wed, 07 Nov 2012 11:25:06 UTC Received: from zeta.dmz-eu.st.com (zeta.dmz-eu.st.com [164.129.230.9]) by beta.dmz-eu.st.com (STMicroelectronics) with ESMTP id 6DA6421B for ; Wed, 7 Nov 2012 11:25:01 +0000 (GMT) Received: from Webmail-eu.st.com (safex1hubcas5.st.com [10.75.90.71]) by zeta.dmz-eu.st.com (STMicroelectronics) with ESMTP id 83A0F2CA4 for ; Wed, 7 Nov 2012 11:25:01 +0000 (GMT) Received: from [164.129.122.89] (164.129.122.89) by webmail-eu.st.com (10.75.90.13) with Microsoft SMTP Server (TLS) id 8.3.245.1; Wed, 7 Nov 2012 12:24:59 +0100 Message-ID: <509A450A.304@st.com> Date: Wed, 7 Nov 2012 12:24:58 +0100 From: Christian Bruel User-Agent: Mozilla/5.0 (X11; Linux i686 on x86_64; rv:14.0) Gecko/20120713 Thunderbird/14.0 MIME-Version: 1.0 To: "gcc-patches@gcc.gnu.org" Subject: [Patch]: Update bb->count to avoid erroneous partitioning decisions 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 Hello, This tiny patch fixes the issue previously discussed in http://gcc.gnu.org/ml/gcc-patches/2012-09/msg00794.html Not maintaining bb->count while merging basic blocs results in wrong partitioning (and surely other) decisions. This is visible on the SH4 with shrink-wrapping. I haven't noticed any difference on x86. This also solves a few "Invalid sum of incoming frequencies" messages while dumping the CFG Reg-tested on x85 and sh-superh-elf. Is it OK for the 4.7 and 4.8 branches ? Thanks Christian 2012-11-07 Christian Bruel * tree-ssa-tail-merge.c (replace_block_by): Update target bb count. Index: tree-ssa-tail-merge.c =================================================================== --- tree-ssa-tail-merge.c (revision 193283) +++ tree-ssa-tail-merge.c (working copy) @@ -1490,6 +1490,8 @@ replace_block_by (basic_block bb1, basic_block bb2 bb2->frequency = BB_FREQ_MAX; bb1->frequency = 0; + bb2->count += bb1->count; + /* Do updates that use bb1, before deleting bb1. */ release_last_vdef (bb1); same_succ_flush_bb (bb1);