From nobody Fri Oct 3 16:42:42 2025 Received: from mail-pg1-f202.google.com (mail-pg1-f202.google.com [209.85.215.202]) (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 15750340D83 for ; Thu, 28 Aug 2025 16:33:06 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.215.202 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1756398790; cv=none; b=SO/ftse3K/A88wl3Nf+x3K1+OmRsEkzVy5/AGxG0YsirXRwL5LE4u6CpjtNxzBjS7V6HB17brK7wU0heBPHjLUoduh6BtAQ2a0tHJBaSHBX2jPtP1FeYnczoe2/hdOISIIdwhPIBEzK03BEEZEnQtxaC/CuNCFGvIWRBAMTIoNg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1756398790; c=relaxed/simple; bh=zCHtipe3FFEhxU5sc7D2y2ZkMor+1wVxd4gniTZLH5I=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Content-Type; b=mDqBJgAQsPmmlbsW/9f86gmQtfcRXjFPWBqO+HOVu8UDeKjgplf8IKtHSwZY6bKmQF/aSqO1d1NAel5PfRu78Z7Py1pQQ/6bpdHR9sy75rpd0mbZyVV3M7EQObVjDB9ickXOub5i+7m22sDp8sh4EhP1lYXbYBL8J2wPJtTsDFw= 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=oVWudHVy; arc=none smtp.client-ip=209.85.215.202 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="oVWudHVy" Received: by mail-pg1-f202.google.com with SMTP id 41be03b00d2f7-b47174bdce2so912264a12.2 for ; Thu, 28 Aug 2025 09:33:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1756398786; x=1757003586; 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=CFnyAfmB+YyepyVuM/OrsoORiE8FNGZTxzVIf9Uoa/c=; b=oVWudHVyMZtxjMNcRQwjCWgOZGkFz43Z+pX+khp6QwwU4AbU6pAxmdeos/a1YcmiWl Uga/b4C7hzKoCIA4oBYdhRzOe3YHYB7hTTkpkIYYsD6zeU3XoF6uQmkZI9HRFsbK9ekn njcC5RsOz+/GOTJ2xP6GXrBWpSBRcbgwbJUjwsa3PvjxWblD6Md1kGTIAANILVXQJHBe S53blcxuEKwNrdnlGAKivjnSmbG0QHkDJldSgtkDo/7T4KaP8GnFWPj/g0rtdWCYaKus J/lXu7lp4X0eenGr1aS9fG6uIXrukyGm2qNz5keyItWsCOwRgQmU2qssVADP6cUu84j3 SrXg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1756398786; x=1757003586; 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=CFnyAfmB+YyepyVuM/OrsoORiE8FNGZTxzVIf9Uoa/c=; b=bPSUDcL4b+5kCtagGe9Dq9Q8td40odt8DJMnYXjRgAw8wtmCiqFCxP+fzIaNw/Mgko MBb1c93HC+eRSH3HzQEjiIUX8swsBlfTLk0CZoksvgxfJjGmZFjpOM2k0hPMI+J6YhcR XZZv38V5oIFBHb7OYa9OaO4XM+xYgTGAEKGAc8UzztJ19tzPyIRPjpKn/i9DhdIF/5z5 izCSohmUX86tdC9agFk36SPD5MBDTtx+USeVESmOoRe2lKNiRhQ3dJPbOY7AHKIYP6+A pfLpCNVpBm6IrSi57FCkXf+gs1PqnyOaLIoXieJu9r27K5Q+6AhOKDw+y9cdSxH5nPfs laMg== X-Forwarded-Encrypted: i=1; AJvYcCXh4R2PqtvpeTsH2yoAYvirmc5jQopfC/TexUQH3S7Qs01dELd5E687eB+HWaN9DQ61SIHLvcEydgBatfw=@vger.kernel.org X-Gm-Message-State: AOJu0YzP3ZKT4KZRy4bi/PUKlWbF85pKAxr9SBKf+mi5+C//+b26cuj2 3X1gnD19Kl5s8UY8bJIcTUOlVUJvTJItVx2+19UDDS0p+y6KUQpHBg+6MwPw3tLskVEolvvWAEJ 7esJnRY8qsA== X-Google-Smtp-Source: AGHT+IEKrj2d08xhz8D4axefHuDfcTfQZ0SGLGj6KVrSNmMBHL43lGECBdpGfTJI89L77WbGEflqJaf6yb0D X-Received: from pjyf12.prod.google.com ([2002:a17:90a:ec8c:b0:325:b894:3c4f]) (user=irogers job=prod-delivery.src-stubby-dispatcher) by 2002:a05:6a20:7344:b0:233:c703:d4bf with SMTP id adf61e73a8af0-24340b28476mr34136294637.19.1756398786385; Thu, 28 Aug 2025 09:33:06 -0700 (PDT) Date: Thu, 28 Aug 2025 09:32:23 -0700 In-Reply-To: <20250828163225.3839073-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: <20250828163225.3839073-1-irogers@google.com> X-Mailer: git-send-email 2.51.0.268.g9569e192d0-goog Message-ID: <20250828163225.3839073-14-irogers@google.com> Subject: [PATCH v2 13/15] 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 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. 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.268.g9569e192d0-goog