kevin/linux
1
Fork 0
Code

perf evlist: Reduce scope of evlist__has_hybrid

Browse Source 
Function is only used in printout, reduce scope to
stat-display.c. Remove the now empty evlist-hybrid.c and
evlist-hybrid.h.

Reviewed-by: Kan Liang <kan.liang@linux.intel.com>
Signed-off-by: Ian Rogers <irogers@google.com>
Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Ali Saidi <alisaidi@amazon.com>
Cc: Athira Rajeev <atrajeev@linux.vnet.ibm.com>
Cc: Dmitrii Dolgov <9erthalion6@gmail.com>
Cc: Huacai Chen <chenhuacai@kernel.org>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: James Clark <james.clark@arm.com>
Cc: Jing Zhang <renyu.zj@linux.alibaba.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: John Garry <john.g.garry@oracle.com>
Cc: Kajol Jain <kjain@linux.ibm.com>
Cc: Kang Minchul <tegongkang@gmail.com>
Cc: Leo Yan <leo.yan@linaro.org>
Cc: Madhavan Srinivasan <maddy@linux.ibm.com>
Cc: Mark Rutland <mark.rutland@arm.com>
Cc: Mike Leach <mike.leach@linaro.org>
Cc: Ming Wang <wangming01@loongson.cn>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Ravi Bangoria <ravi.bangoria@amd.com>
Cc: Rob Herring <robh@kernel.org>
Cc: Sandipan Das <sandipan.das@amd.com>
Cc: Sean Christopherson <seanjc@google.com>
Cc: Suzuki Poulouse <suzuki.poulose@arm.com>
Cc: Thomas Richter <tmricht@linux.ibm.com>
Cc: Will Deacon <will@kernel.org>
Cc: Xing Zhengjun <zhengjun.xing@linux.intel.com>
Cc: coresight@lists.linaro.org
Cc: linux-arm-kernel@lists.infradead.org
Link: https://lore.kernel.org/r/20230527072210.2900565-15-irogers@google.com
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
This commit is contained in:
Ian Rogers 2023-05-27 00:21:50 -07:00 committed by Arnaldo Carvalho de Melo
parent 7b100989b4
commit b167b530eb
7 changed files with 14 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
tools/perf/builtin-record.c
View File

@ -50,7 +50,6 @@
#include "util/pfm.h" #include "util/pfm.h"
#include "util/clockid.h" #include "util/clockid.h"
#include "util/pmu-hybrid.h" #include "util/pmu-hybrid.h"
#include "util/evlist-hybrid.h"
#include "util/off_cpu.h" #include "util/off_cpu.h"
#include "util/bpf-filter.h" #include "util/bpf-filter.h"
#include "asm/bug.h" #include "asm/bug.h"

1
tools/perf/builtin-stat.c
View File

@ -48,7 +48,6 @@
#include "util/pmu.h" #include "util/pmu.h"
#include "util/event.h" #include "util/event.h"
#include "util/evlist.h" #include "util/evlist.h"
#include "util/evlist-hybrid.h"
#include "util/evsel.h" #include "util/evsel.h"
#include "util/debug.h" #include "util/debug.h"
#include "util/color.h" #include "util/color.h"

1
tools/perf/util/Build
View File

@ -11,7 +11,6 @@ perf-y += db-export.o
perf-y += env.o perf-y += env.o
perf-y += event.o perf-y += event.o
perf-y += evlist.o perf-y += evlist.o
perf-y += evlist-hybrid.o
perf-y += sideband_evlist.o perf-y += sideband_evlist.o
perf-y += evsel.o perf-y += evsel.o
perf-y += evsel_fprintf.o perf-y += evsel_fprintf.o

31
tools/perf/util/evlist-hybrid.c
View File

@ -1,31 +0,0 @@
// SPDX-License-Identifier: GPL-2.0-only
#include <errno.h>
#include <inttypes.h>
#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 <unistd.h>
#include <stdlib.h>
#include <linux/err.h>
#include <linux/string.h>
#include <perf/evlist.h>
#include <perf/evsel.h>
#include <perf/cpumap.h>
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;
}

12
tools/perf/util/evlist-hybrid.h
View File

@ -1,12 +0,0 @@
/* SPDX-License-Identifier: GPL-2.0 */
#ifndef __PERF_EVLIST_HYBRID_H
#define __PERF_EVLIST_HYBRID_H
#include <linux/compiler.h>
#include <linux/kernel.h>
#include "evlist.h"
#include <unistd.h>
bool evlist__has_hybrid(struct evlist *evlist);
#endif /* __PERF_EVLIST_HYBRID_H */

1
tools/perf/util/evlist.c
View File

@ -28,7 +28,6 @@
#include "util/string2.h" #include "util/string2.h"
#include "util/perf_api_probe.h" #include "util/perf_api_probe.h"
#include "util/evsel_fprintf.h" #include "util/evsel_fprintf.h"
#include "util/evlist-hybrid.h"
#include "util/pmu.h" #include "util/pmu.h"
#include "util/sample.h" #include "util/sample.h"
#include "util/bpf-filter.h" #include "util/bpf-filter.h"

15
tools/perf/util/stat-display.c
View File

@ -20,7 +20,6 @@
#include "util.h" #include "util.h"
#include "iostat.h" #include "iostat.h"
#include "pmu-hybrid.h" #include "pmu-hybrid.h"
#include "evlist-hybrid.h"
#define CNTR_NOT_SUPPORTED "<not supported>" #define CNTR_NOT_SUPPORTED "<not supported>"
#define CNTR_NOT_COUNTED "<not counted>" #define CNTR_NOT_COUNTED "<not counted>"
@ -692,6 +691,20 @@ static bool is_mixed_hw_group(struct evsel *counter)
return false; 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, static void printout(struct perf_stat_config *config, struct outstate *os,
double uval, u64 run, u64 ena, double noise, int aggr_idx) double uval, u64 run, u64 ena, double noise, int aggr_idx)
{ {