From nobody Wed Dec 17 14:22:03 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 E8741EE49AE for ; Mon, 21 Aug 2023 08:36:43 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234037AbjHUIgn (ORCPT ); Mon, 21 Aug 2023 04:36:43 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41428 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234043AbjHUIgg (ORCPT ); Mon, 21 Aug 2023 04:36:36 -0400 Received: from out30-133.freemail.mail.aliyun.com (out30-133.freemail.mail.aliyun.com [115.124.30.133]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 445EABB; Mon, 21 Aug 2023 01:36:34 -0700 (PDT) X-Alimail-AntiSpam: AC=PASS;BC=-1|-1;BR=01201311R171e4;CH=green;DM=||false|;DS=||;FP=0|-1|-1|-1|0|-1|-1|-1;HT=ay29a033018045170;MF=renyu.zj@linux.alibaba.com;NM=1;PH=DS;RN=21;SR=0;TI=SMTPD_---0VqEq8D0_1692606989; Received: from srmbuffer011165236051.sqa.net(mailfrom:renyu.zj@linux.alibaba.com fp:SMTPD_---0VqEq8D0_1692606989) by smtp.aliyun-inc.com; Mon, 21 Aug 2023 16:36:30 +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 v7 4/8] perf jevents: Support more event fields Date: Mon, 21 Aug 2023 16:36:13 +0800 Message-Id: <1692606977-92009-5-git-send-email-renyu.zj@linux.alibaba.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1692606977-92009-1-git-send-email-renyu.zj@linux.alibaba.com> References: <1692606977-92009-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 previous code assumes an event has either an "event=3D" or "config" field at the beginning. For CMN neither of these may be present, as an event is typically "type=3Dxx,eventid=3Dxxx". 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 "eventid=3Dxxx" and "type=3Dxxx", the CMN events 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. And add EventIdCode and Type to the event field. I compared pmu_event.c before and after compiling with JEVENT_ARCH=3Dall, they are consistent. Signed-off-by: Jing Zhang --- tools/perf/pmu-events/jevents.py | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/tools/perf/pmu-events/jevents.py b/tools/perf/pmu-events/jeven= ts.py index f57a8f2..369c8bf 100755 --- a/tools/perf/pmu-events/jevents.py +++ b/tools/perf/pmu-events/jevents.py @@ -275,11 +275,14 @@ class JsonEvent: } return table[unit] if unit in table else f'uncore_{unit.lower()}' =20 - eventcode =3D 0 + eventcode =3D None if 'EventCode' in jd: eventcode =3D int(jd['EventCode'].split(',', 1)[0], 0) if 'ExtSel' in jd: - eventcode |=3D int(jd['ExtSel']) << 8 + if eventcode is None: + eventcode =3D int(jd['ExtSel']) << 8 + else: + 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 '' @@ -317,7 +320,11 @@ 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)}' + event =3D None + if eventcode is not None: + event =3D f'event=3D{llx(eventcode)}' + elif configcode is not None: + event =3D f'config=3D{llx(configcode)}' event_fields =3D [ ('AnyThread', 'any=3D'), ('PortMask', 'ch_mask=3D'), @@ -327,10 +334,15 @@ class JsonEvent: ('Invert', 'inv=3D'), ('SampleAfterValue', 'period=3D'), ('UMask', 'umask=3D'), + ('NodeType', '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] + if event: + event +=3D ',' + value + jd[key] + else: + event =3D value + jd[key] if filter: event +=3D f',{filter}' if msr: --=20 1.8.3.1