[PATCH v9 04/23] perf script: Sort includes and add missed explicit dependencies

[Namhyung Kim]

On Fri, May 22, 2026 at 03:04:15PM -0700, Ian Rogers wrote:
> Fix missing #include of pmu.h found while cleaning the evsel/evlist
> header files. Sort the remaining header files for consistency with the
> rest of the code. Doing this exposed a missing forward declaration of
> addr_location in print_insn.h, add this and sort the forward
> declarations.
> 
> Signed-off-by: Ian Rogers <irogers at google.com>

Acked-by: Namhyung Kim <namhyung at kernel.org>

Thanks,
Namhyung

> ---
>  tools/perf/builtin-script.c  | 111 ++++++++++++++++++-----------------
>  tools/perf/util/print_insn.h |   5 +-
>  2 files changed, 60 insertions(+), 56 deletions(-)
> 
> diff --git a/tools/perf/builtin-script.c b/tools/perf/builtin-script.c
> index c0918006e0ab..e330ae7f725e 100644
> --- a/tools/perf/builtin-script.c
> +++ b/tools/perf/builtin-script.c
> @@ -1,75 +1,78 @@
>  // SPDX-License-Identifier: GPL-2.0
> -#include "builtin.h"
> +#include <errno.h>
> +#include <inttypes.h>
> +#include <signal.h>
> +#include <stdio.h>
> +
> +#include <dirent.h>
> +#include <fcntl.h>
> +#include <linux/bitmap.h>
> +#include <linux/compiler.h>
> +#include <linux/ctype.h>
> +#include <linux/err.h>
> +#include <linux/kernel.h>
> +#include <linux/stringify.h>
> +#include <linux/time64.h>
> +#include <linux/unaligned.h>
> +#include <linux/zalloc.h>
> +#include <sys/param.h>
> +#include <sys/stat.h>
> +#include <sys/types.h>
> +#include <sys/utsname.h>
> +#include <unistd.h>
>  
> +#include <perf/evlist.h>
> +#include <subcmd/exec-cmd.h>
> +#include <subcmd/pager.h>
> +#include <subcmd/parse-options.h>
> +
> +#include "asm/bug.h"
> +#include "builtin.h"
> +#include "perf.h"
> +#include "print_binary.h"
> +#include "print_insn.h"
> +#include "ui/ui.h"
> +#include "util/annotate.h"
> +#include "util/auxtrace.h"
> +#include "util/cgroup.h"
> +#include "util/color.h"
>  #include "util/counts.h"
> +#include "util/cpumap.h"
> +#include "util/data.h"
>  #include "util/debug.h"
> +#include "util/dlfilter.h"
>  #include "util/dso.h"
> -#include <subcmd/exec-cmd.h>
> -#include "util/header.h"
> -#include <subcmd/parse-options.h>
> -#include "util/perf_regs.h"
> -#include "util/session.h"
> -#include "util/tool.h"
> -#include "util/map.h"
> -#include "util/srcline.h"
> -#include "util/symbol.h"
> -#include "util/thread.h"
> -#include "util/trace-event.h"
> +#include "util/dump-insn.h"
>  #include "util/env.h"
> +#include "util/event.h"
>  #include "util/evlist.h"
>  #include "util/evsel.h"
>  #include "util/evsel_fprintf.h"
>  #include "util/evswitch.h"
> +#include "util/header.h"
> +#include "util/map.h"
> +#include "util/mem-events.h"
> +#include "util/mem-info.h"
> +#include "util/metricgroup.h"
> +#include "util/path.h"
> +#include "util/perf_regs.h"
> +#include "util/pmu.h"
> +#include "util/record.h"
> +#include "util/session.h"
>  #include "util/sort.h"
> -#include "util/data.h"
> -#include "util/auxtrace.h"
> -#include "util/cpumap.h"
> -#include "util/thread_map.h"
> +#include "util/srcline.h"
>  #include "util/stat.h"
> -#include "util/color.h"
>  #include "util/string2.h"
> +#include "util/symbol.h"
>  #include "util/thread-stack.h"
> +#include "util/thread.h"
> +#include "util/thread_map.h"
>  #include "util/time-utils.h"
> -#include "util/path.h"
> -#include "util/event.h"
> -#include "util/mem-info.h"
> -#include "util/metricgroup.h"
> -#include "ui/ui.h"
> -#include "print_binary.h"
> -#include "print_insn.h"
> -#include <linux/bitmap.h>
> -#include <linux/compiler.h>
> -#include <linux/kernel.h>
> -#include <linux/stringify.h>
> -#include <linux/time64.h>
> -#include <linux/zalloc.h>
> -#include <linux/unaligned.h>
> -#include <sys/utsname.h>
> -#include "asm/bug.h"
> -#include "util/mem-events.h"
> -#include "util/dump-insn.h"
> -#include <dirent.h>
> -#include <errno.h>
> -#include <inttypes.h>
> -#include <signal.h>
> -#include <stdio.h>
> -#include <sys/param.h>
> -#include <sys/types.h>
> -#include <sys/stat.h>
> -#include <fcntl.h>
> -#include <unistd.h>
> -#include <subcmd/pager.h>
> -#include <perf/evlist.h>
> -#include <linux/err.h>
> -#include "util/dlfilter.h"
> -#include "util/record.h"
> +#include "util/tool.h"
> +#include "util/trace-event.h"
>  #include "util/unwind.h"
>  #include "util/util.h"
> -#include "util/cgroup.h"
> -#include "util/annotate.h"
> -#include "perf.h"
>  
> -#include <linux/ctype.h>
>  #ifdef HAVE_LIBTRACEEVENT
>  #include <event-parse.h>
>  #endif
> diff --git a/tools/perf/util/print_insn.h b/tools/perf/util/print_insn.h
> index 07d11af3fc1c..a54f7e858e49 100644
> --- a/tools/perf/util/print_insn.h
> +++ b/tools/perf/util/print_insn.h
> @@ -5,10 +5,11 @@
>  #include <stddef.h>
>  #include <stdio.h>
>  
> -struct perf_sample;
> -struct thread;
> +struct addr_location;
>  struct machine;
>  struct perf_insn;
> +struct perf_sample;
> +struct thread;
>  
>  #define PRINT_INSN_IMM_HEX		(1<<0)
>  
> -- 
> 2.54.0.794.g4f17f83d09-goog
>