From nobody Sun Feb 8 02:30:39 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 2FC211D5146 for ; Sat, 26 Oct 2024 12:18:07 +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=1729945089; cv=none; b=fiyWhCoSy+QPy+/lIkMvF9VAyaSLnN4NuZKtQ3ghlYzHQp9U8+YMBBsqA8IHd9n9DSr0kaN/C1RbW5MOA2H+EkbojBp+IzEX9RM5boisPQsZ2RovZnD3yIW7EmX9fJo7VsZHKKEqfeyncQVNOegf19MHZm5lWsmzXhPEp0rObpY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1729945089; c=relaxed/simple; bh=vZB35SPaUV/ecna2U9vXm56Rzj4+ti0U2yyXIsnH7v4=; h=Date:In-Reply-To:Message-Id:Mime-Version:References:Subject:From: To:Content-Type; b=sdDT80PgEuuqt9GFUYxOr7KaLugkkx0qwOjRnTMduT8yyCNrDJy9K/mrPNMffwmr9y56/UVHEH/U5cFMrrPESuyijHYd3qlj4FvBzbI/hGEnubOPWabs+/3D7wvoC0hWltRJdlcxbzEyKrFCl58NlTCLtVUp2d9MmwDeAj34XFY= 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=pTbgIa5h; 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="pTbgIa5h" Received: by mail-yw1-f202.google.com with SMTP id 00721157ae682-6e3d6713619so42448087b3.2 for ; Sat, 26 Oct 2024 05:18:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1729945086; x=1730549886; 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=WdNDvzlbuJZcRwH/3AdtbsrZFMtP+MFgk5KWwVeQrN0=; b=pTbgIa5hI2IAgriHGqHyJlxkOz0rUChEhig5H0wFI+JpUKXabEfmJ+5zk8C12Sh1pi Rg7las5fOC8LkWvEttwDIQ2iFQUFieExDNSsi9W9aPMnoTy23zTgNFvguPkmP5a+uYWL BiyXpltetJeuXW7hyZb8S5Jqp6srD7xQIxPWFzosmJGKAd72IWHvX6PJteDPEpyLXu9l dlrUAAbR2doiFK2tGrcfhtetpTesBUuG9gQ4YHPYMh4EwDcOk4sMJyXY5MW2AOT+8If9 uzoLTuinaZGMNd8NjBoCDrfCcQYND3Z8M+P8BfFij2ioA+0/rqtHxSlykL9A+mejQPnY w+rg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1729945086; x=1730549886; 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=WdNDvzlbuJZcRwH/3AdtbsrZFMtP+MFgk5KWwVeQrN0=; b=Y1IJYS+LaxoCYta5eTl/tcH9VmaHHgEIjHD5VIK1c7NsrYfz7KChTjrf7wAILb9mSS hjBREOB1ObDjJbr3ZtEAWf3Lskux8d34jYbnFse1BBCyCAZ6evR7v1q/oTv3pBJh9USg mT9Gt1fZGUkFLlnODhVl7FGJPu7BYb+Vjae9Ww/iss6v/G60raS1NJSpySNgQnycAS2O fXEjXEWTzhHxlqa1sbDFVrmlx/TMJawY+mZwXEh4fb71bLT1Nl6q4eLe/0IOJ42noEkm KyKURCSgv0G/Ww2Io7HmFZ8ox3DZiLSnn5HieRHD/c0ZwI+Afz8xCGeq3ckzOhiUosva sROg== X-Forwarded-Encrypted: i=1; AJvYcCXOOaPylY3NakKFqqrsVuURndBeaN9jkOfHIfKzRGrAUBgKiIphqb+EtqLCJQxqpj87SiC5iVfkI6Dwpho=@vger.kernel.org X-Gm-Message-State: AOJu0YxJl6sOD/5EiJ60N7SEJCUCLybGFKMu4lkFLJWWGoYQnBw0AdxT O4R1jhDYG9Wa2dpSmnSiYMx8shvWKthiFKwtDfuMY7Dp0MtQzJex8R6Sj29Y6/CzWCV7esNRX8J RQEK/6w== X-Google-Smtp-Source: AGHT+IFOl40mvdVs5SQR71bN1+vwfDx/yPB8F4Q/dtZHVs4/wMyo+J/RvfVAtx7pjhDNaEO8viHyeAKpEpqm X-Received: from irogers.svl.corp.google.com ([2620:15c:2c5:11:4bc4:f7cc:83b4:dece]) (user=irogers job=sendgmr) by 2002:a05:690c:6ac6:b0:6e3:2f0b:b595 with SMTP id 00721157ae682-6e9d8b171afmr600867b3.5.1729945086125; Sat, 26 Oct 2024 05:18:06 -0700 (PDT) Date: Sat, 26 Oct 2024 05:17:55 -0700 In-Reply-To: <20241026121758.143259-1-irogers@google.com> Message-Id: <20241026121758.143259-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: <20241026121758.143259-1-irogers@google.com> X-Mailer: git-send-email 2.47.0.163.g1226f6d8fa-goog Subject: [PATCH v1 1/4] perf evsel: Add pmu_name helper From: Ian Rogers To: Atish Patra , linux-riscv@lists.infradead.org, beeman@rivosinc.com, Peter Zijlstra , Ingo Molnar , Arnaldo Carvalho de Melo , Namhyung Kim , Mark Rutland , Alexander Shishkin , Jiri Olsa , Ian Rogers , Adrian Hunter , Kan Liang , James Clark , Ze Gao , Weilin Wang , Ben Gainey , Dominique Martinet , Junhao He , linux-perf-users@vger.kernel.org, linux-kernel@vger.kernel.org Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Add helper to get the name of the evsel's PMU. This handles the case where there's no sysfs PMU via parse_events event_type helper. Signed-off-by: Ian Rogers Tested-by: Atish Patra --- tools/perf/util/evsel.c | 10 ++++++++++ tools/perf/util/evsel.h | 1 + 2 files changed, 11 insertions(+) diff --git a/tools/perf/util/evsel.c b/tools/perf/util/evsel.c index f780e30aa259..87ed417df133 100644 --- a/tools/perf/util/evsel.c +++ b/tools/perf/util/evsel.c @@ -236,6 +236,16 @@ int evsel__object_config(size_t object_size, int (*ini= t)(struct evsel *evsel), return 0; } =20 +const char *evsel__pmu_name(const struct evsel *evsel) +{ + struct perf_pmu *pmu =3D evsel__find_pmu(evsel); + + if (pmu) + return pmu->name; + + return event_type(evsel->core.attr.type); +} + #define FD(e, x, y) (*(int *)xyarray__entry(e->core.fd, x, y)) =20 int __evsel__sample_size(u64 sample_type) diff --git a/tools/perf/util/evsel.h b/tools/perf/util/evsel.h index 04934a7af174..5774a9d4d725 100644 --- a/tools/perf/util/evsel.h +++ b/tools/perf/util/evsel.h @@ -232,6 +232,7 @@ int evsel__object_config(size_t object_size, void (*fini)(struct evsel *evsel)); =20 struct perf_pmu *evsel__find_pmu(const struct evsel *evsel); +const char *evsel__pmu_name(const struct evsel *evsel); bool evsel__is_aux_event(const struct evsel *evsel); =20 struct evsel *evsel__new_idx(struct perf_event_attr *attr, int idx); --=20 2.47.0.163.g1226f6d8fa-goog From nobody Sun Feb 8 02:30:39 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 762B81D61AC for ; Sat, 26 Oct 2024 12:18:10 +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=1729945092; cv=none; b=U/q0j1VxBOmzGv8JTLovnBSeShwQzMl6UJtlfWblgkFt368OCdyTu/VHqkdyMEpmSJYvTtN66J9N/DdW1ZCvRjh7kKWkggRH+m+hxm6LZGiEq1t5y0Su0ebMmPK9AkWvxHmiIkb2oE6SPFBOYVJeVhmK6rEHlnI9mI3mZ6zZ5gc= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1729945092; c=relaxed/simple; bh=QMbvqc11c1t3yQ/Xre0ZQBICf4/YYduHNNtc/69A+Xg=; h=Date:In-Reply-To:Message-Id:Mime-Version:References:Subject:From: To:Content-Type; b=SW+coDKge7LStYo2TY/P4SsDPinbm9iXrTKo/r2B+JMzbox/TaG6w79mV6qN1gUTKSpf81YazdxXyrjNpKUF8AkKkLCfLavexCPlIi+ig2FAhc8koUr1Jb1BTGmnls8d89IN3xOwcQXfI2vFnskK0ImWri679HYgR87FSknH5IM= 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=yNg5EHSZ; 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="yNg5EHSZ" Received: by mail-yw1-f201.google.com with SMTP id 00721157ae682-6e389169f92so53897027b3.0 for ; Sat, 26 Oct 2024 05:18:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1729945089; x=1730549889; 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=7F7PVEl1yMjHz9vox0k4Hp07MzhtEZCh12BPQyxhhQY=; b=yNg5EHSZZCJjhB7Ff/ZK2sqDzcGIxQMNs9d6ONBIG0e2Tg2fd07oMw0E+JYGSJ4dz+ fZ0I0IAagRgqA5cToMBngKzfODYFS1aJALnoHOvr1Bih7rd3nDnUbu4x8N3ZnwjL5dhd 89nkSWgQKFHe5UOoXLx97wZTRrw9UT5161N2aLkEyAH+t6AcQm8cxvWsgOPk322XLI5U FdNUHwzPBua9e3t27V3QKTrCH9ZkAVE/GFBA0sa0wr9ortr86Cosb4vTPvsKwGv59csa lwtmh9TBOF7AGpAMmvjYSK1Zc2MxTGggSIq07QPQKdmH9jmV7twxOV+5CUhPt3vv1okB Ghyg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1729945089; x=1730549889; 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=7F7PVEl1yMjHz9vox0k4Hp07MzhtEZCh12BPQyxhhQY=; b=OBNUymqHHVnZu6FlqBQsnFqh3o+zIMad4J7gbMj8h2cjU8Qp5Yc9vdSBEnN5lQBFJF 9m2IU3zNKcPnq37VwFTMMKOwU9o2LEWKvshZoyE3jbecbOLvhTlqYsoa1Mp3S6m5zNkN dey6xX9FBPrNrWaph1cSK+5vGwxHr1bx71StfnuIm7VqlXr8T4hWhKJQgTEZo4SETdF+ osMgB2PAXft3Q2ENKkSVUmXD5hLTK/5V4vOWdtCAx4hGdKu0BejD1Zx0K183tLY+X3sL ZOAHQHY01IEls6n8CaASCuwlqHPIcsD+CTkkqjYCuf8b1nB7rMjxdN8S6yFSNXOhMZnW qhoA== X-Forwarded-Encrypted: i=1; AJvYcCUABjAslD73u/LWZzgiiR/vRBvFYXDOLwN3kfAj0rPZfA5C3ph9e3ix0Ek/jToIvdcekcGXLJISinWNitw=@vger.kernel.org X-Gm-Message-State: AOJu0YzVmMK3oB5i+ZoMHdBHj2W1MUPCuAeMRZyDlw+e7GfuH6ArByI1 FRGU7P37QqBRcpKxtydxBq/1Bl3uSuw939/jmMCjBzbeUTAcoteieh1SBwXdzbO2wJMimU8U8cZ qYXmy4Q== X-Google-Smtp-Source: AGHT+IGokN+iNYXdGTM/m8jAXY+rBHKDjwssa4ELvzrrAB/oAfWnGPy244qe6dALscEwgMiTq4roYYY/2wDq X-Received: from irogers.svl.corp.google.com ([2620:15c:2c5:11:4bc4:f7cc:83b4:dece]) (user=irogers job=sendgmr) by 2002:a05:690c:3607:b0:68d:52a1:be9 with SMTP id 00721157ae682-6e9d88b0b4cmr691497b3.1.1729945088518; Sat, 26 Oct 2024 05:18:08 -0700 (PDT) Date: Sat, 26 Oct 2024 05:17:56 -0700 In-Reply-To: <20241026121758.143259-1-irogers@google.com> Message-Id: <20241026121758.143259-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: <20241026121758.143259-1-irogers@google.com> X-Mailer: git-send-email 2.47.0.163.g1226f6d8fa-goog Subject: [PATCH v1 2/4] perf stat: Fix find_stat for mixed legacy/non-legacy events From: Ian Rogers To: Atish Patra , linux-riscv@lists.infradead.org, beeman@rivosinc.com, Peter Zijlstra , Ingo Molnar , Arnaldo Carvalho de Melo , Namhyung Kim , Mark Rutland , Alexander Shishkin , Jiri Olsa , Ian Rogers , Adrian Hunter , Kan Liang , James Clark , Ze Gao , Weilin Wang , Ben Gainey , Dominique Martinet , Junhao He , linux-perf-users@vger.kernel.org, linux-kernel@vger.kernel.org Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Legacy events typically don't have a PMU when added leading to mismatched legacy/non-legacy cases in find_stat. Use evsel__find_pmu to make sure the evsel PMU is looked up. Update the evsel__find_pmu code to look for the PMU using the extended config type or, for legacy hardware/hw_cache events on non-hybrid systems, just use the core PMU. Before: ``` $ perf stat -e cycles,cpu/instructions/ -a sleep 1 Performance counter stats for 'system wide': 215,309,764 cycles 44,326,491 cpu/instructions/ 1.002555314 seconds time elapsed ``` After: ``` $ perf stat -e cycles,cpu/instructions/ -a sleep 1 Performance counter stats for 'system wide': 990,676,332 cycles 1,235,762,487 cpu/instructions/ # 1.25 insn pe= r cycle 1.002667198 seconds time elapsed ``` Fixes: 3612ca8e2935 ("perf stat: Fix the hard-coded metrics calculation on the hybrid") Signed-off-by: Ian Rogers Tested-by: Atish Patra --- tools/perf/util/pmus.c | 20 +++++++++++++++++--- tools/perf/util/stat-shadow.c | 3 ++- 2 files changed, 19 insertions(+), 4 deletions(-) diff --git a/tools/perf/util/pmus.c b/tools/perf/util/pmus.c index 107de86c2637..8d8eeeb28868 100644 --- a/tools/perf/util/pmus.c +++ b/tools/perf/util/pmus.c @@ -708,11 +708,25 @@ char *perf_pmus__default_pmu_name(void) struct perf_pmu *evsel__find_pmu(const struct evsel *evsel) { struct perf_pmu *pmu =3D evsel->pmu; + bool legacy_core_type; =20 - if (!pmu) { - pmu =3D perf_pmus__find_by_type(evsel->core.attr.type); - ((struct evsel *)evsel)->pmu =3D pmu; + if (pmu) + return pmu; + + pmu =3D perf_pmus__find_by_type(evsel->core.attr.type); + legacy_core_type =3D + evsel->core.attr.type =3D=3D PERF_TYPE_HARDWARE || + evsel->core.attr.type =3D=3D PERF_TYPE_HW_CACHE; + if (!pmu && legacy_core_type) { + if (perf_pmus__supports_extended_type()) { + u32 type =3D evsel->core.attr.config >> PERF_PMU_TYPE_SHIFT; + + pmu =3D perf_pmus__find_by_type(type); + } else { + pmu =3D perf_pmus__find_core_pmu(); + } } + ((struct evsel *)evsel)->pmu =3D pmu; return pmu; } =20 diff --git a/tools/perf/util/stat-shadow.c b/tools/perf/util/stat-shadow.c index ada787947e16..f6d34e12e65c 100644 --- a/tools/perf/util/stat-shadow.c +++ b/tools/perf/util/stat-shadow.c @@ -151,6 +151,7 @@ static double find_stat(const struct evsel *evsel, int = aggr_idx, enum stat_type { struct evsel *cur; int evsel_ctx =3D evsel_context(evsel); + struct perf_pmu *evsel_pmu =3D evsel__find_pmu(evsel); =20 evlist__for_each_entry(evsel->evlist, cur) { struct perf_stat_aggr *aggr; @@ -177,7 +178,7 @@ static double find_stat(const struct evsel *evsel, int = aggr_idx, enum stat_type * Except the SW CLOCK events, * ignore if not the PMU we're looking for. */ - if ((type !=3D STAT_NSECS) && (evsel->pmu !=3D cur->pmu)) + if ((type !=3D STAT_NSECS) && (evsel_pmu !=3D evsel__find_pmu(cur))) continue; =20 aggr =3D &cur->stats->aggr[aggr_idx]; --=20 2.47.0.163.g1226f6d8fa-goog From nobody Sun Feb 8 02:30:39 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 C53221D63F7 for ; Sat, 26 Oct 2024 12:18:12 +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=1729945095; cv=none; b=o0Tc5Whgkec4SbzsJzWev+jkW7A0wFNQV0ZSgr4mkRx8ivODB/8+7fcGzTf5cFarZzooHRLiz8TjTg9O4WVkgY4ATuBXlxjgnseh60XYyVvAwRoQAdI/oQHbj7Sri4y1XEQPraFgrU814S1TIP895WUQjwwwohm7OtidvqZMuXs= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1729945095; c=relaxed/simple; bh=XP9mEzAtZ8d2CSIQWX5Go/SHsDroib7XQqauoGKr8OU=; h=Date:In-Reply-To:Message-Id:Mime-Version:References:Subject:From: To:Content-Type; b=tjgURy3lJSL+VBpDpY3nsqJ86uxKDAxGwsVvwuaKiV6kJTn1VXGQAKFSWfP2dRSYZYs2S41Pq0gzD9MdFYsg8/dAex42eMEdimZP8NyI9JcNNBWQeCksS3+Tp+kXyt40vw/Ygr/H+RqILEXED7OY2z0SDOz4Y1/WVH9WxyIBdS0= 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=UN1zBTtx; 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="UN1zBTtx" Received: by mail-yw1-f202.google.com with SMTP id 00721157ae682-6e35a643200so54251187b3.0 for ; Sat, 26 Oct 2024 05:18:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1729945092; x=1730549892; 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=u2vjrGB7qYjjtCMVzRupcGHYUQ0/euLShZj24B3CAVY=; b=UN1zBTtxMuAndSSYb5pZ0L+X0/BdR7yfFw9VE4fyFJPzOfPyWMu9zmmfYMyMR3vzb+ +j6vQXOtPncWcDByB2OklC+ncpYF+oY8EfJXfKw+v5Vv9nZtRU6RgNz0zdWdvyA3lPKB idLdUBAo/2IgpWi0bILMnf5uAT400+sBnHnwsD2GwAbDACVLPX+xQYOlO0qkULgv2rGU n1qkKVx1gzDanLBLGlh7b8rLzcda4zSd6JVASNKQhF+o171cV9Z7iT3OxkrdVsbveGtf JaM5PxigiJQNba6smDUSFyAde5bPIPJh7rQTEi1WUSDCEIL25hf5Cjm34zNsk9kD6XqS JvOA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1729945092; x=1730549892; 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=u2vjrGB7qYjjtCMVzRupcGHYUQ0/euLShZj24B3CAVY=; b=I+qjuW1OLXcy+bHdv6VtWxfrflCAcSn6KgRhKLc7Pgo97wkq1dIx5DJTwJERKwuo8Y 4jXjLCkWSxyDH6azyZd6WxCMaoFnh5jDTtdAsAIwj7l5beX+HVD6McWMZFXCG+6mCfgZ IFMpiKwKwzT6kFjMzkkysRt+OQBC6BrN5CNhTqMHojRpcZRRaXrDqxuqERPhA6pOrkcp WBLV4YawZ24cJ3UmLBB5WlgadS81KpDZk+7WaEdJYheGldLpjbIuuAxPXiz1/40RXbri 4Pn/xtM5+GiLfoKN5MG4D5wJWHmW4jB9A1YQpXLYxOoX+nSY1jwaUCdws3C2IL4IrXmO IsyA== X-Forwarded-Encrypted: i=1; AJvYcCVvIMZPD5FJcIdHKoKAvD/vv+uaY04TpLr+MsuxFKxCCGW2fu3jxBLF+gQtnN8z9fRnKpVXiA82TxNMAak=@vger.kernel.org X-Gm-Message-State: AOJu0YzJVpyyZ4lzw1h9PZ6jHnMzbBECQAWi/NXy0YsDJC729qi/jHsu Uvd15vPEM6IMiI5xnJStgzuL0KM+iRpDtKnTveJxYsNDbDISCbucfjRUYbuGYl44L93Jzqd9Y+4 eDGUBTA== X-Google-Smtp-Source: AGHT+IEsM/AxBcDGQflFJCepomQhbOJ8k6jWS/Dg9HzPpOvx9YedrkWoKAs2MTNM86jX3dIc4CLHW5uZhQ5E X-Received: from irogers.svl.corp.google.com ([2620:15c:2c5:11:4bc4:f7cc:83b4:dece]) (user=irogers job=sendgmr) by 2002:a25:aa04:0:b0:e28:8f62:e735 with SMTP id 3f1490d57ef6-e3087854604mr1606276.1.1729945091637; Sat, 26 Oct 2024 05:18:11 -0700 (PDT) Date: Sat, 26 Oct 2024 05:17:57 -0700 In-Reply-To: <20241026121758.143259-1-irogers@google.com> Message-Id: <20241026121758.143259-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: <20241026121758.143259-1-irogers@google.com> X-Mailer: git-send-email 2.47.0.163.g1226f6d8fa-goog Subject: [PATCH v1 3/4] perf record: Skip don't fail for events that don't open From: Ian Rogers To: Atish Patra , linux-riscv@lists.infradead.org, beeman@rivosinc.com, Peter Zijlstra , Ingo Molnar , Arnaldo Carvalho de Melo , Namhyung Kim , Mark Rutland , Alexander Shishkin , Jiri Olsa , Ian Rogers , Adrian Hunter , Kan Liang , James Clark , Ze Gao , Weilin Wang , Ben Gainey , Dominique Martinet , Junhao He , linux-perf-users@vger.kernel.org, linux-kernel@vger.kernel.org Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Whilst for many tools it is an expected behavior that failure to open a perf event is a failure, ARM decided to name PMU events the same as legacy events and then failed to rename such events on a server uncore SLC PMU. As perf's default behavior when no PMU is specified is to open the event on all PMUs that advertise/"have" the event, this yielded failures when trying to make the priority of legacy and sysfs/json events uniform - something requested by RISC-V and ARM. A legacy event user on ARM hardware may find their event opened on an uncore PMU which for perf record will fail. Arnaldo suggested skipping such events which this patch implements. Rather than have the skipping conditional on running on ARM, the skipping is done on all architectures as such a fundamental behavioral difference could lead to problems with tools built/depending on perf. An example of perf record failing to open events on x86 is: ``` $ perf record -e data_read,cycles,LLC-prefetch-read -a sleep 0.1 Error: Failure to open event 'data_read' on PMU 'uncore_imc_free_running_0' which = will be removed. The sys_perf_event_open() syscall returned with 22 (Invalid argument) for e= vent (data_read). "dmesg | grep -i perf" may provide additional information. Error: Failure to open event 'data_read' on PMU 'uncore_imc_free_running_1' which = will be removed. The sys_perf_event_open() syscall returned with 22 (Invalid argument) for e= vent (data_read). "dmesg | grep -i perf" may provide additional information. Error: Failure to open event 'LLC-prefetch-read' on PMU 'cpu' which will be remove= d. The LLC-prefetch-read event is not supported. [ perf record: Woken up 1 times to write data ] [ perf record: Captured and wrote 2.188 MB perf.data (87 samples) ] $ perf report --stats Aggregated stats: TOTAL events: 17255 MMAP events: 284 ( 1.6%) COMM events: 1961 (11.4%) EXIT events: 1 ( 0.0%) FORK events: 1960 (11.4%) SAMPLE events: 87 ( 0.5%) MMAP2 events: 12836 (74.4%) KSYMBOL events: 83 ( 0.5%) BPF_EVENT events: 36 ( 0.2%) FINISHED_ROUND events: 2 ( 0.0%) ID_INDEX events: 1 ( 0.0%) THREAD_MAP events: 1 ( 0.0%) CPU_MAP events: 1 ( 0.0%) TIME_CONV events: 1 ( 0.0%) FINISHED_INIT events: 1 ( 0.0%) cycles stats: SAMPLE events: 87 ``` Note, if all events fail to open then the data file will contain no samples. This is deliberate as at the point the events are opened there are other events, such as the dummy event for sideband data, and these events will succeed in opening even if the user specified ones don't. Having a mix of open and broken events leads to a problem of identifying different sources of events. The issue with legacy events is that on RISC-V they want the driver to not have mappings from legacy to non-legacy config encodings for each vendor/model due to size, complexity and difficulty to update. It was reported that on ARM Apple-M? CPUs the legacy mapping in the driver was broken and the sysfs/json events should always take precedent, however, it isn't clear this is still the case. It is the case that without working around this issue a legacy event like cycles without a PMU can encode differently than when specified with a PMU - the non-PMU version favoring legacy encodings, the PMU one avoiding legacy encodings. The patch removes events and then adjusts the idx value for each evsel. This is done so that the dense xyarrays used for file descriptors, etc. don't contain broken entries. As event opening happens relatively late in the record process, use of the idx value before the open will have become corrupted, so it is expected there are latent bugs hidden behind this change - the change is best effort. As the only vendor that has broken event names is ARM, this will principally effect ARM users. They will also experience warning messages like those above because of the uncore PMU advertising legacy event names. Suggested-by: Arnaldo Carvalho de Melo Signed-off-by: Ian Rogers Tested-by: Atish Patra Tested-by: James Clark Tested-by: Leo Yan --- tools/perf/builtin-record.c | 22 +++++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-) diff --git a/tools/perf/builtin-record.c b/tools/perf/builtin-record.c index f83252472921..7e99743f7e42 100644 --- a/tools/perf/builtin-record.c +++ b/tools/perf/builtin-record.c @@ -1364,6 +1364,7 @@ static int record__open(struct record *rec) struct perf_session *session =3D rec->session; struct record_opts *opts =3D &rec->opts; int rc =3D 0; + bool skipped =3D false; =20 evlist__for_each_entry(evlist, pos) { try_again: @@ -1379,15 +1380,26 @@ static int record__open(struct record *rec) pos =3D evlist__reset_weak_group(evlist, pos, true); goto try_again; } - rc =3D -errno; evsel__open_strerror(pos, &opts->target, errno, msg, sizeof(msg)); - ui__error("%s\n", msg); - goto out; + ui__error("Failure to open event '%s' on PMU '%s' which will be removed= .\n%s\n", + evsel__name(pos), evsel__pmu_name(pos), msg); + pos->skippable =3D true; + skipped =3D true; + } else { + pos->supported =3D true; } - - pos->supported =3D true; } =20 + if (skipped) { + struct evsel *tmp; + int idx =3D 0; + + evlist__for_each_entry_safe(evlist, tmp, pos) { + if (pos->skippable) + evlist__remove(evlist, pos); + pos->core.idx =3D idx++; + } + } if (symbol_conf.kptr_restrict && !evlist__exclude_kernel(evlist)) { pr_warning( "WARNING: Kernel address maps (/proc/{kallsyms,modules}) are restricted,\n" --=20 2.47.0.163.g1226f6d8fa-goog From nobody Sun Feb 8 02:30:39 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 311571D79B8 for ; Sat, 26 Oct 2024 12:18:15 +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=1729945099; cv=none; b=Rg2xt0TvYOEBIieydkvlM3vjhZExR+T3YI3S7r/DPnraH15iexnOY4xsfkwG6sk9H/8erZ3p420DUEpJSuhSGQ43QMTf6cwiFuX+yU0/FQxUpxBOuLNvC0cWQ3DmV3POYDoH8EM38VowiYODWVLAaARiTnA1DkyfD5hJmxHYP3I= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1729945099; c=relaxed/simple; bh=DPIndwk3RQQEXM4gFMbGGoLEJaNcXWLEvzX2V8KLPrA=; h=Date:In-Reply-To:Message-Id:Mime-Version:References:Subject:From: To:Cc:Content-Type; b=G5MwqxGfjKxjYFY8GnP2LHEvHWBRiha0vuBFtTc+KkZRjzMO4cfN23qjbXoz765TCAwohWMIO29Vzsmc0kkLVnlyS5rltRvl5NImPP1I73nChigsCQbFRAU5wU8kdrlJ8k/SWoXJlmWN0v9u+sPNzA9DWOXpWzLDX4qPX8jSmLM= 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=qFS1Dy3s; 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="qFS1Dy3s" Received: by mail-yw1-f202.google.com with SMTP id 00721157ae682-6e35199eb2bso61099587b3.3 for ; Sat, 26 Oct 2024 05:18:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1729945094; x=1730549894; darn=vger.kernel.org; h=cc:to:from:subject:references:mime-version:message-id:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=8ftEzJasNCcJeexyNkoSNB0nrv0LAFiVNEIp4ZCHsL8=; b=qFS1Dy3ssViQJ8Fg+fnOO4c7ARgEyiqB87CqaGggUDFS0hPeQlLndAo6u22LKqL9gE UlEvK8d6mOKcEkG9amv12W28dEfD0qylznw37uDV1UJ0sykGViPt7Fg2MyjZJJiPsH4T PnMW91/cvFmHA4novvGCJN7LlUn6gGWbE6QWgcJBaxZSw97quPuHIW5OiXo0/50gMwCC PHsUZZSanGcuyXgi6427U/7KT0n4Cj8JhQGjlxK0LzPNi2loh/ofuTjzi6VGzsuAgWaV i377KP+oecU95SQbQuLoTeH9w96n7V4N8Vq5xRwzJKNV+FwcXHatPsQEFqbxSaRX+jsG gIqg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1729945094; x=1730549894; h=cc: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=8ftEzJasNCcJeexyNkoSNB0nrv0LAFiVNEIp4ZCHsL8=; b=oNB/hxuMuI59MiD2tFvSXEJRv5vyDkLHHsnRLfMA2+XYyRODrCsuiEqdilIaeBO/jf 1hNmVd7OG2XM9S6CufDhbSZjNl2DRyMtFkFIh5FG396laMNPLUaWxjjQiv9y1AVolLED dRC492EON9hUsEb7htb5Y5csKF6aIl5Z3LQe2O45WS/eYcAxpzCCQc3GNDpWt62dGqBx 4j9/Ghhjmq8PHkOsJmQbkg6/Ytz9d11hKfU32O+fdTH+B32SkhtkmOOSq6/+DwWCl5jT dEWiq0vpNFB8+A2b7KSFohdvV5q6UpGkguk+qS0Ktq/9NrvachJGEeXfK1Dpy9bzB5XG f05g== X-Forwarded-Encrypted: i=1; AJvYcCXBoL07HFJ49lIhusWtyNwABS9jc1wXs4mi/rX8FNZZqRxkjacJpI3trDsUSwP1AoUygOo8qwScrsSiLis=@vger.kernel.org X-Gm-Message-State: AOJu0YyS8ESlp2yd+TgakTYFKOZtiLBE1GjvKCnPqJMc+waxu04UlFka 44IaAkQt06W5kcXEvGJTjK3GcRdxjmasKc9SEhWdWbc1Nm8HVKsXgM4pdN22SEQirL8aEkwv1Qp KaLWBvQ== X-Google-Smtp-Source: AGHT+IHmk4Q/fZtmN2eUzccfLQakc3cAXpk/ynFpwayBUM5Y5EEsq3lkcnBI6nYhMBXQ3rLpM35yhZFd6bmv X-Received: from irogers.svl.corp.google.com ([2620:15c:2c5:11:4bc4:f7cc:83b4:dece]) (user=irogers job=sendgmr) by 2002:a05:6902:4ca:b0:e2e:4391:67cc with SMTP id 3f1490d57ef6-e3087a65968mr8121276.4.1729945093900; Sat, 26 Oct 2024 05:18:13 -0700 (PDT) Date: Sat, 26 Oct 2024 05:17:58 -0700 In-Reply-To: <20241026121758.143259-1-irogers@google.com> Message-Id: <20241026121758.143259-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: <20241026121758.143259-1-irogers@google.com> X-Mailer: git-send-email 2.47.0.163.g1226f6d8fa-goog Subject: [PATCH v1 4/4] perf parse-events: Reapply "Prefer sysfs/JSON hardware events over legacy" From: Ian Rogers To: Atish Patra , linux-riscv@lists.infradead.org, beeman@rivosinc.com, Peter Zijlstra , Ingo Molnar , Arnaldo Carvalho de Melo , Namhyung Kim , Mark Rutland , Alexander Shishkin , Jiri Olsa , Ian Rogers , Adrian Hunter , Kan Liang , James Clark , Ze Gao , Weilin Wang , Ben Gainey , Dominique Martinet , Junhao He , linux-perf-users@vger.kernel.org, linux-kernel@vger.kernel.org Cc: James Clark , Arnaldo Carvalho de Melo Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Originally posted and merged from: https://lore.kernel.org/r/20240416061533.921723-10-irogers@google.com This reverts commit 4f1b067359ac8364cdb7f9fda41085fa85789d0f although the patch is now smaller due to related fixes being applied in commit 22a4db3c3603 ("perf evsel: Add alternate_hw_config and use in evsel__match"). The original commit message was: It was requested that RISC-V be able to add events to the perf tool so the PMU driver didn't need to map legacy events to config encodings: https://lore.kernel.org/lkml/20240217005738.3744121-1-atishp@rivosinc.com/ This change makes the priority of events specified without a PMU the same as those specified with a PMU, namely sysfs and JSON events are checked first before using the legacy encoding. The hw_term is made more generic as a hardware_event that encodes a pair of string and int value, allowing parse_events_multi_pmu_add to fall back on a known encoding when the sysfs/JSON adding fails for core events. As this covers PE_VALUE_SYM_HW, that token is removed and related code simplified. Signed-off-by: Ian Rogers Reviewed-by: Kan Liang Tested-by: Atish Patra Cc: Adrian Hunter Cc: Alexander Shishkin Cc: Beeman Strong Cc: Ingo Molnar Cc: James Clark Cc: Jiri Olsa Cc: Mark Rutland Cc: Namhyung Kim Cc: Peter Zijlstra Signed-off-by: Arnaldo Carvalho de Melo --- tools/perf/util/parse-events.c | 26 +++++++++--- tools/perf/util/parse-events.l | 76 +++++++++++++++++----------------- tools/perf/util/parse-events.y | 60 ++++++++++++++++++--------- 3 files changed, 98 insertions(+), 64 deletions(-) diff --git a/tools/perf/util/parse-events.c b/tools/perf/util/parse-events.c index afeb8d815bbf..fd33e2b4860b 100644 --- a/tools/perf/util/parse-events.c +++ b/tools/perf/util/parse-events.c @@ -1549,8 +1549,8 @@ int parse_events_multi_pmu_add(struct parse_events_st= ate *parse_state, struct list_head *list =3D NULL; struct perf_pmu *pmu =3D NULL; YYLTYPE *loc =3D loc_; - int ok =3D 0; - const char *config; + int ok =3D 0, core_ok =3D 0; + const char *tmp; struct parse_events_terms parsed_terms; =20 *listp =3D NULL; @@ -1563,15 +1563,15 @@ int parse_events_multi_pmu_add(struct parse_events_= state *parse_state, return ret; } =20 - config =3D strdup(event_name); - if (!config) + tmp =3D strdup(event_name); + if (!tmp) goto out_err; =20 if (parse_events_term__num(&term, PARSE_EVENTS__TERM_TYPE_USER, - config, /*num=3D*/1, /*novalue=3D*/true, + tmp, /*num=3D*/1, /*novalue=3D*/true, loc, /*loc_val=3D*/NULL) < 0) { - zfree(&config); + zfree(&tmp); goto out_err; } list_add_tail(&term->list, &parsed_terms.terms); @@ -1602,6 +1602,8 @@ int parse_events_multi_pmu_add(struct parse_events_st= ate *parse_state, pr_debug("%s -> %s/%s/\n", event_name, pmu->name, sb.buf); strbuf_release(&sb); ok++; + if (pmu->is_core) + core_ok++; } } =20 @@ -1618,6 +1620,18 @@ int parse_events_multi_pmu_add(struct parse_events_s= tate *parse_state, } } =20 + if (hw_config !=3D PERF_COUNT_HW_MAX && !core_ok) { + /* + * The event wasn't found on core PMUs but it has a hardware + * config version to try. + */ + if (!parse_events_add_numeric(parse_state, list, + PERF_TYPE_HARDWARE, hw_config, + const_parsed_terms, + /*wildcard=3D*/true)) + ok++; + } + out_err: parse_events_terms__exit(&parsed_terms); if (ok) diff --git a/tools/perf/util/parse-events.l b/tools/perf/util/parse-events.l index 14e5bd856a18..7c2641cf9b79 100644 --- a/tools/perf/util/parse-events.l +++ b/tools/perf/util/parse-events.l @@ -113,12 +113,12 @@ do { \ yyless(0); \ } while (0) =20 -static int sym(yyscan_t scanner, int type, int config) +static int sym(yyscan_t scanner, int config) { YYSTYPE *yylval =3D parse_events_get_lval(scanner); =20 - yylval->num =3D (type << 16) + config; - return type =3D=3D PERF_TYPE_HARDWARE ? PE_VALUE_SYM_HW : PE_VALUE_SYM_SW; + yylval->num =3D config; + return PE_VALUE_SYM_SW; } =20 static int term(yyscan_t scanner, enum parse_events__term_type type) @@ -129,13 +129,13 @@ static int term(yyscan_t scanner, enum parse_events__= term_type type) return PE_TERM; } =20 -static int hw_term(yyscan_t scanner, int config) +static int hw(yyscan_t scanner, int config) { YYSTYPE *yylval =3D parse_events_get_lval(scanner); char *text =3D parse_events_get_text(scanner); =20 - yylval->hardware_term.str =3D strdup(text); - yylval->hardware_term.num =3D PERF_TYPE_HARDWARE + config; + yylval->hardware_event.str =3D strdup(text); + yylval->hardware_event.num =3D config; return PE_TERM_HW; } =20 @@ -323,16 +323,16 @@ percore { return term(yyscanner, PARSE_EVENTS__TERM= _TYPE_PERCORE); } aux-output { return term(yyscanner, PARSE_EVENTS__TERM_TYPE_AUX_OUTPUT); } aux-sample-size { return term(yyscanner, PARSE_EVENTS__TERM_TYPE_AUX_SAMP= LE_SIZE); } metric-id { return term(yyscanner, PARSE_EVENTS__TERM_TYPE_METRIC_ID); } -cpu-cycles|cycles { return hw_term(yyscanner, PERF_COUNT_HW_CPU_CYCLES)= ; } -stalled-cycles-frontend|idle-cycles-frontend { return hw_term(yyscanner, P= ERF_COUNT_HW_STALLED_CYCLES_FRONTEND); } -stalled-cycles-backend|idle-cycles-backend { return hw_term(yyscanner, PER= F_COUNT_HW_STALLED_CYCLES_BACKEND); } -instructions { return hw_term(yyscanner, PERF_COUNT_HW_INSTRUCTIONS); } -cache-references { return hw_term(yyscanner, PERF_COUNT_HW_CACHE_REFERE= NCES); } -cache-misses { return hw_term(yyscanner, PERF_COUNT_HW_CACHE_MISSES); } -branch-instructions|branches { return hw_term(yyscanner, PERF_COUNT_HW_B= RANCH_INSTRUCTIONS); } -branch-misses { return hw_term(yyscanner, PERF_COUNT_HW_BRANCH_MISSES)= ; } -bus-cycles { return hw_term(yyscanner, PERF_COUNT_HW_BUS_CYCLES); } -ref-cycles { return hw_term(yyscanner, PERF_COUNT_HW_REF_CPU_CYCLES); } +cpu-cycles|cycles { return hw(yyscanner, PERF_COUNT_HW_CPU_CYCLES); } +stalled-cycles-frontend|idle-cycles-frontend { return hw(yyscanner, PERF_C= OUNT_HW_STALLED_CYCLES_FRONTEND); } +stalled-cycles-backend|idle-cycles-backend { return hw(yyscanner, PERF_COU= NT_HW_STALLED_CYCLES_BACKEND); } +instructions { return hw(yyscanner, PERF_COUNT_HW_INSTRUCTIONS); } +cache-references { return hw(yyscanner, PERF_COUNT_HW_CACHE_REFERENCES)= ; } +cache-misses { return hw(yyscanner, PERF_COUNT_HW_CACHE_MISSES); } +branch-instructions|branches { return hw(yyscanner, PERF_COUNT_HW_BRANCH= _INSTRUCTIONS); } +branch-misses { return hw(yyscanner, PERF_COUNT_HW_BRANCH_MISSES); } +bus-cycles { return hw(yyscanner, PERF_COUNT_HW_BUS_CYCLES); } +ref-cycles { return hw(yyscanner, PERF_COUNT_HW_REF_CPU_CYCLES); } r{num_raw_hex} { return str(yyscanner, PE_RAW); } r0x{num_raw_hex} { return str(yyscanner, PE_RAW); } , { return ','; } @@ -376,28 +376,28 @@ r0x{num_raw_hex} { return str(yyscanner, PE_RAW); } <> { BEGIN(INITIAL); } } =20 -cpu-cycles|cycles { return sym(yyscanner, PERF_TYPE_HARDWARE, PERF_COUN= T_HW_CPU_CYCLES); } -stalled-cycles-frontend|idle-cycles-frontend { return sym(yyscanner, PERF_= TYPE_HARDWARE, PERF_COUNT_HW_STALLED_CYCLES_FRONTEND); } -stalled-cycles-backend|idle-cycles-backend { return sym(yyscanner, PERF_TY= PE_HARDWARE, PERF_COUNT_HW_STALLED_CYCLES_BACKEND); } -instructions { return sym(yyscanner, PERF_TYPE_HARDWARE, PERF_COUNT_HW= _INSTRUCTIONS); } -cache-references { return sym(yyscanner, PERF_TYPE_HARDWARE, PERF_COUNT= _HW_CACHE_REFERENCES); } -cache-misses { return sym(yyscanner, PERF_TYPE_HARDWARE, PERF_COUNT_HW= _CACHE_MISSES); } -branch-instructions|branches { return sym(yyscanner, PERF_TYPE_HARDWARE,= PERF_COUNT_HW_BRANCH_INSTRUCTIONS); } -branch-misses { return sym(yyscanner, PERF_TYPE_HARDWARE, PERF_COUNT_H= W_BRANCH_MISSES); } -bus-cycles { return sym(yyscanner, PERF_TYPE_HARDWARE, PERF_COUNT_HW_B= US_CYCLES); } -ref-cycles { return sym(yyscanner, PERF_TYPE_HARDWARE, PERF_COUNT_HW_R= EF_CPU_CYCLES); } -cpu-clock { return sym(yyscanner, PERF_TYPE_SOFTWARE, PERF_COUNT_SW_CP= U_CLOCK); } -task-clock { return sym(yyscanner, PERF_TYPE_SOFTWARE, PERF_COUNT_SW_T= ASK_CLOCK); } -page-faults|faults { return sym(yyscanner, PERF_TYPE_SOFTWARE, PERF_COU= NT_SW_PAGE_FAULTS); } -minor-faults { return sym(yyscanner, PERF_TYPE_SOFTWARE, PERF_COUNT_SW= _PAGE_FAULTS_MIN); } -major-faults { return sym(yyscanner, PERF_TYPE_SOFTWARE, PERF_COUNT_SW= _PAGE_FAULTS_MAJ); } -context-switches|cs { return sym(yyscanner, PERF_TYPE_SOFTWARE, PERF_CO= UNT_SW_CONTEXT_SWITCHES); } -cpu-migrations|migrations { return sym(yyscanner, PERF_TYPE_SOFTWARE, PE= RF_COUNT_SW_CPU_MIGRATIONS); } -alignment-faults { return sym(yyscanner, PERF_TYPE_SOFTWARE, PERF_COUNT= _SW_ALIGNMENT_FAULTS); } -emulation-faults { return sym(yyscanner, PERF_TYPE_SOFTWARE, PERF_COUNT= _SW_EMULATION_FAULTS); } -dummy { return sym(yyscanner, PERF_TYPE_SOFTWARE, PERF_COUNT_SW_DUMMY= ); } -bpf-output { return sym(yyscanner, PERF_TYPE_SOFTWARE, PERF_COUNT_SW_B= PF_OUTPUT); } -cgroup-switches { return sym(yyscanner, PERF_TYPE_SOFTWARE, PERF_COUNT= _SW_CGROUP_SWITCHES); } +cpu-cycles|cycles { return hw(yyscanner, PERF_COUNT_HW_CPU_CYCLES); } +stalled-cycles-frontend|idle-cycles-frontend { return hw(yyscanner, PERF_C= OUNT_HW_STALLED_CYCLES_FRONTEND); } +stalled-cycles-backend|idle-cycles-backend { return hw(yyscanner, PERF_COU= NT_HW_STALLED_CYCLES_BACKEND); } +instructions { return hw(yyscanner, PERF_COUNT_HW_INSTRUCTIONS); } +cache-references { return hw(yyscanner, PERF_COUNT_HW_CACHE_REFERENCES)= ; } +cache-misses { return hw(yyscanner, PERF_COUNT_HW_CACHE_MISSES); } +branch-instructions|branches { return hw(yyscanner, PERF_COUNT_HW_BRANCH= _INSTRUCTIONS); } +branch-misses { return hw(yyscanner, PERF_COUNT_HW_BRANCH_MISSES); } +bus-cycles { return hw(yyscanner, PERF_COUNT_HW_BUS_CYCLES); } +ref-cycles { return hw(yyscanner, PERF_COUNT_HW_REF_CPU_CYCLES); } +cpu-clock { return sym(yyscanner, PERF_COUNT_SW_CPU_CLOCK); } +task-clock { return sym(yyscanner, PERF_COUNT_SW_TASK_CLOCK); } +page-faults|faults { return sym(yyscanner, PERF_COUNT_SW_PAGE_FAULTS); } +minor-faults { return sym(yyscanner, PERF_COUNT_SW_PAGE_FAULTS_MIN); } +major-faults { return sym(yyscanner, PERF_COUNT_SW_PAGE_FAULTS_MAJ); } +context-switches|cs { return sym(yyscanner, PERF_COUNT_SW_CONTEXT_SWITC= HES); } +cpu-migrations|migrations { return sym(yyscanner, PERF_COUNT_SW_CPU_MIGR= ATIONS); } +alignment-faults { return sym(yyscanner, PERF_COUNT_SW_ALIGNMENT_FAULTS= ); } +emulation-faults { return sym(yyscanner, PERF_COUNT_SW_EMULATION_FAULTS= ); } +dummy { return sym(yyscanner, PERF_COUNT_SW_DUMMY); } +bpf-output { return sym(yyscanner, PERF_COUNT_SW_BPF_OUTPUT); } +cgroup-switches { return sym(yyscanner, PERF_COUNT_SW_CGROUP_SWITCHES)= ; } =20 {lc_type} { return str(yyscanner, PE_LEGACY_CACHE); } {lc_type}-{lc_op_result} { return str(yyscanner, PE_LEGACY_CACHE); } diff --git a/tools/perf/util/parse-events.y b/tools/perf/util/parse-events.y index f888cbb076d6..d2ef1890007e 100644 --- a/tools/perf/util/parse-events.y +++ b/tools/perf/util/parse-events.y @@ -55,7 +55,7 @@ static void free_list_evsel(struct list_head* list_evsel) %} =20 %token PE_START_EVENTS PE_START_TERMS -%token PE_VALUE PE_VALUE_SYM_HW PE_VALUE_SYM_SW PE_TERM +%token PE_VALUE PE_VALUE_SYM_SW PE_TERM %token PE_EVENT_NAME %token PE_RAW PE_NAME %token PE_MODIFIER_EVENT PE_MODIFIER_BP PE_BP_COLON PE_BP_SLASH @@ -65,11 +65,9 @@ static void free_list_evsel(struct list_head* list_evsel) %token PE_DRV_CFG_TERM %token PE_TERM_HW %type PE_VALUE -%type PE_VALUE_SYM_HW %type PE_VALUE_SYM_SW %type PE_MODIFIER_EVENT %type PE_TERM -%type value_sym %type PE_RAW %type PE_NAME %type PE_LEGACY_CACHE @@ -85,6 +83,7 @@ static void free_list_evsel(struct list_head* list_evsel) %type opt_pmu_config %destructor { parse_events_terms__delete ($$); } %type event_pmu +%type event_legacy_hardware %type event_legacy_symbol %type event_legacy_cache %type event_legacy_mem @@ -102,8 +101,8 @@ static void free_list_evsel(struct list_head* list_evse= l) %destructor { free_list_evsel ($$); } %type tracepoint_name %destructor { free ($$.sys); free ($$.event); } -%type PE_TERM_HW -%destructor { free ($$.str); } +%type PE_TERM_HW +%destructor { free ($$.str); } =20 %union { @@ -118,10 +117,10 @@ static void free_list_evsel(struct list_head* list_ev= sel) char *sys; char *event; } tracepoint_name; - struct hardware_term { + struct hardware_event { char *str; u64 num; - } hardware_term; + } hardware_event; } %% =20 @@ -264,6 +263,7 @@ PE_EVENT_NAME event_def event_def =20 event_def: event_pmu | + event_legacy_hardware | event_legacy_symbol | event_legacy_cache sep_dc | event_legacy_mem sep_dc | @@ -306,24 +306,45 @@ PE_NAME sep_dc $$ =3D list; } =20 -value_sym: -PE_VALUE_SYM_HW +event_legacy_hardware: +PE_TERM_HW opt_pmu_config +{ + /* List of created evsels. */ + struct list_head *list =3D NULL; + int err =3D parse_events_multi_pmu_add(_parse_state, $1.str, $1.num, $2, = &list, &@1); + + free($1.str); + parse_events_terms__delete($2); + if (err) + PE_ABORT(err); + + $$ =3D list; +} | -PE_VALUE_SYM_SW +PE_TERM_HW sep_dc +{ + struct list_head *list; + int err; + + err =3D parse_events_multi_pmu_add(_parse_state, $1.str, $1.num, NULL, &l= ist, &@1); + free($1.str); + if (err) + PE_ABORT(err); + $$ =3D list; +} =20 event_legacy_symbol: -value_sym '/' event_config '/' +PE_VALUE_SYM_SW '/' event_config '/' { struct list_head *list; - int type =3D $1 >> 16; - int config =3D $1 & 255; int err; - bool wildcard =3D (type =3D=3D PERF_TYPE_HARDWARE || type =3D=3D PERF_TYP= E_HW_CACHE); =20 list =3D alloc_list(); if (!list) YYNOMEM; - err =3D parse_events_add_numeric(_parse_state, list, type, config, $3, wi= ldcard); + err =3D parse_events_add_numeric(_parse_state, list, + /*type=3D*/PERF_TYPE_SOFTWARE, /*config=3D*/$1, + $3, /*wildcard=3D*/false); parse_events_terms__delete($3); if (err) { free_list_evsel(list); @@ -332,18 +353,17 @@ value_sym '/' event_config '/' $$ =3D list; } | -value_sym sep_slash_slash_dc +PE_VALUE_SYM_SW sep_slash_slash_dc { struct list_head *list; - int type =3D $1 >> 16; - int config =3D $1 & 255; - bool wildcard =3D (type =3D=3D PERF_TYPE_HARDWARE || type =3D=3D PERF_TYP= E_HW_CACHE); int err; =20 list =3D alloc_list(); if (!list) YYNOMEM; - err =3D parse_events_add_numeric(_parse_state, list, type, config, /*head= _config=3D*/NULL, wildcard); + err =3D parse_events_add_numeric(_parse_state, list, + /*type=3D*/PERF_TYPE_SOFTWARE, /*config=3D*/$1, + /*head_config=3D*/NULL, /*wildcard=3D*/false); if (err) PE_ABORT(err); $$ =3D list; --=20 2.47.0.163.g1226f6d8fa-goog