From nobody Sun Feb 8 07:03:08 2026 Received: from mail-yw1-f201.google.com (mail-yw1-f201.google.com [209.85.128.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 EE6F9633E0 for ; Thu, 7 Mar 2024 08:14:20 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1709799262; cv=none; b=iFvSFd2twaRPHvxrLApaTQFV/jaGk8WTJ85EDMb/b12ZhLWQ5w6KETwRo5Z2rbjzmP7zVVPiSmxQTV3WPOtQc5VdCOkKd7YdUrROMIMYoQRC5JIiORrk2/a6pngp6MlJONluSZblDTEjQ88ILSEA6A9USnkbkAZl2xkkBTwQMjo= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1709799262; c=relaxed/simple; bh=zZMAjPThw9neF0rFKQqn5K77WjJlmrho8flUA6F99+Y=; h=Date:In-Reply-To:Message-Id:Mime-Version:References:Subject:From: To:Content-Type; b=I0qu1IoLJF/kJOghFT73sWV+IhpqjdUqXDX1SOiux4xAPZ6R+qvgyKCLtPdFUIyERL0m8DvZHTLOj0ea0SaH0x5br3wRF2CY3KrCWl/yvi5o/eCP4LbJUd5G6zZu4nqtmcXf6AueQzLkoJQRbUdnlGXqBYWrl9zI5dccDw7kQbw= 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=BYRHK63R; arc=none smtp.client-ip=209.85.128.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="BYRHK63R" Received: by mail-yw1-f201.google.com with SMTP id 00721157ae682-608e4171382so9918417b3.3 for ; Thu, 07 Mar 2024 00:14:20 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1709799260; x=1710404060; darn=vger.kernel.org; h=to:from:subject:references:mime-version:message-id:in-reply-to:date :from:to:cc:subject:date:message-id:reply-to; bh=N0YwbzbP5FZTLjIONNJPfeJ1/VNBa3uXm6yCLCKpsEw=; b=BYRHK63RP4iEjgw5fUXil9DDxdKWSfYJqDDcov8gzNVivZjvbda9dIE6NrhqX3PeeB 6gasiYLcUz9Q/anqInlPqhfC8PRUNdb3nd0PuMxUodYcL9oHuRiU17S1x/8Od6dlGOx6 c1R1aj/XzEzwaCaYEt7jyc+6wM03Fl/HhF28Z8phECgQHZ4yqKPaz+O4+tjkxXwsIJHR 49MRVC8tlIhjKbGmjs/JOKFCBnfasXrJMKfNwcQ1crC3QE1Lt5jvYigGgR9rfECM5Ab0 /Bt3WaCV2NS7Mc21+SD//DWK4DkwW/ZPHVPvrlvx1JbmKjuTjHgVYq9Ipgg1dKxE2KyN 8sFw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1709799260; x=1710404060; h=to:from:subject:references:mime-version:message-id:in-reply-to:date :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=N0YwbzbP5FZTLjIONNJPfeJ1/VNBa3uXm6yCLCKpsEw=; b=rwELmUIqCg3R11JwmAZ5Mgb05el8aELIi+NEc1J/Y07oJ5l+XwG52Y2Kg3GeqfBPmX pATb+bHkSFX2WcexGCYhW3XAr3ruliWPx+LTa8wIwXLSqur7C2uI9fsW4GtrY5Iox9S2 ZZ6NLviWKFZlYsMeOjOZ37yWFvLTiqAzu3XQkojIqruKO/qje5k3O7Dss3yQx49kj6Sd AYoLf8BYzHODzce1qo+fzUqIbIaerB99UfhYNHlXn9tvn+X0Z3vrmGP6+bMfJBmXTeOx lKTGSZhns8yrewFmyN914yBfPcYfZLCMi6+EYtmrJgyUckWqBCEmNfY+jJUHD3txVhI1 nBMw== X-Forwarded-Encrypted: i=1; AJvYcCVWz6a7ds00WvC8G5CHmJcdg9Up0PGwc2QXkBAG6KAwDpT7SHJr6PKLsF90n2/+uDsuyTtWYYHdBZCIeAhhEFHHFL/K2Xljc3Sas9Ob X-Gm-Message-State: AOJu0Yw/2TwI/vM0ZIasV+LECy2J98yRUiPNFWE2gMQ5upUIMg76HyHH +w+6Wi4X0/lt2DkXlhrvK4K1Y1gTxpMEgmzyMRM57pnKRKEY5FpssCnEVmyi5+HcxqYppDMjvNA zgu6VaQ== X-Google-Smtp-Source: AGHT+IHUjqbaae93241ZToWGQ/CaSL/ooYK0+SAO3P8QmIpGQlqCu+pyhfF1o4RBXwSJe+EksnwY+jpP+3Rs X-Received: from irogers.svl.corp.google.com ([2620:15c:2a3:200:47d6:1de1:237a:6728]) (user=irogers job=sendgmr) by 2002:a05:690c:c10:b0:608:398c:33bf with SMTP id cl16-20020a05690c0c1000b00608398c33bfmr3734617ywb.8.1709799260073; Thu, 07 Mar 2024 00:14:20 -0800 (PST) Date: Thu, 7 Mar 2024 00:14:06 -0800 In-Reply-To: <20240307081412.3933750-1-irogers@google.com> Message-Id: <20240307081412.3933750-2-irogers@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20240307081412.3933750-1-irogers@google.com> X-Mailer: git-send-email 2.44.0.278.ge034bb2e1d-goog Subject: [PATCH v1 1/6] perf list: Add tracepoint encoding to detailed output From: Ian Rogers To: Peter Zijlstra , Ingo Molnar , Arnaldo Carvalho de Melo , Namhyung Kim , Mark Rutland , Alexander Shishkin , Jiri Olsa , Ian Rogers , Adrian Hunter , Yang Jihong , Kan Liang , James Clark , Ravi Bangoria , linux-perf-users@vger.kernel.org, linux-kernel@vger.kernel.org Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" The tracepoint id holds the config value and is probed in determining what an event is. Add reading of the id so that we can display the event encoding as: ``` $ perf list --details ... alarmtimer:alarmtimer_cancel [Tracepoint event] tracepoint/config=3D0x18c/ ... ``` Signed-off-by: Ian Rogers --- tools/perf/util/print-events.c | 35 ++++++++++++++++++++++++---------- 1 file changed, 25 insertions(+), 10 deletions(-) diff --git a/tools/perf/util/print-events.c b/tools/perf/util/print-events.c index 7b54e9385442..e0d2b49bab66 100644 --- a/tools/perf/util/print-events.c +++ b/tools/perf/util/print-events.c @@ -9,6 +9,7 @@ #include =20 #include +#include #include #include #include @@ -92,34 +93,48 @@ void print_tracepoint_events(const struct print_callbac= ks *print_cb __maybe_unus =20 evt_items =3D scandirat(events_fd, sys_dirent->d_name, &evt_namelist, NU= LL, alphasort); for (int j =3D 0; j < evt_items; j++) { + /* + * Buffer sized at twice the max filename length + 1 + * separator + 1 \0 terminator. + */ + char buf[NAME_MAX * 2 + 2]; + /* 16 possible hex digits and 22 other characters and \0. */ + char encoding[16 + 22]; struct dirent *evt_dirent =3D evt_namelist[j]; - char evt_path[MAXPATHLEN]; - int evt_fd; + struct io id; + __u64 config; =20 if (evt_dirent->d_type !=3D DT_DIR || !strcmp(evt_dirent->d_name, ".") || !strcmp(evt_dirent->d_name, "..")) goto next_evt; =20 - snprintf(evt_path, sizeof(evt_path), "%s/id", evt_dirent->d_name); - evt_fd =3D openat(dir_fd, evt_path, O_RDONLY); - if (evt_fd < 0) + snprintf(buf, sizeof(buf), "%s/id", evt_dirent->d_name); + io__init(&id, openat(dir_fd, buf, O_RDONLY), buf, sizeof(buf)); + + if (id.fd < 0) + goto next_evt; + + if (io__get_dec(&id, &config) < 0) { + close(id.fd); goto next_evt; - close(evt_fd); + } + close(id.fd); =20 - snprintf(evt_path, MAXPATHLEN, "%s:%s", + snprintf(buf, sizeof(buf), "%s:%s", sys_dirent->d_name, evt_dirent->d_name); + snprintf(encoding, sizeof(encoding), "tracepoint/config=3D0x%llx/", con= fig); print_cb->print_event(print_state, /*topic=3D*/NULL, - /*pmu_name=3D*/NULL, - evt_path, + /*pmu_name=3D*/NULL, /* really "tracepoint" */ + /*event_name=3D*/buf, /*event_alias=3D*/NULL, /*scale_unit=3D*/NULL, /*deprecated=3D*/false, "Tracepoint event", /*desc=3D*/NULL, /*long_desc=3D*/NULL, - /*encoding_desc=3D*/NULL); + encoding); next_evt: free(evt_namelist[j]); } --=20 2.44.0.278.ge034bb2e1d-goog From nobody Sun Feb 8 07:03:08 2026 Received: from mail-yb1-f202.google.com (mail-yb1-f202.google.com [209.85.219.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 121C86340A for ; Thu, 7 Mar 2024 08:14:23 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.219.202 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1709799264; cv=none; b=eCZ9timd/x6ugsaLjzMhxxHh2PsDFGhtoy3ZR85yW5h3KLv7Mde4p1Ko3erpBacI3KwHHYa+69VuQxPuiHRUv0k0BLiqCbkL9RMXNIR2GcW2d0iwAdP4hlpVnoc1FYS9IVYbFse69ExmowJ+prWH6EK0fVtQTpCj4s2gh31G1YQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1709799264; c=relaxed/simple; bh=kbFBHdCad/TTKVPzgQtSH7M2inFZrQ/NSaJSVlW2wnY=; h=Date:In-Reply-To:Message-Id:Mime-Version:References:Subject:From: To:Content-Type; b=HAeYl+ejX0xuehRVTEWOqIPZpLgBdO/C3J0ucnQaK7k58Jq22EU04YQkXTIOD58fH6F137UkWCdc/LOJugPL2Dj1C/dVDvA1vuVM2Ko/6oc9mazw6Le5+A+c17/1OMywakm1n/33gRsnz2nG3ReWGtjR+oKgIWAfDfTsKcKZIyM= 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=EHn1+0D3; arc=none smtp.client-ip=209.85.219.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="EHn1+0D3" Received: by mail-yb1-f202.google.com with SMTP id 3f1490d57ef6-dcc15b03287so858701276.3 for ; Thu, 07 Mar 2024 00:14:23 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1709799262; x=1710404062; darn=vger.kernel.org; h=to:from:subject:references:mime-version:message-id:in-reply-to:date :from:to:cc:subject:date:message-id:reply-to; bh=w11Yp0wodb7GDuRE7Pf73tA+Sknph1YJzxldtQ9IWAs=; b=EHn1+0D3CqRrvYUcV3hcdNNe5+9M1U8npj4JP4ojSfe4mB0JKiR976eigwMTB0XZjl APaGNMNKIxvGhzSTgbFPFE6c040n4Vq2Z8Z2YOGjNh7NR45lYOQSJxPhLqgi/w7+494a tUOlbPeNSYqD986ILPWQG5IbcE1puFsLXpOBrV3KeZFl2n2pQ/NMvmoVXHrIDYFPiV2C RaZzPv2NbLDyPiwgtjHCnPmb6U2wZPbJ0jSlNwpuulhx/8ya6OT7cGVlvl4pYRprnJ+c qQUf3bmoCmYFjhNi2LJGRUzmZ76IXulUO0mYwJDPlBWlV9a8Vi/S/xR+rQsW/KwA4BRM uZjw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1709799262; x=1710404062; h=to:from:subject:references:mime-version:message-id:in-reply-to:date :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=w11Yp0wodb7GDuRE7Pf73tA+Sknph1YJzxldtQ9IWAs=; b=vZ35eBHh9p6FyhZZpMye0x2xtGcmus/QAQ5oI/59uYkT5qeZbQnqYtegCInBKNSuNu jfi4ty8p1kKYEoP5Wd42N5fHcQ0lbRj3A/+lKVFvX3CMBrnreKDctTR6WDuw/XJdS9mJ IXpgwsPIENKbqXW/qVDVzwYfeX/YKrsEjTLs+crbSrTGtWXJ8yDgdDkqIopaEp8JNDMK up23aizgKAzf1yag+xrV9XkjNGjNXySXw0opSkb5+krNwYpPuV8tWcJ8c1k8P9k2Kij4 kb1PgCyE4aSCwlTiDDP9wQ/2kTGSc49WsRgmC3Z0IzWvtd5w2R7tqcCuIYT/8yoRv/k2 kEow== X-Forwarded-Encrypted: i=1; AJvYcCVvg5ICoPi5hjp/ubH3UOjhQ3wnTaXklvJ+MC2YhkFlgYBuUlcX6hUeEZSxEyXOm98B2vRn9/fBgHmOH5Ex1BA1CAcvEMzzgiM+OQw7 X-Gm-Message-State: AOJu0YyEoEeTH+oZzXKSBraW/VCjWHJ6G49adZbj9JAYvNPwv7ipk78y +kbfX/SbgC2LziLu94zhY5oszylTj/4Y7nU01sTL1SHiMmJq/BUmxp9XwCbg3OAxxHMsuBW/yYk Q1vDvBg== X-Google-Smtp-Source: AGHT+IG3XWpl+hiZSDVvdAJyxW1RmoGtmXv0tET+3cQqV/HaljGx3Oow9DCUkEVyU8iWOtIbidaNFDxpp/DS X-Received: from irogers.svl.corp.google.com ([2620:15c:2a3:200:47d6:1de1:237a:6728]) (user=irogers job=sendgmr) by 2002:a05:6902:1549:b0:dc6:e647:3fae with SMTP id r9-20020a056902154900b00dc6e6473faemr761880ybu.2.1709799262344; Thu, 07 Mar 2024 00:14:22 -0800 (PST) Date: Thu, 7 Mar 2024 00:14:07 -0800 In-Reply-To: <20240307081412.3933750-1-irogers@google.com> Message-Id: <20240307081412.3933750-3-irogers@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20240307081412.3933750-1-irogers@google.com> X-Mailer: git-send-email 2.44.0.278.ge034bb2e1d-goog Subject: [PATCH v1 2/6] perf pmu: Drop "default_core" from alias names From: Ian Rogers To: Peter Zijlstra , Ingo Molnar , Arnaldo Carvalho de Melo , Namhyung Kim , Mark Rutland , Alexander Shishkin , Jiri Olsa , Ian Rogers , Adrian Hunter , Yang Jihong , Kan Liang , James Clark , Ravi Bangoria , linux-perf-users@vger.kernel.org, linux-kernel@vger.kernel.org Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" "default_core" is used by jevents.py for json events' PMU name when none is specified. On x86 the "default_core" is typically the PMU "cpu". When creating an alias see if the event's PMU name is "default_core" in which case don't record it. This means in places like "perf list" the PMU's name will be used in its place. Before: ``` $ perf list --details ... cache: l1d.replacement [Counts the number of cache lines replaced in L1 data cache] default_core/event=3D0x51,period=3D0x186a3,umask=3D0x1/ ... ``` After: ``` $ perf list --details ... cache: l1d.replacement [Counts the number of cache lines replaced in L1 data cache. Unit: c= pu] cpu/event=3D0x51,period=3D0x186a3,umask=3D0x1/ ... ``` Signed-off-by: Ian Rogers --- tools/perf/util/pmu.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tools/perf/util/pmu.c b/tools/perf/util/pmu.c index f39cbbc1a7ec..24be587e3537 100644 --- a/tools/perf/util/pmu.c +++ b/tools/perf/util/pmu.c @@ -518,7 +518,8 @@ static int perf_pmu__new_alias(struct perf_pmu *pmu, co= nst char *name, unit =3D pe->unit; perpkg =3D pe->perpkg; deprecated =3D pe->deprecated; - pmu_name =3D pe->pmu; + if (pe->pmu && strcmp(pe->pmu, "default_core")) + pmu_name =3D pe->pmu; } =20 alias =3D zalloc(sizeof(*alias)); --=20 2.44.0.278.ge034bb2e1d-goog From nobody Sun Feb 8 07:03:08 2026 Received: from mail-yb1-f201.google.com (mail-yb1-f201.google.com [209.85.219.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 CCAE664AAA for ; Thu, 7 Mar 2024 08:14:25 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.219.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1709799267; cv=none; b=A6gRfYWgQlpi3AX0T2BpNQco6ZaoNFBSM4oGsm9dvXK25NXjm7QRc9+yXkVEcdNSKsZJ+Ty8+0u4wqXPpViNysIFbHZQWcuBK2L+R30vatqLqUp+Y5X2utPcrYVPFefsjyOPJij38p6M6fTTr8+yJyJ268D9aT49kqUWHqEHLCg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1709799267; c=relaxed/simple; bh=4FGMDKoOkBBxkj1JqFSRgh1cfE5NtnWchNm4jvP3s8Y=; h=Date:In-Reply-To:Message-Id:Mime-Version:References:Subject:From: To:Content-Type; b=g1aGoqsXpIuRA0/fexJjp1XCRBkKObNa3GsIWYhm3grTuLlDu5vfwHwoIqGaHxc/J537o6kqqlhoszuVBunKeQ4LekiIFX96IAXtabhbJtJcBXZuVHyfqAMe8PBJYrsaC5kxA4zJWh3DNlIYmVjbRMDMve4U2RR6rMfvmi2uwYo= 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=qMwsRt69; arc=none smtp.client-ip=209.85.219.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="qMwsRt69" Received: by mail-yb1-f201.google.com with SMTP id 3f1490d57ef6-dbe9e13775aso1047981276.1 for ; Thu, 07 Mar 2024 00:14:25 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1709799265; x=1710404065; darn=vger.kernel.org; h=to:from:subject:references:mime-version:message-id:in-reply-to:date :from:to:cc:subject:date:message-id:reply-to; bh=pAckeiwvch0FsitNqCYbJ5gbjBFcfyBaGMXWdwxHN00=; b=qMwsRt69Pi3UVSG2s1h1r9OHqUTd7Yr970cndzvUvXwd1i2knRshfuuoft1bUc2J59 Jbx2nzjcOsojY5wqE19ZG2AN7KNOf4cMRQyjMrvXIBcZZAQAsojHmkDpqKQpktMuqUpk EED507Xre6mfqs9r+TyuD83IAAQoWUZTnjz8pKfFMtRxF64AJTNZpcE9dzHeYuoj/WZL Eb3ILvi+vXj4+CWY5YdKb41k3i0yeaV/zDNob951ctW8JQ/misq5YkwBLuE9qwll9ath 0xCFriUXUFX9YkzTzTTH7Cwaonqd6+R80dShiZHelGj6hVPxKt2Qg1iTNf0YQJse/FRa +fAA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1709799265; x=1710404065; h=to:from:subject:references:mime-version:message-id:in-reply-to:date :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=pAckeiwvch0FsitNqCYbJ5gbjBFcfyBaGMXWdwxHN00=; b=vcQ0+NwuP7C5LEZ7Brvi2/f1lUWNK1oV5BPh5WmaQOdP8f/dJdddBl6Ys4oF/HoJyv OL+8Yf3rv6MyQhPLkGBJgFcuDkZqjRSMA0NUjCX3gexnexmYlhNEsFpjLUadvTiDTIB1 zGz8IhqXGm+TFAXTm7OAnEKw59FW/5FuOlngBwJkL23UVZ8WmRT04uTXWGNzOa9ZIE2E ynsHQOAJOrbwHjbeZXAAn14EAjarZgl3d+8fJPRaJ8c93FrBm+3kK7E7PT0fk38//+8M 8/dI68ioLgrU60Ev+cJ29X8iUAe2C7Y12VIH4y9zaBfd/KBqjPhClVwwvTA1I+gHz2wr gDQA== X-Forwarded-Encrypted: i=1; AJvYcCVAj7B19aCR0R3tmBeG034QxzzBz0/tVNjh3SLMFiTvDUQjplOsVF25+wRleFm7EzLXVjSawMf4x4fhguH00NnFJcHFZld/oJrmz/3k X-Gm-Message-State: AOJu0YxPAeoDX6NULj/SLjLdXn4eiAW9HE15cGfLCsQHdYILNAoTnVl1 YBtwtH2lvuZE64VWZgtP0jBgj1iF9py4hXf5vOStO9u4TYWMjizdh3oTBCGPQoZ37Rv+kmmaKdt qXNfSsg== X-Google-Smtp-Source: AGHT+IEkQ7xYzGPHdIbXejmdwpipGr9wIfLLFPDjQ1Rf+7YZ69qmawid4SieE8nfYfC1s4yP6jWLx+fz8wiX X-Received: from irogers.svl.corp.google.com ([2620:15c:2a3:200:47d6:1de1:237a:6728]) (user=irogers job=sendgmr) by 2002:a25:2688:0:b0:dc6:eea0:1578 with SMTP id m130-20020a252688000000b00dc6eea01578mr4298880ybm.13.1709799264869; Thu, 07 Mar 2024 00:14:24 -0800 (PST) Date: Thu, 7 Mar 2024 00:14:08 -0800 In-Reply-To: <20240307081412.3933750-1-irogers@google.com> Message-Id: <20240307081412.3933750-4-irogers@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20240307081412.3933750-1-irogers@google.com> X-Mailer: git-send-email 2.44.0.278.ge034bb2e1d-goog Subject: [PATCH v1 3/6] perf list: Allow wordwrap to wrap on commas From: Ian Rogers To: Peter Zijlstra , Ingo Molnar , Arnaldo Carvalho de Melo , Namhyung Kim , Mark Rutland , Alexander Shishkin , Jiri Olsa , Ian Rogers , Adrian Hunter , Yang Jihong , Kan Liang , James Clark , Ravi Bangoria , linux-perf-users@vger.kernel.org, linux-kernel@vger.kernel.org Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" A raw event encoding may be lock with terms separated by commas. If wrapping such a string it would be useful to break at the commas, so add this ability to wordwrap. Signed-off-by: Ian Rogers --- tools/perf/builtin-list.c | 21 +++++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-) diff --git a/tools/perf/builtin-list.c b/tools/perf/builtin-list.c index 02bf608d585e..e0fe3d178d63 100644 --- a/tools/perf/builtin-list.c +++ b/tools/perf/builtin-list.c @@ -22,6 +22,7 @@ #include #include #include +#include #include #include =20 @@ -76,26 +77,38 @@ static void default_print_start(void *ps) =20 static void default_print_end(void *print_state __maybe_unused) {} =20 +static const char *skip_spaces_or_commas(const char *str) +{ + while (isspace(*str) || *str =3D=3D ',') + ++str; + return str; +} + static void wordwrap(FILE *fp, const char *s, int start, int max, int corr) { int column =3D start; int n; bool saw_newline =3D false; + bool comma =3D false; =20 while (*s) { - int wlen =3D strcspn(s, " \t\n"); + int wlen =3D strcspn(s, " ,\t\n"); + const char *sep =3D comma ? "," : " "; =20 if ((column + wlen >=3D max && column > start) || saw_newline) { - fprintf(fp, "\n%*s", start, ""); + fprintf(fp, comma ? ",\n%*s" : "\n%*s", start, ""); column =3D start + corr; } - n =3D fprintf(fp, "%s%.*s", column > start ? " " : "", wlen, s); + if (column <=3D start) + sep =3D ""; + n =3D fprintf(fp, "%s%.*s", sep, wlen, s); if (n <=3D 0) break; saw_newline =3D s[wlen] =3D=3D '\n'; s +=3D wlen; + comma =3D s[0] =3D=3D ','; column +=3D n; - s =3D skip_spaces(s); + s =3D skip_spaces_or_commas(s); } } =20 --=20 2.44.0.278.ge034bb2e1d-goog From nobody Sun Feb 8 07:03:08 2026 Received: from mail-yb1-f201.google.com (mail-yb1-f201.google.com [209.85.219.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 688F16313F for ; Thu, 7 Mar 2024 08:14:28 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.219.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1709799270; cv=none; b=JePwhns1OyQHdxauSQHyNO8mEFd0oSZh98DTNugeuHaOJK2qVYHbWes7gOUoMDdIDtU+WtimybqLAhYDIMwnUP1K9b0+25a0dvMBYKcZ9LzxbKMLVrsOL9wfwsVHu7OQ8klNs8XH4bUL6P6uaBtPpzoloEXkw5+/HIxYEOoSWKM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1709799270; c=relaxed/simple; bh=XGzXnxJZH8s5PcPdqcgZ/6hetrszP2lucv0OhWZIshI=; h=Date:In-Reply-To:Message-Id:Mime-Version:References:Subject:From: To:Content-Type; b=jaX8phcCACAv1b+pCcpNRWMmZB53GCXyiJ8yCdBNpP6TlcaRFDX03YaOc/TTLhdHEWDaFjREZ63ficuzR7dNEp4MlGo5ylER0n+CBf53GTPpRnPPTmI8pamBudt1mxZSW9B/hzBqlVo5zIVhGuywW7PZiRHMdGH1X/xdfBk79es= 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=l6cwCQdt; arc=none smtp.client-ip=209.85.219.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="l6cwCQdt" Received: by mail-yb1-f201.google.com with SMTP id 3f1490d57ef6-dcbfe1a42a4so1067701276.2 for ; Thu, 07 Mar 2024 00:14:28 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1709799267; x=1710404067; darn=vger.kernel.org; h=to:from:subject:references:mime-version:message-id:in-reply-to:date :from:to:cc:subject:date:message-id:reply-to; bh=YougMEoFVUMcWamL7etYWLsdGr+wHRhz9uRl/ecxZRs=; b=l6cwCQdtX9f5Q0rjGOS3FnceoZW8D+Gnh6jhAYWSUxcEwZx+6jwh/bjgkeCl3U2xmh PE5bUlbihBC/pXMg8ntNKecZuymhkIVjGFktXNk1R4KS6phafbWKQf8BMSabXP4ulNpp z5gU1cM7/g7NIvTK4nTdSgMRSodNaZiBd0jnYVHCKS1lzZNQgmqrqX2fH3EnOHK37UCz 7vEPQj1rR+i6AepZk1upxIz9QKCeJZjed4WK1pbGSVBrZn5vGg5Dwpc9bIMU+qTY/S8X bUkaeJxfn2Pebj/cwYHtJQt6HGQj2Neb41CQf/lFCjXel5n7L1tJEPUSCmgoUm7Jfo6S bikw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1709799267; x=1710404067; h=to:from:subject:references:mime-version:message-id:in-reply-to:date :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=YougMEoFVUMcWamL7etYWLsdGr+wHRhz9uRl/ecxZRs=; b=FAWVDdDnL7yreIJovBnMpey4rvDrLDaJMmFxmdIlX3gw77FHuYdMclv58/vaMq13Gq vlBHl/cvhLj5PeFVa2BxI9o8QKY17qWESJhkr90gOdE5qNUUT0ZdquPZV0wL53tndYfz G0r2dQZLVAkv7BqiiR0VBYV67BdE4aKtz/+nBJxrZ3D5rnmkTVAynZS9288R64YbfEWZ kmkvPgy25ltZl/GJf4tRN6R96DqQfxAj6icsO7C50Ht8XBR7Sl7tVKxhMjArX+kW/fuN SYJnGyLDQIA9nm7PAStIIdG5gYaP6mIeZngcbwS4d6eV29oeNi+IRuODiz5LNREVV6/W ex1A== X-Forwarded-Encrypted: i=1; AJvYcCVIb2QLoml4WkUygetKfzQpIb9qLVGdzsU1nD+nvbl0Mazz2cHfoVjptm+o57YWM5QSnQ+MpLjpuWfroiOx/GMt94KNu2U5XVIAQwrQ X-Gm-Message-State: AOJu0YwC9QT8vaU7/TaosdQM5irqqzgcIPjp9Y96k7fmscZTclJlWYEO OSdQw9Rm9nXB2M+BExwsz0XYuG88ZHlK47R54oJNQmD72RDccvdDKDkXl8Y0Dcc82to3oJeCMCS jSOr/VQ== X-Google-Smtp-Source: AGHT+IF+8eMTgbAr7eFoq/j1QgVu2gl7VBH/VMolXJH0mLW5rtSnRZzJpu6aQpRcln4R/ZHRoLBarCE6C8iH X-Received: from irogers.svl.corp.google.com ([2620:15c:2a3:200:47d6:1de1:237a:6728]) (user=irogers job=sendgmr) by 2002:a25:dbc9:0:b0:dc6:dfc6:4207 with SMTP id g192-20020a25dbc9000000b00dc6dfc64207mr4198161ybf.10.1709799267453; Thu, 07 Mar 2024 00:14:27 -0800 (PST) Date: Thu, 7 Mar 2024 00:14:09 -0800 In-Reply-To: <20240307081412.3933750-1-irogers@google.com> Message-Id: <20240307081412.3933750-5-irogers@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20240307081412.3933750-1-irogers@google.com> X-Mailer: git-send-email 2.44.0.278.ge034bb2e1d-goog Subject: [PATCH v1 4/6] perf list: Give more details about raw event encodings From: Ian Rogers To: Peter Zijlstra , Ingo Molnar , Arnaldo Carvalho de Melo , Namhyung Kim , Mark Rutland , Alexander Shishkin , Jiri Olsa , Ian Rogers , Adrian Hunter , Yang Jihong , Kan Liang , James Clark , Ravi Bangoria , linux-perf-users@vger.kernel.org, linux-kernel@vger.kernel.org Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" List all the PMUs, not just the first core one, and list real format specifiers with value ranges. Before: ``` $ perf list ... rNNN [Raw hardware event de= scriptor] cpu/t1=3Dv1[,t2=3Dv2,t3 ...]/modifier [Raw hardware even= t descriptor] [(see 'man perf-list' on how to encode it)] mem:[/len][:access] [Hardware breakpoint] ... ``` After: ``` $ perf list ... rNNN [Raw hardware event de= scriptor] cpu/event=3D0..255,pc,edge,.../modifier [Raw hardware event = descriptor] [(see 'man perf-list' or 'man perf-record' on how to encode it)] breakpoint//modifier [Raw hardware event de= scriptor] cstate_core/event=3D0..0xffffffffffffffff/modifier [Raw hardware event = descriptor] cstate_pkg/event=3D0..0xffffffffffffffff/modifier [Raw hardware event = descriptor] i915/i915_eventid=3D0..0x1fffff/modifier [Raw hardware event = descriptor] intel_bts//modifier [Raw hardware event de= scriptor] intel_pt/ptw,event,cyc_thresh=3D0..15,.../modifier [Raw hardware event = descriptor] kprobe/retprobe/modifier [Raw hardware event de= scriptor] msr/event=3D0..0xffffffffffffffff/modifier [Raw hardware event = descriptor] power/event=3D0..255/modifier [Raw hardware event = descriptor] software//modifier [Raw hardware event de= scriptor] tracepoint//modifier [Raw hardware event de= scriptor] uncore_arb/event=3D0..255,edge,inv,.../modifier [Raw hardware event = descriptor] uncore_cbox/event=3D0..255,edge,inv,.../modifier [Raw hardware event = descriptor] uncore_clock/event=3D0..255/modifier [Raw hardware event = descriptor] uncore_imc_free_running/event=3D0..255,umask=3D0..255/modifier[Raw hardwa= re event descriptor] uprobe/ref_ctr_offset=3D0..0xffffffff,retprobe/modifier[Raw hardware even= t descriptor] mem:[/len][:access] [Hardware breakpoint] ... ``` With '--details' provide more details on the formats encoding: ``` cpu/event=3D0..255,pc,edge,.../modifier [Raw hardware event = descriptor] [(see 'man perf-list' or 'man perf-record' on how to encode it)] cpu/event=3D0..255,pc,edge,offcore_rsp=3D0..0xffffffffffffffff,ldla= t=3D0..0xffff,inv, umask=3D0..255,frontend=3D0..0xffffff,cmask=3D0..255,config=3D0..0x= ffffffffffffffff, config1=3D0..0xffffffffffffffff,config2=3D0..0xffffffffffffffff,con= fig3=3D0..0xffffffffffffffff, name=3Dstring,period=3Dnumber,freq=3Dnumber,branch_type=3D(u|k|hv|a= ny|...),time, call-graph=3D(fp|dwarf|lbr),stack-size=3Dnumber,max-stack=3Dnumber,= nr=3Dnumber,inherit,no-inherit, overwrite,no-overwrite,percore,aux-output,aux-sample-size=3Dnumber/= modifier breakpoint//modifier [Raw hardware event de= scriptor] breakpoint//modifier cstate_core/event=3D0..0xffffffffffffffff/modifier [Raw hardware event = descriptor] cstate_core/event=3D0..0xffffffffffffffff/modifier cstate_pkg/event=3D0..0xffffffffffffffff/modifier [Raw hardware event = descriptor] cstate_pkg/event=3D0..0xffffffffffffffff/modifier i915/i915_eventid=3D0..0x1fffff/modifier [Raw hardware event = descriptor] i915/i915_eventid=3D0..0x1fffff/modifier intel_bts//modifier [Raw hardware event de= scriptor] intel_bts//modifier intel_pt/ptw,event,cyc_thresh=3D0..15,.../modifier [Raw hardware event = descriptor] intel_pt/ptw,event,cyc_thresh=3D0..15,pt,notnt,branch,tsc,pwr_evt,f= up_on_ptw,cyc,noretcomp, mtc,psb_period=3D0..15,mtc_period=3D0..15/modifier kprobe/retprobe/modifier [Raw hardware event de= scriptor] kprobe/retprobe/modifier msr/event=3D0..0xffffffffffffffff/modifier [Raw hardware event = descriptor] msr/event=3D0..0xffffffffffffffff/modifier power/event=3D0..255/modifier [Raw hardware event = descriptor] power/event=3D0..255/modifier software//modifier [Raw hardware event de= scriptor] software//modifier tracepoint//modifier [Raw hardware event de= scriptor] tracepoint//modifier uncore_arb/event=3D0..255,edge,inv,.../modifier [Raw hardware event = descriptor] uncore_arb/event=3D0..255,edge,inv,umask=3D0..255,cmask=3D0..31/mod= ifier uncore_cbox/event=3D0..255,edge,inv,.../modifier [Raw hardware event = descriptor] uncore_cbox/event=3D0..255,edge,inv,umask=3D0..255,cmask=3D0..31/mo= difier uncore_clock/event=3D0..255/modifier [Raw hardware event = descriptor] uncore_clock/event=3D0..255/modifier uncore_imc_free_running/event=3D0..255,umask=3D0..255/modifier[Raw hardwa= re event descriptor] uncore_imc_free_running/event=3D0..255,umask=3D0..255/modifier uprobe/ref_ctr_offset=3D0..0xffffffff,retprobe/modifier[Raw hardware even= t descriptor] uprobe/ref_ctr_offset=3D0..0xffffffff,retprobe/modifier ``` Signed-off-by: Ian Rogers --- tools/perf/util/pmu.c | 55 +++++++++++++++++++- tools/perf/util/pmu.h | 3 ++ tools/perf/util/pmus.c | 94 ++++++++++++++++++++++++++++++++++ tools/perf/util/pmus.h | 1 + tools/perf/util/print-events.c | 18 +------ 5 files changed, 153 insertions(+), 18 deletions(-) diff --git a/tools/perf/util/pmu.c b/tools/perf/util/pmu.c index 24be587e3537..904725f03d29 100644 --- a/tools/perf/util/pmu.c +++ b/tools/perf/util/pmu.c @@ -1603,6 +1603,55 @@ bool perf_pmu__has_format(const struct perf_pmu *pmu= , const char *name) return false; } =20 +int perf_pmu__for_each_format(struct perf_pmu *pmu, void *state, pmu_forma= t_callback cb) +{ + static const char *const terms[] =3D { + "config=3D0..0xffffffffffffffff", + "config1=3D0..0xffffffffffffffff", + "config2=3D0..0xffffffffffffffff", + "config3=3D0..0xffffffffffffffff", + "name=3Dstring", + "period=3Dnumber", + "freq=3Dnumber", + "branch_type=3D(u|k|hv|any|...)", + "time", + "call-graph=3D(fp|dwarf|lbr)", + "stack-size=3Dnumber", + "max-stack=3Dnumber", + "nr=3Dnumber", + "inherit", + "no-inherit", + "overwrite", + "no-overwrite", + "percore", + "aux-output", + "aux-sample-size=3Dnumber", + }; + struct perf_pmu_format *format; + int ret; + + list_for_each_entry(format, &pmu->format, list) { + perf_pmu_format__load(pmu, format); + ret =3D cb(state, format->name, (int)format->value, format->bits); + if (ret) + return ret; + } + if (!pmu->is_core) + return 0; + + for (size_t i =3D 0; i < ARRAY_SIZE(terms); i++) { + int config =3D PERF_PMU_FORMAT_VALUE_CONFIG; + + if (i < PERF_PMU_FORMAT_VALUE_CONFIG_END) + config =3D i; + + ret =3D cb(state, terms[i], config, /*bits=3D*/NULL); + if (ret) + return ret; + } + return 0; +} + bool is_pmu_core(const char *name) { return !strcmp(name, "cpu") || !strcmp(name, "cpum_cf") || is_sysfs_pmu_c= ore(name); @@ -1697,8 +1746,12 @@ int perf_pmu__for_each_event(struct perf_pmu *pmu, b= ool skip_duplicate_pmus, pmu_add_cpu_aliases(pmu); list_for_each_entry(event, &pmu->aliases, list) { size_t buf_used; + int pmu_name_len; =20 info.pmu_name =3D event->pmu_name ?: pmu->name; + pmu_name_len =3D skip_duplicate_pmus + ? pmu_name_len_no_suffix(info.pmu_name, /*num=3D*/NULL) + : (int)strlen(info.pmu_name); info.alias =3D NULL; if (event->desc) { info.name =3D event->name; @@ -1723,7 +1776,7 @@ int perf_pmu__for_each_event(struct perf_pmu *pmu, bo= ol skip_duplicate_pmus, info.encoding_desc =3D buf + buf_used; parse_events_terms__to_strbuf(&event->terms, &sb); buf_used +=3D snprintf(buf + buf_used, sizeof(buf) - buf_used, - "%s/%s/", info.pmu_name, sb.buf) + 1; + "%.*s/%s/", pmu_name_len, info.pmu_name, sb.buf) + 1; info.topic =3D event->topic; info.str =3D sb.buf; info.deprecated =3D event->deprecated; diff --git a/tools/perf/util/pmu.h b/tools/perf/util/pmu.h index e35d985206db..9f5284b29ecf 100644 --- a/tools/perf/util/pmu.h +++ b/tools/perf/util/pmu.h @@ -196,6 +196,8 @@ struct pmu_event_info { }; =20 typedef int (*pmu_event_callback)(void *state, struct pmu_event_info *info= ); +typedef int (*pmu_format_callback)(void *state, const char *name, int conf= ig, + const unsigned long *bits); =20 void pmu_add_sys_aliases(struct perf_pmu *pmu); int perf_pmu__config(struct perf_pmu *pmu, struct perf_event_attr *attr, @@ -215,6 +217,7 @@ int perf_pmu__find_event(struct perf_pmu *pmu, const ch= ar *event, void *state, p int perf_pmu__format_parse(struct perf_pmu *pmu, int dirfd, bool eager_loa= d); void perf_pmu_format__set_value(void *format, int config, unsigned long *b= its); bool perf_pmu__has_format(const struct perf_pmu *pmu, const char *name); +int perf_pmu__for_each_format(struct perf_pmu *pmu, void *state, pmu_forma= t_callback cb); =20 bool is_pmu_core(const char *name); bool perf_pmu__supports_legacy_cache(const struct perf_pmu *pmu); diff --git a/tools/perf/util/pmus.c b/tools/perf/util/pmus.c index 16505071d362..89b15ddeb24e 100644 --- a/tools/perf/util/pmus.c +++ b/tools/perf/util/pmus.c @@ -16,6 +16,7 @@ #include "pmus.h" #include "pmu.h" #include "print-events.h" +#include "strbuf.h" =20 /* * core_pmus: A PMU belongs to core_pmus if it's name is "cpu" or it's sy= sfs @@ -503,6 +504,99 @@ void perf_pmus__print_pmu_events(const struct print_ca= llbacks *print_cb, void *p zfree(&aliases); } =20 +struct build_format_string_args { + struct strbuf short_string; + struct strbuf long_string; + int num_formats; +}; + +static int build_format_string(void *state, const char *name, int config, + const unsigned long *bits) +{ + struct build_format_string_args *args =3D state; + unsigned int num_bits; + int ret1, ret2 =3D 0; + + (void)config; + args->num_formats++; + if (args->num_formats > 1) { + strbuf_addch(&args->long_string, ','); + if (args->num_formats < 4) + strbuf_addch(&args->short_string, ','); + } + num_bits =3D bits ? bitmap_weight(bits, PERF_PMU_FORMAT_BITS) : 0; + if (num_bits <=3D 1) { + ret1 =3D strbuf_addf(&args->long_string, "%s", name); + if (args->num_formats < 4) + ret2 =3D strbuf_addf(&args->short_string, "%s", name); + } else if (num_bits > 8) { + ret1 =3D strbuf_addf(&args->long_string, "%s=3D0..0x%llx", name, + ULLONG_MAX >> (64 - num_bits)); + if (args->num_formats < 4) { + ret2 =3D strbuf_addf(&args->short_string, "%s=3D0..0x%llx", name, + ULLONG_MAX >> (64 - num_bits)); + } + } else { + ret1 =3D strbuf_addf(&args->long_string, "%s=3D0..%llu", name, + ULLONG_MAX >> (64 - num_bits)); + if (args->num_formats < 4) { + ret2 =3D strbuf_addf(&args->short_string, "%s=3D0..%llu", name, + ULLONG_MAX >> (64 - num_bits)); + } + } + return ret1 < 0 ? ret1 : (ret2 < 0 ? ret2 : 0); +} + +void perf_pmus__print_raw_pmu_events(const struct print_callbacks *print_c= b, void *print_state) +{ + bool skip_duplicate_pmus =3D print_cb->skip_duplicate_pmus(print_state); + struct perf_pmu *(*scan_fn)(struct perf_pmu *); + struct perf_pmu *pmu =3D NULL; + + if (skip_duplicate_pmus) + scan_fn =3D perf_pmus__scan_skip_duplicates; + else + scan_fn =3D perf_pmus__scan; + + while ((pmu =3D scan_fn(pmu)) !=3D NULL) { + struct build_format_string_args format_args =3D { + .short_string =3D STRBUF_INIT, + .long_string =3D STRBUF_INIT, + .num_formats =3D 0, + }; + int len =3D pmu_name_len_no_suffix(pmu->name, /*num=3D*/NULL); + const char *desc =3D "(see 'man perf-list' or 'man perf-record' on how t= o encode it)"; + + if (!pmu->is_core) + desc =3D NULL; + + strbuf_addf(&format_args.short_string, "%.*s/", len, pmu->name); + strbuf_addf(&format_args.long_string, "%.*s/", len, pmu->name); + perf_pmu__for_each_format(pmu, &format_args, build_format_string); + + if (format_args.num_formats > 3) + strbuf_addf(&format_args.short_string, ",.../modifier"); + else + strbuf_addf(&format_args.short_string, "/modifier"); + + strbuf_addf(&format_args.long_string, "/modifier"); + print_cb->print_event(print_state, + /*topic=3D*/NULL, + /*pmu_name=3D*/NULL, + format_args.short_string.buf, + /*event_alias=3D*/NULL, + /*scale_unit=3D*/NULL, + /*deprecated=3D*/false, + "Raw hardware event descriptor", + desc, + /*long_desc=3D*/NULL, + format_args.long_string.buf); + + strbuf_release(&format_args.short_string); + strbuf_release(&format_args.long_string); + } +} + bool perf_pmus__have_event(const char *pname, const char *name) { struct perf_pmu *pmu =3D perf_pmus__find(pname); diff --git a/tools/perf/util/pmus.h b/tools/perf/util/pmus.h index 94d2a08d894b..eec599d8aebd 100644 --- a/tools/perf/util/pmus.h +++ b/tools/perf/util/pmus.h @@ -18,6 +18,7 @@ struct perf_pmu *perf_pmus__scan_core(struct perf_pmu *pm= u); const struct perf_pmu *perf_pmus__pmu_for_pmu_filter(const char *str); =20 void perf_pmus__print_pmu_events(const struct print_callbacks *print_cb, v= oid *print_state); +void perf_pmus__print_raw_pmu_events(const struct print_callbacks *print_c= b, void *print_state); bool perf_pmus__have_event(const char *pname, const char *name); int perf_pmus__num_core_pmus(void); bool perf_pmus__supports_extended_type(void); diff --git a/tools/perf/util/print-events.c b/tools/perf/util/print-events.c index e0d2b49bab66..3a7f14fe2390 100644 --- a/tools/perf/util/print-events.c +++ b/tools/perf/util/print-events.c @@ -416,8 +416,6 @@ void print_symbol_events(const struct print_callbacks *= print_cb, void *print_sta */ void print_events(const struct print_callbacks *print_cb, void *print_stat= e) { - char *tmp; - print_symbol_events(print_cb, print_state, PERF_TYPE_HARDWARE, event_symbols_hw, PERF_COUNT_HW_MAX); print_symbol_events(print_cb, print_state, PERF_TYPE_SOFTWARE, @@ -441,21 +439,7 @@ void print_events(const struct print_callbacks *print_= cb, void *print_state) /*long_desc=3D*/NULL, /*encoding_desc=3D*/NULL); =20 - if (asprintf(&tmp, "%s/t1=3Dv1[,t2=3Dv2,t3 ...]/modifier", - perf_pmus__scan_core(/*pmu=3D*/NULL)->name) > 0) { - print_cb->print_event(print_state, - /*topic=3D*/NULL, - /*pmu_name=3D*/NULL, - tmp, - /*event_alias=3D*/NULL, - /*scale_unit=3D*/NULL, - /*deprecated=3D*/false, - event_type_descriptors[PERF_TYPE_RAW], - "(see 'man perf-list' on how to encode it)", - /*long_desc=3D*/NULL, - /*encoding_desc=3D*/NULL); - free(tmp); - } + perf_pmus__print_raw_pmu_events(print_cb, print_state); =20 print_cb->print_event(print_state, /*topic=3D*/NULL, --=20 2.44.0.278.ge034bb2e1d-goog From nobody Sun Feb 8 07:03:08 2026 Received: from mail-yb1-f201.google.com (mail-yb1-f201.google.com [209.85.219.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 DF1D7651BA for ; Thu, 7 Mar 2024 08:14:30 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.219.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1709799272; cv=none; b=Br4yoMyYrc+UpQoH1eyoCdxxd4FDdiRqxkDX8fb0h/qTQSL7rAMApUBmEYrWwIF+a+rHohx8AvsRATKswYlUK7tz5yTWGlXVdJZQPfwJ4xKSFn2HCb236iY5O+Vk1nFJij+odXquwwsAVzZrAStmdaoKL52cOIAS0tEf9alb6Sw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1709799272; c=relaxed/simple; bh=cmwdpFX6u7kgML8KCB/AE8a30yd+jOPjm9k9IyM0BB4=; h=Date:In-Reply-To:Message-Id:Mime-Version:References:Subject:From: To:Content-Type; b=k0AkRT0y+xDCxHVQLSyL5EJHbWh9KbWw+R3TDGdx0y+6iDCY3wlo316lU+sbXHHFG3KGK/nxdMf1XAATuvZafpdhvWj5BvlAygunAU6pGjuM6qw20SDlynLxW1JWyxjNXjQG4NAE6CKzl7DYX0yaqrfUik3u/okWgKbaQ84BBwg= 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=Ksh8BxJI; arc=none smtp.client-ip=209.85.219.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="Ksh8BxJI" Received: by mail-yb1-f201.google.com with SMTP id 3f1490d57ef6-dd0ae66422fso1357931276.0 for ; Thu, 07 Mar 2024 00:14:30 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1709799270; x=1710404070; darn=vger.kernel.org; h=to:from:subject:references:mime-version:message-id:in-reply-to:date :from:to:cc:subject:date:message-id:reply-to; bh=UMszCQsKnKwqHBaw/VXDFLccaECZInv6bzZZFsySaI8=; b=Ksh8BxJIy6gHYUaMYwtUdsIyRXGv/hCo22AfXAiVEBB6R3EO0zlqhNPBDnWYmVRl+h ydBTW+69fDv8JycgURP2yoPBzGaUkV9Q7U1f738gNWm1Leomm5DaqVycwFyQjIHiX5IY TnJAjUK0riHv+w4jUKXPhbtKY+/SED+rmSBcuOE2fX7Vdv6Lce0O1Bo5dwyWIwH3DwuF wpuvUjNFoKzH51p3T3vziNHCe7sTwcFJuA9JwNlvrXCgbr8HONxNaqt6fb+mFozyiC6L oJhBnegPksSbWn0HUFtSgks/ryU6EltUo4KhsYoRzXOCTD1VRdqeQ+dscSnZQyv63dH7 oQsA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1709799270; x=1710404070; h=to:from:subject:references:mime-version:message-id:in-reply-to:date :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=UMszCQsKnKwqHBaw/VXDFLccaECZInv6bzZZFsySaI8=; b=lLpz4lPDlWs+/q7TjiTqk9OOTUEew6hUSbCixKlP0ltpqYW8LCBg+lzr+3vnhUEmhX O7vsKqYNOd2qBw+VXybbX6X2WEuuJzp8EGYvYm/B9zJuomlcL9MCqg6npU23JUDVfep9 NDxae72vNbNjFWZYG7VSEievbeeyfZp+b/3By294QjxxU77ganAUMtdPOfANlT8nr7gN k08escDOpqnbTg2P0emo7elec5PqcHD5OCjkHDxEWZLmPlCsZi8E1eHJrKl8h6q85YQp 9wZTd4PfyPRSlF7fXu4ZhKZ5tPndaLHGwGIHCnGCLj51pIzyX5PxJBu2uWRf9Mnzpc+F mhiQ== X-Forwarded-Encrypted: i=1; AJvYcCWRv/a7AB29uTYnYasL/0YJoEOy9VPxnV9bupa+qs9muu2g6NssF2lwEZ32qb0Mjbwd1gyu5EeH7k/tHSSebcNRNERHHGLPqU0LaXJ5 X-Gm-Message-State: AOJu0YwDfubzN7klCXiXwYdFmeJM77NdS3SYZhgTKh/lPHvQjdd12lNV loPEeDKKwEX1vHLj5YjnB0naxqz3CypAO+xmOuxhS5NgHQTIvoWiyPhM36TQmcHCUWPgqk27dl/ ZamA0fg== X-Google-Smtp-Source: AGHT+IG2ESZgtaLDvHRZVWktnAFX8J2Uj9lhk+4DYK4F5tZiS2sgPb8NMyn2lHURVoiKjYBUHOx77iuDtqxZ X-Received: from irogers.svl.corp.google.com ([2620:15c:2a3:200:47d6:1de1:237a:6728]) (user=irogers job=sendgmr) by 2002:a25:ab8f:0:b0:dc6:deca:8122 with SMTP id v15-20020a25ab8f000000b00dc6deca8122mr3222ybi.5.1709799269914; Thu, 07 Mar 2024 00:14:29 -0800 (PST) Date: Thu, 7 Mar 2024 00:14:10 -0800 In-Reply-To: <20240307081412.3933750-1-irogers@google.com> Message-Id: <20240307081412.3933750-6-irogers@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20240307081412.3933750-1-irogers@google.com> X-Mailer: git-send-email 2.44.0.278.ge034bb2e1d-goog Subject: [PATCH v1 5/6] perf tools: Use pmus to describe type from attribute From: Ian Rogers To: Peter Zijlstra , Ingo Molnar , Arnaldo Carvalho de Melo , Namhyung Kim , Mark Rutland , Alexander Shishkin , Jiri Olsa , Ian Rogers , Adrian Hunter , Yang Jihong , Kan Liang , James Clark , Ravi Bangoria , linux-perf-users@vger.kernel.org, linux-kernel@vger.kernel.org Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" When dumping a perf_event_attr, use pmus to find the PMU and its name by the type number. This allows dynamically added PMUs to be described. Before: ``` $ perf stat -vv -e data_read true ... perf_event_attr: type 24 size 136 config 0x20ff sample_type IDENTIFIER read_format TOTAL_TIME_ENABLED|TOTAL_TIME_RUNNING disabled 1 inherit 1 exclude_guest 1 ... ``` After: ``` $ perf stat -vv -e data_read true ... perf_event_attr: type 24 (uncore_imc_free_running_0) size 136 config 0x20ff sample_type IDENTIFIER read_format TOTAL_TIME_ENABLED|TOTAL_TIME_RUNNING disabled 1 inherit 1 exclude_guest 1 ... ``` However, it also means that when we have a PMU name we prefer it to a hard coded name: Before: ``` $ perf stat -vv -e cycles true ... perf_event_attr: type 1 (PERF_TYPE_SOFTWARE) size 136 config 0x2 (PERF_COUNT_SW_PAGE_FAULTS) sample_type IDENTIFIER read_format TOTAL_TIME_ENABLED|TOTAL_TIME_RUNNING disabled 1 inherit 1 enable_on_exec 1 exclude_guest 1 ... ``` After: ``` $ perf stat -vv -e faults true ... perf_event_attr: type 1 (software) size 136 config 0x2 (PERF_COUNT_SW_PAGE_FAULTS) sample_type IDENTIFIER read_format TOTAL_TIME_ENABLED|TOTAL_TIME_RUNNING disabled 1 inherit 1 enable_on_exec 1 exclude_guest 1 ... ``` It feels more consistent to do this, rather than only prefer a PMU name when a hard coded name isn't available. Signed-off-by: Ian Rogers --- tools/perf/util/perf_event_attr_fprintf.c | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/tools/perf/util/perf_event_attr_fprintf.c b/tools/perf/util/pe= rf_event_attr_fprintf.c index 8f04d3b7f3ec..29e66835da3a 100644 --- a/tools/perf/util/perf_event_attr_fprintf.c +++ b/tools/perf/util/perf_event_attr_fprintf.c @@ -7,6 +7,8 @@ #include #include #include "util/evsel_fprintf.h" +#include "util/pmu.h" +#include "util/pmus.h" #include "trace-event.h" =20 struct bit_names { @@ -75,9 +77,12 @@ static void __p_read_format(char *buf, size_t size, u64 = value) } =20 #define ENUM_ID_TO_STR_CASE(x) case x: return (#x); -static const char *stringify_perf_type_id(u64 value) +static const char *stringify_perf_type_id(struct perf_pmu *pmu, u32 type) { - switch (value) { + if (pmu) + return pmu->name; + + switch (type) { ENUM_ID_TO_STR_CASE(PERF_TYPE_HARDWARE) ENUM_ID_TO_STR_CASE(PERF_TYPE_SOFTWARE) ENUM_ID_TO_STR_CASE(PERF_TYPE_TRACEPOINT) @@ -175,9 +180,9 @@ do { \ #define print_id_unsigned(_s) PRINT_ID(_s, "%"PRIu64) #define print_id_hex(_s) PRINT_ID(_s, "%#"PRIx64) =20 -static void __p_type_id(char *buf, size_t size, u64 value) +static void __p_type_id(struct perf_pmu *pmu, char *buf, size_t size, u64 = value) { - print_id_unsigned(stringify_perf_type_id(value)); + print_id_unsigned(stringify_perf_type_id(pmu, value)); } =20 static void __p_config_hw_id(char *buf, size_t size, u64 value) @@ -246,7 +251,7 @@ static void __p_config_id(char *buf, size_t size, u32 t= ype, u64 value) #define p_sample_type(val) __p_sample_type(buf, BUF_SIZE, val) #define p_branch_sample_type(val) __p_branch_sample_type(buf, BUF_SIZE, va= l) #define p_read_format(val) __p_read_format(buf, BUF_SIZE, val) -#define p_type_id(val) __p_type_id(buf, BUF_SIZE, val) +#define p_type_id(val) __p_type_id(pmu, buf, BUF_SIZE, val) #define p_config_id(val) __p_config_id(buf, BUF_SIZE, attr->type, val) =20 #define PRINT_ATTRn(_n, _f, _p, _a) \ @@ -262,6 +267,7 @@ do { \ int perf_event_attr__fprintf(FILE *fp, struct perf_event_attr *attr, attr__fprintf_f attr__fprintf, void *priv) { + struct perf_pmu *pmu =3D perf_pmus__find_by_type(attr->type); char buf[BUF_SIZE]; int ret =3D 0; =20 --=20 2.44.0.278.ge034bb2e1d-goog From nobody Sun Feb 8 07:03:08 2026 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 27088657D1 for ; Thu, 7 Mar 2024 08:14:33 +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=1709799274; cv=none; b=hVwL/Vgx98fNqnERry5++JOnpNxKD/wHQ3Ot9SqaN2XTyvxr+C2a7wyM5QDapwJlUMHTXQEO84o1i0gr99JUvCSciE4auEz18mSn5uddiPXp9eRW4gSaTeCGaJz7/sNUEwyGR/10ZxrBahDrDuQVy2fpxBlBSzB9jGNefwyWVfM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1709799274; c=relaxed/simple; bh=+1cu9dKkJ8vg6JWFPY9f9GjbOG3Y+bB8WG0Z1sbnmSY=; h=Date:In-Reply-To:Message-Id:Mime-Version:References:Subject:From: To:Content-Type; b=VG+49EgJWzA7Pd2HUYnihHEqDkfKkYe/2Wvuodn12Z1UhOBM0TnxMoS+lA7w3Z31LZTzsQKMy2gqx3ukdfNuaCEpXMH7M0rdqlUPl0k7+ru+j/+Nxmd1fXwHuzr7OqZX0ybPw0A64fq1gFJDcEb6OJf0YKKZzv4SU+Mwu+TDc2A= 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=uWe+Rk8U; 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="uWe+Rk8U" Received: by mail-yw1-f202.google.com with SMTP id 00721157ae682-609ea26233dso12882627b3.0 for ; Thu, 07 Mar 2024 00:14:32 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1709799272; x=1710404072; darn=vger.kernel.org; h=to:from:subject:references:mime-version:message-id:in-reply-to:date :from:to:cc:subject:date:message-id:reply-to; bh=qJestFEVqFGCX9FS9Jv13Zp7RYO5S1fF+epvUel+hMU=; b=uWe+Rk8U7KDFAi9k5HxPbYz3dsCNPQQcGB0zrocandfOjp8fa3F75bdEh4UmkrFo+k WT5518DvJ1Y6yD/zg3T67h/5Bd7D4cmUORTeihV7E5oS7PACn1RPe3NUoBJKjag/qj48 /7JPZbDt1PIv/ybb/fMGF+VLvfap4XC12jUwXO73jJn3o4ByAqpPF9L0E4QHLY82BrKm 8KYsCuqQJGioxk/7C27hZ9kSWlsmDvYfyl63HiPlukO0/KvkXIn/d7AutKHwt6HKMBHk ObSakJtpEa5S/zYMZNDRVqfgsHIG6Af42rrjr44DM6SXux2m7PI9xT6Lb0cC926xGAfR 9jmA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1709799272; x=1710404072; h=to:from:subject:references:mime-version:message-id:in-reply-to:date :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=qJestFEVqFGCX9FS9Jv13Zp7RYO5S1fF+epvUel+hMU=; b=dwT9ZNHKg/nYPwu9hq/tn4fRs3gmLrJPdoAhG09Jy1mKd93ZMxxVPRWkarvR+r9MG4 e9qK40G9EkXhIBaj52AHRot2HaKFiIOLLQsFJ8RYAtzFW5W/hXEKSvWGgK3a28tMcUeE B98mqOqDeG3pvUxZv/LF74dUFQ2V8QCdpJGBsr+M9YHQefq3/5vpD986OCzqIjLlDnxp 2BrT0ISI5IwkTYD6e9h0zYPHIwuuIBlsJIDes8PguoZg4fM27nX4t8OWgRStAbmIrxkv 6YzaKtdYIdmk8LUvuqyd7xDJ+JDeyN7BpVSgCIFssf9THhqa4n9vYFqBhM32kXjSuC+g BGnQ== X-Forwarded-Encrypted: i=1; AJvYcCUBN4GQ0uU2NS0QQD5jbbO9gg/PdjmYs/AXxeP4SkUu/Q7ojj5cOsZkccbn1xxGSZEF0QSAW2loMvWMArSQJldOt5s4pB3Nt44oXPhB X-Gm-Message-State: AOJu0Yz38cZn7bnxWh/MiN1nTYmOqJkvY0ot1LIbnTsHFUNeDqV5VHPT JZB8VTWtm9ZzWdUM5WMcJlFnG2cZy4ReO1z0OMn81jPXcJeZmlEXQnhRa6O0CoR0VLC1lSeaX8i QVYeXGg== X-Google-Smtp-Source: AGHT+IF62rYpy6xSsQVXWRCPb5hibRpnoEJ2h4Jq+ifJXuHBEDTcW2Nt2tXiYyoCck/ZJKxZgDYae1etPY/v X-Received: from irogers.svl.corp.google.com ([2620:15c:2a3:200:47d6:1de1:237a:6728]) (user=irogers job=sendgmr) by 2002:a05:690c:c17:b0:609:3834:e0f4 with SMTP id cl23-20020a05690c0c1700b006093834e0f4mr5271362ywb.7.1709799272283; Thu, 07 Mar 2024 00:14:32 -0800 (PST) Date: Thu, 7 Mar 2024 00:14:11 -0800 In-Reply-To: <20240307081412.3933750-1-irogers@google.com> Message-Id: <20240307081412.3933750-7-irogers@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20240307081412.3933750-1-irogers@google.com> X-Mailer: git-send-email 2.44.0.278.ge034bb2e1d-goog Subject: [PATCH v1 6/6] perf tools: Add/use PMU reverse lookup from config to name From: Ian Rogers To: Peter Zijlstra , Ingo Molnar , Arnaldo Carvalho de Melo , Namhyung Kim , Mark Rutland , Alexander Shishkin , Jiri Olsa , Ian Rogers , Adrian Hunter , Yang Jihong , Kan Liang , James Clark , Ravi Bangoria , linux-perf-users@vger.kernel.org, linux-kernel@vger.kernel.org Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Add perf_pmu__name_from_config that does a reverse lookup from a config number to an alias name. The lookup is expensive as the config is computed for every alias by filling in a perf_event_attr, but this is only done when verbose output is enabled. The lookup also only considers config, and not config1, config2 or config3. An example of the output: ``` $ perf stat -vv -e data_read true ... perf_event_attr: type 24 (uncore_imc_free_running_0) size 136 config 0x20ff (data_read) sample_type IDENTIFIER read_format TOTAL_TIME_ENABLED|TOTAL_TIME_RUNNING disabled 1 inherit 1 exclude_guest 1 ... ``` Signed-off-by: Ian Rogers --- tools/perf/util/perf_event_attr_fprintf.c | 10 ++++++++-- tools/perf/util/pmu.c | 19 +++++++++++++++++++ tools/perf/util/pmu.h | 1 + 3 files changed, 28 insertions(+), 2 deletions(-) diff --git a/tools/perf/util/perf_event_attr_fprintf.c b/tools/perf/util/pe= rf_event_attr_fprintf.c index 29e66835da3a..59fbbba79697 100644 --- a/tools/perf/util/perf_event_attr_fprintf.c +++ b/tools/perf/util/perf_event_attr_fprintf.c @@ -222,8 +222,14 @@ static void __p_config_tracepoint_id(char *buf, size_t= size, u64 value) } #endif =20 -static void __p_config_id(char *buf, size_t size, u32 type, u64 value) +static void __p_config_id(struct perf_pmu *pmu, char *buf, size_t size, u3= 2 type, u64 value) { + const char *name =3D perf_pmu__name_from_config(pmu, value); + + if (name) { + print_id_hex(name); + return; + } switch (type) { case PERF_TYPE_HARDWARE: return __p_config_hw_id(buf, size, value); @@ -252,7 +258,7 @@ static void __p_config_id(char *buf, size_t size, u32 t= ype, u64 value) #define p_branch_sample_type(val) __p_branch_sample_type(buf, BUF_SIZE, va= l) #define p_read_format(val) __p_read_format(buf, BUF_SIZE, val) #define p_type_id(val) __p_type_id(pmu, buf, BUF_SIZE, val) -#define p_config_id(val) __p_config_id(buf, BUF_SIZE, attr->type, val) +#define p_config_id(val) __p_config_id(pmu, buf, BUF_SIZE, attr->type, val) =20 #define PRINT_ATTRn(_n, _f, _p, _a) \ do { \ diff --git a/tools/perf/util/pmu.c b/tools/perf/util/pmu.c index 904725f03d29..f26b06912a8a 100644 --- a/tools/perf/util/pmu.c +++ b/tools/perf/util/pmu.c @@ -2139,3 +2139,22 @@ void perf_pmu__delete(struct perf_pmu *pmu) zfree(&pmu->id); free(pmu); } + +const char *perf_pmu__name_from_config(struct perf_pmu *pmu, u64 config) +{ + struct perf_pmu_alias *event; + + if (!pmu) + return NULL; + + list_for_each_entry(event, &pmu->aliases, list) { + struct perf_event_attr attr =3D {.config =3D 0,}; + int ret =3D perf_pmu__config(pmu, &attr, &event->terms, NULL); + + if (ret) + return NULL; + if (config =3D=3D attr.config) + return event->name; + } + return NULL; +} diff --git a/tools/perf/util/pmu.h b/tools/perf/util/pmu.h index 9f5284b29ecf..152700f78455 100644 --- a/tools/perf/util/pmu.h +++ b/tools/perf/util/pmu.h @@ -276,5 +276,6 @@ struct perf_pmu *perf_pmu__lookup(struct list_head *pmu= s, int dirfd, const char struct perf_pmu *perf_pmu__create_placeholder_core_pmu(struct list_head *c= ore_pmus); void perf_pmu__delete(struct perf_pmu *pmu); struct perf_pmu *perf_pmus__find_core_pmu(void); +const char *perf_pmu__name_from_config(struct perf_pmu *pmu, u64 config); =20 #endif /* __PMU_H */ --=20 2.44.0.278.ge034bb2e1d-goog