diff mbox series

[v1,09/12] perf jevents: Drop duplicate pending metrics

Message ID	20240228175617.4049201-10-irogers@google.com
State	New
Headers	Received-SPF: pass (google.com: domain of linux-kernel+bounces-85484-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45d1:ec00::1 as permitted sender) client-ip=2604:1380:45d1:ec00::1; Date: Wed, 28 Feb 2024 09:56:14 -0800 In-Reply-To: <20240228175617.4049201-1-irogers@google.com> Message-Id: <20240228175617.4049201-10-irogers@google.com> Precedence: bulk Mime-Version: 1.0 References: <20240228175617.4049201-1-irogers@google.com> Subject: [PATCH v1 09/12] perf jevents: Drop duplicate pending metrics From: Ian Rogers <irogers@google.com> To: Peter Zijlstra <peterz@infradead.org>, Ingo Molnar <mingo@redhat.com>, Arnaldo Carvalho de Melo <acme@kernel.org>, Namhyung Kim <namhyung@kernel.org>, Mark Rutland <mark.rutland@arm.com>, Alexander Shishkin <alexander.shishkin@linux.intel.com>, Jiri Olsa <jolsa@kernel.org>, Ian Rogers <irogers@google.com>, Adrian Hunter <adrian.hunter@intel.com>, John Garry <john.g.garry@oracle.com>, Kan Liang <kan.liang@linux.intel.com>, Jing Zhang <renyu.zj@linux.alibaba.com>, Thomas Richter <tmricht@linux.ibm.com>, James Clark <james.clark@arm.com>, linux-kernel@vger.kernel.org, linux-perf-users@vger.kernel.org, Andi Kleen <ak@linux.intel.com>, Kajol Jain <kjain@linux.ibm.com>, Sandipan Das <sandipan.das@amd.com>, Ravi Bangoria <ravi.bangoria@amd.com>, Perry Taylor <perry.taylor@intel.com>, Samantha Alt <samantha.alt@intel.com>, Caleb Biggers <caleb.biggers@intel.com>, Weilin Wang <weilin.wang@intel.com>, Edward Baker <edward.baker@intel.com>, Stephane Eranian <eranian@google.com> Content-Type: text/plain; charset="UTF-8" X-getmail-retrieved-from-mailbox: INBOX
Series	[v1,01/12] perf jevents: Allow multiple metricgroups.json files \| [v1,01/12] perf jevents: Allow multiple metricgroups.json files [v1,02/12] perf jevents: Update metric constraint support [v1,03/12] perf jevents: Add descriptions to metricgroup abstraction [v1,04/12] perf jevents: Allow metric groups not to be named [v1,05/12] perf jevents: Support parsing negative exponents [v1,06/12] perf jevents: Term list fix in event parsing [v1,07/12] perf jevents: Add threshold expressions to Metric [v1,08/12] perf jevents: Move json encoding to its own functions [v1,09/12] perf jevents: Drop duplicate pending metrics [v1,10/12] perf jevents: Skip optional metrics in metric group list [v1,11/12] perf jevents: Build support for generating metrics from python [v1,12/12] perf jevents: Add load event json to verify and allow fallbacks

Commit Message

Ian Rogers Feb. 28, 2024, 5:56 p.m. UTC

  Drop adding a pending metric if there is an existing one.

Signed-off-by: Ian Rogers <irogers@google.com>
---
 tools/perf/pmu-events/jevents.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff mbox series

Patch

diff --git a/tools/perf/pmu-events/jevents.py b/tools/perf/pmu-events/jevents.py
index 65ab03ce5064..55205a260a16 100755
--- a/tools/perf/pmu-events/jevents.py
+++ b/tools/perf/pmu-events/jevents.py
@@ -468,7 +468,7 @@  def add_events_table_entries(item: os.DirEntry, topic: str) -> None:
   for e in read_json_events(item.path, topic):
     if e.name:
       _pending_events.append(e)
-    if e.metric_name:
+    if e.metric_name and not any(e.metric_name == x.metric_name for x in _pending_metrics):
       _pending_metrics.append(e)