From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from DM6FTOPR00CU001.outbound.protection.outlook.com (mail-centralusazon11020002.outbound.protection.outlook.com [52.101.61.2]) by sourceware.org (Postfix) with ESMTPS id 13CC03858C53 for ; Thu, 9 Nov 2023 02:46:36 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 13CC03858C53 Authentication-Results: sourceware.org; dmarc=pass (p=reject dis=none) header.from=microsoft.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=microsoft.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 13CC03858C53 Authentication-Results: server2.sourceware.org; arc=pass smtp.remote-ip=52.101.61.2 ARC-Seal: i=2; a=rsa-sha256; d=sourceware.org; s=key; t=1699497997; cv=pass; b=rzy4+OJnn9Lrr09NQTJZm0QqpTHW6GpXOQWMPlBdWDQDrTiGX3kHeVgMhoX1rsLmVQ4g+iEPYeEPOmp6AoCctPTSTiH6d3EuiFQD+748SNl2YWuZrsYr0LiI1CWjI+sjdTZ3Xe8FkxfYJWMt4dV7Za2shM6rQbh0cw7ZbtosMTs= ARC-Message-Signature: i=2; a=rsa-sha256; d=sourceware.org; s=key; t=1699497997; c=relaxed/simple; bh=0JiWYpJ1FznMU+Pr5jLyelbDBGnMYDPXYlzftOyJ8aw=; h=DKIM-Signature:From:To:Subject:Date:Message-ID:MIME-Version; b=QfxMVLNA8KnTeEOxE7eCrx14teoyw/ED9uEblq0Kk3XbjYJgpc977oG91GozvNrN7Ey36TyT2361EJuyljVzHx+X4uiUeoj5K+g9jZrl0ojaXsr4VJvZ1rku50y/7ABQQblAej6ElISxy00E0CRZsPnL8t752ZtlR3YY2MPqWzk= ARC-Authentication-Results: i=2; server2.sourceware.org ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=cCSJnsT/J71x+6i8JyO1hPcWmv+wvFzSfMu6H9L5DN0jdo2JzBz2tHdM4tw45am0+Bk73tuJwhEoLId2BEdxzLX+0aM4/AL9AS0NpGEVnQSqlCDXZdh41bX14kWteqmNQ0Czk8Ol8NQWAMg41YTv1CQsa0qvO5txqRcAN2RIi47ykzIKWujgWOCCpwJhBIo5qOwaGPHUz4qZCWlPtYbDn1CLoMoUfiDrsOwrStEb2CnmJDfvGqQ290l6R9pf72Y0MihXv/gImwVAAbz6GjIPECrXkT92cLjsUaHQ7fc4D+fiMVZiDeuPuX0yDH9iGIC5Gnj/gArJ2/lHFVydO9oJNw== 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=F+CYJQvN+ppb94zOsthVdywh19hRg2l2rxscajLUP+0=; b=ZpKlYpCMb2rvWLwXO3yX+NTSIs0SPixOpXCez3tHnymiwf4OJTyoptHhcT7cTTTMWpbge1IuS02RLFN+CIIYlaAKeKl/yxX0ylswb7Qm/4mkqYTWchfWFWOi3gQIoAywrCYvq1ltuQU28U1cLtrxkhIh2a1NGn9SOV2pqb/7Q1M4PskSZTnHxbF4A+WCnqJ5O6WtmWKNu4cHwHoaoPSss/hjW01yvYdQj2COwigqXEdkxSW99zp1OiH7dWSSrtfsLq8Pk9WzTKV+XybFQyCYZGIsQnauVAvs+UpgxMjrugjlAlt/e2eUCP2nzJL2KHF1BcZE4aeyR51ndjHXexWNrQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=microsoft.com; dmarc=pass action=none header.from=microsoft.com; dkim=pass header.d=microsoft.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=F+CYJQvN+ppb94zOsthVdywh19hRg2l2rxscajLUP+0=; b=JSPaIvRmnQsCmKDB34DzD4RkXAR+ZsOJGlUJNKdquGqkTJYkXqgnlhdpVFfwhA+Mt3bsOuy84oYwJueySkM0OS8bHUtVIgsVmHhtVZr/gcjFjygUY4phhEem6z0ELhSYWsU+eVowUdNgNpXms24MN9ZSMSZCWMEQsmGijXowDpg= Received: from DS7PR21MB3479.namprd21.prod.outlook.com (2603:10b6:8:90::11) by PH0PR21MB2047.namprd21.prod.outlook.com (2603:10b6:510:ab::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7002.0; Thu, 9 Nov 2023 02:46:33 +0000 Received: from DS7PR21MB3479.namprd21.prod.outlook.com ([fe80::b5cf:fe6a:5855:c741]) by DS7PR21MB3479.namprd21.prod.outlook.com ([fe80::b5cf:fe6a:5855:c741%4]) with mapi id 15.20.7002.000; Thu, 9 Nov 2023 02:46:33 +0000 From: Eugene Rozenfeld To: Alexandre Oliva , "gcc-patches@gcc.gnu.org" Subject: RE: [EXTERNAL] [PATCH] skip debug stmts when assigning locus discriminators Thread-Topic: [EXTERNAL] [PATCH] skip debug stmts when assigning locus discriminators Thread-Index: AQHaElt0FYQ+QTWZsEO6qQNfsAHy/rBxSEUw Date: Thu, 9 Nov 2023 02:46:32 +0000 Message-ID: References: In-Reply-To: Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: msip_labels: MSIP_Label_f42aa342-8706-4288-bd11-ebb85995028c_ActionId=afb9785a-359d-484d-ae28-212b23248da7;MSIP_Label_f42aa342-8706-4288-bd11-ebb85995028c_ContentBits=0;MSIP_Label_f42aa342-8706-4288-bd11-ebb85995028c_Enabled=true;MSIP_Label_f42aa342-8706-4288-bd11-ebb85995028c_Method=Standard;MSIP_Label_f42aa342-8706-4288-bd11-ebb85995028c_Name=Internal;MSIP_Label_f42aa342-8706-4288-bd11-ebb85995028c_SetDate=2023-11-09T02:43:16Z;MSIP_Label_f42aa342-8706-4288-bd11-ebb85995028c_SiteId=72f988bf-86f1-41af-91ab-2d7cd011db47; authentication-results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=microsoft.com; x-ms-publictraffictype: Email x-ms-traffictypediagnostic: DS7PR21MB3479:EE_|PH0PR21MB2047:EE_ x-ms-office365-filtering-correlation-id: c9c0199a-e559-4f97-5e82-08dbe0ce1560 x-ms-exchange-senderadcheck: 1 x-ms-exchange-antispam-relay: 0 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: /sOpo/Xqk0DegF3i+fraOdAivEsBYW1Wg9n5Inq60W0OcOUPHhJb8mjdZA2cqF4mL6htnpx1OC+47zyXy8avKyKsjRnM7xXx3qEE8PhHEewyLJ43jWj3zB4iBJQBWBwVoiVeBTWPhhQoSaqX0dRfDx+2zmnI8WXiEq0BuDnYzGE2pF19GyxKB7u1iS3SeHKmRNCbLCByaOYSoKK200Aq3uO4EQT9KfU4C68X4BTU9ETxh2MeYAN2fsQxjIfMAk9wqyvVc/fyL5A43FI2zUlhf/+cMVpKI2Sn7AuJdH56x0P9Zv4/9vILYrtr8nvVbl262cH4bVgRvVlBWdeRK50ud4fTLRCFEW/dI7FL6P1pPzYgqFoOxbgnVgZfZ5oHoAv7ExiNqaQfIK1/opphowfdJsTjLbn58IduH0K4AAKG5M67JSYZQPuceFzBEj6+gLZ3th41vevmlyczEDgmRWBYCQ1RDfzO4p+24hYXZ7zgIx8sOp03WuwDuZ1iwRtyw4WH0ayrfD3fV4gzwT3juxcfcSS9LACie+mvzcajSBEsuUR8T9Ut46KG8r6Tbm5ZtV4SLsjB3FUJDGkqBOLdU5wNG2Sk6MHGzuRLfvUYNZIF0zqDXKTzZQ7709g0x1nv17fQRxIidUJ68uf18KUC6oROefrj6Cdz9VD0Od81rpfY/tDT2YbuKhR558ex2sRfqf964Iyud8cj7asRAA4yNm6ekQ== x-forefront-antispam-report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:DS7PR21MB3479.namprd21.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230031)(346002)(136003)(366004)(376002)(39860400002)(396003)(230273577357003)(230173577357003)(230922051799003)(451199024)(1800799009)(64100799003)(186009)(966005)(66556008)(76116006)(110136005)(66946007)(122000001)(478600001)(38100700002)(38070700009)(71200400001)(53546011)(6506007)(7696005)(9686003)(10290500003)(83380400001)(86362001)(41300700001)(52536014)(8936002)(8676002)(5660300002)(2906002)(33656002)(8990500004)(55016003)(82960400001)(66446008)(64756008)(82950400001)(316002)(66476007)(2004002);DIR:OUT;SFP:1102; x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?us-ascii?Q?u2Ma2FAAtBDlE41Wreay6QIkkPJMeMeyMYQW2dbH7RmgaNW142P+YtrOV8G0?= =?us-ascii?Q?spMiHrEzcSN7ACSeBh8dqbsAeEHW59a+e5nK8gybCyZL3ZoVFU3zT8K8A1OZ?= =?us-ascii?Q?uOXSHjScxpTw44FhC2aCnSpY7Maj2GEnjY/dxR9wCTt7cSPed3zmrXSnQeJX?= =?us-ascii?Q?8s7kRfcFD8pxTzAbuL/zJQe0TQuZFJK1wUKubqNSVGLO0E+uGgqJQxo8RGvS?= =?us-ascii?Q?WVSLIDdStiFSt/8jUFk8M0T44x8KYvFDuywh9IyOhG6VU76+hmsBsvmPn/I2?= =?us-ascii?Q?Xfp5/cAtWrz6XINU5r63fPLBCGMX4cYW3BLJmdxRwxO3VC0Q/XwyWV19Rv7K?= =?us-ascii?Q?9H8fAxu47TXdgC+64borItRlvw/8q97lv6DLB2YAgdl3TkThDphsNEth4RAC?= =?us-ascii?Q?5a2t+o20C1VXll72OT0SqS1mYXGnjIewReHwm4qVgbjoLwMeP9hQxvOmCnZg?= =?us-ascii?Q?QDHQ8K2UFABqyPKLv/0rkd967CylMxgj878pUrroQe54rwfZNNhthT5B+2fO?= =?us-ascii?Q?WlcYsV0OCWXFuP5jqYr8tijLgcZrAg0BND+cDpGBBiIDR6lfkQA/4iTCwd7M?= =?us-ascii?Q?qrPIfWp3Bjutr+RL0A5f6Msk8Vs4Kk8GyHYh31QJ6XQtnR7R/x5nryVfCpJA?= =?us-ascii?Q?/aJywiXWYPgCtVVC+yZLyRxPJrpl1bqzhYAuGAjaglBakcdTFJEVfxFf8exs?= =?us-ascii?Q?PH6nxEer6Xa9oXhzdOfYZvyOgSIkCcXoCSHDF4tedwxBgIxg9OFegrep/wfb?= =?us-ascii?Q?KgdueDG6KuzAEv1sAqMMILZ3G5bUXadSSVH7pIF5vqOtKEWrvfMoObzFWp7y?= =?us-ascii?Q?BLR/QCuU5sHqrspSVWCxbfJaXsM6AgVl3NlAAjf5IY5mjrLgU/Q2haR1C/ir?= =?us-ascii?Q?DWCqm168q5Xr/SkBYNVzHzIkzrQ7favNjO49JC4RnKBoHUwDmN7UGf3OwIwp?= =?us-ascii?Q?agWeUBw1TawLQ3U+ieDJfnxnTjApheWDiiPgNVA8sYb4LzRmd+39uhxAtDOJ?= =?us-ascii?Q?W8XR9jk7aVXFAgoNlw6PrK4a222m73JNmEduBvMwJLxQ6p88bGFl+Bl2Km3J?= =?us-ascii?Q?essBWQPfoNMb/MAM7YyOc05fM/IzJapf0F+9CP9EXgPeh7XzU1YqHurrrHPV?= =?us-ascii?Q?TZ0yJ+EyY1QHZW20Nu0WkyQNiZMA7zda1bkCUfrc9zQi4fHrv1sY7nD6pmn4?= =?us-ascii?Q?8TjXPPoRhPYG898w3CpaVb92EAhsSpd4E1j5AdQztzoOoGmIZN2PMW0DRyF1?= =?us-ascii?Q?8LKSs68jlaNVn8fLtyXDgdDiI2TozcPzelNbf7Mu4NcYTN1X6kZ0SdMoXjBi?= =?us-ascii?Q?MtsxB6eqcFKSJgJjZ4O9YYYFanwD6yUDHZLBW7mhRglOAVSM8OX2ocsv8az+?= =?us-ascii?Q?FGJZNhQmkLhxDVASj+izRXKKgpWi+EsK1DjuxoJp8LHlhadXj7RiO65yPNwH?= =?us-ascii?Q?UyXUG8e5ph8rNJ7CmvkWZ5qsrfQOgPATm7LtDOUzNP+hyzyZeq+VO1DkVVPP?= =?us-ascii?Q?IagA/3/IFQXHg1ukJUR3T61BqM0v7B5Tlj0kV0RmfJFO10vzNjABxo9b2W2K?= =?us-ascii?Q?2wuJLh+oEmSqAwC6vwIv1fBUqu97mjqoFNVJu/843QX1vDqYLCW3UDqWdAG8?= =?us-ascii?Q?hp1dmIbEYCKGl0xOl2vXnhBLCRplmG39JhPsd0kGPZLw?= Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-OriginatorOrg: microsoft.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: DS7PR21MB3479.namprd21.prod.outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: c9c0199a-e559-4f97-5e82-08dbe0ce1560 X-MS-Exchange-CrossTenant-originalarrivaltime: 09 Nov 2023 02:46:32.9414 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 72f988bf-86f1-41af-91ab-2d7cd011db47 X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: c3q5bC96MU6nkWxE5/iNRgwWYqfr54V/t01B7RpC6hC+cY7NTQGnzWf6xDbNHG5De2YPf3/SYuP4ZAlO+t/WgQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH0PR21MB2047 X-Spam-Status: No, score=-10.4 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FORGED_SPF_HELO,GIT_PATCH_0,KAM_SHORT,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,SPF_NONE,TXREP,T_SCC_BODY_TEXT_LINE,WEIRD_QUOTING 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: The fix looks good to me. Will this also fix https://gcc.gnu.org/bugzilla/s= how_bug.cgi?id=3D107169 ? It was also a bad interaction of -gstatement-fron= tiers and discriminators. Eugene -----Original Message----- From: Alexandre Oliva Sent: Wednesday, November 8, 2023 7:51 AM To: gcc-patches@gcc.gnu.org Cc: Eugene Rozenfeld Subject: [EXTERNAL] [PATCH] skip debug stmts when assigning locus discrimin= ators c-c++-common/goacc/kernels-loop-g.c has been failing (compare-debug) on i686-linux-gnu since r13-3172, because the implementation enabled debug = stmts to cause discriminators to be assigned differently, and the discrimin= ators are printed in the .gkd dumps that -fcompare-debug compares. This patch prevents debug stmts from affecting the discriminators in nondeb= ug stmts, but enables debug stmts to get discriminators just as nondebug st= mts would if their line numbers match. I suppose we could arrange for discriminators to be omitted from the -fcomp= are-debug dumps, but keeping discriminators in sync is probably good to avo= id other potential sources of divergence between debug and nondebug. Regstrapped on x86_64-linux-gnu, also tested with gcc-13 on i686- and x86_6= 4-. Ok to install? (Eugene, I suppose what's special about this testcase, that may not apply t= o most other uses of assign_discriminators, is that goacc creates new funct= ions out of already optimized code. I think assign_discriminators may not = be suitable for new functions, with code that isn't exactly pristinely in-o= rder. WDYT?) for gcc/ChangeLog * tree-cfg.cc (assign_discriminators): Handle debug stmts. --- gcc/tree-cfg.cc | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/gcc/tree-cfg.cc b/gcc/tree-cfg.cc index 40a6f2a3b529f..a30a2de= 33a106 100644 --- a/gcc/tree-cfg.cc +++ b/gcc/tree-cfg.cc @@ -1214,6 +1214,22 @@ assign_discriminators (void) { gimple *stmt =3D gsi_stmt (gsi); + /* Don't allow debug stmts to affect discriminators, but + allow them to take discriminators when they're on the + same line as the preceding nondebug stmt. */ + if (is_gimple_debug (stmt)) + { + if (curr_locus !=3D UNKNOWN_LOCATION + && same_line_p (curr_locus, &curr_locus_e, + gimple_location (stmt))) + { + location_t loc =3D gimple_location (stmt); + location_t dloc =3D location_with_discriminator (loc, + curr_discr= ); + gimple_set_location (stmt, dloc); + } + continue; + } if (curr_locus =3D=3D UNKNOWN_LOCATION) { curr_locus =3D gimple_location (stmt); -- Alexandre Oliva, happy hacker https://fsfla.org/blogs/lxo/ Free Software Activist GNU Toolchain Engineer More tolerance and less prejudice are key for inclusion and diversity Exclu= ding neuro-others for not behaving ""normal"" is *not* inclusive