intel: Rename gen_device prefix in filenames

export SEARCH_PATH="src/intel src/gallium/drivers/iris src/mesa/drivers/dri/i965"
find $SEARCH_PATH -type f -name "gen_device" -exec sh -c 'f="{}"; mv -- "$f" "${f/gen_device/intel_device}"' \;
grep -E "gen_device_info*\.[cph]" -rIl $SEARCH_PATH | xargs sed -ie "s/gen_device_info\(.*\.[cph]\)/intel_device_info\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_bufmgr.c

@@ -52,7 +52,7 @@
 #include "common/intel_clflush.h"
 #include "dev/intel_debug.h"
 #include "common/intel_gem.h"
-#include "dev/gen_device_info.h"
+#include "dev/intel_device_info.h"
 #include "main/macros.h"
 #include "os/os_mman.h"
 #include "util/debug.h"

src/gallium/drivers/iris/iris_screen.h

@@ -28,7 +28,7 @@
 #include "util/disk_cache.h"
 #include "util/slab.h"
 #include "util/u_screen.h"
-#include "intel/dev/gen_device_info.h"
+#include "intel/dev/intel_device_info.h"
 #include "intel/isl/isl.h"
 #include "iris_bufmgr.h"
 #include "iris_binder.h"

src/intel/Makefile.sources

@@ -150,8 +150,8 @@ COMPILER_GENERATED_FILES = \
 DEV_FILES = \
 	dev/intel_debug.c \
 	dev/intel_debug.h \
-	dev/gen_device_info.c \
-	dev/gen_device_info.h
+	dev/intel_device_info.c \
+	dev/intel_device_info.h
 
 GENXML_XML_FILES = \
 	genxml/gen4.xml \

src/intel/blorp/blorp_genX_exec.h

@@ -25,7 +25,7 @@
 #define BLORP_GENX_EXEC_H
 
 #include "blorp_priv.h"
-#include "dev/gen_device_info.h"
+#include "dev/intel_device_info.h"
 #include "common/intel_sample_positions.h"
 #include "common/intel_l3_config.h"
 #include "genxml/gen_macros.h"

src/intel/common/intel_aux_map.c

@@ -77,7 +77,7 @@
 #include "intel_aux_map.h"
 #include "intel_gem.h"
 
-#include "dev/gen_device_info.h"
+#include "dev/intel_device_info.h"
 #include "isl/isl.h"
 
 #include "drm-uapi/i915_drm.h"

src/intel/common/intel_decoder.h

@@ -28,7 +28,7 @@
 #include <stdbool.h>
 #include <stdio.h>
 
-#include "dev/gen_device_info.h"
+#include "dev/intel_device_info.h"
 #include "util/hash_table.h"
 #include "util/bitset.h"
 

src/intel/common/intel_disasm.h

@@ -24,7 +24,7 @@
 #ifndef INTEL_DISASM_H
 #define INTEL_DISASM_H
 
