From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from na01-obe.outbound.protection.outlook.com (mail-eastusazon11020024.outbound.protection.outlook.com [52.101.51.24]) by sourceware.org (Postfix) with ESMTPS id EF2FF3857833 for ; Tue, 25 Oct 2022 21:07:02 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org EF2FF3857833 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-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=OCHi77CnOv7AT0qbS1Csw+fbb8hYAfL1CLqulFT2AwaWCKRSWCC5QGTzZ13ILCWNRVK2/d2Vrhn1KPUZqNwVuCdNa454GzvIBiCC/iE5Hggk9tMSwBucRo0nCXloLN1K3pRY24SSHtRtWoCHc1TOc7VKxdGP37YJFYMuVsBnPl7uFjFtCptJsBcBpvv/YH16lFFwqZck0fTdOagcyyNXoP54zLIPhxBSBKSFs3cTlD8nkcWzffJpSWFXUaEiM9Q7f7apH3UAUx818Eh18JIx5pS/2VIa15acDTvHUtwNM4+YnW7QEC2RinxUAdrfK0edo2+COAttJf2DVYZug9btfQ== 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=e9r+QWfjdhWBxtSKJDZ51PdOV0yQMm9YD26AWeJap8o=; b=Tfc24kDmkp8c/lfhDG9Xz8ncoGtx7OQr/RJcfqj6nncVZDgaU1XZxBwIF/9n6zhUaAOyUywiH4mas11LLCpEEhGTD8xiZx961HmqTwgse5QgvUDZ3JmjE4rtNSiW5XI95E+Ho8h9UpqZ8P0KBazUl1REGxAOPvBXUkHx0lJUqFQj0PPYm1Ymf1SzD3hP/23O4N2ZTBf/YIS1F2vtmiO0aqvAIzuj1UzubR6+mqKuMDxYALqcGG316cmKd2wNhUUfR7YYG6FTkfY81Ebi+Pb70Xt6ftApGgQplTTVyZhjF0dPsJyCo5vzsAan78FMcIR0Qrj0NfZH75LejxbeiWnI1w== 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=e9r+QWfjdhWBxtSKJDZ51PdOV0yQMm9YD26AWeJap8o=; b=LY+qd3+C4CsPuFLXwncuy08LvEswhT5H5NnXoPpzs/7PzJQWJzZOH+6HzwFTqlK4bwl1Atv0zJcIp6Mjnp20B/rHyvg1RuL2oQBovObuslGDK8/fgBfVavNR2+plqOVaG91T0b/GO5+oqoHlROcnUfEUH/AYcvDjnx/+RxXwfoc= Received: from CY5PR21MB3542.namprd21.prod.outlook.com (2603:10b6:930:d::7) by MN0PR21MB3240.namprd21.prod.outlook.com (2603:10b6:208:37c::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5791.8; Tue, 25 Oct 2022 21:07:00 +0000 Received: from CY5PR21MB3542.namprd21.prod.outlook.com ([fe80::ff72:1a2:7c8:1b55]) by CY5PR21MB3542.namprd21.prod.outlook.com ([fe80::ff72:1a2:7c8:1b55%9]) with mapi id 15.20.5791.001; Tue, 25 Oct 2022 21:06:59 +0000 From: Eugene Rozenfeld To: "gcc-patches@gcc.gnu.org" Subject: [PATCH][PUSHED] Start using discriminators in AutoFDO Thread-Topic: [PATCH][PUSHED] Start using discriminators in AutoFDO Thread-Index: Adjotab9r/9z2otuRVK/b6I4gMwqFA== Date: Tue, 25 Oct 2022 21:06:59 +0000 Message-ID: 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=98ab702a-cd49-4e62-8a59-17ed8a52fffe;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=2022-10-25T21:05:39Z;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: CY5PR21MB3542:EE_|MN0PR21MB3240:EE_ x-ms-office365-filtering-correlation-id: 67d406a2-5151-474a-1242-08dab6ccdb90 x-ms-exchange-senderadcheck: 1 x-ms-exchange-antispam-relay: 0 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: +TSDsVoDfDYt+Ol3tGfzaQ0/zN2nuTegwnAwy4qst5SJLXZr2kncX5Fk1tklh1SOA6xQr8sJDRgImhYtoENoE/YJhQcqbiwS4V10BE3OSAfAd91cJi3ToodLuoeEfvk3TCZn+oes5FtL75Jl6RVrTnpDzkQiMhdb4EBKAvJh7rrs3l3+CXY65wklvyMCZn3FQ6CfOr4E/yWj07MWEEGJ9ZvnCueAIBYE1OOXfaSgvqrMUHmUL6JINrq/nyPLQC4OgO6xpwN33DV2L++pawjlRp+7t9U0ylVObYG3S4qW1rcqeHu5lDjP3eQWo2uN41nlDMYQ92xBc2w4YJlBZceaFvimbgKzB10Zt48AO7wLrwfwpPHlkHpJnh/4HmT2AZEHeQKr/4jOfX9gYDUAG9yw4+TFZzzl8yAzA7jFic1Jhwt2gTThRAs1PFbH2RxbGNI0zK7CUPiy/qRb6D2wZwWxlL8pxJ0XqA3C9YuKQla+zgBUQ2npcqTwW7zk1kPcaQ1R9oJORBLmFv4G4prlJl6PXLA3tad52uLnNxpPZ1+kUTAr1SC7SVGyyoHX1vq+djW6QKk/NXhrwvxvuwOGbnEmjyrTwmK/x9qDc1enOcVc4nzIPQ/kj5Seu0U2mHLNaH9FM/+DVZ3DAsM/nvZkvQgxb8qs2t3RQkZdWdIVdeP57gecBUUWvn55VwGAjqeFrtSaMNGES7JwRnnlA7FM2fbWQUceUtxAHEK1xb7bXE9Lu7DxGI8lctx72g/myrmn55DmIoqLqGC/qucbS1s/rYKeD/TLlRl+YgOkW2BedzZnlcFhme4O+YBIva3XVKirrKu0 x-forefront-antispam-report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:CY5PR21MB3542.namprd21.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230022)(4636009)(396003)(136003)(376002)(39860400002)(346002)(366004)(451199015)(33656002)(66446008)(66556008)(64756008)(186003)(478600001)(41300700001)(66946007)(76116006)(66476007)(82950400001)(38100700002)(2906002)(8990500004)(82960400001)(38070700005)(122000001)(8676002)(71200400001)(83380400001)(6916009)(86362001)(316002)(55016003)(10290500003)(9686003)(6506007)(52536014)(8936002)(7696005)(5660300002);DIR:OUT;SFP:1102; x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?us-ascii?Q?da0MRJ1CGxyvG68XbO9gw57vsiM5N99f20Fh0TgL0JvM1F9kXPPVHwWf6Qre?= =?us-ascii?Q?1dRRZMv2XHmr0hacWl69qjjXu7Khis/j4RShaCSw8QJl+QcouuN5yfYM12d/?= =?us-ascii?Q?JxDpfC3wTnI6bTwsW70OViwZdPCcQDcLMrOkx7Gk1ckNqEPPf5bq7OsMGqnZ?= =?us-ascii?Q?AKTP+XEoktz0/arPgSpvOZHip24UMg30LTy5Zwd4U4ARWGMEj7WCNEbYdY5p?= =?us-ascii?Q?HDmyx7QWHStqacQ7Rk8Zm5vIzP4I57cb8uXMk9aUJMc72229Mz8X1rBP7y2g?= =?us-ascii?Q?k99tyWOhtximM/JnspABYgX9BfXWc4HGHqUvgAZ12AERg79bZ6nQy+qcpme2?= =?us-ascii?Q?4VpLS3Ab0q95QFQNBVF0oUZ5RJOdDuYhtw99m/Uuf6P47e8TSguZIc7zEHNX?= =?us-ascii?Q?QdQYekxJee7+MIpoMAjF4a0DaOvAWvrHbecNxMpoMGWEyVqxqGuHLlGS/RXs?= =?us-ascii?Q?haY1lQimlQha60T8e0eQV+ItdRg16QAFIUJo2YmTPu5tWcZxUK531WvmtMNL?= =?us-ascii?Q?DOr1o8eOMK1c/Dgp+lungplDIN04hGRE0+xET3z4PruuYDtmeqivdXrKEm1c?= =?us-ascii?Q?FNHyKTFsxktWdBB3G3T2QRupf9aRHxwhSlZdwKfW0hLzFFpm65dgjV+PXtZe?= =?us-ascii?Q?n+RbRrz2DyrMAZzRH2xzKdF9uNC5pXtA3vktiDRwssDyDl4Hin6lYf6jDxlq?= =?us-ascii?Q?JgDcImX1C3M8cnVa/MCgjmY+Q23rvfazQ66GnzkMcGLukgZt2TaOKzNvbb5W?= =?us-ascii?Q?u9wI+fmdj/BfR2LxFlVVARZkgXClqAcC154Qwl+L5EtVugI+v4UmzVjaSnCM?= =?us-ascii?Q?U0mfJi1W5vaeyXyC82ksqmDvCUy/WwPXnpoIHtJZ6wfW+BJpfOtVNGto5J8Q?= =?us-ascii?Q?gDigarLqr+ourKI2NbCXqGTlehBDLoQlcy1aQXnjwOCitvs3oSdTTsULS34f?= =?us-ascii?Q?o4uxVKeN58TwZhrYj3EboJzrY/z35H+d1lvcrfqjvundEcdIRNLbAkvp6aWI?= =?us-ascii?Q?/2BByDyMcuM2Fp7f49au5Uv8mwSaxIqWqJF5/1cZ+NTelqaMB9nTO9J4dU5d?= =?us-ascii?Q?77Z0+dQx6VLrV+JBEyeqoBbn9G9iZ/0XmWFDW9ekZi2vuui8h3+BaZYUiy6o?= =?us-ascii?Q?rqQ92NXMIolk4qF06E003LKXTjnl6qlsTRykjgu82TOb5ct2RwpknF1HugCF?= =?us-ascii?Q?X1ZqgFG2J178//4/GIgNBFHjROXEeTm49HV84jKMZ/5ZZVesKJDfUGb5GES/?= =?us-ascii?Q?+ZPwcFwRaQnWRVY/hSIrVxVUlr1f0MjTx6vvsZkSRGlA9O1dFF+imRpyaZSO?= =?us-ascii?Q?6e7XPqkuUjA0bTX/Xoyi07o6DnIGjROVYLmtiQYfTS8FaNXEPk3bx8KdES4T?= =?us-ascii?Q?IlcvR7qC6hmb+5CWwPdrBpZlsDVG6GkARLChwX9kdc66YipaumGnO+ILCD90?= =?us-ascii?Q?jYMo4UyxohbnHXnYdNgAXE2iUnKn9Lgw9FmqfDXhmg90SXFuOmZqXzcSOBhP?= =?us-ascii?Q?Zg9Q1R7N+xS4ZtDNXMeh5diTFDS4gNeecnxliuSONImJdrXpxrjHCNA/omxA?= =?us-ascii?Q?x8y03B8+Ok6LLbQuH1GRd4oQzkY5bBWRCHq4hkwio7z1tGTBFcwaRborZWca?= =?us-ascii?Q?paBUY4jaLLTWTRkTD2m5YsBr1wcrFR26Nuf3yeF3AhZ5?= 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: CY5PR21MB3542.namprd21.prod.outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 67d406a2-5151-474a-1242-08dab6ccdb90 X-MS-Exchange-CrossTenant-originalarrivaltime: 25 Oct 2022 21:06:59.9270 (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: aPLi0RJe5aTwdLJmfL03aUcZb2Vse93VqTHEvv1Ab1hh1iUDDaGdTXiOdiXdKvaDicsJh/eCDjQLXMsZD4IMxw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: MN0PR21MB3240 X-Spam-Status: No, score=-10.2 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,RCVD_IN_DNSWL_NONE,SPF_HELO_PASS,SPF_NONE,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 List-Id: Tested on x86_64-pc-linux-gnu. gcc/ChangeLog: * auto-profile.cc (get_combined_location): Include discriminator in the returned combined location. (read_function_instance): Read discriminators from profiles. --- gcc/auto-profile.cc | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/gcc/auto-profile.cc b/gcc/auto-profile.cc index ca48404eaf1..97307321cbf 100644 --- a/gcc/auto-profile.cc +++ b/gcc/auto-profile.cc @@ -363,7 +363,8 @@ get_combined_location (location_t loc, tree decl) /* TODO: allow more bits for line and less bits for discriminator. */ if (LOCATION_LINE (loc) - DECL_SOURCE_LINE (decl) >=3D (1<<16)) warning_at (loc, OPT_Woverflow, "offset exceeds 16 bytes"); - return ((LOCATION_LINE (loc) - DECL_SOURCE_LINE (decl)) << 16); + return ((LOCATION_LINE (loc) - DECL_SOURCE_LINE (decl)) << 16) + | get_discriminator_from_loc (loc); } =20 /* Return the function decl of a given lexical BLOCK. */ @@ -652,7 +653,7 @@ function_instance::read_function_instance (function_ins= tance_stack *stack, =20 for (unsigned i =3D 0; i < num_pos_counts; i++) { - unsigned offset =3D gcov_read_unsigned () & 0xffff0000; + unsigned offset =3D gcov_read_unsigned (); unsigned num_targets =3D gcov_read_unsigned (); gcov_type count =3D gcov_read_counter (); s->pos_counts[offset].count =3D count; --=20 2.25.1