From nobody Sun Feb 8 22:05:22 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 85CA0359FBE for ; Thu, 13 Nov 2025 18:05:51 +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=1763057153; cv=none; b=YZPbHC/ScRLsngMyxOm2SsxuR5Tk/+XgD1WxTSSAeGLIjNEBYvkf1taQZDNa9zMvytAc8+HE3En22+dxubmi2rxP8lkf3P1Ua688FF+JL4IDxAVAz56EJq+WME4NW6m1b9/2+DVlKi1idZo9gdIWnZBAfxYRsxIZ3FL67EsHgLc= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1763057153; c=relaxed/simple; bh=hVJICGlrUy8MMJWuUtg1ckaMNBO234W7zrw4C+CGyhw=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Content-Type; b=ZcNyxS+hqmaaaJCeYVEylKOOuhQttS/geap3hypja7nTNxZEBGbUFLhUhaiTZoHKYPCGhco40K7rCC1lyvpLoeS3RyDKGETNkLGvfTnbTHpuzTI6BQWHuJwXcIE4zesSNLjjpi5ab1Fa3oVdh768U5N6sT2DD0b8PzUXv3m+7U8= 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=q/IN6cYR; 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="q/IN6cYR" Received: by mail-pg1-f201.google.com with SMTP id 41be03b00d2f7-b95d06db747so1745506a12.1 for ; Thu, 13 Nov 2025 10:05:51 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1763057151; x=1763661951; 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=g1FXHzBhA2SQQSmsUII/uTyO8cL2QPYiQNF1YetQubM=; b=q/IN6cYR5aISncm8WszH5O+k5QUcR+2VJG6+Yfdu4X0qmIig8sBmOQ2kbnrGZKOQES W0PA2GVuqHqfOByDtUez47QiSaNE+kno6cwAN27JvLTE8q7nHKdYAvzmJVuMgHkbcmDk c2sRJEdtYSstP72R4ipL+EcSlJXoPqDIHj40BuqMuvB75tJkfv9gD9giKGZijfBXmC8g 24AULUJrKElH9nhPBKxaEUHCfpiLckp0WLLWJHkMPN2NLB55ehhX1RyTRVDdNPqsT6C6 sLSVnYW6FB9AKR9dwrD+U6U5bZ5+YGY9q+c7oc7S88p1CgSvAZA7SY2PAvR8rDYkbm3F I57g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1763057151; x=1763661951; 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=g1FXHzBhA2SQQSmsUII/uTyO8cL2QPYiQNF1YetQubM=; b=woExxGhkQgbbqfO7vQP7VzBtg3ZIJGOeOsK4a4Z3hcVZL7CochP8X29eDIRJ3S39B0 B1gNfjdrJQVyRr7Zt52UpRrWrc9v4KAjkgB0fmoeVwoGBVCmeRLGnvotthR3YbNEBkrc jvXz76cazy1WOhTY2GPYuVVSYqv4XvtzlsGcNczYp+9S/SZ1JMbSbDqf0lHvn4fk9DVI rxYK8r0bfbIBrCe1yAYmTp3r02KZYvRDpImlNACi6W6H90rgf93mXYppdrvEWUDnatfS CWHOwZAs2u2UnydGG8cN+LJA1Igo++vonslGwS1pIsyldMwiTBfJ26W20BY1/uI47YXs wXXQ== X-Forwarded-Encrypted: i=1; AJvYcCV+IQs+68jA3b+S0pxFPvQaNCpWkLAecxf29Lg/v3Wt0ytMGtPvk88JSTGgUT6s/yESf6/mG1p0d/6tiwU=@vger.kernel.org X-Gm-Message-State: AOJu0YxKY0waKSW1okdGoXmpRsLbBLxZyznNVtELW4aXqupIF59p38KN dvVcKOgSe5GxfL0NsYVNv5SJho3AO7BYWV9HKtIFmsoZ12smC2d7DprulReGHL+bCIOCKCSS3q3 p3bv8/tL4pw== X-Google-Smtp-Source: AGHT+IGtzsF5urWKveWPScCG0h+dMh3vXRquU320w0u1H20MqrHGTFvpU8Dd08FOYTy1HNYzKtEOtnJe5xyJ X-Received: from dykh19.prod.google.com ([2002:a05:7300:5713:b0:2a4:738e:9908]) (user=irogers job=prod-delivery.src-stubby-dispatcher) by 2002:a05:7301:fd03:b0:2a4:3593:ccb9 with SMTP id 5a478bee46e88-2a4ab230e56mr118302eec.0.1763057150808; Thu, 13 Nov 2025 10:05:50 -0800 (PST) Date: Thu, 13 Nov 2025 10:05:10 -0800 In-Reply-To: <20251113180517.44096-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: <20251113180517.44096-1-irogers@google.com> X-Mailer: git-send-email 2.52.0.rc1.455.g30608eb744-goog Message-ID: <20251113180517.44096-5-irogers@google.com> Subject: [PATCH v4 04/10] 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 | 149 +++++++++++++++------------------- 1 file changed, 66 insertions(+), 83 deletions(-) diff --git a/tools/perf/util/stat-shadow.c b/tools/perf/util/stat-shadow.c index b3b482e1808f..6c1ad78604e1 100644 --- a/tools/perf/util/stat-shadow.c +++ b/tools/perf/util/stat-shadow.c @@ -26,7 +26,32 @@ void perf_stat__reset_shadow_stats(void) memset(&ru_stats, 0, sizeof(ru_stats)); } =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(struct perf_stat_config *config, + const struct metric_expr *mexp, const struct evsel *evsel, struct expr_parse_ctx *pctx, int aggr_idx) @@ -36,93 +61,51 @@ static int prepare_metric(const struct metric_expr *mex= p, 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; + /* + * 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_SYSTEM_TIME: - stats =3D &ru_stats.ru_stime_usec_stat; - scale =3D 1e-6; - 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: - case TOOL_PMU__EVENT_CORE_WIDE: - case TOOL_PMU__EVENT_TARGET_CPU: - 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) @@ -168,7 +151,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; @@ -229,7 +212,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