From patchwork Mon May 31 16:57:57 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Jose E. Marchesi" X-Patchwork-Id: 1485733 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=gcc.gnu.org (client-ip=2620:52:3:1:0:246e:9693:128c; helo=sourceware.org; envelope-from=gcc-patches-bounces@gcc.gnu.org; receiver=) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=gcc.gnu.org header.i=@gcc.gnu.org header.a=rsa-sha256 header.s=default header.b=YTo2LLGe; dkim-atps=neutral Received: from sourceware.org (server2.sourceware.org [IPv6:2620:52:3:1:0:246e:9693:128c]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4Fv1hP2XJFz9s5R for ; Tue, 1 Jun 2021 02:58:29 +1000 (AEST) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id C4BFD3938C3D; Mon, 31 May 2021 16:58:21 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org C4BFD3938C3D DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1622480301; bh=h3Lf5SaqxnCHbscFkUUkN9l9+x4vpM8k7m+Fv1ePQsI=; h=To:Subject:Date:In-Reply-To:References:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To: From; b=YTo2LLGeVP+gKcPC9siAoZ5iCfYsgEHUbn6HYUl02wBcGgIOI6x3YVUjAdfxp9oGc ZglkbvcHCQz6897CVw8cNG6RqK9P4K/I5Hg2Wfu6lm5iZMuMSDnZF6Cgh2AhtzvavA yKRIwFgALxreC0byb5bNQoAF9ETfziEoytz+jAD8= X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from userp2120.oracle.com (userp2120.oracle.com [156.151.31.85]) by sourceware.org (Postfix) with ESMTPS id 8E12C386486B for ; Mon, 31 May 2021 16:58:18 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 8E12C386486B Received: from pps.filterd (userp2120.oracle.com [127.0.0.1]) by userp2120.oracle.com (8.16.0.42/8.16.0.42) with SMTP id 14VGnssj108748 for ; Mon, 31 May 2021 16:58:17 GMT Received: from aserp3030.oracle.com (aserp3030.oracle.com [141.146.126.71]) by userp2120.oracle.com with ESMTP id 38ue8pbhse-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Mon, 31 May 2021 16:58:17 +0000 Received: from pps.filterd (aserp3030.oracle.com [127.0.0.1]) by aserp3030.oracle.com (8.16.0.42/8.16.0.42) with SMTP id 14VGoOe7174121 for ; Mon, 31 May 2021 16:58:16 GMT Received: from nam02-sn1-obe.outbound.protection.outlook.com (mail-sn1anam02lp2042.outbound.protection.outlook.com [104.47.57.42]) by aserp3030.oracle.com with ESMTP id 38ubncjb0r-3 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Mon, 31 May 2021 16:58:16 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=lau7jmUH1fyEyD4P/RJGa6Wgyi78YigEQXGVzIFcHuEAe8p18XbI7Pl9H7BEnx7QHuKpG/p0b8MkqWms6oPP0p/QJ+qZ2UKmH3iSDBG5ovYm0U0XEkiTGHQnGCLj8rkHi+VCSe6zcJcwKpC7AdWxBJf/aVth0aDHJwmZCkJKb2ghKYo2eqINTfJsL7onDRqE6UuzJwze8oQEdA3mqWxdfcc4oUt99qTzKryyluxdDwCeRp6/JA8gcA+XSFLDGWo9vEpu6lHUha1JpWyO1LJfqnc6j+zZf5/yXe9TLdTuKOIdUEzrexDrwgk3iJ2ruklk+QrN4qAXYTVWTlYAFzrz+g== 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-SenderADCheck; bh=h3Lf5SaqxnCHbscFkUUkN9l9+x4vpM8k7m+Fv1ePQsI=; b=UeVPzErxDqq5xO5TRo9mwpyEfAS9kELtVLm8XpO2TQS35YSNSrEGQaZRps2cg0b0jcWGMzf4HV9Cq9nBwbqA0mViwhM1KDNxZqaUSRR4lIxCQsRnZgue02/kUZXqQ/EqmwHm6mMD9l4cSNYoWtZmEC0UCnbI2JKpoA4Y8sWx1ixGfzOLmfQdi6kVu7Ek+Mq8PuBr+ach5n2mWLwBrmlF0Ih2wwumJ9TTOHGQ2G8FRvmcpV++//tkbTwLfPhY5Qec527OTOjLoBKpsHsz7fdU4vq2RMtFGIejyQq1PacJgPKYvIMpTFKQpSI8SitYI6u8zfe4aU6/LpJtGo2/F98waQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=oracle.com; dmarc=pass action=none header.from=oracle.com; dkim=pass header.d=oracle.com; arc=none Received: from DM5PR10MB2041.namprd10.prod.outlook.com (2603:10b6:3:111::16) by DM6PR10MB3257.namprd10.prod.outlook.com (2603:10b6:5:1a1::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4173.21; Mon, 31 May 2021 16:58:15 +0000 Received: from DM5PR10MB2041.namprd10.prod.outlook.com ([fe80::14a9:31e9:48af:5e4f]) by DM5PR10MB2041.namprd10.prod.outlook.com ([fe80::14a9:31e9:48af:5e4f%8]) with mapi id 15.20.4173.030; Mon, 31 May 2021 16:58:15 +0000 To: gcc-patches@gcc.gnu.org Subject: [[PATCH V9] 2/7] dejagnu: modularize gcc-dg-debug-runtest a bit Date: Mon, 31 May 2021 18:57:57 +0200 Message-Id: <20210531165802.5686-3-jose.marchesi@oracle.com> X-Mailer: git-send-email 2.25.0.2.g232378479e In-Reply-To: <20210531165802.5686-1-jose.marchesi@oracle.com> References: <20210531165802.5686-1-jose.marchesi@oracle.com> X-Originating-IP: [141.143.193.73] X-ClientProxiedBy: LO2P123CA0070.GBRP123.PROD.OUTLOOK.COM (2603:10a6:600:1::34) To DM5PR10MB2041.namprd10.prod.outlook.com (2603:10b6:3:111::16) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from termi.localdomain (141.143.193.73) by LO2P123CA0070.GBRP123.PROD.OUTLOOK.COM (2603:10a6:600:1::34) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4173.20 via Frontend Transport; Mon, 31 May 2021 16:58:15 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: f8810029-00b2-4fb3-172c-08d92455487a X-MS-TrafficTypeDiagnostic: DM6PR10MB3257: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:6108; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: GAV/cC5emP9Nv4Wf5JI2q5KPBamuTlG301VKuZkrenVXL5UgB1KENAoR0Sd4AOCaxatGW0WtmV2/MxaeWozwRX6m9xaJD7yXK4Ho4SMTBiQ7MnlPKhINfrV95GGyIB540VeRSf/toFgKbDQMFpmhx4EyRA+AynKQFTgqKecEz/Vp2kml5hEf6LJQsSb5lmroSCS7s2BC/SG8SC0aBFMF0TDwGBPS1v2ZIKaa+Kz8paMvQAdhrV36/r2Zd9qIT50PwFH7Yu8TpyQq2uqlYxwS5S5Rv2X3SqdDKlhgWJJ5ZBXWnPNHqx/S/qxVsWYuCBB8PtiJyDaSEKDG+Ectj8Qj8IwxKcW5tV92DAUu/fRb01Jo04Lgj0+yiTeCZhoHYHsf/+4+BX+5FaYGwMSRdWCee607CaYkxuy+kaTVSRAFb5ZYa5Ca5T0szIfoMD1eJHSPNMGvKdjKr5gE9AhsgXZP90+JAnY8xRG7XHkLk/trYLq+9L8UnHeAigrXxznJaBBPgvFu1LQkLgR1SxdDVZAZoxLKC42aR03IsyW50bEW35bqoKNVCt027ocxXzqwDSgJbVzZUhb6cD06yZ+ods2DWn+kqV7LOmhTBJNYnk7zAG2NC7r5ITwZ6t+XEPEO2d6Ax3m1QzIepn4xl9xSkD9KtA== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:DM5PR10MB2041.namprd10.prod.outlook.com; PTR:; CAT:NONE; SFS:(376002)(366004)(396003)(346002)(136003)(39860400002)(478600001)(83380400001)(16526019)(8936002)(66476007)(86362001)(186003)(38350700002)(8676002)(2906002)(5660300002)(52116002)(1076003)(6486002)(36756003)(6916009)(6666004)(6512007)(316002)(38100700002)(6506007)(26005)(956004)(2616005)(66556008)(66946007); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData: vVYyvFBZT9QwwvoJl84JclaFGQnNIAxVVrTPK3d5jUE8U+l60xG8lQCOzAxszcYnU36ZyOGVRZrrYj0ZL5vl4sw0clouv+r3vBmGlbsHxR3MNfcnB5n9JlkgSCrOR58U/FZ2IsUUXHnXuO7td5LO4mI5xvNVSj7TLpCOjg4kiiu3a+uUX1RQpLjdMHgq63hrcgv6KH+aNSSrIV6ZNMLIxvop+jKTijXiBjAV4sz96ALQFLE2Z+eWPVewB9Eee3Jswyp0zTOBewq0QAO+fW0K3atCLDfu2uzawF2Ib+3J9rHSBRnSsSJZ3S2OVzD4dj+Ssr3PVH5GDsx+cNdlvo0j8SHJUqIiLM47+os3JvLO0f1QAlTzDOU0Bwzk4GHcV+92fGlaLue99MWWaT6kpHSVt+XLGMpynWKq6msL/jTa8ydZaoNNewcDgO8nIcnEnYYu2ZWLkQPwP3flNMgV9QmWVUNUmNXjH92dD6Za730SbGEm/5UexM86gotG3N8+CL25hZq/CLx2L+CncQ8J2rBoy19JJ0VpU0rHaktrdv4eyBDV8lHan4wh0aS2sr9vFPu9m5ihEWdwDn2P6nbXCVar4y9dZHPm3aLNowr5CuoX8OUm1+KvjkHT4fVWFCzonqo5PduWxDnzkk07H9JvDv9XqEG8mnO3EubNhBA+FN/bP8+P3DHlQk5bEkW2GYiowiNof4nU4UJP5DwnuSz9mACm5ky+IIacJXe2lZn7Gv1QV4f5RuQCGqmaCuzw06ty6T+BhDlL4huZCbmX0Hqg6MUrD7rl3CHIaXK99XUQJ1jTVFLqWTCSv0D6yRTyIL0+Iqf/JXNtDSGkXA691xLZm/UWVM84s8tcuKawKEfHnhkijXaP5AFtDMh2XqdFod26JOj7ndYkgSxq6+X03VfszT0vWzin10Ws9Jy3dkMY6WM1sEt0thNoh/Q6Qto0XhE+qC4c7PO7nUJ1PfBDlls0fzL5zzoYZ1dTQGrKJx328r4KS2ghjd0V0LVH93k3f6zY+WWAKA1vspV1/DbZT3xTw/c1ZaqQAsNyuDskTvUodzPXjcnF58v7rKwSPacL7QZoiaalSKAIgzUq2zKFCFqckd5W4cI07o0dGmroj2/TdB31ObXuK7mByVbX/YUDMoXtYxGjmcFnC5EC0DDqR2jDCYPHdbnSbT0ADXhduhErJdcfqcyRK/kUZDBRtB1SNn6iwfTVCTiICKhksfQ6rGaUZ4JO+/fYdEZLmitBvWAocB06divCS51EfpJuhkAmbQcB3P7txGVIkStorm1Rcghy3dul2CtYtvQJiwDzImTxqMWjVcdJeleKH7+tn6/S5S/I+tqX X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: f8810029-00b2-4fb3-172c-08d92455487a X-MS-Exchange-CrossTenant-AuthSource: DM5PR10MB2041.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 31 May 2021 16:58:15.7686 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 4e2c6054-71cb-48f1-bd6c-3a9705aca71b X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: /jUQViRk79h9UYfhiFlgN6JlfSBFg10Mp+xx2hwFWElTk6CJkzf605jqmNxdt+E21OdXoxM01+R56rBNfkP/A/yviA8xlZlflyB/7s8lumw= X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR10MB3257 X-Proofpoint-Virus-Version: vendor=nai engine=6200 definitions=10001 signatures=668682 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 adultscore=0 bulkscore=0 phishscore=0 spamscore=0 malwarescore=0 mlxscore=0 mlxlogscore=999 suspectscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2104190000 definitions=main-2105310126 X-Proofpoint-GUID: ZrZHBGyMMhzocNB9LZgxe1fatKrRTdZd X-Proofpoint-ORIG-GUID: ZrZHBGyMMhzocNB9LZgxe1fatKrRTdZd X-Proofpoint-Virus-Version: vendor=nai engine=6200 definitions=10001 signatures=668682 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 mlxscore=0 impostorscore=0 malwarescore=0 adultscore=0 suspectscore=0 lowpriorityscore=0 spamscore=0 bulkscore=0 phishscore=0 priorityscore=1501 clxscore=1015 mlxlogscore=999 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2104190000 definitions=main-2105310126 X-Spam-Status: No, score=-11.3 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, MSGID_FROM_MTA_HEADER, RCVD_IN_MSPIKE_BL, RCVD_IN_MSPIKE_L3, SPF_HELO_PASS, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on server2.sourceware.org X-BeenThere: gcc-patches@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: "Jose E. Marchesi via Gcc-patches" From: "Jose E. Marchesi" Reply-To: "Jose E. Marchesi" Errors-To: gcc-patches-bounces@gcc.gnu.org Sender: "Gcc-patches" Move some functionality into a procedure of its own. This is only so that when the patch for ctf comes along, the gcc-dg-debug-runtest procedure looks bit more uniform. gcc/testsuite/ChangeLog: * lib/gcc-dg.exp (gcc-dg-target-supports-debug-format): New procedure. --- gcc/testsuite/lib/gcc-dg.exp | 23 ++++++++++++++++------- 1 file changed, 16 insertions(+), 7 deletions(-) diff --git a/gcc/testsuite/lib/gcc-dg.exp b/gcc/testsuite/lib/gcc-dg.exp index fce0989cd9c..c7722ba07da 100644 --- a/gcc/testsuite/lib/gcc-dg.exp +++ b/gcc/testsuite/lib/gcc-dg.exp @@ -621,18 +621,27 @@ proc gcc-dg-runtest { testcases flags default-extra-flags } { } } -proc gcc-dg-debug-runtest { target_compile trivial opt_opts testcases } { +# Check if the target system supports the debug format +proc gcc-dg-target-supports-debug-format { target_compile trivial type } { global srcdir subdir + set comp_output [$target_compile \ + "$srcdir/$subdir/$trivial" "trivial.S" assembly \ + "additional_flags=$type"] + if { ! [string match "*: target system does not support the * debug format*" \ + $comp_output] } { + remove-build-file "trivial.S" + return 1 + } + return 0 +} + +proc gcc-dg-debug-runtest { target_compile trivial opt_opts testcases } { if ![info exists DEBUG_TORTURE_OPTIONS] { set DEBUG_TORTURE_OPTIONS "" foreach type {-gdwarf-2 -gstabs -gstabs+ -gxcoff -gxcoff+} { - set comp_output [$target_compile \ - "$srcdir/$subdir/$trivial" "trivial.S" assembly \ - "additional_flags=$type"] - if { ! [string match "*: target system does not support the * debug format*" \ - $comp_output] } { - remove-build-file "trivial.S" + if [expr [gcc-dg-target-supports-debug-format \ + $target_compile $trivial $type]] { foreach level {1 "" 3} { if { ($type == "-gdwarf-2") && ($level != "") } { lappend DEBUG_TORTURE_OPTIONS [list "${type}" "-g${level}"]