From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from BN6PR00CU002.outbound.protection.outlook.com (mail-eastus2azon11021017.outbound.protection.outlook.com [52.101.57.17]) by sourceware.org (Postfix) with ESMTPS id BF9563858D39 for ; Tue, 27 Jun 2023 21:26:05 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org BF9563858D39 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=VfQptvQuVSQTYGgEaztQw9OMehgFmCKCTab13sQn3q7vLMIO3078ycGYhXPnq70l2sFzmJFo0LVDSBYWKJft034mIlhrmANIUMbewf47tuit2q2DtWqTVuE9sJ+dSMFHGVhtZzLQujmOBKinKsiOcD3YVfBYvAShh2g4IvH4X16SFeunRbSy06iqAi7X1ZpP7HLhB2Pjn9XSm/DAPhZwBU7bk2yVINkuO43CLxjL9Ztyq4KAPwHvp3/oQqVQ0Gu9xHwjYuiWA/UCsyY5v8kPLEEmKrR0Q/m6vXiRFpp/mqBqjrkVteGGUUo8DP+2o/+6Tk+yoO37oAJeZ1odGIE1GQ== 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=rr7h61qhWswOsGQjcOiznbt3dKbFya3d+5gDKHZr82A=; b=jNhPP8JxQVdPNSCi187xRURcDR77/5/GuE9E/GJpqj3IGuGl6NelEEZYkQ9IZweUB6aERkM81c9kD0JG9bEb4hVrOsfS4z1isWJIeneheaG0+copKnvtgK5NUOtwH3ry2adqhYoBlUkQf776baym8w8HgH9XQRmSf1iONKnnCBBFgkLRT6MfCsVNoZBUO+lk6hepk0KOdQKRUl7QI7h0EfTXyVLZF+R0XiML1O2I8MXlI4lEmKCQScbjYQNa345RADv7UWkxEx45yMHdwbt2VoJrJ5Cw6AjT9cC6HzrNQm+4n6ybEIr/x8DGXlsKNUzymWzmhS8WkaKSOsHFXV5BPA== 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=rr7h61qhWswOsGQjcOiznbt3dKbFya3d+5gDKHZr82A=; b=g78GVoEfLghQlKMqoEb/f2v9mZ5P2WABH7uzPtEvoC0jcV3lT9IkFiHtuym/VppugI1+hDg3cbkSLFGRqYOOEUHghIuDZy/yxq2BoxXIPVRUg8rzCCe4AKoGFDB0lNYptbW5on/rQtNfThUCGQzaZZmRqVEnD8CqXVdWuHq6D4s= Received: from DS7PR21MB3479.namprd21.prod.outlook.com (2603:10b6:8:90::11) by PH8PR21MB3814.namprd21.prod.outlook.com (2603:10b6:510:214::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6565.3; Tue, 27 Jun 2023 21:26:03 +0000 Received: from DS7PR21MB3479.namprd21.prod.outlook.com ([fe80::3b25:aa2:4331:8a27]) by DS7PR21MB3479.namprd21.prod.outlook.com ([fe80::3b25:aa2:4331:8a27%4]) with mapi id 15.20.6521.013; Tue, 27 Jun 2023 21:26:03 +0000 From: Eugene Rozenfeld To: "gcc-patches@gcc.gnu.org" Subject: [PATCH] Fix collection and processing of autoprofile data for target libs Thread-Topic: [PATCH] Fix collection and processing of autoprofile data for target libs Thread-Index: AdmpPePLLXPeUsH+QYOWTXnRJFvPnw== Date: Tue, 27 Jun 2023 21:26:02 +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=b3eadfde-56ec-4902-89c4-a17313146aa1;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-06-27T21:24:34Z;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_|PH8PR21MB3814:EE_ x-ms-office365-filtering-correlation-id: 88499ea3-6164-4a32-645f-08db77551c1c x-ms-exchange-senderadcheck: 1 x-ms-exchange-antispam-relay: 0 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: G5suHbRJtf8Boq4ZeWrISChz94EuCzGhCLySIDKajNZ8kILpGBKe4Kst/wBSAFkmdRk2twmXfoaaeK5MOkI+E7iw6sIBm/16c6AGysBA88xGzUQRxoBWVpOxAcCoY1n19JAIUZ5SOkRHazochRbcr7YIkyqcYbz8t/kIHWMdtNzK8QbmRNLCi4ScZlGhBYZtmuC5fOQZzzVlPz5cZKeyGJMDNJzPW8z8uG/hTl574bPtWD2ZDfIV+EuCFUdAhyKyl3iBpf9d9E9MJ6KWKmxWHyzx/fuMFhofbC4/fXFcGrwQzClFmXQhSDYyl5FzTgjGeGztGDkDAGS+3dEPXBbaJvaNnmZ2XGv9T19RsaTRMopJPTEDuyCAKV10mRHxp+nZwEgf1PLKGVwsZUQ0b1PnskcKdEOeeTiTGsMZpzfkkbOgwiemXHnov3jJiidcnL6uQIRnMhkWjjHI+cBk9Rwo3j64qsTB/dTp7hXRHS68PDpTrjUQ8nYvGQoJrrqz5dL5PmFqB6XnKkON9ouApOeupewpziLNXh0BKYsj+TTRusSc80vMNW1D7uMh8AzX3or2C/K7HlXqdLLF0hH3FrvJ5RucDuMV+CdoBhYPhG9BaJ8Kq1WOssfiotVJ7GHy40GLvofW+DffzNgZjXf+HzBvGkl6PXYe18NWWEhyBBgB5Pvc/qFthUvQvZOfRdR0HR0f3kHVEmRQYcc/TC3p5gUjSnt+MN5vUzfx/hUaWbAoG94= 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:(13230028)(4636009)(39860400002)(366004)(346002)(376002)(136003)(396003)(451199021)(316002)(41300700001)(83380400001)(9686003)(86362001)(8990500004)(2906002)(38070700005)(5660300002)(52536014)(6506007)(33656002)(186003)(82950400001)(82960400001)(122000001)(38100700002)(55016003)(8936002)(8676002)(478600001)(71200400001)(10290500003)(6916009)(66946007)(66476007)(66446008)(64756008)(66556008)(76116006)(7696005)(414714003)(473944003);DIR:OUT;SFP:1102; x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?us-ascii?Q?zhvFM1uU4UBCr4kxkyOMW8gz2cPC8YtL+jG79YJahf2mHlbvASLWLTLJtZPk?= =?us-ascii?Q?tJuZpMTyvcNCJeONgzMpEpX69MEeDYj3D+ZOwKmHj96MmAjSdOtf3kaUIsOe?= =?us-ascii?Q?ih1bdREfHTG5kkwe4VRwQvjLzo0Os3oGEeD4efz4/1WcKCIeLxuc699fo1SW?= =?us-ascii?Q?7b8NI8oBfvFKs+rYm8EhpQjdw2XiOovSrSKfUYFza49CuZsxHfdeYxrkkMwm?= =?us-ascii?Q?SD+LAhDgdVefSryPmqZY9JGQOqZgx490pDperMbjFi27qnEAIukcN6wqJVOD?= =?us-ascii?Q?qsi6IHMOqISqJCZWA26b5s3JH47scYksMhqzeOPXRkmLdMxTQPa5RodTqNlb?= =?us-ascii?Q?xk0cw3DhkOrvQv5XouW3LLzrHIFqRisijpIZkISBQmtZjZXiTgUXf2cEDNPi?= =?us-ascii?Q?AdifyF3mhYjMfjGpY/mgQRCVeIjy/4D6RqthlJIil9MITpFHCtP+iw74jBkL?= =?us-ascii?Q?RRwin3hjJ1mgZLLsIiAtOQaM/3EGirZhV9UeNpf0CLsmWTgdYq5CxdSH423L?= =?us-ascii?Q?m0TIQV5u4I9GecqVfvf5GcYY7V2CfohOtsSZmj0jvKKfEHcVH/xYR5H5FgNn?= =?us-ascii?Q?OYV9THJFfa4LE5AerUz4zevne7d4dijQdETqzG05KBnPJTX5OR+pQSoccXkw?= =?us-ascii?Q?SxCagR/7LYz2sy8zZZZ00gR8G+aVU1Z6iJxRlSea/jqB0ZcN4UtTvascgukR?= =?us-ascii?Q?yI+ZNUUPnhr0O019hGrC+ROVUBKqF7eHf66okMal2ePyTV/alqUnnqyJEc6c?= =?us-ascii?Q?dwbc6bqaTFm+Yu7xdPLvG/MtGp+4hdo+t8HZnjTx0wC9bTY5BeSRY8vgUz8u?= =?us-ascii?Q?fj+6rwjm6/0/MrqyCfTFnjncj/r5c0MGKr6bGVDQu5oHU8q+ZFXs1prnSS54?= =?us-ascii?Q?wVrk6DwSGrh6YnKNuAXuo4OnfWrByCW/m8LlbwBFrGMlOJWq6CVx62LQceVM?= =?us-ascii?Q?oU84PkLmmA9hUkMRR5fdyaQ+cMbo5J+efygvQT3qTwbyLgXIYKIn2/VPmhUA?= =?us-ascii?Q?yHAM6OLS0JYcmBLK/dXnmcB2nd/J1+X7GReXF/fAyBZm1CRi+5yxwLpWl4QE?= =?us-ascii?Q?XrkqXrW8Kolzlr5CZXwqaNHFFU6WzCnDSu/T1nO99Lno/Xgqeh1z0BmPTUEZ?= =?us-ascii?Q?6EhhVKQHvPjMdDZR20cE9fckgMe3/r7fwwpmJTtTvsVi721XbdhgCFj5vwJr?= =?us-ascii?Q?/Fw9tsQmVo/BAKcuYJEiaPTKzpeIxBN6Whc0mkYWgX/U1cw6T/kOUeaJkRos?= =?us-ascii?Q?8I2s86HO3aWutpwXHn4JuPnGelf54r1XCZYOEHjgFQ+mSQLYuprpQuPs7BQs?= =?us-ascii?Q?YqSCLDUvfrd/N1idW3wtdWSDxAufQEza5tRywKJzQytG7qulzzvi+YofwlAQ?= =?us-ascii?Q?BNWEMtoOxykkMhEPDwhVqHV72mdfEGV3oZfdmDD0VCxBeO5w3OFSN9XXTJGj?= =?us-ascii?Q?G7gmkKFSWh6h8jMhFwJHPsnumM32Y7tG8MbvrBlFNqRZeWuqqDjroORLFHU0?= =?us-ascii?Q?3nAyNeurZzgUelzdbnOUop2bm62vBL3mWSodhRQAV2eh3UBpfRX1A8S+yDO7?= =?us-ascii?Q?EiWt0RXYE5buqxkU0mAOCJpX1e4OqhWW+MUdLT2EZ2buuR2nQU7vz18EuAxY?= =?us-ascii?Q?8aZE4NuOBq1LDQVyM5PLkI/tjPFyVQGEg+XBz9VVis9m?= 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: 88499ea3-6164-4a32-645f-08db77551c1c X-MS-Exchange-CrossTenant-originalarrivaltime: 27 Jun 2023 21:26:03.0243 (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: VTx6Nm3D90Hz/SgIOvR2DgxlLbmSU1g5Mepj4kOpM2aubifYfBO7vsQziIybt5LyTnDhCA7XgZAkwvXfH0gmiA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH8PR21MB3814 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,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,SPF_NONE,TXREP,T_SCC_BODY_TEXT_LINE 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: cc1, cc1plus, and lto built during STAGEautoprofile need to be built with debug info since they are used to build target libs. -gtoggle was turning off debug info for this stage. create_gcov should be passed prev-gcc/cc1, prev-gcc/cc1plus, and prev-gcc/l= to instead of stage1-gcc/cc1, stage1-gcc/cc1plus, and stage1-gcc/lto when processing profile data collected while building target libraries. Tested on x86_64-pc-linux-gnu. ChangeLog: * Makefile.in: Remove -gtoggle for STAGEautoprofile * Makefile.tpl: Remove -gtoggle for STAGEautoprofile gcc/c/ChangeLog: * c/Make-lang.in: Pass correct stage cc1 when processing profile data collected while building target libraries gcc/cp/ChangeLog: * cp/Make-lang.in: Pass correct stage cc1plus when processing profile data collected while building target libraries gcc/lto/ChangeLog: * lto/Make-lang.in: Pass correct stage lto when processing profile data collected while building target libraries --- Makefile.in | 2 +- Makefile.tpl | 2 +- gcc/c/Make-lang.in | 4 ++-- gcc/cp/Make-lang.in | 4 ++-- gcc/lto/Make-lang.in | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Makefile.in b/Makefile.in index b559454cc90..61e5faf550f 100644 --- a/Makefile.in +++ b/Makefile.in @@ -635,7 +635,7 @@ STAGEtrain_TFLAGS =3D $(filter-out -fchecking=3D1,$(STA= GE3_TFLAGS)) STAGEfeedback_CFLAGS =3D $(STAGE4_CFLAGS) -fprofile-use -fprofile-reproduc= ible=3Dparallel-runs STAGEfeedback_TFLAGS =3D $(STAGE4_TFLAGS) =20 -STAGEautoprofile_CFLAGS =3D $(STAGE2_CFLAGS) -g +STAGEautoprofile_CFLAGS =3D $(filter-out -gtoggle,$(STAGE2_CFLAGS)) -g STAGEautoprofile_TFLAGS =3D $(STAGE2_TFLAGS) =20 STAGEautofeedback_CFLAGS =3D $(STAGE3_CFLAGS) diff --git a/Makefile.tpl b/Makefile.tpl index 6bcee3021c9..3a5b7ed3c92 100644 --- a/Makefile.tpl +++ b/Makefile.tpl @@ -558,7 +558,7 @@ STAGEtrain_TFLAGS =3D $(filter-out -fchecking=3D1,$(STA= GE3_TFLAGS)) STAGEfeedback_CFLAGS =3D $(STAGE4_CFLAGS) -fprofile-use -fprofile-reproduc= ible=3Dparallel-runs STAGEfeedback_TFLAGS =3D $(STAGE4_TFLAGS) =20 -STAGEautoprofile_CFLAGS =3D $(STAGE2_CFLAGS) -g +STAGEautoprofile_CFLAGS =3D $(filter-out -gtoggle,$(STAGE2_CFLAGS)) -g STAGEautoprofile_TFLAGS =3D $(STAGE2_TFLAGS) =20 STAGEautofeedback_CFLAGS =3D $(STAGE3_CFLAGS) diff --git a/gcc/c/Make-lang.in b/gcc/c/Make-lang.in index 20840aceab6..79bc0dfd1cf 100644 --- a/gcc/c/Make-lang.in +++ b/gcc/c/Make-lang.in @@ -113,10 +113,10 @@ create_fdas_for_cc1: ../stage1-gcc/cc1$(exeext) ../pr= ev-gcc/$(PERF_DATA) echo $$perf_path; \ if [ -f $$perf_path ]; then \ profile_name=3Dcc1_$$component_in_prev_target.fda; \ - $(CREATE_GCOV) -binary ../stage1-gcc/cc1$(exeext) -gcov $$profile_nam= e -profile $$perf_path -gcov_version 2; \ + $(CREATE_GCOV) -binary ../prev-gcc/cc1$(exeext) -gcov $$profile_name = -profile $$perf_path -gcov_version 2; \ fi; \ done; -# +# # Build hooks: =20 c.info: diff --git a/gcc/cp/Make-lang.in b/gcc/cp/Make-lang.in index c08ee91447e..ba5e8766e99 100644 --- a/gcc/cp/Make-lang.in +++ b/gcc/cp/Make-lang.in @@ -211,10 +211,10 @@ create_fdas_for_cc1plus: ../stage1-gcc/cc1plus$(exeex= t) ../prev-gcc/$(PERF_DATA) echo $$perf_path; \ if [ -f $$perf_path ]; then \ profile_name=3Dcc1plus_$$component_in_prev_target.fda; \ - $(CREATE_GCOV) -binary ../stage1-gcc/cc1plus$(exeext) -gcov $$profile= _name -profile $$perf_path -gcov_version 2; \ + $(CREATE_GCOV) -binary ../prev-gcc/cc1plus$(exeext) -gcov $$profile_n= ame -profile $$perf_path -gcov_version 2; \ fi; \ done; -# +# # Build hooks: =20 c++.all.cross: g++-cross$(exeext) diff --git a/gcc/lto/Make-lang.in b/gcc/lto/Make-lang.in index 4f6025100a3..98aa9f4cc39 100644 --- a/gcc/lto/Make-lang.in +++ b/gcc/lto/Make-lang.in @@ -130,7 +130,7 @@ create_fdas_for_lto1: ../stage1-gcc/lto1$(exeext) ../pr= ev-gcc/$(PERF_DATA) echo $$perf_path; \ if [ -f $$perf_path ]; then \ profile_name=3Dlto1_$$component_in_prev_target.fda; \ - $(CREATE_GCOV) -binary ../stage1-gcc/lto1$(exeext) -gcov $$profile_na= me -profile $$perf_path -gcov_version 2; \ + $(CREATE_GCOV) -binary ../prev-gcc/lto1$(exeext) -gcov $$profile_name= -profile $$perf_path -gcov_version 2; \ fi; \ done; =20 --=20 2.25.1