From nobody Thu Dec 11 19:01:29 2025 Received: from mail-pf1-f202.google.com (mail-pf1-f202.google.com [209.85.210.202]) (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 5217E2D0636 for ; Tue, 2 Dec 2025 17:52:02 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.202 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1764697923; cv=none; b=Gb3VoVSDJm/3pS6v/Lde+9pi30dZHK/bstZJFqklL34hL04bUjvkqT+WvnD9Mwptr5up/p4HpUL2sTgPlWzeQV8AorsWoEq1AyWGiVqfzahMfwKH9NSot8/5G3+eDkt2+Cm7PxD7Y5VAO/lb4Jt/iGWIvsunuw6xSY4JJ5jo1RI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1764697923; c=relaxed/simple; bh=IcQE33lXjfPpknRvMrGb82o9KD6o/Bm0xpa0LZXKGxg=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Content-Type; b=YUrswy5iz283adaIT1Lu3gCv7ZngvyFE1qwu7VfFkDthgaYMY+MwJOKdE9cTOHdrtOjat21fAwGYg3Vn7SmIhfBSoZL7t3jMOHrpCKwu+bseDYBPfZuVRqYBuXPNOlhX8h56VWx0OStk3roshJqmY1O6Y28QbeD6AVnenm21cQQ= 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=mnKOJjWT; arc=none smtp.client-ip=209.85.210.202 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="mnKOJjWT" Received: by mail-pf1-f202.google.com with SMTP id d2e1a72fcca58-7b8ed43cd00so5731147b3a.2 for ; Tue, 02 Dec 2025 09:52:02 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1764697921; x=1765302721; 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=+ANYUwQ4vRnr8Tfeed0nEXZFt9sI8XctpT0STC6xRp8=; b=mnKOJjWTRWLcZrwlBfW7ofKEoNgeRjJJNq5vu3z1YZZTIguD0Qw64lVzbCzDXUUx7E aMDkSuXR0E2ABJ3egmvKsKOzNlkDe6MsZeofpUdlpyUlgKWfM63HjUmb0IsEe/qg2nDz oIDv8zzfR+6UofFGz7xOZatgKhXpg/IXwgFTkv3xZ8GTjLCTs+NQy5Mtisqybe/yZU/P riiv7WcIQJPsdNLrApSyIPoFv4aqnU9Kvc8ToltJfvW5wYBlI2onsLQhKdPZfcwql9DD Dwnf8o3Ajua9h2X7NAfkE2MQIU3Toe4muuKtLO34Nx+QMFjlibnWSfBvaBFPXnaoTYN+ KTiA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1764697921; x=1765302721; 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=+ANYUwQ4vRnr8Tfeed0nEXZFt9sI8XctpT0STC6xRp8=; b=era3hu742b0i/vLgyGjMiPyiCg+8QsqHfnFz//pwyhrIpzZtRdYvP3JtlXihUiuVUK hanmrGXp7RHkGrddv3/VygE/b3mH2OmWAXdqkmtoqQNiJu0PSiDf3na6C2Xy/7iN2e4C /YFdxG/4IIBYrnGpeDbNi/eI1T+MSRkv9BB6cqYk58fpRhL+EjLcYOPcEJs83dPjCG0j MwXEVo4bAEfj8mvny15gdjViF2sCEOXnb8LWOqtCUO9swth+sCHL//Wlx0wpqZgUg6Kz 0p5EliM3LEp0IhB2V2SamR4yndzKksjTJlsRDK5gApvF6vb1WMWB3V6NPA6V0NLhdYBO HhVw== X-Forwarded-Encrypted: i=1; AJvYcCU6DCfI9ymcIburZIozYTygpUpTVklh95hHIAC9oEg6/Qb4gtD8190N4wKAbd4x2B15XfLcv6ErGdqVBFk=@vger.kernel.org X-Gm-Message-State: AOJu0YxSwXb/qGCuL1wwwQhzUGKCFqjsI+VGW+sr4lQAP7whaL31gUP5 aLgZ17rMVXdIO+ocnDfkxQP33QOuVTQ1ySx391+KbXe6DUe6gwVvrnH3JOZ2C/wf3FgHExgmgNA 9dJOJY+QjIw== X-Google-Smtp-Source: AGHT+IF+DOJx23D3lIKPsLM9PwfUaC1iydcEBsjdhnTa5mfDQHg7tgKGyPQBcl3Uj78bLyMSGQEXYzT5e5tS X-Received: from pfmm22.prod.google.com ([2002:a05:6a00:2496:b0:7dd:8bba:63a7]) (user=irogers job=prod-delivery.src-stubby-dispatcher) by 2002:a05:6a20:939f:b0:35e:9b66:9376 with SMTP id adf61e73a8af0-363f3a37c24mr419509637.60.1764697921400; Tue, 02 Dec 2025 09:52:01 -0800 (PST) Date: Tue, 2 Dec 2025 09:50:07 -0800 In-Reply-To: <20251202175043.623597-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: <20251202175043.623597-1-irogers@google.com> X-Mailer: git-send-email 2.52.0.158.g65b55ccf14-goog Message-ID: <20251202175043.623597-13-irogers@google.com> Subject: [PATCH v9 12/48] perf jevents: Skip optional metrics in metric group list From: Ian Rogers To: Adrian Hunter , Alexander Shishkin , Arnaldo Carvalho de Melo , Benjamin Gray , Caleb Biggers , Edward Baker , Ian Rogers , Ingo Molnar , James Clark , Jing Zhang , Jiri Olsa , John Garry , Leo Yan , Namhyung Kim , Perry Taylor , Peter Zijlstra , Samantha Alt , Sandipan Das , Thomas Falcon , Weilin Wang , Xu Yang , linux-kernel@vger.kernel.org, linux-perf-users@vger.kernel.org Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" For metric groups, skip metrics in the list that are None. This allows functions to better optionally return metrics. Signed-off-by: Ian Rogers Tested-by: Thomas Falcon --- tools/perf/pmu-events/metric.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/tools/perf/pmu-events/metric.py b/tools/perf/pmu-events/metric= .py index b39189182608..dd8fd06940e6 100644 --- a/tools/perf/pmu-events/metric.py +++ b/tools/perf/pmu-events/metric.py @@ -493,13 +493,15 @@ class MetricGroup: """ =20 def __init__(self, name: str, - metric_list: List[Union[Metric, 'MetricGroup']], + metric_list: List[Union[Optional[Metric], Optional['MetricG= roup']]], description: Optional[str] =3D None): self.name =3D name - self.metric_list =3D metric_list + self.metric_list =3D [] self.description =3D description for metric in metric_list: - metric.AddToMetricGroup(self) + if metric: + self.metric_list.append(metric) + metric.AddToMetricGroup(self) =20 def AddToMetricGroup(self, group): """Callback used when a MetricGroup is added into another.""" --=20 2.52.0.158.g65b55ccf14-goog