From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 7565033065C; Sat, 12 Sep 2026 14:29:31 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1789223373; cv=none; b=KBNZexYfN3jpiaeuEQh73v8J8bcENb7mUUzUn3aJfdb+y0tuS5f1se2b1dwZ3QqbISqxJu19g8m2006rCN7fh7ewHulgGLxyLVccvwsUHG8wIjldt2WVrcRDLbKXyPavqL/8/VImdkJmQP7R5YXmCH/f6DmNHUmbSR2nsRZjJiY= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1789223373; c=relaxed/simple; bh=KUrdVmH4CC/tytKzdNEJmpPwftJ2mD7vybfHkBjpT2g=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=kz7ER0wTR+Q+MEURZJuBMaNk3fIUW5hP039FtNGGoK4sbfnJZhYdz/UV48XcW0e0+HaztKU/yb7XjY6zvj7veMz6mydgEpVPSsIMW/493B8ZovqL8IiKBz+rPm9PTjEten3aso9rY3gKryZFZ1bslGM15nxiAsWtGXWyEzv8+tA= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=Or2QIh2g; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="Or2QIh2g" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 3E61B1F000FF; Sat, 12 Sep 2026 14:29:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1789223371; bh=+jeddYGXrt5Zx37KfHqzEpRwjCK7675pTeBZjjolD10=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=Or2QIh2glwHdrmt76pFuQwAeIqA6SZyMVt6BYFE1eNvBsf+hKQxvXCOvGDhd6s00/ xrCFPdPIooKCi8BPMOXOq8v1wcUVbBx9Er95GiLmTqoJ/I/AWkB9Jr0NVB/A7GAH7w NDijldn5AVd+utPpj4VaW22HCqb0BGMoqqbr/1bw= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Nazar Kazakov , Ian Rogers , Namhyung Kim , Sasha Levin Subject: [PATCH 6.6 0777/1424] perf jevents: Add more components to the metric sorting order Date: Sat, 12 Sep 2026 08:53:29 +0200 Message-ID: <20260912065624.699139858@linuxfoundation.org> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20260912065607.279695368@linuxfoundation.org> References: <20260912065607.279695368@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.6-stable review patch. If anyone has any objections, please let me know. ------------------ From: Ian Rogers [ Upstream commit 557f8b3ca8c8e58d5bc3084734bc7a470b043922 ] Nazar Kazakov reported non-deterministic builds due to the metrics being reordered in the jevents.py output. The metrics were largely only being sorted by name, add in the expressions and descriptions. Reported-by: Nazar Kazakov Closes: https://lore.kernel.org/linux-perf-users/20260706175624.692736-1-nazar.kazakov@codethink.co.uk/ Fixes: 40769665b63d ("perf jevents: Parse metrics during conversion") Tested-by: Nazar Kazakov Signed-off-by: Ian Rogers Signed-off-by: Namhyung Kim Signed-off-by: Sasha Levin --- tools/perf/pmu-events/jevents.py | 5 +++-- tools/perf/pmu-events/metric.py | 6 +++++- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/tools/perf/pmu-events/jevents.py b/tools/perf/pmu-events/jevents.py index 72ba4a9239c6b..40b2cd98abf86 100755 --- a/tools/perf/pmu-events/jevents.py +++ b/tools/perf/pmu-events/jevents.py @@ -503,13 +503,14 @@ const struct pmu_table_entry {_pending_events_tblname}[] = {{ def print_pending_metrics() -> None: """Optionally close metrics table.""" - def metric_cmp_key(j: JsonEvent) -> Tuple[bool, str, str]: + def metric_cmp_key(j: JsonEvent) -> Tuple[str, str, str, str]: def fix_none(s: Optional[str]) -> str: if s is None: return '' return s - return (j.desc is not None, fix_none(j.pmu), fix_none(j.metric_name)) + return (fix_none(j.pmu), fix_none(j.metric_name), j.metric_expr.ToPerfJson(), + fix_none(j.desc)) global _pending_metrics if not _pending_metrics: diff --git a/tools/perf/pmu-events/metric.py b/tools/perf/pmu-events/metric.py index 3e673f25d5fd8..11cbc8dab09a6 100644 --- a/tools/perf/pmu-events/metric.py +++ b/tools/perf/pmu-events/metric.py @@ -445,7 +445,11 @@ class Metric: def __lt__(self, other): """Sort order.""" - return self.name < other.name + if self.name != other.name: + return self.name < other.name + if not self.expr.Equals(other.expr): + return self.expr.ToPerfJson() < other.expr.ToPerfJson() + return self.description < other.description def AddToMetricGroup(self, group): """Callback used when being added to a MetricGroup.""" -- 2.53.0