From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from EUR01-DB5-obe.outbound.protection.outlook.com (mail-eopbgr150075.outbound.protection.outlook.com [40.107.15.75]) by sourceware.org (Postfix) with ESMTPS id E10853858C52 for ; Fri, 23 Sep 2022 09:23:23 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org E10853858C52 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-Seal: i=2; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=pass; b=l9ZZtTQOCU14WolgWPEJbJ7CS/+XugYTzCIzqwMRGUQEqx2u1Swg2w6Ahu9Rfv/Pyld2qAWJbx/vAp2aCUh2LdYb61OV9q3fUdIMaRE9u0FP4D1J79SWh6i2577NOJvC/TGJDU0G316YiJgZqtHITaSWofpCvUppRvoDbWfhwkUicES7gCUx0aQFiLttFV6Vb+PzVd8GQ8duzIJxNWe4NaJKHvaDaIVVlNLtog1rzzIxc3wixPA/bJtQTS7FcBy089hUWXypZlDk7wrHmTo+VwnJppwBs3IQchQ4trNB2BuJaOsHNyz03XUk5BzXyRL+bgPa30jbwzUT4moUq6J+vQ== ARC-Message-Signature: i=2; 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=+WfOepKr28gExNXSYxvXLzm1y7bAasYuH+oBehq8edI=; b=Tvkk2DsAvAFnmLDVef8k8PfM7Drb2RPk+e+YqBVDBGl2Aqn45OJX8aEb35H3qxHeYDGDW8mLveRSSFEVu+n2eD3tM46b33NJH4Y1uzta26mA58WfrdRnlLdUgCpNnX0xXzkvCKkSz1sIt4Up8FucoSFFwM+COz5uF0IA/sjwYxmdz8g0yMfzUgb3ynRvkLALLVz8uCW9rvWbMuolCFWZ8hI+DoJ7jKnPmdhJ71DGC7e/Fgc59/dxQuKOwYAQiDQwoOMZ/Hz+owAJxHUhHJjK4yLCyZiRT4UFlOHWYbyf0Wi87rIppAnfksQTTAqBeDFjecPjG9PkLfvkz3ldTEFyXg== ARC-Authentication-Results: i=2; mx.microsoft.com 1; spf=pass (sender ip is 63.35.35.123) smtp.rcpttodomain=gcc.gnu.org smtp.mailfrom=arm.com; dmarc=pass (p=none sp=none pct=100) action=none header.from=arm.com; dkim=pass (signature was verified) header.d=armh.onmicrosoft.com; arc=pass (0 oda=1 ltdi=1 spf=[1,1,smtp.mailfrom=arm.com] dkim=[1,1,header.d=arm.com] dmarc=[1,1,header.from=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=+WfOepKr28gExNXSYxvXLzm1y7bAasYuH+oBehq8edI=; b=BU1j96vZWbdHDK+vzCQBLMrIQmLgUDnxcX+vceqk65JnaCNIRAlR4gUF6vZP1IkhBuWTKTvP6tDOcZS8dW/aydBNDZsY5GPkvrJh0LvJVYHrhU0fkc1nDJqFoNZ+4orOvIKvkJTlUzu/6TnpfNpJkxLa63U5WwLFyTLvUTnqOPs= Received: from AM6P194CA0060.EURP194.PROD.OUTLOOK.COM (2603:10a6:209:84::37) by DU0PR08MB7761.eurprd08.prod.outlook.com (2603:10a6:10:3bb::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5654.18; Fri, 23 Sep 2022 09:23:21 +0000 Received: from AM7EUR03FT061.eop-EUR03.prod.protection.outlook.com (2603:10a6:209:84:cafe::bb) by AM6P194CA0060.outlook.office365.com (2603:10a6:209:84::37) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5654.20 via Frontend Transport; Fri, 23 Sep 2022 09:23:21 +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 AM7EUR03FT061.mail.protection.outlook.com (100.127.140.72) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5654.14 via Frontend Transport; Fri, 23 Sep 2022 09:23:20 +0000 Received: ("Tessian outbound 0a0431bdcdb4:v124"); Fri, 23 Sep 2022 09:23:20 +0000 X-CheckRecipientChecked: true X-CR-MTA-CID: 5adbcb8207ece296 X-CR-MTA-TID: 64aa7808 Received: from d4c66252cf51.1 by 64aa7808-outbound-1.mta.getcheckrecipient.com id 95F7A294-B5C9-42AD-898A-ECD66AC2DF83.1; Fri, 23 Sep 2022 09:23:10 +0000 Received: from EUR01-HE1-obe.outbound.protection.outlook.com by 64aa7808-outbound-1.mta.getcheckrecipient.com with ESMTPS id d4c66252cf51.1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384); Fri, 23 Sep 2022 09:23:10 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=JwiWEH4sK5qIDbkMgDvQ5izJatzSiOwPBL1UPMVqEN+sdec8EhmKuq4apM1Gyus1ow3Q8xXC/MB3QSqX9ac2a72nACQ3jsnjBgLx2eYq+SyJRwnAr5yQ3rwClpxQKygB9SyWn9/U2zSY2rpwRw3AEiy9cDjJwIiZSCB7c6Z7J2iX+MIv9roXQK5KfoP/3qJz79MdhKdK+moL0+xBRFxpduiII0hHedPRIQkvc0pwC3Kmu5Mb/sg9GwdRRptIZk0cSFQv4gD+7mvuj72VxwmPmrz/LfFXlf7VgMAHzXtFtwBSGQ54oaCt+UoiACZvTEQjgPek92TloVjHa6053gXnSA== 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=+WfOepKr28gExNXSYxvXLzm1y7bAasYuH+oBehq8edI=; b=LxFiQAdG4nRBlT2NVFQ34sEiWIkSJmrt9TIgyAR9PkIDQ3IQ1NUNf5fXyazobiAgzRGSjx2LvciEvNA5GoxqiCFCBWApbPIz7lYD4Sb2m6DZsGZzqVQ1+nDMO8nrsW6UeZbyUlzY+15Kqkiumgz6ELygKJijJ/N6i+g/fHCHb+ReQUTJkyFBMEtz0CNq4HUCcWDuDeQgPsUgJcYK7wSoJjPIJ6+XcHvEfHcC2SMUq0vbeBOFh4i7yAw0WZ39KfP6GBW0MoaNX0WIKZ3PrcQ30LNfsXoBnhR5dR9bbFm0hdHyMwt0eHyaVAO+jzr0CXMK7kDp5B68kmD+pAavsIsliw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=arm.com; dmarc=pass action=none header.from=arm.com; dkim=pass header.d=arm.com; 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=+WfOepKr28gExNXSYxvXLzm1y7bAasYuH+oBehq8edI=; b=BU1j96vZWbdHDK+vzCQBLMrIQmLgUDnxcX+vceqk65JnaCNIRAlR4gUF6vZP1IkhBuWTKTvP6tDOcZS8dW/aydBNDZsY5GPkvrJh0LvJVYHrhU0fkc1nDJqFoNZ+4orOvIKvkJTlUzu/6TnpfNpJkxLa63U5WwLFyTLvUTnqOPs= Authentication-Results-Original: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=arm.com; Received: from VI1PR08MB5325.eurprd08.prod.outlook.com (2603:10a6:803:13e::17) by DB9PR08MB7557.eurprd08.prod.outlook.com (2603:10a6:10:304::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5654.20; Fri, 23 Sep 2022 09:23:05 +0000 Received: from VI1PR08MB5325.eurprd08.prod.outlook.com ([fe80::6529:66e5:e7d4:1a40]) by VI1PR08MB5325.eurprd08.prod.outlook.com ([fe80::6529:66e5:e7d4:1a40%4]) with mapi id 15.20.5632.021; Fri, 23 Sep 2022 09:23:05 +0000 Date: Fri, 23 Sep 2022 10:23:03 +0100 From: Tamar Christina To: gcc-patches@gcc.gnu.org Cc: nd@arm.com, richard.sandiford@arm.com Subject: [PATCH][testsuite]: make check-functions-body dump expected and seen cases on failure. Message-ID: Content-Type: multipart/mixed; boundary="hM802g18hmdyH5oG" Content-Disposition: inline X-ClientProxiedBy: LO2P265CA0390.GBRP265.PROD.OUTLOOK.COM (2603:10a6:600:f::18) To VI1PR08MB5325.eurprd08.prod.outlook.com (2603:10a6:803:13e::17) MIME-Version: 1.0 X-MS-TrafficTypeDiagnostic: VI1PR08MB5325:EE_|DB9PR08MB7557:EE_|AM7EUR03FT061:EE_|DU0PR08MB7761:EE_ X-MS-Office365-Filtering-Correlation-Id: bd986a95-bd34-4d03-cc63-08da9d4541e5 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: IurcIYvbyHKfO5wjkhcQi8Z9B0D9/KrnLl0agfL00o3EIdF0ADLIYvttN4/xlIsY1mcnapQMKyWcLyUviLyxaR2NPOw9YSHWBjlND0ERkMSu0RheyliyQ/YTP0f8zYVTnV8Kz50vzAvRgYAIFGvdXOArQLWnXxU5PN5lwe5y54UJW8zrPQPltQjKe+jar/0068Yw/24XQkavJjsOxPJknRJXvOTUAOSUZq4qyOj+piyWz/mS7OL/Hxr7UYGISBdjHDe7TZr8dhhRaJiSngU15+po/Yfnw7wdu67BdowytaEFT3wZv9MQkRWetFoCuT+VPaoSZCnfmlPgR9i4udTvHNUEgpj9s2KblZhDQ0FlFtw2K8QOB8M6drDLXZUnNv+f73j0NaFncFxOyfy5d2EVvqABKFayoJwZ+gQPlkMQ2L8P4B8d67yhDHhuDGgdDck52FYVXipf4TkZ+QlfKz5GSmnpVS/K//zFein9d1aJSg9ph6IHPWGe9NI98R2Hs55FabyPBbx0BjMwpQajSg2jtDrippcbzX6jRcA93+OjKVQSjuWc+FcxNxLJS1HRdKWeYbbI1l7husYDBmzxIUHtciOygggTxgPN1N48l0Djq9uqsuvogORi69+hE4YG9VbnP+lh6uWAK44ut3FhjkxUdz47TOfEohNnhzJDHj8LbVqYbJBUtBG9tc9J6D0Za19OLm8EQfnAa5flqRs7neGn3JxtC5ki9q3manj1Mi4dKdggU4RMpUmuC4FnCWEcLb5T49ASuSRkGhfo9+wd1ObD0A== X-Forefront-Antispam-Report-Untrusted: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:VI1PR08MB5325.eurprd08.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230022)(4636009)(136003)(396003)(376002)(39860400002)(366004)(346002)(451199015)(41300700001)(83380400001)(6506007)(33964004)(235185007)(38100700002)(5660300002)(316002)(44144004)(186003)(2906002)(66476007)(6512007)(44832011)(26005)(66946007)(66556008)(4743002)(6486002)(2616005)(6916009)(8936002)(8676002)(4326008)(36756003)(478600001)(86362001)(4216001)(2700100001);DIR:OUT;SFP:1101; X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB9PR08MB7557 Original-Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=arm.com; X-EOPAttributedMessage: 0 X-MS-Exchange-Transport-CrossTenantHeadersStripped: AM7EUR03FT061.eop-EUR03.prod.protection.outlook.com X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id-Prvs: 8aac7618-120a-4b0a-a892-08da9d453893 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: Yb+lSwqgHzttGsSyHmCm8E1OA8ny3NdhOAk+L8jkaM7pp5+8TKV9nImsi3PGu+1xbOgMP62fpDpzGtG/zv/Q2dq2XR5E4fISa1aOMShUNe0XGWZkS9kISVCAT7BHUmHV/06Xk7DGjzph6ZrdLf2rHleqNPNIdXYvfUSL7dDEgAXdDVVB71G5DLfI61fTiAh4kxS3GUczjbwO96gsC4ayd0+xur18EKIq0v7oX+zO0hwc0Mfra+T/VDugE9I/hnkOxHHmxb5U0oekW/5ixKJq/utrFlExHcBjnbAbdxymygrc2mEZ9SevmbsziApsRLCN1U0wiUHNFx9jOsjTstP8B8xlDHuG2y5qzdeCElkp4jzhS1qsTtutdxrVE8rOASD8/8JyZ6doLbLhzo6/13DEH9rJa+b26ZyZQlTxR/XIwE5xqyaopXWX40/5lqYrE6/D1PodtbCIkN4vAzPOUnXdJg+oB9MMKWAbGv1kJ3q+dgnj1HogJqrrl/NFjx5Uk3JTdqyf0f40Q87kA5mgy7vQfInyWfKU8jGZ+9hV/uzxPDW6LJ30eaUqdtRdsLPdO+grXJcIHma1AHtsG+iOm7SJRbAOHKCFYT3FlsSBfUEakwQ8GEBFD9HpFIQQlJO/g4Ki9q0a2Lns1DqKdU96z069Z1l1ZxUw/63rpDTzytZZPmHQMxbbzE78wR4Dl+0cGqdAsMtOZjpFOble5nRtUQcQgdKneiR59ks+mVgd7aWiAlpZp1YEQmXBUykiR7EbxsI2UDjPzhMqmr2At/UIoigidxVAkAUBl8MdllMbrUtlmyoaxhzYK615pOCUlWEjyEju 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:(13230022)(4636009)(376002)(136003)(396003)(39860400002)(346002)(451199015)(46966006)(36840700001)(40470700004)(81166007)(356005)(82740400003)(36756003)(86362001)(36860700001)(83380400001)(44832011)(4743002)(82310400005)(40460700003)(2906002)(478600001)(40480700001)(6486002)(186003)(2616005)(26005)(44144004)(33964004)(6512007)(6506007)(336012)(8676002)(6916009)(70586007)(70206006)(8936002)(41300700001)(47076005)(4326008)(316002)(5660300002)(235185007)(4216001)(2700100001);DIR:OUT;SFP:1101; X-OriginatorOrg: arm.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 23 Sep 2022 09:23:20.9604 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: bd986a95-bd34-4d03-cc63-08da9d4541e5 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: AM7EUR03FT061.eop-EUR03.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DU0PR08MB7761 X-Spam-Status: No, score=-12.7 required=5.0 tests=BAYES_00,DKIM_SIGNED,DKIM_VALID,FORGED_SPF_HELO,GIT_PATCH_0,KAM_DMARC_NONE,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: --hM802g18hmdyH5oG Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Hi All, Often times when a check_function_body check fails it can be quite hard to figure out why as no additional information is provided. This changes it so that on failures it prints out the regex expression it's using and the text it's comparing against to the verbose log. This makes it much easier to figure out why a test has failed. Bootstrapped Regtested on aarch64-none-linux-gnu and no issues. Ok for master? Thanks, Tamar gcc/testsuite/ChangeLog: * lib/scanasm.exp (check_function_body): Add debug output to verbose log on failure. --- inline copy of patch -- diff --git a/gcc/testsuite/lib/scanasm.exp b/gcc/testsuite/lib/scanasm.exp index a80630bb2a819812ce1fe05184535011a12f1288..7c9dcfc9b2e49093355219f76838161f4c3302df 100644 --- a/gcc/testsuite/lib/scanasm.exp +++ b/gcc/testsuite/lib/scanasm.exp @@ -803,7 +803,12 @@ proc check_function_body { functions name body_regexp } { if { ![info exists up_functions($name)] } { return 0 } - return [regexp "^$body_regexp\$" $up_functions($name)] + set fn_res [regexp "^$body_regexp\$" $up_functions($name)] + if { !$fn_res } { + verbose -log "body: $body_regexp" + verbose -log "against: $up_functions($name)" + } + return $fn_res } # Check the implementations of functions against expected output. Used as: -- --hM802g18hmdyH5oG Content-Type: text/plain; charset=utf-8 Content-Disposition: attachment; filename="rb16250.patch" diff --git a/gcc/testsuite/lib/scanasm.exp b/gcc/testsuite/lib/scanasm.exp index a80630bb2a819812ce1fe05184535011a12f1288..7c9dcfc9b2e49093355219f76838161f4c3302df 100644 --- a/gcc/testsuite/lib/scanasm.exp +++ b/gcc/testsuite/lib/scanasm.exp @@ -803,7 +803,12 @@ proc check_function_body { functions name body_regexp } { if { ![info exists up_functions($name)] } { return 0 } - return [regexp "^$body_regexp\$" $up_functions($name)] + set fn_res [regexp "^$body_regexp\$" $up_functions($name)] + if { !$fn_res } { + verbose -log "body: $body_regexp" + verbose -log "against: $up_functions($name)" + } + return $fn_res } # Check the implementations of functions against expected output. Used as: --hM802g18hmdyH5oG--