From nobody Thu Dec 18 22:16:18 2025 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 5601BC7EE21 for ; Tue, 2 May 2023 22:45:23 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230234AbjEBWpV (ORCPT ); Tue, 2 May 2023 18:45:21 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34336 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230347AbjEBWpI (ORCPT ); Tue, 2 May 2023 18:45:08 -0400 Received: from mail-yb1-xb4a.google.com (mail-yb1-xb4a.google.com [IPv6:2607:f8b0:4864:20::b4a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D392635BF for ; Tue, 2 May 2023 15:44:39 -0700 (PDT) Received: by mail-yb1-xb4a.google.com with SMTP id 3f1490d57ef6-b9a8075bd7cso7758993276.1 for ; Tue, 02 May 2023 15:44:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20221208; t=1683067395; x=1685659395; h=cc:to:from:subject:references:mime-version:message-id:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=jgxNy0ApXBVjzvhQZgVvxx7rNPPhGpKow0V3CkUrSSM=; b=hBl2zlApmK/DF51KUpwd95LcHd56hvZaXqxjDJJ9bKdL8d/ljP8HNkT4WX/m5bJWtS gGh/Zv2WIYEPwQRQ0aQpZt3YLOvIPJv5XHM3GqtSrfnNdOO1XK6dCLxBEEiQRMBJKkiG 59ZuLftpveBWITKoO+zEprZ3rI/vwf7/XkeIlCrX2D+vipWGyJXtWU4UT8x8a++d+kzY n59CntWOWDnAz/FCGUrv9XUpTkXZWXbnE+8imtFZ/pW+MSMXm222CLd4jnNo+i+EJSga 7k631Oph6eR361e6qyjgQCRZB7dgFFhWecYn0dY+4t87nauVYy7qrMdlxCE9mmbUKKBo ygCQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1683067395; x=1685659395; 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=jgxNy0ApXBVjzvhQZgVvxx7rNPPhGpKow0V3CkUrSSM=; b=IRffTLAaSrkxmvkV5CbXZiIB+XbhP1TJndD/tFSJPSQcsViTOMOHBk00JF7pWHDnwE tgl6z4jU0FPlI+Rlj8JFEzvQhtY9JBkv6jr5txDU2g6ViI9I7iJFcCfS4diLrvu1ahIy k/ZP73aaRPHQGCNYnPxzWtGyu1wUiRZueNsDaUF98m5RtavpxANeNhhCQpYgJV9mQsaE bU9IU076TyJ0l5lO7zsFK5WQFo1yKGsSlWZ/EjoOIA7+1Qb73c9xGJG0C+T9mTKIZul6 vjJQiG/FuwJ2kXP6+EI7ojJ4Q6kLup0qiXL/BrlEIlKlsJCwxM83t37TqtnBCQzDNM/2 pfpw== X-Gm-Message-State: AC+VfDwRwNpLYznZepBu84JFYMDbmsYyQt2kp8DGepHUNyLtIxL49RXn pA3GL48G2J+RzwHmWT20f/fiKGJgFEN7 X-Google-Smtp-Source: ACHHUZ7LNMMVhEJZZrX8sDNyDbONiX9SJSvoR3ihvfRCdx9SKcU8VKRA3bjAmDpCkaqRv5x0u3+ElwMoTDf8 X-Received: from irogers.svl.corp.google.com ([2620:15c:2d4:203:e70c:446b:d23b:982e]) (user=irogers job=sendgmr) by 2002:a05:6902:100e:b0:b8b:f584:6b73 with SMTP id w14-20020a056902100e00b00b8bf5846b73mr7537984ybt.10.1683067394974; Tue, 02 May 2023 15:43:14 -0700 (PDT) Date: Tue, 2 May 2023 15:38:41 -0700 In-Reply-To: <20230502223851.2234828-1-irogers@google.com> Message-Id: <20230502223851.2234828-35-irogers@google.com> Mime-Version: 1.0 References: <20230502223851.2234828-1-irogers@google.com> X-Mailer: git-send-email 2.40.1.495.gc816e09b53d-goog Subject: [PATCH v4 34/44] perf parse-events: Avoid error when assigning a term From: Ian Rogers To: Arnaldo Carvalho de Melo , Kan Liang , Ahmad Yasin , Peter Zijlstra , Ingo Molnar , Stephane Eranian , Andi Kleen , Perry Taylor , Samantha Alt , Caleb Biggers , Weilin Wang , Edward Baker , Mark Rutland , Alexander Shishkin , Jiri Olsa , Namhyung Kim , Adrian Hunter , Florian Fischer , Rob Herring , Zhengjun Xing , John Garry , Kajol Jain , Sumanth Korikkar , Thomas Richter , Tiezhu Yang , Ravi Bangoria , Leo Yan , Yang Jihong , James Clark , Suzuki Poulouse , Kang Minchul , Athira Rajeev , linux-perf-users@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Ian Rogers Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Avoid the parser error: ''' $ perf stat -e 'cycles/name=3Dname/' true event syntax error: 'cycles/name=3Dname/' \___ parser error ''' by turning the term back to a string if it is on the right. Add PMU and generic parsing tests. Signed-off-by: Ian Rogers --- tools/perf/tests/parse-events.c | 21 +++++++++++++++++++++ tools/perf/util/parse-events.c | 9 +++++++++ tools/perf/util/parse-events.h | 3 +++ tools/perf/util/parse-events.y | 8 ++++++++ 4 files changed, 41 insertions(+) diff --git a/tools/perf/tests/parse-events.c b/tools/perf/tests/parse-event= s.c index 9ca8e19bda00..eb893cc15878 100644 --- a/tools/perf/tests/parse-events.c +++ b/tools/perf/tests/parse-events.c @@ -1499,6 +1499,16 @@ static int test__sym_event_dc(struct evlist *evlist) return TEST_OK; } =20 +static int test__term_equal_term(struct evlist *evlist) +{ + struct evsel *evsel =3D evlist__first(evlist); + + TEST_ASSERT_VAL("wrong type", evsel->core.attr.type =3D=3D PERF_TYPE_HARD= WARE); + TEST_ASSERT_VAL("wrong config", test_config(evsel, PERF_COUNT_HW_CPU_CYCL= ES)); + TEST_ASSERT_VAL("wrong name setting", strcmp(evsel->name, "name") =3D=3D = 0); + return TEST_OK; +} + #ifdef HAVE_LIBTRACEEVENT static int count_tracepoints(void) { @@ -1871,6 +1881,11 @@ static const struct evlist_test test__events[] =3D { .check =3D test__exclusive_group, /* 7 */ }, + { + .name =3D "cycles/name=3Dname/", + .check =3D test__term_equal_term, + /* 8 */ + }, }; =20 static const struct evlist_test test__events_pmu[] =3D { @@ -2052,6 +2067,12 @@ static const struct evlist_test test__events_pmu[] = =3D { .check =3D test__exclusive_group, /* 9 */ }, + { + .name =3D "cpu/cycles,name=3Dname/", + .valid =3D test__pmu_cpu_valid, + .check =3D test__term_equal_term, + /* 0 */ + }, }; =20 struct terms_test { diff --git a/tools/perf/util/parse-events.c b/tools/perf/util/parse-events.c index dea27bc0b376..5d5d77fa398b 100644 --- a/tools/perf/util/parse-events.c +++ b/tools/perf/util/parse-events.c @@ -2581,6 +2581,15 @@ int parse_events_term__str(struct parse_events_term = **term, return new_term(term, &temp, str, 0); } =20 +int parse_events_term__term(struct parse_events_term **term, + int term_lhs, int term_rhs, + void *loc_term, void *loc_val) +{ + return parse_events_term__str(term, term_lhs, NULL, + strdup(config_term_names[term_rhs]), + loc_term, loc_val); +} + int parse_events_term__clone(struct parse_events_term **new, struct parse_events_term *term) { diff --git a/tools/perf/util/parse-events.h b/tools/perf/util/parse-events.h index 7fe80b416143..2a8cafe0ee8f 100644 --- a/tools/perf/util/parse-events.h +++ b/tools/perf/util/parse-events.h @@ -148,6 +148,9 @@ int parse_events_term__num(struct parse_events_term **t= erm, int parse_events_term__str(struct parse_events_term **term, int type_term, char *config, char *str, void *loc_term, void *loc_val); +int parse_events_term__term(struct parse_events_term **term, + int term_lhs, int term_rhs, + void *loc_term, void *loc_val); int parse_events_term__clone(struct parse_events_term **new, struct parse_events_term *term); void parse_events_term__delete(struct parse_events_term *term); diff --git a/tools/perf/util/parse-events.y b/tools/perf/util/parse-events.y index 819a5123fd77..0aaebc57748e 100644 --- a/tools/perf/util/parse-events.y +++ b/tools/perf/util/parse-events.y @@ -848,6 +848,14 @@ PE_TERM '=3D' PE_TERM_HW $$ =3D term; } | +PE_TERM '=3D' PE_TERM +{ + struct parse_events_term *term; + + ABORT_ON(parse_events_term__term(&term, (int)$1, (int)$3, &@1, &@3)); + $$ =3D term; +} +| PE_TERM '=3D' PE_VALUE { struct parse_events_term *term; --=20 2.40.1.495.gc816e09b53d-goog