Received: by 2002:a05:6358:3188:b0:123:57c1:9b43 with SMTP id q8csp479482rwd; Sat, 27 May 2023 00:45:24 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ7pLtferxJr1e3VRe6YAzgvXiFRD78rEERGMjAt8zuT36Oe8cEHvjTo5JaFWbcrR0y+vor5 X-Received: by 2002:a17:903:2281:b0:1af:d724:63ed with SMTP id b1-20020a170903228100b001afd72463edmr6575273plh.42.1685173524004; Sat, 27 May 2023 00:45:24 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1685173523; cv=none; d=google.com; s=arc-20160816; b=XmlkrbPeYV/JyiZiQhCBfJEAbY4CTG3V93j3ovvrIs540jU6tUWmzc2XGRJhg8hepH aTJOe1Ho68wGazCjEMgJDlUq0UHa0pUAfjsFRZerepiYMS1eYRwk1TBV2cEdVX6hMSY8 Au4o5uyTXQT+yqGmGrIIxFJDDF1rd4cNpOV4vm0buqdjhMGwhInnCnzpWwzYNB5SJX/j NNCq4sDfMtMK3sYTh6WRK0Epw2IzQqRSoUAtCFgMDKo9m3J+ZC9tDQ4cYE3Nchc9Kims l/bAHrQY0lVmDNNPBpyG2amIMUgoSWG5R2DPWeUZe9mjaBezhL5mANe1dGV70238Y0mB /zqQ== 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=FHLFLct9vm+JF5+hDruAHJApiqqRufRTiKPYhWzqyW8=; b=GdbBYLGNVWmi4+tX0wDvMsjqpHdEpjHGOawc76oZFz3BQqJvVp589GFrq6iiK1lk0J DOnPqm3K66Z2S0VdrIh58eodWQUfWAzPjIy5DHZz/hv3QKs1If32T7Ady6YG6wYMvD2j sB53wk0tGrqoL2eum4AC8jcUQAt45sG2TcqwaqTZIoJ/eAsgfvkiGJVVc7WYzs5YEku8 CmusfAzXSseb1Ig/2g97qfOcV2pnBbZ6ZAe2tZyej2yslpixHQa1xfum5UzCLb/XFgiz 2XLUipk9s2krUdHm6qRPNakrXg64CuiGyAK5n8SjJZakLMo8r6HhmQzh9/+yZAXKtB17 hN1A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@google.com header.s=20221208 header.b=D2qs1+2g; 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 bi12-20020a170902bf0c00b001a81741ef8dsi5634956plb.54.2023.05.27.00.45.10; Sat, 27 May 2023 00:45:23 -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=D2qs1+2g; 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 S231307AbjE0H0t (ORCPT + 99 others); Sat, 27 May 2023 03:26:49 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57608 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232643AbjE0HYn (ORCPT ); Sat, 27 May 2023 03:24:43 -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 CBF59E5F for ; Sat, 27 May 2023 00:24:15 -0700 (PDT) Received: by mail-yw1-x1149.google.com with SMTP id 00721157ae682-561ceb5b584so36304577b3.3 for ; Sat, 27 May 2023 00:24:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20221208; t=1685172209; x=1687764209; h=to:from:subject:references:mime-version:message-id:in-reply-to:date :from:to:cc:subject:date:message-id:reply-to; bh=FHLFLct9vm+JF5+hDruAHJApiqqRufRTiKPYhWzqyW8=; b=D2qs1+2gQYcy535RVl8wRKH2AtL1YY9IATjaPsIOp0mD/kSwcHTf6sqSbx2Q25A/Ip Qunpa+3bnv2u7jog+DMq2KwQcNmIH5UsO0bDtIILc/SK2VHas8cnperp6veHd+KXwFyA mk9HRfVspROJkhMmHviSDTe5zYdLKnUf7AND1hvLJk4CN45g7nz9ksJETKKuxbeBpPKV Zil6RbFQjI4Qz2mCm5G+3zqo6PL5u2jszJ0ew6oleuV+ROepeetxJJ7kpTUulJqRJOkj dqanEGSzS6ilVE4DjH6qdeWFA1qptnCCgN/jL3zfg1CJKTc9Ce6mPHjm7ejnpNELxhYg oojg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1685172209; x=1687764209; 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=FHLFLct9vm+JF5+hDruAHJApiqqRufRTiKPYhWzqyW8=; b=GOhf/seAJpiOGzCfZwKqs1OlMjtSHyFuGd+PZdvngkhQHN7jvzYhS4d6Ko2JOuL/ZI KpfWiR83PxM29BZlmVqS8ZgT24SZeZzRHSCD0qTRb9zOO4N2a70bvBTUkvwcQpEViaiF AhmbjLySM+d4OgFecCs577mag0OstrOU/0qZn1My9yOwKNdXDM2+97Pg8cO7LWu3f2Dz P7KsJbmNA+/jkQc83ylRMvVkqMFhotqoKyzJnTKtTz0oFKlMJym25rAGZFS/dO3l+eh9 Ywiryckm51KQG4y+7i98RKhIgLZmYW6NkF1AIECwNNkdI2I0Ubh1H6WBXt8eZy9r62Wl TqQg== X-Gm-Message-State: AC+VfDy4wHWbee7yvTAO03hAyAX7wRjnt26GowaFLlIvbgJ2HHgvQPc+ 52hLUv3OULVcQ+nAYBYo74h6vgdL7By7 X-Received: from irogers.svl.corp.google.com ([2620:15c:2d4:203:3b4e:312c:644:a642]) (user=irogers job=sendgmr) by 2002:a81:c945:0:b0:561:c9c0:98d9 with SMTP id c5-20020a81c945000000b00561c9c098d9mr2522323ywl.4.1685172209623; Sat, 27 May 2023 00:23:29 -0700 (PDT) Date: Sat, 27 May 2023 00:22:00 -0700 In-Reply-To: <20230527072210.2900565-1-irogers@google.com> Message-Id: <20230527072210.2900565-25-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 24/34] perf pmu: Remove perf_pmu__hybrid_pmus list 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=unavailable 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 Rather than iterate hybrid PMUs, inhererently Intel specific, iterate all PMUs checking whether they are core. To only get hybrid cores, first call perf_pmu__has_hybrid. Signed-off-by: Ian Rogers Reviewed-by: Kan Liang --- tools/perf/builtin-record.c | 1 - tools/perf/util/Build | 1 - tools/perf/util/pmu-hybrid.c | 39 ------------------------------ tools/perf/util/pmu-hybrid.h | 29 ---------------------- tools/perf/util/pmu.c | 7 ------ tools/perf/util/pmu.h | 2 -- tools/perf/util/print-events.c | 1 - tools/perf/util/python-ext-sources | 1 - 8 files changed, 81 deletions(-) delete mode 100644 tools/perf/util/pmu-hybrid.c delete mode 100644 tools/perf/util/pmu-hybrid.h diff --git a/tools/perf/builtin-record.c b/tools/perf/builtin-record.c index e30e8d6a6575..2abcad2998f6 100644 --- a/tools/perf/builtin-record.c +++ b/tools/perf/builtin-record.c @@ -49,7 +49,6 @@ #include "util/util.h" #include "util/pfm.h" #include "util/clockid.h" -#include "util/pmu-hybrid.h" #include "util/off_cpu.h" #include "util/bpf-filter.h" #include "asm/bug.h" diff --git a/tools/perf/util/Build b/tools/perf/util/Build index 21e4cdcba504..0d68be51a739 100644 --- a/tools/perf/util/Build +++ b/tools/perf/util/Build @@ -73,7 +73,6 @@ perf-y += pmu.o perf-y += pmus.o perf-y += pmu-flex.o perf-y += pmu-bison.o -perf-y += pmu-hybrid.o perf-y += svghelper.o perf-$(CONFIG_LIBTRACEEVENT) += trace-event-info.o perf-y += trace-event-scripting.o diff --git a/tools/perf/util/pmu-hybrid.c b/tools/perf/util/pmu-hybrid.c deleted file mode 100644 index 7fe943dd3217..000000000000 --- a/tools/perf/util/pmu-hybrid.c +++ /dev/null @@ -1,39 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0 -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include "fncache.h" -#include "pmu-hybrid.h" - -LIST_HEAD(perf_pmu__hybrid_pmus); - -static struct perf_pmu *perf_pmu__find_hybrid_pmu(const char *name) -{ - struct perf_pmu *pmu; - - if (!name) - return NULL; - - perf_pmu__for_each_hybrid_pmu(pmu) { - if (!strcmp(name, pmu->name)) - return pmu; - } - - return NULL; -} - -bool perf_pmu__is_hybrid(const char *name) -{ - return perf_pmu__find_hybrid_pmu(name) != NULL; -} diff --git a/tools/perf/util/pmu-hybrid.h b/tools/perf/util/pmu-hybrid.h deleted file mode 100644 index 8dbcae935020..000000000000 --- a/tools/perf/util/pmu-hybrid.h +++ /dev/null @@ -1,29 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0 */ -#ifndef __PMU_HYBRID_H -#define __PMU_HYBRID_H - -#include -#include -#include -#include -#include "pmu.h" - -extern struct list_head perf_pmu__hybrid_pmus; - -#define perf_pmu__for_each_hybrid_pmu(pmu) \ - list_for_each_entry(pmu, &perf_pmu__hybrid_pmus, hybrid_list) - -bool perf_pmu__is_hybrid(const char *name); - -static inline int perf_pmu__hybrid_pmu_num(void) -{ - struct perf_pmu *pmu; - int num = 0; - - perf_pmu__for_each_hybrid_pmu(pmu) - num++; - - return num; -} - -#endif /* __PMU_HYBRID_H */ diff --git a/tools/perf/util/pmu.c b/tools/perf/util/pmu.c index 65daa0cc71d6..21ee23b78f5a 100644 --- a/tools/perf/util/pmu.c +++ b/tools/perf/util/pmu.c @@ -32,7 +32,6 @@ #include "string2.h" #include "strbuf.h" #include "fncache.h" -#include "pmu-hybrid.h" #include "util/evsel_config.h" struct perf_pmu perf_pmu__fake; @@ -954,11 +953,6 @@ static struct perf_pmu *pmu_lookup(int dirfd, const char *lookup_name) list_splice(&aliases, &pmu->aliases); list_add_tail(&pmu->list, &pmus); - if (!strcmp(name, "cpu_core") || !strcmp(name, "cpu_atom")) - list_add_tail(&pmu->hybrid_list, &perf_pmu__hybrid_pmus); - else - INIT_LIST_HEAD(&pmu->hybrid_list); - pmu->default_config = perf_pmu__get_default_config(pmu); return pmu; @@ -2131,7 +2125,6 @@ void perf_pmu__destroy(void) list_for_each_entry_safe(pmu, tmp, &pmus, list) { list_del(&pmu->list); - list_del(&pmu->hybrid_list); perf_pmu__delete(pmu); } diff --git a/tools/perf/util/pmu.h b/tools/perf/util/pmu.h index 5f5de7c20ab6..cb51ad6e40fa 100644 --- a/tools/perf/util/pmu.h +++ b/tools/perf/util/pmu.h @@ -119,8 +119,6 @@ struct perf_pmu { struct list_head caps; /** @list: Element on pmus list in pmu.c. */ struct list_head list; - /** @hybrid_list: Element on perf_pmu__hybrid_pmus. */ - struct list_head hybrid_list; /** * @missing_features: Features to inhibit when events on this PMU are diff --git a/tools/perf/util/print-events.c b/tools/perf/util/print-events.c index 69492cbd6921..8d823bc906e6 100644 --- a/tools/perf/util/print-events.c +++ b/tools/perf/util/print-events.c @@ -26,7 +26,6 @@ #include "strlist.h" #include "tracepoint.h" #include "pfm.h" -#include "pmu-hybrid.h" #include "thread_map.h" #define MAX_NAME_LEN 100 diff --git a/tools/perf/util/python-ext-sources b/tools/perf/util/python-ext-sources index aa5156c2bcff..d4c9b4cd35ef 100644 --- a/tools/perf/util/python-ext-sources +++ b/tools/perf/util/python-ext-sources @@ -39,5 +39,4 @@ util/affinity.c util/rwsem.c util/hashmap.c util/perf_regs.c -util/pmu-hybrid.c util/fncache.c -- 2.41.0.rc0.172.g3f132b7071-goog