Commit 7050e33e authored by Arnaldo Carvalho de Melo's avatar Arnaldo Carvalho de Melo
Browse files

perf beauty: Move uapi/sound/asound.h copy out of the directory used to build perf 



It is used only to generate string tables, not to build perf, so move it
to the tools/perf/trace/beauty/include/ hierarchy, that is used just for
scraping.

This is a something that should've have happened, as happened with the
linux/socket.h scrapper, do it now as Ian suggested while doing an
audit/refactor session in the headers used by perf.

Suggested-by: default avatarIan Rogers <irogers@google.com>
Reviewed-by: default avatarIan Rogers <irogers@google.com>
Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Namhyung Kim <namhyung@kernel.org>
Link: https://lore.kernel.org/lkml/CAP-5=fWZVrpRufO4w-S4EcSi9STXcTAN2ERLwTSN7yrSSA-otQ@mail.gmail.com


Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent 44512bd6

tools/perf/Makefile.perf

+5 −4
Original line number Diff line number Diff line
@@ -473,6 +473,7 @@ arm64-sysreg-defs-clean: 


beauty_linux_dir := $(srctree)/tools/perf/trace/beauty/include/linux/

beauty_uapi_linux_dir := $(srctree)/tools/perf/trace/beauty/include/uapi/linux/

beauty_uapi_sound_dir := $(srctree)/tools/perf/trace/beauty/include/uapi/sound/

linux_uapi_dir := $(srctree)/tools/include/uapi/linux

asm_generic_uapi_dir := $(srctree)/tools/include/uapi/asm-generic

arch_asm_uapi_dir := $(srctree)/tools/arch/$(SRCARCH)/include/uapi/asm/
@@ -526,15 +527,15 @@ sndrv_ctl_ioctl_array := $(beauty_ioctl_outdir)/sndrv_ctl_ioctl_array.c 
sndrv_ctl_hdr_dir := $(srctree)/tools/include/uapi/sound

sndrv_ctl_ioctl_tbl := $(srctree)/tools/perf/trace/beauty/sndrv_ctl_ioctl.sh



$(sndrv_ctl_ioctl_array): $(sndrv_ctl_hdr_dir)/asound.h $(sndrv_ctl_ioctl_tbl)

	$(Q)$(SHELL) '$(sndrv_ctl_ioctl_tbl)' $(sndrv_ctl_hdr_dir) > $@

$(sndrv_ctl_ioctl_array): $(beauty_uapi_sound_dir)/asound.h $(sndrv_ctl_ioctl_tbl)

	$(Q)$(SHELL) '$(sndrv_ctl_ioctl_tbl)' $(beauty_uapi_sound_dir) > $@



sndrv_pcm_ioctl_array := $(beauty_ioctl_outdir)/sndrv_pcm_ioctl_array.c

sndrv_pcm_hdr_dir := $(srctree)/tools/include/uapi/sound

sndrv_pcm_ioctl_tbl := $(srctree)/tools/perf/trace/beauty/sndrv_pcm_ioctl.sh



$(sndrv_pcm_ioctl_array): $(sndrv_pcm_hdr_dir)/asound.h $(sndrv_pcm_ioctl_tbl)

	$(Q)$(SHELL) '$(sndrv_pcm_ioctl_tbl)' $(sndrv_pcm_hdr_dir) > $@

$(sndrv_pcm_ioctl_array): $(beauty_uapi_sound_dir)/asound.h $(sndrv_pcm_ioctl_tbl)

	$(Q)$(SHELL) '$(sndrv_pcm_ioctl_tbl)' $(beauty_uapi_sound_dir) > $@



kcmp_type_array := $(beauty_outdir)/kcmp_type_array.c

kcmp_hdr_dir := $(srctree)/tools/include/uapi/linux/

tools/perf/check-headers.sh

+1 −1
Original line number Diff line number Diff line
@@ -22,7 +22,6 @@ FILES=( 
  "include/uapi/linux/seccomp.h"

  "include/uapi/linux/stat.h"

  "include/uapi/linux/vhost.h"

  "include/uapi/sound/asound.h"

  "include/linux/bits.h"

  "include/vdso/bits.h"

  "include/linux/const.h"
@@ -98,6 +97,7 @@ BEAUTY_FILES=( 
  "include/uapi/linux/fs.h"

  "include/uapi/linux/mount.h"

  "include/uapi/linux/usbdevice_fs.h"

  "include/uapi/sound/asound.h"

)



declare -a FAILURES

tools/perf/trace/beauty/sndrv_ctl_ioctl.sh

+2 −2
Original line number Diff line number Diff line 
#!/bin/sh

# SPDX-License-Identifier: LGPL-2.1



[ $# -eq 1 ] && header_dir=$1 || header_dir=tools/include/uapi/sound/

[ $# -eq 1 ] && beauty_uapi_sound_dir=$1 || beauty_uapi_sound_dir=tools/perf/trace/beauty/include/uapi/sound/



printf "static const char *sndrv_ctl_ioctl_cmds[] = {\n"

grep "^#define[\t ]\+SNDRV_CTL_IOCTL_" $header_dir/asound.h | \

grep "^#define[\t ]\+SNDRV_CTL_IOCTL_" $beauty_uapi_sound_dir/asound.h | \

	sed -r 's/^#define +SNDRV_CTL_IOCTL_([A-Z0-9_]+)[\t ]+_IO[RW]*\( *.U., *(0x[[:xdigit:]]+),?.*/\t[\2] = \"\1\",/g'

printf "};\n"

tools/perf/trace/beauty/sndrv_pcm_ioctl.sh

+2 −2
Original line number Diff line number Diff line 
#!/bin/sh

# SPDX-License-Identifier: LGPL-2.1



[ $# -eq 1 ] && header_dir=$1 || header_dir=tools/include/uapi/sound/

[ $# -eq 1 ] && beauty_uapi_sound_dir=$1 || beauty_uapi_sound_dir=tools/perf/trace/beauty/include/uapi/sound/



printf "static const char *sndrv_pcm_ioctl_cmds[] = {\n"

grep "^#define[\t ]\+SNDRV_PCM_IOCTL_" $header_dir/asound.h | \

grep "^#define[\t ]\+SNDRV_PCM_IOCTL_" $beauty_uapi_sound_dir/asound.h | \

	sed -r 's/^#define +SNDRV_PCM_IOCTL_([A-Z0-9_]+)[\t ]+_IO[RW]*\( *.A., *(0x[[:xdigit:]]+),?.*/\t[\2] = \"\1\",/g'

printf "};\n"