From patchwork Wed Mar 7 11:33:09 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrey Belevantsev X-Patchwork-Id: 145185 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 AFC0EB6EF1 for ; Wed, 7 Mar 2012 22:33:25 +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=1331724806; h=Comment: DomainKey-Signature:Received:Received:Received:Received: Message-ID:Date:From:User-Agent:MIME-Version:To:CC:Subject: Content-Type:Content-Transfer-Encoding:Mailing-List:Precedence: List-Id:List-Unsubscribe:List-Archive:List-Post:List-Help:Sender: Delivered-To; bh=LSd6Vr2dyEPTVR4YtoTXCSudl/I=; b=Xkz2yE2ATJ+T925 3X3pMOYvhIYhrpGu2ZQT4Til/I9DSaZPwv8VWx7/xHs97XGI8gOdo7AaUgZsRpRr x1seqyUwk69SLjXwZ4i85VPnRXRSvSMLVWAmCzCUuT5WOH5uFmb+GT+JVHgTXc61 Nwt2gjIrzaWqLwzOp65sTl/b/zpE= 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:Message-ID:Date:From:User-Agent:MIME-Version:To:CC:Subject:Content-Type:Content-Transfer-Encoding:X-IsSubscribed:Mailing-List:Precedence:List-Id:List-Unsubscribe:List-Archive:List-Post:List-Help:Sender:Delivered-To; b=Tg0cHzs1n3adoy8JKaK5kVZh9DsKDYgWnAcBWmzuass4iC8VUZHJfq7Dw/UfZJ qNzm8ryiREVRN68qdvpv+F/+wANBzjJlhV+P20JivTANioiAncj/5YwSjcwlfgpr pUFaGOK92rDt4VVyBH5a+602KpsvvgfYzg885EjP4GgtE=; Received: (qmail 13318 invoked by alias); 7 Mar 2012 11:33:22 -0000 Received: (qmail 13305 invoked by uid 22791); 7 Mar 2012 11:33:21 -0000 X-SWARE-Spam-Status: No, hits=-1.7 required=5.0 tests=AWL, BAYES_00, TW_CP, T_RP_MATCHES_RCVD X-Spam-Check-By: sourceware.org Received: from mail.ispras.ru (HELO mail.ispras.ru) (83.149.199.43) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Wed, 07 Mar 2012 11:33:05 +0000 Received: from [10.10.3.52] (winnie.ispras.ru [83.149.198.236]) by mail.ispras.ru (Postfix) with ESMTP id AF79A24FE56; Wed, 7 Mar 2012 15:33:03 +0400 (MSK) Message-ID: <4F574775.4040500@ispras.ru> Date: Wed, 07 Mar 2012 15:33:09 +0400 From: Andrey Belevantsev User-Agent: Mozilla/5.0 (Windows NT 6.1; WOW64; rv:11.0) Gecko/20120229 Thunderbird/11.0 MIME-Version: 1.0 To: GCC Patches CC: Alexander Monakov Subject: [PATCH] Fix PR 52203 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 PR is again about insns that are recog'ed as >=0 but do not change the processor state. As explained in http://gcc.gnu.org/bugzilla/show_bug.cgi?id=52203#c8, I've tried experimenting with an attribute marking those "empty" insns in MD files and asserting that all other insns do have reservations. As this doesn't seem to be interesting, I give up with the idea, and the below patch makes sel-sched do exactly what the Haifa scheduler does, i.e. do not count such insns against issue_rate when modelling clock cycles. Tested on ia64 and x86-64, OK for trunk? No testcase again because of the amount of flags needed. Andrey 2012-03-07 Andrey Belevantsev PR rtl-optimization/52203 * sel-sched.c (estimate_insn_cost): New parameter pempty. Adjust all callers to pass NULL except ... (reset_sched_cycles_in_current_ebb): ... here, save the value in new variable 'empty'. Increase issue_rate only for non-empty insns. int cost; @@ -4277,6 +4278,8 @@ estimate_insn_cost (rtx insn, state_t state) memcpy (temp, state, dfa_state_size); cost = state_transition (temp, insn); + if (pempty) + *pempty = (memcmp (temp, state, dfa_state_size) == 0); if (cost < 0) return 0; @@ -4307,7 +4310,7 @@ get_expr_cost (expr_t expr, fence_t fence) return 0; } else - return estimate_insn_cost (insn, FENCE_STATE (fence)); + return estimate_insn_cost (insn, FENCE_STATE (fence), NULL); } /* Find the best insn for scheduling, either via max_issue or just take @@ -7020,7 +7023,7 @@ reset_sched_cycles_in_current_ebb (void) { int cost, haifa_cost; int sort_p; - bool asm_p, real_insn, after_stall, all_issued; + bool asm_p, real_insn, after_stall, all_issued, empty; int clock; if (!INSN_P (insn)) @@ -7047,7 +7050,7 @@ reset_sched_cycles_in_current_ebb (void) haifa_cost = 0; } else - haifa_cost = estimate_insn_cost (insn, curr_state); + haifa_cost = estimate_insn_cost (insn, curr_state, &empty); /* Stall for whatever cycles we've stalled before. */ after_stall = 0; @@ -7081,7 +7084,7 @@ reset_sched_cycles_in_current_ebb (void) if (!after_stall && real_insn && haifa_cost > 0 - && estimate_insn_cost (insn, curr_state) == 0) + && estimate_insn_cost (insn, curr_state, NULL) == 0) break; /* When the data dependency stall is longer than the DFA stall, @@ -7093,7 +7096,7 @@ reset_sched_cycles_in_current_ebb (void) if ((after_stall || all_issued) && real_insn && haifa_cost == 0) - haifa_cost = estimate_insn_cost (insn, curr_state); + haifa_cost = estimate_insn_cost (insn, curr_state, NULL); } haifa_clock += i; @@ -7125,7 +7128,8 @@ reset_sched_cycles_in_current_ebb (void) if (real_insn) { cost = state_transition (curr_state, insn); - issued_insns++; + if (!empty) + issued_insns++; if (sched_verbose >= 2) { diff --git a/gcc/sel-sched.c b/gcc/sel-sched.c index 2af01ae..2829f60 100644 --- a/gcc/sel-sched.c +++ b/gcc/sel-sched.c @@ -4265,9 +4265,10 @@ invoke_aftermath_hooks (fence_t fence, rtx best_insn, int issue_more) return issue_more; } -/* Estimate the cost of issuing INSN on DFA state STATE. */ +/* Estimate the cost of issuing INSN on DFA state STATE. Write to PEMPTY + true when INSN does not change the processor state. */ static int -estimate_insn_cost (rtx insn, state_t state) +estimate_insn_cost (rtx insn, state_t state, bool *pempty) { static state_t temp = NULL;