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 <anuj.phogat@gmail.com>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/10241>

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);
 

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)

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) \

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

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))

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"

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 <stdio.h>
 #include <stdbool.h>
@@ -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 */

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"
 

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 <stdint.h>
 
@@ -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 */

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 */

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"
 

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 <stdint.h>
 
@@ -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 */

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 */

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@',

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"
 

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"
 

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"
 

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"
 

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" {

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
 

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"