From patchwork Wed Sep 19 02:11:08 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Janis Johnson X-Patchwork-Id: 184904 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 389E32C0085 for ; Wed, 19 Sep 2012 12:11:52 +1000 (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=1348625513; h=Comment: DomainKey-Signature:Received:Received:Received:Received:Received: Received:Message-ID:Date:From:Reply-To: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=1a8ZnRtVAVZKJ5PJeh8fETPm0l8=; b=yKySE7BSrxXThDm A+ORchzR4slaExbZYmn+82kMWYSubdwHu6Kdpb2teCLNfogusHmiLvMZEZR4i8Dz G16hevwe1E4mucZyBgWG6uqUNIY8W+53rc0cgL2jocOcTs4kD9XxmyUTEy51IPBN QT2C9wIm9OVJkKukamdAf60MLmvE= 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:Message-ID:Date:From:Reply-To:User-Agent:MIME-Version:To:Subject:Content-Type:Mailing-List:Precedence:List-Id:List-Unsubscribe:List-Archive:List-Post:List-Help:Sender:Delivered-To; b=afd5WtfQ62cqMifsyw+Fk67eHUOLPyfpIamuQ4lB9yXyRlG4ddjOLTY3dDj03T k48OBTD5rP9iaJekMMBv9TCooLm6bHgvkTPUrKfJYh3gMO0cc840TIx3DJ2OrXRS ZXyFA490ZR19FMGI/iE62/X/qxkQ4sOtn8pJw735CD1ys=; Received: (qmail 4112 invoked by alias); 19 Sep 2012 02:11:42 -0000 Received: (qmail 4076 invoked by uid 22791); 19 Sep 2012 02:11:35 -0000 X-SWARE-Spam-Status: No, hits=-3.8 required=5.0 tests=AWL, BAYES_00, KHOP_RCVD_UNTRUST, RCVD_IN_HOSTKARMA_W, RCVD_IN_HOSTKARMA_WL X-Spam-Check-By: sourceware.org Received: from relay1.mentorg.com (HELO relay1.mentorg.com) (192.94.38.131) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Wed, 19 Sep 2012 02:11:22 +0000 Received: from svr-orw-fem-01.mgc.mentorg.com ([147.34.98.93]) by relay1.mentorg.com with esmtp id 1TE9l2-0003QP-G2 from Janis_Johnson@mentor.com for gcc-patches@gcc.gnu.org; Tue, 18 Sep 2012 19:11:20 -0700 Received: from SVR-ORW-FEM-04.mgc.mentorg.com ([147.34.97.41]) by svr-orw-fem-01.mgc.mentorg.com over TLS secured channel with Microsoft SMTPSVC(6.0.3790.4675); Tue, 18 Sep 2012 19:11:20 -0700 Received: from [127.0.0.1] (147.34.91.1) by svr-orw-fem-04.mgc.mentorg.com (147.34.97.41) with Microsoft SMTP Server id 14.1.289.1; Tue, 18 Sep 2012 19:11:19 -0700 Message-ID: <505929BC.8090004@mentor.com> Date: Tue, 18 Sep 2012 19:11:08 -0700 From: Janis Johnson Reply-To: User-Agent: Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.9.2.28) Gecko/20120313 Thunderbird/3.1.20 MIME-Version: 1.0 To: "gcc-patches@gcc.gnu.org" Subject: [testsuite] gcc.dg/vect/pr48765: fix option conflict 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 Test gcc.dg/vect/pr48765, run only for powerpc*-*-*, unconditionally adds -mcpu=power6 to the command line. It also adds -m64, although tests should rely on different multilib flags for that and skip the test if not lp64 if the test can only be run with -m64. For all of the Power multilib flags that I normally test, the vect test infrastructure either skips the tests (for E500) or adds "-maltivec -mcpu=970" which conflicts with the "-mcpu=power6" in this test and causes the test to fail to compile. The "-m64" definitely has to go. If the "-mcpu=power6" needs to stay in order to use the flags that triggered the ICE for which the test was added, then the test should be skipped if some other -mcpu option will override it. Another option is to remove that and figure that occasionally someone will run tests for power6. This version keeps "-mcpu=power6" and skips the tests if another -mcpu is already specified. OK for trunk, and for 4.7 when the branch opens? Janis 2012-09-18 Janis Johnson * gcc.dg/vect/pr48765.c: Skip for conflicting options, don't specify -m64. Index: gcc.dg/vect/pr48765.c =================================================================== --- gcc.dg/vect/pr48765.c (revision 386848) +++ gcc.dg/vect/pr48765.c (working copy) @@ -1,5 +1,6 @@ -/* { dg-do compile { target powerpc*-*-* } } */ -/* { dg-options "-m64 -O3 -mcpu=power6" } */ +/* { dg-do compile { target { powerpc*-*-* } } } */ +/* { dg-skip-if "do not override -mcpu" { *-*-* } { "-mcpu=*" } { "-mcpu=power6" } } */ +/* { dg-options "-O3 -mcpu=power6" } */ enum reg_class {