Received: by 2002:a05:6358:3188:b0:123:57c1:9b43 with SMTP id q8csp477528rwd; Sat, 27 May 2023 00:42:26 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ4emzyNrRkKCbJwXZ+LcyS0fwEc+RP7R0VpoEQYH8X3OkQBF4WlnPF+PDofv7p/07s33PPp X-Received: by 2002:a05:6a20:7345:b0:100:9d6c:b49e with SMTP id v5-20020a056a20734500b001009d6cb49emr2593772pzc.58.1685173346340; Sat, 27 May 2023 00:42:26 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1685173346; cv=none; d=google.com; s=arc-20160816; b=0jeIWgqoIaWwbGWw4l/4AvFSEeLjO3utwunNR0Ni/0b0Iy65S501PcEGiZbNbONhQi LSRYq38AMQnh/g64cPGlCWq41Wn/cqqlEIOeQ/XqIeltPeztjb40aQS29mdVWivs7JHl 9QfOuJrhEeAvl6uYfkmYsGPJ0x6ttwNbSNSqwzueIJy751lrE+HUYlr8AlNndrQfs0iW xWwzLQoPXhOimUCmCq7jdmsDKzklTnBKPhUyA4dWxhdF5t2VCvdc/cUVIviXz5mE2Cob Q+WiTN9dTcUOozUIFtQXfisgQz/RypxQSwPmZvn74rFXqy4iezgypif+7ubsZ1zJqYdX 4WVw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:to:from:subject:references:mime-version :message-id:in-reply-to:date:dkim-signature; bh=FOWg7xv6khXlnHXVYLJhfsnkHXaBKspybsIekBElbCY=; b=ElpJC/2SnIjJQ45ttToogXO0JXypK4TsFf+jz0q4/XLvCBw0TPgmLe5YUM0cFjqLJe sQ6umabDqR0+mFGXehCSw8VJEmblTfMq9JiUQJVv0SK/NlkLysXt1B2N5bOU2JZEaz0/ T3zoEnJQh4VF0zf2usFR6Ly5A8ibn5B/jRcHI6PFYuY3YYsBJ248W/35YajK8hhNI1Fl w/l/00dehafn3QnyDAeeelvHExA7jkevu12/4KnTCt/YDxgfkERKwlBGN5r8mO5iYv0a ge/0eD5lWpcVyYSAVIxDBEl36B5SDLpTAjU2QViehOpJGBonPNeP+NUWyEh4lvX71n8D cdpw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@google.com header.s=20221208 header.b=W29SobjZ; 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 a24-20020a637f18000000b0053ef815daebsi641126pgd.253.2023.05.27.00.42.11; Sat, 27 May 2023 00:42:26 -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=W29SobjZ; 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 S232517AbjE0HZZ (ORCPT + 99 others); Sat, 27 May 2023 03:25:25 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57306 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232042AbjE0HYW (ORCPT ); Sat, 27 May 2023 03:24:22 -0400 Received: from mail-pj1-x1049.google.com (mail-pj1-x1049.google.com [IPv6:2607:f8b0:4864:20::1049]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id CE95CE50 for ; Sat, 27 May 2023 00:23:58 -0700 (PDT) Received: by mail-pj1-x1049.google.com with SMTP id 98e67ed59e1d1-255dfed764dso1870567a91.1 for ; Sat, 27 May 2023 00:23:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20221208; t=1685172202; x=1687764202; h=to:from:subject:references:mime-version:message-id:in-reply-to:date :from:to:cc:subject:date:message-id:reply-to; bh=FOWg7xv6khXlnHXVYLJhfsnkHXaBKspybsIekBElbCY=; b=W29SobjZ3cxFDl6VPrkoh3+hTzmmIGuh7R+StRgY4VOHdhuKyzKkwyZMofIV5PSAlV thSNjUb7W65Ac4cQ3mGf/3uGYoT0ubzWmD/nplbJegxhjrg0WBRm+WKfo7kWkfrP2208 GY1SZPN0kWlI1XYErt7mJ4ifDzZM6JBREiH8SMyzNL863KSEQTcgjjW8gawrvv05wdDI 6LuMAeuMrH/rUpoZvFTbl6uYdNmPqGmkPhEx3mly1xjr2ILImG1JsZCmfa+ZBSOeBhZG A/F2jcJyEMI+wfU0s4kF7wyFChMECTr4YFuP6EkaiDFUAUbyQ1dN4Y4QL+8K11+k4GT4 m9/g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1685172202; x=1687764202; 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=FOWg7xv6khXlnHXVYLJhfsnkHXaBKspybsIekBElbCY=; b=XsSix6YrfXb+Rx5yagZCXX2o4pIaTWBJoO+EH/HFHObb7/McOK7qteERCFzoQmRsMX YjLjUb1g5bYznd1Tjnpk1QJq8RBz44QTKQTACC3PUx8IEhx1A/l5lnvI3tbmLaLe+2Rf WfZmrFSq6ZLT1ELnDkNOGxjxGjJJuntFxl9N4mHrTEfDsDy3Fc+anxiN2FKREjG+e7/8 TM9BBR8ylxvgsGdLx6Yk4AZEYF0mUjSM6nPscbaHAQ2vFMhv2BXBGuOsxQDx8oqwSrsn Ynig+VOmZ4OGjUu5kf4TG3ilasQ0VpCSBJ2i4TIjYNiij1MIjBUOU+yn5LTDIacqYRdl d6PA== X-Gm-Message-State: AC+VfDxPPsezVn0TWp3iaLvFQIIhpWSfmyEPJS2MSBn8VEVwlmvMjPnQ k9bqPXjzsjcPOKxAzYt2IMa3Pi/FLSMJ X-Received: from irogers.svl.corp.google.com ([2620:15c:2d4:203:3b4e:312c:644:a642]) (user=irogers job=sendgmr) by 2002:a17:903:1cf:b0:1a6:a899:fe78 with SMTP id e15-20020a17090301cf00b001a6a899fe78mr1208202plh.2.1685172202649; Sat, 27 May 2023 00:23:22 -0700 (PDT) Date: Sat, 27 May 2023 00:21:57 -0700 In-Reply-To: <20230527072210.2900565-1-irogers@google.com> Message-Id: <20230527072210.2900565-22-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 21/34] perf metrics: Remove perf_pmu__is_hybrid use 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" 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 Switch from perf_pmu__is_hybrid to avoid implicitly using the hybrid PMU list. Signed-off-by: Ian Rogers Reviewed-by: Kan Liang --- tools/perf/util/metricgroup.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/tools/perf/util/metricgroup.c b/tools/perf/util/metricgroup.c index 80ffd6da70c7..3f04a686d1cd 100644 --- a/tools/perf/util/metricgroup.c +++ b/tools/perf/util/metricgroup.c @@ -11,7 +11,6 @@ #include "evsel.h" #include "strbuf.h" #include "pmu.h" -#include "pmu-hybrid.h" #include "print-events.h" #include "smt.h" #include "expr.h" @@ -274,7 +273,7 @@ static int setup_metric_events(const char *pmu, struct hashmap *ids, const char *metric_id; struct evsel *ev; size_t ids_size, matched_events, i; - bool all_pmus = !strcmp(pmu, "all") || !perf_pmu__is_hybrid(pmu); + bool all_pmus = !strcmp(pmu, "all") || !perf_pmu__has_hybrid() || !is_pmu_hybrid(pmu); *out_metric_events = NULL; ids_size = hashmap__size(ids); @@ -288,8 +287,7 @@ static int setup_metric_events(const char *pmu, struct hashmap *ids, struct expr_id_data *val_ptr; /* Don't match events for the wrong hybrid PMU. */ - if (!all_pmus && ev->pmu_name && - perf_pmu__is_hybrid(ev->pmu_name) && + if (!all_pmus && ev->pmu_name && evsel__is_hybrid(ev) && strcmp(ev->pmu_name, pmu)) continue; /* -- 2.41.0.rc0.172.g3f132b7071-goog