From nobody Thu Oct 2 04:47:05 2025 Received: from mail-pj1-f74.google.com (mail-pj1-f74.google.com [209.85.216.74]) (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 F09A32765D0 for ; Tue, 23 Sep 2025 04:19:19 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.74 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1758601162; cv=none; b=a1GvORwvDUfA4JFCTwqme6TYqz807b7f3EQ/HHseMKsNFED+bLD/205gfYTl7c3oYTlpTD0bukMtN03hD2z8oSlRzqXeI9AWHkTw+pGF79QOBNi2h/q4UOQRgdEpMVOD5sAjF2rmLUFq5a5KkbTRuvl1skN66RjDuDF33qYVurk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1758601162; c=relaxed/simple; bh=leffwGmca9/Uyf0CB9QUmGZNZruy/wn2a//pTjcSms8=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=TVK/I7BAdP9MsN9gZdqKtkAK9TwOHWEwSAX36pLSwOoQV0N3hvdUKpUDvOQx9jdFyT2v6RY3ljHztoh581N6wry7MjEdZbTZNUz/1W5zRhzp5YJ8xvT40iVcaUGHPXZAc19XXgckNZfhrFA3yCRy4xd9ArI4zN3DW2ED+x9E09g= 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=dI+k7yy1; arc=none smtp.client-ip=209.85.216.74 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="dI+k7yy1" Received: by mail-pj1-f74.google.com with SMTP id 98e67ed59e1d1-32e8c800a79so7021327a91.0 for ; Mon, 22 Sep 2025 21:19:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1758601159; x=1759205959; darn=vger.kernel.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=e1Y4y6zCTLXlY4E+9adeVkHim03GuNEJ4UhBVjyN7U8=; b=dI+k7yy1JpgLkk1ctkY72e6snekB4sPhXniEFtpbVeC/SFTo46m6SKh0p2nN+OfzNj p/i/6B8SOC6420ikzrzjoHEJFEKLxG5BszVY3icJIW5AXUpO1ZiwtLx+axr5/Fl4JpGs CufWdg8w84v/gxc1OLwjDbnHt+/ukAVxWbtksRfop4BBcVtPgb1l+tbvv9/rmCC7WdZj HyLzyJzPbYndsDMKTO+BTzCCvb+JLjZX2P3DGH3Fc3StqDoq6LGcHK292gn1zl6ao0fe yOi1yohxpXJQmyPsIyUyFK0B4/EAQSFGJ4aQ/D+6ln9+5DG/VHmUviBEDlchHMdkB8Rr q2OQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1758601159; x=1759205959; h=cc: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=e1Y4y6zCTLXlY4E+9adeVkHim03GuNEJ4UhBVjyN7U8=; b=V/F+HarmnGHxpSypLEAAkYgQGEOUpBN/m1ZvQo/lhBPyNLXER+kc5De/WkIupA7lf/ ++KA7A5C1XwUON7nseSNRK5WeNtst8oMuP2/amRefewZLGdKk2fSOA6G+ZQIUpSbBWmo tYaqRJqKTWaZ8erAh6qLP6SBHIKWr0vELdKc2TN8YVQk0Off9rC31bkX57Yf8xvCHl1g kS8Do5rvGoEAbDJWp+Ju8hFQyaQ19iIB993tWbZsQ+jd100xPS4kewq1rIVVBCQvSFHM /wbn1opnzUphkB0Ri4GBrdJgWKxX9rGpB4qJt3c9MZoEI9JpOJ3Sl4pdjNHbKppu3+kC Omog== X-Forwarded-Encrypted: i=1; AJvYcCUdSQCdbXHxlvoJvvbtFsYlKKbL4k4ebIkg4bGfHTYnMNJmhxHGzIGL7jPsiDSASK5pg4lbMUrlrEEhAvk=@vger.kernel.org X-Gm-Message-State: AOJu0YyNd+on+VWT3DO5qQJgtV1zksj/vNFJwhgkC6m4YmEjyoqSpFG2 9JZhJp7IfdJpj2QUHZK2AiOkoegUNZs+/BClEJSpC6ed8Te/LfyjvBHP/PYJP8Ry1reMcWXLu52 g3+q73iAyyQ== X-Google-Smtp-Source: AGHT+IFQHMNvvonDo8L/b9c5DdxnKj9NxGGoiQ6I2ZhXxlOoKyPwa//pfYXEkZSW9rmNlgk1r6x1rfrU+NK0 X-Received: from pjbsp16.prod.google.com ([2002:a17:90b:52d0:b0:32e:6111:40ac]) (user=irogers job=prod-delivery.src-stubby-dispatcher) by 2002:a17:90b:1f84:b0:330:6f13:53fc with SMTP id 98e67ed59e1d1-332a96f9ea8mr1568407a91.27.1758601159212; Mon, 22 Sep 2025 21:19:19 -0700 (PDT) Date: Mon, 22 Sep 2025 21:18:33 -0700 In-Reply-To: <20250923041844.400164-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: <20250923041844.400164-1-irogers@google.com> X-Mailer: git-send-email 2.51.0.534.gc79095c0ca-goog Message-ID: <20250923041844.400164-15-irogers@google.com> Subject: [PATCH v5 14/25] perf print-events: Remove print_hwcache_events From: Ian Rogers To: Peter Zijlstra , Ingo Molnar , Arnaldo Carvalho de Melo , Namhyung Kim , Mark Rutland , Alexander Shishkin , Jiri Olsa , Ian Rogers , Adrian Hunter , Kan Liang , James Clark , Xu Yang , Thomas Falcon , Andi Kleen , linux-kernel@vger.kernel.org, linux-perf-users@vger.kernel.org, bpf@vger.kernel.org, Atish Patra , Beeman Strong , Leo Yan , Vince Weaver Cc: Thomas Richter Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Now legacy cache events are in json there's no need for a specific printing routine. To support the previous filtered version use an event glob of "legacy cache" which matches the topic of the json events. Tested-by: Thomas Richter Signed-off-by: Ian Rogers --- tools/perf/builtin-list.c | 16 +++++++--- tools/perf/util/print-events.c | 55 ---------------------------------- tools/perf/util/print-events.h | 1 - 3 files changed, 12 insertions(+), 60 deletions(-) diff --git a/tools/perf/builtin-list.c b/tools/perf/builtin-list.c index caf42276bd0f..b6720ef3adf6 100644 --- a/tools/perf/builtin-list.c +++ b/tools/perf/builtin-list.c @@ -652,9 +652,18 @@ int cmd_list(int argc, const char **argv) } default_ps.pmu_glob =3D old_pmu_glob; } else if (strcmp(argv[i], "cache") =3D=3D 0 || - strcmp(argv[i], "hwcache") =3D=3D 0) - print_hwcache_events(&print_cb, ps); - else if (strcmp(argv[i], "pmu") =3D=3D 0) { + strcmp(argv[i], "hwcache") =3D=3D 0) { + char *old_event_glob =3D default_ps.event_glob; + + default_ps.event_glob =3D strdup("legacy cache"); + if (!default_ps.event_glob) { + ret =3D -1; + goto out; + } + perf_pmus__print_pmu_events(&print_cb, ps); + zfree(&default_ps.event_glob); + default_ps.event_glob =3D old_event_glob; + } else if (strcmp(argv[i], "pmu") =3D=3D 0) { default_ps.exclude_abi =3D true; perf_pmus__print_pmu_events(&print_cb, ps); default_ps.exclude_abi =3D false; @@ -707,7 +716,6 @@ int cmd_list(int argc, const char **argv) default_ps.event_glob =3D s; print_symbol_events(&print_cb, ps, PERF_TYPE_HARDWARE, event_symbols_hw, PERF_COUNT_HW_MAX); - print_hwcache_events(&print_cb, ps); perf_pmus__print_pmu_events(&print_cb, ps); print_sdt_events(&print_cb, ps); default_ps.metrics =3D true; diff --git a/tools/perf/util/print-events.c b/tools/perf/util/print-events.c index 4153124a9948..91a5d9c7882b 100644 --- a/tools/perf/util/print-events.c +++ b/tools/perf/util/print-events.c @@ -186,59 +186,6 @@ bool is_event_supported(u8 type, u64 config) return ret; } =20 -int print_hwcache_events(const struct print_callbacks *print_cb, void *pri= nt_state) -{ - struct perf_pmu *pmu =3D NULL; - const char *event_type_descriptor =3D event_type_descriptors[PERF_TYPE_HW= _CACHE]; - - /* - * Only print core PMUs, skipping uncore for performance and - * PERF_TYPE_SOFTWARE that can succeed in opening legacy cache evenst. - */ - while ((pmu =3D perf_pmus__scan_core(pmu)) !=3D NULL) { - if (pmu->is_uncore || pmu->type =3D=3D PERF_TYPE_SOFTWARE) - continue; - - for (int type =3D 0; type < PERF_COUNT_HW_CACHE_MAX; type++) { - for (int op =3D 0; op < PERF_COUNT_HW_CACHE_OP_MAX; op++) { - /* skip invalid cache type */ - if (!evsel__is_cache_op_valid(type, op)) - continue; - - for (int res =3D 0; res < PERF_COUNT_HW_CACHE_RESULT_MAX; res++) { - char name[64]; - char alias_name[128]; - __u64 config; - int ret; - - __evsel__hw_cache_type_op_res_name(type, op, res, - name, sizeof(name)); - - ret =3D parse_events__decode_legacy_cache(name, pmu->type, - &config); - if (ret || !is_event_supported(PERF_TYPE_HW_CACHE, config)) - continue; - snprintf(alias_name, sizeof(alias_name), "%s/%s/", - pmu->name, name); - print_cb->print_event(print_state, - "cache", - pmu->name, - pmu->type, - name, - alias_name, - /*scale_unit=3D*/NULL, - /*deprecated=3D*/false, - event_type_descriptor, - /*desc=3D*/NULL, - /*long_desc=3D*/NULL, - /*encoding_desc=3D*/NULL); - } - } - } - } - return 0; -} - void print_symbol_events(const struct print_callbacks *print_cb, void *pri= nt_state, unsigned int type, const struct event_symbol *syms, unsigned int max) @@ -434,8 +381,6 @@ void print_events(const struct print_callbacks *print_c= b, void *print_state) print_symbol_events(print_cb, print_state, PERF_TYPE_HARDWARE, event_symbols_hw, PERF_COUNT_HW_MAX); =20 - print_hwcache_events(print_cb, print_state); - perf_pmus__print_pmu_events(print_cb, print_state); =20 print_cb->print_event(print_state, diff --git a/tools/perf/util/print-events.h b/tools/perf/util/print-events.h index d6ba384f0c66..44e5dbd91400 100644 --- a/tools/perf/util/print-events.h +++ b/tools/perf/util/print-events.h @@ -32,7 +32,6 @@ struct print_callbacks { =20 /** Print all events, the default when no options are specified. */ void print_events(const struct print_callbacks *print_cb, void *print_stat= e); -int print_hwcache_events(const struct print_callbacks *print_cb, void *pri= nt_state); void print_sdt_events(const struct print_callbacks *print_cb, void *print_= state); void print_symbol_events(const struct print_callbacks *print_cb, void *pri= nt_state, unsigned int type, const struct event_symbol *syms, --=20 2.51.0.534.gc79095c0ca-goog