linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH 0/3] Move some more header copies to tools/perf/trace/beauty/
@ 2024-03-14 14:43 Arnaldo Carvalho de Melo
  2024-03-14 14:43 ` [PATCH 1/3] perf beauty: Move uapi/linux/usbdevice_fs.h copy out of the directory used to build perf Arnaldo Carvalho de Melo
                   ` (3 more replies)
  0 siblings, 4 replies; 6+ messages in thread
From: Arnaldo Carvalho de Melo @ 2024-03-14 14:43 UTC (permalink / raw)
  To: Ian Rogers
  Cc: Jiri Olsa, Namhyung Kim, Adrian Hunter, linux-kernel,
	linux-perf-users, Arnaldo Carvalho de Melo

From: Arnaldo Carvalho de Melo <acme@redhat.com>

Hi,

   	Move a few more files that is used just by scrappers.

- Arnaldo

Arnaldo Carvalho de Melo (3):
  perf beauty: Move uapi/linux/usbdevice_fs.h copy out of the directory
    used to build perf
  perf beauty: Move uapi/sound/asound.h copy out of the directory used
    to build perf
  perf beauty: Move arch/x86/include/asm/irq_vectors.h copy out of the
    directory used to build perf

 tools/perf/Makefile.perf                      | 19 +++++++++++--------
 tools/perf/check-headers.sh                   |  6 +++---
 .../arch/x86/include/asm/irq_vectors.h        |  0
 .../beauty}/include/uapi/linux/usbdevice_fs.h |  0
 .../trace/beauty}/include/uapi/sound/asound.h |  0
 tools/perf/trace/beauty/sndrv_ctl_ioctl.sh    |  4 ++--
 tools/perf/trace/beauty/sndrv_pcm_ioctl.sh    |  4 ++--
 .../beauty/tracepoints/x86_irq_vectors.sh     |  6 +++---
 tools/perf/trace/beauty/usbdevfs_ioctl.sh     |  6 +++---
 9 files changed, 24 insertions(+), 21 deletions(-)
 rename tools/{ => perf/trace/beauty}/arch/x86/include/asm/irq_vectors.h (100%)
 rename tools/{ => perf/trace/beauty}/include/uapi/linux/usbdevice_fs.h (100%)
 rename tools/{ => perf/trace/beauty}/include/uapi/sound/asound.h (100%)

-- 
2.43.2


^ permalink raw reply	[flat|nested] 6+ messages in thread

* [PATCH 1/3] perf beauty: Move uapi/linux/usbdevice_fs.h copy out of the directory used to build perf
  2024-03-14 14:43 [PATCH 0/3] Move some more header copies to tools/perf/trace/beauty/ Arnaldo Carvalho de Melo
