From e6e79436af601692ee3fa159ad44b2cb0aaf3335 Mon Sep 17 00:00:00 2001 From: Anuj Phogat Date: Mon, 5 Apr 2021 17:24:14 -0700 Subject: [PATCH] intel: Rename gen_perf prefix in filenames to intel_perf export SEARCH_PATH="src/intel src/gallium/drivers/iris src/mesa/drivers/dri/i965 find $SEARCH_PATH -type f -name "*gen_perf*[cph]" -exec sh -c 'f="{}"; mv -- "$f" "${f/gen_perf/intel_perf}"' \; grep -E "GEN_PERF[[:alnum:]_]*_H( |$)" -rIl $SEARCH_PATH | xargs sed -ie "s/GEN_PERF\([[:alnum:]_]*_H\)\( \|$\)/INTEL_PERF\1\2/g" grep -E "gen_perf" -rIl $SEARCH_PATH | xargs sed -ie "s/gen_perf\([[:alnum:]_]*\.[ch]\)/intel_perf\1/g" Signed-off-by: Anuj Phogat Reviewed-by: Kenneth Graunke Part-of: --- src/gallium/drivers/iris/iris_perf.h | 4 ++-- src/intel/Android.perf.mk | 4 ++-- src/intel/Makefile.perf.am | 8 ++++---- src/intel/Makefile.sources | 18 +++++++++--------- src/intel/perf/gen_perf.py | 2 +- src/intel/perf/{gen_perf.c => intel_perf.c} | 10 +++++----- src/intel/perf/{gen_perf.h => intel_perf.h} | 6 +++--- .../{gen_perf_mdapi.c => intel_perf_mdapi.c} | 8 ++++---- .../{gen_perf_mdapi.h => intel_perf_mdapi.h} | 6 +++--- ...gen_perf_private.h => intel_perf_private.h} | 8 ++++---- .../{gen_perf_query.c => intel_perf_query.c} | 10 +++++----- .../{gen_perf_query.h => intel_perf_query.h} | 6 +++--- .../{gen_perf_regs.h => intel_perf_regs.h} | 6 +++--- src/intel/perf/meson.build | 8 ++++---- src/intel/vulkan/anv_batch_chain.c | 2 +- src/intel/vulkan/anv_device.c | 2 +- src/intel/vulkan/anv_perf.c | 4 ++-- src/intel/vulkan/genX_query.c | 6 +++--- src/mesa/drivers/dri/i965/brw_context.h | 4 ++-- .../drivers/dri/i965/brw_performance_query.c | 8 ++++---- src/mesa/drivers/dri/i965/gfx6_queryobj.c | 2 +- 21 files changed, 66 insertions(+), 66 deletions(-) rename src/intel/perf/{gen_perf.c => intel_perf.c} (99%) rename src/intel/perf/{gen_perf.h => intel_perf.h} (99%) rename src/intel/perf/{gen_perf_mdapi.c => intel_perf_mdapi.c} (99%) rename src/intel/perf/{gen_perf_mdapi.h => intel_perf_mdapi.h} (98%) rename src/intel/perf/{gen_perf_private.h => intel_perf_private.h} (96%) rename src/intel/perf/{gen_perf_query.c => intel_perf_query.c} (99%) rename src/intel/perf/{gen_perf_query.h => intel_perf_query.h} (97%) rename src/intel/perf/{gen_perf_regs.h => intel_perf_regs.h} (98%) diff --git a/src/gallium/drivers/iris/iris_perf.h b/src/gallium/drivers/iris/iris_perf.h index c1f7ea2072c..6afefe34383 100644 --- a/src/gallium/drivers/iris/iris_perf.h +++ b/src/gallium/drivers/iris/iris_perf.h @@ -23,8 +23,8 @@ #ifndef IRIS_PERF_H #define IRIS_PERF_H -#include "perf/gen_perf.h" -#include "perf/gen_perf_query.h" +#include "perf/intel_perf.h" +#include "perf/intel_perf_query.h" void iris_perf_init_vtbl(struct gen_perf_config *cfg); diff --git a/src/intel/Android.perf.mk b/src/intel/Android.perf.mk index 0d7d746a632..f9d82960b07 100644 --- a/src/intel/Android.perf.mk +++ b/src/intel/Android.perf.mk @@ -38,7 +38,7 @@ LOCAL_SRC_FILES := $(GEN_PERF_FILES) LOCAL_GENERATED_SOURCES += $(addprefix $(intermediates)/, \ $(GEN_PERF_GENERATED_FILES)) -$(intermediates)/perf/gen_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/,$(GEN_PERF_XML_FILES)) @echo "target Generated: $(PRIVATE_MODULE) <= $(notdir $(@))" @mkdir -p $(dir $@) $(hide) $(MESA_PYTHON2) $< \ @@ -46,7 +46,7 @@ $(intermediates)/perf/gen_perf_metrics.c: $(LOCAL_PATH)/perf/gen_perf.py $(addpr --header=$(@:%.c=%.h) \ $(addprefix $(MESA_TOP)/src/intel/,$(GEN_PERF_XML_FILES)) -$(intermediates)/perf/gen_perf_metrics.h: $(intermediates)/perf/gen_perf_metrics.c +$(intermediates)/perf/intel_perf_metrics.h: $(intermediates)/perf/intel_perf_metrics.c include $(MESA_COMMON_MK) include $(BUILD_STATIC_LIBRARY) diff --git a/src/intel/Makefile.perf.am b/src/intel/Makefile.perf.am index a9d896c458d..bd756df032b 100644 --- a/src/intel/Makefile.perf.am +++ b/src/intel/Makefile.perf.am @@ -27,14 +27,14 @@ noinst_LTLIBRARIES += perf/libintel_perf.la perf_libintel_perf_la_SOURCES = $(GEN_PERF_FILES) $(GEN_PERF_GENERATED_FILES) perf_libintel_perf_la_CFLAGS = $(AM_CFLAGS) -perf/gen_perf_metrics.c: perf/gen_perf.py $(GEN_PERF_XML_FILES) +perf/intel_perf_metrics.c: perf/gen_perf.py $(GEN_PERF_XML_FILES) $(MKDIR_GEN) $(PYTHON_GEN) $(PYTHON_FLAGS) $(srcdir)/perf/gen_perf.py \ - --code=$(builddir)/perf/gen_perf_metrics.c \ - --header=$(builddir)/perf/gen_perf_metrics.h \ + --code=$(builddir)/perf/intel_perf_metrics.c \ + --header=$(builddir)/perf/intel_perf_metrics.h \ $(GEN_PERF_XML_FILES:%=$(srcdir)/%) -perf/gen_perf_metrics.h: perf/gen_perf_metrics.c +perf/intel_perf_metrics.h: perf/intel_perf_metrics.c EXTRA_DIST += \ $(GEN_PERF_XML_FILES) \ diff --git a/src/intel/Makefile.sources b/src/intel/Makefile.sources index 9d414868172..a4d8e608b5c 100644 --- a/src/intel/Makefile.sources +++ b/src/intel/Makefile.sources @@ -370,14 +370,14 @@ GEN_PERF_XML_FILES = \ perf/oa-adl.xml GEN_PERF_FILES = \ - perf/gen_perf.c \ - perf/gen_perf.h \ - perf/gen_perf_mdapi.c \ - perf/gen_perf_mdapi.h \ - perf/gen_perf_private.h \ - perf/gen_perf_query.h \ - perf/gen_perf_query.c + perf/intel_perf.c \ + perf/intel_perf.h \ + perf/intel_perf_mdapi.c \ + perf/intel_perf_mdapi.h \ + perf/intel_perf_private.h \ + perf/intel_perf_query.h \ + perf/intel_perf_query.c GEN_PERF_GENERATED_FILES = \ - perf/gen_perf_metrics.c \ - perf/gen_perf_metrics.h + perf/intel_perf_metrics.c \ + perf/intel_perf_metrics.h diff --git a/src/intel/perf/gen_perf.py b/src/intel/perf/gen_perf.py index dd9d6f456ae..b6c4617ea06 100644 --- a/src/intel/perf/gen_perf.py +++ b/src/intel/perf/gen_perf.py @@ -685,7 +685,7 @@ def main(): c("#include \"" + os.path.basename(args.header) + "\"") c(textwrap.dedent("""\ - #include "perf/gen_perf.h" + #include "perf/intel_perf.h" #define MIN(a, b) ((a < b) ? (a) : (b)) diff --git a/src/intel/perf/gen_perf.c b/src/intel/perf/intel_perf.c similarity index 99% rename from src/intel/perf/gen_perf.c rename to src/intel/perf/intel_perf.c index 29bc79cbee4..d33e796d0d4 100644 --- a/src/intel/perf/gen_perf.c +++ b/src/intel/perf/intel_perf.c @@ -40,11 +40,11 @@ #include "dev/intel_debug.h" #include "dev/intel_device_info.h" -#include "perf/gen_perf.h" -#include "perf/gen_perf_regs.h" -#include "perf/gen_perf_mdapi.h" -#include "perf/gen_perf_metrics.h" -#include "perf/gen_perf_private.h" +#include "perf/intel_perf.h" +#include "perf/intel_perf_regs.h" +#include "perf/intel_perf_mdapi.h" +#include "perf/intel_perf_metrics.h" +#include "perf/intel_perf_private.h" #include "util/bitscan.h" #include "util/macros.h" diff --git a/src/intel/perf/gen_perf.h b/src/intel/perf/intel_perf.h similarity index 99% rename from src/intel/perf/gen_perf.h rename to src/intel/perf/intel_perf.h index f807365479b..c3edff9a6e3 100644 --- a/src/intel/perf/gen_perf.h +++ b/src/intel/perf/intel_perf.h @@ -21,8 +21,8 @@ * IN THE SOFTWARE. */ -#ifndef GEN_PERF_H -#define GEN_PERF_H +#ifndef INTEL_PERF_H +#define INTEL_PERF_H #include #include @@ -510,4 +510,4 @@ void gen_perf_get_counters_passes(struct gen_perf_config *perf, uint32_t counter_indices_count, struct gen_perf_counter_pass *counter_pass); -#endif /* GEN_PERF_H */ +#endif /* INTEL_PERF_H */ diff --git a/src/intel/perf/gen_perf_mdapi.c b/src/intel/perf/intel_perf_mdapi.c similarity index 99% rename from src/intel/perf/gen_perf_mdapi.c rename to src/intel/perf/intel_perf_mdapi.c index de5faf7477a..ab3751804ea 100644 --- a/src/intel/perf/gen_perf_mdapi.c +++ b/src/intel/perf/intel_perf_mdapi.c @@ -21,10 +21,10 @@ * IN THE SOFTWARE. */ -#include "gen_perf.h" -#include "gen_perf_mdapi.h" -#include "gen_perf_private.h" -#include "gen_perf_regs.h" +#include "intel_perf.h" +#include "intel_perf_mdapi.h" +#include "intel_perf_private.h" +#include "intel_perf_regs.h" #include "dev/intel_device_info.h" diff --git a/src/intel/perf/gen_perf_mdapi.h b/src/intel/perf/intel_perf_mdapi.h similarity index 98% rename from src/intel/perf/gen_perf_mdapi.h rename to src/intel/perf/intel_perf_mdapi.h index 0123c31922f..9a5a6ca5923 100644 --- a/src/intel/perf/gen_perf_mdapi.h +++ b/src/intel/perf/intel_perf_mdapi.h @@ -21,8 +21,8 @@ * IN THE SOFTWARE. */ -#ifndef GEN_PERF_MDAPI_H -#define GEN_PERF_MDAPI_H +#ifndef INTEL_PERF_MDAPI_H +#define INTEL_PERF_MDAPI_H #include @@ -157,4 +157,4 @@ static inline void gen_perf_query_mdapi_write_marker(void *data, uint32_t data_s } } -#endif /* GEN_PERF_MDAPI_H */ +#endif /* INTEL_PERF_MDAPI_H */ diff --git a/src/intel/perf/gen_perf_private.h b/src/intel/perf/intel_perf_private.h similarity index 96% rename from src/intel/perf/gen_perf_private.h rename to src/intel/perf/intel_perf_private.h index 363061326de..5403a95e687 100644 --- a/src/intel/perf/gen_perf_private.h +++ b/src/intel/perf/intel_perf_private.h @@ -21,10 +21,10 @@ * IN THE SOFTWARE. */ -#ifndef GEN_PERF_PRIVATE_H -#define GEN_PERF_PRIVATE_H +#ifndef INTEL_PERF_PRIVATE_H +#define INTEL_PERF_PRIVATE_H -#include "gen_perf.h" +#include "intel_perf.h" static inline uint64_t to_user_pointer(void *ptr) { @@ -93,4 +93,4 @@ void gen_perf_register_mdapi_oa_query(struct gen_perf_config *perf, const struct intel_device_info *devinfo); -#endif /* GEN_PERF_PRIVATE_H */ +#endif /* INTEL_PERF_PRIVATE_H */ diff --git a/src/intel/perf/gen_perf_query.c b/src/intel/perf/intel_perf_query.c similarity index 99% rename from src/intel/perf/gen_perf_query.c rename to src/intel/perf/intel_perf_query.c index 56e583275ac..f409c438d5c 100644 --- a/src/intel/perf/gen_perf_query.c +++ b/src/intel/perf/intel_perf_query.c @@ -28,11 +28,11 @@ #include "dev/intel_debug.h" #include "dev/intel_device_info.h" -#include "perf/gen_perf.h" -#include "perf/gen_perf_mdapi.h" -#include "perf/gen_perf_private.h" -#include "perf/gen_perf_query.h" -#include "perf/gen_perf_regs.h" +#include "perf/intel_perf.h" +#include "perf/intel_perf_mdapi.h" +#include "perf/intel_perf_private.h" +#include "perf/intel_perf_query.h" +#include "perf/intel_perf_regs.h" #include "drm-uapi/i915_drm.h" diff --git a/src/intel/perf/gen_perf_query.h b/src/intel/perf/intel_perf_query.h similarity index 97% rename from src/intel/perf/gen_perf_query.h rename to src/intel/perf/intel_perf_query.h index fcb835e2fc5..7c5887dec2a 100644 --- a/src/intel/perf/gen_perf_query.h +++ b/src/intel/perf/intel_perf_query.h @@ -21,8 +21,8 @@ * IN THE SOFTWARE. */ -#ifndef GEN_PERF_QUERY_H -#define GEN_PERF_QUERY_H +#ifndef INTEL_PERF_QUERY_H +#define INTEL_PERF_QUERY_H #include @@ -78,4 +78,4 @@ void gen_perf_dump_query(struct gen_perf_context *perf_ctx, struct gen_perf_query_object *obj, void *current_batch); -#endif /* GEN_PERF_QUERY_H */ +#endif /* INTEL_PERF_QUERY_H */ diff --git a/src/intel/perf/gen_perf_regs.h b/src/intel/perf/intel_perf_regs.h similarity index 98% rename from src/intel/perf/gen_perf_regs.h rename to src/intel/perf/intel_perf_regs.h index 67e7ece4143..43834cf098b 100644 --- a/src/intel/perf/gen_perf_regs.h +++ b/src/intel/perf/intel_perf_regs.h @@ -21,8 +21,8 @@ * IN THE SOFTWARE. */ -#ifndef GEN_PERF_REGS_H -#define GEN_PERF_REGS_H +#ifndef INTEL_PERF_REGS_H +#define INTEL_PERF_REGS_H #define INTEL_MASK(high, low) (((1u<<((high)-(low)+1))-1)<<(low)) @@ -92,4 +92,4 @@ #define GFX6_SO_NUM_PRIMS_WRITTEN 0x2288 #define GFX7_SO_NUM_PRIMS_WRITTEN(n) (0x5200 + (n) * 8) -#endif /* GEN_PERF_REGS_H */ +#endif /* INTEL_PERF_REGS_H */ diff --git a/src/intel/perf/meson.build b/src/intel/perf/meson.build index f9d05a00056..cb3d1858924 100644 --- a/src/intel/perf/meson.build +++ b/src/intel/perf/meson.build @@ -15,15 +15,15 @@ foreach hw : gen_hw_metrics endforeach gen_perf_sources = [ - 'gen_perf.c', - 'gen_perf_query.c', - 'gen_perf_mdapi.c', + 'intel_perf.c', + 'intel_perf_query.c', + 'intel_perf_mdapi.c', ] gen_perf_sources += custom_target( 'intel-perf-sources', input : gen_hw_metrics_xml_files, - output : [ 'gen_perf_metrics.c', 'gen_perf_metrics.h' ], + output : [ 'intel_perf_metrics.c', 'intel_perf_metrics.h' ], command : [ prog_python, files('gen_perf.py'), '--code', '@OUTPUT0@', '--header', '@OUTPUT1@', diff --git a/src/intel/vulkan/anv_batch_chain.c b/src/intel/vulkan/anv_batch_chain.c index 9a988722150..bb98420a955 100644 --- a/src/intel/vulkan/anv_batch_chain.c +++ b/src/intel/vulkan/anv_batch_chain.c @@ -32,7 +32,7 @@ #include "genxml/gen8_pack.h" #include "genxml/genX_bits.h" -#include "perf/gen_perf.h" +#include "perf/intel_perf.h" #include "util/debug.h" diff --git a/src/intel/vulkan/anv_device.c b/src/intel/vulkan/anv_device.c index 6a1c6a733c8..1e18736cc7c 100644 --- a/src/intel/vulkan/anv_device.c +++ b/src/intel/vulkan/anv_device.c @@ -48,7 +48,7 @@ #include "common/intel_aux_map.h" #include "common/intel_defines.h" #include "common/intel_uuid.h" -#include "perf/gen_perf.h" +#include "perf/intel_perf.h" #include "genxml/gen7_pack.h" diff --git a/src/intel/vulkan/anv_perf.c b/src/intel/vulkan/anv_perf.c index 7da9796d996..efe90bacde7 100644 --- a/src/intel/vulkan/anv_perf.c +++ b/src/intel/vulkan/anv_perf.c @@ -28,8 +28,8 @@ #include "anv_private.h" #include "vk_util.h" -#include "perf/gen_perf.h" -#include "perf/gen_perf_mdapi.h" +#include "perf/intel_perf.h" +#include "perf/intel_perf_mdapi.h" #include "util/mesa-sha1.h" diff --git a/src/intel/vulkan/genX_query.c b/src/intel/vulkan/genX_query.c index 23e3d1a9f60..18c6f34c5fb 100644 --- a/src/intel/vulkan/genX_query.c +++ b/src/intel/vulkan/genX_query.c @@ -42,9 +42,9 @@ #define __gen_address_offset anv_address_add #define __gen_get_batch_address(b, a) anv_batch_address(b, a) #include "common/mi_builder.h" -#include "perf/gen_perf.h" -#include "perf/gen_perf_mdapi.h" -#include "perf/gen_perf_regs.h" +#include "perf/intel_perf.h" +#include "perf/intel_perf_mdapi.h" +#include "perf/intel_perf_regs.h" #include "vk_util.h" diff --git a/src/mesa/drivers/dri/i965/brw_context.h b/src/mesa/drivers/dri/i965/brw_context.h index 7ad5b6012cd..3c71bf0b0cf 100644 --- a/src/mesa/drivers/dri/i965/brw_context.h +++ b/src/mesa/drivers/dri/i965/brw_context.h @@ -50,8 +50,8 @@ #include "common/intel_decoder.h" #include "brw_screen.h" #include "brw_tex_obj.h" -#include "perf/gen_perf.h" -#include "perf/gen_perf_query.h" +#include "perf/intel_perf.h" +#include "perf/intel_perf_query.h" #ifdef __cplusplus extern "C" { diff --git a/src/mesa/drivers/dri/i965/brw_performance_query.c b/src/mesa/drivers/dri/i965/brw_performance_query.c index a1354c14d7a..86d46ae5446 100644 --- a/src/mesa/drivers/dri/i965/brw_performance_query.c +++ b/src/mesa/drivers/dri/i965/brw_performance_query.c @@ -72,10 +72,10 @@ #include "brw_defines.h" #include "brw_batch.h" -#include "perf/gen_perf.h" -#include "perf/gen_perf_regs.h" -#include "perf/gen_perf_mdapi.h" -#include "perf/gen_perf_query.h" +#include "perf/intel_perf.h" +#include "perf/intel_perf_regs.h" +#include "perf/intel_perf_mdapi.h" +#include "perf/intel_perf_query.h" #define FILE_DEBUG_FLAG DEBUG_PERFMON diff --git a/src/mesa/drivers/dri/i965/gfx6_queryobj.c b/src/mesa/drivers/dri/i965/gfx6_queryobj.c index 75508ab672b..d6067d3c08e 100644 --- a/src/mesa/drivers/dri/i965/gfx6_queryobj.c +++ b/src/mesa/drivers/dri/i965/gfx6_queryobj.c @@ -34,7 +34,7 @@ #include "brw_context.h" #include "brw_defines.h" #include "brw_state.h" -#include "perf/gen_perf_regs.h" +#include "perf/intel_perf_regs.h" #include "brw_batch.h" #include "brw_buffer_objects.h"