From nobody Tue Feb 10 19:16:13 2026 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 CD0E72E543E for ; Thu, 6 Nov 2025 07:12:53 +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=1762413175; cv=none; b=UxQe3AwkOfEUbVQaHQhU5iEZZiGohz5cTetdE3me+Q/0dvt6EcqC2p2omonn430xde85ITh70WrjbM9g9LyqBK71mzb/8dAKzPDj5hVcb17Z/NQ1yVhSgDTy3lb3cX2C2THLwG6UdiE2RCYV3AkNo12U1Nm+SrFsuniQ8r+5G5I= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1762413175; c=relaxed/simple; bh=EC/tZ9Xdy5myRRq+PdXPCKA/bbIvt50N1agXEhWd7Rg=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Content-Type; b=i5hSDHMXTFZokm7Y3K8ep2VQoBcuOarwiBr7/YLzau5z3sCR/lbAlIuYLQAkMbEE02GnCr214mWcmG/TjVRgVL5WjgU9s1b14yHlnec8TvvGqsB5kKvlg1XWjXJDo+82I6SVt/DrK6jP3Iaqnhrt1cIGYqCewxXtNcumzSrwSWM= 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=tg5T3ARd; 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="tg5T3ARd" Received: by mail-pg1-f201.google.com with SMTP id 41be03b00d2f7-b6ce1b57b9cso645733a12.1 for ; Wed, 05 Nov 2025 23:12:53 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1762413173; x=1763017973; 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=A4ZNYhXXjGnRVVF3I/Hjm5vaAXPO71/s9Kf71lIm9nQ=; b=tg5T3ARdGqbsgOew2K+s222ZCz7ckEai9nG75XNpK0yYq2f4L5m9IaYJyF7kJpcG5g 9KUJodYzUCSwNNDnBKgbYyJZm8RXO8iBqEEbc7YnaKp6ab5/JkjImngcLLkKNIXguVAc u4lPMP2Yam/vUCdtIrkkLKRhF2KaBKSbmcbjYe1naSBweHlFWWTYOBmhm3/tA6ztf/9v Qi4Xf5Yz9xcvkMkIWhedHV3dEcX7kyqSuCFexChbHdLx8AbhAFxmhp5X/tVteVVn4j1d u9It7uQhZbctr3z/mAPsnCRXl5oR9FtwjjUK9mhKKon9A4UUdpSRL9xV9r7hmrnb9lmI dFBw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1762413173; x=1763017973; 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=A4ZNYhXXjGnRVVF3I/Hjm5vaAXPO71/s9Kf71lIm9nQ=; b=eX62Dwjju6BtkW0tg8N8aNFaumfOl+bWNt07bZg9wk8AWGF8mIYX6fu+zWSOP7zdFD m1cwfyBdCxGkroeBlWU2uJL+sbFbtasXpeSSnx+bmqACPSMLtnnXjpbHI56ndY53P8Ov nSbgcUv1uwyjBEX9z1X19ku34gwcPBetdq+CcRjKh5411Rr+ClFuw5rcyFnxrlptBGff yV+QYqIB81/h3OQeB0tRg2WF6ZfSyIF/ySg3cl/2MOwMWXIxBLQwxR9fqjKrDRY67nrR BHJFyhL0eLiWfcLlkE/oNG2bDQg+cQnl2boXgLXFzu8RLjXwWjcvMwNxxggw45/R0vZv aXpA== X-Forwarded-Encrypted: i=1; AJvYcCWrV9xPEqqvB1GtCxhOBTGSq5Te7KW68vMAmFT5kPwM2LLfNyCFAFUuNG8BUIYyTA71aNVphwYm69lmjhE=@vger.kernel.org X-Gm-Message-State: AOJu0YyIk3LrKZk1NfdNKuAZOyYpQecq2/xwlX+Zgu6RQ2X8JIE6C0ZU eAFbDkY4sKLmo6dMfp4YKD51xvt98b3LVD1C8kodr6paenbFQ7hX30xt+w3dAPJGpzZ6OU0Nrzx hnnyND+z8mg== X-Google-Smtp-Source: AGHT+IHGU1zIshvyY+car8C198znETVpyz+J4B/MEF/IzHG6Vp7onwTJYM5tT/KUFm8oCtJPiJO3W6kuDROM X-Received: from dlbut3.prod.google.com ([2002:a05:7022:7e03:b0:119:49ca:6ba5]) (user=irogers job=prod-delivery.src-stubby-dispatcher) by 2002:a05:6a20:4305:b0:344:bf35:2bfa with SMTP id adf61e73a8af0-34f8561d759mr8426190637.33.1762413173091; Wed, 05 Nov 2025 23:12:53 -0800 (PST) Date: Wed, 5 Nov 2025 23:12:35 -0800 In-Reply-To: <20251106071241.141234-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: <20251106071241.141234-1-irogers@google.com> X-Mailer: git-send-email 2.51.2.1041.gc1ab5b90ca-goog Message-ID: <20251106071241.141234-5-irogers@google.com> Subject: [PATCH v3 4/9] perf stat-shadow: Read tool events directly From: Ian Rogers To: Peter Zijlstra , Ingo Molnar , Arnaldo Carvalho de Melo , Namhyung Kim , Alexander Shishkin , Jiri Olsa , Ian Rogers , Adrian Hunter , "Dr. David Alan Gilbert" , Yang Li , James Clark , Thomas Falcon , Thomas Richter , linux-perf-users@vger.kernel.org, linux-kernel@vger.kernel.org, Andi Kleen , Dapeng Mi Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" When reading time values for metrics don't use the globals updated in builtin-stat, just read the events as regular events. The only exception is for time events where nanoseconds need converting to seconds as metrics assume time metrics are in seconds. Signed-off-by: Ian Rogers --- tools/perf/util/stat-shadow.c | 147 +++++++++++++++------------------- 1 file changed, 66 insertions(+), 81 deletions(-) diff --git a/tools/perf/util/stat-shadow.c b/tools/perf/util/stat-shadow.c index abaf6b579bfc..939ac3269a44 100644 --- a/tools/perf/util/stat-shadow.c +++ b/tools/perf/util/stat-shadow.c @@ -371,7 +371,32 @@ static void print_nsecs(struct perf_stat_config *confi= g, } } =20 -static int prepare_metric(const struct metric_expr *mexp, +static bool tool_pmu__is_time_event(const struct perf_stat_config *config, + const struct evsel *evsel, int *tool_aggr_idx) +{ + enum tool_pmu_event event =3D evsel__tool_event(evsel); + int aggr_idx; + + if (event !=3D TOOL_PMU__EVENT_DURATION_TIME && + event !=3D TOOL_PMU__EVENT_USER_TIME && + event !=3D TOOL_PMU__EVENT_SYSTEM_TIME) + return false; + + if (config) { + cpu_aggr_map__for_each_idx(aggr_idx, config->aggr_map) { + if (config->aggr_map->map[aggr_idx].cpu.cpu =3D=3D 0) { + *tool_aggr_idx =3D aggr_idx; + return true; + } + } + pr_debug("Unexpected CPU0 missing in aggregation for tool event.\n"); + } + *tool_aggr_idx =3D 0; /* Assume the first aggregation index works. */ + return true; +} + +static int prepare_metric(const struct perf_stat_config *config, + const struct metric_expr *mexp, const struct evsel *evsel, struct expr_parse_ctx *pctx, int aggr_idx) @@ -381,91 +406,51 @@ static int prepare_metric(const struct metric_expr *m= exp, int i; =20 for (i =3D 0; metric_events[i]; i++) { + int source_count =3D 0, tool_aggr_idx; + bool is_tool_time =3D + tool_pmu__is_time_event(config, metric_events[i], &tool_aggr_idx); + struct perf_stat_evsel *ps =3D metric_events[i]->stats; + struct perf_stat_aggr *aggr; char *n; double val; - int source_count =3D 0; =20 - if (evsel__is_tool(metric_events[i])) { - struct stats *stats; - double scale; - - switch (evsel__tool_event(metric_events[i])) { - case TOOL_PMU__EVENT_DURATION_TIME: - stats =3D &walltime_nsecs_stats; - scale =3D 1e-9; - break; - case TOOL_PMU__EVENT_USER_TIME: - stats =3D &ru_stats.ru_utime_usec_stat; - scale =3D 1e-6; - break; - case TOOL_PMU__EVENT_SYSTEM_TIME: - stats =3D &ru_stats.ru_stime_usec_stat; - scale =3D 1e-6; + /* + * 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 && + mexp->metric_events[i]->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 mexp->metric_events[i]) + continue; + ps =3D pos->stats; + source_count =3D 1; break; - case TOOL_PMU__EVENT_NONE: - pr_err("Invalid tool event 'none'"); - abort(); - case TOOL_PMU__EVENT_MAX: - pr_err("Invalid tool event 'max'"); - abort(); - case TOOL_PMU__EVENT_HAS_PMEM: - case TOOL_PMU__EVENT_NUM_CORES: - case TOOL_PMU__EVENT_NUM_CPUS: - case TOOL_PMU__EVENT_NUM_CPUS_ONLINE: - case TOOL_PMU__EVENT_NUM_DIES: - case TOOL_PMU__EVENT_NUM_PACKAGES: - case TOOL_PMU__EVENT_SLOTS: - case TOOL_PMU__EVENT_SMT_ON: - case TOOL_PMU__EVENT_SYSTEM_TSC_FREQ: - default: - pr_err("Unexpected tool event '%s'", evsel__name(metric_events[i])); - abort(); } - val =3D avg_stats(stats) * scale; - source_count =3D 1; - } else { - struct perf_stat_evsel *ps =3D metric_events[i]->stats; - struct perf_stat_aggr *aggr; - + } + /* Time events are always on CPU0, the first aggregation index. */ + aggr =3D &ps->aggr[is_tool_time ? tool_aggr_idx : aggr_idx]; + if (!aggr || !metric_events[i]->supported) { /* - * If there are multiple uncore PMUs and we're not - * reading the leader's stats, determine the stats for - * the appropriate uncore PMU. + * Not supported events will have a count of 0, which + * can be confusing in a metric. Explicitly set the + * value to NAN. Not counted events (enable time of 0) + * are read as 0. */ - if (evsel && evsel->metric_leader && - evsel->pmu !=3D evsel->metric_leader->pmu && - mexp->metric_events[i]->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 mexp->metric_events[i]) - continue; - ps =3D pos->stats; - source_count =3D 1; - break; - } - } - aggr =3D &ps->aggr[aggr_idx]; - if (!aggr) - break; - - if (!metric_events[i]->supported) { - /* - * Not supported events will have a count of 0, - * which can be confusing in a - * metric. Explicitly set the value to NAN. Not - * counted events (enable time of 0) are read as - * 0. - */ - val =3D NAN; - source_count =3D 0; - } else { - val =3D aggr->counts.val; - if (!source_count) - source_count =3D evsel__source_count(metric_events[i]); - } + val =3D NAN; + source_count =3D 0; + } else { + val =3D aggr->counts.val; + if (is_tool_time) + val *=3D 1e-9; /* Convert time event nanoseconds to seconds. */ + if (!source_count) + source_count =3D evsel__source_count(metric_events[i]); } n =3D strdup(evsel__metric_id(metric_events[i])); if (!n) @@ -511,7 +496,7 @@ static void generic_metric(struct perf_stat_config *con= fig, pctx->sctx.user_requested_cpu_list =3D strdup(config->user_requested_cpu= _list); pctx->sctx.runtime =3D runtime; pctx->sctx.system_wide =3D config->system_wide; - i =3D prepare_metric(mexp, evsel, pctx, aggr_idx); + i =3D prepare_metric(config, mexp, evsel, pctx, aggr_idx); if (i < 0) { expr__ctx_free(pctx); return; @@ -572,7 +557,7 @@ double test_generic_metric(struct metric_expr *mexp, in= t aggr_idx) if (!pctx) return NAN; =20 - if (prepare_metric(mexp, /*evsel=3D*/NULL, pctx, aggr_idx) < 0) + if (prepare_metric(/*config=3D*/NULL, mexp, /*evsel=3D*/NULL, pctx, aggr_= idx) < 0) goto out; =20 if (expr__parse(&ratio, pctx, mexp->metric_expr)) --=20 2.51.2.1041.gc1ab5b90ca-goog