From patchwork Wed Nov 15 10:48:54 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Earnshaw X-Patchwork-Id: 165275 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b909:0:b0:403:3b70:6f57 with SMTP id t9csp2453864vqg; Wed, 15 Nov 2023 02:49:36 -0800 (PST) X-Google-Smtp-Source: AGHT+IH9/A9UvJ8u6ngPB+XG14VT4ilwqGTeKKY4Xoux2/rqz9NDFf5OLRN2Nlt3ECaucKkmA+xD X-Received: by 2002:a05:6102:1505:b0:45f:ba11:b794 with SMTP id f5-20020a056102150500b0045fba11b794mr14956704vsv.14.1700045376656; Wed, 15 Nov 2023 02:49:36 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1700045376; cv=pass; d=google.com; s=arc-20160816; b=De6AZG0UzRHrfr6VjnLFWgF4O8SIktCBj5jAo5ANrrehwQltmghd3mXa7CKO4cX/z6 MXliu1V+lIlhDobh+2Y/e+89VdQeDEq0GYQoJzBnOAjtOkyC1AlkbTl//M49Z7Tkswsy ladh1w8EdqUkP+Mz/hFXY9gWG2Ifwgszl7xglqZMZvGQyQ1xNcotk/vjLnH56u5qbDzl 3D68CIg8yxSd2TvEpPxj67MpJ1wLLB0WSWKmbYt8cGn62RHPEIMDH1248Q415bMGOx8m mm+LBMrCK3n/X53pxVVO/fUXNf6xzF29FKPyk9lOT8Ml59HCEmHvFC0NDHLMOAd9xKqq Tnuw== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:message-id:date:subject:cc:to:from:arc-filter :dmarc-filter:delivered-to; bh=nZ0Gd+zvePDLvhSP+GsDnUccfsqCjmAtJ2la4ErT31g=; fh=vcPCoAFD9ELdvNMTpDIWpczE2wb0OD9E1jzZw6wSlzw=; b=xC9ueeoB01D/Cxu8LLuNCHZGfAE74fCX+TZc8Z17TEGnC3yCUGnV9+/j+g678vvFm3 +YSrLuwjxOiUn33z8ubtCO6vVlWrDQpjvk83DuwmIBM8JKaxdfmbRsdXvHSnNDa/Vsg4 L/5rhD0825dYPttcJr6q9Q4ikfr8IHBlnYWo7XSA/1XvhaAUjK9MQwW+1lTgaac+5HdF JdaGszgsj4c6yOCDuY04/x3pgjG36bcyKkLroSxwBR/J5PzlyDXqYecjg/b8CkESGx4Z qzFxgnupiW+9EfV3bqqtu26uUBg07IpWh443ZWMykRCIjRzH0eJRjBknrGtM5zvYOvqF OrxQ== ARC-Authentication-Results: i=2; mx.google.com; arc=pass (i=1); spf=pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 2620:52:3:1:0:246e:9693:128c as permitted sender) smtp.mailfrom="gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=arm.com Received: from server2.sourceware.org (server2.sourceware.org. [2620:52:3:1:0:246e:9693:128c]) by mx.google.com with ESMTPS id o14-20020a05622a138e00b0041e9f3cbda7si8428971qtk.320.2023.11.15.02.49.36 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 15 Nov 2023 02:49:36 -0800 (PST) Received-SPF: pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 2620:52:3:1:0:246e:9693:128c as permitted sender) client-ip=2620:52:3:1:0:246e:9693:128c; Authentication-Results: mx.google.com; arc=pass (i=1); spf=pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 2620:52:3:1:0:246e:9693:128c as permitted sender) smtp.mailfrom="gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=arm.com Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 6BBD43858409 for ; Wed, 15 Nov 2023 10:49:36 +0000 (GMT) X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by sourceware.org (Postfix) with ESMTP id 453343858D20 for ; Wed, 15 Nov 2023 10:49:13 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 453343858D20 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 453343858D20 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=1700045354; cv=none; b=MI58IbY96uRNOqkU6iTQcxV55geUlPtuxAKRprLjZw7+83jFg7S1R0Ss8ezvdbHSweOKNTUXGqxTAZSSVLauZXDlMkWcMaNXBbqDVbpWtok3zeOl9yhZgp1aJPqZwJaevLc3y2DU4yxCdrTz71e+r2k6MloUOnyP6WSh1Fr4SbM= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1700045354; c=relaxed/simple; bh=8fUwcoFwQx3bkphVfVTSO41E9b1CSpTrYYAI0Wi/fI0=; h=From:To:Subject:Date:Message-Id:MIME-Version; b=i1qKoZ18bZ9eP/3GjtWHvxhLsRUaWPbOz1VKaoyLnYa0h7RX+BQlSnn9V+XMrn9820iWKP/AmhTWgq2Bzo9gCA1qLxla2ohGSgSN/TXup0XW4kxu8XDlNPS3219aoYPtA29A69xvxNCPWBqpzKJGRJTLUGWKGXLH3cgw9gQB6mY= 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 39224DA7; Wed, 15 Nov 2023 02:49:58 -0800 (PST) Received: from e126323.arm.com (unknown [10.57.41.187]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 304AF3F7B4; Wed, 15 Nov 2023 02:49:12 -0800 (PST) From: Richard Earnshaw To: gcc-patches@gcc.gnu.org Cc: Richard Earnshaw Subject: [committed] arm: testsuite: fix test for armv6t2 hardware Date: Wed, 15 Nov 2023 10:48:54 +0000 Message-Id: <20231115104854.1784462-1-rearnsha@arm.com> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 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 X-BeenThere: gcc-patches@gcc.gnu.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1782626781246102828 X-GMAIL-MSGID: 1782626781246102828 My previous patch series added a new function to check for armv6t2 compatible hardware. But the test was not correctly implemented and also did not follow the standard naming convention for Arm hw compatibility tests. Fix both of these issues. gcc/testsuite: * lib/target-supports.exp (check_effective_target_arm_arch_v6t2_hw_ok): Rename to... (check_effective_target_arm_arch_v6t2_hw): ... this. Fix checks. * gcc.target/arm/acle/data-intrinsics-armv6.c: Update pre-check. * gcc.target/arm/acle/data-intrinsics-rbit.c: Likewise. --- gcc/testsuite/gcc.target/arm/acle/data-intrinsics-armv6.c | 2 +- gcc/testsuite/gcc.target/arm/acle/data-intrinsics-rbit.c | 2 +- gcc/testsuite/lib/target-supports.exp | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/gcc/testsuite/gcc.target/arm/acle/data-intrinsics-armv6.c b/gcc/testsuite/gcc.target/arm/acle/data-intrinsics-armv6.c index 6dc8c55e2f9..c231fa4c1ae 100644 --- a/gcc/testsuite/gcc.target/arm/acle/data-intrinsics-armv6.c +++ b/gcc/testsuite/gcc.target/arm/acle/data-intrinsics-armv6.c @@ -1,5 +1,5 @@ /* { dg-do run } */ -/* { dg-require-effective-target arm_arch_v6t2_hw_ok } */ +/* { dg-require-effective-target arm_arch_v6t2_hw } */ /* { dg-add-options arm_arch_v6t2 } */ #include "arm_acle.h" diff --git a/gcc/testsuite/gcc.target/arm/acle/data-intrinsics-rbit.c b/gcc/testsuite/gcc.target/arm/acle/data-intrinsics-rbit.c index b01c4219a7e..ac358bce02d 100644 --- a/gcc/testsuite/gcc.target/arm/acle/data-intrinsics-rbit.c +++ b/gcc/testsuite/gcc.target/arm/acle/data-intrinsics-rbit.c @@ -1,6 +1,6 @@ /* Test the ACLE data intrinsics existence for specific instruction. */ /* { dg-do run } */ -/* { dg-require-effective-target arm_arch_v6t2_hw_ok } */ +/* { dg-require-effective-target arm_arch_v6t2_hw } */ /* { dg-additional-options "--save-temps -O1" } */ /* { dg-add-options arm_arch_v6t2 } */ /* { dg-final { check-function-bodies "**" "" "" } } */ diff --git a/gcc/testsuite/lib/target-supports.exp b/gcc/testsuite/lib/target-supports.exp index 43a040e135c..b6a2e4fd096 100644 --- a/gcc/testsuite/lib/target-supports.exp +++ b/gcc/testsuite/lib/target-supports.exp @@ -5607,9 +5607,9 @@ proc check_effective_target_arm_thumb1_cbz_ok {} { # Return 1 if this is an Arm target which supports the Armv6t2 extensions. # This can be either in Arm state or in Thumb state. -proc check_effective_target_arm_arch_v6t2_hw_ok {} { - if [check_effective_target_arm_thumb1_ok] { - return [check_no_compiler_messages arm_movt object { +proc check_effective_target_arm_arch_v6t2_hw {} { + if [check_effective_target_arm_arch_v6t2_ok] { + return [check_runtime arm_arch_v6t2 { int main (void) {