From 5f2578de2d09bd1bb6e215ada498b8f84e2f34a1 Mon Sep 17 00:00:00 2001 From: Anuj Phogat Date: Tue, 6 Apr 2021 10:08:41 -0700 Subject: intel: Rename GEN_PERF prefix to INTEL_PERF in build files export': export SEARCH_PATH="src/intel src/gallium/drivers/iris src/mesa/drivers/dri/i965 grep -E "GEN_PERF[A-Z_]*_FILES" -rIl $SEARCH_PATH | xargs sed -ie "s/GEN_PERF\([A-Z_]*_FILES\)/INTEL_PERF\1/g" Signed-off-by: Anuj Phogat Reviewed-by: Kenneth Graunke Part-of: --- src/intel/Android.perf.mk | 8 ++++---- src/intel/Makefile.perf.am | 10 +++++----- src/intel/Makefile.sources | 6 +++--- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/intel/Android.perf.mk b/src/intel/Android.perf.mk index f9d82960b07..4e5f04a7ddf 100644 --- a/src/intel/Android.perf.mk +++ b/src/intel/Android.perf.mk @@ -33,18 +33,18 @@ intermediates := $(call local-generated-sources-dir) LOCAL_C_INCLUDES := $(MESA_TOP)/include/drm-uapi -LOCAL_SRC_FILES := $(GEN_PERF_FILES) +LOCAL_SRC_FILES := $(INTEL_PERF_FILES) LOCAL_GENERATED_SOURCES += $(addprefix $(intermediates)/, \ - $(GEN_PERF_GENERATED_FILES)) + $(INTEL_PERF_GENERATED_FILES)) -$(intermediates)/perf/intel_perf_metrics.c: $(LOCAL_PATH)/perf/gen_perf.py $(addprefix $(MESA_TOP)/src/intel/,$(GEN_PERF_XML_FILES)) +$(intermediates)/perf/intel_perf_metrics.c: $(LOCAL_PATH)/perf/gen_perf.py $(addprefix $(MESA_TOP)/src/intel/,$(INTEL_PERF_XML_FILES)) @echo "target Generated: $(PRIVATE_MODULE) <= $(notdir $(@))" @mkdir -p $(dir $@) $(hide) $(MESA_PYTHON2) $< \ --code=$@ \ --header=$(@:%.c=%.h) \ - $(addprefix $(MESA_TOP)/src/intel/,$(GEN_PERF_XML_FILES)) + $(addprefix $(MESA_TOP)/src/intel/,$(INTEL_PERF_XML_FILES)) $(intermediates)/perf/intel_perf_metrics.h: $(intermediates)/perf/intel_perf_metrics.c diff --git a/src/intel/Makefile.perf.am b/src/intel/Makefile.perf.am index bd756df032b..9e81a59f527 100644 --- a/src/intel/Makefile.perf.am +++ b/src/intel/Makefile.perf.am @@ -20,22 +20,22 @@ # IN THE SOFTWARE. BUILT_SOURCES += \ - $(GEN_PERF_GENERATED_FILES) + $(INTEL_PERF_GENERATED_FILES) noinst_LTLIBRARIES += perf/libintel_perf.la -perf_libintel_perf_la_SOURCES = $(GEN_PERF_FILES) $(GEN_PERF_GENERATED_FILES) +perf_libintel_perf_la_SOURCES = $(INTEL_PERF_FILES) $(INTEL_PERF_GENERATED_FILES) perf_libintel_perf_la_CFLAGS = $(AM_CFLAGS) -perf/intel_perf_metrics.c: perf/gen_perf.py $(GEN_PERF_XML_FILES) +perf/intel_perf_metrics.c: perf/gen_perf.py $(INTEL_PERF_XML_FILES) $(MKDIR_GEN) $(PYTHON_GEN) $(PYTHON_FLAGS) $(srcdir)/perf/gen_perf.py \ --code=$(builddir)/perf/intel_perf_metrics.c \ --header=$(builddir)/perf/intel_perf_metrics.h \ - $(GEN_PERF_XML_FILES:%=$(srcdir)/%) + $(INTEL_PERF_XML_FILES:%=$(srcdir)/%) perf/intel_perf_metrics.h: perf/intel_perf_metrics.c EXTRA_DIST += \ - $(GEN_PERF_XML_FILES) \ + $(INTEL_PERF_XML_FILES) \ perf/gen_perf.py diff --git a/src/intel/Makefile.sources b/src/intel/Makefile.sources index a4d8e608b5c..382d08654d0 100644 --- a/src/intel/Makefile.sources +++ b/src/intel/Makefile.sources @@ -348,7 +348,7 @@ VULKAN_GFX125_FILES := \ vulkan/gfx8_cmd_buffer.c \ $(VULKAN_GENX_FILES) -GEN_PERF_XML_FILES = \ +INTEL_PERF_XML_FILES = \ perf/oa-hsw.xml \ perf/oa-bdw.xml \ perf/oa-chv.xml \ @@ -369,7 +369,7 @@ GEN_PERF_XML_FILES = \ perf/oa-dg1.xml \ perf/oa-adl.xml -GEN_PERF_FILES = \ +INTEL_PERF_FILES = \ perf/intel_perf.c \ perf/intel_perf.h \ perf/intel_perf_mdapi.c \ @@ -378,6 +378,6 @@ GEN_PERF_FILES = \ perf/intel_perf_query.h \ perf/intel_perf_query.c -GEN_PERF_GENERATED_FILES = \ +INTEL_PERF_GENERATED_FILES = \ perf/intel_perf_metrics.c \ perf/intel_perf_metrics.h -- cgit v1.2.3