From patchwork Wed Sep 2 13:55:00 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Bennett X-Patchwork-Id: 513522 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]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 99D51140285 for ; Wed, 2 Sep 2015 23:55:17 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=gcc.gnu.org header.i=@gcc.gnu.org header.b=WRFE/4gz; dkim-atps=neutral DomainKey-Signature: a=rsa-sha1; c=nofws; d=gcc.gnu.org; h=list-id :list-unsubscribe:list-archive:list-post:list-help:sender:from :to:cc:subject:date:message-id:references:in-reply-to :content-type:content-transfer-encoding:mime-version; q=dns; s= default; b=EcPV8l+VcZBgVQIpiyp397JgF1qTXHTyn1keIiRJ+DqOf0IM4HKcI xU9yJcGPvTlUpNzTF8TGyLeeBKo28re0iPkFB0D9fHd92eIWXWzZ8PiCfrQCIbFU WvrVS3oA7Cm/XdQGdcVqI59ObtjTv7ATlkmgcZK5XNVtTPGKiy5w6c= DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=gcc.gnu.org; h=list-id :list-unsubscribe:list-archive:list-post:list-help:sender:from :to:cc:subject:date:message-id:references:in-reply-to :content-type:content-transfer-encoding:mime-version; s=default; bh=iaTv9WQ5KCmadh4WnCm/XzxIOpM=; b=WRFE/4gz5r1h1NdaohmE2jGW4rmQ GhQzzRIDTvvaSsP4WL3wrXpnqq/YyrDISPHvXb60EsXFiGuRKWNDlPG0ZpTmo3gf ekgjJjflwoyI9ADGz3T8fnRLgWUVKKedM18sih8EqnJLHQfX5/cM0xoUTJ4znWD8 AegJrAnCkVD/DpA= Received: (qmail 98878 invoked by alias); 2 Sep 2015 13:55:10 -0000 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 Received: (qmail 98861 invoked by uid 89); 2 Sep 2015 13:55:10 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-2.2 required=5.0 tests=AWL, BAYES_00, RCVD_IN_DNSWL_LOW, SPF_PASS, T_RP_MATCHES_RCVD autolearn=ham version=3.3.2 X-HELO: mailapp01.imgtec.com Received: from mailapp01.imgtec.com (HELO mailapp01.imgtec.com) (195.59.15.196) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Wed, 02 Sep 2015 13:55:04 +0000 Received: from KLMAIL01.kl.imgtec.org (unknown [192.168.5.35]) by Websense Email Security Gateway with ESMTPS id 70C52EDEB782A; Wed, 2 Sep 2015 14:54:58 +0100 (IST) Received: from LEMAIL01.le.imgtec.org (192.168.152.62) by KLMAIL01.kl.imgtec.org (192.168.5.35) with Microsoft SMTP Server (TLS) id 14.3.195.1; Wed, 2 Sep 2015 14:55:01 +0100 Received: from LEMAIL01.le.imgtec.org ([fe80::5ae:ee16:f4b9:cda9]) by LEMAIL01.le.imgtec.org ([fe80::5ae:ee16:f4b9:cda9%17]) with mapi id 14.03.0210.002; Wed, 2 Sep 2015 14:55:01 +0100 From: Andrew Bennett To: Matthew Fortune , "gcc-patches@gcc.gnu.org" CC: "Moore, Catherine (Catherine_Moore@mentor.com)" Subject: RE: [PATCH] MIPS: Prevent the p5600-bonding.c test from being run for the n32 and 64 ABIs Date: Wed, 2 Sep 2015 13:55:00 +0000 Message-ID: <0DA23CC379F5F945ACB41CF394B98277211175A0@LEMAIL01.le.imgtec.org> References: <0DA23CC379F5F945ACB41CF394B98277210FA58F@LEMAIL01.le.imgtec.org> <6D39441BF12EF246A7ABCE6654B02353211F0E22@LEMAIL01.le.imgtec.org> In-Reply-To: <6D39441BF12EF246A7ABCE6654B02353211F0E22@LEMAIL01.le.imgtec.org> MIME-Version: 1.0 X-IsSubscribed: yes > > diff --git a/gcc/testsuite/gcc.target/mips/p5600-bonding.c > > b/gcc/testsuite/gcc.target/mips/p5600-bonding.c > > index 0890ffa..20c26ca 100644 > > --- a/gcc/testsuite/gcc.target/mips/p5600-bonding.c > > +++ b/gcc/testsuite/gcc.target/mips/p5600-bonding.c > > @@ -1,6 +1,7 @@ > > /* { dg-do compile } */ > > /* { dg-options "-dp -mtune=p5600 -mno-micromips -mno-mips16" } */ > > /* { dg-skip-if "Bonding needs peephole optimization." { *-*-* } { "-O0" "- > O1" } { "" } } > > */ > > +/* { dg-skip-if "There is no DI mode support for load/store bonding" { *-*- > * } { "- > > mabi=n32" "-mabi=64" } { "" } } */ > > typedef int VINT32 __attribute__ ((vector_size((16)))); > > If the best fix we can do for this test is to limit what it tests then we > should still not just skip it. There is some precedence for tests that > require a specific arch with the isa=loongson special case. I'd rather > just lock the test down to p5600 as per the filename. I have changed the testcase's dg-options so that it is only built for p5600. The updated patch and ChangeLog are below. Ok to commit? Many thanks, Andrew testsuite/ * gcc.target/mips/p5600-bonding.c (dg-options): Force the test to be always built for p5600. * gcc.target/mips/mips.exp (mips-dg-options): Add support for the isa=p5600 dg-option. diff --git a/gcc/testsuite/gcc.target/mips/mips.exp b/gcc/testsuite/gcc.target/mips/mips.exp index 42e7fff..e8d1895 100644 --- a/gcc/testsuite/gcc.target/mips/mips.exp +++ b/gcc/testsuite/gcc.target/mips/mips.exp @@ -142,6 +142,9 @@ # isa=loongson # select a Loongson processor # +# isa=p5600 +# select a P5600 processor +# # addressing=absolute # force absolute addresses to be used # @@ -1009,6 +1012,10 @@ proc mips-dg-options { args } { if { ![regexp {^-march=loongson} $arch] } { set arch "-march=loongson2f" } + } elseif { [string equal $spec "isa=p5600"] } { + if { ![regexp {^-march=p5600} $arch] } { + set arch "-march=p5600" + } } else { if { ![regexp {^(isa(?:|_rev))(=|<=|>=)([0-9]*)$} \ $spec dummy prop relation value nocpus] } { diff --git a/gcc/testsuite/gcc.target/mips/p5600-bonding.c b/gcc/testsuite/gcc.target/mips/p5600-bonding.c index 0890ffa..0bc6d91 100644 --- a/gcc/testsuite/gcc.target/mips/p5600-bonding.c +++ b/gcc/testsuite/gcc.target/mips/p5600-bonding.c @@ -1,5 +1,5 @@ /* { dg-do compile } */ -/* { dg-options "-dp -mtune=p5600 -mno-micromips -mno-mips16" } */ +/* { dg-options "-dp isa=p5600 -mtune=p5600 -mno-micromips -mno-mips16" } */ /* { dg-skip-if "Bonding needs peephole optimization." { *-*-* } { "-O0" "-O1" } { "" } } */ typedef int VINT32 __attribute__ ((vector_size((16))));