From nobody Thu Dec 18 22:16:22 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 1DC1AC77B75 for ; Tue, 2 May 2023 22:52:18 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230298AbjEBWwP (ORCPT ); Tue, 2 May 2023 18:52:15 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41894 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229766AbjEBWwJ (ORCPT ); Tue, 2 May 2023 18:52:09 -0400 Received: from mail-yw1-x1149.google.com (mail-yw1-x1149.google.com [IPv6:2607:f8b0:4864:20::1149]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6C2BF3AB2 for ; Tue, 2 May 2023 15:51:23 -0700 (PDT) Received: by mail-yw1-x1149.google.com with SMTP id 00721157ae682-55a07969b10so934007b3.1 for ; Tue, 02 May 2023 15:51:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20221208; t=1683067825; x=1685659825; h=cc:to:from:subject:references:mime-version:message-id:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=aRrQWfMbhp+rlO4pd/8kREfyV/ueQNA+MFq0luWCz2E=; b=birtAO/fNgJeeNe1EUuoa3hSX/1QwUqIjZZj7a+1BdVQTVNEQGQaXl+14G52zHHfhj 52v91gnKt0mrexc2JAFHifoaVpuMhBn2PaN5M8zdnmjAgD+4FhLrWg1TaPtZwu/2nF/l MEmTjC/JVv1REQ7XiXZOMKjDzMEzZskMk7uN5rZ5abY78UL+9u+ecoB94yXgpCaKz4dF XUMmTNVyQL3QMHbDOizDpK2KMX0iPaaUdVb70/+9dueB5Igwl0gKCiZGAGdL8hdsFaa5 SX0ZAdX473YGopCtceGGhrcV85iR1caW7t8w/CsQ555pI+FQY8Pao7/2WA5AaJ1D4S51 P/Sg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1683067825; x=1685659825; 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=aRrQWfMbhp+rlO4pd/8kREfyV/ueQNA+MFq0luWCz2E=; b=AIj9kuoB1H2QtWJ7kvcXeLvrvyxs6oZzl2HQBTFM+Bxv8wpq5j5/U/XiI8B+ty/q3B FqorlADhIFV12unVADYvukAnu+zJuQmdOUhJWy1lE8fbv+txdBvsKCe6+xJ07VpjbNb6 gPHtrd2rhtXqRxvO7bIIwHc4Xzi+stV33od4F7XnT4530puCbhltO1bJUqeXuiQiXHXn xUdCi/T5o4O9kcNqQzsKvOCZDST/DH3vlkItSFOeFEtKcIGzryFbib26BU/IBZl6OZvb nMZNyQblZGiLjmJDofxnJYetgw5b38z5VzTavxdrDpQ2nAJmT7QFdnNKqp5Ht/2bpren 35GQ== X-Gm-Message-State: AC+VfDwrk1EgzJ8muIGeOsFSu+dAUW7GbXhWPnzdOPF5QeHlDNcrdiNv JTaa9axVzVwMQXW0lpiOc4qTw04/tl3Z X-Google-Smtp-Source: ACHHUZ6l6yQT0eNizaa54wKMpaY+fppvn7gI2uSsn6yH/Kk1CrNSxJL7CW+d6Nmv2hlVj0VFHbeLUspxXl1Q X-Received: from irogers.svl.corp.google.com ([2620:15c:2d4:203:e70c:446b:d23b:982e]) (user=irogers job=sendgmr) by 2002:a17:903:408d:b0:1a9:7f45:8711 with SMTP id z13-20020a170903408d00b001a97f458711mr8155plc.6.1683067402755; Tue, 02 May 2023 15:43:22 -0700 (PDT) Date: Tue, 2 May 2023 15:38:42 -0700 In-Reply-To: <20230502223851.2234828-1-irogers@google.com> Message-Id: <20230502223851.2234828-36-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 35/44] 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 eb893cc15878..72a10bed84fd 100644 --- a/tools/perf/tests/parse-events.c +++ b/tools/perf/tests/parse-events.c @@ -1509,6 +1509,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) { @@ -1886,6 +1896,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 { @@ -2073,6 +2088,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