From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-yw1-f202.google.com (mail-yw1-f202.google.com [209.85.128.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 747F02E543B for ; Sun, 14 Sep 2025 18:11:54 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.202 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1757873516; cv=none; b=ubtmyd5a1c70S8ZTOpNt8gq0jKZV4egJpDnBZuW6c82S1UJaf7zZaT/YDDFhsKijWI+K3PZhL0Fisqk5MLX4N2wjf8FZn5hHh9EiAZlSh/KwCIrdGEGRBTHru46qriZnVyaFiiLDGEredaVCLWWtmegOAb4KXRttdQmDmChVgHU= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1757873516; c=relaxed/simple; bh=9gkLdh4Oj8cVCcyBX4aS91SLZZLGTyeFq1KPg5AWG/4=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=ecCuRpjDuRBB/EDmMxiVvcgRi81sRBO9Z9zIB0m8c4JSA+h7tqV8N2W1E0avsNvpkDNugNDHzXFw4XmW8mqZ/Ixy1xgsBS0sveWFeXZYjqUPrxt3oPGRUxtUSvXi+ymxht8aKa43ekbp73LEYmFLVRgkr4rAs54yc9RwleFKmwU= 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=MKfpCZqW; arc=none smtp.client-ip=209.85.128.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="MKfpCZqW" Received: by mail-yw1-f202.google.com with SMTP id 00721157ae682-72390769037so34176247b3.0 for ; Sun, 14 Sep 2025 11:11:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1757873513; x=1758478313; 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=ScGbSf1f5eAIdwbQRDjth99SGC3kWFRA1XeteaWfsNw=; b=MKfpCZqWViVGf4KApazISiVuos2cEs8C+VKLkeZK7lU940YRZitQeYh8t7zPQLTiDS rV0onsnni6pEAwltVGimjPR/R9BqYSE00pmD15wZeZMI0xEJrV2cC57CUfKqGlOhDCmw vAPwG+D5itSD6Y9FJmn6w5l+dNSI02ftdAUya/Gn8HALk0iwnPSO2T9J6eo1uF+dVpsZ 7P3sYvQ6Kx60apCWXUe4wi2HMRWBD38ujEQOLeF3xDct2vWzKbPZfwzP3EU8WQKmjeEc yQ0d9Ah21UutxUeuFz6hDsdDGiVpfXiSsvEx9VZgvZAEvXDpm0iEWRPxTXP3xxW4zuKd JGLA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1757873513; x=1758478313; 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=ScGbSf1f5eAIdwbQRDjth99SGC3kWFRA1XeteaWfsNw=; b=PidBx4ieCm+JP+rj9hFo+XOyRnWBe87pkwtKaAqrB5WjXbLTQKiy9K+lXLO9ZbFKhk gwWtgEvzTg6P+t1TUyqLpF/5uUgH+JuPkdmXA+UVKLnHzRC5YDdLQpEANqPHQifjMVOh fUUk795I5thLAZFyQhPefUWrMv1slQD/tMOO8rkHUyVf8F2hT9lpObvg8xOB1vpQKbKt 9PTWeGd1lUDtky3fmc/a27pLHRc4T5vDl/Tx3hG32pWKE+n1ya5FnpbepBNO2AAigIMu /Q9SZ+3tX+7sZwu3axVQKT2YcYFXgcHDSbgHjXFaeR+v5hxp014fsC/wINnrmErGPaYW JPJQ== X-Forwarded-Encrypted: i=1; AJvYcCX9FbA+uWcF4Ob+q8TS5aUaTbIImukYdXnx6omphvuHa8wKhEb0VsJDSClnBnTSZI1hI7mRwFKKqdXQ3DEbTU84@vger.kernel.org X-Gm-Message-State: AOJu0YwCgYkCcLxETBErD7VeTSZxkEY/8OsjI4BwhClL0q4DltouCN2N KcJGmMl6F1i316bbnOZ4WyPb2TIv9yRkjv46ilius3KmADPvhSQzo0hf7x0GwQ+1ypLfeF8n1ue a9jcWFgYHNQ== X-Google-Smtp-Source: AGHT+IFF7IjsQRx1QsJc7tWH++G9nOxWQQXZUxM/LoZic2KKklGdox8MX8ZvLtTcverIBI5DnxUKnHFKp8nA X-Received: from ywbbg14.prod.google.com ([2002:a05:690c:30e:b0:721:18d6:984a]) (user=irogers job=prod-delivery.src-stubby-dispatcher) by 2002:a05:690c:6286:b0:71b:f500:70c0 with SMTP id 00721157ae682-73063191220mr78320797b3.6.1757873513560; Sun, 14 Sep 2025 11:11:53 -0700 (PDT) Date: Sun, 14 Sep 2025 11:11:14 -0700 In-Reply-To: <20250914181121.1952748-1-irogers@google.com> Precedence: bulk X-Mailing-List: linux-perf-users@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20250914181121.1952748-1-irogers@google.com> X-Mailer: git-send-email 2.51.0.384.g4c02a37b29-goog Message-ID: <20250914181121.1952748-15-irogers@google.com> Subject: [PATCH v4 14/21] perf print-events: Remove print_symbol_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-Type: text/plain; charset="UTF-8" Now legacy hardware events are in json there's no need for a specific printing routine that previously served for both hardware and software events. The associated event_symbols_hw is also removed. To support the previous filtered version use an event glob of "legacy hardware" which matches the topic of the json events. Signed-off-by: Ian Rogers Tested-by: Thomas Richter --- tools/perf/builtin-list.c | 18 +++++++---- tools/perf/util/parse-events.c | 43 ------------------------- tools/perf/util/parse-events.h | 1 - tools/perf/util/print-events.c | 57 ---------------------------------- tools/perf/util/print-events.h | 3 -- 5 files changed, 12 insertions(+), 110 deletions(-) diff --git a/tools/perf/builtin-list.c b/tools/perf/builtin-list.c index b6720ef3adf6..16400366f827 100644 --- a/tools/perf/builtin-list.c +++ b/tools/perf/builtin-list.c @@ -633,10 +633,18 @@ int cmd_list(int argc, const char **argv) zfree(&default_ps.pmu_glob); default_ps.pmu_glob = old_pmu_glob; } else if (strcmp(argv[i], "hw") == 0 || - strcmp(argv[i], "hardware") == 0) - print_symbol_events(&print_cb, ps, PERF_TYPE_HARDWARE, - event_symbols_hw, PERF_COUNT_HW_MAX); - else if (strcmp(argv[i], "sw") == 0 || + strcmp(argv[i], "hardware") == 0) { + char *old_event_glob = default_ps.event_glob; + + default_ps.event_glob = strdup("legacy hardware"); + if (!default_ps.event_glob) { + ret = -1; + goto out; + } + perf_pmus__print_pmu_events(&print_cb, ps); + zfree(&default_ps.event_glob); + default_ps.event_glob = old_event_glob; + } else if (strcmp(argv[i], "sw") == 0 || strcmp(argv[i], "software") == 0) { char *old_pmu_glob = default_ps.pmu_glob; static const char * const sw_globs[] = { "software", "tool" }; @@ -714,8 +722,6 @@ int cmd_list(int argc, const char **argv) continue; } default_ps.event_glob = s; - print_symbol_events(&print_cb, ps, PERF_TYPE_HARDWARE, - event_symbols_hw, PERF_COUNT_HW_MAX); perf_pmus__print_pmu_events(&print_cb, ps); print_sdt_events(&print_cb, ps); default_ps.metrics = true; diff --git a/tools/perf/util/parse-events.c b/tools/perf/util/parse-events.c index be3e86e7b157..72cc59cfc46d 100644 --- a/tools/perf/util/parse-events.c +++ b/tools/perf/util/parse-events.c @@ -42,49 +42,6 @@ static int parse_events_terms__copy(const struct parse_events_terms *src, struct parse_events_terms *dest); static int parse_events_terms__to_strbuf(const struct parse_events_terms *terms, struct strbuf *sb); -const struct event_symbol event_symbols_hw[PERF_COUNT_HW_MAX] = { - [PERF_COUNT_HW_CPU_CYCLES] = { - .symbol = "cpu-cycles", - .alias = "cycles", - }, - [PERF_COUNT_HW_INSTRUCTIONS] = { - .symbol = "instructions", - .alias = "", - }, - [PERF_COUNT_HW_CACHE_REFERENCES] = { - .symbol = "cache-references", - .alias = "", - }, - [PERF_COUNT_HW_CACHE_MISSES] = { - .symbol = "cache-misses", - .alias = "", - }, - [PERF_COUNT_HW_BRANCH_INSTRUCTIONS] = { - .symbol = "branch-instructions", - .alias = "branches", - }, - [PERF_COUNT_HW_BRANCH_MISSES] = { - .symbol = "branch-misses", - .alias = "", - }, - [PERF_COUNT_HW_BUS_CYCLES] = { - .symbol = "bus-cycles", - .alias = "", - }, - [PERF_COUNT_HW_STALLED_CYCLES_FRONTEND] = { - .symbol = "stalled-cycles-frontend", - .alias = "idle-cycles-frontend", - }, - [PERF_COUNT_HW_STALLED_CYCLES_BACKEND] = { - .symbol = "stalled-cycles-backend", - .alias = "idle-cycles-backend", - }, - [PERF_COUNT_HW_REF_CPU_CYCLES] = { - .symbol = "ref-cycles", - .alias = "", - }, -}; - static const char *const event_types[] = { [PERF_TYPE_HARDWARE] = "hardware", [PERF_TYPE_SOFTWARE] = "software", diff --git a/tools/perf/util/parse-events.h b/tools/perf/util/parse-events.h index a64f0741cb4b..32bde974c9f5 100644 --- a/tools/perf/util/parse-events.h +++ b/tools/perf/util/parse-events.h @@ -264,7 +264,6 @@ struct event_symbol { const char *symbol; const char *alias; }; -extern const struct event_symbol event_symbols_hw[]; char *parse_events_formats_error_string(char *additional_terms); diff --git a/tools/perf/util/print-events.c b/tools/perf/util/print-events.c index 91a5d9c7882b..8f3ed83853a9 100644 --- a/tools/perf/util/print-events.c +++ b/tools/perf/util/print-events.c @@ -186,60 +186,6 @@ bool is_event_supported(u8 type, u64 config) return ret; } -void print_symbol_events(const struct print_callbacks *print_cb, void *print_state, - unsigned int type, const struct event_symbol *syms, - unsigned int max) -{ - struct strlist *evt_name_list = strlist__new(NULL, NULL); - struct str_node *nd; - - if (!evt_name_list) { - pr_debug("Failed to allocate new strlist for symbol events\n"); - return; - } - for (unsigned int i = 0; i < max; i++) { - /* - * New attr.config still not supported here, the latest - * example was PERF_COUNT_SW_CGROUP_SWITCHES - */ - if (syms[i].symbol == NULL) - continue; - - if (!is_event_supported(type, i)) - continue; - - if (strlen(syms[i].alias)) { - char name[MAX_NAME_LEN]; - - snprintf(name, MAX_NAME_LEN, "%s OR %s", syms[i].symbol, syms[i].alias); - strlist__add(evt_name_list, name); - } else - strlist__add(evt_name_list, syms[i].symbol); - } - - strlist__for_each_entry(nd, evt_name_list) { - char *alias = strstr(nd->s, " OR "); - - if (alias) { - *alias = '\0'; - alias += 4; - } - print_cb->print_event(print_state, - /*topic=*/NULL, - /*pmu_name=*/NULL, - type, - nd->s, - alias, - /*scale_unit=*/NULL, - /*deprecated=*/false, - event_type_descriptors[type], - /*desc=*/NULL, - /*long_desc=*/NULL, - /*encoding_desc=*/NULL); - } - strlist__delete(evt_name_list); -} - /** struct mep - RB-tree node for building printing information. */ struct mep { /** nd - RB-tree element. */ @@ -378,9 +324,6 @@ void metricgroup__print(const struct print_callbacks *print_cb, void *print_stat */ void print_events(const struct print_callbacks *print_cb, void *print_state) { - print_symbol_events(print_cb, print_state, PERF_TYPE_HARDWARE, - event_symbols_hw, PERF_COUNT_HW_MAX); - perf_pmus__print_pmu_events(print_cb, print_state); print_cb->print_event(print_state, diff --git a/tools/perf/util/print-events.h b/tools/perf/util/print-events.h index 44e5dbd91400..eabba5d4a1fd 100644 --- a/tools/perf/util/print-events.h +++ b/tools/perf/util/print-events.h @@ -33,9 +33,6 @@ struct print_callbacks { /** Print all events, the default when no options are specified. */ void print_events(const struct print_callbacks *print_cb, void *print_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 *print_state, - unsigned int type, const struct event_symbol *syms, - unsigned int max); void metricgroup__print(const struct print_callbacks *print_cb, void *print_state); bool is_event_supported(u8 type, u64 config); -- 2.51.0.384.g4c02a37b29-goog