From nobody Thu Dec 18 08:37:56 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 05988C77B60 for ; Wed, 26 Apr 2023 07:07:38 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S239589AbjDZHHg (ORCPT ); Wed, 26 Apr 2023 03:07:36 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45204 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S239905AbjDZHGo (ORCPT ); Wed, 26 Apr 2023 03:06:44 -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 B3C2526AB for ; Wed, 26 Apr 2023 00:05:25 -0700 (PDT) Received: by mail-yb1-xb49.google.com with SMTP id 3f1490d57ef6-b98d97c8130so7469786276.3 for ; Wed, 26 Apr 2023 00:05:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20221208; t=1682492712; x=1685084712; h=cc:to:from:subject:references:mime-version:message-id:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=/plNQbu4G1AZ1u58dMCTT3uzVDWaqK01wOO9KBqAtbY=; b=ksVVgGIMy6kHnI3/OnVXaQU3NTY8KlHGcr47Iw4EgU8+oa+rvxkq+SwLmv0BMHFA1t nKvo4JpO/YE6O7A6C8F2TmkO7ukl4yfydWWUm0zl/GV9m2XdvI8W2i8qfirvpD9o7RtB beonoRudazw3V8XGP27W4GFMbzyo8DHfXEr+Gun0U/QN+Cj1cGY2+Z5MYJWI93Kt9tCt AEdc/X5B0vhT/jT2g/zG5vnJ43Du98m/OoSGcb+KVb/SpS5/4zYrT/k9ETppGrm4dgO4 auWHzwxuMaqN6TlwgQ4FKW5+1rHWXQUmAOlw6Hiciv4YO6Uv72DwymmrD8xyzyPMviHH VM8Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1682492712; x=1685084712; 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=/plNQbu4G1AZ1u58dMCTT3uzVDWaqK01wOO9KBqAtbY=; b=CWyytbsyjrBL5p1/GEFZs4VbiAzCYsfR4K8Bc/DKZwIKDXiYWjevytmbnSpWerps8j xz1LWc8DOKbIxOHjWXlB283sxXIj7qIxv2ES8R6olZsiinT76qEmOiQFH0e2xk22lwUv FThQqY2KzPqZzm0n/ybqu5XihCFj6gRMefvkbWn69IqMBBsClYUBMdG/vOtWXwTOi4rH exZ0W0FhUedhW7q8wKmHDEKhYm6zojg3K4+PUX1O4c4Vq4vixB7vohV7vKVxNBFkOMWR o8hmxILL3e/Do2NfnzjwJFjOjJCiNt4N07KrKDoU7qWqSQAfnqEFN+DNfOYAzVDwYvNR 5c2w== X-Gm-Message-State: AAQBX9fIrHyHIOeOIN/RPyycoyCu9DSH1XLRjmsySCL27XeKrd795wp7 l+KxccqmhBC3L5Y1l2YQfEpY3QxnS3A4 X-Google-Smtp-Source: AKy350aHxepvYNLSmBzagRsxX/5pdKFhYbj9wbjB3iGMO+Lk0Ligqftc6dHApW2C19W74PH5l9UCGj08gMgV X-Received: from irogers.svl.corp.google.com ([2620:15c:2d4:203:144f:e890:2b29:48d9]) (user=irogers job=sendgmr) by 2002:a81:b514:0:b0:556:414:5805 with SMTP id t20-20020a81b514000000b0055604145805mr10016726ywh.7.1682492711912; Wed, 26 Apr 2023 00:05:11 -0700 (PDT) Date: Wed, 26 Apr 2023 00:00:40 -0700 In-Reply-To: <20230426070050.1315519-1-irogers@google.com> Message-Id: <20230426070050.1315519-31-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 30/40] perf parse-events: Support hardware events as terms 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" An event like "cpu/instructions/" typically parses due to there being a sysfs event called instructions. On hybrid recursive parsing means that the hardware event is encoded in the attribute, with the PMU being placed in the high bits of the config: ''' $ perf stat -vv -e 'cpu_core/cycles/' true ... ------------------------------------------------------------ perf_event_attr: size 136 config 0x400000000 sample_type IDENTIFIER read_format TOTAL_TIME_ENABLED|TOTAL_TIME_RUNNING disabled 1 inherit 1 enable_on_exec 1 exclude_guest 1 ------------------------------------------------------------ ''' Make this behavior the default by adding a new term type and token for hardware events. The token gathers both the numeric config and the parsed name, so that if the token appears like "cycles/name=3Dcycles/" then the token can be handled like a name. The numeric value isn't sufficient to distinguish say "cpu-cycles" from "cycles". Extend the parse-events test so that all current non-PMU hardware parsing tests, also test with the PMU cpu - more than half the change. Signed-off-by: Ian Rogers --- tools/perf/tests/parse-events.c | 126 ++++++++++++++++++++++++++++++++ tools/perf/util/parse-events.c | 37 +++------- tools/perf/util/parse-events.h | 3 +- tools/perf/util/parse-events.l | 20 +++++ tools/perf/util/parse-events.y | 34 +++++++-- 5 files changed, 187 insertions(+), 33 deletions(-) diff --git a/tools/perf/tests/parse-events.c b/tools/perf/tests/parse-event= s.c index a0cd50e18ebc..4c21bef882ff 100644 --- a/tools/perf/tests/parse-events.c +++ b/tools/perf/tests/parse-events.c @@ -1912,6 +1912,132 @@ static const struct evlist_test test__events_pmu[] = =3D { .check =3D test__checkevent_config_cache, /* 8 */ }, + { + .name =3D "cpu/instructions/", + .valid =3D test__pmu_cpu_valid, + .check =3D test__checkevent_symbolic_name, + /* 9 */ + }, + { + .name =3D "cpu/cycles,period=3D100000,config2/", + .valid =3D test__pmu_cpu_valid, + .check =3D test__checkevent_symbolic_name_config, + /* 0 */ + }, + { + .name =3D "cpu/instructions/h", + .valid =3D test__pmu_cpu_valid, + .check =3D test__checkevent_symbolic_name_modifier, + /* 1 */ + }, + { + .name =3D "cpu/instructions/G", + .valid =3D test__pmu_cpu_valid, + .check =3D test__checkevent_exclude_host_modifier, + /* 2 */ + }, + { + .name =3D "cpu/instructions/H", + .valid =3D test__pmu_cpu_valid, + .check =3D test__checkevent_exclude_guest_modifier, + /* 3 */ + }, + { + .name =3D "{cpu/instructions/k,cpu/cycles/upp}", + .valid =3D test__pmu_cpu_valid, + .check =3D test__group1, + /* 4 */ + }, + { + .name =3D "{cpu/cycles/u,cpu/instructions/kp}:p", + .valid =3D test__pmu_cpu_valid, + .check =3D test__group4, + /* 5 */ + }, + { + .name =3D "{cpu/cycles/,cpu/cache-misses/G}:H", + .valid =3D test__pmu_cpu_valid, + .check =3D test__group_gh1, + /* 6 */ + }, + { + .name =3D "{cpu/cycles/,cpu/cache-misses/H}:G", + .valid =3D test__pmu_cpu_valid, + .check =3D test__group_gh2, + /* 7 */ + }, + { + .name =3D "{cpu/cycles/G,cpu/cache-misses/H}:u", + .valid =3D test__pmu_cpu_valid, + .check =3D test__group_gh3, + /* 8 */ + }, + { + .name =3D "{cpu/cycles/G,cpu/cache-misses/H}:uG", + .valid =3D test__pmu_cpu_valid, + .check =3D test__group_gh4, + /* 9 */ + }, + { + .name =3D "{cpu/cycles/,cpu/cache-misses/,cpu/branch-misses/}:S", + .valid =3D test__pmu_cpu_valid, + .check =3D test__leader_sample1, + /* 0 */ + }, + { + .name =3D "{cpu/instructions/,cpu/branch-misses/}:Su", + .valid =3D test__pmu_cpu_valid, + .check =3D test__leader_sample2, + /* 1 */ + }, + { + .name =3D "cpu/instructions/uDp", + .valid =3D test__pmu_cpu_valid, + .check =3D test__checkevent_pinned_modifier, + /* 2 */ + }, + { + .name =3D "{cpu/cycles/,cpu/cache-misses/,cpu/branch-misses/}:D", + .valid =3D test__pmu_cpu_valid, + .check =3D test__pinned_group, + /* 3 */ + }, + { + .name =3D "cpu/instructions/I", + .valid =3D test__pmu_cpu_valid, + .check =3D test__checkevent_exclude_idle_modifier, + /* 4 */ + }, + { + .name =3D "cpu/instructions/kIG", + .valid =3D test__pmu_cpu_valid, + .check =3D test__checkevent_exclude_idle_modifier_1, + /* 5 */ + }, + { + .name =3D "cpu/cycles/u", + .valid =3D test__pmu_cpu_valid, + .check =3D test__sym_event_slash, + /* 6 */ + }, + { + .name =3D "cpu/cycles/k", + .valid =3D test__pmu_cpu_valid, + .check =3D test__sym_event_dc, + /* 7 */ + }, + { + .name =3D "cpu/instructions/uep", + .valid =3D test__pmu_cpu_valid, + .check =3D test__checkevent_exclusive_modifier, + /* 8 */ + }, + { + .name =3D "{cpu/cycles/,cpu/cache-misses/,cpu/branch-misses/}:e", + .valid =3D test__pmu_cpu_valid, + .check =3D test__exclusive_group, + /* 9 */ + }, }; =20 struct terms_test { diff --git a/tools/perf/util/parse-events.c b/tools/perf/util/parse-events.c index 29fa84c4cdd4..27c179323b6d 100644 --- a/tools/perf/util/parse-events.c +++ b/tools/perf/util/parse-events.c @@ -1053,6 +1053,7 @@ static const char *config_term_names[__PARSE_EVENTS__= TERM_TYPE_NR] =3D { [PARSE_EVENTS__TERM_TYPE_METRIC_ID] =3D "metric-id", [PARSE_EVENTS__TERM_TYPE_RAW] =3D "raw", [PARSE_EVENTS__TERM_TYPE_LEGACY_CACHE] =3D "legacy-cache", + [PARSE_EVENTS__TERM_TYPE_HARDWARE] =3D "hardware", }; =20 static bool config_term_shrinked; @@ -1240,6 +1241,17 @@ static int config_term_pmu(struct perf_event_attr *a= ttr, } else term->type_term =3D PARSE_EVENTS__TERM_TYPE_USER; } + if (term->type_term =3D=3D PARSE_EVENTS__TERM_TYPE_HARDWARE) { + const struct perf_pmu *pmu =3D perf_pmu__find_by_type(attr->type); + + if (!pmu) { + pr_debug("Failed to find PMU for type %d", attr->type); + return -EINVAL; + } + attr->type =3D PERF_TYPE_HARDWARE; + attr->config =3D ((__u64)pmu->type << PERF_PMU_TYPE_SHIFT) | term->val.n= um; + return 0; + } if (term->type_term =3D=3D PARSE_EVENTS__TERM_TYPE_USER || term->type_term =3D=3D PARSE_EVENTS__TERM_TYPE_DRV_CFG) { /* @@ -2566,31 +2578,6 @@ int parse_events_term__str(struct parse_events_term = **term, return new_term(term, &temp, str, 0); } =20 -int parse_events_term__sym_hw(struct parse_events_term **term, - char *config, unsigned idx) -{ - struct event_symbol *sym; - char *str; - struct parse_events_term temp =3D { - .type_val =3D PARSE_EVENTS__TERM_TYPE_STR, - .type_term =3D PARSE_EVENTS__TERM_TYPE_USER, - .config =3D config, - }; - - if (!temp.config) { - temp.config =3D strdup("event"); - if (!temp.config) - return -ENOMEM; - } - BUG_ON(idx >=3D PERF_COUNT_HW_MAX); - sym =3D &event_symbols_hw[idx]; - - str =3D strdup(sym->symbol); - if (!str) - return -ENOMEM; - return new_term(term, &temp, str, 0); -} - 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 d4cbda6e946a..7fe80b416143 100644 --- a/tools/perf/util/parse-events.h +++ b/tools/perf/util/parse-events.h @@ -79,6 +79,7 @@ enum { PARSE_EVENTS__TERM_TYPE_METRIC_ID, PARSE_EVENTS__TERM_TYPE_RAW, PARSE_EVENTS__TERM_TYPE_LEGACY_CACHE, + PARSE_EVENTS__TERM_TYPE_HARDWARE, __PARSE_EVENTS__TERM_TYPE_NR, }; =20 @@ -147,8 +148,6 @@ 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__sym_hw(struct parse_events_term **term, - char *config, unsigned idx); 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.l b/tools/perf/util/parse-events.l index abe0ce681d29..6deb70c25984 100644 --- a/tools/perf/util/parse-events.l +++ b/tools/perf/util/parse-events.l @@ -149,6 +149,16 @@ static int term(yyscan_t scanner, int type) return PE_TERM; } =20 +static int hw_term(yyscan_t scanner, int config) +{ + YYSTYPE *yylval =3D parse_events_get_lval(scanner); + char *text =3D parse_events_get_text(scanner); + + yylval->hardware_term.str =3D strdup(text); + yylval->hardware_term.num =3D PERF_TYPE_HARDWARE + config; + return PE_TERM_HW; +} + #define YY_USER_ACTION \ do { \ yylloc->last_column =3D yylloc->first_column; \ @@ -269,6 +279,16 @@ percore { return term(yyscanner, PARSE_EVENTS__TERM_= TYPE_PERCORE); } aux-output { return term(yyscanner, PARSE_EVENTS__TERM_TYPE_AUX_OUTPUT); } aux-sample-size { return term(yyscanner, PARSE_EVENTS__TERM_TYPE_AUX_SAMP= LE_SIZE); } metric-id { return term(yyscanner, PARSE_EVENTS__TERM_TYPE_METRIC_ID); } +cpu-cycles|cycles { return hw_term(yyscanner, PERF_COUNT_HW_CPU_CYCLES)= ; } +stalled-cycles-frontend|idle-cycles-frontend { return hw_term(yyscanner, P= ERF_COUNT_HW_STALLED_CYCLES_FRONTEND); } +stalled-cycles-backend|idle-cycles-backend { return hw_term(yyscanner, PER= F_COUNT_HW_STALLED_CYCLES_BACKEND); } +instructions { return hw_term(yyscanner, PERF_COUNT_HW_INSTRUCTIONS); } +cache-references { return hw_term(yyscanner, PERF_COUNT_HW_CACHE_REFERE= NCES); } +cache-misses { return hw_term(yyscanner, PERF_COUNT_HW_CACHE_MISSES); } +branch-instructions|branches { return hw_term(yyscanner, PERF_COUNT_HW_B= RANCH_INSTRUCTIONS); } +branch-misses { return hw_term(yyscanner, PERF_COUNT_HW_BRANCH_MISSES)= ; } +bus-cycles { return hw_term(yyscanner, PERF_COUNT_HW_BUS_CYCLES); } +ref-cycles { return hw_term(yyscanner, PERF_COUNT_HW_REF_CPU_CYCLES); } r{num_raw_hex} { return str(yyscanner, PE_RAW); } r0x{num_raw_hex} { return str(yyscanner, PE_RAW); } , { return ','; } diff --git a/tools/perf/util/parse-events.y b/tools/perf/util/parse-events.y index c95877cbd6cf..819a5123fd77 100644 --- a/tools/perf/util/parse-events.y +++ b/tools/perf/util/parse-events.y @@ -65,6 +65,7 @@ static void free_list_evsel(struct list_head* list_evsel) %token PE_KERNEL_PMU_EVENT PE_PMU_EVENT_FAKE %token PE_ARRAY_ALL PE_ARRAY_RANGE %token PE_DRV_CFG_TERM +%token PE_TERM_HW %type PE_VALUE %type PE_VALUE_SYM_HW %type PE_VALUE_SYM_SW @@ -112,6 +113,8 @@ static void free_list_evsel(struct list_head* list_evse= l) %type array_term %type array_terms %destructor { free ($$.ranges); } +%type PE_TERM_HW +%destructor { free ($$.str); } =20 %union { @@ -125,6 +128,10 @@ static void free_list_evsel(struct list_head* list_evs= el) char *event; } tracepoint_name; struct parse_events_array array; + struct hardware_term { + char *str; + u64 num; + } hardware_term; } %% =20 @@ -770,13 +777,14 @@ name_or_raw '=3D' PE_VALUE $$ =3D term; } | -name_or_raw '=3D' PE_VALUE_SYM_HW +name_or_raw '=3D' PE_TERM_HW { struct parse_events_term *term; - int config =3D $3 & 255; =20 - if (parse_events_term__sym_hw(&term, $1, config)) { + if (parse_events_term__str(&term, PARSE_EVENTS__TERM_TYPE_USER, + $1, $3.str, &@1, &@3)) { free($1); + free($3.str); YYABORT; } $$ =3D term; @@ -806,12 +814,15 @@ PE_NAME $$ =3D term; } | -PE_VALUE_SYM_HW +PE_TERM_HW { struct parse_events_term *term; - int config =3D $1 & 255; =20 - ABORT_ON(parse_events_term__sym_hw(&term, NULL, config)); + if (parse_events_term__num(&term, PARSE_EVENTS__TERM_TYPE_HARDWARE, + $1.str, $1.num & 255, false, &@1, NULL)) { + free($1.str); + YYABORT; + } $$ =3D term; } | @@ -826,6 +837,17 @@ PE_TERM '=3D' PE_NAME $$ =3D term; } | +PE_TERM '=3D' PE_TERM_HW +{ + struct parse_events_term *term; + + if (parse_events_term__str(&term, (int)$1, NULL, $3.str, &@1, &@3)) { + free($3.str); + YYABORT; + } + $$ =3D term; +} +| PE_TERM '=3D' PE_VALUE { struct parse_events_term *term; --=20 2.40.1.495.gc816e09b53d-goog