@ 2024-03-14 14:43 ` Arnaldo Carvalho de Melo
  2024-03-14 14:43 ` [PATCH 2/3] perf beauty: Move uapi/sound/asound.h " Arnaldo Carvalho de Melo
                   ` (2 subsequent siblings)
  3 siblings, 0 replies; 6+ messages in thread
From: Arnaldo Carvalho de Melo @ 2024-03-14 14:43 UTC (permalink / raw)
  To: Ian Rogers
  Cc: Jiri Olsa, Namhyung Kim, Adrian Hunter, linux-kernel,
	linux-perf-users, Arnaldo Carvalho de Melo

From: Arnaldo Carvalho de Melo <acme@redhat.com>

It is mostly 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 scrapping.

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.

No other tools/ living code uses it, just <linux/usbdevice_fs.h> coming
from either 'make install_headers' or from the system /usr/include/
directory.

Suggested-by: Ian 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: Arnaldo Carvalho de Melo <acme@redhat.com>
---
 tools/perf/Makefile.perf                                    | 4 ++--
 tools/perf/check-headers.sh                                 | 2 +-
 .../trace/beauty}/include/uapi/linux/usbdevice_fs.h         | 0
 tools/perf/trace/beauty/usbdevfs_ioctl.sh                   | 6 +++---
 4 files changed, 6 insertions(+), 6 deletions(-)
 rename tools/{ => perf/trace/beauty}/include/uapi/linux/usbdevice_fs.h (100%)

diff --git a/tools/perf/Makefile.perf b/tools/perf/Makefile.perf
index 523c3b7d6c9d3f51..53ec3765b4b2bd1b 100644
--- a/tools/perf/Makefile.perf
+++ b/tools/perf/Makefile.perf
@@ -623,8 +623,8 @@ $(prctl_option_array): $(prctl_hdr_dir)/prctl.h $(prctl_option_tbl)
 usbdevfs_ioctl_array := $(beauty_ioctl_outdir)/usbdevfs_ioctl_array.c
 usbdevfs_ioctl_tbl := $(srctree)/tools/perf/trace/beauty/usbdevfs_ioctl.sh
 
-$(usbdevfs_ioctl_array): $(linux_uapi_dir)/usbdevice_fs.h $(usbdevfs_ioctl_tbl)
-	$(Q)$(SHELL) '$(usbdevfs_ioctl_tbl)' $(linux_uapi_dir) > $@
+$(usbdevfs_ioctl_array): $(beauty_uapi_linux_dir)/usbdevice_fs.h $(usbdevfs_ioctl_tbl)
+	$(Q)$(SHELL) '$(usbdevfs_ioctl_tbl)' $(beauty_uapi_linux_dir) > $@
 
 x86_arch_prctl_code_array := $(beauty_outdir)/x86_arch_prctl_code_array.c
 x86_arch_prctl_code_tbl := $(srctree)/tools/perf/trace/beauty/x86_arch_prctl.sh
diff --git a/tools/perf/check-headers.sh b/tools/perf/check-headers.sh
index c2c26d6b87ef52f9..356ddb76a9541018 100755
--- a/tools/perf/check-headers.sh
+++ b/tools/perf/check-headers.sh
@@ -21,7 +21,6 @@ FILES=(
   "include/uapi/linux/sched.h"
   "include/uapi/linux/seccomp.h"
   "include/uapi/linux/stat.h"
-  "include/uapi/linux/usbdevice_fs.h"
   "include/uapi/linux/vhost.h"
   "include/uapi/sound/asound.h"
   "include/linux/bits.h"
@@ -98,6 +97,7 @@ BEAUTY_FILES=(
   "include/linux/socket.h"
   "include/uapi/linux/fs.h"
   "include/uapi/linux/mount.h"
+  "include/uapi/linux/usbdevice_fs.h"
 )
 
 declare -a FAILURES
diff --git a/tools/include/uapi/linux/usbdevice_fs.h b/tools/perf/trace/beauty/include/uapi/linux/usbdevice_fs.h
similarity index 100%
rename from tools/include/uapi/linux/usbdevice_fs.h
rename to tools/perf/trace/beauty/include/uapi/linux/usbdevice_fs.h
diff --git a/tools/perf/trace/beauty/usbdevfs_ioctl.sh b/tools/perf/trace/beauty/usbdevfs_ioctl.sh
index b39cfb3720b80624..12a30a9a8e0c8f44 100755
--- a/tools/perf/trace/beauty/usbdevfs_ioctl.sh
+++ b/tools/perf/trace/beauty/usbdevfs_ioctl.sh
@@ -1,21 +1,21 @@
 #!/bin/sh
 # SPDX-License-Identifier: LGPL-2.1
 
-[ $# -eq 1 ] && header_dir=$1 || header_dir=tools/include/uapi/linux/
+[ $# -eq 1 ] && beauty_uapi_linux_dir=$1 || beauty_uapi_linux_dir=tools/perf/trace/beauty/include/uapi/linux/
 
 # also as:
 # #define USBDEVFS_CONNINFO_EX(len)  _IOC(_IOC_READ, 'U', 32, len)
 
 printf "static const char *usbdevfs_ioctl_cmds[] = {\n"
 regex="^#[[:space:]]*define[[:space:]]+USBDEVFS_(\w+)(\(\w+\))?[[:space:]]+_IO[CWR]{0,2}\([[:space:]]*(_IOC_\w+,[[:space:]]*)?'U'[[:space:]]*,[[:space:]]*([[:digit:]]+).*"
-grep -E "$regex" ${header_dir}/usbdevice_fs.h | grep -E -v 'USBDEVFS_\w+32[[:space:]]' | \
+grep -E "$regex" ${beauty_uapi_linux_dir}/usbdevice_fs.h | grep -E -v 'USBDEVFS_\w+32[[:space:]]' | \
 	sed -r "s/$regex/\4 \1/g"	| \
 	sort | xargs printf "\t[%s] = \"%s\",\n"
 printf "};\n\n"
 printf "#if 0\n"
 printf "static const char *usbdevfs_ioctl_32_cmds[] = {\n"
 regex="^#[[:space:]]*define[[:space:]]+USBDEVFS_(\w+)[[:space:]]+_IO[WR]{0,2}\([[:space:]]*'U'[[:space:]]*,[[:space:]]*([[:digit:]]+).*"
-grep -E $regex ${header_dir}/usbdevice_fs.h | grep -E 'USBDEVFS_\w+32[[:space:]]' | \
+grep -E $regex ${beauty_uapi_linux_dir}/usbdevice_fs.h | grep -E 'USBDEVFS_\w+32[[:space:]]' | \
 	sed -r "s/$regex/\2 \1/g"	| \
 	sort | xargs printf "\t[%s] = \"%s\",\n"
 printf "};\n"
-- 
2.43.2


^ permalink raw reply related	[flat|nested] 6+ messages in thread

* [PATCH 2/3] perf beauty: Move uapi/sound/asound.h copy out of the directory used to build perf
  2024-03-14 14:43 [PATCH 0/3] Move some more header copies to tools/perf/trace/beauty/ Arnaldo Carvalho de Melo
  2024-03-14 14:43 ` [PATCH 1/3] perf beauty: Move uapi/linux/usbdevice_fs.h copy out of the directory used to build perf Arnaldo Carvalho de Melo
