From patchwork Wed May 17 14:57:44 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ian Rogers X-Patchwork-Id: 13245271 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 ECD63C7EE23 for ; Wed, 17 May 2023 16:00:50 +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=vvnDWrMJTKqFGxVFFOcBzExhLcyd9TllptIVWvTCUbE=; b=0B6Krxv5czmTqe MMZHX4cZoD8Xqs9I6cAC1CyixtmSRFKt3RCbuBvqXaxRFmesZCF78dWVvEmGsSj97xFnTWmDbtbpj aACrwpGW8m/gcrzQj7WD5OGAj358/4t/CVweVajPCA+VWo28F5gxs22QVUfwfrfb/etGcbq/HEekT 8BiL1vfLxmvUxWgYpTuExSduGaGEjl1qzLu2CQQ7Rzu/oW5kGF3ysxJt+cEjTkdUseHdiyrcXkBGt a9zozbpn2A0ONC9G0azMiwbNv/AnEdrvuBy+uN6IzU/Lguh5WUolYIb6Vy7XpRuWCM37sQeWjT9x6 NxDRLeVGE+3449JcaEeQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1pzJZz-00AORg-3C; Wed, 17 May 2023 16:00:43 +0000 Received: from mail-yb1-xb4a.google.com ([2607:f8b0:4864:20::b4a]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1pzIc1-00ADRG-2N for linux-arm-kernel@lists.infradead.org; Wed, 17 May 2023 14:58:47 +0000 Received: by mail-yb1-xb4a.google.com with SMTP id 3f1490d57ef6-ba87d7d2988so1394030276.0 for ; Wed, 17 May 2023 07:58:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20221208; t=1684335524; x=1686927524; h=to:from:subject:references:mime-version:message-id:in-reply-to:date :from:to:cc:subject:date:message-id:reply-to; bh=teh0Pm56RFznH4cxkDKohWyHgUByyEY0rmKe5R5AKbA=; b=wWB8dU0B/1m8OAWhyWPhbMoCb17J0pVHH/Nn8OOvAlhtzMj3PFhsQv28cHl2/LKmNd OoSbnLQo9Xf2ARgZc4vVBjIyoWOoNa9Tf0g7QdD6stBADHbAD5QzTmRJN1IIoml0rSra qMzZd16fsFwGpKJB7AuKGZPB/gwTY6H0yRwhXamE/WM4jKlXjykrkBAuhxe1Xgt3BYDJ A5ICdu5Aqdx3OV8ioh21rHffUc7AL7tZlQf/bkTwIwlnpRR8iVXX07CQUkCdqWEzJ0Z2 A57SJD4hFnmRcw+Dj4IAtnOg8vbOCOuJ1n40PV/YySW/8QgyuELnt30DU08bzW5dw46V AiCw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1684335524; x=1686927524; 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=teh0Pm56RFznH4cxkDKohWyHgUByyEY0rmKe5R5AKbA=; b=abEQHyqGSpGGis3NR++NeDMhXXbzuzKfHY61MOBTFV9N41+QOPt23U+BRdlQWfML/l aJginOlBdf3qwiLHAAStqvq1J80CRzbJ/on0Pe+TeblSzXIFSuoBtscVMbYZl+suX7cL 6q5lps5Eqt8v22d+XXdf/DsCK9FDGRJ8rzyHykB7Z97Qb2JYGblafGuQ8xzg45HK1HOt pC575vQ0RQ7hoPbxvbhTRJeOG/LyuMJHEZVvCtrXkJ7vvXHrMILofdFG9Zww8JB6Xxjo ojKoHfxvPu38owyFUYaSZNLjTm3JEus30gHJ8cha9iH4V3xIJG9khpsCN0vGpZKDqwDS 6x6A== X-Gm-Message-State: AC+VfDwydWPAtIqYELOOUU6FgX8wKgjYBamgaat0KEjlFSznRurNxueo pFDCeQsX8LksqFnY6PEDtSo8plLVPW9b X-Google-Smtp-Source: ACHHUZ6aWp5bxbOg1yJ6tAm7uZDYxctfA/HJomA7YEauHsizgUYJzlmvyLfg+V0tXVLIvDwNb5sUOFMeJ+NI X-Received: from irogers.svl.corp.google.com ([2620:15c:2d4:203:628b:7e78:d09b:39b]) (user=irogers job=sendgmr) by 2002:a25:b10e:0:b0:b8f:5474:2f33 with SMTP id g14-20020a25b10e000000b00b8f54742f33mr1624564ybj.5.1684335524558; Wed, 17 May 2023 07:58:44 -0700 (PDT) Date: Wed, 17 May 2023 07:57:44 -0700 In-Reply-To: <20230517145803.559429-1-irogers@google.com> Message-Id: <20230517145803.559429-5-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 04/23] 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 , Raul Silvera , 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-20230517_075845_775757_BBE57DBC X-CRM114-Status: GOOD ( 15.88 ) 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 --- 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 85f2bd035a94..42135be760ab 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 084cc570b8e8..bd51da5fd3a5 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 b8ca99afdfe5..cb996d94bd64 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) {