From patchwork Sun Oct 13 17:50:43 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Torbj=C3=B6rn_SVENSSON?= X-Patchwork-Id: 1996545 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=foss.st.com header.i=@foss.st.com header.a=rsa-sha256 header.s=selector1 header.b=lfCdzbUh; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=gcc.gnu.org (client-ip=8.43.85.97; helo=server2.sourceware.org; envelope-from=gcc-patches-bounces~incoming=patchwork.ozlabs.org@gcc.gnu.org; receiver=patchwork.ozlabs.org) Received: from server2.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 ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4XRSd65b2vz1xvC for ; Mon, 14 Oct 2024 04:52:58 +1100 (AEDT) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id E17C9385AE73 for ; Sun, 13 Oct 2024 17:52:56 +0000 (GMT) X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from mx07-00178001.pphosted.com (mx07-00178001.pphosted.com [185.132.182.106]) by sourceware.org (Postfix) with ESMTPS id 11AF43858CDB for ; Sun, 13 Oct 2024 17:52:37 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 11AF43858CDB Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=foss.st.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=foss.st.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 11AF43858CDB Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=185.132.182.106 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1728841960; cv=none; b=N6ACeSHkmg3UNyFyl8+7Gqs6BRIj6SWfbmnHyVhCbECU2leQzn3Sn2VOT8gGmsoGs4VJ6WhgJauQPeWBeXB58pN4m0sK23VHpyXzzRVN7Q4UHq6wjPEI7UjXLQv+3RSyVWtu2+bLtpaiT0mGF91qGj/gvf86PqZv7YleeElhBQg= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1728841960; c=relaxed/simple; bh=6OIPNOTS7LJJPZqQdznaDA3uYRftepZLAi5Mj1Xd0cQ=; h=DKIM-Signature:From:To:Subject:Date:Message-ID:MIME-Version; b=T9v4cBGceWG/cQTVBRH5XBTGoNrsfBjBuxpMiCtb0iY4BMvzDnAFJci+T0IE4u9lO2pp3Lfb8KekAMPfGgPsZroq5shl9p3xAMq7brgSYISqi1ntNjhrspYqIPotEZI0uBIGjHY2y6DDmMePgLNVgQQ1Uj00ZEQIisG01nyl44o= ARC-Authentication-Results: i=1; server2.sourceware.org Received: from pps.filterd (m0369458.ppops.net [127.0.0.1]) by mx07-00178001.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 49CNIV74014485; Sun, 13 Oct 2024 19:52:35 +0200 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foss.st.com; h= cc:content-transfer-encoding:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to; s=selector1; bh= tREZBReXmaWAuR4JzLGrdZcU4laPJ4yn+0kCnXMcR+g=; b=lfCdzbUhjZA18gYF BWtGoqvfMNqVSLQZHgW6pILvs2ej3Qtm8FtVr/1Jix6V8N0pu3VFUpnaEujb4nUk +DiITsbHuzljcSw387D+fAjhGSdaV29JWlukmp07564TQTdVTiyE6TGPSM06DWEs jyA5wpdystJFD+9jrJYOMoZZpEwlPMoRXfQFAN9CYVpEoU2UqAFlZYJMELDpJ7Ng 7QUAVzE+Spzg8HR4ZkZxgdIZTjFwM9UIyBO1dlmd3bejDy6URXQKgES6Ygl1A8/Q dLMoV9wWI+plkK5x+ShgeJgMkwLgc4VZ1Gwi6sQPx+AZo5crxpc470lR0sBmQnki 4c7yzA== Received: from beta.dmz-ap.st.com (beta.dmz-ap.st.com [138.198.100.35]) by mx07-00178001.pphosted.com (PPS) with ESMTPS id 4282p0t1ex-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Sun, 13 Oct 2024 19:52:35 +0200 (MEST) Received: from euls16034.sgp.st.com (euls16034.sgp.st.com [10.75.44.20]) by beta.dmz-ap.st.com (STMicroelectronics) with ESMTP id 4FA2A40049; Sun, 13 Oct 2024 19:51:45 +0200 (CEST) Received: from Webmail-eu.st.com (shfdag1node3.st.com [10.75.129.71]) by euls16034.sgp.st.com (STMicroelectronics) with ESMTP id 4B5ED2945B4; Sun, 13 Oct 2024 19:51:31 +0200 (CEST) Received: from jkgcxl0004.jkg.st.com (10.74.22.255) by SHFDAG1NODE3.st.com (10.75.129.71) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.37; Sun, 13 Oct 2024 19:51:30 +0200 From: =?utf-8?q?Torbj=C3=B6rn_SVENSSON?= To: CC: , , =?utf-8?q?Torb?= =?utf-8?q?j=C3=B6rn_SVENSSON?= , Yvan ROUX Subject: [PATCH v2] testsuite: Sanitize pacbti test cases for Cortex-M Date: Sun, 13 Oct 2024 19:50:43 +0200 Message-ID: <20241013175042.1427606-1-torbjorn.svensson@foss.st.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <8d163b8d-a4d2-4204-879a-f893fad4c586@arm.com> References: <8d163b8d-a4d2-4204-879a-f893fad4c586@arm.com> MIME-Version: 1.0 X-Originating-IP: [10.74.22.255] X-ClientProxiedBy: SHFCAS1NODE1.st.com (10.75.129.72) To SHFDAG1NODE3.st.com (10.75.129.71) X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1039,Hydra:6.0.680,FMLib:17.12.60.29 definitions=2024-09-06_09,2024-09-06_01,2024-09-02_01 X-Spam-Status: No, score=-12.1 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, GIT_PATCH_0, KAM_SHORT, RCVD_IN_DNSWL_LOW, SPF_HELO_NONE, SPF_PASS, TXREP 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~incoming=patchwork.ozlabs.org@gcc.gnu.org Ok for trunk and releases/gcc-14? Changes since v1: - Dropped changes to dg- instructions. These will be addressed in a separate set of patches later. --- Some of the test cases were scanning for "bti", but it would, incorrectly, match the ".arch_extenssion pacbti". gcc/testsuite/ChangeLog: * gcc.target/arm/bti-1.c: Check for asm instructions starting with a tab. * gcc.target/arm/bti-2.c: Likewise. * gcc.target/arm/pac-1.c: Likewise. * gcc.target/arm/pac-2.c: Likewise. * gcc.target/arm/pac-3.c: Likewise. * gcc.target/arm/pac-4.c: Likewise. * gcc.target/arm/pac-6.c: Likewise. * gcc.target/arm/pac-7.c: Likewise. * gcc.target/arm/pac-8.c: Likewise. * gcc.target/arm/pac-9.c: Likewise. * gcc.target/arm/pac-10.c: Likewise. * gcc.target/arm/pac-11.c: Likewise. * gcc.target/arm/pac-15.c: Likewise. * gcc.target/arm/pac-sibcall.c: Likewise. Signed-off-by: Torbjörn SVENSSON Co-authored-by: Yvan ROUX --- gcc/testsuite/gcc.target/arm/bti-1.c | 2 +- gcc/testsuite/gcc.target/arm/bti-2.c | 2 +- gcc/testsuite/gcc.target/arm/pac-1.c | 4 ++-- gcc/testsuite/gcc.target/arm/pac-10.c | 4 ++-- gcc/testsuite/gcc.target/arm/pac-11.c | 4 ++-- gcc/testsuite/gcc.target/arm/pac-15.c | 2 +- gcc/testsuite/gcc.target/arm/pac-2.c | 4 ++-- gcc/testsuite/gcc.target/arm/pac-3.c | 4 ++-- gcc/testsuite/gcc.target/arm/pac-4.c | 2 +- gcc/testsuite/gcc.target/arm/pac-6.c | 6 +++--- gcc/testsuite/gcc.target/arm/pac-7.c | 4 ++-- gcc/testsuite/gcc.target/arm/pac-8.c | 4 ++-- gcc/testsuite/gcc.target/arm/pac-9.c | 4 ++-- gcc/testsuite/gcc.target/arm/pac-sibcall.c | 2 +- 14 files changed, 24 insertions(+), 24 deletions(-) diff --git a/gcc/testsuite/gcc.target/arm/bti-1.c b/gcc/testsuite/gcc.target/arm/bti-1.c index 79dd8010d2d..54a733d9f20 100644 --- a/gcc/testsuite/gcc.target/arm/bti-1.c +++ b/gcc/testsuite/gcc.target/arm/bti-1.c @@ -9,4 +9,4 @@ main (void) return 0; } -/* { dg-final { scan-assembler "bti" } } */ +/* { dg-final { scan-assembler "\tbti" } } */ diff --git a/gcc/testsuite/gcc.target/arm/bti-2.c b/gcc/testsuite/gcc.target/arm/bti-2.c index 33910563849..645ad369424 100644 --- a/gcc/testsuite/gcc.target/arm/bti-2.c +++ b/gcc/testsuite/gcc.target/arm/bti-2.c @@ -55,4 +55,4 @@ lab2: return 2; } -/* { dg-final { scan-assembler-times "bti" 15 } } */ +/* { dg-final { scan-assembler-times "\tbti" 14 } } */ diff --git a/gcc/testsuite/gcc.target/arm/pac-1.c b/gcc/testsuite/gcc.target/arm/pac-1.c index 9b26f62b65f..e0eea0858e0 100644 --- a/gcc/testsuite/gcc.target/arm/pac-1.c +++ b/gcc/testsuite/gcc.target/arm/pac-1.c @@ -6,6 +6,6 @@ #include "pac.h" -/* { dg-final { scan-assembler-times "pac\tip, lr, sp" 2 } } */ -/* { dg-final { scan-assembler-times "aut\tip, lr, sp" 2 } } */ +/* { dg-final { scan-assembler-times "\tpac\tip, lr, sp" 2 } } */ +/* { dg-final { scan-assembler-times "\taut\tip, lr, sp" 2 } } */ /* { dg-final { scan-assembler-not "\tbti" } } */ diff --git a/gcc/testsuite/gcc.target/arm/pac-10.c b/gcc/testsuite/gcc.target/arm/pac-10.c index a794195e8f6..6da8434aeaf 100644 --- a/gcc/testsuite/gcc.target/arm/pac-10.c +++ b/gcc/testsuite/gcc.target/arm/pac-10.c @@ -5,6 +5,6 @@ #include "pac.h" -/* { dg-final { scan-assembler "pac\tip, lr, sp" } } */ -/* { dg-final { scan-assembler "aut\tip, lr, sp" } } */ +/* { dg-final { scan-assembler "\tpac\tip, lr, sp" } } */ +/* { dg-final { scan-assembler "\taut\tip, lr, sp" } } */ /* { dg-final { scan-assembler-not "\tbti" } } */ diff --git a/gcc/testsuite/gcc.target/arm/pac-11.c b/gcc/testsuite/gcc.target/arm/pac-11.c index 37ffc93b41b..0bb727c2c80 100644 --- a/gcc/testsuite/gcc.target/arm/pac-11.c +++ b/gcc/testsuite/gcc.target/arm/pac-11.c @@ -5,6 +5,6 @@ #include "pac.h" -/* { dg-final { scan-assembler-times "pacbti\tip, lr, sp" 2 } } */ -/* { dg-final { scan-assembler-times "aut\tip, lr, sp" 2 } } */ +/* { dg-final { scan-assembler-times "\tpacbti\tip, lr, sp" 2 } } */ +/* { dg-final { scan-assembler-times "\taut\tip, lr, sp" 2 } } */ /* { dg-final { scan-assembler-not "\tbti" } } */ diff --git a/gcc/testsuite/gcc.target/arm/pac-15.c b/gcc/testsuite/gcc.target/arm/pac-15.c index e1054902955..979941492d3 100644 --- a/gcc/testsuite/gcc.target/arm/pac-15.c +++ b/gcc/testsuite/gcc.target/arm/pac-15.c @@ -24,7 +24,7 @@ int main (void) } /* { dg-final { scan-assembler-times "\.pacspval" 1 } } */ -/* { dg-final { scan-assembler-times "pac ip, lr, sp" 3 } } */ +/* { dg-final { scan-assembler-times "\tpac\tip, lr, sp" 3 } } */ /* { dg-final { scan-assembler-times "\.cfi_register 143, 12" 3 } } */ /* { dg-final { scan-assembler-times "\.save {r7, ra_auth_code, lr}" 2 } } */ /* { dg-final { scan-assembler-times "\.cfi_offset 143, -8" 2 } } */ diff --git a/gcc/testsuite/gcc.target/arm/pac-2.c b/gcc/testsuite/gcc.target/arm/pac-2.c index 945ce938592..5eb1062043c 100644 --- a/gcc/testsuite/gcc.target/arm/pac-2.c +++ b/gcc/testsuite/gcc.target/arm/pac-2.c @@ -6,6 +6,6 @@ #include "pac.h" -/* { dg-final { scan-assembler "pac\tip, lr, sp" } } */ -/* { dg-final { scan-assembler "aut\tip, lr, sp" } } */ +/* { dg-final { scan-assembler "\tpac\tip, lr, sp" } } */ +/* { dg-final { scan-assembler "\taut\tip, lr, sp" } } */ /* { dg-final { scan-assembler-not "\tbti" } } */ diff --git a/gcc/testsuite/gcc.target/arm/pac-3.c b/gcc/testsuite/gcc.target/arm/pac-3.c index 47e290a5840..50453dd8ec4 100644 --- a/gcc/testsuite/gcc.target/arm/pac-3.c +++ b/gcc/testsuite/gcc.target/arm/pac-3.c @@ -6,6 +6,6 @@ #include "pac.h" -/* { dg-final { scan-assembler-times "pacbti\tip, lr, sp" 2 } } */ -/* { dg-final { scan-assembler-times "aut\tip, lr, sp" 2 } } */ +/* { dg-final { scan-assembler-times "\tpacbti\tip, lr, sp" 2 } } */ +/* { dg-final { scan-assembler-times "\taut\tip, lr, sp" 2 } } */ /* { dg-final { scan-assembler-not "\tbti" } } */ diff --git a/gcc/testsuite/gcc.target/arm/pac-4.c b/gcc/testsuite/gcc.target/arm/pac-4.c index cf915cdba50..81907079d77 100644 --- a/gcc/testsuite/gcc.target/arm/pac-4.c +++ b/gcc/testsuite/gcc.target/arm/pac-4.c @@ -5,6 +5,6 @@ #include "pac.h" -/* { dg-final { scan-assembler-not "\tbti\t" } } */ +/* { dg-final { scan-assembler-not "\tbti" } } */ /* { dg-final { scan-assembler-not "\tpac\t" } } */ /* { dg-final { scan-assembler-not "\tpacbti\t" } } */ diff --git a/gcc/testsuite/gcc.target/arm/pac-6.c b/gcc/testsuite/gcc.target/arm/pac-6.c index c5329f0ef48..a8e3067f825 100644 --- a/gcc/testsuite/gcc.target/arm/pac-6.c +++ b/gcc/testsuite/gcc.target/arm/pac-6.c @@ -13,6 +13,6 @@ int bar() return 0; } -/* { dg-final { scan-assembler "pac\tip, lr, sp" } } */ -/* { dg-final { scan-assembler "aut\tip, lr, sp" } } */ -/* { dg-final { scan-assembler-not "bti" } } */ +/* { dg-final { scan-assembler "\tpac\tip, lr, sp" } } */ +/* { dg-final { scan-assembler "\taut\tip, lr, sp" } } */ +/* { dg-final { scan-assembler-not "\tbti" } } */ diff --git a/gcc/testsuite/gcc.target/arm/pac-7.c b/gcc/testsuite/gcc.target/arm/pac-7.c index cdaebca5cfa..6b4ad1450ce 100644 --- a/gcc/testsuite/gcc.target/arm/pac-7.c +++ b/gcc/testsuite/gcc.target/arm/pac-7.c @@ -27,6 +27,6 @@ main (void) return 0; } -/* { dg-final { scan-assembler-times "pac\tip, lr, sp" 3 } } */ -/* { dg-final { scan-assembler-times "aut\tip, lr, sp" 3 } } */ +/* { dg-final { scan-assembler-times "\tpac\tip, lr, sp" 3 } } */ +/* { dg-final { scan-assembler-times "\taut\tip, lr, sp" 3 } } */ /* { dg-final { scan-assembler-not "\tbti" } } */ diff --git a/gcc/testsuite/gcc.target/arm/pac-8.c b/gcc/testsuite/gcc.target/arm/pac-8.c index 3f37dcfa5c8..84208bfda4f 100644 --- a/gcc/testsuite/gcc.target/arm/pac-8.c +++ b/gcc/testsuite/gcc.target/arm/pac-8.c @@ -29,6 +29,6 @@ int main() return 0; } -/* { dg-final { scan-assembler-times "pac\tip, lr, sp" 2 } } */ -/* { dg-final { scan-assembler-times "aut\tip, lr, sp" 2 } } */ +/* { dg-final { scan-assembler-times "\tpac\tip, lr, sp" 2 } } */ +/* { dg-final { scan-assembler-times "\taut\tip, lr, sp" 2 } } */ /* { dg-final { scan-assembler-not "\tbti" } } */ diff --git a/gcc/testsuite/gcc.target/arm/pac-9.c b/gcc/testsuite/gcc.target/arm/pac-9.c index ee2fad290b5..588b7ffb8d2 100644 --- a/gcc/testsuite/gcc.target/arm/pac-9.c +++ b/gcc/testsuite/gcc.target/arm/pac-9.c @@ -5,7 +5,7 @@ #include "pac.h" -/* { dg-final { scan-assembler-times "pac\tip, lr, sp" 2 } } */ -/* { dg-final { scan-assembler-times "aut\tip, lr, sp" 2 } } */ +/* { dg-final { scan-assembler-times "\tpac\tip, lr, sp" 2 } } */ +/* { dg-final { scan-assembler-times "\taut\tip, lr, sp" 2 } } */ /* { dg-final { scan-assembler-not "\tbti" } } */ diff --git a/gcc/testsuite/gcc.target/arm/pac-sibcall.c b/gcc/testsuite/gcc.target/arm/pac-sibcall.c index e15bd2f478d..205099d177e 100644 --- a/gcc/testsuite/gcc.target/arm/pac-sibcall.c +++ b/gcc/testsuite/gcc.target/arm/pac-sibcall.c @@ -11,4 +11,4 @@ void fail(void (*f)(int, int, int, int)) f(1, 2, 3, 4); } -/* { dg-final { scan-assembler-not "bx\tip\t@ indirect register sibling call" } } */ +/* { dg-final { scan-assembler-not "\tbx\tip\t@ indirect register sibling call" } } */