@ 2024-03-14 14:43 ` Arnaldo Carvalho de Melo
  2024-03-14 14:43 ` [PATCH 3/3] perf beauty: Move arch/x86/include/asm/irq_vectors.h " Arnaldo Carvalho de Melo
  2024-03-14 15:00 ` [PATCH 0/3] Move some more header copies to tools/perf/trace/beauty/ Ian Rogers
  3 siblings, 0 replies; 6+ messages in thread
From: Arnaldo Carvalho de Melo @ 2024-03-14 14:43 UTC (permalink / raw)
  To: Ian Rogers
  Cc: Jiri Olsa, Namhyung Kim, Adrian Hunter, linux-kernel,
	linux-perf-users, Arnaldo Carvalho de Melo

From: Arnaldo Carvalho de Melo <acme@redhat.com>

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
scrapping.

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: Ian 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: Arnaldo Carvalho de Melo <acme@redhat.com>
---
 tools/perf/Makefile.perf                                 | 9 +++++----
 tools/perf/check-headers.sh                              | 2 +-
 .../{ => perf/trace/beauty}/include/uapi/sound/asound.h  | 0
 tools/perf/trace/beauty/sndrv_ctl_ioctl.sh               | 4 ++--
 tools/perf/trace/beauty/sndrv_pcm_ioctl.sh               | 4 ++--
 5 files changed, 10 insertions(+), 9 deletions(-)
 rename tools/{ => perf/trace/beauty}/include/uapi/sound/asound.h (100%)

diff --git a/tools/perf/Makefile.perf b/tools/perf/Makefile.perf
index 53ec3765b4b2bd1b..757777d968602ded 100644
--- a/tools/perf/Makefile.perf
+++ b/tools/perf/Makefile.perf
@@ -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/
diff --git a/tools/perf/check-headers.sh b/tools/perf/check-headers.sh
index 356ddb76a9541018..93ad7a787a19d550 100755
--- a/tools/perf/check-headers.sh
+++ b/tools/perf/check-headers.sh
@@ -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
diff --git a/tools/include/uapi/sound/asound.h b/tools/perf/trace/beauty/include/uapi/sound/asound.h
similarity index 100%
rename from tools/include/uapi/sound/asound.h
rename to tools/perf/trace/beauty/include/uapi/sound/asound.h
diff --git a/tools/perf/trace/beauty/sndrv_ctl_ioctl.sh b/tools/perf/trace/beauty/sndrv_ctl_ioctl.sh
index e0803b9575932420..572939a1288455a4 100755
--- a/tools/perf/trace/beauty/sndrv_ctl_ioctl.sh
+++ b/tools/perf/trace/beauty/sndrv_ctl_ioctl.sh
@@ -1,9 +1,9 @@
 #!/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"
diff --git a/tools/perf/trace/beauty/sndrv_pcm_ioctl.sh b/tools/perf/trace/beauty/sndrv_pcm_ioctl.sh
index 7a464a7bf91399bf..33afae9a1c07ca5e 100755
--- a/tools/perf/trace/beauty/sndrv_pcm_ioctl.sh
+++ b/tools/perf/trace/beauty/sndrv_pcm_ioctl.sh
@@ -1,9 +1,9 @@
 #!/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"
-- 
2.43.2


^ permalink raw reply related	[flat|nested] 6+ messages in thread

* [PATCH 3/3] perf beauty: Move arch/x86/include/asm/irq_vectors.h copy out of the directory used to build perf
  2024-03-14 14:43 [PATCH 0/3] Move some more header copies to tools/perf/trace/beauty/ Arnaldo Carvalho de Melo
  2024-03-14 14:43 ` [PATCH 1/3] perf beauty: Move uapi/linux/usbdevice_fs.h copy out of the directory used to build perf Arnaldo Carvalho de Melo
  2024-03-14 14:43 ` [PATCH 2/3] perf beauty: Move uapi/sound/asound.h " Arnaldo Carvalho de Melo
@ 2024-03-14 14:43 ` Arnaldo Carvalho de Melo
  2024-03-14 15:00 ` [PATCH 0/3] Move some more header copies to tools/perf/trace/beauty/ Ian Rogers
  3 siblings, 0 replies; 6+ messages in thread
From: Arnaldo Carvalho de Melo @ 2024-03-14 14:43 UTC (permalink / raw)
  To: Ian Rogers
  Cc: Jiri Olsa, Namhyung Kim, Adrian Hunter, linux-kernel,
	linux-perf-users, Arnaldo Carvalho de Melo

From: Arnaldo Carvalho de Melo <acme@redhat.com>

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
scrapping.

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.

No other tools/ living code uses it.

Suggested-by: Ian 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: Arnaldo Carvalho de Melo <acme@redhat.com>
---
 tools/perf/Makefile.perf                                    | 6 ++++--
 tools/perf/check-headers.sh                                 | 2 +-
 .../trace/beauty}/arch/x86/include/asm/irq_vectors.h        | 0
 tools/perf/trace/beauty/tracepoints/x86_irq_vectors.sh      | 6 +++---
 4 files changed, 8 insertions(+), 6 deletions(-)
 rename tools/{ => perf/trace/beauty}/arch/x86/include/asm/irq_vectors.h (100%)

diff --git a/tools/perf/Makefile.perf b/tools/perf/Makefile.perf
index 757777d968602ded..c75342b21089fc6f 100644
--- a/tools/perf/Makefile.perf
+++ b/tools/perf/Makefile.perf
@@ -474,6 +474,8 @@ 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/
+beauty_arch_asm_dir := $(srctree)/tools/perf/trace/beauty/arch/x86/include/asm/
+
 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/
@@ -636,8 +638,8 @@ $(x86_arch_prctl_code_array): $(x86_arch_asm_uapi_dir)/prctl.h $(x86_arch_prctl_
 x86_arch_irq_vectors_array := $(beauty_outdir)/x86_arch_irq_vectors_array.c
 x86_arch_irq_vectors_tbl := $(srctree)/tools/perf/trace/beauty/tracepoints/x86_irq_vectors.sh
 
-$(x86_arch_irq_vectors_array): $(x86_arch_asm_dir)/irq_vectors.h $(x86_arch_irq_vectors_tbl)
-	$(Q)$(SHELL) '$(x86_arch_irq_vectors_tbl)' $(x86_arch_asm_dir) > $@
+$(x86_arch_irq_vectors_array): $(beauty_arch_asm_dir)/irq_vectors.h $(x86_arch_irq_vectors_tbl)
+	$(Q)$(SHELL) '$(x86_arch_irq_vectors_tbl)' $(beauty_arch_asm_dir) > $@
 
 x86_arch_MSRs_array := $(beauty_outdir)/x86_arch_MSRs_array.c
 x86_arch_MSRs_tbl := $(srctree)/tools/perf/trace/beauty/tracepoints/x86_msr.sh
diff --git a/tools/perf/check-headers.sh b/tools/perf/check-headers.sh
index 93ad7a787a19d550..b35eba5e99c8d91f 100755
--- a/tools/perf/check-headers.sh
+++ b/tools/perf/check-headers.sh
@@ -34,7 +34,6 @@ FILES=(
   "arch/x86/include/asm/cpufeatures.h"
   "arch/x86/include/asm/inat_types.h"
   "arch/x86/include/asm/emulate_prefix.h"
-  "arch/x86/include/asm/irq_vectors.h"
   "arch/x86/include/asm/msr-index.h"
   "arch/x86/include/uapi/asm/prctl.h"
   "arch/x86/lib/x86-opcode-map.txt"
@@ -93,6 +92,7 @@ SYNC_CHECK_FILES=(
 
 declare -a BEAUTY_FILES
 BEAUTY_FILES=(
+  "arch/x86/include/asm/irq_vectors.h"
   "include/linux/socket.h"
   "include/uapi/linux/fs.h"
   "include/uapi/linux/mount.h"
diff --git a/tools/arch/x86/include/asm/irq_vectors.h b/tools/perf/trace/beauty/arch/x86/include/asm/irq_vectors.h
similarity index 100%
rename from tools/arch/x86/include/asm/irq_vectors.h
rename to tools/perf/trace/beauty/arch/x86/include/asm/irq_vectors.h
diff --git a/tools/perf/trace/beauty/tracepoints/x86_irq_vectors.sh b/tools/perf/trace/beauty/tracepoints/x86_irq_vectors.sh
index 87dc68c7de0c297e..d8e927dd2bb75c41 100755
--- a/tools/perf/trace/beauty/tracepoints/x86_irq_vectors.sh
+++ b/tools/perf/trace/beauty/tracepoints/x86_irq_vectors.sh
@@ -3,12 +3,12 @@
 # (C) 2019, Arnaldo Carvalho de Melo <acme@redhat.com>
 
 if [ $# -ne 1 ] ; then
-	arch_x86_header_dir=tools/arch/x86/include/asm/
+	beauty_arch_asm_dir=tools/perf/trace/beauty/arch/x86/include/asm/
 else
-	arch_x86_header_dir=$1
+	beauty_arch_asm_dir=$1
 fi
 
-x86_irq_vectors=${arch_x86_header_dir}/irq_vectors.h
+x86_irq_vectors=${beauty_arch_asm_dir}/irq_vectors.h
 
 # FIRST_EXTERNAL_VECTOR is not that useful, find what is its number
 # and then replace whatever is using it and that is useful, which at
-- 
2.43.2


^ permalink raw reply related	[flat|nested] 6+ messages in thread

* Re: [PATCH 0/3] Move some more header copies to tools/perf/trace/beauty/
  2024-03-14 14:43 [PATCH 0/3] Move some more header copies to tools/perf/trace/beauty/ Arnaldo Carvalho de Melo
                   ` (2 preceding siblings ...)
  2024-03-14 14:43 ` [PATCH 3/3] perf beauty: Move arch/x86/include/asm/irq_vectors.h " Arnaldo Carvalho de Melo
@ 2024-03-14 15:00 ` Ian Rogers
       [not found]   ` <CA+JHD93osaLDZurWep=ie5Rnshk-T8i8ZnLrneVfeQ6eNAaKJA@mail.gmail.com>
  3 siblings, 1 reply; 6+ messages in thread
From: Ian Rogers @ 2024-03-14 15:00 UTC (permalink / raw)
  To: Arnaldo Carvalho de Melo
  Cc: Jiri Olsa, Namhyung Kim, Adrian Hunter, linux-kernel,
	linux-perf-users, Arnaldo Carvalho de Melo

On Thu, Mar 14, 2024 at 7:43 AM Arnaldo Carvalho de Melo
<acme@kernel.org> wrote:
>
> From: Arnaldo Carvalho de Melo <acme@redhat.com>
>
> Hi,
>
>         Move a few more files that is used just by scrappers.

Thanks Arnaldo! A nit, could you change s/scrapp/scrap/g in the commit
messages - scrapping is throwing away, you mean scraping :-)

Ian

> - Arnaldo
>
> Arnaldo Carvalho de Melo (3):
>   perf beauty: Move uapi/linux/usbdevice_fs.h copy out of the directory
>     used to build perf
>   perf beauty: Move uapi/sound/asound.h copy out of the directory used
>     to build perf
>   perf beauty: Move arch/x86/include/asm/irq_vectors.h copy out of the
>     directory used to build perf
>
>  tools/perf/Makefile.perf                      | 19 +++++++++++--------
>  tools/perf/check-headers.sh                   |  6 +++---
>  .../arch/x86/include/asm/irq_vectors.h        |  0
>  .../beauty}/include/uapi/linux/usbdevice_fs.h |  0
>  .../trace/beauty}/include/uapi/sound/asound.h |  0
>  tools/perf/trace/beauty/sndrv_ctl_ioctl.sh    |  4 ++--
>  tools/perf/trace/beauty/sndrv_pcm_ioctl.sh    |  4 ++--
>  .../beauty/tracepoints/x86_irq_vectors.sh     |  6 +++---
>  tools/perf/trace/beauty/usbdevfs_ioctl.sh     |  6 +++---
>  9 files changed, 24 insertions(+), 21 deletions(-)
>  rename tools/{ => perf/trace/beauty}/arch/x86/include/asm/irq_vectors.h (100%)
>  rename tools/{ => perf/trace/beauty}/include/uapi/linux/usbdevice_fs.h (100%)
>  rename tools/{ => perf/trace/beauty}/include/uapi/sound/asound.h (100%)
>
> --
> 2.43.2
>

^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: [PATCH 0/3] Move some more header copies to tools/perf/trace/beauty/
       [not found]   ` <CA+JHD93osaLDZurWep=ie5Rnshk-T8i8ZnLrneVfeQ6eNAaKJA@mail.gmail.com>
