Hello, On Wed, Oct 11, 2023 at 12:58 PM Oliver Upton <oliver.upton@xxxxxxxxx> wrote: > > Start generating sysreg-defs.h in anticipation of updating sysreg.h to a > version that needs the generated output. > > Signed-off-by: Oliver Upton <oliver.upton@xxxxxxxxx> It seems we also need this on non-ARM archs to process ARM SPE data. Acked-by: Namhyung Kim <namhyung@xxxxxxxxxx> Thanks, Namhyung > --- > tools/perf/Makefile.perf | 15 +++++++++++++-- > tools/perf/util/Build | 2 +- > 2 files changed, 14 insertions(+), 3 deletions(-) > > diff --git a/tools/perf/Makefile.perf b/tools/perf/Makefile.perf > index 37af6df7b978..14dedd11a1f5 100644 > --- a/tools/perf/Makefile.perf > +++ b/tools/perf/Makefile.perf > @@ -443,6 +443,15 @@ drm_ioctl_tbl := $(srctree)/tools/perf/trace/beauty/drm_ioctl.sh > # Create output directory if not already present > _dummy := $(shell [ -d '$(beauty_ioctl_outdir)' ] || mkdir -p '$(beauty_ioctl_outdir)') > > +arm64_gen_sysreg_dir := $(srctree)/tools/arch/arm64/tools > + > +arm64-sysreg-defs: FORCE > + $(Q)$(MAKE) -C $(arm64_gen_sysreg_dir) > + > +arm64-sysreg-defs-clean: > + $(call QUIET_CLEAN,arm64-sysreg-defs) > + $(Q)$(MAKE) -C $(arm64_gen_sysreg_dir) clean > /dev/null > + > $(drm_ioctl_array): $(drm_hdr_dir)/drm.h $(drm_hdr_dir)/i915_drm.h $(drm_ioctl_tbl) > $(Q)$(SHELL) '$(drm_ioctl_tbl)' $(drm_hdr_dir) > $@ > > @@ -716,7 +725,9 @@ endif > __build-dir = $(subst $(OUTPUT),,$(dir $@)) > build-dir = $(or $(__build-dir),.) > > -prepare: $(OUTPUT)PERF-VERSION-FILE $(OUTPUT)common-cmds.h archheaders $(drm_ioctl_array) \ > +prepare: $(OUTPUT)PERF-VERSION-FILE $(OUTPUT)common-cmds.h archheaders \ > + arm64-sysreg-defs \ > + $(drm_ioctl_array) \ > $(fadvise_advice_array) \ > $(fsconfig_arrays) \ > $(fsmount_arrays) \ > @@ -1125,7 +1136,7 @@ endif # BUILD_BPF_SKEL > bpf-skel-clean: > $(call QUIET_CLEAN, bpf-skel) $(RM) -r $(SKEL_TMP_OUT) $(SKELETONS) > > -clean:: $(LIBAPI)-clean $(LIBBPF)-clean $(LIBSUBCMD)-clean $(LIBSYMBOL)-clean $(LIBPERF)-clean fixdep-clean python-clean bpf-skel-clean tests-coresight-targets-clean > +clean:: $(LIBAPI)-clean $(LIBBPF)-clean $(LIBSUBCMD)-clean $(LIBSYMBOL)-clean $(LIBPERF)-clean arm64-sysreg-defs-clean fixdep-clean python-clean bpf-skel-clean tests-coresight-targets-clean > $(call QUIET_CLEAN, core-objs) $(RM) $(LIBPERF_A) $(OUTPUT)perf-archive $(OUTPUT)perf-iostat $(LANG_BINDINGS) > $(Q)find $(or $(OUTPUT),.) -name '*.o' -delete -o -name '\.*.cmd' -delete -o -name '\.*.d' -delete > $(Q)$(RM) $(OUTPUT).config-detected > diff --git a/tools/perf/util/Build b/tools/perf/util/Build > index 6d657c9927f7..2f76230958ad 100644 > --- a/tools/perf/util/Build > +++ b/tools/perf/util/Build > @@ -345,7 +345,7 @@ CFLAGS_rbtree.o += -Wno-unused-parameter -DETC_PERFCONFIG="BUILD_STR($(ET > CFLAGS_libstring.o += -Wno-unused-parameter -DETC_PERFCONFIG="BUILD_STR($(ETC_PERFCONFIG_SQ))" > CFLAGS_hweight.o += -Wno-unused-parameter -DETC_PERFCONFIG="BUILD_STR($(ETC_PERFCONFIG_SQ))" > CFLAGS_header.o += -include $(OUTPUT)PERF-VERSION-FILE > -CFLAGS_arm-spe.o += -I$(srctree)/tools/arch/arm64/include/ > +CFLAGS_arm-spe.o += -I$(srctree)/tools/arch/arm64/include/ -I$(srctree)/tools/arch/arm64/include/generated/ > > $(OUTPUT)util/argv_split.o: ../lib/argv_split.c FORCE > $(call rule_mkdir) > -- > 2.42.0.609.gbb76f46606-goog >
