Received: by 2002:a05:6358:9144:b0:117:f937:c515 with SMTP id r4csp3036246rwr; Fri, 28 Apr 2023 22:41:25 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ7q19fErlXZ3h6DQmwMGcKTL9NDrlLEVa4Urend7Px0R/UK/SKFfTSbBtMahEmHJv0KHWCb X-Received: by 2002:a17:90a:15:b0:247:b1f7:9f67 with SMTP id 21-20020a17090a001500b00247b1f79f67mr6626877pja.4.1682746884913; Fri, 28 Apr 2023 22:41:24 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1682746884; cv=none; d=google.com; s=arc-20160816; b=aoSDP8pyAXB56p90T+rDQgFX6XScR5kMvDzo+uy+Az8vjFsxus0O03eKe8h7Z1+elP Azp0J9l1hWSWZS2NT+hp52cGDGkOYlNk+k5v8TI5LRAJOcYPacl8D2Z6mUyA7y6kgiQO +SeaRq37hS814uCdc+D/TG96gkuLvC42r5F/ZQcx30paGxYp1c46n8eCBobS9esY+zA9 JcolL/Z/fEALp5RRDSmwBTNrWFAKfx8Ix3pVX3KaSLc/pLyHolG5Jm2ExVQBKOG4DqJo zQiYyFlV0XPJjrt4AeweQ9LsOkF994yezBc4b5ME1b9NGYqXPx8ohGeOHF+iglYi5M5r IYeg== 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=ohDDuv+O+O1AO0fzCB79qmFkbP0s7sjsI45WHmWzJyM=; b=ytqh906RVrMPmmWDBFSUkWCuvmCj72tO9FJD+m9iEkiYtoEHVVm9tWUJWTnJ4eTS55 ldE0I+wCQuLdR/V1a4HrlCUiO7f/CkNfFdGAKnbwergtkAip4KK2ozsNmVnz8eWLX7pK PblF7ud/4GR0+7lK8/KnmGhwg5Y7O693MkCRia4PJ6j8JxavP7AWPG6RpPNv0xBjrRsb EYqPzre84aw/GzrPz0ETSpPCKN3yR3HB2v0uZBvyCOBX8HEL8CVivDbs63/k8ethqGK5 zQq8EpAK6FnCux3bGjllmOO9AhAn0tJa6NDXtOb0nlPLp/J38UGq7iw5VHb/JrLmmm4Y 7OlQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@google.com header.s=20221208 header.b=rdsMGMh4; 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 r18-20020a6560d2000000b0050c10cfd6f8si22884465pgv.198.2023.04.28.22.41.12; Fri, 28 Apr 2023 22:41:24 -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=rdsMGMh4; 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 S1347356AbjD2Fkn (ORCPT + 99 others); Sat, 29 Apr 2023 01:40:43 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42864 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1347290AbjD2Fkm (ORCPT ); Sat, 29 Apr 2023 01:40:42 -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 50D0249F0 for ; Fri, 28 Apr 2023 22:40:02 -0700 (PDT) Received: by mail-yb1-xb49.google.com with SMTP id 3f1490d57ef6-b9a7766d1f2so590084276.3 for ; Fri, 28 Apr 2023 22:40:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20221208; t=1682746748; x=1685338748; h=cc:to:from:subject:references:mime-version:message-id:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=ohDDuv+O+O1AO0fzCB79qmFkbP0s7sjsI45WHmWzJyM=; b=rdsMGMh4vHjBSja+BzG/3o0kxrvuWiSspuqaN853GGdumkpDLXyzt9Lf7bQg9/wEF4 eZbL1iBRzZFQqF8s1xnsxDOC5jm9d9l/WbSd+IMd09uaCT2RGbuPRbikgBf09v5TUiQ9 2LMAznPzEdAJpBaBrJ9u7/v2J6LD0BY2TDHZOcYq7mCuAi10dOdqTk2cZKOX/b2KABQi jAxadVqjcvwyr8M8+pCsIJahp9FB0gKupn+sF19zo8LRUQE9gAKNj94OBZW042HJw36p KCrWO34baCemWcoTga4XE9S5v/B/8UgW2BBpZZeXhLtv6diwhnaaAGzQfxCM2j55wec6 vkcg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1682746748; x=1685338748; 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=ohDDuv+O+O1AO0fzCB79qmFkbP0s7sjsI45WHmWzJyM=; b=FplJs/xq9hXGLmq/X7XEFGiPCB7U/604f4+GxM4SIGTk32x2atW31TEAToL9z8Psu6 ZsJ4Ambng9qIX3pRIk+FEnkwbWQB83sBGZ95hhVIEMLah1UwkbjGZXoy6Fa4y9iT3Kni U4Ef3tZdIrVpEbAUALAQOeBBzT4v7K/PB5BLuEHJy8SD0twfDWlbLC4EeU/PIxPgXOrJ 7WvyQ/QPY4yPxnxHXivJjhBsxdAHJRLgxoewMY9H2oeX0ILl1MekBKXLMuVLttIN+GET L8lJJOKHfkNLYdozLiZylQyJWl5f69Nfv+vApa8Dqs4oW1NNkC/ZJoTfYMluUxVdMYBq dKWw== X-Gm-Message-State: AC+VfDy1ydkbNHvuaJxd+i1yysVm7dHsHWYPOff+lTfTI9uSJr159NXS Z48UfY7TC+kenNWuBiMYSltKNSKYrx1b X-Received: from irogers.svl.corp.google.com ([2620:15c:2d4:203:c563:7e28:fb7c:bce3]) (user=irogers job=sendgmr) by 2002:a05:6902:1003:b0:b8f:54f5:89ff with SMTP id w3-20020a056902100300b00b8f54f589ffmr4594997ybt.11.1682746747685; Fri, 28 Apr 2023 22:39:07 -0700 (PDT) Date: Fri, 28 Apr 2023 22:34:47 -0700 In-Reply-To: <20230429053506.1962559-1-irogers@google.com> Message-Id: <20230429053506.1962559-28-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 27/46] perf print-events: Print legacy cache events for each PMU 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=ham 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 Mirroring parse_events_add_cache, list the legacy name alongside its alias with the PMU. Remove the now unnecessary hybrid logic. Signed-off-by: Ian Rogers --- tools/perf/util/parse-events.c | 2 +- tools/perf/util/parse-events.h | 1 + tools/perf/util/print-events.c | 85 ++++++++++++++++------------------ 3 files changed, 41 insertions(+), 47 deletions(-) diff --git a/tools/perf/util/parse-events.c b/tools/perf/util/parse-events.c index 9f2bbf8f3a81..ec72f11fb37f 100644 --- a/tools/perf/util/parse-events.c +++ b/tools/perf/util/parse-events.c @@ -414,7 +414,7 @@ static int config_attr(struct perf_event_attr *attr, * contain hyphens and the longest name * should always be selected. */ -static int parse_events__decode_legacy_cache(const char *name, int pmu_type, __u64 *config) +int parse_events__decode_legacy_cache(const char *name, int pmu_type, __u64 *config) { int len, cache_type = -1, cache_op = -1, cache_result = -1; const char *name_end = &name[strlen(name) + 1]; diff --git a/tools/perf/util/parse-events.h b/tools/perf/util/parse-events.h index 0c26303f7f63..4e49be290209 100644 --- a/tools/perf/util/parse-events.h +++ b/tools/perf/util/parse-events.h @@ -173,6 +173,7 @@ int parse_events_add_tool(struct parse_events_state *parse_state, int parse_events_add_cache(struct list_head *list, int *idx, const char *name, struct parse_events_error *error, struct list_head *head_config); +int parse_events__decode_legacy_cache(const char *name, int pmu_type, __u64 *config); int parse_events_add_breakpoint(struct list_head *list, int *idx, u64 addr, char *type, u64 len); int parse_events_add_pmu(struct parse_events_state *parse_state, diff --git a/tools/perf/util/print-events.c b/tools/perf/util/print-events.c index 93bbb868d400..d416c5484cd5 100644 --- a/tools/perf/util/print-events.c +++ b/tools/perf/util/print-events.c @@ -226,56 +226,49 @@ void print_sdt_events(const struct print_callbacks *print_cb, void *print_state) int print_hwcache_events(const struct print_callbacks *print_cb, void *print_state) { + struct perf_pmu *pmu = NULL; const char *event_type_descriptor = event_type_descriptors[PERF_TYPE_HW_CACHE]; - for (int type = 0; type < PERF_COUNT_HW_CACHE_MAX; type++) { - for (int op = 0; op < PERF_COUNT_HW_CACHE_OP_MAX; op++) { - /* skip invalid cache type */ - if (!evsel__is_cache_op_valid(type, op)) - continue; + while ((pmu = perf_pmu__scan(pmu)) != NULL) { + /* + * Skip uncore PMUs for performance. Software PMUs can open + * PERF_TYPE_HW_CACHE, so skip. + */ + if (pmu->is_uncore || pmu->type == PERF_TYPE_SOFTWARE) + continue; - for (int res = 0; res < PERF_COUNT_HW_CACHE_RESULT_MAX; res++) { - struct perf_pmu *pmu = NULL; - char name[64]; - - __evsel__hw_cache_type_op_res_name(type, op, res, - name, sizeof(name)); - if (!perf_pmu__has_hybrid()) { - if (is_event_supported(PERF_TYPE_HW_CACHE, - type | (op << 8) | (res << 16))) { - print_cb->print_event(print_state, - "cache", - /*pmu_name=*/NULL, - name, - /*event_alias=*/NULL, - /*scale_unit=*/NULL, - /*deprecated=*/false, - event_type_descriptor, - /*desc=*/NULL, - /*long_desc=*/NULL, - /*encoding_desc=*/NULL); - } + for (int type = 0; type < PERF_COUNT_HW_CACHE_MAX; type++) { + for (int op = 0; op < PERF_COUNT_HW_CACHE_OP_MAX; op++) { + /* skip invalid cache type */ + if (!evsel__is_cache_op_valid(type, op)) continue; - } - perf_pmu__for_each_hybrid_pmu(pmu) { - if (is_event_supported(PERF_TYPE_HW_CACHE, - type | (op << 8) | (res << 16) | - ((__u64)pmu->type << PERF_PMU_TYPE_SHIFT))) { - char new_name[128]; - snprintf(new_name, sizeof(new_name), - "%s/%s/", pmu->name, name); - print_cb->print_event(print_state, - "cache", - pmu->name, - name, - new_name, - /*scale_unit=*/NULL, - /*deprecated=*/false, - event_type_descriptor, - /*desc=*/NULL, - /*long_desc=*/NULL, - /*encoding_desc=*/NULL); - } + + for (int res = 0; res < PERF_COUNT_HW_CACHE_RESULT_MAX; res++) { + char name[64]; + char alias_name[128]; + __u64 config; + int ret; + + __evsel__hw_cache_type_op_res_name(type, op, res, + name, sizeof(name)); + + ret = parse_events__decode_legacy_cache(name, pmu->type, + &config); + if (ret || !is_event_supported(PERF_TYPE_HW_CACHE, config)) + continue; + snprintf(alias_name, sizeof(alias_name), "%s/%s/", + pmu->name, name); + print_cb->print_event(print_state, + "cache", + pmu->name, + name, + alias_name, + /*scale_unit=*/NULL, + /*deprecated=*/false, + event_type_descriptor, + /*desc=*/NULL, + /*long_desc=*/NULL, + /*encoding_desc=*/NULL); } } } -- 2.40.1.495.gc816e09b53d-goog