Received: by 2002:a05:6358:9144:b0:117:f937:c515 with SMTP id r4csp3062544rwr; Fri, 28 Apr 2023 23:19:54 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ64B1tGxpcUiFdRqH4aOD7MGqCm+E24vrzGtaVlpnmZXO5lnSg0OYVTspwLFzl8DSr3jbCO X-Received: by 2002:a17:902:ce8a:b0:1a6:cf4b:4d7d with SMTP id f10-20020a170902ce8a00b001a6cf4b4d7dmr8910002plg.2.1682749194176; Fri, 28 Apr 2023 23:19:54 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1682749194; cv=none; d=google.com; s=arc-20160816; b=bvFKwyRrlIsLYfnQvHbZ6Pgde7bCDzqOPfuD55xQy0mSOgHhSGVpzoWAIN4rxIEFuv V3UyNmWfLoFl8aSxXTpJpAvNH5Cz40Ue9DnG5pjzhWs/BjKHHv/iq0GFyzoTECoGuWwM hMpEAL6TpdiI/54PKevvimTqO3ms9uN3OzjJnu3PqY8lCyy7tzdcQ/eW/F6JxKraSHWV yWoLQg8vuONaxIGaDmx9BpVXVTKjrx1ZsxBPGjLNlMBwDcBiZ++fAQvouLMkM7yjmZGw vFRAfOyN+9be8/fJzfKsrjpwG599UuX9N2gET53qQmY7SHhu2muA/fnMnK+QvzUm0jUU +ZqA== 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=jM7vst5DIFoMzXwuvX7sLg/ZL9kiwCaMvQ9X5dcPg1U=; b=TVPwY1lBFSDI0tgD48bcMalDjz3C/FMEQ8j+9fM9q0fFZe7yxdxwCAoCXbs3sCD4IF GS+3Fgh1fS9tiAQ1duhIjjH8XbzR9x5UBGuvKj4KxYbfAOAAVlYwloyqm1H0LhwfQuZC JMIYXKL6E/jZtkDzgE4PCxg6GBwIG6xs3W3rtQEmvJUuW28khNkSut/vCxeLmVPKCi0y VogKtee8pFiyxn2kP+rSFusQDV5LYvawvCbMHZuaBXoSMcAy9Qqh0viXlGsCN5DXt5ew g/k1ZtY19tXPsK/1BPrvfKSqJDqr7H04l+9etei7GrgtPaOX8KuahQw8WudcoUm1Gypv aSSA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@google.com header.s=20221208 header.b=yzaUaNwm; 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 k18-20020a170902c41200b001a66a0f12b7si11768830plk.236.2023.04.28.23.19.42; Fri, 28 Apr 2023 23:19:54 -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=yzaUaNwm; 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 S230457AbjD2Fw5 (ORCPT + 99 others); Sat, 29 Apr 2023 01:52:57 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57126 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230252AbjD2Fw4 (ORCPT ); Sat, 29 Apr 2023 01:52:56 -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 188DF171B for ; Fri, 28 Apr 2023 22:52:34 -0700 (PDT) Received: by mail-yb1-xb4a.google.com with SMTP id 3f1490d57ef6-b9a805e82a9so1180689276.3 for ; Fri, 28 Apr 2023 22:52:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20221208; t=1682747553; x=1685339553; h=cc:to:from:subject:references:mime-version:message-id:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=jM7vst5DIFoMzXwuvX7sLg/ZL9kiwCaMvQ9X5dcPg1U=; b=yzaUaNwm6eqdCsjwKNAOWoOR546O/EQBwcU91WAKCKe2wzJytROj1RTkFYVBiiGWGs q9kvh9+X4/52rgNiWUOKCsim1N26UnkAa2YdJSqrvulgnA7S3S7hM4z1yr4w72bl4EBY Yvbjk5ci7s/9jdQ/kT5D1NDOigrFJrmSjUdfOay08o8nKhybPvh5WtvJbS0Y8+fc0wml zaJnAem9MieO1SE8AGYW8IPJwjcyzipSbriSak2Dv9Xv8obfplQSpYM+oeypDyEvqTlF p6P+bkjleEgFED08+cTWYitcGlu08F5VvN6Db6753djHXTOeUdL9Ac2I5v4bWKA5L8RH f7Zg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1682747553; x=1685339553; 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=jM7vst5DIFoMzXwuvX7sLg/ZL9kiwCaMvQ9X5dcPg1U=; b=NHuZWL+qmdvgQ2lUoRN/A90rpsGzDhdybcWHn7dZzI8PCouvWX8lHyJwuBLJTMw+d9 WM1ulECfzSU6cwCBjVXlctCB9uw7nnjml12PDSQ8cWlqOuqH1IG+mcwQpGDILN0YoszG WxuXEUL7q5AHXapPkYLQeO5+FeIBzq7HuF+eWOcEgHL11Mg5QA8nFv3g0HBz3cgEv655 hay06h44APuL2hDC9wt+9P80e4sDNRl3qnhhLf41oqNCOXnyGE2iMcRKvAfbT1uExxm6 wky/i/71eXcRKdRbh5Zzx9uMcefKvUAtwxZwxMcLgSBbiod6B7OSJRA9X7VPdfy8KSsK kJBg== X-Gm-Message-State: AC+VfDzgqAaosp3aK8LdBoV3x4AgV5CPi9jLaJ6uby+aMwuojBe5TIut TVKk9Z8VeJmIiu/HkiDkRoz2zsn/lopi X-Received: from irogers.svl.corp.google.com ([2620:15c:2d4:203:c563:7e28:fb7c:bce3]) (user=irogers job=sendgmr) by 2002:a25:947:0:b0:b9d:8612:a8bd with SMTP id u7-20020a250947000000b00b9d8612a8bdmr705401ybm.4.1682746820024; Fri, 28 Apr 2023 22:40:20 -0700 (PDT) Date: Fri, 28 Apr 2023 22:34:56 -0700 In-Reply-To: <20230429053506.1962559-1-irogers@google.com> Message-Id: <20230429053506.1962559-37-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 36/46] 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 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=name/' true event syntax error: 'cycles/name=name/' \___ 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-events.c index 49166d51c0a1..449d7a1780f4 100644 --- a/tools/perf/tests/parse-events.c +++ b/tools/perf/tests/parse-events.c @@ -1485,6 +1485,16 @@ static int test__sym_event_dc(struct evlist *evlist) return TEST_OK; } +static int test__term_equal_term(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, "name") == 0); + return TEST_OK; +} + #ifdef HAVE_LIBTRACEEVENT static int count_tracepoints(void) { @@ -1857,6 +1867,11 @@ static const struct evlist_test test__events[] = { .check = test__exclusive_group, /* 7 */ }, + { + .name = "cycles/name=name/", + .check = test__term_equal_term, + /* 8 */ + }, }; static const struct evlist_test test__events_pmu[] = { @@ -2038,6 +2053,12 @@ static const struct evlist_test test__events_pmu[] = { .check = test__exclusive_group, /* 9 */ }, + { + .name = "cpu/cycles,name=name/", + .valid = test__pmu_cpu_valid, + .check = test__term_equal_term, + /* 0 */ + }, }; 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); } +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 **term, 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 '=' PE_TERM_HW $$ = term; } | +PE_TERM '=' PE_TERM +{ + struct parse_events_term *term; + + ABORT_ON(parse_events_term__term(&term, (int)$1, (int)$3, &@1, &@3)); + $$ = term; +} +| PE_TERM '=' PE_VALUE { struct parse_events_term *term; -- 2.40.1.495.gc816e09b53d-goog