@ 2024-03-14 16:55     ` Ian Rogers
  0 siblings, 0 replies; 6+ messages in thread
From: Ian Rogers @ 2024-03-14 16:55 UTC (permalink / raw)
  To: Arnaldo Carvalho de Melo
  Cc: Arnaldo Carvalho de Melo, Jiri Olsa, Namhyung Kim, Adrian Hunter,
	Linux Kernel Mailing List, linux-perf-users,
	Arnaldo Carvalho de Melo

On Thu, Mar 14, 2024 at 9:46 AM Arnaldo Carvalho de Melo
<arnaldo.melo@gmail.com> wrote:
>
>
>
> On Thu, Mar 14, 2024, 12:00 PM Ian Rogers <irogers@google.com> wrote:
>>
>> On Thu, Mar 14, 2024 at 7:43 AM Arnaldo Carvalho de Melo
>> <acme@kernel.org> wrote:
>> >
>> > From: Arnaldo Carvalho de Melo <acme@redhat.com>
>> >
>> > Hi,
>> >
>> >         Move a few more files that is used just by scrappers.
>>
>> Thanks Arnaldo! A nit, could you change s/scrapp/scrap/g in the commit
>> messages - scrapping is throwing away, you mean scraping :-)
>
>
> Sure, learned the difference an extra p makes :-)
>
> Can I take this as an acked-by?

Yep.

Reviewed-by: Ian Rogers <irogers@google.com>

Thanks,
Ian

> - Arnaldo
>
>>
>> Ian
>>
>> > - Arnaldo
>> >
>> > Arnaldo Carvalho de Melo (3):
>> >   perf beauty: Move uapi/linux/usbdevice_fs.h copy out of the directory
>> >     used to build perf
>> >   perf beauty: Move uapi/sound/asound.h copy out of the directory used
>> >     to build perf
>> >   perf beauty: Move arch/x86/include/asm/irq_vectors.h copy out of the
>> >     directory used to build perf
>> >
>> >  tools/perf/Makefile.perf                      | 19 +++++++++++--------
>> >  tools/perf/check-headers.sh                   |  6 +++---
>> >  .../arch/x86/include/asm/irq_vectors.h        |  0
>> >  .../beauty}/include/uapi/linux/usbdevice_fs.h |  0
>> >  .../trace/beauty}/include/uapi/sound/asound.h |  0
>> >  tools/perf/trace/beauty/sndrv_ctl_ioctl.sh    |  4 ++--
>> >  tools/perf/trace/beauty/sndrv_pcm_ioctl.sh    |  4 ++--
>> >  .../beauty/tracepoints/x86_irq_vectors.sh     |  6 +++---
>> >  tools/perf/trace/beauty/usbdevfs_ioctl.sh     |  6 +++---
>> >  9 files changed, 24 insertions(+), 21 deletions(-)
>> >  rename tools/{ => perf/trace/beauty}/arch/x86/include/asm/irq_vectors.h (100%)
>> >  rename tools/{ => perf/trace/beauty}/include/uapi/linux/usbdevice_fs.h (100%)
>> >  rename tools/{ => perf/trace/beauty}/include/uapi/sound/asound.h (100%)
>> >
>> > --
>> > 2.43.2
>> >

^ permalink raw reply	[flat|nested] 6+ messages in thread

end of thread, other threads:[~2024-03-14 16:55 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2024-03-14 14:43 [PATCH 0/3] Move some more header copies to tools/perf/trace/beauty/ Arnaldo Carvalho de Melo
2024-03-14 14:43 ` [PATCH 1/3] perf beauty: Move uapi/linux/usbdevice_fs.h copy out of the directory used to build perf Arnaldo Carvalho de Melo
2024-03-14 14:43 ` [PATCH 2/3] perf beauty: Move uapi/sound/asound.h " Arnaldo Carvalho de Melo
2024-03-14 14:43 ` [PATCH 3/3] perf beauty: Move arch/x86/include/asm/irq_vectors.h " Arnaldo Carvalho de Melo
2024-03-14 15:00 ` [PATCH 0/3] Move some more header copies to tools/perf/trace/beauty/ Ian Rogers
     [not found]   ` <CA+JHD93osaLDZurWep=ie5Rnshk-T8i8ZnLrneVfeQ6eNAaKJA@mail.gmail.com>
2024-03-14 16:55     ` Ian Rogers

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).