From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from DM6FTOPR00CU001.outbound.protection.outlook.com (mail-centralusazon11020023.outbound.protection.outlook.com [52.101.61.23]) by sourceware.org (Postfix) with ESMTPS id F0F543858416 for ; Tue, 6 Jun 2023 03:03:46 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org F0F543858416 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=SIqTMlmADLrr6WWxky26SQ+WC0WkZNbDAwtTLLj+CsC5DIpWHLD+ONd3M8aoFbtDQQT5OYN5Zn5Y3X0tFcORNzgLAFXigHiynGtuHHTACHoVZtya06JgA6A6xOYpdelEdg0Y2YLIlPrFf2iQTxWsudVCOAPGKpxyff85OwFEFPeGEM+Js05B+9F+1tTEtuE4uuiYvvr8ZZgRyti2l4DUiCVYP7x49GtUuslDIET5hI/T6p9KaHleoZv6LtEv0fAjzaos8QtZ6Yg5na3W/3mP9g/iaE6Tui+Iqm8aVRBX7vDqZRGtQwoplr3jg3IE3lCWltFRDFLHmyMcR00ITI/r9A== 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=0GjGa2BMCDxYYceNXoMgMu5jrLcS5+N0i3AjNPKZaQc=; b=bxS3TPAAIwy8Ty1NGuv9n7a6vem80QVPKjTwsyY8a5e/5SlrlXoh5LPa5d1Ot8So0wFvUmdXik8whMovw4xE/tSsua7ljNC8ZXCQY30qvChh4pxf7lk5LgW4QqxjHWygTVz837XkVdOeo2yicxgN41g+k7TF9m0N8CG1iSJNadjKmlT+aCrPP7INx5GRcQPCpkNggIeZrWw6qLOY8Ej8y6H1jGCCYOZ9NBDfZr7VF7Jb9Z8PfQQMyPE38keqHXjjGTkDzZ+AVrOWFjN8dsJuQvMw4F3thlV23kYEWV17bitz6M7+dvt+x+4oMhoPZCNMmLGe09o5y2mtgy9DbUklcQ== 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=0GjGa2BMCDxYYceNXoMgMu5jrLcS5+N0i3AjNPKZaQc=; b=JhgiuWNkE3AOfALRIt6gmYuF17CKhuwvc4odePCoPrN0YROySB8vdikO84+t+rJ7XWgDc6hGTk1TSTipDD0AaK2NmTVkRJayynXV7R/5ZbY+ofmJuHS/XqnL+0hpiA9kNeyVsAgtR/mhqo52vwA0mt/WsJDOyy2BGpgKq/hougs= Received: from DS7PR21MB3479.namprd21.prod.outlook.com (2603:10b6:8:90::11) by SJ1PR21MB3482.namprd21.prod.outlook.com (2603:10b6:a03:452::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6500.2; Tue, 6 Jun 2023 03:03:43 +0000 Received: from DS7PR21MB3479.namprd21.prod.outlook.com ([fe80::9011:4e4d:fb2a:afd7]) by DS7PR21MB3479.namprd21.prod.outlook.com ([fe80::9011:4e4d:fb2a:afd7%6]) with mapi id 15.20.6500.004; Tue, 6 Jun 2023 03:03:42 +0000 From: Eugene Rozenfeld To: Andi Kleen , "gcc-patches@gcc.gnu.org" Subject: RE: [EXTERNAL] [PATCH] Update perf auto profile script Thread-Topic: [EXTERNAL] [PATCH] Update perf auto profile script Thread-Index: AQHZkuceT9DF5NroHUOI2qe6LL0Kl699IOog Date: Tue, 6 Jun 2023 03:03:42 +0000 Message-ID: References: <20230530110818.142552-1-ak@linux.intel.com> In-Reply-To: <20230530110818.142552-1-ak@linux.intel.com> 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=a2394eee-a474-4028-9a9a-d01619711702;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-06T03:02:42Z;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_|SJ1PR21MB3482:EE_ x-ms-office365-filtering-correlation-id: 1476ae19-189b-4141-b4e7-08db663aa2bc x-ms-exchange-senderadcheck: 1 x-ms-exchange-antispam-relay: 0 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: UQAWoBbvx95eH7kYJyK0rNVEC3vDyzwA6h1/YeFnnBltxc+RWTal2R0dec5z5+RQCCxbXsA8aI8mc5RYvCg0osG7hf8TPn7rXaKBYGN/F29R9XH0af6A3xTlbl47q9euVvGJt3rowJrlCKyIm/vs1txbwGkhIQFja+9LrQZpjJonj9waave64dtWZb/lBsDV5f09UNR1tOY+/q7erUOcsu1g12dq+XXrf2AXxWqonZtJwpY2GHn++r1nH3vr+suMSfzR4D8OQ51oMqGsrZCzfLE41A2AnztYfjBVhptBCmAYuN8UO9n4R473KIwmJqIFXnBhIdIZ+0R016QmAyiLu0Y8cFeGkMGjVZxveQgtin+EtpfHcT7NJSloHL1rUoySVq6b57pY6XQIQIwiRPw+pdTnFz1LLeWps4J7pTujY8xlplQsdmyTcY7/mZ9BTYxVAYgj2ijVP9xCPzDXrcbGjNk1lTrHkWjAaHEqQIJEZafoa3UNDZMEgkvHqRXbKtuNVAjQ39zirL+Ex6VOg86WRqT/EvucYadYLO58PikhoQwn0T29MBc/RJLAvX/8BTuNZMTc7kxXBbsHi4/bynF6Ceqtl5LGEND93h3yBtgmh3T1MKRgdhS8EMiSCrhc/A7R4/bxmfkdqA1Gg76X5PiPtg== 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)(346002)(396003)(376002)(366004)(136003)(451199021)(8990500004)(82950400001)(82960400001)(110136005)(55016003)(186003)(15650500001)(33656002)(53546011)(2906002)(9686003)(86362001)(316002)(41300700001)(5660300002)(7696005)(52536014)(6506007)(71200400001)(38100700002)(10290500003)(8936002)(76116006)(478600001)(8676002)(66946007)(64756008)(66556008)(66476007)(66446008)(83380400001)(38070700005)(122000001);DIR:OUT;SFP:1102; x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?us-ascii?Q?vw/r42gsZ4VDRDpgynDcrX2IN3WpNje8RUEtz4CdVWTsHJpk/nDb9oIYoPwe?= =?us-ascii?Q?w4Cx+K9VnsJu2vglKpt7F+RjeY52vRRwojFlC/B00lpxLOTP2AA8kOcUhyJH?= =?us-ascii?Q?+Wl76HCFaS9zKJbVkGbf7JnEyUx+zuzDVupdQzoaE/AXStKAO1L5rUc7nJJr?= =?us-ascii?Q?vF6oL8T45+1I4A0l/v4jX9mR4NTHw+c2A8JNlD8/XUm79Vesjg72Sm1TVE3P?= =?us-ascii?Q?CwTfb4r9H1r4EkTQjAaedBFJGehcqivx0ExX39Z6e0v3PXl5geOv9/BzawPI?= =?us-ascii?Q?YG/7KPxPYVAx0E0VSlAX3w9ivNJCZEwoJ/B0NKEDNBWMjSVONGzR7vMoPw6j?= =?us-ascii?Q?MEG8u09qf54vIk/tI48wOEtogRhxFWoOEFiAnGLHdVoSVnotnTKUNyXLycaZ?= =?us-ascii?Q?xuaEZcv4JU5k0DO+kcKEvMUXjiCxpZQt7lNUlauVyOsW9rtvc6DaYyiooM58?= =?us-ascii?Q?qKb81/7UBF2pQ8+T31xxgGyVWKuvw0j76aq9fZEA26nO8iWMabj1KAvNZRrP?= =?us-ascii?Q?qL15tx/D/YSD/EI4k+sBbpG9TJ02H38JN6PzR4usq4FCj9d5uHvrf6Cw+gib?= =?us-ascii?Q?aB+cHKQLK3hSoitGpuKSeIQcvid9Ko+qwvVY/Iy+DvoP+lGnUHdkOgE17vPn?= =?us-ascii?Q?V8mVFkGIPh3TwKtZWmeL+nhuz2SpDrRsyMYs17iUaUKs4aMWPULqpWBikGUF?= =?us-ascii?Q?SnhNSFJDgBv/pGRCoDiInqIkr+60+Hs44fP8r+J7dhBm9YXY2S5Q0t8zp83p?= =?us-ascii?Q?4TwqrUakJjaWBIHXcdDL7K97ibECDa4eZ1LimEgBJ5snhtC65o2E9CsW+gBj?= =?us-ascii?Q?QN4qojWLnrBsVvYik2vE2X7JYzqERwWV3yinXhYbC+0kM7opf8Fn0mKmN4Zm?= =?us-ascii?Q?zWJrqUiaoSd8vIsP7ZNdTDz0jRRikuO5I2tx1e1Ku4fweQe0UIqOjnN+aYkl?= =?us-ascii?Q?BdsSwIuvqGzmzV+XZSIle7G+9V0H2yy/A0E7pfhL1VpqSnNwzxjad4rmJLgv?= =?us-ascii?Q?XqJFPQI048JgftvSALPF8z3ee9JEBc4Y16ihX17kTsKZSYnuWjWnvTjQ9kIS?= =?us-ascii?Q?qviYrYGUaGzvdbK6T8PQt6Lb8IPbGJ2Eq9yFlyCNyfUOFOlHPGTZ9HzdXs26?= =?us-ascii?Q?WR1cepriH5vJ0Lx89h+jVRRro1DCjSXUGp0tjRd+4/yFPLaZP9PpVsWGs3gM?= =?us-ascii?Q?Kp7Df9ItHzQcQj1+vMIP+PVdL1rr98DHCupsoAhHksVSQ4ItUU725WsvKUHj?= =?us-ascii?Q?5NLlCB+0R8he39j+3ZchB+bniR/d1oCpHTnjfzAe2ZlbajlKmg2wicpGkXup?= =?us-ascii?Q?pLyNSAP1GjdqbSzF0W0NrnoU3pPvWgXVPUMUf4VHdp3InkVKlQT7wfG4ZzIA?= =?us-ascii?Q?abBT/5nL5S6O8OffvdV+nv71Gw3CBY4neM53A9cId025I3+3pQXtETJ5OpW3?= =?us-ascii?Q?r3ObAQsHqvXNnHIw3wRnrC6vo3bqWle3xGJLQqCXRlzMPa+LhfvbtvJlrmws?= =?us-ascii?Q?JEJheyi69Cf4dDnNjM+sB8AtmBQS8l0x/adsRdjsiRhf9DZgZfqp0ZBbYOZM?= =?us-ascii?Q?2R4SnYXYr2wF073xDgyySgsD1Kuev14YAqEmugc+vYeTWDH3vG5GdmKkQWiQ?= =?us-ascii?Q?ye1RYzG81ahT942z+vbr0i+jYrYxAMsyeZsGqd18eDrC?= 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: 1476ae19-189b-4141-b4e7-08db663aa2bc X-MS-Exchange-CrossTenant-originalarrivaltime: 06 Jun 2023 03:03:42.7140 (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: eD2RjHE6mz9A8cLcbOyaMgKH2S3j42iMmhCbDWEHl8czQ0uXPTv/aZoQVzs1M8B/c7RqykoIeUu4Z6Hp3UoOtg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: SJ1PR21MB3482 X-Spam-Status: No, score=-10.3 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: Ok for trunk. Thank you for updating this! Eugene -----Original Message----- From: Gcc-patches = On Behalf Of Andi Kleen via Gcc-patches Sent: Tuesday, May 30, 2023 4:08 AM To: gcc-patches@gcc.gnu.org Cc: Andi Kleen Subject: [EXTERNAL] [PATCH] Update perf auto profile script - Fix gen_autofdo_event: The download URL for the Intel Perfmon Event list has changed, as well as the JSON format. Also it now uses pattern matching to match CPUs. Update the script to sup= port all of this. - Regenerate gcc-auto-profile with the latest published Intel model numbers, so it works with recent systems. - So far it's still broken on hybrid systems --- contrib/gen_autofdo_event.py | 7 ++++--- gcc/config/i386/gcc-auto-profile | 9 ++++++++- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/contrib/gen_autofdo_event.py b/contrib/gen_autofdo_event.py in= dex ac23b83888db..533c706c090b 100755 --- a/contrib/gen_autofdo_event.py +++ b/contrib/gen_autofdo_event.py @@ -32,8 +32,9 @@ import json import argparse import collections import os +import fnmatch -baseurl =3D "https://download.01.org/perfmon" +baseurl =3D "https://raw.githubusercontent.com/intel/perfmon/main" target_events =3D ('BR_INST_RETIRED.NEAR_TAKEN', 'BR_INST_EXEC.TAKEN', @@ -74,7 +75,7 @@ def get_cpustr(): def find_event(eventurl, model): print("Downloading", eventurl, file =3D sys.stderr) u =3D urllib.request.urlopen(eventurl) - events =3D json.loads(u.read()) + events =3D json.loads(u.read())["Events"] u.close() found =3D 0 @@ -102,7 +103,7 @@ found =3D 0 cpufound =3D 0 for j in u: n =3D j.rstrip().decode().split(',') - if len(n) >=3D 4 and (args.all or n[0] =3D=3D cpu) and n[3] =3D=3D "co= re": + if len(n) >=3D 4 and (args.all or fnmatch.fnmatch(cpu, n[0])) and n[3]= =3D=3D "core": components =3D n[0].split("-") model =3D components[2] model =3D int(model, 16) diff --git a/gcc/config/i386/gcc-auto-profile b/gcc/config/i386/gcc-auto-pr= ofile index 5ab224b041b9..04f7d35dcc51 100755 --- a/gcc/config/i386/gcc-auto-profile +++ b/gcc/config/i386/gcc-auto-profile @@ -43,8 +43,10 @@ model*:\ 47|\ model*:\ 37|\ model*:\ 44) E=3D"cpu/event=3D0x88,umask=3D0x40/$FLAGS" ;; model*:\ 55|\ +model*:\ 74|\ model*:\ 77|\ model*:\ 76|\ +model*:\ 90|\ model*:\ 92|\ model*:\ 95|\ model*:\ 87|\ @@ -75,14 +77,19 @@ model*:\ 165|\ model*:\ 166|\ model*:\ 85|\ model*:\ 85) E=3D"cpu/event=3D0xC4,umask=3D0x20/p$FLAGS" ;; +model*:\ 125|\ model*:\ 126|\ +model*:\ 167|\ model*:\ 140|\ model*:\ 141|\ model*:\ 143|\ +model*:\ 207|\ model*:\ 106|\ model*:\ 108) E=3D"cpu/event=3D0xc4,umask=3D0x20/p$FLAGS" ;; model*:\ 134= |\ -model*:\ 150) E=3D"cpu/event=3D0xc4,umask=3D0xfe/p$FLAGS" ;; +model*:\ 150|\ +model*:\ 156|\ +model*:\ 190) E=3D"cpu/event=3D0xc4,umask=3D0xfe/p$FLAGS" ;; *) echo >&2 "Unknown CPU. Run contrib/gen_autofdo_event.py --all --script to = update script." exit 1 ;; -- 2.40.1