-#include "intel/dev/gen_device_info.h"
+#include "intel/dev/intel_device_info.h"
 
 #ifdef __cplusplus
 extern "C" {

src/intel/common/intel_l3_config.h

@@ -26,7 +26,7 @@
 
 #include <stdio.h>
 
-#include "dev/gen_device_info.h"
+#include "dev/intel_device_info.h"
 
 /**
  * Chunk of L3 cache reserved for some specific purpose.

src/intel/common/intel_measure.c

@@ -37,7 +37,7 @@
 #define __STDC_FORMAT_MACROS 1
 #include <inttypes.h>
 
-#include "dev/gen_device_info.h"
+#include "dev/intel_device_info.h"
 #include "util/debug.h"
 #include "util/macros.h"
 #include "util/u_debug.h"

src/intel/common/intel_uuid.h

@@ -25,7 +25,7 @@
 #ifndef INTEL_UUID_H
 #define INTEL_UUID_H
 
-#include "dev/gen_device_info.h"
+#include "dev/intel_device_info.h"
 #include "isl/isl.h"
 
 #ifdef __cplusplus

src/intel/common/mi_builder.h

@@ -24,7 +24,7 @@
 #ifndef MI_BUILDER_H
 #define MI_BUILDER_H
 
-#include "dev/gen_device_info.h"
+#include "dev/intel_device_info.h"
 #include "genxml/genX_bits.h"
 #include "util/bitscan.h"
 #include "util/fast_idiv_by_const.h"

src/intel/common/tests/mi_builder_test.cpp

@@ -27,7 +27,7 @@
 
 #include <gtest/gtest.h>
 
-#include "dev/gen_device_info.h"
+#include "dev/intel_device_info.h"
 #include "drm-uapi/i915_drm.h"
 #include "genxml/gen_macros.h"
 #include "util/macros.h"

src/intel/compiler/brw_compiler.h

@@ -25,7 +25,7 @@
 #define BRW_COMPILER_H
 
 #include <stdio.h>
-#include "dev/gen_device_info.h"
+#include "dev/intel_device_info.h"
 #include "main/macros.h"
 #include "main/mtypes.h"
 #include "util/ralloc.h"

src/intel/compiler/brw_eu_defines.h

@@ -35,7 +35,7 @@
 #include <stdint.h>
 #include <stdlib.h>
 #include "util/macros.h"
-#include "dev/gen_device_info.h"
+#include "dev/intel_device_info.h"
 
 /* The following hunk, up-to "Execution Unit" is used by both the
  * intel/compiler and i965 codebase. */

src/intel/compiler/brw_gen_enum.h

@@ -22,7 +22,7 @@
  */
 
 #include "util/macros.h"
-#include "dev/gen_device_info.h"
+#include "dev/intel_device_info.h"
 
 enum gen {
    GFX4    = (1 << 0),

src/intel/compiler/brw_inst.h

@@ -36,7 +36,7 @@
 
 #include "brw_eu_defines.h"
 #include "brw_reg_type.h"
-#include "dev/gen_device_info.h"
+#include "dev/intel_device_info.h"
 
 #ifdef __cplusplus
 extern "C" {

src/intel/compiler/brw_reg_type.c

@@ -23,7 +23,7 @@
 
 #include "brw_reg.h"
 #include "brw_eu_defines.h"
-#include "dev/gen_device_info.h"
+#include "dev/intel_device_info.h"
 
 #define INVALID (-1)
 

src/intel/dev/intel_dev_info.c

@@ -33,7 +33,7 @@
 
 #include <xf86drm.h>
 
-#include "gen_device_info.h"
+#include "intel_device_info.h"
 
 static int
 error(char *fmt, ...)

src/intel/dev/intel_device_info.c

@@ -27,7 +27,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
-#include "gen_device_info.h"
+#include "intel_device_info.h"
 #include "compiler/shader_enums.h"
 #include "intel/common/intel_gem.h"
 #include "util/bitscan.h"

src/intel/dev/intel_device_info.h

@@ -22,8 +22,8 @@
   *
   */
 
-#ifndef GEN_DEVICE_INFO_H
-#define GEN_DEVICE_INFO_H
+#ifndef INTEL_DEVICE_INFO_H
+#define INTEL_DEVICE_INFO_H
 
 #include <stdbool.h>
 #include <stdint.h>
@@ -360,4 +360,4 @@ int gen_get_aperture_size(int fd, uint64_t *size);
 }
 #endif
 
-#endif /* GEN_DEVICE_INFO_H */
+#endif /* INTEL_DEVICE_INFO_H */

src/intel/dev/intel_device_info_test.c

@@ -3,7 +3,7 @@
 #include <stdint.h>
 #include <assert.h>
 
-#include "gen_device_info.h"
+#include "intel_device_info.h"
 
 int
 main(int argc, char *argv[])

src/intel/dev/meson.build

@@ -23,8 +23,8 @@
 files_libintel_dev = files(
   'intel_debug.c',
   'intel_debug.h',
-  'gen_device_info.c',
-  'gen_device_info.h',
+  'intel_device_info.c',
+  'intel_device_info.h',
 )
 
 libintel_dev = static_library(
@@ -40,7 +40,7 @@ if with_tests
   test('gen_device_info_test',
        executable(
          'gen_device_info_test',
-         'gen_device_info_test.c',
+         'intel_device_info_test.c',
          include_directories : [inc_include, inc_src],
          link_with : libintel_dev,
        ),

src/intel/genxml/gen_bits_header.py

@@ -67,7 +67,7 @@ from operator import itemgetter
 
 #include <stdint.h>
 
-#include "dev/gen_device_info.h"
+#include "dev/intel_device_info.h"
 #include "util/macros.h"
 
 <%def name="emit_per_gen_prop_func(item, prop)">

src/intel/isl/isl_drm.c

@@ -28,7 +28,7 @@
 #include "drm-uapi/i915_drm.h"
 
 #include "isl.h"
-#include "dev/gen_device_info.h"
+#include "dev/intel_device_info.h"
 #include "dev/intel_debug.h"
 
 uint32_t

src/intel/isl/isl_format.c

@@ -25,7 +25,7 @@
 
 #include "isl.h"
 #include "isl_priv.h"
-#include "dev/gen_device_info.h"
+#include "dev/intel_device_info.h"
 
 #include "main/macros.h" /* Needed for MAX3 and MAX2 for format_rgb9e5 */
 #include "util/format_srgb.h"

src/intel/isl/isl_priv.h

@@ -28,7 +28,7 @@
 #include <stddef.h>
 #include <strings.h>
 
-#include "dev/gen_device_info.h"
+#include "dev/intel_device_info.h"
 #include "util/macros.h"
 
 #include "isl.h"

src/intel/isl/tests/isl_surf_get_image_offset_test.c

@@ -26,7 +26,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 
-#include "dev/gen_device_info.h"
+#include "dev/intel_device_info.h"
 #include "isl/isl.h"
 #include "isl/isl_priv.h"
 

src/intel/perf/gen_perf.c

@@ -38,7 +38,7 @@
 #include "common/intel_gem.h"
 
 #include "dev/intel_debug.h"
-#include "dev/gen_device_info.h"
+#include "dev/intel_device_info.h"
 
 #include "perf/gen_perf.h"
 #include "perf/gen_perf_regs.h"

src/intel/perf/gen_perf_mdapi.c

@@ -26,7 +26,7 @@
 #include "gen_perf_private.h"
 #include "gen_perf_regs.h"
 
-#include "dev/gen_device_info.h"
+#include "dev/intel_device_info.h"
 
 #include <drm-uapi/i915_drm.h>
 

src/intel/perf/gen_perf_mdapi.h

@@ -26,7 +26,7 @@
 
 #include <stdint.h>
 
-#include "dev/gen_device_info.h"
+#include "dev/intel_device_info.h"
 
 struct gen_perf_query_result;
 

src/intel/perf/gen_perf_query.c

@@ -26,7 +26,7 @@
 #include "common/intel_gem.h"
 
 #include "dev/intel_debug.h"
-#include "dev/gen_device_info.h"
+#include "dev/intel_device_info.h"
 
 #include "perf/gen_perf.h"
 #include "perf/gen_perf_mdapi.h"

src/intel/tools/aub_mem.h

@@ -30,7 +30,7 @@
 #include "util/list.h"
 #include "util/rb_tree.h"
 
-#include "dev/gen_device_info.h"
+#include "dev/intel_device_info.h"
 #include "common/intel_decoder.h"
 
 #ifdef __cplusplus

src/intel/tools/aub_read.h

@@ -27,7 +27,7 @@
 
 #include <stdint.h>
 
-#include "dev/gen_device_info.h"
+#include "dev/intel_device_info.h"
 #include "drm-uapi/i915_drm.h"
 
 #ifdef __cplusplus

src/intel/tools/aub_write.h

@@ -32,7 +32,7 @@
 
 #include "drm-uapi/i915_drm.h"
 
-#include "dev/gen_device_info.h"
+#include "dev/intel_device_info.h"
 #include "common/intel_gem.h"
 
 #ifdef __cplusplus

src/intel/tools/i965_asm.h

@@ -34,7 +34,7 @@
 #include "compiler/brw_eu_defines.h"
 #include "compiler/brw_inst.h"
 #include "compiler/brw_eu.h"
-#include "dev/gen_device_info.h"
+#include "dev/intel_device_info.h"
 #include "util/list.h"
 
 /* glibc < 2.27 defines OVERFLOW in /usr/include/math.h. */

src/intel/tools/i965_disasm.c

@@ -27,7 +27,7 @@
 #include <getopt.h>
 
 #include "compiler/brw_eu.h"
-#include "dev/gen_device_info.h"
+#include "dev/intel_device_info.h"
 #include "util/u_dynarray.h"
 
 enum opt_input_type {

src/intel/tools/intel_dump_gpu.c

@@ -44,7 +44,7 @@
 #include "aub_write.h"
 
 #include "dev/intel_debug.h"
-#include "dev/gen_device_info.h"
+#include "dev/intel_device_info.h"
 #include "util/macros.h"
 
 static int close_init_helper(int fd);

src/intel/tools/intel_noop_drm_shim.c

@@ -33,7 +33,7 @@
 #include <sys/un.h>
 
 #include "common/intel_gem.h"
-#include "dev/gen_device_info.h"
+#include "dev/intel_device_info.h"
 #include "drm-uapi/i915_drm.h"
 #include "drm-shim/drm_shim.h"
 #include "util/macros.h"

src/intel/vulkan/anv_private.h

@@ -48,7 +48,7 @@
 #include "common/intel_gem.h"
 #include "common/intel_l3_config.h"
 #include "common/intel_measure.h"
-#include "dev/gen_device_info.h"
+#include "dev/intel_device_info.h"
 #include "blorp/blorp.h"
 #include "compiler/brw_compiler.h"
 #include "util/bitset.h"

src/mesa/drivers/dri/i965/brw_bufmgr.c

@@ -48,7 +48,7 @@
 #include "common/intel_clflush.h"
 #include "dev/intel_debug.h"
 #include "common/intel_gem.h"
-#include "dev/gen_device_info.h"
+#include "dev/intel_device_info.h"
 #include "libdrm_macros.h"
 #include "main/macros.h"
 #include "util/macros.h"

src/mesa/drivers/dri/i965/brw_screen.h

@@ -34,7 +34,7 @@
 #include "isl/isl.h"
 #include "dri_util.h"
 #include "brw_bufmgr.h"
-#include "dev/gen_device_info.h"
+#include "dev/intel_device_info.h"
 #include "drm-uapi/i915_drm.h"
 #include "util/xmlconfig.h"
 

src/mesa/drivers/dri/i965/genX_state_upload.c

@@ -25,7 +25,7 @@
 
 #include "main/samplerobj.h"
 
-#include "dev/gen_device_info.h"
+#include "dev/intel_device_info.h"
 #include "common/intel_sample_positions.h"
 #include "genxml/gen_macros.h"
 #include "common/intel_guardband.h"