From nobody Thu Dec 18 08:37:57 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 217F5C77B60 for ; Wed, 26 Apr 2023 07:07:53 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S239870AbjDZHHv (ORCPT ); Wed, 26 Apr 2023 03:07:51 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46440 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S239910AbjDZHHL (ORCPT ); Wed, 26 Apr 2023 03:07:11 -0400 Received: from mail-yb1-xb49.google.com (mail-yb1-xb49.google.com [IPv6:2607:f8b0:4864:20::b49]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2A79E49F4 for ; Wed, 26 Apr 2023 00:05:44 -0700 (PDT) Received: by mail-yb1-xb49.google.com with SMTP id 3f1490d57ef6-b9a25f6aa0eso1476619276.1 for ; Wed, 26 Apr 2023 00:05:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20221208; t=1682492727; x=1685084727; h=cc:to:from:subject:references:mime-version:message-id:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=mQ0x6N0RNGSt0AF/fHZKh2i20S0O9mJpVpnE3xtP9Qs=; b=dLfPuoZPECVNAa8PJubrzET3fdMuNPpnEJhZwWXqjBenElR9cXO6ly6IIczs/OfWFq 8zQ0iFqlh+vakxj7BJ+u+aB8MWOX5vie45jmde2bTaJglKhPaaeN/JpYQSTP6CpW19Cf qsuOvULaFoWvN82XLXCYcH6+QgybmOwh+qxAky2avg0CHNN76ooZ5qHCyY+S3uzK7ZlO ZtQn7E3q1D4kf86EnVcWhbF/zq+gLO381XLBr+rPYfPl2ZtRxrPh/jONbn+++HhZJfgF 9jSccJ+XSOxtHZq1yMMH0uPYZ9zqxrSuDfcxcs1aVmpRf4cbjimlWfDB8REZCwk6dNA0 JlKQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1682492727; x=1685084727; 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=mQ0x6N0RNGSt0AF/fHZKh2i20S0O9mJpVpnE3xtP9Qs=; b=intW01jYlsaJ25PcoknzMjhiWerndcMQ1q74/qmFkyAiWom5fYCJhBtL9NoHr0L04G +Cv4VgdNlaHXXDNCW8NqcTbmpqOEcn6idEaIkdALhw5MHXI+tHHbmP2/alGzRYEULjZT Z/j0ctsEJPkLCMvciqJ8cBPHncWhsXKQBzlgPbaKiG/g6htfbTkT2znnBxalLMfxCs5o fWwSP3RavDCq1g6lhMr8IRE788f8M7u00mLY7ccDt/hU2tnkFBGMYK/f0AwE325XFyoE x/3+l72i+gg8aWvz9Alp29x+VhgkQaB8Xim8U9WsHLrAuMPbH8gc6qCkFSlaCde1F7uF LlYA== X-Gm-Message-State: AAQBX9dgO0Hs+/WDo+5litVa426nvIGkQ87irPR58toZ2mad/iwp823E FGC052ulVg2PT98AMVQUWril0Wfwit/F X-Google-Smtp-Source: AKy350a+sScxF4h4rmGICB8SVQvSJ8OaNlw1N3UYC3rgi0avDPGMbp+Zo/s/ohkk0badWy0fLCwZbdQ9GbCB X-Received: from irogers.svl.corp.google.com ([2620:15c:2d4:203:144f:e890:2b29:48d9]) (user=irogers job=sendgmr) by 2002:a25:ccd6:0:b0:b8b:fe5f:2eaa with SMTP id l205-20020a25ccd6000000b00b8bfe5f2eaamr7789005ybf.2.1682492727239; Wed, 26 Apr 2023 00:05:27 -0700 (PDT) Date: Wed, 26 Apr 2023 00:00:42 -0700 In-Reply-To: <20230426070050.1315519-1-irogers@google.com> Message-Id: <20230426070050.1315519-33-irogers@google.com> Mime-Version: 1.0 References: <20230426070050.1315519-1-irogers@google.com> X-Mailer: git-send-email 2.40.1.495.gc816e09b53d-goog Subject: [PATCH v1 32/40] perf parse-events: Avoid error when assigning a legacy cache 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=3Dl1d/' true event syntax error: 'cycles/name=3Dl1d/' \___ parser error ''' by combining the name and legacy cache cases in the parser. Signed-off-by: Ian Rogers --- tools/perf/tests/parse-events.c | 21 +++++++++++++++++++++ tools/perf/util/parse-events.y | 10 ++++++---- 2 files changed, 27 insertions(+), 4 deletions(-) diff --git a/tools/perf/tests/parse-events.c b/tools/perf/tests/parse-event= s.c index 06042f450ece..c44f0ffa51c5 100644 --- a/tools/perf/tests/parse-events.c +++ b/tools/perf/tests/parse-events.c @@ -1495,6 +1495,16 @@ static int test__term_equal_term(struct evlist *evli= st) return TEST_OK; } =20 +static int test__term_equal_legacy(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, "l1d") =3D=3D 0= ); + return TEST_OK; +} + #ifdef HAVE_LIBTRACEEVENT static int count_tracepoints(void) { @@ -1872,6 +1882,11 @@ static const struct evlist_test test__events[] =3D { .check =3D test__term_equal_term, /* 8 */ }, + { + .name =3D "cycles/name=3Dl1d/", + .check =3D test__term_equal_legacy, + /* 9 */ + }, }; =20 static const struct evlist_test test__events_pmu[] =3D { @@ -2059,6 +2074,12 @@ static const struct evlist_test test__events_pmu[] = =3D { .check =3D test__term_equal_term, /* 0 */ }, + { + .name =3D "cpu/cycles,name=3Dl1d/", + .valid =3D test__pmu_cpu_valid, + .check =3D test__term_equal_legacy, + /* 1 */ + }, }; =20 struct terms_test { diff --git a/tools/perf/util/parse-events.y b/tools/perf/util/parse-events.y index 0aaebc57748e..f4ee03b5976b 100644 --- a/tools/perf/util/parse-events.y +++ b/tools/perf/util/parse-events.y @@ -82,7 +82,7 @@ static void free_list_evsel(struct list_head* list_evsel) %type PE_EVENT_NAME %type PE_KERNEL_PMU_EVENT PE_PMU_EVENT_FAKE %type PE_DRV_CFG_TERM -%type name_or_raw +%type name_or_raw name_or_legacy %destructor { free ($$); } %type event_term %destructor { parse_events_term__delete ($$); } @@ -739,6 +739,8 @@ event_term =20 name_or_raw: PE_RAW | PE_NAME | PE_LEGACY_CACHE =20 +name_or_legacy: PE_NAME | PE_LEGACY_CACHE + event_term: PE_RAW { @@ -752,7 +754,7 @@ PE_RAW $$ =3D term; } | -name_or_raw '=3D' PE_NAME +name_or_raw '=3D' name_or_legacy { struct parse_events_term *term; =20 @@ -826,7 +828,7 @@ PE_TERM_HW $$ =3D term; } | -PE_TERM '=3D' PE_NAME +PE_TERM '=3D' name_or_legacy { struct parse_events_term *term; =20 @@ -872,7 +874,7 @@ PE_TERM $$ =3D term; } | -name_or_raw array '=3D' PE_NAME +name_or_raw array '=3D' name_or_legacy { struct parse_events_term *term; =20 --=20 2.40.1.495.gc816e09b53d-goog