From patchwork Sun Jan 13 08:45:19 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Sandiford X-Patchwork-Id: 211600 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 0B81B2C00F8 for ; Sun, 13 Jan 2013 19:45:41 +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=1358671542; h=Comment: DomainKey-Signature:Received:Received:Received:Received:Received: From:To:Mail-Followup-To:Subject:Date:Message-ID:User-Agent: MIME-Version:Content-Type:Mailing-List:Precedence:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:Sender: Delivered-To; bh=pfuNhN0UKa1oLcKWmDMeKVW+T/A=; b=SBTZs25i6wvB3pE EwAlkPPzz5JTLghKebEJUzb+WHqBhNQEpXAWSV3LQMd/8Ez7/vGRigqTMA0/3COw FyX+qFLVeEbjcPCmbGUBjfEn3LqOsp0L8UyvnmmVFMVst0WHIZHSLPiuu2otLuYI QCCu81tidspmFnHZJatpjGnIig+8= 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:X-Received:Received:From:To:Mail-Followup-To:Subject:Date:Message-ID:User-Agent:MIME-Version:Content-Type:Mailing-List:Precedence:List-Id:List-Unsubscribe:List-Archive:List-Post:List-Help:Sender:Delivered-To; b=ClezJvNO+3SmzdNMXI4WRVYSYQkWlh5gzsWSleaKzGAzAm8kb7D5o38zOnYttQ /pgDU3MAzY5Jwf9cgKWaTFGDY//jm00Pvrtb94/SrwS16ylXm6IWLosnqKaKSKxX WkI6sOpIPSR4Dgmko2h3SMf/5L4Np4Ri8+PnOQmDrzW6g=; Received: (qmail 23165 invoked by alias); 13 Jan 2013 08:45:35 -0000 Received: (qmail 23090 invoked by uid 22791); 13 Jan 2013 08:45:34 -0000 X-SWARE-Spam-Status: No, hits=-3.6 required=5.0 tests=AWL, BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, DKIM_VALID, FREEMAIL_FROM, KHOP_RCVD_TRUST, NML_ADSP_CUSTOM_MED, RCVD_IN_DNSWL_LOW, RCVD_IN_HOSTKARMA_YE X-Spam-Check-By: sourceware.org Received: from mail-wg0-f51.google.com (HELO mail-wg0-f51.google.com) (74.125.82.51) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Sun, 13 Jan 2013 08:45:23 +0000 Received: by mail-wg0-f51.google.com with SMTP id gg4so1478492wgb.6 for ; Sun, 13 Jan 2013 00:45:22 -0800 (PST) X-Received: by 10.194.23.37 with SMTP id j5mr128989827wjf.28.1358066722369; Sun, 13 Jan 2013 00:45:22 -0800 (PST) Received: from localhost ([2.26.203.77]) by mx.google.com with ESMTPS id bw9sm7061745wib.5.2013.01.13.00.45.20 (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Sun, 13 Jan 2013 00:45:21 -0800 (PST) From: Richard Sandiford To: gcc-patches@gcc.gnu.org Mail-Followup-To: gcc-patches@gcc.gnu.org, rdsandiford@googlemail.com Subject: [committed] Update ssa-dom-thread-4.c for MIPS Date: Sun, 13 Jan 2013 08:45:19 +0000 Message-ID: <878v7xzd28.fsf@talisman.default> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.1 (gnu/linux) MIME-Version: 1.0 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 ssa-dom-thread-4.c has been failing on MIPS for some time, because we now copy the header of the inner while loop. This patch updates the test accordingly. Maybe at some point I should just admit that it would be better to skip the thing on MIPS, like we do for Cortex-M0. Tested on mips64-linux-gnu and mipsisa64-elf. Applied. Richard gcc/testsuite/ * gcc.dg/tree-ssa/ssa-dom-thread-4.c: Update expected results for MIPS. Index: gcc/testsuite/gcc.dg/tree-ssa/ssa-dom-thread-4.c =================================================================== --- gcc/testsuite/gcc.dg/tree-ssa/ssa-dom-thread-4.c 2013-01-13 08:05:03.428375740 +0000 +++ gcc/testsuite/gcc.dg/tree-ssa/ssa-dom-thread-4.c 2013-01-13 08:43:53.217750773 +0000 @@ -62,8 +62,25 @@ bitmap_ior_and_compl (bitmap dst, const_ /* ARM Cortex-M0 defined LOGICAL_OP_NON_SHORT_CIRCUIT to false, so skip below test. */ /* { dg-final { scan-tree-dump-times "Threaded" 3 "dom1" { target { ! { mips*-*-* || { arm_cortex_m && arm_thumb1 } } } } } } */ -/* MIPS defines LOGICAL_OP_NON_SHORT_CIRCUIT to 0, so we split var1 || var2 - into two conditions, rather than use (var1 != 0) | (var2 != 0). */ -/* { dg-final { scan-tree-dump-times "Threaded" 4 "dom1" { target mips*-*-* } } } */ +/* MIPS defines LOGICAL_OP_NON_SHORT_CIRCUIT to 0, so we split both + "a_elt || b_elt" and "b_elt && kill_elt" into two conditions each, + rather than using "(var1 != 0) op (var2 != 0)". Also, as on other targets, + we duplicate the header of the inner "while" loop. There are then + 6 threading opportunities: + + 1x "!a_elt && b_elt" in the outer "while" loop + -> the start of the inner "while" loop, + skipping the known-true "b_elt" in the first condition. + 1x "!b_elt" in the first condition + -> the outer "while" loop's continuation point, + skipping the known-false "b_elt" in the second condition. + 2x "!kill_elt" in the inner "while" loop + -> the outer "while" loop's continuation point, + skipping the known-false "b_elt && kill_elt" in the second condition + 2x "kill_elt->indx < b_elt->indx" in the first "while" loop + -> "kill_elt->indx == b_elt->indx" in the second condition, + skipping the known-true "b_elt && kill_elt" in the second + condition. */ +/* { dg-final { scan-tree-dump-times "Threaded" 6 "dom1" { target mips*-*-* } } } */ /* { dg-final { cleanup-tree-dump "dom1" } } */