From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by sourceware.org (Postfix) with ESMTP id 7EFFA393827B for ; Mon, 13 Nov 2023 14:27:39 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 7EFFA393827B Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=arm.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=arm.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 7EFFA393827B Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=217.140.110.172 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1699885661; cv=none; b=cXZ9jYuwDpJrQBWD+2XqtFerx0XQRu8YsgmShB9VETUzTwpawXxd71JDffP6YpvJCuDdNZuPR4Xv60HyWoPmFN1TfUlQDswWvjbha+w5wo/LGExVzrtseraCei0lIi49lPS/8HRte5V7hx5epbGKe20Og6ZgYlV6f3+ulwMVBXQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1699885661; c=relaxed/simple; bh=AyGypS9Z7jsV/3WxgkGfl6wFYqOiPFvnZuRD5RSVJmI=; h=From:To:Subject:Date:Message-Id:MIME-Version; b=bLJR2XneMwKIbh174Mbj21HxoM1LejRBBOTST69R8dD82TzoQ9gS/DgMqkmg54uwJ4jt1+lzumBCkbgC4lJPh1RH8grOcOGxRuh+OQovAwfGTnuR2EJJasAqGRe/vOjxhFFD4ibHisltH1EI+jzAPlPGehPu6prDgxeYVkl0igg= ARC-Authentication-Results: i=1; server2.sourceware.org Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id CA29BFEC; Mon, 13 Nov 2023 06:28:24 -0800 (PST) Received: from e126323.arm.com (unknown [10.57.41.187]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 863FF3F7B4; Mon, 13 Nov 2023 06:27:38 -0800 (PST) From: Richard Earnshaw To: gcc-patches@gcc.gnu.org Cc: Richard Earnshaw Subject: [committed 21/22] arm: testsuite: fix some more architecture tests Date: Mon, 13 Nov 2023 14:26:57 +0000 Message-Id: <20231113142658.69039-22-rearnsha@arm.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20231113142658.69039-1-rearnsha@arm.com> References: <20231113142658.69039-1-rearnsha@arm.com> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="------------2.34.1" Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-14.0 required=5.0 tests=BAYES_00,GIT_PATCH_0,KAM_DMARC_NONE,KAM_DMARC_STATUS,KAM_LAZY_DOMAIN_SECURITY,KAM_SHORT,SPF_HELO_NONE,SPF_NONE,TXREP,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org List-Id: This is a multi-part message in MIME format. --------------2.34.1 Content-Type: text/plain; charset=UTF-8; format=fixed Content-Transfer-Encoding: 8bit This fixes a bunch more tests that try to override the default architecture; some partially used the framework for doing this, others just blindly added a -march option, which was doomed to cause problems. In most cases we can now run these tests regardless of the users testing options and the base compiler configuration. gcc/testsuite: * lib/target-supports.exp (check_effective_target_arm_arch_FUNC_ok): Add test for v7a_arm. * gcc.target/arm/pr60650-2.c: Use require-effective-target and add-options. * gcc.target/arm/pr60657.c: Likewise. * gcc.target/arm/pr60663.c: Likewise. * gcc.target/arm/pr81863.c: Likewise. * gcc.target/arm/pr97969.c: Likewise. * gcc.target/arm/pr98931.c: Likewise. * gcc.target/arm/tail-long-call.c: Likewise. --- gcc/testsuite/gcc.target/arm/pr60650-2.c | 4 +++- gcc/testsuite/gcc.target/arm/pr60657.c | 4 +++- gcc/testsuite/gcc.target/arm/pr60663.c | 4 +++- gcc/testsuite/gcc.target/arm/pr81863.c | 4 +++- gcc/testsuite/gcc.target/arm/pr97969.c | 4 +++- gcc/testsuite/gcc.target/arm/pr98931.c | 5 +++-- gcc/testsuite/gcc.target/arm/tail-long-call.c | 6 ++++-- gcc/testsuite/lib/target-supports.exp | 1 + 8 files changed, 23 insertions(+), 9 deletions(-) --------------2.34.1 Content-Type: text/x-patch; name="0021-arm-testsuite-fix-some-more-architecture-tests.patch" Content-Transfer-Encoding: 8bit Content-Disposition: attachment; filename="0021-arm-testsuite-fix-some-more-architecture-tests.patch" diff --git a/gcc/testsuite/gcc.target/arm/pr60650-2.c b/gcc/testsuite/gcc.target/arm/pr60650-2.c index c44d7b5f9d2..36d57f08676 100644 --- a/gcc/testsuite/gcc.target/arm/pr60650-2.c +++ b/gcc/testsuite/gcc.target/arm/pr60650-2.c @@ -1,6 +1,8 @@ /* { dg-do compile } */ +/* { dg-require-effective-target arm_arch_v7a_ok } */ /* { dg-skip-if "-mpure-code supports M-profile only" { *-*-* } { "-mpure-code" } } */ -/* { dg-options "-O2 -fno-omit-frame-pointer -march=armv7-a" } */ +/* { dg-options "-O2 -fno-omit-frame-pointer" } */ +/* { dg-add-options arm_arch_v7a } */ int a, h, j; long long d, e, i; diff --git a/gcc/testsuite/gcc.target/arm/pr60657.c b/gcc/testsuite/gcc.target/arm/pr60657.c index ca121526bb3..e608dd39355 100644 --- a/gcc/testsuite/gcc.target/arm/pr60657.c +++ b/gcc/testsuite/gcc.target/arm/pr60657.c @@ -1,6 +1,8 @@ /* { dg-do compile } */ +/* { dg-require-effective-target arm_arch_v7a_ok } */ /* { dg-skip-if "-mpure-code supports M-profile only" { *-*-* } { "-mpure-code" } } */ -/* { dg-options "-O2 -march=armv7-a" } */ +/* { dg-options "-O2" } */ +/* { dg-add-options arm_arch_v7a } */ void foo (void); diff --git a/gcc/testsuite/gcc.target/arm/pr60663.c b/gcc/testsuite/gcc.target/arm/pr60663.c index 8d76d79301a..bb48d7fdae8 100644 --- a/gcc/testsuite/gcc.target/arm/pr60663.c +++ b/gcc/testsuite/gcc.target/arm/pr60663.c @@ -1,7 +1,9 @@ /* PR rtl-optimization/60663 */ /* { dg-do compile } */ +/* { dg-require-effective-target arm_arch_v7a_ok } */ /* { dg-skip-if "-mpure-code supports M-profile only" { *-*-* } { "-mpure-code" } } */ -/* { dg-options "-O2 -march=armv7-a" } */ +/* { dg-options "-O2" } */ +/* { dg-add-options arm_arch_v7a } */ int foo (void) diff --git a/gcc/testsuite/gcc.target/arm/pr81863.c b/gcc/testsuite/gcc.target/arm/pr81863.c index 85bfab144c0..a96f3b58411 100644 --- a/gcc/testsuite/gcc.target/arm/pr81863.c +++ b/gcc/testsuite/gcc.target/arm/pr81863.c @@ -1,8 +1,10 @@ /* testsuite/gcc.target/arm/pr48183.c */ /* { dg-do compile } */ +/* { dg-require-effective-target arm_arch_v7a_arm_ok } */ /* { dg-skip-if "-mslow-flash-data and -mword-relocations incompatible" { *-*-* } { "-mslow-flash-data" } } */ /* { dg-skip-if "-mpure-code and -mword-relocations incompatible" { *-*-* } { "-mpure-code" } } */ -/* { dg-options "-O2 -mword-relocations -march=armv7-a -marm" } */ +/* { dg-options "-O2 -mword-relocations" } */ +/* { dg-add-options arm_arch_v7a_arm } */ /* { dg-final { scan-assembler-not "\[\\t \]+movw" } } */ int a, d, f; diff --git a/gcc/testsuite/gcc.target/arm/pr97969.c b/gcc/testsuite/gcc.target/arm/pr97969.c index 714a1d18870..b8c3a23676a 100644 --- a/gcc/testsuite/gcc.target/arm/pr97969.c +++ b/gcc/testsuite/gcc.target/arm/pr97969.c @@ -1,5 +1,7 @@ /* { dg-do compile } */ -/* { dg-options "-std=c99 -fno-omit-frame-pointer -mthumb -w -Os" } */ +/* { dg-require-effective-target arm_arch_v6m_ok } */ +/* { dg-options "-std=c99 -fno-omit-frame-pointer -w -Os" } */ +/* { dg-add-options arm_arch_v6m } */ typedef a[23]; enum { b }; diff --git a/gcc/testsuite/gcc.target/arm/pr98931.c b/gcc/testsuite/gcc.target/arm/pr98931.c index 66070ad7298..56f66a3b82f 100644 --- a/gcc/testsuite/gcc.target/arm/pr98931.c +++ b/gcc/testsuite/gcc.target/arm/pr98931.c @@ -1,6 +1,7 @@ /* { dg-do assemble } */ -/* { dg-skip-if "avoid conflicting multilib options" { *-*-* } { "-marm" "-mcpu=*" } } */ -/* { dg-options "-march=armv8.1-m.main -O3 --param=max-completely-peeled-insns=1300 --save-temps -mthumb" } */ +/* { dg-require-effective-target arm_arch_v8_1m_main_ok } */ +/* { dg-options "-O3 --param=max-completely-peeled-insns=1300 --save-temps" } */ +/* { dg-add-options arm_arch_v8_1m_main } */ extern long long a[][20][26][26][22]; diff --git a/gcc/testsuite/gcc.target/arm/tail-long-call.c b/gcc/testsuite/gcc.target/arm/tail-long-call.c index f70e9cf3938..6a130063fcc 100644 --- a/gcc/testsuite/gcc.target/arm/tail-long-call.c +++ b/gcc/testsuite/gcc.target/arm/tail-long-call.c @@ -1,6 +1,8 @@ -/* { dg-skip-if "need at least armv5te" { *-*-* } { "-march=armv[234]*" "-mthumb" } { "" } } */ +/* { dg-do compile } */ +/* { dg-require-effective-target arm_arch_v5te_arm_ok } */ /* { dg-skip-if "FDPIC does not support tailcall optimization" { arm*-*-uclinuxfdpiceabi } "*" "" } */ -/* { dg-options "-O2 -march=armv5te -marm" } */ +/* { dg-options "-O2" } */ +/* { dg-add-options arm_arch_v5te_arm } */ /* { dg-final { scan-assembler "bx" } } */ /* { dg-final { scan-assembler-not "blx" } } */ diff --git a/gcc/testsuite/lib/target-supports.exp b/gcc/testsuite/lib/target-supports.exp index 3d504d26164..ae43dc97872 100644 --- a/gcc/testsuite/lib/target-supports.exp +++ b/gcc/testsuite/lib/target-supports.exp @@ -5424,6 +5424,7 @@ foreach { armfunc armflag armdefs } { v6z_thumb "-march=armv6z+fp -mthumb -mfloat-abi=softfp" "__ARM_ARCH_6Z__ && __thumb__" v6m "-march=armv6-m -mthumb -mfloat-abi=soft" __ARM_ARCH_6M__ v7a "-march=armv7-a+fp" __ARM_ARCH_7A__ + v7a_arm "-march=armv7-a+fp -marm" "__ARM_ARCH_7A__ && !__thumb__" v7r "-march=armv7-r+fp" __ARM_ARCH_7R__ v7m "-march=armv7-m -mthumb -mfloat-abi=soft" __ARM_ARCH_7M__ v7em "-march=armv7e-m+fp -mthumb" __ARM_ARCH_7EM__ --------------2.34.1--