From nobody Tue Feb 10 20:06:42 2026 Received: from mail-wr1-f43.google.com (mail-wr1-f43.google.com [209.85.221.43]) (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 70D2A2046B7 for ; Tue, 4 Mar 2025 13:50:18 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.221.43 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741096220; cv=none; b=lR91MC2R3WFawZ4U9e09X50A7E5ZzcSHrpfZskZXF70iZ2cjNb/EkGrA2t+ljIzXVWJUZSA94IbeGKD8gzbnbCyKYWD/K83IZG/Z67sT2MFjvyZCiKuo1dJNAIm69dRrjGfCIVMB2i28/DPlNE1d1hp6u/U/TvBRP3URiN04Nik= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741096220; c=relaxed/simple; bh=ssO3CwRUgUXsweDnMWczi+OJMu2AOFJlyUIqu9OXdXI=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=KrsECc2Fn76H8xAcVioUkrka7fviedYfxfKNyGl+pqkVWRLNGrvnaru4rN3+6/RDHU8NAtPN9X+b10CZ3rCZ0kiYX75Jorapm40l6dTMOpx000/iYR++32gYZOPltg0LDj9mQdQCRjpV3KjaOhoik1Dhx++OGVsWBdnFjmAnRME= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org; spf=pass smtp.mailfrom=linaro.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b=cjW5e4K4; arc=none smtp.client-ip=209.85.221.43 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linaro.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="cjW5e4K4" Received: by mail-wr1-f43.google.com with SMTP id ffacd0b85a97d-390eebcc331so2393603f8f.1 for ; Tue, 04 Mar 2025 05:50:18 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1741096217; x=1741701017; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=GrYsuIKVD+UTjXvBv+IWgOdWlxYNByPEbenQuMjAbWM=; b=cjW5e4K4qHWbxahFdrg805LT9v8V+jiap37SYD95fThhKysS7exu922aN4N3bXOvCC NfJAfzR9aAJcmzKu1nazg731HbdknNfQeWjpzcqwEnHqbN6b7jxgukqJQicmd5LKwZmY sDP0pmQezXzAEOv6WK222nxgWvvGEo7lsffQkFI1YqD58ft1FbtKzxo2Nh+/F8NyhVFi sEAz/3iDcB27Mz/ugVXeOGmzWXYGto2erKfvbqYbH+YWAT2GoDjYMjcfCR76HyXtw1+L NhlXV06677j+ciwTrIudePnxXDRkVKRDYLY9+/N7t9kdftJ6crsIWHyoz7cYndMvMFMW zXVw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741096217; x=1741701017; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=GrYsuIKVD+UTjXvBv+IWgOdWlxYNByPEbenQuMjAbWM=; b=XrFeLejOzL+WVvFPfsgwtS8Y0z4fx/qzmzeQMv/hXmEp9uwW1QBupoSeMRBK/F481W qJfX8Ur7N65z9pOC9RhJckbMwKBvfgWtTSmE+y67Ka0DyfS4Acaybf3qGtwqw4Q4RYTD mV/kLUGSAQYdZH9tz1Vrbq0iajODpi6p0FAOQ5HnskETHcJzxnAtqLY2rGnpidRYSxyn wyXMvFekg5wvFuV2VgsIV4w3RhrNLP0YNpwsqWbdEK9ynMCTajAYLZva+xypditLvisT VLsKJIocc+QXrsdIFp/42LD6DNJVtdV7RTmyCYtZi9/dN9XLmx3xTXsHsmLAcZlqMYuv DW0Q== X-Forwarded-Encrypted: i=1; AJvYcCUQgq+othWUgJHZpLITyOaLK3py8cN0h7ROGtUjUCAsgX29uPGo+Bnf+hzAVSL1WdJZGPWonb84Fw53ilY=@vger.kernel.org X-Gm-Message-State: AOJu0YzF4kaxNTx7dAsXV7pvtXiFYjT9oCPBZB1kxRHsPAHU1BAsJxZA IZENq2CFJ7gtkcdPtTBK4xOqIwgm3jUkYmwGHbSb0kKuQIeMAuxP5Nm8OT2uxnc= X-Gm-Gg: ASbGncvvcGZO9RSxQW/sX8Ead5BwEh8hRLwge5K+xgnoRoUoZddwLERImxwGZC2nXrq ca8LXjsULrGudXTxz7816hkJP8eI/APuYgTONFaMdKoXmwKtCQpF4K/vfuhtqEFVnOdaSATipS6 EIoZkR1GBkxMZGI0YePHoC7Os2jiOOsahrI7zYRpFUUxxKnwJ+fArUr38TYfH3F679xLldnXzp+ 2P/7NugnjRuIoZb9YImgOaHzbjf7R7TYbE2gtwr3WoaCnf/D+asFe1qGe6K+yBLBrPOrQ8rBtEW 6gsuYNDO4jgSHckvlwQXjdTvm+qSsn1XSALLyWgZuo+/ZLHp X-Google-Smtp-Source: AGHT+IGTOmyI1imsf8X1i3V3hRuDOKpDTP2yjLY6x/1Jn/E2a1PbaLnwVOa+4QCsl76xxoNWGtPb1g== X-Received: by 2002:a5d:5f8b:0:b0:38d:e3da:8b4f with SMTP id ffacd0b85a97d-391154cc7fcmr2698737f8f.0.1741096216709; Tue, 04 Mar 2025 05:50:16 -0800 (PST) Received: from pop-os.lan ([209.198.129.225]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-390e47b7cf2sm18096697f8f.59.2025.03.04.05.50.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 04 Mar 2025 05:50:16 -0800 (PST) From: James Clark Date: Tue, 04 Mar 2025 13:49:14 +0000 Subject: [PATCH 2/3] perf list: Collapse similar events across PMUs Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20250304-james-perf-hybrid-list-v1-2-a363ffac283c@linaro.org> References: <20250304-james-perf-hybrid-list-v1-0-a363ffac283c@linaro.org> In-Reply-To: <20250304-james-perf-hybrid-list-v1-0-a363ffac283c@linaro.org> To: Peter Zijlstra , Ingo Molnar , Arnaldo Carvalho de Melo , Namhyung Kim , Mark Rutland , Alexander Shishkin , Jiri Olsa , Ian Rogers , Adrian Hunter , Robin Murphy , Leo Yan Cc: linux-perf-users@vger.kernel.org, linux-kernel@vger.kernel.org, James Clark X-Mailer: b4 0.14.0 Instead of showing multiple line items with the same event name and description, show a single line and concatenate all PMUs that this event can belong to. Don't do it for json output. Machine readable output doesn't need to be minimized, and changing the "Unit" field to a list type would break backwards compatibility. Before: $ perf list -v ... br_indirect_spec [Branch speculatively executed,indirect branch. Unit: armv8_cortex_a= 53] br_indirect_spec [Branch speculatively executed,indirect branch. Unit: armv8_cortex_a= 57] After: $ perf list -v ... br_indirect_spec [Branch speculatively executed,indirect branch. Unit: armv8_cortex_a= 53,armv8_cortex_a57] Signed-off-by: James Clark --- tools/perf/builtin-list.c | 2 ++ tools/perf/util/pmus.c | 75 +++++++++++++++++++++++++++++++++++++-= ---- tools/perf/util/print-events.h | 1 + 3 files changed, 70 insertions(+), 8 deletions(-) diff --git a/tools/perf/builtin-list.c b/tools/perf/builtin-list.c index fed482adb039..aacd7beae2a0 100644 --- a/tools/perf/builtin-list.c +++ b/tools/perf/builtin-list.c @@ -516,6 +516,7 @@ int cmd_list(int argc, const char **argv) .print_event =3D default_print_event, .print_metric =3D default_print_metric, .skip_duplicate_pmus =3D default_skip_duplicate_pmus, + .collapse_events =3D true }; const char *cputype =3D NULL; const char *unit_name =3D NULL; @@ -574,6 +575,7 @@ int cmd_list(int argc, const char **argv) .print_event =3D json_print_event, .print_metric =3D json_print_metric, .skip_duplicate_pmus =3D json_skip_duplicate_pmus, + .collapse_events =3D false }; ps =3D &json_ps; } else { diff --git a/tools/perf/util/pmus.c b/tools/perf/util/pmus.c index 4d60bac2d2b9..cb1b14ade25b 100644 --- a/tools/perf/util/pmus.c +++ b/tools/perf/util/pmus.c @@ -453,17 +453,50 @@ static int cmp_sevent(const void *a, const void *b) /* Order by PMU name. */ if (as->pmu =3D=3D bs->pmu) return 0; - return strcmp(as->pmu_name ?: "", bs->pmu_name ?: ""); + ret =3D strcmp(as->pmu_name ?: "", bs->pmu_name ?: ""); + if (ret) + return ret; + + /* Order by remaining displayed fields for purposes of deduplication late= r */ + ret =3D strcmp(as->scale_unit ?: "", bs->scale_unit ?: ""); + if (ret) + return ret; + ret =3D !!as->deprecated - !!bs->deprecated; + if (ret) + return ret; + ret =3D strcmp(as->desc ?: "", bs->desc ?: ""); + if (ret) + return ret; + return strcmp(as->long_desc ?: "", bs->long_desc ?: ""); } =20 -static bool pmu_alias_is_duplicate(struct sevent *a, struct sevent *b) +enum dup_type { + UNIQUE, + DUPLICATE, + SAME_TEXT +}; + +static enum dup_type pmu_alias_duplicate_type(struct sevent *a, struct sev= ent *b) { /* Different names -> never duplicates */ if (strcmp(a->name ?: "//", b->name ?: "//")) - return false; + return UNIQUE; + + /* Duplicate PMU name and event name -> hide completely */ + if (strcmp(a->pmu_name, b->pmu_name) =3D=3D 0) + return DUPLICATE; + + /* Any other different display text -> not duplicate */ + if (strcmp(a->topic ?: "", b->topic ?: "") || + strcmp(a->scale_unit ?: "", b->scale_unit ?: "") || + a->deprecated !=3D b->deprecated || + strcmp(a->desc ?: "", b->desc ?: "") || + strcmp(a->long_desc ?: "", b->long_desc ?: "")) { + return UNIQUE; + } =20 - /* Don't remove duplicates for different PMUs */ - return strcmp(a->pmu_name, b->pmu_name) =3D=3D 0; + /* Same display text but different PMU -> collapse */ + return SAME_TEXT; } =20 struct events_callback_state { @@ -501,6 +534,21 @@ static int perf_pmus__print_pmu_events__callback(void = *vstate, return 0; } =20 +static void concat_pmu_names(char *pmu_names, size_t size, const char *a, = const char *b) +{ + size_t len =3D strlen(pmu_names); + size_t added; + + if (len) + added =3D snprintf(pmu_names + len, size - len, ",%s", b); + else + added =3D snprintf(pmu_names, size, "%s,%s", a, b); + + /* Truncate with ... */ + if (added > 0 && added + len >=3D size) + sprintf(pmu_names + size - 4, "..."); +} + void perf_pmus__print_pmu_events(const struct print_callbacks *print_cb, v= oid *print_state) { struct perf_pmu *pmu; @@ -510,6 +558,7 @@ void perf_pmus__print_pmu_events(const struct print_cal= lbacks *print_cb, void *p struct events_callback_state state; bool skip_duplicate_pmus =3D print_cb->skip_duplicate_pmus(print_state); struct perf_pmu *(*scan_fn)(struct perf_pmu *); + char pmu_names[128] =3D {0}; =20 if (skip_duplicate_pmus) scan_fn =3D perf_pmus__scan_skip_duplicates; @@ -539,12 +588,21 @@ void perf_pmus__print_pmu_events(const struct print_c= allbacks *print_cb, void *p qsort(aliases, len, sizeof(struct sevent), cmp_sevent); for (int j =3D 0; j < len; j++) { /* Skip duplicates */ - if (j < len - 1 && pmu_alias_is_duplicate(&aliases[j], &aliases[j + 1])) - goto free; + if (j < len - 1) { + enum dup_type dt =3D pmu_alias_duplicate_type(&aliases[j], &aliases[j += 1]); + + if (dt =3D=3D DUPLICATE) { + goto free; + } else if (print_cb->collapse_events && dt =3D=3D SAME_TEXT) { + concat_pmu_names(pmu_names, sizeof(pmu_names), + aliases[j].pmu_name, aliases[j+1].pmu_name); + goto free; + } + } =20 print_cb->print_event(print_state, aliases[j].topic, - aliases[j].pmu_name, + pmu_names[0] ? pmu_names : aliases[j].pmu_name, aliases[j].name, aliases[j].alias, aliases[j].scale_unit, @@ -553,6 +611,7 @@ void perf_pmus__print_pmu_events(const struct print_cal= lbacks *print_cb, void *p aliases[j].desc, aliases[j].long_desc, aliases[j].encoding_desc); + pmu_names[0] =3D '\0'; free: zfree(&aliases[j].name); zfree(&aliases[j].alias); diff --git a/tools/perf/util/print-events.h b/tools/perf/util/print-events.h index 445efa1636c1..e91f9f830a2a 100644 --- a/tools/perf/util/print-events.h +++ b/tools/perf/util/print-events.h @@ -27,6 +27,7 @@ struct print_callbacks { const char *threshold, const char *unit); bool (*skip_duplicate_pmus)(void *print_state); + bool collapse_events; }; =20 /** Print all events, the default when no options are specified. */ --=20 2.34.1