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 X-Spam-Level: X-Spam-Status: No, score=-10.3 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,NICE_REPLY_A,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, USER_AGENT_SANE_1 autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id E4BA6C433DB for ; Fri, 5 Mar 2021 11:11:03 +0000 (UTC) Received: from desiato.infradead.org (desiato.infradead.org [90.155.92.199]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 6440065015 for ; Fri, 5 Mar 2021 11:11:03 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 6440065015 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=huawei.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=desiato.20200630; h=Sender:Content-Type: Content-Transfer-Encoding:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:In-Reply-To:MIME-Version:Date:Message-ID:References: CC:To:Subject:From:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=HYcycOEqb2x3bDCboIbCyy5xUIgJ0KMR3BW8nnve8uQ=; b=SpLzZCBroLj6CDIWx3JBizg38 xYL7u/VdHQENDv+SxQYhxvRpkyIO/oWMmYIOX6n6iN1th0miBZa5r2psip7K2XC/tjBFtFq/zCyCz uBIgTZWKopOlL5InWVCgzcDL0ZRYPgLGyasmvRScpElYxxMdWst7ba+a1zWlWqoHi0rUuOF9PIvbN Hj+PqB0w9OqyLNXQWJ1P5b9pkt6xNonw+MAJktaa3/2dwaaxk93iaDyflPa48SxJG5U7GiCGvEaoo xSBN1XFMpe36FKLY16M7FtxL/EIR26IW4X1/xHiPnFY4Yj7OnAL4x4rWznAAtunTHUKb61aoa0b8O mMh/qLGsA==; Received: from localhost ([::1] helo=desiato.infradead.org) by desiato.infradead.org with esmtp (Exim 4.94 #2 (Red Hat Linux)) id 1lI8Ks-00EhSF-5H; Fri, 05 Mar 2021 11:09:34 +0000 Received: from frasgout.his.huawei.com ([185.176.79.56]) by desiato.infradead.org with esmtps (Exim 4.94 #2 (Red Hat Linux)) id 1lI8KP-00EhNr-J6 for linux-arm-kernel@lists.infradead.org; Fri, 05 Mar 2021 11:09:09 +0000 Received: from fraeml714-chm.china.huawei.com (unknown [172.18.147.200]) by frasgout.his.huawei.com (SkyGuard) with ESMTP id 4DsPtF5QC2z67jpW; Fri, 5 Mar 2021 19:01:09 +0800 (CST) Received: from lhreml724-chm.china.huawei.com (10.201.108.75) by fraeml714-chm.china.huawei.com (10.206.15.33) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2106.2; Fri, 5 Mar 2021 12:08:57 +0100 Received: from [10.47.8.182] (10.47.8.182) by lhreml724-chm.china.huawei.com (10.201.108.75) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2106.2; Fri, 5 Mar 2021 11:08:55 +0000 From: John Garry Subject: Re: [PATCH 1/5] perf metricgroup: Support printing metrics for arm64 To: Jiri Olsa CC: , , , , , , , , , , , , , , , References: <1614784938-27080-1-git-send-email-john.garry@huawei.com> <1614784938-27080-2-git-send-email-john.garry@huawei.com> Message-ID: <95205463-4c80-4e8a-a7c0-c2a4e4553838@huawei.com> Date: Fri, 5 Mar 2021 11:06:58 +0000 User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64; rv:68.0) Gecko/20100101 Thunderbird/68.1.2 MIME-Version: 1.0 In-Reply-To: Content-Language: en-US X-Originating-IP: [10.47.8.182] X-ClientProxiedBy: lhreml713-chm.china.huawei.com (10.201.108.64) To lhreml724-chm.china.huawei.com (10.201.108.75) X-CFilter-Loop: Reflected X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210305_110906_986427_8FB1F86E X-CRM114-Status: GOOD ( 18.59 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="us-ascii"; Format="flowed" Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Hi Jirka, >> - struct pmu_events_map *map = perf_pmu__find_map(NULL); >> + struct pmu_events_map *map = find_cpumap(); > so this is just for arm at the moment right? > Yes - but to be more accurate, arm64. At the moment, from the archs which use pmu-events, only arm64 and nds32 have versions of get_cpuid_str() which require a non-NULL pmu argument. But then apparently nds32 only supports a single CPU, so this issue of heterogeneous CPUs should not be a concern there :) > could we rather make this arch specific code, so we don't need > to do the scanning on archs where this is not needed? > > like marking perf_pmu__find_map as __weak and add arm specific > version? Well I was thinking that this code should not be in metricgroup.c anyway. So there is code which is common in current perf_pmu__find_map() for all archs. I could factor that out into a common function, below. Just a bit worried about perf_pmu__find_map() and perf_pmu__find_pmu_map() being confused. Here's how that would look: +++ b/tools/perf/arch/arm64/util/pmu.c #include "../../util/cpumap.h" #include "../../util/pmu.h" struct pmu_events_map *perf_pmu__find_map(void) { struct perf_pmu *pmu = perf_pmu__find("armv8_pmuv3_0"); if (!pmu || !pmu->cpus || pmu->cpus->nr != cpu__max_cpu()) return NULL; return perf_pmu__find_pmu_map(pmu); } And: diff --git a/tools/perf/util/metricgroup.c b/tools/perf/util/metricgroup.c index 26c990e32378..312164ce9299 100644 --- a/tools/perf/util/metricgroup.c +++ b/tools/perf/util/metricgroup.c @@ -618,7 +618,7 @@ static int metricgroup__print_sys_event_iter(struct pmu_event *pe, void *data) void metricgroup__print(bool metrics, bool metricgroups, char *filter, bool raw, bool details) { - struct pmu_events_map *map = perf_pmu__find_map(NULL); + struct pmu_events_map *map = perf_pmu__find_map(); struct pmu_event *pe; int i; struct rblist groups; @@ -1253,8 +1253,7 @@ int metricgroup__parse_groups(const struct option *opt, struct rblist *metric_events) { struct evlist *perf_evlist = *(struct evlist **)opt->value; - struct pmu_events_map *map = perf_pmu__find_map(NULL); - + struct pmu_events_map *map = perf_pmu__find_map(); return parse_groups(perf_evlist, str, metric_no_group, metric_no_merge, NULL, metric_events, map); @@ -1273,7 +1272,7 @@ int metricgroup__parse_groups_test(struct evlist *evlist, bool metricgroup__has_metric(const char *metric) { - struct pmu_events_map *map = perf_pmu__find_map(NULL); + struct pmu_events_map *map = perf_pmu__find_map(); struct pmu_event *pe; int i; diff --git a/tools/perf/util/pmu.c b/tools/perf/util/pmu.c index 44ef28302fc7..d49bf20b6058 100644 --- a/tools/perf/util/pmu.c +++ b/tools/perf/util/pmu.c @@ -690,7 +690,7 @@ static char *perf_pmu__getcpuid(struct perf_pmu *pmu) return cpuid; } -struct pmu_events_map *perf_pmu__find_map(struct perf_pmu *pmu) +struct pmu_events_map *perf_pmu__find_pmu_map(struct perf_pmu *pmu) { struct pmu_events_map *map; char *cpuid = perf_pmu__getcpuid(pmu); @@ -717,6 +717,11 @@ struct pmu_events_map *perf_pmu__find_map(struct perf_pmu *pmu) return map; } +struct pmu_events_map *__weak perf_pmu__find_map(void) +{ + return perf_pmu__find_pmu_map(NULL); +} + bool pmu_uncore_alias_match(const char *pmu_name, const char *name) { char *tmp = NULL, *tok, *str; @@ -805,7 +810,7 @@ static void pmu_add_cpu_aliases(struct list_head *head, struct perf_pmu *pmu) { struct pmu_events_map *map; - map = perf_pmu__find_map(pmu); + map = perf_pmu__find_pmu_map(pmu); if (!map) return; Thoughts? Thanks! _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel