Move some headers out of tools/include/ to tools/perf/trace/beauty/include
Arnaldo Carvalho de Melo
maintainercover Move some headers out of tools/include/ to tools/perf/trace/beauty/include
Since those are not used to build any tool in tools/, move them to the directory where we just track for changes and use those headers just to scrape defines and turn them into id->string tables used by 'perf trace' (or any other tool in the future).
Best Regards,
- Arnaldo
Arnaldo Carvalho de Melo (2):
tools: Move tools/include/uapi/drm to tools/perf/trace/beauty/include/uapi perf beauty: Move copy of fadvise.h from tools/include/ to tools/perf/trace/beauty/include/
tools/perf/Makefile.perf | 6 +++---
tools/perf/check-headers.sh | 6 +++---
tools/perf/trace/beauty/drm_ioctl.sh | 2 +-
tools/perf/trace/beauty/fadvise.sh | 2 +-
tools/{ => perf/trace/beauty}/include/uapi/drm/drm.h | 0
tools/{ => perf/trace/beauty}/include/uapi/drm/i915_drm.h | 0
tools/{ => perf/trace/beauty}/include/uapi/linux/fadvise.h | 0
7 files changed, 8 insertions(+), 8 deletions(-)
rename tools/{ => perf/trace/beauty}/include/uapi/drm/drm.h (100%)
rename tools/{ => perf/trace/beauty}/include/uapi/drm/i915_drm.h (100%)
rename tools/{ => perf/trace/beauty}/include/uapi/linux/fadvise.h (100%)Signature · 1 line
2.53.0
Arnaldo Carvalho de Melo
maintainerPATCH 1/2 tools: Move tools/include/uapi/drm to tools/perf/trace/beauty/include/uapi
From: Arnaldo Carvalho de Melo <[email protected]>
As it is used only to parse ioctl numbers, not to build perf and so far no other tools/ living tool uses it, so to clean up tools/include/ to be used just for building tools, to have access to things available in the kernel and not yet in the system headers, move it to the directory where just the tools/perf/trace/beauty/ scripts can use to generate tables used by perf.
---
tools/perf/Makefile.perf | 2 +-
tools/perf/check-headers.sh | 4 ++--
tools/perf/trace/beauty/drm_ioctl.sh | 2 +-
tools/{ => perf/trace/beauty}/include/uapi/drm/drm.h | 0
tools/{ => perf/trace/beauty}/include/uapi/drm/i915_drm.h | 0
5 files changed, 4 insertions(+), 4 deletions(-)
rename tools/{ => perf/trace/beauty}/include/uapi/drm/drm.h (100%)
rename tools/{ => perf/trace/beauty}/include/uapi/drm/i915_drm.h (100%)tools/perf/Makefile.perf +1 -1
@@ -547,7 +547,7 @@ $(clone_flags_array): $(beauty_uapi_linux_dir)/sched.h $(clone_flags_tbl) $(Q)$(SHELL) '$(clone_flags_tbl)' $(beauty_uapi_linux_dir) > $@ drm_ioctl_array := $(beauty_ioctl_outdir)/drm_ioctl_array.c -drm_hdr_dir := $(srctree)/tools/include/uapi/drm +drm_hdr_dir := $(srctree)/tools/perf/trace/beauty/include/uapi/drm drm_ioctl_tbl := $(srctree)/tools/perf/trace/beauty/drm_ioctl.sh $(drm_ioctl_array): $(drm_hdr_dir)/drm.h $(drm_hdr_dir)/i915_drm.h $(drm_ioctl_tbl)
tools/perf/check-headers.sh +2 -2
@@ -6,8 +6,6 @@ NC='\033[0m' # No Color declare -a FILES=( "include/uapi/linux/const.h" - "include/uapi/drm/drm.h" - "include/uapi/drm/i915_drm.h" "include/uapi/linux/bits.h" "include/uapi/linux/fadvise.h" "include/uapi/linux/fscrypt.h"
@@ -90,6 +88,8 @@ declare -a SYNC_CHECK_FILES=( declare -a BEAUTY_FILES=( "arch/x86/include/asm/irq_vectors.h" "arch/x86/include/uapi/asm/prctl.h" + "include/uapi/drm/drm.h" + "include/uapi/drm/i915_drm.h" "include/linux/socket.h" "include/uapi/linux/fcntl.h" "include/uapi/linux/fs.h"
tools/perf/trace/beauty/drm_ioctl.sh +1 -1
@@ -1,7 +1,7 @@ #!/bin/sh # SPDX-License-Identifier: LGPL-2.1 -[ $# -eq 1 ] && header_dir=$1 || header_dir=tools/include/uapi/drm/ +[ $# -eq 1 ] && header_dir=$1 || header_dir=tools/perf/trace/beauty/include/uapi/drm/ printf "#ifndef DRM_COMMAND_BASE\n" grep "#define DRM_COMMAND_BASE" $header_dir/drm.h
tools/perf/trace/beauty/include/uapi/drm/drm.h renamed from tools/include/uapi/drm/drm.h +0 -0
tools/perf/trace/beauty/include/uapi/drm/i915_drm.h renamed from tools/include/uapi/drm/i915_drm.h +0 -0
Signature · 1 line
2.53.0
Arnaldo Carvalho de Melo
maintainerPATCH 2/2 perf beauty: Move copy of fadvise.h from tools/include/ to tools/perf/trace/beauty/include/
In reply to Arnaldo Carvalho de MeloFrom: Arnaldo Carvalho de Melo <[email protected]>
As it is not really used when compiling anything, just being parsed to collect number->string tables for 'perf trace'.
$ git grep fadvise.h tools/
tools/perf/Makefile.perf:$(fadvise_advice_array): $(beauty_uapi_linux_dir)/fadvise.h $(fadvise_advice_tbl)
tools/perf/check-headers.sh: "include/uapi/linux/fadvise.h"
tools/perf/trace/beauty/fadvise.sh:grep -E $regex ${header_dir}/fadvise.h | \
tools/perf/trace/beauty/fadvise.sh:# tools/include/uapi/linux/fadvise.h for details.
$---
tools/perf/Makefile.perf | 4 ++--
tools/perf/check-headers.sh | 2 +-
tools/perf/trace/beauty/fadvise.sh | 2 +-
tools/{ => perf/trace/beauty}/include/uapi/linux/fadvise.h | 0
4 files changed, 4 insertions(+), 4 deletions(-)
rename tools/{ => perf/trace/beauty}/include/uapi/linux/fadvise.h (100%)tools/perf/Makefile.perf +2 -2
@@ -556,8 +556,8 @@ $(drm_ioctl_array): $(drm_hdr_dir)/drm.h $(drm_hdr_dir)/i915_drm.h $(drm_ioctl_t fadvise_advice_array := $(beauty_outdir)/fadvise_advice_array.c fadvise_advice_tbl := $(srctree)/tools/perf/trace/beauty/fadvise.sh -$(fadvise_advice_array): $(linux_uapi_dir)/in.h $(fadvise_advice_tbl) - $(Q)$(SHELL) '$(fadvise_advice_tbl)' $(linux_uapi_dir) > $@ +$(fadvise_advice_array): $(beauty_uapi_linux_dir)/fadvise.h $(fadvise_advice_tbl) + $(Q)$(SHELL) '$(fadvise_advice_tbl)' $(beauty_uapi_linux_dir) > $@ fsmount_arrays := $(beauty_outdir)/fsmount_arrays.c fsmount_tbls := $(srctree)/tools/perf/trace/beauty/fsmount.sh
tools/perf/check-headers.sh +1 -1
@@ -7,7 +7,6 @@ NC='\033[0m' # No Color declare -a FILES=( "include/uapi/linux/const.h" "include/uapi/linux/bits.h" - "include/uapi/linux/fadvise.h" "include/uapi/linux/fscrypt.h" "include/uapi/linux/genetlink.h" "include/uapi/linux/if_addr.h"
@@ -91,6 +90,7 @@ declare -a BEAUTY_FILES=( "include/uapi/drm/drm.h" "include/uapi/drm/i915_drm.h" "include/linux/socket.h" + "include/uapi/linux/fadvise.h" "include/uapi/linux/fcntl.h" "include/uapi/linux/fs.h" "include/uapi/linux/mount.h"
tools/perf/trace/beauty/fadvise.sh +1 -1
@@ -1,7 +1,7 @@ #!/bin/sh # SPDX-License-Identifier: LGPL-2.1 -[ $# -eq 1 ] && header_dir=$1 || header_dir=tools/include/uapi/linux/ +[ $# -eq 1 ] && header_dir=$1 || header_dir=tools/perf/trace/beauty/include/uapi/linux/ printf "static const char *fadvise_advices[] = {\n" regex='^[[:space:]]*#[[:space:]]*define[[:space:]]+POSIX_FADV_(\w+)[[:space:]]+([[:digit:]]+)[[:space:]]+.*'
tools/perf/trace/beauty/include/uapi/linux/fadvise.h renamed from tools/include/uapi/linux/fadvise.h +0 -0
Signature · 1 line
2.53.0
Quoted 8 lines · Arnaldo Carvalho de Melo
Since those are not used to build any tool in
tools/, move them to the directory where we just track for changes and use those headers just to scrape defines and turn them intoid->stringtables used by 'perf trace' (or any other tool in the future).Best Regards,
[...]
Applied to perf-tools-next, thanks!
Best regards,
Namhyung