From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from EUR05-AM6-obe.outbound.protection.outlook.com (mail-am6eur05on2056.outbound.protection.outlook.com [40.107.22.56]) by sourceware.org (Postfix) with ESMTPS id AC6773830B6C for ; Tue, 22 Aug 2023 10:39:03 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org AC6773830B6C Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=arm.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=arm.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=armh.onmicrosoft.com; s=selector2-armh-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=xG3Rle61n082HmwUK8xDsstMLIRBaVuxfwMndD0moNA=; b=UcMKN5L6OvfkFFEmz7Ihl/cYgZENIYHV1g8EEhnb5/avSlvZ71SPyG16DDnqZtiBFesuHcQs2kyJGuRyiN5JO6P0K3dZAQKjDkXo/leA4MTaJAkEH8FQFwWB02Qkmo34MxIpxyElyznx3EAiAsXihI8fB2aDq59sAeMfXKU1NLU= Received: from DUZPR01CA0045.eurprd01.prod.exchangelabs.com (2603:10a6:10:468::20) by GV1PR08MB7874.eurprd08.prod.outlook.com (2603:10a6:150:5d::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6699.20; Tue, 22 Aug 2023 10:39:00 +0000 Received: from DBAEUR03FT017.eop-EUR03.prod.protection.outlook.com (2603:10a6:10:468:cafe::c5) by DUZPR01CA0045.outlook.office365.com (2603:10a6:10:468::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6699.20 via Frontend Transport; Tue, 22 Aug 2023 10:39:00 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 63.35.35.123) smtp.mailfrom=arm.com; dkim=pass (signature was verified) header.d=armh.onmicrosoft.com;dmarc=pass action=none header.from=arm.com; Received-SPF: Pass (protection.outlook.com: domain of arm.com designates 63.35.35.123 as permitted sender) receiver=protection.outlook.com; client-ip=63.35.35.123; helo=64aa7808-outbound-1.mta.getcheckrecipient.com; pr=C Received: from 64aa7808-outbound-1.mta.getcheckrecipient.com (63.35.35.123) by DBAEUR03FT017.mail.protection.outlook.com (100.127.142.243) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6723.15 via Frontend Transport; Tue, 22 Aug 2023 10:39:00 +0000 Received: ("Tessian outbound b5a0f4347031:v175"); Tue, 22 Aug 2023 10:39:00 +0000 X-CheckRecipientChecked: true X-CR-MTA-CID: 7cf9bda7c9365d6c X-CR-MTA-TID: 64aa7808 Received: from 2fdc22d1572a.1 by 64aa7808-outbound-1.mta.getcheckrecipient.com id DF338AAE-4CFE-4EDF-A216-C30997FFCE0B.1; Tue, 22 Aug 2023 10:38:53 +0000 Received: from EUR05-VI1-obe.outbound.protection.outlook.com by 64aa7808-outbound-1.mta.getcheckrecipient.com with ESMTPS id 2fdc22d1572a.1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384); Tue, 22 Aug 2023 10:38:53 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ZFN9MZLfzrCMrEdP+p+/lEJ7CU2DrVreoeTt3CWTXAI4Jh07e9WWJDcqWuvVMkDuHNnwHCvo5R3T1cJGA3KChHYj9gqhDKdkcPyOwJ4jwgjD84FpToDjZdi8XvKX3nzOmx+z8Vfod75xTzWLsugaeoddMFPdnNxJPKqR1Ft5FChUE5RRTqTYHKYsUkw6ijCnNYo/ZXfUl3ntFyB6mBLBM2ASn7rTJDt+Cwf9mohJrH+qZrJDkPiZ8IDg4jTAqYu5d5LE9KFauxH+3Sfb0MkfuXSst5423Je6gGbDlF57eZwv0Ztncw/3JIEXX/MC2dckskdfvNyFtUjin5UpOyMUKA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=xG3Rle61n082HmwUK8xDsstMLIRBaVuxfwMndD0moNA=; b=d9T3tapHPzyIjavg+SVuSVir1dtBj+c5I+ArzwsN0s2Q/eGn0vsKbkNrnFC8ZqIuNcQr91tNghgiorbFSnkByZEBpFSn/awQwVj/4JPibjrTUgVMTSWA7M4l/oF3fklK6GBkTqI5l6usGnWlCNMpP1+gMOb7OyxXidXkJ9ikd9qZkcuL/yxUHMkdD3Xgt6q9NPfnFe3wtRe63rFLLYjVVe0uMXIc1FFjO88v8nOIC9Qlt8IMEPwn8A5x6662elqJqAKnyIqKrRY/3gsL/XgcTdobcK5IoWt3OjvblQzAlhbBf7ONIcM7vbhptSCSR1jmAwRrMVwEmXKn/cIIPcJR6A== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 40.67.248.234) smtp.rcpttodomain=gcc.gnu.org smtp.mailfrom=arm.com; dmarc=pass (p=none sp=none pct=100) action=none header.from=arm.com; dkim=none (message not signed); arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=armh.onmicrosoft.com; s=selector2-armh-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=xG3Rle61n082HmwUK8xDsstMLIRBaVuxfwMndD0moNA=; b=UcMKN5L6OvfkFFEmz7Ihl/cYgZENIYHV1g8EEhnb5/avSlvZ71SPyG16DDnqZtiBFesuHcQs2kyJGuRyiN5JO6P0K3dZAQKjDkXo/leA4MTaJAkEH8FQFwWB02Qkmo34MxIpxyElyznx3EAiAsXihI8fB2aDq59sAeMfXKU1NLU= Received: from AM7PR04CA0025.eurprd04.prod.outlook.com (2603:10a6:20b:110::35) by DB4PR08MB8199.eurprd08.prod.outlook.com (2603:10a6:10:381::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6699.24; Tue, 22 Aug 2023 10:38:51 +0000 Received: from AM7EUR03FT030.eop-EUR03.prod.protection.outlook.com (2603:10a6:20b:110:cafe::d) by AM7PR04CA0025.outlook.office365.com (2603:10a6:20b:110::35) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6699.20 via Frontend Transport; Tue, 22 Aug 2023 10:38:50 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 40.67.248.234) smtp.mailfrom=arm.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=arm.com; Received-SPF: Pass (protection.outlook.com: domain of arm.com designates 40.67.248.234 as permitted sender) receiver=protection.outlook.com; client-ip=40.67.248.234; helo=nebula.arm.com; pr=C Received: from nebula.arm.com (40.67.248.234) by AM7EUR03FT030.mail.protection.outlook.com (100.127.140.180) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.6723.16 via Frontend Transport; Tue, 22 Aug 2023 10:38:50 +0000 Received: from AZ-NEU-EX03.Arm.com (10.251.24.31) by AZ-NEU-EX03.Arm.com (10.251.24.31) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.27; Tue, 22 Aug 2023 10:38:49 +0000 Received: from armchair.cambridge.arm.com (10.2.80.71) by mail.arm.com (10.251.24.31) with Microsoft SMTP Server id 15.1.2507.27 via Frontend Transport; Tue, 22 Aug 2023 10:38:49 +0000 From: Szabolcs Nagy To: , , , Subject: [PATCH 06/11] aarch64: Fix pac-ret eh_return tests Date: Tue, 22 Aug 2023 11:38:49 +0100 Message-ID: X-Mailer: git-send-email 2.25.1 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-EOPAttributedMessage: 1 X-MS-TrafficTypeDiagnostic: AM7EUR03FT030:EE_|DB4PR08MB8199:EE_|DBAEUR03FT017:EE_|GV1PR08MB7874:EE_ X-MS-Office365-Filtering-Correlation-Id: 65ffb37b-a483-4373-3636-08dba2fbff58 x-checkrecipientrouted: true NoDisclaimer: true X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam-Untrusted: BCL:0; X-Microsoft-Antispam-Message-Info-Original: bVcObm6xYJtbBuC5C6ZTkQPilHrB4UzZ6kuQar3kjkwizhYkiMSBmYjaU5HO/PoSBUhjwxZwb2/LcMpKLgVIxf0fwuX84mtYHRNFWAiLDV5+1hwjtc0u8UQE3/ut/Z7EVEPhl9BtifD6/9vFkWCqsZiWzFEXxz6ym/OHbrjHc+LAEBzOAR1/naLtcsUIZ3J/Zrrei/D2HlG5PiSNRs5uKvDO8Oe2XJiwmiwhYiQtg32LrgeuJsiwcceb6s3Jel1DvdTcjxipERedyESHxLn22gZFoh2dSUOWRLJI5n3qQZH57mn6WBXFRftrcgHt1pb4T5y4ELVKiNf0yrYGCUUaQH5d/IU+F/wmL5deKO/2dhpdUtMXLtVHnottljy/08uxj3+SH9Ty2tV0NUE9IRKEn0rIEFpgzV/EoqjPcyKmxknJoobsB4Aap4DMk+FvXl8ayqRnN5Gk2ObPdQ0x9850U8fXdfrJc0JNvIEH/wxtlE0CJIrtdJcynEv0XrzXEYbL/Ameh8HEPQdhISq/KouqVvAfVUeBAe51cy56hiId+ukJCH/nChsvvi9eadqq8vHGxXEPjh8gb9+x4xKHqW62AP4K4raTTxu1Kyt5vtjPtffC5RxOQpk/B/W605Dx7W2G1N53A6StQFoREVDceulgEC5MrJEgVRSWg2KXN7izr1CkahP/J8teukwh9R8nTYDXLTzWwKpxZnq4/DKSNjTUq5AT6gwTY3fJkXqWERXMzpp4TkoHJZhHdTPqLAzPrMz63PLY5x7DNADx40CWdWcxkQ== X-Forefront-Antispam-Report-Untrusted: CIP:40.67.248.234;CTRY:IE;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:nebula.arm.com;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(13230031)(4636009)(396003)(136003)(346002)(376002)(39850400004)(1800799009)(186009)(451199024)(82310400011)(46966006)(36840700001)(6636002)(70586007)(70206006)(316002)(110136005)(2616005)(8676002)(8936002)(41300700001)(36756003)(356005)(81166007)(82740400003)(478600001)(40480700001)(83380400001)(2906002)(84970400001)(36860700001)(7696005)(47076005)(426003)(44832011)(5660300002)(86362001)(26005)(336012)(36900700001);DIR:OUT;SFP:1101; X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB4PR08MB8199 X-MS-Exchange-Transport-CrossTenantHeadersStripped: DBAEUR03FT017.eop-EUR03.prod.protection.outlook.com X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id-Prvs: 22ca73ad-7257-40f8-4123-08dba2fbf97f X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: hd9+QmXdSSTsUQKT4CIRDBZhWp3gJZTFtSmSC3SP4GYhrDrWsKhbJmUAfh+ZspCJowx3C8g/reWvK70s4z9GyRvHhC2QdqYuucQqM1iqqXXSa/RYiWf5VADZFirm6V6/c9W7PawGoXBmtit2agWHx5KBl6E9wHwPi6SJe2YMq891On5ds5O0u84GdAr6PY0cQSt/HIyVnFgBTiS4pmrCeOdaxpHnTfYASTobIF1V7Fli7RK9pQWx59GJJZqYKFlOxPIT3KuZQo00+Cinaedi9H+19SKta/mQwJwRVn63KHD0pw3EOe941cZap9OtWWbP3RORRZdnThKNnawBrPe5/dmG8iyIKIX3yXSNMQSee0szKkvZSTcrSJybje0lN18lnFP/Ocv15aR6TK4glLq/JYvW+SGaLlot3sMoWJtKpZ03YgbwJjRfJIrWQ8p9crwFTKeEWu60tV2rKNnrdvxnmQtKPct9K733T5XN04RzMH6253RHGsVVSFeVPE1TwuV1/1+T3f2kSZga16rq5pyNaNhPE/VIPMNTmj8sOAfVegVnSd++J6YLbMlOhk25e0Df/waSyX7ZATW8KE/xrDeLY3phaijqquRMEkjgfwHTHuK3dqadPe1O7GklUjuFYrnFJ5TTZpJhuHIPvDGLdiERHU0VRh+ATsr22WC2+dM0Wt9S3ooh/u3HTKvZFTH9vngZKq9MQtdruris23HDL1h1LdwyuSBohCgXL7teORZZ4gAnS36wupsJnwth4XQM4h9D47W76pBn2yR3cwlSaZHZew== X-Forefront-Antispam-Report: CIP:63.35.35.123;CTRY:IE;LANG:en;SCL:1;SRV:;IPV:CAL;SFV:NSPM;H:64aa7808-outbound-1.mta.getcheckrecipient.com;PTR:ec2-63-35-35-123.eu-west-1.compute.amazonaws.com;CAT:NONE;SFS:(13230031)(4636009)(39860400002)(396003)(136003)(346002)(376002)(1800799009)(186009)(451199024)(82310400011)(46966006)(36840700001)(40470700004)(84970400001)(40480700001)(86362001)(36756003)(40460700003)(316002)(70206006)(6636002)(41300700001)(70586007)(110136005)(82740400003)(478600001)(81166007)(47076005)(7696005)(26005)(426003)(336012)(36860700001)(2906002)(83380400001)(8676002)(2616005)(44832011)(8936002)(5660300002);DIR:OUT;SFP:1101; X-OriginatorOrg: arm.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 22 Aug 2023 10:39:00.7519 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 65ffb37b-a483-4373-3636-08dba2fbff58 X-MS-Exchange-CrossTenant-Id: f34e5979-57d9-4aaa-ad4d-b122a662184d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=f34e5979-57d9-4aaa-ad4d-b122a662184d;Ip=[63.35.35.123];Helo=[64aa7808-outbound-1.mta.getcheckrecipient.com] X-MS-Exchange-CrossTenant-AuthSource: DBAEUR03FT017.eop-EUR03.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: GV1PR08MB7874 X-Spam-Status: No, score=-11.6 required=5.0 tests=BAYES_00,DKIM_SIGNED,DKIM_VALID,FORGED_SPF_HELO,GIT_PATCH_0,KAM_DMARC_NONE,KAM_SHORT,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,SPF_NONE,TXREP,UNPARSEABLE_RELAY 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 needed since eh_return no longer prevents pac-ret in the normal return path. gcc/testsuite/ChangeLog: * gcc.target/aarch64/return_address_sign_1.c: Move func4 to ... * gcc.target/aarch64/return_address_sign_2.c: ... here and fix the scan asm check. * gcc.target/aarch64/return_address_sign_b_1.c: Move func4 to ... * gcc.target/aarch64/return_address_sign_b_2.c: ... here and fix the scan asm check. --- .../gcc.target/aarch64/return_address_sign_1.c | 13 +------------ .../gcc.target/aarch64/return_address_sign_2.c | 17 +++++++++++++++-- .../aarch64/return_address_sign_b_1.c | 11 ----------- .../aarch64/return_address_sign_b_2.c | 17 +++++++++++++++-- 4 files changed, 31 insertions(+), 27 deletions(-) diff --git a/gcc/testsuite/gcc.target/aarch64/return_address_sign_1.c b/gcc/testsuite/gcc.target/aarch64/return_address_sign_1.c index 232ba67ade0..114a9dacb3f 100644 --- a/gcc/testsuite/gcc.target/aarch64/return_address_sign_1.c +++ b/gcc/testsuite/gcc.target/aarch64/return_address_sign_1.c @@ -37,16 +37,5 @@ func3 (int a, int b, int c) /* autiasp */ } -/* eh_return. */ -void __attribute__ ((target ("arch=armv8.3-a"))) -func4 (long offset, void *handler, int *ptr, int imm1, int imm2) -{ - /* no paciasp */ - *ptr = imm1 + foo (imm1) + imm2; - __builtin_eh_return (offset, handler); - /* no autiasp */ - return; -} - -/* { dg-final { scan-assembler-times "autiasp" 3 } } */ /* { dg-final { scan-assembler-times "paciasp" 3 } } */ +/* { dg-final { scan-assembler-times "autiasp" 3 } } */ diff --git a/gcc/testsuite/gcc.target/aarch64/return_address_sign_2.c b/gcc/testsuite/gcc.target/aarch64/return_address_sign_2.c index a4bc5b45333..d93492c3c43 100644 --- a/gcc/testsuite/gcc.target/aarch64/return_address_sign_2.c +++ b/gcc/testsuite/gcc.target/aarch64/return_address_sign_2.c @@ -14,5 +14,18 @@ func1 (int a, int b, int c) /* retaa */ } -/* { dg-final { scan-assembler-times "paciasp" 1 } } */ -/* { dg-final { scan-assembler-times "retaa" 1 } } */ +/* eh_return. */ +void __attribute__ ((target ("arch=armv8.3-a"))) +func4 (long offset, void *handler, int *ptr, int imm1, int imm2) +{ + /* paciasp */ + *ptr = imm1 + foo (imm1) + imm2; + if (handler) + /* br */ + __builtin_eh_return (offset, handler); + /* retaa */ + return; +} + +/* { dg-final { scan-assembler-times "paciasp" 2 } } */ +/* { dg-final { scan-assembler-times "retaa" 2 } } */ diff --git a/gcc/testsuite/gcc.target/aarch64/return_address_sign_b_1.c b/gcc/testsuite/gcc.target/aarch64/return_address_sign_b_1.c index 43e32ab6cb7..697fa30dc5a 100644 --- a/gcc/testsuite/gcc.target/aarch64/return_address_sign_b_1.c +++ b/gcc/testsuite/gcc.target/aarch64/return_address_sign_b_1.c @@ -37,16 +37,5 @@ func3 (int a, int b, int c) /* autibsp */ } -/* eh_return. */ -void __attribute__ ((target ("arch=armv8.3-a"))) -func4 (long offset, void *handler, int *ptr, int imm1, int imm2) -{ - /* no pacibsp */ - *ptr = imm1 + foo (imm1) + imm2; - __builtin_eh_return (offset, handler); - /* no autibsp */ - return; -} - /* { dg-final { scan-assembler-times "pacibsp" 3 } } */ /* { dg-final { scan-assembler-times "autibsp" 3 } } */ diff --git a/gcc/testsuite/gcc.target/aarch64/return_address_sign_b_2.c b/gcc/testsuite/gcc.target/aarch64/return_address_sign_b_2.c index 9ed64ce0591..748924c72f3 100644 --- a/gcc/testsuite/gcc.target/aarch64/return_address_sign_b_2.c +++ b/gcc/testsuite/gcc.target/aarch64/return_address_sign_b_2.c @@ -14,5 +14,18 @@ func1 (int a, int b, int c) /* retab */ } -/* { dg-final { scan-assembler-times "pacibsp" 1 } } */ -/* { dg-final { scan-assembler-times "retab" 1 } } */ +/* eh_return. */ +void __attribute__ ((target ("arch=armv8.3-a"))) +func4 (long offset, void *handler, int *ptr, int imm1, int imm2) +{ + /* paciasp */ + *ptr = imm1 + foo (imm1) + imm2; + if (handler) + /* br */ + __builtin_eh_return (offset, handler); + /* retab */ + return; +} + +/* { dg-final { scan-assembler-times "pacibsp" 2 } } */ +/* { dg-final { scan-assembler-times "retab" 2 } } */ -- 2.25.1