From nobody Wed Sep 10 02:57:14 2025 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 2B835C04A6A for ; Mon, 7 Aug 2023 07:52:17 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231347AbjHGHvt (ORCPT ); Mon, 7 Aug 2023 03:51:49 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45534 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231140AbjHGHvo (ORCPT ); Mon, 7 Aug 2023 03:51:44 -0400 Received: from out30-100.freemail.mail.aliyun.com (out30-100.freemail.mail.aliyun.com [115.124.30.100]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8497510F4; Mon, 7 Aug 2023 00:51:42 -0700 (PDT) X-Alimail-AntiSpam: AC=PASS;BC=-1|-1;BR=01201311R181e4;CH=green;DM=||false|;DS=||;FP=0|-1|-1|-1|0|-1|-1|-1;HT=ay29a033018046051;MF=renyu.zj@linux.alibaba.com;NM=1;PH=DS;RN=21;SR=0;TI=SMTPD_---0VpC-045_1691394696; Received: from srmbuffer011165236051.sqa.net(mailfrom:renyu.zj@linux.alibaba.com fp:SMTPD_---0VpC-045_1691394696) by smtp.aliyun-inc.com; Mon, 07 Aug 2023 15:51:37 +0800 From: Jing Zhang To: John Garry , Ian Rogers Cc: Will Deacon , James Clark , Arnaldo Carvalho de Melo , Mark Rutland , Mike Leach , Leo Yan , Namhyung Kim , Peter Zijlstra , Ingo Molnar , Alexander Shishkin , Jiri Olsa , Adrian Hunter , linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-perf-users@vger.kernel.org, linux-doc@vger.kernel.org, Zhuo Song , Jing Zhang , Shuai Xue Subject: [PATCH v6 3/7] perf jevents: Support more event fields Date: Mon, 7 Aug 2023 15:51:21 +0800 Message-Id: <1691394685-61240-4-git-send-email-renyu.zj@linux.alibaba.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1691394685-61240-1-git-send-email-renyu.zj@linux.alibaba.com> References: <1691394685-61240-1-git-send-email-renyu.zj@linux.alibaba.com> Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" The usual event descriptions are "event=3Dxxx" or "config=3Dxxx", while the event descriptions of CMN are "type=3Dxxx, eventid=3Dxxx" or more complex. $cat /sys/bus/event_source/devices/arm_cmn_0/events/hnf_cache_fill type=3D0x5,eventid=3D0x3 When adding aliases for events described as "event=3Dxxx" or "config=3Dxxx", EventCode or ConfigCode can be used in the JSON files to describe the events. But "eventid=3Dxxx, type=3Dxxx" cannot be supported at present. If EventCode and ConfigCode is not added in the alias JSON file, the event description will add "event=3D0" by default. So, even if the event field is added to supplement "eventid=3Dxxx" and "type=3Dxxx", the final parsing result will be "event=3D0, eventid=3Dxxx, type=3Dxxx". Therefore, when EventCode and ConfigCode are missing in JSON, "event=3D0" is no longer added by default. EventIdCode and Type are added to the event field, and ConfigCode is moved into the event_field array which can also guarantee its original function. Signed-off-by: Jing Zhang --- tools/perf/pmu-events/jevents.py | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/tools/perf/pmu-events/jevents.py b/tools/perf/pmu-events/jeven= ts.py index f57a8f2..9c0f63a 100755 --- a/tools/perf/pmu-events/jevents.py +++ b/tools/perf/pmu-events/jevents.py @@ -275,12 +275,6 @@ class JsonEvent: } return table[unit] if unit in table else f'uncore_{unit.lower()}' =20 - eventcode =3D 0 - if 'EventCode' in jd: - eventcode =3D int(jd['EventCode'].split(',', 1)[0], 0) - if 'ExtSel' in jd: - eventcode |=3D int(jd['ExtSel']) << 8 - configcode =3D int(jd['ConfigCode'], 0) if 'ConfigCode' in jd else None self.name =3D jd['EventName'].lower() if 'EventName' in jd else None self.topic =3D '' self.compat =3D jd.get('Compat') @@ -317,7 +311,15 @@ class JsonEvent: if precise and self.desc and '(Precise Event)' not in self.desc: extra_desc +=3D ' (Must be precise)' if precise =3D=3D '2' else (' (= Precise ' 'event)') - event =3D f'config=3D{llx(configcode)}' if configcode is not None else= f'event=3D{llx(eventcode)}' + eventcode =3D None + if 'EventCode' in jd: + eventcode =3D int(jd['EventCode'].split(',', 1)[0], 0) + if 'ExtSel' in jd: + if eventcode is None: + eventcode =3D int(jd['ExtSel']) << 8 + else: + eventcode |=3D int(jd['ExtSel']) << 8 + event =3D f'event=3D{llx(eventcode)}' if eventcode is not None else No= ne event_fields =3D [ ('AnyThread', 'any=3D'), ('PortMask', 'ch_mask=3D'), @@ -327,10 +329,13 @@ class JsonEvent: ('Invert', 'inv=3D'), ('SampleAfterValue', 'period=3D'), ('UMask', 'umask=3D'), + ('ConfigCode', 'config=3D'), + ('Type', 'type=3D'), + ('EventIdCode', 'eventid=3D'), ] for key, value in event_fields: if key in jd and jd[key] !=3D '0': - event +=3D ',' + value + jd[key] + event =3D event + ',' + value + jd[key] if event is not None else = value + jd[key] if filter: event +=3D f',{filter}' if msr: --=20 1.8.3.1