From patchwork Sun Jan 15 18:31:52 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Sandiford X-Patchwork-Id: 136201 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 65D27B6EEC for ; Mon, 16 Jan 2012 05:32:11 +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=1327257133; h=Comment: DomainKey-Signature:Received: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=/gGoG0y9kjtAinu7iVHsi28nEfk=; b=lH1vWDJmD27nB9L ePVV4TFUysR4OAoYly5Gv9UAyYoDo41p+RZTuRI0Qki9GfvkUdCVbA0QHQDzoWC0 B240iwYek08oBIMKb3olpxF2j+u4H+DN2AbHv6lHH6RzgpoywMT2N00Ru7Ejpjgo togbNb1gHaMv6l7X/9Pqic4YenSA= 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: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=ssNG/6Qc3zbzUyxloDJLukiYds1xz1TYLJTa5BzREvSJaa4WxsNGD2rqPKwFaq 2+PuOp2/Un2qH/+cQkntLvL5qcqC9oKM5NFcFmUn+VVe/ihPUvuaXqKRroeOvv9M zJLDC1Ryw3uQvzCdsrENzlJB+zK4It7xlGt2X+f18AP1Y=; Received: (qmail 23470 invoked by alias); 15 Jan 2012 18:32:09 -0000 Received: (qmail 23461 invoked by uid 22791); 15 Jan 2012 18:32:08 -0000 X-SWARE-Spam-Status: No, hits=-2.3 required=5.0 tests=AWL, BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, FREEMAIL_FROM, RCVD_IN_DNSWL_LOW X-Spam-Check-By: sourceware.org Received: from mail-ww0-f51.google.com (HELO mail-ww0-f51.google.com) (74.125.82.51) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Sun, 15 Jan 2012 18:31:55 +0000 Received: by wgbdq12 with SMTP id dq12so1252207wgb.8 for ; Sun, 15 Jan 2012 10:31:54 -0800 (PST) Received: by 10.180.95.199 with SMTP id dm7mr14691324wib.9.1326652314368; Sun, 15 Jan 2012 10:31:54 -0800 (PST) Received: from localhost (rsandifo.gotadsl.co.uk. [82.133.89.107]) by mx.google.com with ESMTPS id ga4sm19268552wbb.4.2012.01.15.10.31.52 (version=TLSv1/SSLv3 cipher=OTHER); Sun, 15 Jan 2012 10:31:53 -0800 (PST) From: Richard Sandiford To: gcc-patches@gcc.gnu.org Mail-Followup-To: gcc-patches@gcc.gnu.org, rdsandiford@googlemail.com Subject: [committed] Adjust ssa-dom-thread-4.c for MIPS Date: Sun, 15 Jan 2012 18:31:52 +0000 Message-ID: <87k44s95rb.fsf@firetop.home> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/23.2 (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 was failing for MIPS because the mips.h definition: #define LOGICAL_OP_NON_SHORT_CIRCUIT 0 caused "var1 || var2" conditions to be split into two rather than converted into "(var1 != 0) | (var2 != 0)". I don't know whether the MIPS definition still makes sense (probably not for Octeon2 at least) but it's too late to change it for this release. Tested on mips64-linux-gnu and x86_64-linux-gnu. Applied. Richard gcc/testsuite/ * gcc.dg/tree-ssa/ssa-dom-thread-4.c: Expect 4 threaded edges 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 2012-01-15 18:19:31.000000000 +0000 +++ gcc/testsuite/gcc.dg/tree-ssa/ssa-dom-thread-4.c 2012-01-15 18:26:13.000000000 +0000 @@ -58,6 +58,9 @@ bitmap_ior_and_compl (bitmap dst, const_ code we missed the edge when the first conditional is false (b_elt is zero, which means the second conditional is always zero. */ -/* { dg-final { scan-tree-dump-times "Threaded" 3 "dom1"} } */ +/* { dg-final { scan-tree-dump-times "Threaded" 3 "dom1" { target { ! mips*-*-* } } } } */ +/* 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*-*-* } } } */ /* { dg-final { cleanup-tree-dump "dom1" } } */