From patchwork Tue Aug 11 13:22:47 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Bergner X-Patchwork-Id: 1343323 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=gcc.gnu.org (client-ip=8.43.85.97; helo=sourceware.org; envelope-from=gcc-patches-bounces@gcc.gnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=gcc.gnu.org Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=gcc.gnu.org header.i=@gcc.gnu.org header.a=rsa-sha256 header.s=default header.b=rspG3YQa; dkim-atps=neutral Received: from sourceware.org (server2.sourceware.org [8.43.85.97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4BQtnN4sDnz9sR4 for ; Tue, 11 Aug 2020 23:23:19 +1000 (AEST) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 3ECB73857C72; Tue, 11 Aug 2020 13:23:15 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 3ECB73857C72 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1597152195; bh=MdXrJKdVpLP1+MHC8rD8Aber02cXXWF4l8ouQQuDTNU=; h=To:Subject:Date:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:Cc:From; b=rspG3YQa0CsS9batxCtYYHBAA953V852u9DuCqczHsOl6QaVt4MGnqGIUmFxWAPyg Y7BPE8iwOGL42F9exgkggWzYik0SoC3wske6h94JJ/89P+jQAwuzuSaAZoXsQ81Jgs v5/OrJs11zf9gi/S6DVv1OsLVHqRByhrHF1AUVIU= X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from mx0a-001b2d01.pphosted.com (mx0a-001b2d01.pphosted.com [148.163.156.1]) by sourceware.org (Postfix) with ESMTPS id 068D53857C70 for ; Tue, 11 Aug 2020 13:22:53 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 068D53857C70 Received: from pps.filterd (m0098404.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.16.0.42/8.16.0.42) with SMTP id 07BD2L5q100859; Tue, 11 Aug 2020 09:22:52 -0400 Received: from pps.reinject (localhost [127.0.0.1]) by mx0a-001b2d01.pphosted.com with ESMTP id 32usu5c4g4-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 11 Aug 2020 09:22:51 -0400 Received: from m0098404.ppops.net (m0098404.ppops.net [127.0.0.1]) by pps.reinject (8.16.0.36/8.16.0.36) with SMTP id 07BD2aBN102347; Tue, 11 Aug 2020 09:22:51 -0400 Received: from ppma02wdc.us.ibm.com (aa.5b.37a9.ip4.static.sl-reverse.com [169.55.91.170]) by mx0a-001b2d01.pphosted.com with ESMTP id 32usu5c4fn-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 11 Aug 2020 09:22:51 -0400 Received: from pps.filterd (ppma02wdc.us.ibm.com [127.0.0.1]) by ppma02wdc.us.ibm.com (8.16.0.42/8.16.0.42) with SMTP id 07BDFtwi025092; Tue, 11 Aug 2020 13:22:50 GMT Received: from b03cxnp08026.gho.boulder.ibm.com (b03cxnp08026.gho.boulder.ibm.com [9.17.130.18]) by ppma02wdc.us.ibm.com with ESMTP id 32skp91pjr-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 11 Aug 2020 13:22:50 +0000 Received: from b03ledav004.gho.boulder.ibm.com (b03ledav004.gho.boulder.ibm.com [9.17.130.235]) by b03cxnp08026.gho.boulder.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 07BDMjqG19005752 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 11 Aug 2020 13:22:45 GMT Received: from b03ledav004.gho.boulder.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id DBBB37806D; Tue, 11 Aug 2020 13:22:48 +0000 (GMT) Received: from b03ledav004.gho.boulder.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id EBD2978069; Tue, 11 Aug 2020 13:22:47 +0000 (GMT) Received: from [9.65.195.179] (unknown [9.65.195.179]) by b03ledav004.gho.boulder.ibm.com (Postfix) with ESMTP; Tue, 11 Aug 2020 13:22:47 +0000 (GMT) To: Segher Boessenkool , David Edelsohn Subject: [PATCH] rs6000: Update powerpc test cases to use -mdejagnu-cpu=. Message-ID: <57caaf8c-f739-301c-bae5-9b01ce1dd02c@linux.ibm.com> Date: Tue, 11 Aug 2020 08:22:47 -0500 User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.14; rv:68.0) Gecko/20100101 Thunderbird/68.11.0 MIME-Version: 1.0 Content-Language: en-US X-TM-AS-GCONF: 00 X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:6.0.235, 18.0.687 definitions=2020-08-11_13:2020-08-11, 2020-08-11 signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 lowpriorityscore=0 bulkscore=0 mlxscore=0 adultscore=0 clxscore=1015 malwarescore=0 phishscore=0 priorityscore=1501 impostorscore=0 suspectscore=0 mlxlogscore=999 spamscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2006250000 definitions=main-2008110087 X-Spam-Status: No, score=-9.1 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_EF, GIT_PATCH_0, RCVD_IN_DNSWL_LOW, RCVD_IN_MSPIKE_H2, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on server2.sourceware.org X-BeenThere: gcc-patches@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Peter Bergner via Gcc-patches From: Peter Bergner Reply-To: Peter Bergner Cc: GCC Patches Errors-To: gcc-patches-bounces@gcc.gnu.org Sender: "Gcc-patches" I was looking through some POWER10 test cases and noticed that we used -mcpu=power10 rather than the preferred -mdejagnu-cpu=power10. I went looking for more tests that were not converted over and came up with the following patch. Ok for trunk? Peter gcc/testsuite/ * g++.dg/ext/spe1.C (dg-options): Use -mdejagnu-cpu=. * gcc.target/powerpc/pr93122.c: Likewise. * gcc.target/powerpc/vsx_mask-count-runnable.c: Likewise. * gcc.target/powerpc/vsx_mask-expand-runnable.c: Likewise. * gcc.target/powerpc/vsx_mask-extract-runnable.c: Likewise. * gcc.target/powerpc/vsx_mask-move-runnable.c: Likewise. * gfortran.dg/pr47614.f (dg-options): Likewise. * gfortran.dg/pr58968.f: Likewise. * gfortran.dg/nint_p7.f90: Likewise. Remove unneeded dg-skip-if. * g++.dg/pr65240-1.C: Likewise. * g++.dg/pr65240-2.C: Likewise. * g++.dg/pr65240-3.C: Likewise. * g++.dg/pr65240-4.C: Likewise. * g++.dg/pr65242.C: Likewise. * g++.dg/pr67211.C: Likewise. * g++.dg/pr69667.C: Likewise. * g++.dg/pr71294.C: Likewise. * g++.dg/pr84279.C: Likewise. * g++.dg/torture/ppc-ldst-array.C: Likewise. * g++.dg/torture/pr69264.C (dg-additional-options): Use -mdejagnu-cpu=. * gcc.dg/pr84032.c: Likewise. * gcc.dg/torture/pr90972.c: Likewise. * gcc.dg/vect/O3-pr70130.c: Likewise. * gfortran.dg/vect/pr45714-b.f: Likewise. * gcc.dg/vect/pr48765.c: Likewise. Remove unneeded dg-skip-if. diff --git a/gcc/testsuite/g++.dg/ext/spe1.C b/gcc/testsuite/g++.dg/ext/spe1.C index b98d4b27b3d..a2b0224f09e 100644 --- a/gcc/testsuite/g++.dg/ext/spe1.C +++ b/gcc/testsuite/g++.dg/ext/spe1.C @@ -1,5 +1,5 @@ /* { dg-do compile } */ -/* { dg-options "-mcpu=8540 -mspe -mabi=spe -mfloat-gprs=single -O0" } */ +/* { dg-options "-mdejagnu-cpu=8540 -mspe -mabi=spe -mfloat-gprs=single -O0" } */ /* { dg-skip-if "not an SPE target" { ! powerpc_spe_nocache } } */ typedef int v2si __attribute__ ((vector_size (8))); diff --git a/gcc/testsuite/gcc.target/powerpc/pr93122.c b/gcc/testsuite/gcc.target/powerpc/pr93122.c index 8ea4eb6a48b..97bcb0cea5f 100644 --- a/gcc/testsuite/gcc.target/powerpc/pr93122.c +++ b/gcc/testsuite/gcc.target/powerpc/pr93122.c @@ -1,7 +1,7 @@ /* PR target/93122 */ /* { dg-require-effective-target power10_ok } */ /* { dg-do compile { target lp64 } } */ -/* { dg-options "-fstack-clash-protection -mprefixed -mcpu=power10" } */ +/* { dg-options "-fstack-clash-protection -mprefixed -mdejagnu-cpu=power10" } */ void bar (char *); diff --git a/gcc/testsuite/gcc.target/powerpc/vsx_mask-count-runnable.c b/gcc/testsuite/gcc.target/powerpc/vsx_mask-count-runnable.c index f1e3860ee43..ca7e11ba83f 100644 --- a/gcc/testsuite/gcc.target/powerpc/vsx_mask-count-runnable.c +++ b/gcc/testsuite/gcc.target/powerpc/vsx_mask-count-runnable.c @@ -1,5 +1,5 @@ /* { dg-do run } */ -/* { dg-options "-mcpu=power10 -O2" } */ +/* { dg-options "-mdejagnu-cpu=power10 -O2" } */ /* { dg-require-effective-target power10_hw } */ /* Check that the expected 128-bit instructions are generated if the processor diff --git a/gcc/testsuite/gcc.target/powerpc/vsx_mask-expand-runnable.c b/gcc/testsuite/gcc.target/powerpc/vsx_mask-expand-runnable.c index 0c5695e4807..f61f62a3c24 100644 --- a/gcc/testsuite/gcc.target/powerpc/vsx_mask-expand-runnable.c +++ b/gcc/testsuite/gcc.target/powerpc/vsx_mask-expand-runnable.c @@ -1,5 +1,5 @@ /* { dg-do run } */ -/* { dg-options "-mcpu=power10 -O2" } */ +/* { dg-options "-mdejagnu-cpu=power10 -O2" } */ /* { dg-require-effective-target power10_hw } */ /* Check that the expected 128-bit instructions are generated if the processor diff --git a/gcc/testsuite/gcc.target/powerpc/vsx_mask-extract-runnable.c b/gcc/testsuite/gcc.target/powerpc/vsx_mask-extract-runnable.c index 93c3c720246..63ab59005ad 100644 --- a/gcc/testsuite/gcc.target/powerpc/vsx_mask-extract-runnable.c +++ b/gcc/testsuite/gcc.target/powerpc/vsx_mask-extract-runnable.c @@ -1,5 +1,5 @@ /* { dg-do run } */ -/* { dg-options "-mcpu=power10 -O2" } */ +/* { dg-options "-mdejagnu-cpu=power10 -O2" } */ /* { dg-require-effective-target power10_hw } */ /* Check that the expected 128-bit instructions are generated if the processor diff --git a/gcc/testsuite/gcc.target/powerpc/vsx_mask-move-runnable.c b/gcc/testsuite/gcc.target/powerpc/vsx_mask-move-runnable.c index 41dee583e59..ed08172bca6 100644 --- a/gcc/testsuite/gcc.target/powerpc/vsx_mask-move-runnable.c +++ b/gcc/testsuite/gcc.target/powerpc/vsx_mask-move-runnable.c @@ -1,5 +1,5 @@ /* { dg-do run } */ -/* { dg-options "-mcpu=power10 -O2" } */ +/* { dg-options "-mdejagnu-cpu=power10 -O2" } */ /* { dg-require-effective-target power10_hw } */ /* Check that the expected 128-bit instructions are generated if the processor diff --git a/gcc/testsuite/g++.dg/pr65240-1.C b/gcc/testsuite/g++.dg/pr65240-1.C index d2e25b65fca..ff8910df6a1 100644 --- a/gcc/testsuite/g++.dg/pr65240-1.C +++ b/gcc/testsuite/g++.dg/pr65240-1.C @@ -1,8 +1,7 @@ /* { dg-do compile { target { powerpc*-*-* && lp64 } } } */ /* { dg-skip-if "" { powerpc*-*-darwin* } } */ /* { dg-require-effective-target powerpc_p8vector_ok } */ -/* { dg-skip-if "do not override -mcpu" { powerpc*-*-* } { "-mcpu=*" } { "-mcpu=power8" } } */ -/* { dg-options "-mcpu=power8 -O3 -ffast-math -mcmodel=small -mno-fp-in-toc -Wno-return-type" } */ +/* { dg-options "-mdejagnu-cpu=power8 -O3 -ffast-math -mcmodel=small -mno-fp-in-toc -Wno-return-type" } */ /* target/65240, compiler got a 'insn does not satisfy its constraints' error. */ diff --git a/gcc/testsuite/g++.dg/pr65240-2.C b/gcc/testsuite/g++.dg/pr65240-2.C index 38d5020bd19..bdb7a62d73d 100644 --- a/gcc/testsuite/g++.dg/pr65240-2.C +++ b/gcc/testsuite/g++.dg/pr65240-2.C @@ -1,8 +1,7 @@ /* { dg-do compile { target { powerpc*-*-* && lp64 } } } */ /* { dg-skip-if "" { powerpc*-*-darwin* } } */ /* { dg-require-effective-target powerpc_p8vector_ok } */ -/* { dg-skip-if "do not override -mcpu" { powerpc*-*-* } { "-mcpu=*" } { "-mcpu=power8" } } */ -/* { dg-options "-mcpu=power8 -O3 -ffast-math -mcmodel=small -mfp-in-toc -Wno-return-type" } */ +/* { dg-options "-mdejagnu-cpu=power8 -O3 -ffast-math -mcmodel=small -mfp-in-toc -Wno-return-type" } */ /* target/65240, compiler got a 'insn does not satisfy its constraints' error. */ diff --git a/gcc/testsuite/g++.dg/pr65240-3.C b/gcc/testsuite/g++.dg/pr65240-3.C index e8463c91494..f37db9025d1 100644 --- a/gcc/testsuite/g++.dg/pr65240-3.C +++ b/gcc/testsuite/g++.dg/pr65240-3.C @@ -1,8 +1,7 @@ /* { dg-do compile { target { powerpc*-*-* && lp64 } } } */ /* { dg-skip-if "" { powerpc*-*-darwin* } } */ /* { dg-require-effective-target powerpc_p8vector_ok } */ -/* { dg-skip-if "do not override -mcpu" { powerpc*-*-* } { "-mcpu=*" } { "-mcpu=power8" } } */ -/* { dg-options "-mcpu=power8 -O3 -ffast-math -mcmodel=medium -Wno-return-type" } */ +/* { dg-options "-mdejagnu-cpu=power8 -O3 -ffast-math -mcmodel=medium -Wno-return-type" } */ /* target/65240, compiler got a 'insn does not satisfy its constraints' error. */ diff --git a/gcc/testsuite/g++.dg/pr65240-4.C b/gcc/testsuite/g++.dg/pr65240-4.C index a119752d18e..efb6a6c06e7 100644 --- a/gcc/testsuite/g++.dg/pr65240-4.C +++ b/gcc/testsuite/g++.dg/pr65240-4.C @@ -1,8 +1,7 @@ /* { dg-do compile { target { powerpc*-*-* && lp64 } } } */ /* { dg-skip-if "" { powerpc*-*-darwin* } } */ /* { dg-require-effective-target powerpc_vsx_ok } */ -/* { dg-skip-if "do not override -mcpu" { powerpc*-*-* } { "-mcpu=*" } { "-mcpu=power7" } } */ -/* { dg-options "-mcpu=power7 -O3 -ffast-math -Wno-return-type" } */ +/* { dg-options "-mdejagnu-cpu=power7 -O3 -ffast-math -Wno-return-type" } */ /* target/65240, compiler got a 'insn does not satisfy its constraints' error. */ diff --git a/gcc/testsuite/g++.dg/pr65242.C b/gcc/testsuite/g++.dg/pr65242.C index be2ddaa85b2..662f375015f 100644 --- a/gcc/testsuite/g++.dg/pr65242.C +++ b/gcc/testsuite/g++.dg/pr65242.C @@ -1,8 +1,7 @@ /* { dg-do compile { target { powerpc*-*-* && lp64 } } } */ /* { dg-skip-if "" { powerpc*-*-darwin* } } */ /* { dg-require-effective-target powerpc_p8vector_ok } */ -/* { dg-skip-if "do not override -mcpu" { powerpc*-*-* } { "-mcpu=*" } { "-mcpu=power8" } } */ -/* { dg-options "-mcpu=power8 -O3" } */ +/* { dg-options "-mdejagnu-cpu=power8 -O3" } */ class A { public: diff --git a/gcc/testsuite/g++.dg/pr67211.C b/gcc/testsuite/g++.dg/pr67211.C index cb3d342c122..c3d7f710188 100644 --- a/gcc/testsuite/g++.dg/pr67211.C +++ b/gcc/testsuite/g++.dg/pr67211.C @@ -1,8 +1,7 @@ /* { dg-do compile { target { powerpc*-*-* && lp64 } } } */ /* { dg-skip-if "" { powerpc*-*-darwin* } } */ /* { dg-require-effective-target powerpc_p8vector_ok } */ -/* { dg-skip-if "do not override -mcpu" { powerpc*-*-* } { "-mcpu=*" } { "-mcpu=power7" } } */ -/* { dg-options "-mcpu=power7 -mtune=power8 -O3 -w" } */ +/* { dg-options "-mdejagnu-cpu=power7 -mtune=power8 -O3 -w" } */ /* target/67211, compiler got a 'insn does not satisfy its constraints' error. */ diff --git a/gcc/testsuite/g++.dg/pr69667.C b/gcc/testsuite/g++.dg/pr69667.C index 76f7cb3d40b..422116dd599 100644 --- a/gcc/testsuite/g++.dg/pr69667.C +++ b/gcc/testsuite/g++.dg/pr69667.C @@ -1,8 +1,7 @@ /* { dg-do compile { target { powerpc*-*-* && lp64 } } } */ /* { dg-skip-if "" { powerpc*-*-darwin* } } */ /* { dg-require-effective-target powerpc_p8vector_ok } */ -/* { dg-skip-if "do not override -mcpu" { powerpc*-*-* } { "-mcpu=*" } { "-mcpu=power7" } } */ -/* { dg-options "-mcpu=power8 -w -std=c++14" } */ +/* { dg-options "-mdejagnu-cpu=power8 -w -std=c++14" } */ /* target/69667, compiler got internal compiler error: Max. number of generated reload insns per insn is achieved (90) */ diff --git a/gcc/testsuite/g++.dg/pr71294.C b/gcc/testsuite/g++.dg/pr71294.C index 67675dd7e30..716fa0d44b2 100644 --- a/gcc/testsuite/g++.dg/pr71294.C +++ b/gcc/testsuite/g++.dg/pr71294.C @@ -1,7 +1,6 @@ // { dg-do compile { target { powerpc64*-*-* && lp64 } } } // { dg-require-effective-target powerpc_p8vector_ok } */ -// { dg-skip-if "do not override -mcpu" { powerpc*-*-* } { "-mcpu=*" } { "-mcpu=power8" } } -// { dg-options "-mcpu=power8 -O3 -fstack-protector" } +// { dg-options "-mdejagnu-cpu=power8 -O3 -fstack-protector" } // PAR target/71294 failed because RELOAD could not figure how create a V2DI // vector that auto vectorization created with each element being the same diff --git a/gcc/testsuite/g++.dg/pr84279.C b/gcc/testsuite/g++.dg/pr84279.C index a88d3fb8470..43a4f30b69e 100644 --- a/gcc/testsuite/g++.dg/pr84279.C +++ b/gcc/testsuite/g++.dg/pr84279.C @@ -1,8 +1,7 @@ /* { dg-do compile { target { powerpc*-*-* } } } */ /* { dg-skip-if "" { powerpc*-*-darwin* } } */ /* { dg-require-effective-target powerpc_p8vector_ok } */ -/* { dg-skip-if "do not override -mcpu" { powerpc*-*-* } { "-mcpu=*" } { "-mcpu=power8" } } */ -/* { dg-options "-O3 -mcpu=power8 -g -fPIC -fvisibility=hidden -fstack-protector-strong" } */ +/* { dg-options "-O3 -mdejagnu-cpu=power8 -g -fPIC -fvisibility=hidden -fstack-protector-strong" } */ template struct E { T e; }; struct J { diff --git a/gcc/testsuite/g++.dg/torture/ppc-ldst-array.C b/gcc/testsuite/g++.dg/torture/ppc-ldst-array.C index 75862e2b5be..fef69e7cf09 100644 --- a/gcc/testsuite/g++.dg/torture/ppc-ldst-array.C +++ b/gcc/testsuite/g++.dg/torture/ppc-ldst-array.C @@ -1,6 +1,5 @@ /* { dg-do compile { target { powerpc64*-*-* } } } */ -/* { dg-skip-if "do not override mcpu" { powerpc*-*-* } { "-mcpu=*" } { "-mcpu=power8" } } */ -/* { dg-options "-mcpu=power8" } */ +/* { dg-options "-mdejagnu-cpu=power8" } */ /* When compiled with C++, this code was breaking because of different tree representations of arrays between C and C++. */ diff --git a/gcc/testsuite/g++.dg/torture/pr69264.C b/gcc/testsuite/g++.dg/torture/pr69264.C index a531bfc9b8c..4d408cc72af 100644 --- a/gcc/testsuite/g++.dg/torture/pr69264.C +++ b/gcc/testsuite/g++.dg/torture/pr69264.C @@ -1,6 +1,6 @@ // { dg-do compile } // { dg-additional-options "-Wno-return-type" } -// { dg-additional-options "-mcpu=970 -maltivec" { target powerpc*-*-* } } +// { dg-additional-options "-mdejagnu-cpu=970 -maltivec" { target powerpc*-*-* } } typedef union { long int asBits; diff --git a/gcc/testsuite/gcc.dg/pr84032.c b/gcc/testsuite/gcc.dg/pr84032.c index c295d9a0dae..2e2dad12471 100644 --- a/gcc/testsuite/gcc.dg/pr84032.c +++ b/gcc/testsuite/gcc.dg/pr84032.c @@ -1,7 +1,7 @@ /* PR rtl-optimization/84032 */ /* { dg-do compile } */ /* { dg-options "-O1 -fmodulo-sched" } */ -/* { dg-additional-options "-mcpu=power6" { target { powerpc-*-* } } } */ +/* { dg-additional-options "-mdejagnu-cpu=power6" { target { powerpc-*-* } } } */ void yr (int cm) diff --git a/gcc/testsuite/gcc.dg/torture/pr90972.c b/gcc/testsuite/gcc.dg/torture/pr90972.c index b18ccbd540e..b909f470b27 100644 --- a/gcc/testsuite/gcc.dg/torture/pr90972.c +++ b/gcc/testsuite/gcc.dg/torture/pr90972.c @@ -1,5 +1,5 @@ /* { dg-do compile } */ -/* { dg-additional-options "-mcpu=power8" { target powerpc*-*-* } } */ +/* { dg-additional-options "-mdejagnu-cpu=power8" { target powerpc*-*-* } } */ /* { dg-additional-options "-w" { target avr-*-* } } */ long f; diff --git a/gcc/testsuite/gcc.dg/vect/O3-pr70130.c b/gcc/testsuite/gcc.dg/vect/O3-pr70130.c index f8b84405140..e16b68023a6 100644 --- a/gcc/testsuite/gcc.dg/vect/O3-pr70130.c +++ b/gcc/testsuite/gcc.dg/vect/O3-pr70130.c @@ -1,5 +1,5 @@ /* { dg-require-effective-target vsx_hw { target powerpc*-*-* } } */ -/* { dg-additional-options "-mcpu=power7 -mno-power9-vector -mno-power8-vector" { target powerpc*-*-* } } */ +/* { dg-additional-options "-mdejagnu-cpu=power7 -mno-power9-vector -mno-power8-vector" { target powerpc*-*-* } } */ #include "tree-vect.h" diff --git a/gcc/testsuite/gfortran.dg/vect/pr45714-b.f b/gcc/testsuite/gfortran.dg/vect/pr45714-b.f index abf33cd25b8..07dc34f2a79 100644 --- a/gcc/testsuite/gfortran.dg/vect/pr45714-b.f +++ b/gcc/testsuite/gfortran.dg/vect/pr45714-b.f @@ -1,5 +1,5 @@ ! { dg-do compile { target powerpc*-*-* } } -! { dg-additional-options "-O3 -mcpu=power7 -mno-power9-vector -mno-power8-vector -ffast-math -mveclibabi=mass" } +! { dg-additional-options "-O3 -mdejagnu-cpu=power7 -mno-power9-vector -mno-power8-vector -ffast-math -mveclibabi=mass" } integer index(18),i,j,k,l,ipiv(18),info,ichange,neq,lda,ldb, & nrhs,iplas diff --git a/gcc/testsuite/gcc.dg/vect/pr48765.c b/gcc/testsuite/gcc.dg/vect/pr48765.c index b091a145d0f..22f62b0cd0c 100644 --- a/gcc/testsuite/gcc.dg/vect/pr48765.c +++ b/gcc/testsuite/gcc.dg/vect/pr48765.c @@ -1,6 +1,5 @@ /* { dg-do compile { target { powerpc*-*-* } } } */ -/* { dg-skip-if "do not override -mcpu" { *-*-* } { "-mcpu=*" } { "-mcpu=power6" } } */ -/* { dg-additional-options "-O3 -mcpu=power6 -mno-power9-vector -mno-power8-vector -mno-vsx" } */ +/* { dg-additional-options "-O3 -mdejagnu-cpu=power6 -mno-power9-vector -mno-power8-vector -mno-vsx" } */ enum reg_class { diff --git a/gcc/testsuite/gfortran.dg/pr47614.f b/gcc/testsuite/gfortran.dg/pr47614.f index 500d210a2a4..e69551aed98 100644 --- a/gcc/testsuite/gfortran.dg/pr47614.f +++ b/gcc/testsuite/gfortran.dg/pr47614.f @@ -1,6 +1,6 @@ ! { dg-do run { target { powerpc*-*-* } } } ! { dg-skip-if "" { powerpc*-*-darwin* } } -! { dg-options "-O3 -funroll-loops -ffast-math -mcpu=power4" } +! { dg-options "-O3 -funroll-loops -ffast-math -mdejagnu-cpu=power4" } SUBROUTINE SFCPAR(ZET,NZ,ZMH,TSL,TMES) diff --git a/gcc/testsuite/gfortran.dg/pr58968.f b/gcc/testsuite/gfortran.dg/pr58968.f index b6ea17f4ae2..a7f1e1e710b 100644 --- a/gcc/testsuite/gfortran.dg/pr58968.f +++ b/gcc/testsuite/gfortran.dg/pr58968.f @@ -1,6 +1,6 @@ C PR rtl-optimization/58968.f C { dg-do compile { target powerpc*-*-* } } -C { dg-options "-mcpu=power7 -O3 -w -ffast-math -funroll-loops" } +C { dg-options "-mdejagnu-cpu=power7 -O3 -w -ffast-math -funroll-loops" } SUBROUTINE MAKTABS(IW,SOME,LBOX1,LBOX2,LBOX3,NSPACE,NA,NB, * LBST,X, * NX,IAMA,IAMI,IBMA,IBMI,MNUM,IDIM,MSTA,IBO, diff --git a/gcc/testsuite/gfortran.dg/nint_p7.f90 b/gcc/testsuite/gfortran.dg/nint_p7.f90 index 8f3552293c5..2239824a7fb 100644 --- a/gcc/testsuite/gfortran.dg/nint_p7.f90 +++ b/gcc/testsuite/gfortran.dg/nint_p7.f90 @@ -1,8 +1,7 @@ ! Fortran ! { dg-do compile { target { powerpc*-*-* } } } ! { dg-require-effective-target powerpc_vsx_ok } -! { dg-skip-if "do not override -mcpu" { powerpc*-*-* } { "-mcpu=*" } { "-mcpu=power7" } } -! { dg-options "-O2 -mcpu=power7 -ffast-math" } +! { dg-options "-O2 -mdejagnu-cpu=power7 -ffast-math" } ! { dg-final { scan-assembler-times "xsrdpi" 2 } } subroutine test_nint(x4,x8)