From nobody Fri May 9 13:28:00 2025
Received: from mail-pj1-f73.google.com (mail-pj1-f73.google.com
[209.85.216.73])
(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 03F36263F40
for <linux-kernel@vger.kernel.org>; Mon, 24 Mar 2025 16:46:04 +0000 (UTC)
Authentication-Results: smtp.subspace.kernel.org;
arc=none smtp.client-ip=209.85.216.73
ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116;
t=1742834766; cv=none;
b=r8NF5Iw4ei8BSvPKi/YkCuYXaCFPxE/UInwv3zKX/fGk1qu1mAz756WMkyFFXw973S4dXN1YFL/xQADuxY0CAzzYUg5HaDBQ6L1VV83X5lsu5djTBubiWUwTvw85pDzxgVWBLmJFlZe212RgqbC2403cie8n6dpqvZIFhKEK0dY=
ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org;
s=arc-20240116; t=1742834766; c=relaxed/simple;
bh=xO9XeqO4FUSuYO61Dfds0tzBhFOyw8Et+cqs1nSl4Hw=;
h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From:
To:Cc:Content-Type;
b=AwH4dB5GB3zJgc20/JdYUkvqPsqtH45nTTwqLgmmebnva0EF7jPGquleAX4wh8l7yBd/3g2h7Og5GdYOT11bYq9o3Yj8BVGMu/QnnQF3160EoeEg+CZoqTRAgjhMzf1QgANmadJNMs5rSU9dr/5Vuh6HKimJMqEIdPEQB52gQJ0=
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=1INgl1Un; arc=none smtp.client-ip=209.85.216.73
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="1INgl1Un"
Received: by mail-pj1-f73.google.com with SMTP id
98e67ed59e1d1-2fec3e38c2dso12364461a91.2
for <linux-kernel@vger.kernel.org>;
Mon, 24 Mar 2025 09:46:04 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=google.com; s=20230601; t=1742834764; x=1743439564;
darn=vger.kernel.org;
h=cc:to:from:subject:message-id:references:mime-version:in-reply-to
:date:from:to:cc:subject:date:message-id:reply-to;
bh=lyWvHd4BtbK+3yGaCjWTrHoIvu1HDim/7/52tq5OE9U=;
b=1INgl1UnTv57zf/lFC9/n87rZcnhxwnmAJK0NXUu56HrN1UZDfJpy0f2G9WBK12G/T
kWXlJ4S2HKFMNfM6z4jD3mx4KNKe8ombap9NN01QwUcTMGn1iq4VsHazgEfN3y5ZUO0Z
rNYKNkD89D3jKmB6K3UGS/aRQQ4S64Qvzx6uu6hBmXxS+fyGNHjlYkLaOJt6BPwvitIQ
1+TdPyh/g/ssaRzCGgZ7InbCQv9l2x7ckAuEJunK9Jza8oe/TX5avzGQeObOsKO5BQUr
EQC7HvNJ4IWlKDN/EgXfVQx4Zp4uc2wb3j2is3IfiUSBb12dlcwjwGn6jdg0LdRdMe2O
jd1w==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=1e100.net; s=20230601; t=1742834764; x=1743439564;
h=cc:to:from:subject:message-id:references:mime-version:in-reply-to
:date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to;
bh=lyWvHd4BtbK+3yGaCjWTrHoIvu1HDim/7/52tq5OE9U=;
b=bpV8a50Fb4bhXG2ejAmIpnjAX61rOpKvG01iNNa7zecXv2l2TqguB/liPfwnbJGLIv
GExZX3sqv9m/oqRY0ufS/eOKk0Lb7xdpt8/lBx3UCVcx7AQWH+UlR/eTawg2Yz1pePLs
Og6ewERvsAuR9OaOWSfreKONHHSdgSEWrlsxsj/82QT24dX/dw33CoK3XpScU6DcASzC
68QwjFPZ+rzDqbO75VtH0rmIoYQTcfD0mjYqWgixOOAjbf9rB5DplcF7RFByzJq071+n
0YVRCKCca5y7dYVVtIJbswbm8Ye7rPtA5BDUD9uYA6YVodyyCv3CVZ0Nc4Ye+KwKRQBS
A3Og==
X-Forwarded-Encrypted: i=1;
AJvYcCWbGY2mqMt6q6mg4XCinSKt4YlM5Ih0MU8HJT6CiU+snVnzTD0L1QWgaWQ1iOM1SD7KviM2d4AmuFKFCw0=@vger.kernel.org
X-Gm-Message-State: AOJu0YzkLBEceIKLmfuQE2xKj7Yqk6MkZzIJNyQihjSihtLmDWVCca6n
lah5VrbRj04DvJYfm5mDvW2orlXqxaDX1P3Pw8xkVqbo1fgQc5uNnCWPlO12jivcDT7P8pqqi5g
UkmJUvg==
X-Google-Smtp-Source:
AGHT+IEH8uDIa3ThDPIKOKWNfJrvulB8GlFJeT25fcBnQjgw5EmXt6jC2y681fLkwj3GSPfbGSpNv/jwWBRS
X-Received: from pjur15.prod.google.com ([2002:a17:90a:d40f:b0:2fa:210c:d068])
(user=irogers job=prod-delivery.src-stubby-dispatcher) by
2002:a17:90b:1f81:b0:2ee:b8ac:73b0
with SMTP id 98e67ed59e1d1-3030fe6df0amr24783166a91.2.1742834764248; Mon, 24
Mar 2025 09:46:04 -0700 (PDT)
Date: Mon, 24 Mar 2025 09:45:42 -0700
In-Reply-To: <20250324164543.62574-1-irogers@google.com>
Precedence: bulk
X-Mailing-List: linux-kernel@vger.kernel.org
List-Id: <linux-kernel.vger.kernel.org>
List-Subscribe: <mailto:linux-kernel+subscribe@vger.kernel.org>
List-Unsubscribe: <mailto:linux-kernel+unsubscribe@vger.kernel.org>
Mime-Version: 1.0
References: <20250324164543.62574-1-irogers@google.com>
X-Mailer: git-send-email 2.49.0.395.g12beb8f557-goog
Message-ID: <20250324164543.62574-3-irogers@google.com>
Subject: [PATCH v6 2/2] perf parse-events: Reapply "Prefer sysfs/JSON hardware
events over legacy"
From: Ian Rogers <irogers@google.com>
To: Peter Zijlstra <peterz@infradead.org>, Ingo Molnar <mingo@redhat.com>,
Arnaldo Carvalho de Melo <acme@kernel.org>,
Namhyung Kim <namhyung@kernel.org>,
Mark Rutland <mark.rutland@arm.com>,
Alexander Shishkin <alexander.shishkin@linux.intel.com>,
Jiri Olsa <jolsa@kernel.org>,
Ian Rogers <irogers@google.com>, Adrian Hunter <adrian.hunter@intel.com>,
Kan Liang <kan.liang@linux.intel.com>, James Clark <james.clark@linaro.org>,
Ze Gao <zegao2021@gmail.com>, Weilin Wang <weilin.wang@intel.com>,
Dominique Martinet <asmadeus@codewreck.org>,
Jean-Philippe Romain <jean-philippe.romain@foss.st.com>,
Junhao He <hejunhao3@huawei.com>,
linux-perf-users@vger.kernel.org, linux-kernel@vger.kernel.org,
Aditya Bodkhe <Aditya.Bodkhe1@ibm.com>
Cc: Atish Patra <atishp@rivosinc.com>, Leo Yan <leo.yan@arm.com>,
Beeman Strong <beeman@rivosinc.com>,
Arnaldo Carvalho de Melo <acme@redhat.com>
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 <irogers@google.com>
Reviewed-by: Kan Liang <kan.liang@linux.intel.com>
Tested-by: Atish Patra <atishp@rivosinc.com>
Tested-by: James Clark <james.clark@linaro.org>
Tested-by: Leo Yan <leo.yan@arm.com>
Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Beeman Strong <beeman@rivosinc.com>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Mark Rutland <mark.rutland@arm.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
---
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 5152fd5a6ead..cc9cd8069cab 100644
--- a/tools/perf/util/parse-events.c
+++ b/tools/perf/util/parse-events.c
@@ -1551,8 +1551,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;
@@ -1565,15 +1565,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);
@@ -1604,6 +1604,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
@@ -1620,6 +1622,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 7ed86e3e34e3..324b7dc8a0d3 100644
--- a/tools/perf/util/parse-events.l
+++ b/tools/perf/util/parse-events.l
@@ -117,12 +117,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)
@@ -133,13 +133,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
@@ -335,16 +335,16 @@ aux-output { return term(yyscanner, PARSE_EVENTS__TE=
RM_TYPE_AUX_OUTPUT); }
aux-action { return term(yyscanner, PARSE_EVENTS__TERM_TYPE_AUX_ACTION); }
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 ','; }
@@ -390,28 +390,28 @@ r0x{num_raw_hex} { return str(yyscanner, PE_RAW); }
<<EOF>> { 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 <num> PE_VALUE
-%type <num> PE_VALUE_SYM_HW
%type <num> PE_VALUE_SYM_SW
%type <mod> PE_MODIFIER_EVENT
%type <term_type> PE_TERM
-%type <num> value_sym
%type <str> PE_RAW
%type <str> PE_NAME
%type <str> PE_LEGACY_CACHE
@@ -85,6 +83,7 @@ static void free_list_evsel(struct list_head* list_evsel)
%type <list_terms> opt_pmu_config
%destructor { parse_events_terms__delete ($$); } <list_terms>
%type <list_evsel> event_pmu
+%type <list_evsel> event_legacy_hardware
%type <list_evsel> event_legacy_symbol
%type <list_evsel> event_legacy_cache
%type <list_evsel> event_legacy_mem
@@ -102,8 +101,8 @@ static void free_list_evsel(struct list_head* list_evse=
l)
%destructor { free_list_evsel ($$); } <list_evsel>
%type <tracepoint_name> tracepoint_name
%destructor { free ($$.sys); free ($$.event); } <tracepoint_name>
-%type <hardware_term> PE_TERM_HW
-%destructor { free ($$.str); } <hardware_term>
+%type <hardware_event> PE_TERM_HW
+%destructor { free ($$.str); } <hardware_event>
=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.49.0.395.g12beb8f557-goog