Received: by 2002:a05:6358:3188:b0:123:57c1:9b43 with SMTP id q8csp487789rwd; Sat, 27 May 2023 00:58:39 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ4vLtRH2ivcRUJ8SU2Wp3NNP6WgVM9/bwCqtgUioJJ43N80UtIWTd2STqPM3W86DE9AyMJp X-Received: by 2002:a17:903:32c6:b0:1ac:7260:80a7 with SMTP id i6-20020a17090332c600b001ac726080a7mr6215571plr.43.1685174319398; Sat, 27 May 2023 00:58:39 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1685174319; cv=none; d=google.com; s=arc-20160816; b=rfP/1VTMf1daH7xqNPTrfYbNwALFk+jKFRZ8NZEFpPxns5fgybeYqB2lYHex5brxze APCXWLLmMpD3QZQPidF4TtSVRWqx63xifUmmSY5Te0c+s81Gwjd8SQOr3E4Sd1ci0xux TvMzF4rfrelps9Cmv1vVj7gEMKPnh5zZqoIirw3lzYTEY6N7aUd/USzlaTERfhuMnIkv kP3j4H/ScD8BRmh2nY3MhIe7CoqWhPf+/oNEWmntCxHZUltPG4o0MCGvUpLUDSxCjH+Q xZi7PaXk6AiQopXWhDMJlqEw0V3IkHj71f8V8xbPIfz2c4hjVXsrrhDKsND5Lgo/Ef13 drkQ== 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=I37rqh5cG8jyPI8CnkZDKw7uLKTCQzZXDibgw5Pks+s=; b=yuQTk5fLqIf2asgrah6pFO+f10ATcgeFj3Ccgqay1vGIBZtHLRwxVz7S4DsRWVHdgI pUpRdmJT/CZOGc6p+Z1arkWOyBlR+k/40X6XREamQh+uaawBiUWn0Qhm5On+6LqCuo16 caCt6rlBTqF5v9qTkSTN1jzLO1Wf0LYefsrBCMBqnTWyr72Q9/dB6OVw4RCBV1s3ajyp Mwok+Zv8SFkn1wFqLt2XF8zNjnW6ArwJ/jV8RuaQLT9rQ0XbVsMCcA9SF3hthuw5Zta8 7Mh8pWUjcZGXV4SBlOi2kekS9Z0gthyCxdIO1wJz7tdo2SbGmnHpYz0ODciEcpMgeewT LjOA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@google.com header.s=20221208 header.b=JbaNTb+Y; 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 b3-20020a170902d50300b001a9265e6fdasi6367272plg.268.2023.05.27.00.58.26; Sat, 27 May 2023 00:58:39 -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=JbaNTb+Y; 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 S231734AbjE0H0V (ORCPT + 99 others); Sat, 27 May 2023 03:26:21 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57612 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S238370AbjE0HZm (ORCPT ); Sat, 27 May 2023 03:25:42 -0400 Received: from mail-yw1-x114a.google.com (mail-yw1-x114a.google.com [IPv6:2607:f8b0:4864:20::114a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id F14C2E62 for ; Sat, 27 May 2023 00:25:10 -0700 (PDT) Received: by mail-yw1-x114a.google.com with SMTP id 00721157ae682-564feceb97dso30664357b3.2 for ; Sat, 27 May 2023 00:25:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20221208; t=1685172232; x=1687764232; h=to:from:subject:references:mime-version:message-id:in-reply-to:date :from:to:cc:subject:date:message-id:reply-to; bh=I37rqh5cG8jyPI8CnkZDKw7uLKTCQzZXDibgw5Pks+s=; b=JbaNTb+YoFBnILHze5B/sosyUm2MQP4Y0jSpgE6FaHOPiwbbxJRmEIw9vuZN0VhkXs rboTkzWd7Sw+pkmZvebpDXVN90UnkVKIj82VLkm8mTqJHEEJxsJxr2Z1tXHLAOGL4H3E kMV+E4kmR+rr29EnsOQs3QbH1dAVsrcOcuHnmeG/Z+/FyXu9CSX/3ijEYMczyoRo/d3B qHygUAFcT4AlyEJmP0HGJnsBzoc7gqzozDrFRvJaWYQ4m09f8/X53tcaTtiT53LXYCyi gmvSR0h6sT2Pz0YuhnE8Yt6w045BVknASZuz8iBog8fae1znZJyK9PhmRPH1GN3aHyTm T/0w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1685172232; x=1687764232; 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=I37rqh5cG8jyPI8CnkZDKw7uLKTCQzZXDibgw5Pks+s=; b=lDkHcB2waXjhnJ7EWnq7D7PoM6NDxPqXPB4RSOLqpRFl0h0uJXSWI7Z76mzWr0Ocm0 opammTOtlV9bcrRYst7CukTZ8UjM1Bkm42WmICbo/L9OtVxf0Pd7AM33CW2uuMDztvtr LfJKZUtCR/QfXGssrgcJksTd/5aTB901EhLIkldRwIUI+LS57C7Wtdh8NzY5CcfLJLuN veIXzY+yjajGM4FSovgr2sbek+gWQi/CRUuC3xmOWz6om5zErbkHFbkRVlx2tFlXU/E6 0rUmR/GtqI0nquqE66BaCuj1bN2v9EKcrak4LiEs9oMbhiMe5L/2Gs5tKN+balt9adh4 L9VA== X-Gm-Message-State: AC+VfDwKh/bwVtvyZw9/mqtuDbhc5kM069VuTvIQ3ujhdDGBM5xseLcg 06xVeVVih+CX129xu3P5RYEqBfgvI2NJ X-Received: from irogers.svl.corp.google.com ([2620:15c:2d4:203:3b4e:312c:644:a642]) (user=irogers job=sendgmr) by 2002:a25:84c8:0:b0:ba8:90c9:f7bd with SMTP id x8-20020a2584c8000000b00ba890c9f7bdmr1556932ybm.6.1685172232617; Sat, 27 May 2023 00:23:52 -0700 (PDT) Date: Sat, 27 May 2023 00:22:10 -0700 In-Reply-To: <20230527072210.2900565-1-irogers@google.com> Message-Id: <20230527072210.2900565-35-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 34/34] perf pmu: Remove is_pmu_hybrid 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 Users have been removed or switched to using pmu->is_core with perf_pmus__num_core_pmus() > 1. Signed-off-by: Ian Rogers Reviewed-by: Kan Liang --- tools/perf/util/pmu.c | 7 +------ tools/perf/util/pmu.h | 1 - 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/tools/perf/util/pmu.c b/tools/perf/util/pmu.c index 7102084dd3aa..0520aa9fe991 100644 --- a/tools/perf/util/pmu.c +++ b/tools/perf/util/pmu.c @@ -1417,11 +1417,6 @@ bool is_pmu_core(const char *name) return !strcmp(name, "cpu") || is_sysfs_pmu_core(name); } -bool is_pmu_hybrid(const char *name) -{ - return !strcmp(name, "cpu_atom") || !strcmp(name, "cpu_core"); -} - bool perf_pmu__supports_legacy_cache(const struct perf_pmu *pmu) { return pmu->is_core; @@ -1429,7 +1424,7 @@ bool perf_pmu__supports_legacy_cache(const struct perf_pmu *pmu) bool perf_pmu__auto_merge_stats(const struct perf_pmu *pmu) { - return !is_pmu_hybrid(pmu->name); + return pmu->is_core && perf_pmus__num_core_pmus() > 1; } bool perf_pmu__have_event(const struct perf_pmu *pmu, const char *name) diff --git a/tools/perf/util/pmu.h b/tools/perf/util/pmu.h index 02fec0a7d4c8..287f593b15c7 100644 --- a/tools/perf/util/pmu.h +++ b/tools/perf/util/pmu.h @@ -221,7 +221,6 @@ int perf_pmu__format_parse(int dirfd, struct list_head *head); void perf_pmu__del_formats(struct list_head *formats); bool is_pmu_core(const char *name); -bool is_pmu_hybrid(const char *name); bool perf_pmu__supports_legacy_cache(const struct perf_pmu *pmu); bool perf_pmu__auto_merge_stats(const struct perf_pmu *pmu); bool perf_pmu__have_event(const struct perf_pmu *pmu, const char *name); -- 2.41.0.rc0.172.g3f132b7071-goog