Received: by 2002:a05:6358:9144:b0:117:f937:c515 with SMTP id r4csp3062895rwr; Fri, 28 Apr 2023 23:20:27 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ7HhK5G86bUqajMI4l/Sztdtkm2pZAHEJ0TVVPgxWABV85hFD1CKOc7cqx5gjmSToxdv/pQ X-Received: by 2002:a17:90a:15:b0:247:b1f7:9f67 with SMTP id 21-20020a17090a001500b00247b1f79f67mr6693782pja.4.1682749227365; Fri, 28 Apr 2023 23:20:27 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1682749227; cv=none; d=google.com; s=arc-20160816; b=yH7ZcXLdN3ts4SbMcgHLKrlbPmKSJEoysF6LYf2/yagqeLNQ+TCVr2C2F6Wtiuhk95 rQ3EGP060jt4k+abE9X2Ht7OtVVabZz1PDuC855IK+zZ/2cMrjOn7vjSy99y7bRZwTHs gXGuaF39dVdromaIN5+t+2oSyKAcW8GVziASB4MKCMYGoumgRpklmtpY117JGlOyjCt1 7DaSiVHHDX3T7amxBdjt9ahlOwobOZPfL3q5BHocdXlA4t+tNnDvIusZdOxEk0HZeaSe b2y18Q/tTwsIOqCMggsXKeXwz9m9mKVdn/woThjZkPzBg7mNqcon348mvoAvdXFCjiyR 2Jdg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:cc:to:from:subject:references:mime-version :message-id:in-reply-to:date:dkim-signature; bh=sU/lmeLSKoR5H/nqE4K4lE0bCFvnA0wWSNvCYVNue5M=; b=zJWHGc1Ko/8bN16i1joHMuVjHOI0JSJV65u+xaRJnz/mmMGEnJlkeKUJ3cVQl4KpdG dnbpqFBcj5aOWMNHenVx0ec9RmHRnMDAcel3yrezFSiBP4tKkZGIVKgmlBT9moku+eqw fbuRBc40f97p7whXfe/QMHw44p6LSu6U/lg5F3CP9Tfl822OMCr9qEqDJRlrSNGr4t/I kpUAAbONWw6CSLyl1JUa/aVCuA8pGwO0zqnj2T5BUwKRoiMd4u2UbN30THZ/ZCzyEUPB 9jwHp+SmQn4Hhc0ZxFeYTrTYhA0RupmodMsSWs+/GWlSE4ZQn+KwWtWpDeWkgtSo0Jx/ ZPKQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@google.com header.s=20221208 header.b=1SNdB3zf; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=google.com Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id u3-20020a170902e20300b001a63889abd8si22217382plb.370.2023.04.28.23.20.13; Fri, 28 Apr 2023 23:20:27 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@google.com header.s=20221208 header.b=1SNdB3zf; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=google.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1347471AbjD2Fmn (ORCPT + 99 others); Sat, 29 Apr 2023 01:42:43 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43698 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1347454AbjD2FmF (ORCPT ); Sat, 29 Apr 2023 01:42:05 -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 5AC1B40DC for ; Fri, 28 Apr 2023 22:41:37 -0700 (PDT) Received: by mail-yb1-xb49.google.com with SMTP id 3f1490d57ef6-b9a6eeea78cso16080540276.0 for ; Fri, 28 Apr 2023 22:41:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20221208; t=1682746828; x=1685338828; h=cc:to:from:subject:references:mime-version:message-id:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=sU/lmeLSKoR5H/nqE4K4lE0bCFvnA0wWSNvCYVNue5M=; b=1SNdB3zfpjsoaEe5XpzfPN15wRuQpnXQk3xDhygeew3ee3x+ETNwNjxeCOjNltPlMY BlP/ND4c8eOqwF5mv7PjwLao/wbeGE512eLoYwvPs1j9rSqCAh9Foh2oq22Gn4yROtUx sjBBvfj6Gkrv7ykLh0w7h8oJTn6rh6/IUwyCj07xx2hPkNBaHbFELLTCNLvC38l/wMgv nGyr/0nKOopAdhpHJy5kLPYLqQBJkn5d/VKrcPDJuQONLnBoTFauwlDOkP+faR3aWIF3 aZBNJHS0WSMXhBWna3is3HLxIRaaWDAQbYGAVFyLzCFgukw4llAHCyf3IQiqy3KLoxy2 hnAA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1682746828; x=1685338828; 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=sU/lmeLSKoR5H/nqE4K4lE0bCFvnA0wWSNvCYVNue5M=; b=ZM52yXNCdZajL0+Evw5kgWT9RVyvjKtwWJMX0ZzglayTKEcY7tvmC7YZWtV4x2xBCa Xo/McT7IGeVLVQ/5IDWbnFrtUTMSId7XTmfePe6d0JrRB/3pzXmrDy3kXB3DEVU1HPCF LZ1LP8e9Ca4iAJfplX4v+I/CdRg54mEZ3h5hAugwhSO31RL7U18FKRg4ktg65qPz+vuq 48a6MdmIs0gpIalAE6O+Kt3QzqLVy3lz8dIKWoEpRKcL3mLl2gg1Go+ZgoZ81SNb57QO MCglTjgU5ndOArUp59e7uKsGWH9yDnYlOOmz7HBpIVGGGjaLrbRBBlVdbDQDQgGCxJ5q EozQ== X-Gm-Message-State: AC+VfDxyWYnnpB9XYAFLJ96DIHX9imU5YfsMgGbno9+MaDPQYVBtiWiq 6eFfJVDl9Dh8vLw0pfRX6chGHKMHyD+c X-Received: from irogers.svl.corp.google.com ([2620:15c:2d4:203:c563:7e28:fb7c:bce3]) (user=irogers job=sendgmr) by 2002:a81:ed06:0:b0:54b:fd28:c5ff with SMTP id k6-20020a81ed06000000b0054bfd28c5ffmr4992847ywm.3.1682746828140; Fri, 28 Apr 2023 22:40:28 -0700 (PDT) Date: Fri, 28 Apr 2023 22:34:57 -0700 In-Reply-To: <20230429053506.1962559-1-irogers@google.com> Message-Id: <20230429053506.1962559-38-irogers@google.com> Mime-Version: 1.0 References: <20230429053506.1962559-1-irogers@google.com> X-Mailer: git-send-email 2.40.1.495.gc816e09b53d-goog Subject: [PATCH v3 37/46] 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 Content-Type: text/plain; charset="UTF-8" X-Spam-Status: No, score=-9.6 required=5.0 tests=BAYES_00,DKIMWL_WL_MED, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE,USER_IN_DEF_DKIM_WL autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Avoid the parser error: ''' $ perf stat -e 'cycles/name=l1d/' true event syntax error: 'cycles/name=l1d/' \___ 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-events.c index 449d7a1780f4..cf786c362861 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 *evlist) return TEST_OK; } +static int test__term_equal_legacy(struct evlist *evlist) +{ + struct evsel *evsel = evlist__first(evlist); + + TEST_ASSERT_VAL("wrong type", evsel->core.attr.type == PERF_TYPE_HARDWARE); + TEST_ASSERT_VAL("wrong config", test_config(evsel, PERF_COUNT_HW_CPU_CYCLES)); + TEST_ASSERT_VAL("wrong name setting", strcmp(evsel->name, "l1d") == 0); + return TEST_OK; +} + #ifdef HAVE_LIBTRACEEVENT static int count_tracepoints(void) { @@ -1872,6 +1882,11 @@ static const struct evlist_test test__events[] = { .check = test__term_equal_term, /* 8 */ }, + { + .name = "cycles/name=l1d/", + .check = test__term_equal_legacy, + /* 9 */ + }, }; static const struct evlist_test test__events_pmu[] = { @@ -2059,6 +2074,12 @@ static const struct evlist_test test__events_pmu[] = { .check = test__term_equal_term, /* 0 */ }, + { + .name = "cpu/cycles,name=l1d/", + .valid = test__pmu_cpu_valid, + .check = test__term_equal_legacy, + /* 1 */ + }, }; 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 name_or_raw: PE_RAW | PE_NAME | PE_LEGACY_CACHE +name_or_legacy: PE_NAME | PE_LEGACY_CACHE + event_term: PE_RAW { @@ -752,7 +754,7 @@ PE_RAW $$ = term; } | -name_or_raw '=' PE_NAME +name_or_raw '=' name_or_legacy { struct parse_events_term *term; @@ -826,7 +828,7 @@ PE_TERM_HW $$ = term; } | -PE_TERM '=' PE_NAME +PE_TERM '=' name_or_legacy { struct parse_events_term *term; @@ -872,7 +874,7 @@ PE_TERM $$ = term; } | -name_or_raw array '=' PE_NAME +name_or_raw array '=' name_or_legacy { struct parse_events_term *term; -- 2.40.1.495.gc816e09b53d-goog