From 52326ca9f7122807776f333732dc27bb00bf8ae1 Mon Sep 17 00:00:00 2001 From: Anuj Phogat Date: Mon, 5 Apr 2021 11:11:29 -0700 Subject: [PATCH] intel: Rename gen_debug prefix to intel_debug export SEARCH_PATH="src/intel src/gallium/drivers/iris src/mesa/drivers/dri/i965" grep -E "gen_debug" -rIl $SEARCH_PATH | xargs sed -ie "s/gen_debug/intel_debug/g" Signed-off-by: Anuj Phogat Reviewed-by: Kenneth Graunke Part-of: --- src/intel/dev/intel_debug.c | 10 +++++----- src/intel/dev/intel_debug.h | 20 ++++++++++---------- src/intel/tools/aubinator_error_decode.c | 2 +- src/intel/tools/intel_dump_gpu.c | 2 +- src/intel/vulkan/anv_private.h | 2 +- 5 files changed, 18 insertions(+), 18 deletions(-) diff --git a/src/intel/dev/intel_debug.c b/src/intel/dev/intel_debug.c index 3b97cc2..de5c58a 100644 --- a/src/intel/dev/intel_debug.c +++ b/src/intel/dev/intel_debug.c @@ -171,7 +171,7 @@ intel_debug_write_identifiers(void *_output, for (uint32_t id = GEN_DEBUG_BLOCK_TYPE_DRIVER; id < GEN_DEBUG_BLOCK_TYPE_MAX; id++) { switch (id) { case GEN_DEBUG_BLOCK_TYPE_DRIVER: { - struct gen_debug_block_driver driver_desc = { + struct intel_debug_block_driver driver_desc = { .base = { .type = id, }, @@ -187,7 +187,7 @@ intel_debug_write_identifiers(void *_output, } case GEN_DEBUG_BLOCK_TYPE_FRAME: { - struct gen_debug_block_frame frame_desc = { + struct intel_debug_block_frame frame_desc = { .base = { .type = GEN_DEBUG_BLOCK_TYPE_FRAME, .length = sizeof(frame_desc), @@ -205,7 +205,7 @@ intel_debug_write_identifiers(void *_output, assert(output < output_end); } - struct gen_debug_block_base end = { + struct intel_debug_block_base end = { .type = GEN_DEBUG_BLOCK_TYPE_END, .length = sizeof(end), }; @@ -223,13 +223,13 @@ intel_debug_write_identifiers(void *_output, void * intel_debug_get_identifier_block(void *_buffer, uint32_t buffer_size, - enum gen_debug_block_type type) + enum intel_debug_block_type type) { void *buffer = _buffer + intel_debug_identifier_size(), *end_buffer = _buffer + buffer_size; while (buffer < end_buffer) { - struct gen_debug_block_base *item = buffer; + struct intel_debug_block_base *item = buffer; if (item->type == type) return item; diff --git a/src/intel/dev/intel_debug.h b/src/intel/dev/intel_debug.h index 3222e85..4fe7ef9 100644 --- a/src/intel/dev/intel_debug.h +++ b/src/intel/dev/intel_debug.h @@ -131,32 +131,32 @@ extern void brw_process_intel_debug_variable(void); * can fill those in for debug purposes. */ -enum gen_debug_block_type { +enum intel_debug_block_type { /* End of the debug blocks */ GEN_DEBUG_BLOCK_TYPE_END = 1, - /* Driver identifier (struct gen_debug_block_driver) */ + /* Driver identifier (struct intel_debug_block_driver) */ GEN_DEBUG_BLOCK_TYPE_DRIVER, - /* Frame identifier (struct gen_debug_block_frame) */ + /* Frame identifier (struct intel_debug_block_frame) */ GEN_DEBUG_BLOCK_TYPE_FRAME, /* Internal, never to be written out */ GEN_DEBUG_BLOCK_TYPE_MAX, }; -struct gen_debug_block_base { - uint32_t type; /* enum gen_debug_block_type */ +struct intel_debug_block_base { + uint32_t type; /* enum intel_debug_block_type */ uint32_t length; /* inclusive of this structure size */ }; -struct gen_debug_block_driver { - struct gen_debug_block_base base; +struct intel_debug_block_driver { + struct intel_debug_block_base base; uint8_t description[]; }; -struct gen_debug_block_frame { - struct gen_debug_block_base base; +struct intel_debug_block_frame { + struct intel_debug_block_base base; uint64_t frame_id; }; @@ -169,7 +169,7 @@ extern uint32_t intel_debug_write_identifiers(void *output, extern void *intel_debug_get_identifier_block(void *buffer, uint32_t buffer_size, - enum gen_debug_block_type type); + enum intel_debug_block_type type); #ifdef __cplusplus } diff --git a/src/intel/tools/aubinator_error_decode.c b/src/intel/tools/aubinator_error_decode.c index eaa4e41..1f4fc48 100644 --- a/src/intel/tools/aubinator_error_decode.c +++ b/src/intel/tools/aubinator_error_decode.c @@ -640,7 +640,7 @@ read_data_file(FILE *file) if (sections[s].dword_count * 4 > intel_debug_identifier_size() && memcmp(sections[s].data, intel_debug_identifier(), intel_debug_identifier_size()) == 0) { - const struct gen_debug_block_driver *driver_desc = + const struct intel_debug_block_driver *driver_desc = intel_debug_get_identifier_block(sections[s].data, sections[s].dword_count * 4, GEN_DEBUG_BLOCK_TYPE_DRIVER); diff --git a/src/intel/tools/intel_dump_gpu.c b/src/intel/tools/intel_dump_gpu.c index e067aea..c0364c7 100644 --- a/src/intel/tools/intel_dump_gpu.c +++ b/src/intel/tools/intel_dump_gpu.c @@ -275,7 +275,7 @@ dump_execbuffer2(int fd, struct drm_i915_gem_execbuffer2 *execbuffer2) /* Check against frame_id requirements. */ if (memcmp(bo->map, intel_debug_identifier(), intel_debug_identifier_size()) == 0) { - const struct gen_debug_block_frame *frame_desc = + const struct intel_debug_block_frame *frame_desc = intel_debug_get_identifier_block(bo->map, bo->size, GEN_DEBUG_BLOCK_TYPE_FRAME); diff --git a/src/intel/vulkan/anv_private.h b/src/intel/vulkan/anv_private.h index 4878368..a0dd982 100644 --- a/src/intel/vulkan/anv_private.h +++ b/src/intel/vulkan/anv_private.h @@ -1256,7 +1256,7 @@ struct anv_device { const struct intel_l3_config *l3_config; - struct gen_debug_block_frame *debug_frame_desc; + struct intel_debug_block_frame *debug_frame_desc; }; static inline struct anv_instance * -- 2.7.4