From nobody Wed Dec 10 20:09:26 2025 Received: from mail-pl1-f201.google.com (mail-pl1-f201.google.com [209.85.214.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 D7A352749DC for ; Thu, 13 Nov 2025 03:20:57 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1763004059; cv=none; b=IU7JVKUNzKF8OCaGb9KSshNMKd79IVCqWUxqBs7FzrPIrohvQOtPhpNQbpp+eudRQZyhljk6UPGs3wclXxR3hDl04zYIQaHWIp5vS8tM0oOAueEG8MjlT5D4TDmtdZVSsc0VkhYGaIILt8Qico22arWCAVUHZF7yiU+c9q/fgvE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1763004059; c=relaxed/simple; bh=/wEuwYJacbKKFlQbisK53qhhUkEk1l0aXnBlIihbh9U=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Content-Type; b=BY9chxIA1tVnBgwnabJUZB9WBQdvr9t/NuelbXu5Wj7PRVuwdgGD35maxWPu2Ctx91gKiGxNrlKDQJMWZXwy8NrL50Qt/5g3Ut75P/ZyDy0XyFTKrNh7PzBkyObpgoAmyZ6gNIiK7vMnzHZZ5JddBhkA/JXzCQygHqDcn/u3c4U= 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=s5LgEgwg; arc=none smtp.client-ip=209.85.214.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="s5LgEgwg" Received: by mail-pl1-f201.google.com with SMTP id d9443c01a7336-297b35951b7so4376115ad.3 for ; Wed, 12 Nov 2025 19:20:57 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1763004057; x=1763608857; 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=OdnvPjUnvOTc/khADHyjd22NHmjVe0GcMSDru3c6rsg=; b=s5LgEgwg7/kEdIH5YM8+it5Rd0TkC6gKEoRd6CXxxiMGJ/1veWoxHeAy0JEnUlUWWs OWwEOAjODbhxImWB6Dm8NGwojfhls5S+sLpDXZXstowiX0QYilj+36HVxIX5OQ/2ABfJ 8z8q+v0lj9p1+loNQ1ppwmpzqsDIa4GFHPOFi7cbgE0U154z+sKOoFM64s3CVeR0ZIdg wdq+8hI4YaBpU6abm6O1Znz/4bgLzW0T9GkEvQPZSNd0iHTF8seLapX63HmvyVlWE+R8 x8GFwQPW2ZdPb9x+n4Gvq75tSrfo2RKuQTdiwENPCW6c9Kly/PblI3TfvlGXHW+BXgCV OqWw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1763004057; x=1763608857; 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=OdnvPjUnvOTc/khADHyjd22NHmjVe0GcMSDru3c6rsg=; b=DCiQOz/5ICCgckqRlxV27l3SkqeFqe6Qj7ETBPIlGlt7tIWuT4Lrm25/+BthDt4rFA loPZyUXvr2O+99tickk2lPjaztOLN4xwX3yirBOyCbIq2jXpyrlZVtBb4IN1wwVpOqWS WY19VH1GZfnvYI3yCyBStNZvmMLFCBE597KJTjIPx1oC86DKkd12tvVodvvrNtusshYt yDZXdOOOtnWVCfpJ0jKPsFBA6C8bzMKGsoPGtNjrxAGKPzW5Qr66ulC+9OFL42C7KjUz +yQK7cAdEMr32JhqzhMNg6pWJjtIkOjFdJnV1BVGhebOlmFHzKBAsy1ERAbf38/pP+YG rFrA== X-Forwarded-Encrypted: i=1; AJvYcCWcETQgqqhNsfEZVF+XpUepikw751iO+ank5cM7AveJUVeQ3ELgUo0nj9/UIru1nwfcohxgqgvokEAykwA=@vger.kernel.org X-Gm-Message-State: AOJu0YybjT0Og9CESr8JIiGhlYgUhXX1m0Ty3hp0u3Ae7l11DeLR1Fod WLyVFEkaZ3jiaZjwEpz4PMV7BaFahOI8BmsY3sFiPBUy+jVM4UoIvxxJjuTJy3Q9LVNI9givTKz bwjBwwfrolw== X-Google-Smtp-Source: AGHT+IENUSd+lkjoZsq3X/mgYxckQizMTyTN+FLUqohdc7ToQ3zhL9b20/x+B5CLRvZiyi/W8aKKHcX7dAct X-Received: from dybli13.prod.google.com ([2002:a05:7301:128d:b0:2a4:7052:5652]) (user=irogers job=prod-delivery.src-stubby-dispatcher) by 2002:a17:903:3c46:b0:295:560a:e474 with SMTP id d9443c01a7336-2984edacbedmr63481055ad.32.1763004057211; Wed, 12 Nov 2025 19:20:57 -0800 (PST) Date: Wed, 12 Nov 2025 19:19:49 -0800 In-Reply-To: <20251113032040.1994090-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: <20251113032040.1994090-1-irogers@google.com> X-Mailer: git-send-email 2.51.2.1041.gc1ab5b90ca-goog Message-ID: <20251113032040.1994090-2-irogers@google.com> Subject: [PATCH v8 01/52] perf python: Correct copying of metric_leader in an evsel 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" Ensure the metric_leader is copied and set up correctly. In compute_metric determine the correct metric_leader event to match the requested CPU. Fixes the handling of metrics particularly on hybrid machines. Signed-off-by: Ian Rogers --- tools/perf/util/evsel.c | 1 + tools/perf/util/python.c | 82 +++++++++++++++++++++++++++++----------- 2 files changed, 61 insertions(+), 22 deletions(-) diff --git a/tools/perf/util/evsel.c b/tools/perf/util/evsel.c index 989c56d4a23f..0918afe5c009 100644 --- a/tools/perf/util/evsel.c +++ b/tools/perf/util/evsel.c @@ -538,6 +538,7 @@ struct evsel *evsel__clone(struct evsel *dest, struct e= vsel *orig) #endif evsel->handler =3D orig->handler; evsel->core.leader =3D orig->core.leader; + evsel->metric_leader =3D orig->metric_leader; =20 evsel->max_events =3D orig->max_events; zfree(&evsel->unit); diff --git a/tools/perf/util/python.c b/tools/perf/util/python.c index fa5e4270d182..cc1019d29a5d 100644 --- a/tools/perf/util/python.c +++ b/tools/perf/util/python.c @@ -1340,27 +1340,48 @@ static int prepare_metric(const struct metric_expr = *mexp, struct metric_ref *metric_refs =3D mexp->metric_refs; =20 for (int i =3D 0; metric_events[i]; i++) { - char *n =3D strdup(evsel__metric_id(metric_events[i])); + struct evsel *cur =3D metric_events[i]; double val, ena, run; - int source_count =3D evsel__source_count(metric_events[i]); - int ret; + int ret, source_count =3D 0; struct perf_counts_values *old_count, *new_count; + char *n =3D strdup(evsel__metric_id(cur)); =20 if (!n) return -ENOMEM; =20 + /* + * If there are multiple uncore PMUs and we're not reading the + * leader's stats, determine the stats for the appropriate + * uncore PMU. + */ + if (evsel && evsel->metric_leader && + evsel->pmu !=3D evsel->metric_leader->pmu && + cur->pmu =3D=3D evsel->metric_leader->pmu) { + struct evsel *pos; + + evlist__for_each_entry(evsel->evlist, pos) { + if (pos->pmu !=3D evsel->pmu) + continue; + if (pos->metric_leader !=3D cur) + continue; + cur =3D pos; + source_count =3D 1; + break; + } + } + if (source_count =3D=3D 0) - source_count =3D 1; + source_count =3D evsel__source_count(cur); =20 - ret =3D evsel__ensure_counts(metric_events[i]); + ret =3D evsel__ensure_counts(cur); if (ret) return ret; =20 /* Set up pointers to the old and newly read counter values. */ - old_count =3D perf_counts(metric_events[i]->prev_raw_counts, cpu_idx, th= read_idx); - new_count =3D perf_counts(metric_events[i]->counts, cpu_idx, thread_idx); - /* Update the value in metric_events[i]->counts. */ - evsel__read_counter(metric_events[i], cpu_idx, thread_idx); + old_count =3D perf_counts(cur->prev_raw_counts, cpu_idx, thread_idx); + new_count =3D perf_counts(cur->counts, cpu_idx, thread_idx); + /* Update the value in cur->counts. */ + evsel__read_counter(cur, cpu_idx, thread_idx); =20 val =3D new_count->val - old_count->val; ena =3D new_count->ena - old_count->ena; @@ -1392,6 +1413,7 @@ static PyObject *pyrf_evlist__compute_metric(struct p= yrf_evlist *pevlist, struct metric_expr *mexp =3D NULL; struct expr_parse_ctx *pctx; double result =3D 0; + struct evsel *metric_evsel =3D NULL; =20 if (!PyArg_ParseTuple(args, "sii", &metric, &cpu, &thread)) return NULL; @@ -1404,6 +1426,7 @@ static PyObject *pyrf_evlist__compute_metric(struct p= yrf_evlist *pevlist, =20 list_for_each(pos, &me->head) { struct metric_expr *e =3D container_of(pos, struct metric_expr, nd); + struct evsel *pos2; =20 if (strcmp(e->metric_name, metric)) continue; @@ -1411,20 +1434,24 @@ static PyObject *pyrf_evlist__compute_metric(struct= pyrf_evlist *pevlist, if (e->metric_events[0] =3D=3D NULL) continue; =20 - cpu_idx =3D perf_cpu_map__idx(e->metric_events[0]->core.cpus, - (struct perf_cpu){.cpu =3D cpu}); - if (cpu_idx < 0) - continue; - - thread_idx =3D perf_thread_map__idx(e->metric_events[0]->core.threads, - thread); - if (thread_idx < 0) - continue; - - mexp =3D e; - break; + evlist__for_each_entry(&pevlist->evlist, pos2) { + if (pos2->metric_leader !=3D e->metric_events[0]) + continue; + cpu_idx =3D perf_cpu_map__idx(pos2->core.cpus, + (struct perf_cpu){.cpu =3D cpu}); + if (cpu_idx < 0) + continue; + + thread_idx =3D perf_thread_map__idx(pos2->core.threads, thread); + if (thread_idx < 0) + continue; + metric_evsel =3D pos2; + mexp =3D e; + goto done; + } } } +done: if (!mexp) { PyErr_Format(PyExc_TypeError, "Unknown metric '%s' for CPU '%d' and thre= ad '%d'", metric, cpu, thread); @@ -1435,7 +1462,7 @@ static PyObject *pyrf_evlist__compute_metric(struct p= yrf_evlist *pevlist, if (!pctx) return PyErr_NoMemory(); =20 - ret =3D prepare_metric(mexp, mexp->metric_events[0], pctx, cpu_idx, threa= d_idx); + ret =3D prepare_metric(mexp, metric_evsel, pctx, cpu_idx, thread_idx); if (ret) { expr__ctx_free(pctx); errno =3D -ret; @@ -1996,6 +2023,17 @@ static PyObject *pyrf_evlist__from_evlist(struct evl= ist *evlist) else if (leader =3D=3D NULL) evsel__set_leader(pos, pos); } + + leader =3D pos->metric_leader; + + if (pos !=3D leader) { + int idx =3D evlist__pos(evlist, leader); + + if (idx >=3D 0) + pos->metric_leader =3D evlist__at(&pevlist->evlist, idx); + else if (leader =3D=3D NULL) + pos->metric_leader =3D pos; + } } metricgroup__copy_metric_events(&pevlist->evlist, /*cgrp=3D*/NULL, &pevlist->evlist.metric_events, --=20 2.51.2.1041.gc1ab5b90ca-goog