aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--tools/lib/subcmd/Build7
-rw-r--r--tools/lib/subcmd/Makefile48
-rw-r--r--tools/lib/subcmd/exec-cmd.c (renamed from tools/perf/util/exec_cmd.c)2
-rw-r--r--tools/lib/subcmd/exec-cmd.h (renamed from tools/perf/util/exec_cmd.h)0
-rw-r--r--tools/lib/subcmd/help.c (renamed from tools/perf/util/help.c)2
-rw-r--r--tools/lib/subcmd/help.h (renamed from tools/perf/util/help.h)0
-rw-r--r--tools/lib/subcmd/pager.c (renamed from tools/perf/util/pager.c)0
-rw-r--r--tools/lib/subcmd/pager.h (renamed from tools/perf/util/pager.h)0
-rw-r--r--tools/lib/subcmd/parse-options.c (renamed from tools/perf/util/parse-options.c)0
-rw-r--r--tools/lib/subcmd/parse-options.h (renamed from tools/perf/util/parse-options.h)0
-rw-r--r--tools/lib/subcmd/run-command.c (renamed from tools/perf/util/run-command.c)2
-rw-r--r--tools/lib/subcmd/run-command.h (renamed from tools/perf/util/run-command.h)0
-rw-r--r--tools/lib/subcmd/sigchain.c (renamed from tools/perf/util/sigchain.c)0
-rw-r--r--tools/lib/subcmd/sigchain.h (renamed from tools/perf/util/sigchain.h)0
-rw-r--r--tools/lib/subcmd/subcmd-config.c (renamed from tools/perf/util/subcmd-config.c)0
-rw-r--r--tools/lib/subcmd/subcmd-config.h (renamed from tools/perf/util/subcmd-config.h)0
-rw-r--r--tools/lib/subcmd/subcmd-util.h (renamed from tools/perf/util/subcmd-util.h)0
-rw-r--r--tools/perf/MANIFEST1
-rw-r--r--tools/perf/Makefile.perf20
-rw-r--r--tools/perf/arch/x86/util/intel-pt.c2
-rw-r--r--tools/perf/bench/futex-hash.c2
-rw-r--r--tools/perf/bench/futex-lock-pi.c2
-rw-r--r--tools/perf/bench/futex-requeue.c2
-rw-r--r--tools/perf/bench/futex-wake-parallel.c2
-rw-r--r--tools/perf/bench/futex-wake.c2
-rw-r--r--tools/perf/bench/mem-functions.c2
-rw-r--r--tools/perf/bench/numa.c2
-rw-r--r--tools/perf/bench/sched-messaging.c2
-rw-r--r--tools/perf/bench/sched-pipe.c2
-rw-r--r--tools/perf/builtin-annotate.c2
-rw-r--r--tools/perf/builtin-bench.c2
-rw-r--r--tools/perf/builtin-buildid-cache.c2
-rw-r--r--tools/perf/builtin-buildid-list.c2
-rw-r--r--tools/perf/builtin-config.c2
-rw-r--r--tools/perf/builtin-data.c2
-rw-r--r--tools/perf/builtin-evlist.c2
-rw-r--r--tools/perf/builtin-help.c8
-rw-r--r--tools/perf/builtin-inject.c2
-rw-r--r--tools/perf/builtin-kmem.c2
-rw-r--r--tools/perf/builtin-kvm.c2
-rw-r--r--tools/perf/builtin-list.c2
-rw-r--r--tools/perf/builtin-lock.c2
-rw-r--r--tools/perf/builtin-mem.c2
-rw-r--r--tools/perf/builtin-probe.c2
-rw-r--r--tools/perf/builtin-record.c2
-rw-r--r--tools/perf/builtin-report.c2
-rw-r--r--tools/perf/builtin-sched.c2
-rw-r--r--tools/perf/builtin-script.c4
-rw-r--r--tools/perf/builtin-stat.c2
-rw-r--r--tools/perf/builtin-timechart.c2
-rw-r--r--tools/perf/builtin-top.c2
-rw-r--r--tools/perf/builtin-trace.c4
-rw-r--r--tools/perf/perf.c6
-rw-r--r--tools/perf/tests/attr.c2
-rw-r--r--tools/perf/tests/builtin-test.c2
-rw-r--r--tools/perf/util/Build7
-rw-r--r--tools/perf/util/auxtrace.c2
-rw-r--r--tools/perf/util/cache.h2
-rw-r--r--tools/perf/util/cgroup.c2
-rw-r--r--tools/perf/util/config.c2
-rw-r--r--tools/perf/util/evlist.c2
-rw-r--r--tools/perf/util/help-unknown-cmd.c2
-rw-r--r--tools/perf/util/parse-branch-options.c2
-rw-r--r--tools/perf/util/parse-events.c4
-rw-r--r--tools/perf/util/parse-regs-options.c2
-rw-r--r--tools/perf/util/sort.h2
66 files changed, 129 insertions, 68 deletions
diff --git a/tools/lib/subcmd/Build b/tools/lib/subcmd/Build
new file mode 100644
index 000000000000..ee31288788c1
--- /dev/null
+++ b/tools/lib/subcmd/Build
@@ -0,0 +1,7 @@
1libsubcmd-y += exec-cmd.o
2libsubcmd-y += help.o
3libsubcmd-y += pager.o
4libsubcmd-y += parse-options.o
5libsubcmd-y += run-command.o
6libsubcmd-y += sigchain.o
7libsubcmd-y += subcmd-config.o
diff --git a/tools/lib/subcmd/Makefile b/tools/lib/subcmd/Makefile
new file mode 100644
index 000000000000..629cf8c14e68
--- /dev/null
+++ b/tools/lib/subcmd/Makefile
@@ -0,0 +1,48 @@
1include ../../scripts/Makefile.include
2include ../../perf/config/utilities.mak # QUIET_CLEAN
3
4ifeq ($(srctree),)
5srctree := $(patsubst %/,%,$(dir $(shell pwd)))
6srctree := $(patsubst %/,%,$(dir $(srctree)))
7srctree := $(patsubst %/,%,$(dir $(srctree)))
8#$(info Determined 'srctree' to be $(srctree))
9endif
10
11CC = $(CROSS_COMPILE)gcc
12AR = $(CROSS_COMPILE)ar
13RM = rm -f
14
15MAKEFLAGS += --no-print-directory
16
17LIBFILE = $(OUTPUT)libsubcmd.a
18
19CFLAGS := $(EXTRA_WARNINGS) $(EXTRA_CFLAGS)
20CFLAGS += -ggdb3 -Wall -Wextra -std=gnu99 -Werror -O6 -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2 -fPIC
21CFLAGS += -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE
22
23CFLAGS += -I$(srctree)/tools/include/
24CFLAGS += -I$(srctree)/include/uapi
25CFLAGS += -I$(srctree)/include
26
27SUBCMD_IN := $(OUTPUT)libsubcmd-in.o
28
29all:
30
31export srctree OUTPUT CC LD CFLAGS V
32include $(srctree)/tools/build/Makefile.include
33
34all: fixdep $(LIBFILE)
35
36$(SUBCMD_IN): FORCE
37 @$(MAKE) $(build)=libsubcmd
38
39$(LIBFILE): $(SUBCMD_IN)
40 $(QUIET_AR)$(RM) $@ && $(AR) rcs $@ $(SUBCMD_IN)
41
42clean:
43 $(call QUIET_CLEAN, libsubcmd) $(RM) $(LIBFILE); \
44 find $(if $(OUTPUT),$(OUTPUT),.) -name \*.o -or -name \*.o.cmd -or -name \*.o.d | xargs $(RM)
45
46FORCE:
47
48.PHONY: clean FORCE
diff --git a/tools/perf/util/exec_cmd.c b/tools/lib/subcmd/exec-cmd.c
index e7f9ed7943e3..1ae833af1a4a 100644
--- a/tools/perf/util/exec_cmd.c
+++ b/tools/lib/subcmd/exec-cmd.c
@@ -7,7 +7,7 @@
7#include <stdlib.h> 7#include <stdlib.h>
8#include <stdio.h> 8#include <stdio.h>
9#include "subcmd-util.h" 9#include "subcmd-util.h"
10#include "exec_cmd.h" 10#include "exec-cmd.h"
11#include "subcmd-config.h" 11#include "subcmd-config.h"
12 12
13#define MAX_ARGS 32 13#define MAX_ARGS 32
diff --git a/tools/perf/util/exec_cmd.h b/tools/lib/subcmd/exec-cmd.h
index f1bd3436ad5f..f1bd3436ad5f 100644
--- a/tools/perf/util/exec_cmd.h
+++ b/tools/lib/subcmd/exec-cmd.h
diff --git a/tools/perf/util/help.c b/tools/lib/subcmd/help.c
index 8169480066c6..e228c3cb3716 100644
--- a/tools/perf/util/help.c
+++ b/tools/lib/subcmd/help.c
@@ -9,7 +9,7 @@
9#include <dirent.h> 9#include <dirent.h>
10#include "subcmd-util.h" 10#include "subcmd-util.h"
11#include "help.h" 11#include "help.h"
12#include "exec_cmd.h" 12#include "exec-cmd.h"
13 13
14void add_cmdname(struct cmdnames *cmds, const char *name, size_t len) 14void add_cmdname(struct cmdnames *cmds, const char *name, size_t len)
15{ 15{
diff --git a/tools/perf/util/help.h b/tools/lib/subcmd/help.h
index 096c8bc45cd7..096c8bc45cd7 100644
--- a/tools/perf/util/help.h
+++ b/tools/lib/subcmd/help.h
diff --git a/tools/perf/util/pager.c b/tools/lib/subcmd/pager.c
index d50f3b58606b..d50f3b58606b 100644
--- a/tools/perf/util/pager.c
+++ b/tools/lib/subcmd/pager.c
diff --git a/tools/perf/util/pager.h b/tools/lib/subcmd/pager.h
index d6a591a4c017..d6a591a4c017 100644
--- a/tools/perf/util/pager.h
+++ b/tools/lib/subcmd/pager.h
diff --git a/tools/perf/util/parse-options.c b/tools/lib/subcmd/parse-options.c
index 981bb4481fd5..981bb4481fd5 100644
--- a/tools/perf/util/parse-options.c
+++ b/tools/lib/subcmd/parse-options.c
diff --git a/tools/perf/util/parse-options.h b/tools/lib/subcmd/parse-options.h
index dec893f10477..dec893f10477 100644
--- a/tools/perf/util/parse-options.h
+++ b/tools/lib/subcmd/parse-options.h
diff --git a/tools/perf/util/run-command.c b/tools/lib/subcmd/run-command.c
index fed37d6ae070..f4f6c9eb8e59 100644
--- a/tools/perf/util/run-command.c
+++ b/tools/lib/subcmd/run-command.c
@@ -7,7 +7,7 @@
7#include <sys/wait.h> 7#include <sys/wait.h>
8#include "subcmd-util.h" 8#include "subcmd-util.h"
9#include "run-command.h" 9#include "run-command.h"
10#include "exec_cmd.h" 10#include "exec-cmd.h"
11 11
12#define STRERR_BUFSIZE 128 12#define STRERR_BUFSIZE 128
13 13
diff --git a/tools/perf/util/run-command.h b/tools/lib/subcmd/run-command.h
index 4a55393a6547..4a55393a6547 100644
--- a/tools/perf/util/run-command.h
+++ b/tools/lib/subcmd/run-command.h
diff --git a/tools/perf/util/sigchain.c b/tools/lib/subcmd/sigchain.c
index 3537c348a18e..3537c348a18e 100644
--- a/tools/perf/util/sigchain.c
+++ b/tools/lib/subcmd/sigchain.c
diff --git a/tools/perf/util/sigchain.h b/tools/lib/subcmd/sigchain.h
index 959d64eb5557..959d64eb5557 100644
--- a/tools/perf/util/sigchain.h
+++ b/tools/lib/subcmd/sigchain.h
diff --git a/tools/perf/util/subcmd-config.c b/tools/lib/subcmd/subcmd-config.c
index d017c728bd1b..d017c728bd1b 100644
--- a/tools/perf/util/subcmd-config.c
+++ b/tools/lib/subcmd/subcmd-config.c
diff --git a/tools/perf/util/subcmd-config.h b/tools/lib/subcmd/subcmd-config.h
index cc8514030b5c..cc8514030b5c 100644
--- a/tools/perf/util/subcmd-config.h
+++ b/tools/lib/subcmd/subcmd-config.h
diff --git a/tools/perf/util/subcmd-util.h b/tools/lib/subcmd/subcmd-util.h
index 321aeb11a381..321aeb11a381 100644
--- a/tools/perf/util/subcmd-util.h
+++ b/tools/lib/subcmd/subcmd-util.h
diff --git a/tools/perf/MANIFEST b/tools/perf/MANIFEST
index 2562eac6451d..ce3932ee4893 100644
--- a/tools/perf/MANIFEST
+++ b/tools/perf/MANIFEST
@@ -20,6 +20,7 @@ tools/lib/traceevent
20tools/lib/bpf 20tools/lib/bpf
21tools/lib/api 21tools/lib/api
22tools/lib/bpf 22tools/lib/bpf
23tools/lib/subcmd
23tools/lib/hweight.c 24tools/lib/hweight.c
24tools/lib/rbtree.c 25tools/lib/rbtree.c
25tools/lib/string.c 26tools/lib/string.c
diff --git a/tools/perf/Makefile.perf b/tools/perf/Makefile.perf
index 388ec64fa39b..569fcf022531 100644
--- a/tools/perf/Makefile.perf
+++ b/tools/perf/Makefile.perf
@@ -145,9 +145,10 @@ BISON = bison
145STRIP = strip 145STRIP = strip
146AWK = awk 146AWK = awk
147 147
148LIB_DIR = $(srctree)/tools/lib/api/ 148LIB_DIR = $(srctree)/tools/lib/api/
149TRACE_EVENT_DIR = $(srctree)/tools/lib/traceevent/ 149TRACE_EVENT_DIR = $(srctree)/tools/lib/traceevent/
150BPF_DIR = $(srctree)/tools/lib/bpf/ 150BPF_DIR = $(srctree)/tools/lib/bpf/
151SUBCMD_DIR = $(srctree)/tools/lib/subcmd/
151 152
152# include config/Makefile by default and rule out 153# include config/Makefile by default and rule out
153# non-config cases 154# non-config cases
@@ -184,6 +185,7 @@ strip-libs = $(filter-out -l%,$(1))
184ifneq ($(OUTPUT),) 185ifneq ($(OUTPUT),)
185 TE_PATH=$(OUTPUT) 186 TE_PATH=$(OUTPUT)
186 BPF_PATH=$(OUTPUT) 187 BPF_PATH=$(OUTPUT)
188 SUBCMD_PATH=$(OUTPUT)
187ifneq ($(subdir),) 189ifneq ($(subdir),)
188 API_PATH=$(OUTPUT)/../lib/api/ 190 API_PATH=$(OUTPUT)/../lib/api/
189else 191else
@@ -193,6 +195,7 @@ else
193 TE_PATH=$(TRACE_EVENT_DIR) 195 TE_PATH=$(TRACE_EVENT_DIR)
194 API_PATH=$(LIB_DIR) 196 API_PATH=$(LIB_DIR)
195 BPF_PATH=$(BPF_DIR) 197 BPF_PATH=$(BPF_DIR)
198 SUBCMD_PATH=$(SUBCMD_DIR)
196endif 199endif
197 200
198LIBTRACEEVENT = $(TE_PATH)libtraceevent.a 201LIBTRACEEVENT = $(TE_PATH)libtraceevent.a
@@ -206,6 +209,8 @@ export LIBAPI
206 209
207LIBBPF = $(BPF_PATH)libbpf.a 210LIBBPF = $(BPF_PATH)libbpf.a
208 211
212LIBSUBCMD = $(SUBCMD_PATH)libsubcmd.a
213
209# python extension build directories 214# python extension build directories
210PYTHON_EXTBUILD := $(OUTPUT)python_ext_build/ 215PYTHON_EXTBUILD := $(OUTPUT)python_ext_build/
211PYTHON_EXTBUILD_LIB := $(PYTHON_EXTBUILD)lib/ 216PYTHON_EXTBUILD_LIB := $(PYTHON_EXTBUILD)lib/
@@ -257,7 +262,7 @@ export PERL_PATH
257 262
258LIB_FILE=$(OUTPUT)libperf.a 263LIB_FILE=$(OUTPUT)libperf.a
259 264
260PERFLIBS = $(LIB_FILE) $(LIBAPI) $(LIBTRACEEVENT) 265PERFLIBS = $(LIB_FILE) $(LIBAPI) $(LIBTRACEEVENT) $(LIBSUBCMD)
261ifndef NO_LIBBPF 266ifndef NO_LIBBPF
262 PERFLIBS += $(LIBBPF) 267 PERFLIBS += $(LIBBPF)
263endif 268endif
@@ -437,6 +442,13 @@ $(LIBBPF)-clean:
437 $(call QUIET_CLEAN, libbpf) 442 $(call QUIET_CLEAN, libbpf)
438 $(Q)$(MAKE) -C $(BPF_DIR) O=$(OUTPUT) clean >/dev/null 443 $(Q)$(MAKE) -C $(BPF_DIR) O=$(OUTPUT) clean >/dev/null
439 444
445$(LIBSUBCMD): fixdep FORCE
446 $(Q)$(MAKE) -C $(SUBCMD_DIR) O=$(OUTPUT) $(OUTPUT)libsubcmd.a
447
448$(LIBSUBCMD)-clean:
449 $(call QUIET_CLEAN, libsubcmd)
450 $(Q)$(MAKE) -C $(SUBCMD_DIR) O=$(OUTPUT) clean
451
440help: 452help:
441 @echo 'Perf make targets:' 453 @echo 'Perf make targets:'
442 @echo ' doc - make *all* documentation (see below)' 454 @echo ' doc - make *all* documentation (see below)'
@@ -584,7 +596,7 @@ config-clean:
584 $(call QUIET_CLEAN, config) 596 $(call QUIET_CLEAN, config)
585 $(Q)$(MAKE) -C $(srctree)/tools/build/feature/ $(if $(OUTPUT),OUTPUT=$(OUTPUT)feature/,) clean >/dev/null 597 $(Q)$(MAKE) -C $(srctree)/tools/build/feature/ $(if $(OUTPUT),OUTPUT=$(OUTPUT)feature/,) clean >/dev/null
586 598
587clean: $(LIBTRACEEVENT)-clean $(LIBAPI)-clean $(LIBBPF)-clean config-clean 599clean: $(LIBTRACEEVENT)-clean $(LIBAPI)-clean $(LIBBPF)-clean $(LIBSUBCMD)-clean config-clean
588 $(call QUIET_CLEAN, core-objs) $(RM) $(LIB_FILE) $(OUTPUT)perf-archive $(OUTPUT)perf-with-kcore $(LANG_BINDINGS) 600 $(call QUIET_CLEAN, core-objs) $(RM) $(LIB_FILE) $(OUTPUT)perf-archive $(OUTPUT)perf-with-kcore $(LANG_BINDINGS)
589 $(Q)find $(if $(OUTPUT),$(OUTPUT),.) -name '*.o' -delete -o -name '\.*.cmd' -delete -o -name '\.*.d' -delete 601 $(Q)find $(if $(OUTPUT),$(OUTPUT),.) -name '*.o' -delete -o -name '\.*.cmd' -delete -o -name '\.*.d' -delete
590 $(Q)$(RM) $(OUTPUT).config-detected 602 $(Q)$(RM) $(OUTPUT).config-detected
diff --git a/tools/perf/arch/x86/util/intel-pt.c b/tools/perf/arch/x86/util/intel-pt.c
index b02af064f0f9..b64d46285ebb 100644
--- a/tools/perf/arch/x86/util/intel-pt.c
+++ b/tools/perf/arch/x86/util/intel-pt.c
@@ -26,7 +26,7 @@
26#include "../../util/evlist.h" 26#include "../../util/evlist.h"
27#include "../../util/evsel.h" 27#include "../../util/evsel.h"
28#include "../../util/cpumap.h" 28#include "../../util/cpumap.h"
29#include "../../util/parse-options.h" 29#include <subcmd/parse-options.h>
30#include "../../util/parse-events.h" 30#include "../../util/parse-events.h"
31#include "../../util/pmu.h" 31#include "../../util/pmu.h"
32#include "../../util/debug.h" 32#include "../../util/debug.h"
diff --git a/tools/perf/bench/futex-hash.c b/tools/perf/bench/futex-hash.c
index fc9bebd2cca0..0999ac536d86 100644
--- a/tools/perf/bench/futex-hash.c
+++ b/tools/perf/bench/futex-hash.c
@@ -11,7 +11,7 @@
11#include "../perf.h" 11#include "../perf.h"
12#include "../util/util.h" 12#include "../util/util.h"
13#include "../util/stat.h" 13#include "../util/stat.h"
14#include "../util/parse-options.h" 14#include <subcmd/parse-options.h>
15#include "../util/header.h" 15#include "../util/header.h"
16#include "bench.h" 16#include "bench.h"
17#include "futex.h" 17#include "futex.h"
diff --git a/tools/perf/bench/futex-lock-pi.c b/tools/perf/bench/futex-lock-pi.c
index bc6a16adbca8..6a18ce21f865 100644
--- a/tools/perf/bench/futex-lock-pi.c
+++ b/tools/perf/bench/futex-lock-pi.c
@@ -5,7 +5,7 @@
5#include "../perf.h" 5#include "../perf.h"
6#include "../util/util.h" 6#include "../util/util.h"
7#include "../util/stat.h" 7#include "../util/stat.h"
8#include "../util/parse-options.h" 8#include <subcmd/parse-options.h>
9#include "../util/header.h" 9#include "../util/header.h"
10#include "bench.h" 10#include "bench.h"
11#include "futex.h" 11#include "futex.h"
diff --git a/tools/perf/bench/futex-requeue.c b/tools/perf/bench/futex-requeue.c
index ad0d9b5342fb..718238683013 100644
--- a/tools/perf/bench/futex-requeue.c
+++ b/tools/perf/bench/futex-requeue.c
@@ -11,7 +11,7 @@
11#include "../perf.h" 11#include "../perf.h"
12#include "../util/util.h" 12#include "../util/util.h"
13#include "../util/stat.h" 13#include "../util/stat.h"
14#include "../util/parse-options.h" 14#include <subcmd/parse-options.h>
15#include "../util/header.h" 15#include "../util/header.h"
16#include "bench.h" 16#include "bench.h"
17#include "futex.h" 17#include "futex.h"
diff --git a/tools/perf/bench/futex-wake-parallel.c b/tools/perf/bench/futex-wake-parallel.c
index 6d8c9fa2a16c..91aaf2a1fa90 100644
--- a/tools/perf/bench/futex-wake-parallel.c
+++ b/tools/perf/bench/futex-wake-parallel.c
@@ -10,7 +10,7 @@
10#include "../perf.h" 10#include "../perf.h"
11#include "../util/util.h" 11#include "../util/util.h"
12#include "../util/stat.h" 12#include "../util/stat.h"
13#include "../util/parse-options.h" 13#include <subcmd/parse-options.h>
14#include "../util/header.h" 14#include "../util/header.h"
15#include "bench.h" 15#include "bench.h"
16#include "futex.h" 16#include "futex.h"
diff --git a/tools/perf/bench/futex-wake.c b/tools/perf/bench/futex-wake.c
index e5e41d3bdce7..f416bd705f66 100644
--- a/tools/perf/bench/futex-wake.c
+++ b/tools/perf/bench/futex-wake.c
@@ -11,7 +11,7 @@
11#include "../perf.h" 11#include "../perf.h"
12#include "../util/util.h" 12#include "../util/util.h"
13#include "../util/stat.h" 13#include "../util/stat.h"
14#include "../util/parse-options.h" 14#include <subcmd/parse-options.h>
15#include "../util/header.h" 15#include "../util/header.h"
16#include "bench.h" 16#include "bench.h"
17#include "futex.h" 17#include "futex.h"
diff --git a/tools/perf/bench/mem-functions.c b/tools/perf/bench/mem-functions.c
index 9419b944220f..a91aa85d80ff 100644
--- a/tools/perf/bench/mem-functions.c
+++ b/tools/perf/bench/mem-functions.c
@@ -8,7 +8,7 @@
8 8
9#include "../perf.h" 9#include "../perf.h"
10#include "../util/util.h" 10#include "../util/util.h"
11#include "../util/parse-options.h" 11#include <subcmd/parse-options.h>
12#include "../util/header.h" 12#include "../util/header.h"
13#include "../util/cloexec.h" 13#include "../util/cloexec.h"
14#include "bench.h" 14#include "bench.h"
diff --git a/tools/perf/bench/numa.c b/tools/perf/bench/numa.c
index 492df2752a2d..5049d6357a46 100644
--- a/tools/perf/bench/numa.c
+++ b/tools/perf/bench/numa.c
@@ -7,7 +7,7 @@
7#include "../perf.h" 7#include "../perf.h"
8#include "../builtin.h" 8#include "../builtin.h"
9#include "../util/util.h" 9#include "../util/util.h"
10#include "../util/parse-options.h" 10#include <subcmd/parse-options.h>
11#include "../util/cloexec.h" 11#include "../util/cloexec.h"
12 12
13#include "bench.h" 13#include "bench.h"
diff --git a/tools/perf/bench/sched-messaging.c b/tools/perf/bench/sched-messaging.c
index d4ff1b539cfd..bfaf9503de8e 100644
--- a/tools/perf/bench/sched-messaging.c
+++ b/tools/perf/bench/sched-messaging.c
@@ -11,7 +11,7 @@
11 11
12#include "../perf.h" 12#include "../perf.h"
13#include "../util/util.h" 13#include "../util/util.h"
14#include "../util/parse-options.h" 14#include <subcmd/parse-options.h>
15#include "../builtin.h" 15#include "../builtin.h"
16#include "bench.h" 16#include "bench.h"
17 17
diff --git a/tools/perf/bench/sched-pipe.c b/tools/perf/bench/sched-pipe.c
index 005cc283790c..1dc2d13cc272 100644
--- a/tools/perf/bench/sched-pipe.c
+++ b/tools/perf/bench/sched-pipe.c
@@ -10,7 +10,7 @@
10 */ 10 */
11#include "../perf.h" 11#include "../perf.h"
12#include "../util/util.h" 12#include "../util/util.h"
13#include "../util/parse-options.h" 13#include <subcmd/parse-options.h>
14#include "../builtin.h" 14#include "../builtin.h"
15#include "bench.h" 15#include "bench.h"
16 16
diff --git a/tools/perf/builtin-annotate.c b/tools/perf/builtin-annotate.c
index 1f00dc7cecba..e18f1b995ffd 100644
--- a/tools/perf/builtin-annotate.c
+++ b/tools/perf/builtin-annotate.c
@@ -21,7 +21,7 @@
21#include "util/evsel.h" 21#include "util/evsel.h"
22#include "util/annotate.h" 22#include "util/annotate.h"
23#include "util/event.h" 23#include "util/event.h"
24#include "util/parse-options.h" 24#include <subcmd/parse-options.h>
25#include "util/parse-events.h" 25#include "util/parse-events.h"
26#include "util/thread.h" 26#include "util/thread.h"
27#include "util/sort.h" 27#include "util/sort.h"
diff --git a/tools/perf/builtin-bench.c b/tools/perf/builtin-bench.c
index b17aed36ca16..a1cddc6bbf0f 100644
--- a/tools/perf/builtin-bench.c
+++ b/tools/perf/builtin-bench.c
@@ -16,7 +16,7 @@
16 */ 16 */
17#include "perf.h" 17#include "perf.h"
18#include "util/util.h" 18#include "util/util.h"
19#include "util/parse-options.h" 19#include <subcmd/parse-options.h>
20#include "builtin.h" 20#include "builtin.h"
21#include "bench/bench.h" 21#include "bench/bench.h"
22 22
diff --git a/tools/perf/builtin-buildid-cache.c b/tools/perf/builtin-buildid-cache.c
index 7b8450cd33c2..d93bff7fc0e4 100644
--- a/tools/perf/builtin-buildid-cache.c
+++ b/tools/perf/builtin-buildid-cache.c
@@ -16,7 +16,7 @@
16#include "util/cache.h" 16#include "util/cache.h"
17#include "util/debug.h" 17#include "util/debug.h"
18#include "util/header.h" 18#include "util/header.h"
19#include "util/parse-options.h" 19#include <subcmd/parse-options.h>
20#include "util/strlist.h" 20#include "util/strlist.h"
21#include "util/build-id.h" 21#include "util/build-id.h"
22#include "util/session.h" 22#include "util/session.h"
diff --git a/tools/perf/builtin-buildid-list.c b/tools/perf/builtin-buildid-list.c
index 6419f57b0850..5e914ee79eb3 100644
--- a/tools/perf/builtin-buildid-list.c
+++ b/tools/perf/builtin-buildid-list.c
@@ -12,7 +12,7 @@
12#include "util/build-id.h" 12#include "util/build-id.h"
13#include "util/cache.h" 13#include "util/cache.h"
14#include "util/debug.h" 14#include "util/debug.h"
15#include "util/parse-options.h" 15#include <subcmd/parse-options.h>
16#include "util/session.h" 16#include "util/session.h"
17#include "util/symbol.h" 17#include "util/symbol.h"
18#include "util/data.h" 18#include "util/data.h"
diff --git a/tools/perf/builtin-config.c b/tools/perf/builtin-config.c
index 427ea7a705b8..f04e804a9fad 100644
--- a/tools/perf/builtin-config.c
+++ b/tools/perf/builtin-config.c
@@ -9,7 +9,7 @@
9#include "perf.h" 9#include "perf.h"
10 10
11#include "util/cache.h" 11#include "util/cache.h"
12#include "util/parse-options.h" 12#include <subcmd/parse-options.h>
13#include "util/util.h" 13#include "util/util.h"
14#include "util/debug.h" 14#include "util/debug.h"
15 15
diff --git a/tools/perf/builtin-data.c b/tools/perf/builtin-data.c
index d6525bc54d13..b97bc1518b44 100644
--- a/tools/perf/builtin-data.c
+++ b/tools/perf/builtin-data.c
@@ -2,7 +2,7 @@
2#include "builtin.h" 2#include "builtin.h"
3#include "perf.h" 3#include "perf.h"
4#include "debug.h" 4#include "debug.h"
5#include "parse-options.h" 5#include <subcmd/parse-options.h>
6#include "data-convert-bt.h" 6#include "data-convert-bt.h"
7 7
8typedef int (*data_cmd_fn_t)(int argc, const char **argv, const char *prefix); 8typedef int (*data_cmd_fn_t)(int argc, const char **argv, const char *prefix);
diff --git a/tools/perf/builtin-evlist.c b/tools/perf/builtin-evlist.c
index f4d62510acbb..08a7d36a2cf8 100644
--- a/tools/perf/builtin-evlist.c
+++ b/tools/perf/builtin-evlist.c
@@ -12,7 +12,7 @@
12#include "util/evlist.h" 12#include "util/evlist.h"
13#include "util/evsel.h" 13#include "util/evsel.h"
14#include "util/parse-events.h" 14#include "util/parse-events.h"
15#include "util/parse-options.h" 15#include <subcmd/parse-options.h>
16#include "util/session.h" 16#include "util/session.h"
17#include "util/data.h" 17#include "util/data.h"
18#include "util/debug.h" 18#include "util/debug.h"
diff --git a/tools/perf/builtin-help.c b/tools/perf/builtin-help.c
index 275aa641c31c..96c1a4cfbbbf 100644
--- a/tools/perf/builtin-help.c
+++ b/tools/perf/builtin-help.c
@@ -6,11 +6,11 @@
6#include "perf.h" 6#include "perf.h"
7#include "util/cache.h" 7#include "util/cache.h"
8#include "builtin.h" 8#include "builtin.h"
9#include "util/exec_cmd.h" 9#include <subcmd/exec-cmd.h>
10#include "common-cmds.h" 10#include "common-cmds.h"
11#include "util/parse-options.h" 11#include <subcmd/parse-options.h>
12#include "util/run-command.h" 12#include <subcmd/run-command.h>
13#include "util/help.h" 13#include <subcmd/help.h>
14#include "util/debug.h" 14#include "util/debug.h"
15 15
16static struct man_viewer_list { 16static struct man_viewer_list {
diff --git a/tools/perf/builtin-inject.c b/tools/perf/builtin-inject.c
index 99d127fe9c35..0022e02ed31a 100644
--- a/tools/perf/builtin-inject.c
+++ b/tools/perf/builtin-inject.c
@@ -18,7 +18,7 @@
18#include "util/data.h" 18#include "util/data.h"
19#include "util/auxtrace.h" 19#include "util/auxtrace.h"
20 20
21#include "util/parse-options.h" 21#include <subcmd/parse-options.h>
22 22
23#include <linux/list.h> 23#include <linux/list.h>
24 24
diff --git a/tools/perf/builtin-kmem.c b/tools/perf/builtin-kmem.c
index 93ce665f976f..118010553d0c 100644
--- a/tools/perf/builtin-kmem.c
+++ b/tools/perf/builtin-kmem.c
@@ -12,7 +12,7 @@
12#include "util/tool.h" 12#include "util/tool.h"
13#include "util/callchain.h" 13#include "util/callchain.h"
14 14
15#include "util/parse-options.h" 15#include <subcmd/parse-options.h>
16#include "util/trace-event.h" 16#include "util/trace-event.h"
17#include "util/data.h" 17#include "util/data.h"
18#include "util/cpumap.h" 18#include "util/cpumap.h"
diff --git a/tools/perf/builtin-kvm.c b/tools/perf/builtin-kvm.c
index 031f9f55c281..4418d9214872 100644
--- a/tools/perf/builtin-kvm.c
+++ b/tools/perf/builtin-kvm.c
@@ -10,7 +10,7 @@
10#include "util/header.h" 10#include "util/header.h"
11#include "util/session.h" 11#include "util/session.h"
12#include "util/intlist.h" 12#include "util/intlist.h"
13#include "util/parse-options.h" 13#include <subcmd/parse-options.h>
14#include "util/trace-event.h" 14#include "util/trace-event.h"
15#include "util/debug.h" 15#include "util/debug.h"
16#include "util/tool.h" 16#include "util/tool.h"
diff --git a/tools/perf/builtin-list.c b/tools/perf/builtin-list.c
index bf679e2c978b..5e22db4684b8 100644
--- a/tools/perf/builtin-list.c
+++ b/tools/perf/builtin-list.c
@@ -14,7 +14,7 @@
14#include "util/parse-events.h" 14#include "util/parse-events.h"
15#include "util/cache.h" 15#include "util/cache.h"
16#include "util/pmu.h" 16#include "util/pmu.h"
17#include "util/parse-options.h" 17#include <subcmd/parse-options.h>
18 18
19int cmd_list(int argc, const char **argv, const char *prefix __maybe_unused) 19int cmd_list(int argc, const char **argv, const char *prefix __maybe_unused)
20{ 20{
diff --git a/tools/perf/builtin-lock.c b/tools/perf/builtin-lock.c
index de16aaed516e..ce3bfb48b26f 100644
--- a/tools/perf/builtin-lock.c
+++ b/tools/perf/builtin-lock.c
@@ -9,7 +9,7 @@
9#include "util/thread.h" 9#include "util/thread.h"
10#include "util/header.h" 10#include "util/header.h"
11 11
12#include "util/parse-options.h" 12#include <subcmd/parse-options.h>
13#include "util/trace-event.h" 13#include "util/trace-event.h"
14 14
15#include "util/debug.h" 15#include "util/debug.h"
diff --git a/tools/perf/builtin-mem.c b/tools/perf/builtin-mem.c
index 80170aace5d4..390170041696 100644
--- a/tools/perf/builtin-mem.c
+++ b/tools/perf/builtin-mem.c
@@ -1,7 +1,7 @@
1#include "builtin.h" 1#include "builtin.h"
2#include "perf.h" 2#include "perf.h"
3 3
4#include "util/parse-options.h" 4#include <subcmd/parse-options.h>
5#include "util/trace-event.h" 5#include "util/trace-event.h"
6#include "util/tool.h" 6#include "util/tool.h"
7#include "util/session.h" 7#include "util/session.h"
diff --git a/tools/perf/builtin-probe.c b/tools/perf/builtin-probe.c
index dbe2ea5a2932..9af859b28b15 100644
--- a/tools/perf/builtin-probe.c
+++ b/tools/perf/builtin-probe.c
@@ -37,7 +37,7 @@
37#include "util/strfilter.h" 37#include "util/strfilter.h"
38#include "util/symbol.h" 38#include "util/symbol.h"
39#include "util/debug.h" 39#include "util/debug.h"
40#include "util/parse-options.h" 40#include <subcmd/parse-options.h>
41#include "util/probe-finder.h" 41#include "util/probe-finder.h"
42#include "util/probe-event.h" 42#include "util/probe-event.h"
43#include "util/probe-file.h" 43#include "util/probe-file.h"
diff --git a/tools/perf/builtin-record.c b/tools/perf/builtin-record.c
index a3b4930737c6..1435ef6265b6 100644
--- a/tools/perf/builtin-record.c
+++ b/tools/perf/builtin-record.c
@@ -11,7 +11,7 @@
11 11
12#include "util/build-id.h" 12#include "util/build-id.h"
13#include "util/util.h" 13#include "util/util.h"
14#include "util/parse-options.h" 14#include <subcmd/parse-options.h>
15#include "util/parse-events.h" 15#include "util/parse-events.h"
16 16
17#include "util/callchain.h" 17#include "util/callchain.h"
diff --git a/tools/perf/builtin-report.c b/tools/perf/builtin-report.c
index 5a454669d075..2a7330b99b82 100644
--- a/tools/perf/builtin-report.c
+++ b/tools/perf/builtin-report.c
@@ -27,7 +27,7 @@
27#include "util/session.h" 27#include "util/session.h"
28#include "util/tool.h" 28#include "util/tool.h"
29 29
30#include "util/parse-options.h" 30#include <subcmd/parse-options.h>
31#include "util/parse-events.h" 31#include "util/parse-events.h"
32 32
33#include "util/thread.h" 33#include "util/thread.h"
diff --git a/tools/perf/builtin-sched.c b/tools/perf/builtin-sched.c
index e3d3e32c0a93..871b55ae22a4 100644
--- a/tools/perf/builtin-sched.c
+++ b/tools/perf/builtin-sched.c
@@ -12,7 +12,7 @@
12#include "util/tool.h" 12#include "util/tool.h"
13#include "util/cloexec.h" 13#include "util/cloexec.h"
14 14
15#include "util/parse-options.h" 15#include <subcmd/parse-options.h>
16#include "util/trace-event.h" 16#include "util/trace-event.h"
17 17
18#include "util/debug.h" 18#include "util/debug.h"
diff --git a/tools/perf/builtin-script.c b/tools/perf/builtin-script.c
index 571016f16c5a..bcc3542d9df5 100644
--- a/tools/perf/builtin-script.c
+++ b/tools/perf/builtin-script.c
@@ -3,9 +3,9 @@
3#include "perf.h" 3#include "perf.h"
4#include "util/cache.h" 4#include "util/cache.h"
5#include "util/debug.h" 5#include "util/debug.h"
6#include "util/exec_cmd.h" 6#include <subcmd/exec-cmd.h>
7#include "util/header.h" 7#include "util/header.h"
8#include "util/parse-options.h" 8#include <subcmd/parse-options.h>
9#include "util/perf_regs.h" 9#include "util/perf_regs.h"
10#include "util/session.h" 10#include "util/session.h"
11#include "util/tool.h" 11#include "util/tool.h"
diff --git a/tools/perf/builtin-stat.c b/tools/perf/builtin-stat.c
index 25a95f49c36e..bbf42eefd5e5 100644
--- a/tools/perf/builtin-stat.c
+++ b/tools/perf/builtin-stat.c
@@ -45,7 +45,7 @@
45#include "builtin.h" 45#include "builtin.h"
46#include "util/cgroup.h" 46#include "util/cgroup.h"
47#include "util/util.h" 47#include "util/util.h"
48#include "util/parse-options.h" 48#include <subcmd/parse-options.h>
49#include "util/parse-events.h" 49#include "util/parse-events.h"
50#include "util/pmu.h" 50#include "util/pmu.h"
51#include "util/event.h" 51#include "util/event.h"
diff --git a/tools/perf/builtin-timechart.c b/tools/perf/builtin-timechart.c
index 30e59620179d..bd7a7757176f 100644
--- a/tools/perf/builtin-timechart.c
+++ b/tools/perf/builtin-timechart.c
@@ -30,7 +30,7 @@
30 30
31#include "perf.h" 31#include "perf.h"
32#include "util/header.h" 32#include "util/header.h"
33#include "util/parse-options.h" 33#include <subcmd/parse-options.h>
34#include "util/parse-events.h" 34#include "util/parse-events.h"
35#include "util/event.h" 35#include "util/event.h"
36#include "util/session.h" 36#include "util/session.h"
diff --git a/tools/perf/builtin-top.c b/tools/perf/builtin-top.c
index 92fe963e43c4..9ebd67a42ede 100644
--- a/tools/perf/builtin-top.c
+++ b/tools/perf/builtin-top.c
@@ -34,7 +34,7 @@
34#include "util/top.h" 34#include "util/top.h"
35#include "util/util.h" 35#include "util/util.h"
36#include <linux/rbtree.h> 36#include <linux/rbtree.h>
37#include "util/parse-options.h" 37#include <subcmd/parse-options.h>
38#include "util/parse-events.h" 38#include "util/parse-events.h"
39#include "util/cpumap.h" 39#include "util/cpumap.h"
40#include "util/xyarray.h" 40#include "util/xyarray.h"
diff --git a/tools/perf/builtin-trace.c b/tools/perf/builtin-trace.c
index c783d8fd3a80..20916dd77aac 100644
--- a/tools/perf/builtin-trace.c
+++ b/tools/perf/builtin-trace.c
@@ -22,11 +22,11 @@
22#include "util/color.h" 22#include "util/color.h"
23#include "util/debug.h" 23#include "util/debug.h"
24#include "util/evlist.h" 24#include "util/evlist.h"
25#include "util/exec_cmd.h" 25#include <subcmd/exec-cmd.h>
26#include "util/machine.h" 26#include "util/machine.h"
27#include "util/session.h" 27#include "util/session.h"
28#include "util/thread.h" 28#include "util/thread.h"
29#include "util/parse-options.h" 29#include <subcmd/parse-options.h>
30#include "util/strlist.h" 30#include "util/strlist.h"
31#include "util/intlist.h" 31#include "util/intlist.h"
32#include "util/thread_map.h" 32#include "util/thread_map.h"
diff --git a/tools/perf/perf.c b/tools/perf/perf.c
index 6894325fe921..cb1d2499c45c 100644
--- a/tools/perf/perf.c
+++ b/tools/perf/perf.c
@@ -9,12 +9,12 @@
9#include "builtin.h" 9#include "builtin.h"
10 10
11#include "util/env.h" 11#include "util/env.h"
12#include "util/exec_cmd.h" 12#include <subcmd/exec-cmd.h>
13#include "util/cache.h" 13#include "util/cache.h"
14#include "util/quote.h" 14#include "util/quote.h"
15#include "util/run-command.h" 15#include <subcmd/run-command.h>
16#include "util/parse-events.h" 16#include "util/parse-events.h"
17#include "util/parse-options.h" 17#include <subcmd/parse-options.h>
18#include "util/bpf-loader.h" 18#include "util/bpf-loader.h"
19#include "util/debug.h" 19#include "util/debug.h"
20#include <api/fs/tracing_path.h> 20#include <api/fs/tracing_path.h>
diff --git a/tools/perf/tests/attr.c b/tools/perf/tests/attr.c
index 6337f1c07f02..28d1605b0338 100644
--- a/tools/perf/tests/attr.c
+++ b/tools/perf/tests/attr.c
@@ -24,7 +24,7 @@
24#include <linux/kernel.h> 24#include <linux/kernel.h>
25#include "../perf.h" 25#include "../perf.h"
26#include "util.h" 26#include "util.h"
27#include "exec_cmd.h" 27#include <subcmd/exec-cmd.h>
28#include "tests.h" 28#include "tests.h"
29 29
30#define ENV "PERF_TEST_ATTR" 30#define ENV "PERF_TEST_ATTR"
diff --git a/tools/perf/tests/builtin-test.c b/tools/perf/tests/builtin-test.c
index fa98406c92e2..0372d5945910 100644
--- a/tools/perf/tests/builtin-test.c
+++ b/tools/perf/tests/builtin-test.c
@@ -11,7 +11,7 @@
11#include "tests.h" 11#include "tests.h"
12#include "debug.h" 12#include "debug.h"
13#include "color.h" 13#include "color.h"
14#include "parse-options.h" 14#include <subcmd/parse-options.h>
15#include "symbol.h" 15#include "symbol.h"
16 16
17struct test __weak arch_tests[] = { 17struct test __weak arch_tests[] = {
diff --git a/tools/perf/util/Build b/tools/perf/util/Build
index 196beefa16a9..94b1099f2c22 100644
--- a/tools/perf/util/Build
+++ b/tools/perf/util/Build
@@ -9,13 +9,10 @@ libperf-y += env.o
9libperf-y += event.o 9libperf-y += event.o
10libperf-y += evlist.o 10libperf-y += evlist.o
11libperf-y += evsel.o 11libperf-y += evsel.o
12libperf-y += exec_cmd.o
13libperf-y += find_next_bit.o 12libperf-y += find_next_bit.o
14libperf-y += help.o
15libperf-y += kallsyms.o 13libperf-y += kallsyms.o
16libperf-y += levenshtein.o 14libperf-y += levenshtein.o
17libperf-y += llvm-utils.o 15libperf-y += llvm-utils.o
18libperf-y += parse-options.o
19libperf-y += parse-events.o 16libperf-y += parse-events.o
20libperf-y += perf_regs.o 17libperf-y += perf_regs.o
21libperf-y += path.o 18libperf-y += path.o
@@ -23,7 +20,6 @@ libperf-y += rbtree.o
23libperf-y += libstring.o 20libperf-y += libstring.o
24libperf-y += bitmap.o 21libperf-y += bitmap.o
25libperf-y += hweight.o 22libperf-y += hweight.o
26libperf-y += run-command.o
27libperf-y += quote.o 23libperf-y += quote.o
28libperf-y += strbuf.o 24libperf-y += strbuf.o
29libperf-y += string.o 25libperf-y += string.o
@@ -32,11 +28,9 @@ libperf-y += strfilter.o
32libperf-y += top.o 28libperf-y += top.o
33libperf-y += usage.o 29libperf-y += usage.o
34libperf-y += wrapper.o 30libperf-y += wrapper.o
35libperf-y += sigchain.o
36libperf-y += dso.o 31libperf-y += dso.o
37libperf-y += symbol.o 32libperf-y += symbol.o
38libperf-y += color.o 33libperf-y += color.o
39libperf-y += pager.o
40libperf-y += header.o 34libperf-y += header.o
41libperf-y += callchain.o 35libperf-y += callchain.o
42libperf-y += values.o 36libperf-y += values.o
@@ -88,7 +82,6 @@ libperf-y += parse-branch-options.o
88libperf-y += parse-regs-options.o 82libperf-y += parse-regs-options.o
89libperf-y += term.o 83libperf-y += term.o
90libperf-y += help-unknown-cmd.o 84libperf-y += help-unknown-cmd.o
91libperf-y += subcmd-config.o
92 85
93libperf-$(CONFIG_LIBBPF) += bpf-loader.o 86libperf-$(CONFIG_LIBBPF) += bpf-loader.o
94libperf-$(CONFIG_BPF_PROLOGUE) += bpf-prologue.o 87libperf-$(CONFIG_BPF_PROLOGUE) += bpf-prologue.o
diff --git a/tools/perf/util/auxtrace.c b/tools/perf/util/auxtrace.c
index 7f10430af39c..360fda01f3b0 100644
--- a/tools/perf/util/auxtrace.c
+++ b/tools/perf/util/auxtrace.c
@@ -45,7 +45,7 @@
45#include "event.h" 45#include "event.h"
46#include "session.h" 46#include "session.h"
47#include "debug.h" 47#include "debug.h"
48#include "parse-options.h" 48#include <subcmd/parse-options.h>
49 49
50#include "intel-pt.h" 50#include "intel-pt.h"
51#include "intel-bts.h" 51#include "intel-bts.h"
diff --git a/tools/perf/util/cache.h b/tools/perf/util/cache.h
index fc6a745d2ec6..07b5d63947b1 100644
--- a/tools/perf/util/cache.h
+++ b/tools/perf/util/cache.h
@@ -4,7 +4,7 @@
4#include <stdbool.h> 4#include <stdbool.h>
5#include "util.h" 5#include "util.h"
6#include "strbuf.h" 6#include "strbuf.h"
7#include "pager.h" 7#include <subcmd/pager.h>
8#include "../perf.h" 8#include "../perf.h"
9#include "../ui/ui.h" 9#include "../ui/ui.h"
10 10
diff --git a/tools/perf/util/cgroup.c b/tools/perf/util/cgroup.c
index 32e12ecfe9c5..90aa1b46b2e5 100644
--- a/tools/perf/util/cgroup.c
+++ b/tools/perf/util/cgroup.c
@@ -1,6 +1,6 @@
1#include "util.h" 1#include "util.h"
2#include "../perf.h" 2#include "../perf.h"
3#include "parse-options.h" 3#include <subcmd/parse-options.h>
4#include "evsel.h" 4#include "evsel.h"
5#include "cgroup.h" 5#include "cgroup.h"
6#include "evlist.h" 6#include "evlist.h"
diff --git a/tools/perf/util/config.c b/tools/perf/util/config.c
index 2e452ac1353d..d3e12e30e1d5 100644
--- a/tools/perf/util/config.c
+++ b/tools/perf/util/config.c
@@ -10,7 +10,7 @@
10 */ 10 */
11#include "util.h" 11#include "util.h"
12#include "cache.h" 12#include "cache.h"
13#include "exec_cmd.h" 13#include <subcmd/exec-cmd.h>
14#include "util/hist.h" /* perf_hist_config */ 14#include "util/hist.h" /* perf_hist_config */
15#include "util/llvm-utils.h" /* perf_llvm_config */ 15#include "util/llvm-utils.h" /* perf_llvm_config */
16 16
diff --git a/tools/perf/util/evlist.c b/tools/perf/util/evlist.c
index d1b6c206bb93..8c44aadb9810 100644
--- a/tools/perf/util/evlist.c
+++ b/tools/perf/util/evlist.c
@@ -18,7 +18,7 @@
18#include <unistd.h> 18#include <unistd.h>
19 19
20#include "parse-events.h" 20#include "parse-events.h"
21#include "parse-options.h" 21#include <subcmd/parse-options.h>
22 22
23#include <sys/mman.h> 23#include <sys/mman.h>
24 24
diff --git a/tools/perf/util/help-unknown-cmd.c b/tools/perf/util/help-unknown-cmd.c
index a0820f16f511..dc1e41c9b054 100644
--- a/tools/perf/util/help-unknown-cmd.c
+++ b/tools/perf/util/help-unknown-cmd.c
@@ -1,5 +1,5 @@
1#include "cache.h" 1#include "cache.h"
2#include "help.h" 2#include <subcmd/help.h>
3#include "../builtin.h" 3#include "../builtin.h"
4#include "levenshtein.h" 4#include "levenshtein.h"
5 5
diff --git a/tools/perf/util/parse-branch-options.c b/tools/perf/util/parse-branch-options.c
index 355eecf6bf59..afc088dd7d20 100644
--- a/tools/perf/util/parse-branch-options.c
+++ b/tools/perf/util/parse-branch-options.c
@@ -1,7 +1,7 @@
1#include "perf.h" 1#include "perf.h"
2#include "util/util.h" 2#include "util/util.h"
3#include "util/debug.h" 3#include "util/debug.h"
4#include "util/parse-options.h" 4#include <subcmd/parse-options.h>
5#include "util/parse-branch-options.h" 5#include "util/parse-branch-options.h"
6 6
7#define BRANCH_OPT(n, m) \ 7#define BRANCH_OPT(n, m) \
diff --git a/tools/perf/util/parse-events.c b/tools/perf/util/parse-events.c
index 6fc8cd753e1a..4f7b0efdde2f 100644
--- a/tools/perf/util/parse-events.c
+++ b/tools/perf/util/parse-events.c
@@ -4,9 +4,9 @@
4#include "../perf.h" 4#include "../perf.h"
5#include "evlist.h" 5#include "evlist.h"
6#include "evsel.h" 6#include "evsel.h"
7#include "parse-options.h" 7#include <subcmd/parse-options.h>
8#include "parse-events.h" 8#include "parse-events.h"
9#include "exec_cmd.h" 9#include <subcmd/exec-cmd.h>
10#include "string.h" 10#include "string.h"
11#include "symbol.h" 11#include "symbol.h"
12#include "cache.h" 12#include "cache.h"
diff --git a/tools/perf/util/parse-regs-options.c b/tools/perf/util/parse-regs-options.c
index 4f2c1c255d81..646ecf736aad 100644
--- a/tools/perf/util/parse-regs-options.c
+++ b/tools/perf/util/parse-regs-options.c
@@ -1,7 +1,7 @@
1#include "perf.h" 1#include "perf.h"
2#include "util/util.h" 2#include "util/util.h"
3#include "util/debug.h" 3#include "util/debug.h"
4#include "util/parse-options.h" 4#include <subcmd/parse-options.h>
5#include "util/parse-regs-options.h" 5#include "util/parse-regs-options.h"
6 6
7int 7int
diff --git a/tools/perf/util/sort.h b/tools/perf/util/sort.h
index 31228851e397..86f05e7a5566 100644
--- a/tools/perf/util/sort.h
+++ b/tools/perf/util/sort.h
@@ -18,7 +18,7 @@
18#include "debug.h" 18#include "debug.h"
19#include "header.h" 19#include "header.h"
20 20
21#include "parse-options.h" 21#include <subcmd/parse-options.h>
22#include "parse-events.h" 22#include "parse-events.h"
23#include "hist.h" 23#include "hist.h"
24#include "thread.h" 24#include "thread.h"
generated by cgit v1.2.2 (git 2.25.0) at 2025-04-25 09:14:22 -0400