From patchwork Fri May 26 21:53:50 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ian Rogers X-Patchwork-Id: 13257410 Return-Path: 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 65AA0C7EE23 for ; Fri, 26 May 2023 22:41:29 +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=2uxBzBVFMtmaPxdsy/NfGZZJgvTgsY0YnWsw86AqQmQ=; b=uOUs5XG2etNEoz p32rb2MDta43nARVOPsoTMTPpTGpZFyaQAMSMrZVEWZNu653ZNfLtz1VyYxSHSh1RovdA63E5/1Eo eIkzWtwCMxvEwU1SjfI0Hvd/Xw6Q0D/mFg4/1dKXCjYPqTNBAyo4JMfIu/xLJ8RJDVYqsh4Wo94t6 3Vq6CgIAufGOUkW8G/9blXHO1LY6GJtIcUWogCFABpWrZWTVo8g3zlnDKt7yHeVQcLiSJa0e48o4k 5X6qWBrQppl0Zgpe417Wvr9auson4SVz8ofB7VcNpgJyHb2jJIcmSzBg82KTXY4lUOn48eZIlhJW2 0rvXEktwXeVGjdckJRLw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1q2g7I-004AC8-1T; Fri, 26 May 2023 22:41:00 +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 1q2g6w-0049yT-2R for linux-arm-kernel@bombadil.infradead.org; Fri, 26 May 2023 22:40:38 +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=uQLy+VY7puWbfitln8G+spxphB2gCRmUi07gLeIATPU=; b=HM5bJR87EVWns/SKGtiTWMNZwY FifJZiaJr6p/BW9wI4tBkcpg9jZLsjvbO1spXZuTKMN8L3dejPNWHdjHoIO9JHHBWu08BqwUvaO0k 5x9mQgTUaqIFrBWfs/eKUNQu5vXtosHin2ZdJ1y2Hk/hoiuWXUDLMYm99Q4pYbPFWF43oakPm7CIs SE6uO3EM7eOGyhar+531AL0nZ2bL9HpR143Ne84Ozg5cHKxLlkx+GgsxrZfJK3fteSRn3VYNYWjIz FJHfXHP3Xcmd5XyVtrw8rWgCzvtNL6H7zC1AQ2k61IZY31o5SkVezBeI+5/7jD5O/k5LbSCgA1IWw 2Y5M7wsA==; Received: from mail-yb1-xb4a.google.com ([2607:f8b0:4864:20::b4a]) by desiato.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1q2fOb-007isz-2m for linux-arm-kernel@lists.infradead.org; Fri, 26 May 2023 21:54:51 +0000 Received: by mail-yb1-xb4a.google.com with SMTP id 3f1490d57ef6-ba81b37d9d2so2624512276.3 for ; Fri, 26 May 2023 14:54:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20221208; t=1685138088; x=1687730088; h=to:from:subject:references:mime-version:message-id:in-reply-to:date :from:to:cc:subject:date:message-id:reply-to; bh=uQLy+VY7puWbfitln8G+spxphB2gCRmUi07gLeIATPU=; b=Bsjntan5Y2+dIlGuMVR4LMyjvy74tDv2Kb8Zu6GWYMtssbAPNbPFtWNoqLIAcBlC6j k3NrOYiIuvF9S8x9Xx9GePnRcrQhFWgeauMLwb/WOWij+LW9FViv6MqQffZ+NW9GSbtW 5Cb6CyARmaDGa+XCHM5mIvvPu5RzxIfXgeCljxg+5RWIPDDDuiya77rksXLvXYPayxTt +xSmGKiJhLm21w6AELNRt/lg/bFoEfJoq7raXg+B6r0i73EjBOaICftVzRE6mXINTlPp DKsO+HsItRD9rDwjPKCLGToWh9nm+Gfy7vY+JUDSgeZx6U5Wa3wVKHObpx+yAa1nOC97 cV8A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1685138088; x=1687730088; 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=uQLy+VY7puWbfitln8G+spxphB2gCRmUi07gLeIATPU=; b=WuUcW0+0ZHOJe3CngK3xvpSgePe5yKLY49kDeIpVD5E6OXIl6HrKckZPSWbwbXQt6J kiEeTlXYptGDWw3Qvd211AZT33OLHUITg4XOMrYlzMrRdyr0TURKAe0Gv0NPbwHmvtVm tPO4nHba1OSn8WxeFGy+x/8plZ3c1O62KSw+8IBUbKE79IFAaTgUsQyBVLuzQsihOJK7 HYYleCwJ2OtgQl7X7PK3Wb+VN6ZILvWZea7G6U2gHWnTX/hDxTVw4Geh3gnBuWlMdMYR i0mlkAta/bFC8p/YMAJCGrPVBNV2NVO3Ln58pGTFXGzpQ3rScvcKImI6W8TSDzcb7yeu Mh1Q== X-Gm-Message-State: AC+VfDwm/BB3gAuIUbBMFCfFZyMuHtLArQQRVzGxQ8c+zRkPHqni1x0g 2XzZHyazrTfe5Te9sI2otQhgSb5rY46L X-Google-Smtp-Source: ACHHUZ5Iy9W6pUsgIX5TcxV+nKCckxbPOPFTSTz29+jdUj5JHkKkACwkmiASg2jdMxPtg4/9JCfiEvEm2IhZ X-Received: from irogers.svl.corp.google.com ([2620:15c:2d4:203:3b4e:312c:644:a642]) (user=irogers job=sendgmr) by 2002:a25:d648:0:b0:bab:9391:470d with SMTP id n69-20020a25d648000000b00bab9391470dmr1229422ybg.0.1685138088001; Fri, 26 May 2023 14:54:48 -0700 (PDT) Date: Fri, 26 May 2023 14:53:50 -0700 In-Reply-To: <20230526215410.2435674-1-irogers@google.com> Message-Id: <20230526215410.2435674-16-irogers@google.com> Mime-Version: 1.0 References: <20230526215410.2435674-1-irogers@google.com> X-Mailer: git-send-email 2.41.0.rc0.172.g3f132b7071-goog Subject: [PATCH v4 15/35] perf evlist: Reduce scope of evlist__has_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 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20230526_225450_050189_C461A9E6 X-CRM114-Status: GOOD ( 15.80 ) 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: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Function is only used in printout, reduce scope to stat-display.c. Remove the now empty evlist-hybrid.c and evlist-hybrid.h. Signed-off-by: Ian Rogers Reviewed-by: Kan Liang --- tools/perf/builtin-record.c | 1 - tools/perf/builtin-stat.c | 1 - tools/perf/util/Build | 1 - tools/perf/util/evlist-hybrid.c | 31 ------------------------------- tools/perf/util/evlist-hybrid.h | 12 ------------ tools/perf/util/evlist.c | 1 - tools/perf/util/stat-display.c | 15 ++++++++++++++- 7 files changed, 14 insertions(+), 48 deletions(-) delete mode 100644 tools/perf/util/evlist-hybrid.c delete mode 100644 tools/perf/util/evlist-hybrid.h diff --git a/tools/perf/builtin-record.c b/tools/perf/builtin-record.c index d80b54a6f450..e30e8d6a6575 100644 --- a/tools/perf/builtin-record.c +++ b/tools/perf/builtin-record.c @@ -50,7 +50,6 @@ #include "util/pfm.h" #include "util/clockid.h" #include "util/pmu-hybrid.h" -#include "util/evlist-hybrid.h" #include "util/off_cpu.h" #include "util/bpf-filter.h" #include "asm/bug.h" diff --git a/tools/perf/builtin-stat.c b/tools/perf/builtin-stat.c index cc4d96de1851..3b90d742b023 100644 --- a/tools/perf/builtin-stat.c +++ b/tools/perf/builtin-stat.c @@ -48,7 +48,6 @@ #include "util/pmu.h" #include "util/event.h" #include "util/evlist.h" -#include "util/evlist-hybrid.h" #include "util/evsel.h" #include "util/debug.h" #include "util/color.h" diff --git a/tools/perf/util/Build b/tools/perf/util/Build index c146736ead19..21e4cdcba504 100644 --- a/tools/perf/util/Build +++ b/tools/perf/util/Build @@ -11,7 +11,6 @@ perf-y += db-export.o perf-y += env.o perf-y += event.o perf-y += evlist.o -perf-y += evlist-hybrid.o perf-y += sideband_evlist.o perf-y += evsel.o perf-y += evsel_fprintf.o diff --git a/tools/perf/util/evlist-hybrid.c b/tools/perf/util/evlist-hybrid.c deleted file mode 100644 index 64f78d06fe19..000000000000 --- a/tools/perf/util/evlist-hybrid.c +++ /dev/null @@ -1,31 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0-only -#include -#include -#include "cpumap.h" -#include "evlist.h" -#include "evsel.h" -#include "../perf.h" -#include "util/pmu-hybrid.h" -#include "util/evlist-hybrid.h" -#include "debug.h" -#include -#include -#include -#include -#include -#include -#include - -bool evlist__has_hybrid(struct evlist *evlist) -{ - struct evsel *evsel; - - evlist__for_each_entry(evlist, evsel) { - if (evsel->pmu_name && - perf_pmu__is_hybrid(evsel->pmu_name)) { - return true; - } - } - - return false; -} diff --git a/tools/perf/util/evlist-hybrid.h b/tools/perf/util/evlist-hybrid.h deleted file mode 100644 index 0cded76eb344..000000000000 --- a/tools/perf/util/evlist-hybrid.h +++ /dev/null @@ -1,12 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0 */ -#ifndef __PERF_EVLIST_HYBRID_H -#define __PERF_EVLIST_HYBRID_H - -#include -#include -#include "evlist.h" -#include - -bool evlist__has_hybrid(struct evlist *evlist); - -#endif /* __PERF_EVLIST_HYBRID_H */ diff --git a/tools/perf/util/evlist.c b/tools/perf/util/evlist.c index 63f8821a5395..82c0b3d0c822 100644 --- a/tools/perf/util/evlist.c +++ b/tools/perf/util/evlist.c @@ -28,7 +28,6 @@ #include "util/string2.h" #include "util/perf_api_probe.h" #include "util/evsel_fprintf.h" -#include "util/evlist-hybrid.h" #include "util/pmu.h" #include "util/sample.h" #include "util/bpf-filter.h" diff --git a/tools/perf/util/stat-display.c b/tools/perf/util/stat-display.c index bf5a6c14dfcd..ede0477d958a 100644 --- a/tools/perf/util/stat-display.c +++ b/tools/perf/util/stat-display.c @@ -20,7 +20,6 @@ #include "util.h" #include "iostat.h" #include "pmu-hybrid.h" -#include "evlist-hybrid.h" #define CNTR_NOT_SUPPORTED "" #define CNTR_NOT_COUNTED "" @@ -677,6 +676,20 @@ static bool is_mixed_hw_group(struct evsel *counter) return false; } +static bool evlist__has_hybrid(struct evlist *evlist) +{ + struct evsel *evsel; + + evlist__for_each_entry(evlist, evsel) { + if (evsel->pmu_name && + perf_pmu__is_hybrid(evsel->pmu_name)) { + return true; + } + } + + return false; +} + static void printout(struct perf_stat_config *config, struct outstate *os, double uval, u64 run, u64 ena, double noise, int aggr_idx) {