From nobody Fri Oct 3 15:34:24 2025 Received: from mail-pg1-f201.google.com (mail-pg1-f201.google.com [209.85.215.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id E2B8D248F7F for ; Fri, 29 Aug 2025 03:07:46 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.215.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1756436868; cv=none; b=rlSMnunwt7b2LWsenPtc64PRPBlBnIWNEMkX3Y2w7rRuOT8qTXOf7ICMXxwW7DIIphrsOy3YigNm60O0MFiKPbsVLZAf7dmb14GsHXjmGkA3aad8deqQhDte/2+glE2YgcH7lBlezbcy7+fnykmErZH5YI6aN59L/W2/QhLzku4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1756436868; c=relaxed/simple; bh=EojQsIdJN1GuyaOl2KgVOYpdyL7ZGtnSEaoqswJcMlE=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Content-Type; b=HN+3JJKZlQCqdjRS9xkUzvYFHpZc8P1743RtdPvH9cRvz5aTHq3/usH1uAmwXkMKA+EnOmSPesOjWA9F7lnzcCJv3uzt04SMXe6zSIL7SRUfiTfTKApAjEE1rsQXqz3Oan9nPhI1P9QZ///qk/aqugKuiX2NnWODPQQs1Vz9UoA= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--irogers.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=4ZtlC7wG; arc=none smtp.client-ip=209.85.215.201 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--irogers.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="4ZtlC7wG" Received: by mail-pg1-f201.google.com with SMTP id 41be03b00d2f7-b471737e673so2513172a12.1 for ; Thu, 28 Aug 2025 20:07:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1756436866; x=1757041666; darn=vger.kernel.org; h=to:from:subject:message-id:references:mime-version:in-reply-to:date :from:to:cc:subject:date:message-id:reply-to; bh=XpvrhTjgsn/qk3aSFs928zmUukaE0KfqqZKqz4DFQQM=; b=4ZtlC7wGQZzmdh+q7kP4d2YegWDu7ArJj07kTpbUOi/HbtXnA9a4P7WHjxM/ywQou3 BkeGAOUaCcJz8PrOGVU9F0tp0db9eqmcH+ogT7B60uKKY61wKQXlPsn7LQK8u0imgNbd kTneuZZwkOe2HKW4aHlbMcr8BSZRw8mUBX3Q5UZqujpxC6OAQm6qkIdZxoJt1Ige+y4q rsB1gW/WTWu34BQZWowR/ATd8dP78B+JHZogEu5yvEGJ2POLr/YdeqVkLm9I+b7Vzrmr P5qCHXdfP7oSAsviOaAh8q65aFWc6dtUgZN/jH4BmnnpNvrzLa651Y721F9zXVOuUIHJ y0dg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1756436866; x=1757041666; h=to:from:subject:message-id:references:mime-version:in-reply-to:date :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=XpvrhTjgsn/qk3aSFs928zmUukaE0KfqqZKqz4DFQQM=; b=jSlrLHdeSRhMoSPuZrT30gfCtYUYK1DJNkCXUvJCrWN79/SDQNdvMSZZRuwd6r3C9a 1XaXJkk8f8HW4BB715pgheF/0Mfv9BoapNsXYyoZtfaKz6qkQUMAqoxNHgjZhiGYeq7r mo+Hbv6ZL0D/erTzXhQj25glWwYmy++RMC2r2Ztq3fUyUlnTRFUVJX7XOBOc/p8x0B1e +GApbvF4G1nVwHx43KuEsUMx2lDsfG3HdypRE/Jf2wT4bkRK927nDdxW0bA5Nqu9fO3v s6fBosV5jXgWE1SomKScowKjhp2gT5G2d5eeNEwqydgkYV+6lGFQUxiXqIGUsRfZm7Ph vLTw== X-Forwarded-Encrypted: i=1; AJvYcCVhouWcjp2VAvZFv3RTrLxQChcBzm6dCfq3zjmWrVbnr4wXkA7vOacc8DjQCHpbyPmb11ohmXrTVPFwgjo=@vger.kernel.org X-Gm-Message-State: AOJu0Yx2rg+VVAi1YLHQYcYPrtrKQyXxLAuLWMB4Gfwd18UU7e54BRqt vs9p8wWvPL8nbMUySlwzHNVT7TmKu2Ej6GAvh4R+NZRTFjd9dnWVCy+X+Rv9dQqe66zXFNVqvpf WHEgiO43E9g== X-Google-Smtp-Source: AGHT+IFZRJlDlWDv4YCFoPK8CVnuDonQ45vbo7lM64LoLVkiN6b58RAMtn1zVT5LsWMELR8lo5acltefU4lK X-Received: from pjxx6.prod.google.com ([2002:a17:90b:58c6:b0:324:ed49:6c92]) (user=irogers job=prod-delivery.src-stubby-dispatcher) by 2002:a05:6a20:244d:b0:243:bcff:b436 with SMTP id adf61e73a8af0-243bd0036aemr3707842637.34.1756436866203; Thu, 28 Aug 2025 20:07:46 -0700 (PDT) Date: Thu, 28 Aug 2025 20:07:22 -0700 In-Reply-To: <20250829030727.4159703-1-irogers@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20250829030727.4159703-1-irogers@google.com> X-Mailer: git-send-email 2.51.0.318.gd7df087d1a-goog Message-ID: <20250829030727.4159703-9-irogers@google.com> Subject: [PATCH v5 08/12] perf jevents: Move json encoding to its own functions From: Ian Rogers To: Peter Zijlstra , Ingo Molnar , Arnaldo Carvalho de Melo , Namhyung Kim , Mark Rutland , Alexander Shishkin , Jiri Olsa , Ian Rogers , Adrian Hunter , Kan Liang , James Clark , Xu Yang , linux-kernel@vger.kernel.org, linux-perf-users@vger.kernel.org, John Garry , Jing Zhang , Sandipan Das , Benjamin Gray Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Have dedicated encode functions rather than having them embedded in MetricGroup. This is to provide some uniformity in the Metric ToXXX routines. Signed-off-by: Ian Rogers --- tools/perf/pmu-events/metric.py | 34 +++++++++++++++++++++------------ 1 file changed, 22 insertions(+), 12 deletions(-) diff --git a/tools/perf/pmu-events/metric.py b/tools/perf/pmu-events/metric= .py index e81fed2e29b5..b39189182608 100644 --- a/tools/perf/pmu-events/metric.py +++ b/tools/perf/pmu-events/metric.py @@ -484,15 +484,6 @@ class Metric: def ToMetricGroupDescriptions(self, root: bool =3D True) -> Dict[str, st= r]: return {} =20 -class _MetricJsonEncoder(json.JSONEncoder): - """Special handling for Metric objects.""" - - def default(self, o): - if isinstance(o, Metric): - return o.ToPerfJson() - return json.JSONEncoder.default(self, o) - - class MetricGroup: """A group of metrics. =20 @@ -523,8 +514,11 @@ class MetricGroup: =20 return result =20 - def ToPerfJson(self) -> str: - return json.dumps(sorted(self.Flatten()), indent=3D2, cls=3D_MetricJso= nEncoder) + def ToPerfJson(self) -> List[Dict[str, str]]: + result =3D [] + for x in sorted(self.Flatten()): + result.append(x.ToPerfJson()) + return result =20 def ToMetricGroupDescriptions(self, root: bool =3D True) -> Dict[str, st= r]: result =3D {self.name: self.description} if self.description else {} @@ -533,7 +527,23 @@ class MetricGroup: return result =20 def __str__(self) -> str: - return self.ToPerfJson() + return str(self.ToPerfJson()) + + +def JsonEncodeMetric(x: MetricGroup): + class MetricJsonEncoder(json.JSONEncoder): + """Special handling for Metric objects.""" + + def default(self, o): + if isinstance(o, Metric) or isinstance(o, MetricGroup): + return o.ToPerfJson() + return json.JSONEncoder.default(self, o) + + return json.dumps(x, indent=3D2, cls=3DMetricJsonEncoder) + + +def JsonEncodeMetricGroupDescriptions(x: MetricGroup): + return json.dumps(x.ToMetricGroupDescriptions(), indent=3D2) =20 =20 class _RewriteIfExpToSelect(ast.NodeTransformer): --=20 2.51.0.318.gd7df087d1a-goog