From nobody Tue Dec 23 10:51:32 2025 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 21C19130E24 for ; Thu, 7 Mar 2024 17:40:26 +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=1709833227; cv=none; b=QAmWR6OJy2Dn+T4hVPEnT910g1tHIkQme+6pKdn80nCzeD6kg82O82MenYagnWDHDDS+NO51+VM4NHYyJInCU299X21yHIX28FhC4hNy3XOvwIvdwOWkAXPcUfN08FpOjphHOW11YnjsDw/ByFQB3Gwbeuqkbqk6m5pi7hqLZXU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1709833227; c=relaxed/simple; bh=zZMAjPThw9neF0rFKQqn5K77WjJlmrho8flUA6F99+Y=; h=Date:In-Reply-To:Message-Id:Mime-Version:References:Subject:From: To:Content-Type; b=e23nT8dzgDa9BTLgjueFt11TbTHuySx4Ih/vXYZ9ezQ6Zp21U9N4DNH9JWlyLY3Zui/FLg0zCn6JtbNvj4JMCxNc/JYZiJcmgMkopUqYwa2TjhghzzIZNpyKVA/s5ickY4a13Yb1vU97nzkCmInrvwZ3hJ6JdB5C5rdehyMAQE4= 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=BBCU+VEa; 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="BBCU+VEa" Received: by mail-yw1-f202.google.com with SMTP id 00721157ae682-6047fed0132so18474117b3.1 for ; Thu, 07 Mar 2024 09:40:25 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1709833225; x=1710438025; 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=BBCU+VEabxMteTfQQ0YbHVlpHHe8FZCvBBaJuRl4Dd2futHm+M7gLFgEm9cbD5HfRv AkTTF1anKkI8rsJM60PhVXHTQKXIZQ/76oHeCipPZiyPPHX4pMTP+1a4KBt+K3dlTxyp DHdahlfx6ZGDQ8Y18lRdQlPJHx18P8Md6fYB/aWVXLcPfwSyS45VAwjyexZZ2h3nWIO1 MorSdSMkWEea2ckkLN8JCqDjlDMd86pKrPwksEoVB8DlfLwqitQmCIXYQEc9uL/NVm0q W5QUaao5yRj6qWEguF41Tg2Ec3d59IYeM4PpGJGsDMVOhebrvk3fWLOJxYClev8/mIMl Rd1w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1709833225; x=1710438025; 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=TBY2S+XXa2ICtv49fQdJvZhXoIUSvrzpPUgsFXobLdjeST69MYhk6SLyEUEhecoVB6 /8qV2FwgrL8yLAmB6pKyJXDSXcJ1IiAtZm0TD32lDIYGMypU1/QbgrfN+W5z4KGo580Q DkFS4OVlXISRk3cZ0Qv3m1eehIXn2WbaMy55F9qnGI6RgHFMArdUPe6pfDr43dEBTv+l sH4s7sxYj+4eybPYVYJMX9d/sEc+il9EV342bV1wwVI8eAzcKZAn62HJwT2gaT551fcJ hmYx0BwKQbhQ7h5OivfTPdjrYGqdn8neDcaGdUVW9uHn/+4CMmxeZY/X/Vi/IlclnpVq Tcyg== X-Forwarded-Encrypted: i=1; AJvYcCW+bBIzRUPN2JywwUbZOxdvoHOyBciKnFUSW8uJqwpx1JEwxY+eDH8vlgIbaI0yeZ9TKxDUwFotf0xDWoO8yi5b5fxFvg7BDIvh8VTj X-Gm-Message-State: AOJu0YwBJHzB0t/hhqYCwcnpW2MaivmkN6fB9dybFQ4t2InIHQ8P7xCt A0pMAed3++ZFqjoaURdQko14CtEJPsnjJjk5bb+Z0BiT0mil8w9VPk5oh9kJhszdM/zm7UZESL6 85XjWFA== X-Google-Smtp-Source: AGHT+IFi8pCz2tpIMM3csNv3mom/3CvP1+s6BJFEc09p5I4T6sVJFww7h8sxsrG+ozo/wb7E1npkw5pklwNz X-Received: from irogers.svl.corp.google.com ([2620:15c:2a3:200:47d6:1de1:237a:6728]) (user=irogers job=sendgmr) by 2002:a05:690c:3581:b0:609:4293:23eb with SMTP id fr1-20020a05690c358100b00609429323ebmr4024349ywb.10.1709833225272; Thu, 07 Mar 2024 09:40:25 -0800 (PST) Date: Thu, 7 Mar 2024 09:39:50 -0800 In-Reply-To: <20240307173955.3982040-1-irogers@google.com> Message-Id: <20240307173955.3982040-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: <20240307173955.3982040-1-irogers@google.com> X-Mailer: git-send-email 2.44.0.278.ge034bb2e1d-goog Subject: [PATCH v2 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 Tue Dec 23 10:51:32 2025 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 9540B13175D for ; Thu, 7 Mar 2024 17:40:28 +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=1709833230; cv=none; b=NcWWja3CHXtB4s7dz0LTdlHXdE9nyJfB7X1pMLVVEu4W0Pt359+N6OMkkUNc4jnTOI42CD9NifigYw37DIvqSHQzOUzd+TBTNGZVTQ6EO6Hl5iCh/1+ZSl0FdA5o8Um8b2Veq42iH+uGjkHE8dAd7ciao7ojR757aji7O0BkvOA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1709833230; c=relaxed/simple; bh=kbFBHdCad/TTKVPzgQtSH7M2inFZrQ/NSaJSVlW2wnY=; h=Date:In-Reply-To:Message-Id:Mime-Version:References:Subject:From: To:Content-Type; b=d1KEW3+qTlifUrc5iLZpDZg2Ybj7cpfM4u67uC/3qzFqkfOIz2IY4xYk5eryrOjUtWQjNdye+W0qzCSzWOLtAYXhszNbEnt17VbsWCPlx2VnpURNpb0KEnHssBkqRlZni+GCcC/wCKyFGhrlDhh/Y4ub0iubxBx9UIeSTEmLXnw= 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=jXH4eky1; 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="jXH4eky1" Received: by mail-yw1-f201.google.com with SMTP id 00721157ae682-6047fed0132so18474817b3.1 for ; Thu, 07 Mar 2024 09:40:28 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1709833227; x=1710438027; 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=jXH4eky1aX3eDDpp3cgQ3WLemFoD3qlpwXlLRIpDJzTOP1EIFzdXI5+8OwPcwkDJxw HPBPruX81/yjO5CebGAwU5RyXgbHkrURG5mOHpAzcvINgeoCYdTXVny0Qr4EhG2oQkr0 bSMxdkcNbty2RQrgtS8NkPh0C53JudynA7xz3Ribcd8mluQflxqWQ5ozw8kduo0lbJol nCmPGOSj3sA4BJMHtoD3cPod3p1UwFBIP9Y1QEJBFU0kIXQ/1mnQ5xefDF9/kwPvsYiH lkqIeo4IC2f1cBOBIdSD95i7rKWfHwtRelrfBlA1iVHLym4OKkXDb0aotpcgQsq63y+E kOug== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1709833227; x=1710438027; 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=xCQF30iQJgM78Gz+yUpad0YeWmAjXdNOfEUh6dpKFUcOxbsWnkBeoUUidL0gpEPeH1 hHpFdY8IEBt7Ag08WNj3GKtJQFc2EIo0ijC3N6aMD7Tlb3TdcJzsUJ3j4VvqH6XmoRat gXnuHbu1abCAJXslnqjWJgsY0xWHoObAW42zWv4quSQ+jW7xXNILOoRSHliG3FV2qPM4 vQ3UXiwZmlzGxsJIr23S5WznblpKzYmfHpXm/5MNdoDpFvqx+8kD4QU5mLHzhcrp5Pac 1LzhQvnQVj81ak8WA6uPDkT76gcO8ug86kFpQuRFK771NUGbbnf2UJ/WmcS8dee37FXj V/Vg== X-Forwarded-Encrypted: i=1; AJvYcCVgwvanttB0XkumdKrSjcZMhAB5tCiR9FHFWfRTlYlzHYHfas8Zd98MAwK2XutOVXxoL67Pbylt+INsRNwauJFSk8bTBxmnXoFx1+eZ X-Gm-Message-State: AOJu0Yz3xyFVko47FbdPMd1DvDBow3U+3UxMzdUBnWo3KKQUxx1Wu0aA EGpavLA6XETMYjO2IzOvEOd41uxmyk/rpadgGcVSr2D8ktXzv29DFs7pXSoBAqgR+ZvRdnSrQz8 48LfCZg== X-Google-Smtp-Source: AGHT+IH8sZdc0d9tNRzSN2uG5lhybBegGoq6WEWX2vIww74GkR3N/VxeT9aT7l441OV/23HQC5uuq7AsGoj5 X-Received: from irogers.svl.corp.google.com ([2620:15c:2a3:200:47d6:1de1:237a:6728]) (user=irogers job=sendgmr) by 2002:a05:690c:3386:b0:609:3844:ecdb with SMTP id fl6-20020a05690c338600b006093844ecdbmr4023284ywb.6.1709833227619; Thu, 07 Mar 2024 09:40:27 -0800 (PST) Date: Thu, 7 Mar 2024 09:39:51 -0800 In-Reply-To: <20240307173955.3982040-1-irogers@google.com> Message-Id: <20240307173955.3982040-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: <20240307173955.3982040-1-irogers@google.com> X-Mailer: git-send-email 2.44.0.278.ge034bb2e1d-goog Subject: [PATCH v2 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 Tue Dec 23 10:51:32 2025 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 7F381130E24 for ; Thu, 7 Mar 2024 17:40:30 +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=1709833233; cv=none; b=Tp1eO1Zhfkf4M2Haf+6rvH4GiC6/ScL+L+RNTDxCjYAtS5bkWAITuxV1Stcc6C5hvey2rHWYfSx7QidYBe8B1YAZQcwXHQf3BeAYirb8+wYlkMHqfyKwlX0INaPEsNVRJSEBn0x6DniEwGtkkZ5WjPNzM+9yRMtPTipOURspOQQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1709833233; c=relaxed/simple; bh=FRTaxqQ9z0fdBOTvorH6lKFlBCFvX2RUJshMGjEelbw=; h=Date:In-Reply-To:Message-Id:Mime-Version:References:Subject:From: To:Content-Type; b=FhOvW6gvBB1xNc3XehDjwn0XeuouSqyOSmFFQmoMtaSIHULXLm5cDWYTWdY6RtCZc/mJKIfBavNXziCDOEV785TgiD4jQatS9fTNm3hM7Q1vRbx5vu8vtgNifT4dASWTnMMBXPnyFf6U/juhUxMh1HsiujS+zZMI2lB2UqanLcE= 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=tykL8nx3; 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="tykL8nx3" Received: by mail-yw1-f201.google.com with SMTP id 00721157ae682-608e4171382so18079307b3.3 for ; Thu, 07 Mar 2024 09:40:30 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1709833230; x=1710438030; 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=GMafHwnxZN4CIEYFiJO7IENRNxeo2KK0p3Rv7PcNfpc=; b=tykL8nx3Lxmlbhg/ZCcq5S1PjFn+xnzTOXsN60VZEC9SuTp5pVRQNfLi6hT60+W+u+ Qoa39y4717dnKRSLIieopMSabY8/VcAmEu1V+RCX0v+rI5Mcd5o/wy8VrycR0ct1ST9/ 9S0pJhhnKjMh3tlWPPzDYs3uujPnThhlTUYjweLGmNI992lh5AWgagOh6/CtNfivkcvl l7YjTe85okN32csOLud2/XOIpLQeH8/s30T7aUkx06aU+L0tEBskYWtmM4kTijPCESc1 boIXM8cBgjpxzf+SzWnSlZ0ZsSxj+jOVz4theRY7TwdfvWQodQ2enq2T6SYoab+QGONE c/xA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1709833230; x=1710438030; 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=GMafHwnxZN4CIEYFiJO7IENRNxeo2KK0p3Rv7PcNfpc=; b=JrIJT3QN0jTHt18eHNUrnlHPYrmGnaxaNQNkR72xKe1h6w6Ke4QTPToqIq5FtjEcLL qP5UudnnUuO+MYX/j04h8/YivyaWhPHBJKDAvvffb9akgkMqagXcGkPelZm3pfeYdEyO hh63IcJXYd4bbSKfoTqZp9ahGGsb3DwXPfda3FcwXWom2sn0obCnBEGKmUJlbfwCVN22 ZVjMjho5+icv9kmHe2UNtk12nQbnELr1HrQt05JY8mXagSvRG2u6iV0FkiqGkQwhwupm SJuhr31zxce3NG72u2yf7kowUOc1KeF2Fhkx3M8t7L9Y2GrEaapDm2O+a+mvpacf99YV jw4w== X-Forwarded-Encrypted: i=1; AJvYcCX13hy22mR0IiF02Py3jL4/wdlN6BEAvYJ5YOz/V+ABpb9PvxjMnrLE9b22aCLO/jdRB7fzMIkCydnwAZM9eFGLyNxBwTlh9uwpwNnL X-Gm-Message-State: AOJu0Yz7qgSCqA5jS+LBbV+k9OHwmTK7lZNNGyaDCv7N89iqNvX+cvag bN+RGR6z5/n+3I9oOPMEs4iRspikSO3MxKxYgLZuJuoHqwM3hTkt+vc+Z08xJlyBE+k7ogpGTuY QjALOqg== X-Google-Smtp-Source: AGHT+IFsavMJluR8mAKN+8BZP435zJgd3jnYIlb4VLH0oAUuObBtrUSpcNLiEJF/6LxQU5VIFDyxCLzLZ+XX X-Received: from irogers.svl.corp.google.com ([2620:15c:2a3:200:47d6:1de1:237a:6728]) (user=irogers job=sendgmr) by 2002:a81:9945:0:b0:609:781f:a7ab with SMTP id q66-20020a819945000000b00609781fa7abmr4000841ywg.1.1709833229919; Thu, 07 Mar 2024 09:40:29 -0800 (PST) Date: Thu, 7 Mar 2024 09:39:52 -0800 In-Reply-To: <20240307173955.3982040-1-irogers@google.com> Message-Id: <20240307173955.3982040-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: <20240307173955.3982040-1-irogers@google.com> X-Mailer: git-send-email 2.44.0.278.ge034bb2e1d-goog Subject: [PATCH v2 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 a block 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 Tue Dec 23 10:51:32 2025 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 5A3F7130E29 for ; Thu, 7 Mar 2024 17:40:33 +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=1709833235; cv=none; b=Tlp0l6qbfE63yU4rGpNK2dpMDRiw2qksT7zZU2Q5p27Awa70Qo+Z2EshxfbM49ji1nK4ygeziHf5+nMPw1GVJF5602km70FEt6VEpuq95hF2t2zHGyFsQN3ysRMtcVPbwlD/U5u+kC9rRxbf1SykmcQhuIXBs+JZUMerp2Ix9rg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1709833235; c=relaxed/simple; bh=rmbRKlb2vBzSHZMNaT8weYEcJ5jh/TsECzXwG5zHVJI=; h=Date:In-Reply-To:Message-Id:Mime-Version:References:Subject:From: To:Content-Type; b=H5dOXY6px99aF55PzHAiYSkzSqNrPphhtOmhY0M2/9de21M5HM49RxWrkpur3MCnGWSX/J9AJ3LLVvhYNIv0booBarMvCmdZOa54EdjYDyjj6nuG2DQAnVqNOJGkpcYlZ9NsjukwtdxssRiOzMtMhhbfu+nM6YsPlPOXFb8jGsk= 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=J2DiKUDM; 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="J2DiKUDM" Received: by mail-yw1-f201.google.com with SMTP id 00721157ae682-608e88ca078so17127787b3.1 for ; Thu, 07 Mar 2024 09:40:33 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1709833232; x=1710438032; 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=6mfNvkJfntBmtMbV7xiy0gPZgImuCiMELZ3US+yokug=; b=J2DiKUDMJA0XOx1rPCEwBZS8+fZkmfpdETjgMzF5N32YGNy0k1fK4a/1p2Q1/bEWQ7 GMc3NJG84cS9cRIPcouOZwsWgX5vMOnbMQfiLY/QSyICC4vqzi6psnGvUS++ANfTVaSO guCM+dCvzrlvBcioV6/j7sgltMfXeUANPBGHnc5J16afYNMkL1z70+DztWlJV801ZNb7 Q5IQdU+xcd9o50geC7zdUWT4MF5xM9F+RIrhw0fVT1f9hRBr4Q8HDwIPyFXdlsoTjSp5 9G91z8/9SBDCI+AD/5kQ7skpFbQyvylEEMT1Bd6OE//imyPfbxGD6rzz0EpGpViIU+DA 41wA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1709833232; x=1710438032; 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=6mfNvkJfntBmtMbV7xiy0gPZgImuCiMELZ3US+yokug=; b=GxmiOSr74Z+W4gIzLhNF9PnuC7IKro2PvqrwNyeC9Ui5Uq5YyHHhH+PAZeqveNEKjq EAc4a9MhyFsnoayIyv7YJzSAL2WU5Uv4l5WiGo16mq5ihMOyORw0vF8IC/dlmBYJ93GA 8rBd1azYbowWo3MmlDbxyYifGQ51VlaXFspmUYjR1oUlWzMX/2YWuZZ3E15Chm1Dn3oC DBSqpBwOwyqu5x1wJAvmHCa6stCwDQ9gqO5v1YMPkdIp37toZSlwgJ5MKhq5pPwiZFHP /emCM5nCiUtjrl8cxL5YH9bXB2RKPLo+gCpMFd6gygJBkPIfzp58GobooKH8nPMxSJ9Z feQA== X-Forwarded-Encrypted: i=1; AJvYcCVZhhzhbS20ahjMfQWaKXrFi72mQVTVc2thtwUj6bXp20qwLA4FXeO1fmyil6cU/SHXMCCbMYSCAMojIwnsXVtyThAzNRWlNQNyzWQ/ X-Gm-Message-State: AOJu0YwDNwgauduQmJMRcDkWoB5T1Dj8OVI750K3pSOQneqmf6cqBY1+ dFAsLmWry1pjufMEwCrqC7MXbTazBFxpVFX+jkyEZiS4myOUyc0LhXNm24Y2GA5BdpIXR0n4Ked zqEi2vg== X-Google-Smtp-Source: AGHT+IH+HUty856X+wVJVrTL391Sb5bgQdEGw9tBYaH1uOQNAMTxZFmlE7btZ9mf2QftqdzZxCDuFG5jXKtg X-Received: from irogers.svl.corp.google.com ([2620:15c:2a3:200:47d6:1de1:237a:6728]) (user=irogers job=sendgmr) by 2002:a05:6902:1004:b0:dc2:3441:897f with SMTP id w4-20020a056902100400b00dc23441897fmr4537167ybt.6.1709833232428; Thu, 07 Mar 2024 09:40:32 -0800 (PST) Date: Thu, 7 Mar 2024 09:39:53 -0800 In-Reply-To: <20240307173955.3982040-1-irogers@google.com> Message-Id: <20240307173955.3982040-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: <20240307173955.3982040-1-irogers@google.com> X-Mailer: git-send-email 2.44.0.278.ge034bb2e1d-goog Subject: [PATCH v2 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 event descriptor] cpu/event=3D0..255,pc,edge,.../modifier [Raw event descripto= r] [(see 'man perf-list' or 'man perf-record' on how to encode it)] breakpoint//modifier [Raw event descriptor] cstate_core/event=3D0..0xffffffffffffffff/modifier [Raw event descripto= r] cstate_pkg/event=3D0..0xffffffffffffffff/modifier [Raw event descripto= r] i915/i915_eventid=3D0..0x1fffff/modifier [Raw event descripto= r] intel_bts//modifier [Raw event descriptor] intel_pt/ptw,event,cyc_thresh=3D0..15,.../modifier [Raw event descripto= r] kprobe/retprobe/modifier [Raw event descriptor] msr/event=3D0..0xffffffffffffffff/modifier [Raw event descripto= r] power/event=3D0..255/modifier [Raw event descripto= r] software//modifier [Raw event descriptor] tracepoint//modifier [Raw event descriptor] uncore_arb/event=3D0..255,edge,inv,.../modifier [Raw event descripto= r] uncore_cbox/event=3D0..255,edge,inv,.../modifier [Raw event descripto= r] uncore_clock/event=3D0..255/modifier [Raw event descripto= r] uncore_imc_free_running/event=3D0..255,umask=3D0..255/modifier[Raw event = descriptor] uprobe/ref_ctr_offset=3D0..0xffffffff,retprobe/modifier[Raw event descrip= tor] mem:[/len][:access] [Hardware breakpoint] ... ``` With '--details' provide more details on the formats encoding: ``` cpu/event=3D0..255,pc,edge,.../modifier [Raw event descripto= r] [(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 event descriptor] breakpoint//modifier cstate_core/event=3D0..0xffffffffffffffff/modifier [Raw event descripto= r] cstate_core/event=3D0..0xffffffffffffffff/modifier cstate_pkg/event=3D0..0xffffffffffffffff/modifier [Raw event descripto= r] cstate_pkg/event=3D0..0xffffffffffffffff/modifier i915/i915_eventid=3D0..0x1fffff/modifier [Raw event descripto= r] i915/i915_eventid=3D0..0x1fffff/modifier intel_bts//modifier [Raw event descriptor] intel_bts//modifier intel_pt/ptw,event,cyc_thresh=3D0..15,.../modifier [Raw event descripto= r] 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 event descriptor] kprobe/retprobe/modifier msr/event=3D0..0xffffffffffffffff/modifier [Raw event descripto= r] msr/event=3D0..0xffffffffffffffff/modifier power/event=3D0..255/modifier [Raw event descripto= r] power/event=3D0..255/modifier software//modifier [Raw event descriptor] software//modifier tracepoint//modifier [Raw event descriptor] tracepoint//modifier uncore_arb/event=3D0..255,edge,inv,.../modifier [Raw event descripto= r] uncore_arb/event=3D0..255,edge,inv,umask=3D0..255,cmask=3D0..31/mod= ifier uncore_cbox/event=3D0..255,edge,inv,.../modifier [Raw event descripto= r] uncore_cbox/event=3D0..255,edge,inv,umask=3D0..255,cmask=3D0..31/mo= difier uncore_clock/event=3D0..255/modifier [Raw event descripto= r] uncore_clock/event=3D0..255/modifier uncore_imc_free_running/event=3D0..255,umask=3D0..255/modifier[Raw event = descriptor] uncore_imc_free_running/event=3D0..255,umask=3D0..255/modifier uprobe/ref_ctr_offset=3D0..0xffffffff,retprobe/modifier[Raw event descrip= tor] uprobe/ref_ctr_offset=3D0..0xffffffff,retprobe/modifier ``` Signed-off-by: Ian Rogers --- tools/perf/util/pmu.c | 61 +++++++++++++++++++++- tools/perf/util/pmu.h | 3 ++ tools/perf/util/pmus.c | 94 ++++++++++++++++++++++++++++++++++ tools/perf/util/pmus.h | 1 + tools/perf/util/print-events.c | 20 +------- 5 files changed, 160 insertions(+), 19 deletions(-) diff --git a/tools/perf/util/pmu.c b/tools/perf/util/pmu.c index 24be587e3537..e24bc3b8f696 100644 --- a/tools/perf/util/pmu.c +++ b/tools/perf/util/pmu.c @@ -1603,6 +1603,61 @@ 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; + + /* + * max-events and driver-config are missing above as are the internal + * types user, metric-id, raw, legacy cache and hardware. Assert against + * the enum parse_events__term_type so they are kept in sync. + */ + _Static_assert(ARRAY_SIZE(terms) =3D=3D __PARSE_EVENTS__TERM_TYPE_NR - 6); + 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 +1752,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 +1782,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..2fd369e45832 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 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..3f38c27f0157 100644 --- a/tools/perf/util/print-events.c +++ b/tools/perf/util/print-events.c @@ -39,7 +39,7 @@ static const char * const event_type_descriptors[] =3D { "Software event", "Tracepoint event", "Hardware cache event", - "Raw hardware event descriptor", + "Raw event descriptor", "Hardware breakpoint", }; =20 @@ -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 Tue Dec 23 10:51:32 2025 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 2F0A6130E35 for ; Thu, 7 Mar 2024 17:40:35 +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=1709833236; cv=none; b=O216XiwJKTLFkCKKx6PuLdjiCqmLrRSqZNQBS/Mvp/WIe0FBHkriHXjb/riD7YugiDln+eg4mZmc0HdErTsapPqAiXC1PPln99NtBY2/tLZw9XldPtE90cj7+WYQU9gpNm7wtRS+8uZAO0E1NIHjD2Yf1BIrT/KYkdY7ROVQsCk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1709833236; c=relaxed/simple; bh=qRbM4J1nMnCOTtjpsDerekpdTUM2CRL3YgboxCf8VXI=; h=Date:In-Reply-To:Message-Id:Mime-Version:References:Subject:From: To:Content-Type; b=XadTKd5LQ4xPhAJAdgj95kHEECULFwE38HUK8nHM4BEDmUv2dVcaE/YseocfzLGIM3D5yFybbeh2JXA1aiBGL5UUYJ+r4AhT8VgQAEr++euGeiWx13nihe4K/gjG/PBxtUWKGufMJ47gqaDgt3alR28fLDw+hnMz2OXOju2Icyo= 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=mUHzOig9; 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="mUHzOig9" Received: by mail-yw1-f201.google.com with SMTP id 00721157ae682-609db871b90so673027b3.1 for ; Thu, 07 Mar 2024 09:40:35 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1709833234; x=1710438034; 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=WnCRzMIwEmUWcP4taw0TGh+kO0P1YkAyutoR+GaoeIk=; b=mUHzOig98qznQjWKBadckcenh3qg3aKvQVTDtj/TVY0/C4fjjSlciDtKP8P1qw6l0D aoUZZ4R3kzQdlTnxbc32Yts/30FCEeJRV4joc4KGIKXaov/E0noIR7KfR8+FVB7pcx3p Ip7v2O3ahgWvzvO5Hd8/acMn80Z1PvM0fKiXcv+hdRke2cyxR8nCP4teH1kU9oZJyd32 eDSkG6d8Aheu8RJIPuxhTOk0UZ2y8BisL/kLQHgqB4WwSMXXSRorxZaQLNppp/oK6lPi McCHTJgMmTnmhhLcm1UYIOPHWZsqlfR0OvJUYQ46R8F9Ng6JkMnHitkoSbcQUvrcE+zD CIiw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1709833234; x=1710438034; 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=WnCRzMIwEmUWcP4taw0TGh+kO0P1YkAyutoR+GaoeIk=; b=KrDkcZFPyYD5qjTxzKmudoBDOYEnZVnqWs/fhuxuKbzTI5A7UCrB7FhjE0s4mEk4j0 al4XOwg+GjPo9D2B9oHsmDRhTDON5mkVUmqm0/EvUsay6nE8u1k63UJ3Wi5xq8VEPtIi 5wAeGS/hpNKAps8mM5xg5E4P6iMKbilykaK4qs4tQ98VnGVH1hFt1bpx76Lx0RECZwO4 /57+YqivlTfNu73K+CHAd2NSmGNbiyxRSCpHJ3k20FWqTqsNit/ZB1EC1F9hTgL8WoPg xJCiCIAppBVugZbUhhUh+cQLQ9WTA4G8I6ltgavUc9iafIlp9rZ+Ly0l9PaxoXronXtu rHFA== X-Forwarded-Encrypted: i=1; AJvYcCWjBP9haO7si82IP5Kd3EcszxYBPPksYSmGBxlcg6fsrBZ8I3gFQYHPcoWLy3OulXLMwb4GPwnEjx4S6+7gqypE3GoKUX2U05bpTkg+ X-Gm-Message-State: AOJu0Yz5aQnNkx08eT+WfpW2rk5C2Y/eowWR/oRwajPmdyakpfCSdkN8 BphKO0HcGvzFJMssL1Y3sb9hDm8RNL3NA1tDKuhfPdbWvyS6vRSo6T1txdUqyw0mw63O+hLVqDl gXLjRHA== X-Google-Smtp-Source: AGHT+IEhh6Kp6uBn3S698WNWsAUPCqlRZBKy0FEY2SEfrml6jP5P0/i9mnZTMpgvkkcp7d7UPnOxJpU2jx1u X-Received: from irogers.svl.corp.google.com ([2620:15c:2a3:200:47d6:1de1:237a:6728]) (user=irogers job=sendgmr) by 2002:a25:abad:0:b0:dcb:abcc:62be with SMTP id v42-20020a25abad000000b00dcbabcc62bemr4788790ybi.6.1709833234407; Thu, 07 Mar 2024 09:40:34 -0800 (PST) Date: Thu, 7 Mar 2024 09:39:54 -0800 In-Reply-To: <20240307173955.3982040-1-irogers@google.com> Message-Id: <20240307173955.3982040-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: <20240307173955.3982040-1-irogers@google.com> X-Mailer: git-send-email 2.44.0.278.ge034bb2e1d-goog Subject: [PATCH v2 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 faults 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 Tue Dec 23 10:51:32 2025 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 4AC3A13343F for ; Thu, 7 Mar 2024 17:40:37 +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=1709833238; cv=none; b=TqISAD0EYFquEWyquSYUzeFBoaGjAjPKl2gd3dSObMoXBjc0rqkQP8NvtnaZUDOI8sChE3ej/gJjU/ohl5mVuRmwB6OdGAyiBFUM54eELKkM34gcjXts5OeELfmH8sNr/9Cj6eB+X5B4ZniKLTldYR6qJvNsRE1qbBjxUUXDiTQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1709833238; c=relaxed/simple; bh=ZLOOMl0qXMLQWjkuSZIkSXV501SW+ckp2OkDp4kJWAM=; h=Date:In-Reply-To:Message-Id:Mime-Version:References:Subject:From: To:Content-Type; b=lJvhzgK1D7U0W7UwDLh548lks2/vneVmfLsVGxAAK1EgvRcOrLzlA0jL9dEu4G7pgv1l2OcsXuRDsmpyp7w4z86y2hZCIdhw9Qq5Py3vFsNNV43xG2RHFdz3z3T6y4M0YT2lTOpyO/Swf2H8FxS2jMFh1kTE5zrHtC4dG4cSyHQ= 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=SUiNu2zr; 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="SUiNu2zr" Received: by mail-yw1-f202.google.com with SMTP id 00721157ae682-609fb151752so11511877b3.2 for ; Thu, 07 Mar 2024 09:40:37 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1709833236; x=1710438036; 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=ZigOsMfeCTwvEg61o3PR7nQedI0UAALUJDC7Nz2NQVM=; b=SUiNu2zryv+/Q1qNfFr60aOKJDr3/q5KuR1/w4Qp6z/ccIU5ce+6QRS4ugJFrQfqu5 CaK0CNyCkxvknWcYjlwQ+H8PUjyqGxqVwIsGRzQde0sCopbJSjvtT0yLLTOGmQ7q4f2l +0/L6mGwsHcxTjshxUgSRTusZaEhnGlsY6l+qCNf7qabgTpo2l6Ft49cbWwA5RlSl/bO Ms1CLVVugCxq7SgnASkXAicyX3bIX/k01LGyzTWX59kEmSg8Zqi2fzMGiKFHGKYT0D2s C1xq/Hn56HZVAXj7f2UoJbVU7Qs2QJXE1brNR6ibkBZH54DqY5MFkYq8WyEK3m38Wv4o 1TKw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1709833236; x=1710438036; 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=ZigOsMfeCTwvEg61o3PR7nQedI0UAALUJDC7Nz2NQVM=; b=ohT359LFvZ418x5dtupQ/qfrDAGO24uWND9ZK5LlOmFT4gMqM6mNp1HPtHXsto7sv9 3tfntbKYgMwcd+TMNReQcnmxnYbkFMrK1Ymul2gU8nuoS+1yCBbAV1J0AZ4fmOgn5r6c 1UFzfmuEiBteY9bAPE820tfXrMVtgL7KSlVA6wdsDpM5YwXZWDLVCXZsbR/CU8rwCiAS 6K2x4Fvb+8EBYmn1ZjyFd5CnBiMhA2TZWFu7LkNuljQz/Ewp1N17Zlbizsf9PdAB6IJ4 12+UqdV9Eqce9s7VbRZJO1vnwSasGCECNLQ7lDwezHFxQOKAsWvIODkeRlr+fNl/cI0z 3/IA== X-Forwarded-Encrypted: i=1; AJvYcCUb7+Mow/mo+BUqQvsGaW1IgfrnR7JR6+0aZp/HvN4zPbX2BqXxQDs5g01OYP7/pGUhItADiEpCTVlU4FkF+p1eHrbQ0zdjSYdt4f51 X-Gm-Message-State: AOJu0Yw9YAvjYus+FNZIIAx+gVurZyQPtuaSDnyL8f+G279tdsKiieTZ HIQlTfE0reyCwmY+sJZ/B33dkZA8ASpTPXUlpKQ8JDh3s8kEMfCaa2vIZ4HvcDVavQER2v1qG3+ jFG0aNw== X-Google-Smtp-Source: AGHT+IHgFKHoeLPEZSWiE0sw5Xu1/ZmH0sT3JOtCAUVonWb1XUC0Xo2AztyVVhS3uVUWpI48UnREqgf71zhv X-Received: from irogers.svl.corp.google.com ([2620:15c:2a3:200:47d6:1de1:237a:6728]) (user=irogers job=sendgmr) by 2002:a05:690c:c08:b0:608:b796:3d01 with SMTP id cl8-20020a05690c0c0800b00608b7963d01mr4993222ywb.10.1709833236538; Thu, 07 Mar 2024 09:40:36 -0800 (PST) Date: Thu, 7 Mar 2024 09:39:55 -0800 In-Reply-To: <20240307173955.3982040-1-irogers@google.com> Message-Id: <20240307173955.3982040-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: <20240307173955.3982040-1-irogers@google.com> X-Mailer: git-send-email 2.44.0.278.ge034bb2e1d-goog Subject: [PATCH v2 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 e24bc3b8f696..c7e0cb65a283 100644 --- a/tools/perf/util/pmu.c +++ b/tools/perf/util/pmu.c @@ -2145,3 +2145,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