Message ID | 20230517145803.559429-13-irogers@google.com (mailing list archive) |
---|---|
State | New, archived |
Headers | show
Return-Path: <linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org> X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id A2D8DC77B75 for <linux-arm-kernel@archiver.kernel.org>; Wed, 17 May 2023 15:41:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:To:From:Subject:References:Mime-Version :Message-Id:In-Reply-To:Date:Reply-To:Cc:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=l+Orobbg72zWJAzGT0L3Mi6Iz40JqrN3QvJNPTletec=; b=ElZ+VF2Pviyxeb 0PMF1HmCGpsAlgk8PNBK/iC5UBLF3ncu4/YOmQCs/3YPi7Pqks5D+SOfvasuG+6DW0reT4ui+qgbk eyNcYHLdSzhUl2Swx4fTqAtcYWE8Cjzgi3WH0M9V5LZJKrr4qYksGCUrSOs8CboBGFOQ+ED7oXe6Q dwwJpqo75wibGQf+SgW8cIZ+MizP/z7a6gVO164S0AU9s9TIz3FYhURLRH9Loxd8V4bVH488cLGD2 LGaz4YULptY2EPc/uuTRDKK/ZDOsnHmY9Dfr62XuV14qRIhDGDBfoBNCbpwZxjbnbpHae0rHCH9EL LSMmGV9MGmyPXK+ePLkw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1pzJGb-00AKXJ-0o; Wed, 17 May 2023 15:40:41 +0000 Received: from desiato.infradead.org ([2001:8b0:10b:1:d65d:64ff:fe57:4e05]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1pzJGU-00AKRB-1T for linux-arm-kernel@bombadil.infradead.org; Wed, 17 May 2023 15:40:34 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=desiato.20200630; h=Content-Type:To:From:Subject: References:Mime-Version:Message-Id:In-Reply-To:Date:Sender:Reply-To:Cc: Content-Transfer-Encoding:Content-ID:Content-Description; bh=Lf/8hxCzQpNjHzWukJV+4jFN6uFu6lEtBSl3J7I1nZY=; b=enHFztiurdlf5KeTjhDnRM05nj IiNFoy18wmteaTnzBQ7rl5l6wNgLjMSY6EgMFtRf8f2KJidugczPVsv5iosenmAPSAnP0E47YhPgU /UJiAp0MLidMxH64LcjzHJqKC/yy+cgc9Hk6ZuPwUs4irYgkTVWd16WAJdQnNAdKksFdCPe7l+fyg /drY0l+NGO3FKk9NYgeV+Tc7rTDLNYFk3TOeTALrvUrdS2vGZLbFFJZayl+pJBjUrCpkgcURyTBoy KvlBsx9O+Bjc8MyPTgS7vPvGSBirs8lezCO6qMhl4igvDL61qpRrYhs5J8bBNSOaPn3xy7YgMBAsa v6Bmu4XQ==; Received: from mail-yw1-x114a.google.com ([2607:f8b0:4864:20::114a]) by desiato.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1pzIcK-00DFt5-0Y for linux-arm-kernel@lists.infradead.org; Wed, 17 May 2023 14:59:05 +0000 Received: by mail-yw1-x114a.google.com with SMTP id 00721157ae682-55d9a9d19c9so13670867b3.1 for <linux-arm-kernel@lists.infradead.org>; Wed, 17 May 2023 07:59:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20221208; t=1684335542; x=1686927542; h=to:from:subject:references:mime-version:message-id:in-reply-to:date :from:to:cc:subject:date:message-id:reply-to; bh=Lf/8hxCzQpNjHzWukJV+4jFN6uFu6lEtBSl3J7I1nZY=; b=Nay2/Y9VQgRkTRjYQsrtoubcISP/lly9q68dZu16//xSdEEDB6jAKmPvCgKvS1MDp8 HB5c8R9YCQ3z6X0vYwmJ4REAKa1achWvqfjtuQeOkHwKI6mPFZzsXzV0bLAPjJzGizOT yNeqSVIuNkDzx9x0wuPgl9A88c5JaTJ9ftM3pjuLC6DtYfIPMF/0H8GRVJBfhbvb9CWx U2gEue7Js3gsKbw8iT6iavD0UcikLr4+5jvoUoge3l1eQb6CKb1O+sF1DXnLhsb1oshp b6SJZvu6wsr/Xq0RiD+htui3aZHT7Sa86qqAIOR3HV2fLf8MP3pBKAnohyCcqTkm4AXt gl9Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1684335542; x=1686927542; 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=Lf/8hxCzQpNjHzWukJV+4jFN6uFu6lEtBSl3J7I1nZY=; b=WDgIS9Om2YB7mO+ymZR1MMxqqSSgUlC/5BiaTnn/GQg0Rl7AmKYUu0isoUd3LCe3rb +RyIGkItW3KBX8vNW+wWuIeIB3sh3GxKj7wbnyns23G1/BE9wrMpOWxJYvl7dyBCswvg Llmu+BGAcqkdKskL9fYfdzSznAtF0XJEy+ELbVW6zJqFgl6srlAiUK210NrMRxdsTRfX niAPJlAlPVESlu0rcj3kRKq1WElspQLW0MPZwKR0vGANoC2A20LKIkEUII913aog9byL o3HtDEXCB3oh5ygPYmJ9DS6w3p08S7APYSxrj9iBBhZjqcJZ/BD8JcYJKGh2FjmtTshD bAdw== X-Gm-Message-State: AC+VfDwZw9atcA5091Q0vzs7n3U6hpmR1LvNzpGhqtW4VvEa0f9iYxtK dhU7di88KQftZMQ7Ge88o3M/2Dl2MlHN X-Google-Smtp-Source: ACHHUZ6VoZUrC6EiZAlnVlcFeo0+/IFgZymrHY8SipcP/PmqCYApS3tdMoqxNMXgD9tobYPeVb9FmmrqsGUa X-Received: from irogers.svl.corp.google.com ([2620:15c:2d4:203:628b:7e78:d09b:39b]) (user=irogers job=sendgmr) by 2002:a81:c402:0:b0:55d:ea61:d8e9 with SMTP id j2-20020a81c402000000b0055dea61d8e9mr20859767ywi.7.1684335542635; Wed, 17 May 2023 07:59:02 -0700 (PDT) Date: Wed, 17 May 2023 07:57:52 -0700 In-Reply-To: <20230517145803.559429-1-irogers@google.com> Message-Id: <20230517145803.559429-13-irogers@google.com> Mime-Version: 1.0 References: <20230517145803.559429-1-irogers@google.com> X-Mailer: git-send-email 2.40.1.606.ga4b1b128d6-goog Subject: [PATCH v1 12/23] perf header: Avoid hybrid PMU list in write_pmu_caps From: Ian Rogers <irogers@google.com> To: Suzuki K Poulose <suzuki.poulose@arm.com>, Mike Leach <mike.leach@linaro.org>, Leo Yan <leo.yan@linaro.org>, John Garry <john.g.garry@oracle.com>, Will Deacon <will@kernel.org>, James Clark <james.clark@arm.com>, Peter Zijlstra <peterz@infradead.org>, Ingo Molnar <mingo@redhat.com>, Arnaldo Carvalho de Melo <acme@kernel.org>, Mark Rutland <mark.rutland@arm.com>, Alexander Shishkin <alexander.shishkin@linux.intel.com>, Jiri Olsa <jolsa@kernel.org>, Namhyung Kim <namhyung@kernel.org>, Ian Rogers <irogers@google.com>, Adrian Hunter <adrian.hunter@intel.com>, Kajol Jain <kjain@linux.ibm.com>, Jing Zhang <renyu.zj@linux.alibaba.com>, Kan Liang <kan.liang@linux.intel.com>, Zhengjun Xing <zhengjun.xing@linux.intel.com>, Ravi Bangoria <ravi.bangoria@amd.com>, Madhavan Srinivasan <maddy@linux.ibm.com>, Athira Rajeev <atrajeev@linux.vnet.ibm.com>, Ming Wang <wangming01@loongson.cn>, Huacai Chen <chenhuacai@kernel.org>, Sandipan Das <sandipan.das@amd.com>, Dmitrii Dolgov <9erthalion6@gmail.com>, Sean Christopherson <seanjc@google.com>, Raul Silvera <rsilvera@google.com>, Ali Saidi <alisaidi@amazon.com>, Rob Herring <robh@kernel.org>, Thomas Richter <tmricht@linux.ibm.com>, Kang Minchul <tegongkang@gmail.com>, linux-kernel@vger.kernel.org, coresight@lists.linaro.org, linux-arm-kernel@lists.infradead.org, linux-perf-users@vger.kernel.org X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20230517_155904_286471_B39023C9 X-CRM114-Status: GOOD ( 14.68 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: <linux-arm-kernel.lists.infradead.org> List-Unsubscribe: <http://lists.infradead.org/mailman/options/linux-arm-kernel>, <mailto:linux-arm-kernel-request@lists.infradead.org?subject=unsubscribe> List-Archive: <http://lists.infradead.org/pipermail/linux-arm-kernel/> List-Post: <mailto:linux-arm-kernel@lists.infradead.org> List-Help: <mailto:linux-arm-kernel-request@lists.infradead.org?subject=help> List-Subscribe: <http://lists.infradead.org/mailman/listinfo/linux-arm-kernel>, <mailto:linux-arm-kernel-request@lists.infradead.org?subject=subscribe> Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" <linux-arm-kernel-bounces@lists.infradead.org> Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org |
Series |
PMU refactoring and improvements
|
expand
|
diff --git a/tools/perf/util/header.c b/tools/perf/util/header.c index 276870221ce0..e24cc8f316cd 100644 --- a/tools/perf/util/header.c +++ b/tools/perf/util/header.c @@ -51,7 +51,6 @@ #include "bpf-event.h" #include "bpf-utils.h" #include "clockid.h" -#include "pmu-hybrid.h" #include <linux/ctype.h> #include <internal/lib.h> @@ -1589,17 +1588,21 @@ static int write_pmu_caps(struct feat_fd *ff, * Write hybrid pmu caps first to maintain compatibility with * older perf tool. */ - pmu = NULL; - perf_pmu__for_each_hybrid_pmu(pmu) { - ret = __write_pmu_caps(ff, pmu, true); - if (ret < 0) - return ret; + if (perf_pmu__has_hybrid()) { + pmu = NULL; + while ((pmu = perf_pmu__scan(pmu))) { + if (!pmu->is_core) + continue; + + ret = __write_pmu_caps(ff, pmu, true); + if (ret < 0) + return ret; + } } pmu = NULL; while ((pmu = perf_pmu__scan(pmu))) { - if (!pmu->name || !strcmp(pmu->name, "cpu") || - !pmu->nr_caps || perf_pmu__is_hybrid(pmu->name)) + if (pmu->is_core || !pmu->nr_caps) continue; ret = __write_pmu_caps(ff, pmu, true);
Avoid perf_pmu__for_each_hybrid_pmu by iterating all PMUs are dumping the core ones. This will eventually allow removal of the hybrid PMU list. Signed-off-by: Ian Rogers <irogers@google.com> --- tools/perf/util/header.c | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-)