From mboxrd@z Thu Jan 1 00:00:00 1970 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 C1236C7EE23 for ; Sat, 27 May 2023 07:25:59 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237984AbjE0HZ6 (ORCPT ); Sat, 27 May 2023 03:25:58 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57482 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S238352AbjE0HZf (ORCPT ); Sat, 27 May 2023 03:25:35 -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 29EA3E4F for ; Sat, 27 May 2023 00:24:59 -0700 (PDT) Received: by mail-yw1-x1149.google.com with SMTP id 00721157ae682-56561689700so35754737b3.2 for ; Sat, 27 May 2023 00:24:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20221208; t=1685172228; x=1687764228; h=to:from:subject:references:mime-version:message-id:in-reply-to:date :from:to:cc:subject:date:message-id:reply-to; bh=vW2lbdpPJdg/r6QP2GPnX5xgemELHxkJ0mClCQxJlXE=; b=uzUf12s9yhSlYHSWmPiamqaCVuzarvHr//Lm3DeLpVKdny3NM9/V4jdSVhPz97qJ2Z zXDz7kmXqMq6TuJ7kVtu6iRDSxuMPsaktdVicJl/2LUt7mvU3hkvlS0RZ/PUFMvHEdRb bmkiZnQCjYARbtk2klizoAF+iHSJecfkOgsol1lce+OFn6dTQYFH6UcHaoK+QEFhK66+ VvzxQpV/7+xHnJXmQDDkJHX0wKljLw43fqnRKTSqkuah8ckch6ocmsbLAmcnIZ9tFRxt Brvk0DA3A5NajeZfU0Lefd1WNkiI/yZ3oJshq/nzIhM89W9QU3/+Tb9/ZE0leh1MG8iQ RETg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1685172228; x=1687764228; h=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=vW2lbdpPJdg/r6QP2GPnX5xgemELHxkJ0mClCQxJlXE=; b=fgxtV7mRGonHMIEVcvDfTmo5bvWE6o6EF7RDTmQWlQSLGl8fxd5zteNemJWdzyLEgJ nJRZLQcx4UAcpc0nn57bdnO49qdYblxkN7U5NCqTSVUkZFShrGnuLIbruNopHG8I12Vp u7hhgp5zJf49LY5+UsK+3EBVhJd9dlOmz0vWN79AqLuc1tWj6ji9ApVMKmkz9cBufBtr vUfzp6EjfvJYT2pdOBN78a9Oz6HUs0ZWiuVC4dV5u4dNfSglTtzTdCqKR87wZEGbqQzV E5iostcBScod1NWUTVdGHVTOGgiCFzB+Br7+ncvZVp8271z31Ez0AczMyX+rMazXtpso gihQ== X-Gm-Message-State: AC+VfDzXMJGfK7gSqDi76ySJyhZGRknrAv6wTROlNYC3WIM4GFPkAvIo nM55Bsy2c6/2puwmDh0peffE3nyjGSo6 X-Google-Smtp-Source: ACHHUZ41cQH6jnf4yOyAOqUAG71xGg12eViK6KDqDuQxV2LkUGIWW0ZK2l5nXD9R1+F00kcT4YFSjXiekF6n X-Received: from irogers.svl.corp.google.com ([2620:15c:2d4:203:3b4e:312c:644:a642]) (user=irogers job=sendgmr) by 2002:a81:c90b:0:b0:565:9abf:e057 with SMTP id o11-20020a81c90b000000b005659abfe057mr2579814ywi.9.1685172228274; Sat, 27 May 2023 00:23:48 -0700 (PDT) Date: Sat, 27 May 2023 00:22:08 -0700 In-Reply-To: <20230527072210.2900565-1-irogers@google.com> Message-Id: <20230527072210.2900565-33-irogers@google.com> Mime-Version: 1.0 References: <20230527072210.2900565-1-irogers@google.com> X-Mailer: git-send-email 2.41.0.rc0.172.g3f132b7071-goog Subject: [PATCH v5 32/34] perf pmus: Add function to return count of core PMUs From: Ian Rogers To: Suzuki K Poulose , Mike Leach , Leo Yan , John Garry , Will Deacon , James Clark , Peter Zijlstra , Ingo Molnar , Arnaldo Carvalho de Melo , Mark Rutland , Alexander Shishkin , Jiri Olsa , Namhyung Kim , Ian Rogers , Adrian Hunter , Kajol Jain , Jing Zhang , Kan Liang , Zhengjun Xing , Ravi Bangoria , Madhavan Srinivasan , Athira Rajeev , Ming Wang , Huacai Chen , Sandipan Das , Dmitrii Dolgov <9erthalion6@gmail.com>, Sean Christopherson , Ali Saidi , Rob Herring , Thomas Richter , Kang Minchul , linux-kernel@vger.kernel.org, coresight@lists.linaro.org, linux-arm-kernel@lists.infradead.org, linux-perf-users@vger.kernel.org Content-Type: text/plain; charset="UTF-8" Precedence: bulk List-ID: X-Mailing-List: linux-perf-users@vger.kernel.org Add perf_pmus__num_core_pmus that will count core PMUs holding the result in a static. Reuse for perf_pmus__num_mem_pmus. Signed-off-by: Ian Rogers Reviewed-by: Kan Liang --- tools/perf/util/pmus.c | 21 ++++++++++++++------- tools/perf/util/pmus.h | 1 + 2 files changed, 15 insertions(+), 7 deletions(-) diff --git a/tools/perf/util/pmus.c b/tools/perf/util/pmus.c index 6ecccb5ad03e..bf927aed162e 100644 --- a/tools/perf/util/pmus.c +++ b/tools/perf/util/pmus.c @@ -229,14 +229,8 @@ const struct perf_pmu *perf_pmus__pmu_for_pmu_filter(const char *str) int perf_pmus__num_mem_pmus(void) { - struct perf_pmu *pmu = NULL; - int count = 0; - /* All core PMUs are for mem events. */ - while ((pmu = perf_pmus__scan_core(pmu)) != NULL) - count++; - - return count; + return perf_pmus__num_core_pmus(); } /** Struct for ordering events as output in perf list. */ @@ -488,6 +482,19 @@ bool perf_pmus__has_hybrid(void) return has_hybrid; } +int perf_pmus__num_core_pmus(void) +{ + static int count; + + if (!count) { + struct perf_pmu *pmu = NULL; + + while ((pmu = perf_pmus__scan_core(pmu)) != NULL) + count++; + } + return count; +} + struct perf_pmu *evsel__find_pmu(const struct evsel *evsel) { struct perf_pmu *pmu = evsel->pmu; diff --git a/tools/perf/util/pmus.h b/tools/perf/util/pmus.h index 9de0222ed52b..27400a027d41 100644 --- a/tools/perf/util/pmus.h +++ b/tools/perf/util/pmus.h @@ -19,5 +19,6 @@ int perf_pmus__num_mem_pmus(void); void perf_pmus__print_pmu_events(const struct print_callbacks *print_cb, void *print_state); bool perf_pmus__have_event(const char *pname, const char *name); bool perf_pmus__has_hybrid(void); +int perf_pmus__num_core_pmus(void); #endif /* __PMUS_H */ -- 2.41.0.rc0.172.g3f132b7071-goog