intel: Rename GEN_DEBUG prefix to INTEL_DEBUG
authorAnuj Phogat <anuj.phogat@gmail.com>
Mon, 5 Apr 2021 18:13:16 +0000 (11:13 -0700)
committerMarge Bot <eric+marge@anholt.net>
Tue, 20 Apr 2021 20:06:33 +0000 (20:06 +0000)
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 <anuj.phogat@gmail.com>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/10241>

src/intel/dev/intel_debug.c
src/intel/dev/intel_debug.h
src/intel/tools/aubinator_error_decode.c
src/intel/tools/intel_dump_gpu.c
src/intel/vulkan/anv_device.c

index de5c58a..96cdf9c 100644 (file)
@@ -168,9 +168,9 @@ intel_debug_write_identifiers(void *_output,
    memcpy(output, intel_debug_identifier(), intel_debug_identifier_size());
    output += intel_debug_identifier_size();
 
-   for (uint32_t id = GEN_DEBUG_BLOCK_TYPE_DRIVER; id < GEN_DEBUG_BLOCK_TYPE_MAX; id++) {
+   for (uint32_t id = INTEL_DEBUG_BLOCK_TYPE_DRIVER; id < INTEL_DEBUG_BLOCK_TYPE_MAX; id++) {
       switch (id) {
-      case GEN_DEBUG_BLOCK_TYPE_DRIVER: {
+      case INTEL_DEBUG_BLOCK_TYPE_DRIVER: {
          struct intel_debug_block_driver driver_desc = {
             .base = {
                .type = id,
@@ -186,10 +186,10 @@ intel_debug_write_identifiers(void *_output,
          break;
       }
 
-      case GEN_DEBUG_BLOCK_TYPE_FRAME: {
+      case INTEL_DEBUG_BLOCK_TYPE_FRAME: {
          struct intel_debug_block_frame frame_desc = {
             .base = {
-               .type = GEN_DEBUG_BLOCK_TYPE_FRAME,
+               .type = INTEL_DEBUG_BLOCK_TYPE_FRAME,
                .length = sizeof(frame_desc),
             },
          };
@@ -206,7 +206,7 @@ intel_debug_write_identifiers(void *_output,
    }
 
    struct intel_debug_block_base end = {
-      .type = GEN_DEBUG_BLOCK_TYPE_END,
+      .type = INTEL_DEBUG_BLOCK_TYPE_END,
       .length = sizeof(end),
    };
    memcpy(output, &end, sizeof(end));
@@ -233,7 +233,7 @@ intel_debug_get_identifier_block(void *_buffer,
 
       if (item->type == type)
          return item;
-      if (item->type == GEN_DEBUG_BLOCK_TYPE_END)
+      if (item->type == INTEL_DEBUG_BLOCK_TYPE_END)
          return NULL;
 
       buffer += item->length;
index 4fe7ef9..d933df4 100644 (file)
@@ -133,16 +133,16 @@ extern void brw_process_intel_debug_variable(void);
 
 enum intel_debug_block_type {
    /* End of the debug blocks */
-   GEN_DEBUG_BLOCK_TYPE_END = 1,
+   INTEL_DEBUG_BLOCK_TYPE_END = 1,
 
    /* Driver identifier (struct intel_debug_block_driver) */
-   GEN_DEBUG_BLOCK_TYPE_DRIVER,
+   INTEL_DEBUG_BLOCK_TYPE_DRIVER,
 
    /* Frame identifier (struct intel_debug_block_frame) */
-   GEN_DEBUG_BLOCK_TYPE_FRAME,
+   INTEL_DEBUG_BLOCK_TYPE_FRAME,
 
    /* Internal, never to be written out */
-   GEN_DEBUG_BLOCK_TYPE_MAX,
+   INTEL_DEBUG_BLOCK_TYPE_MAX,
 };
 
 struct intel_debug_block_base {
index 1f4fc48..7ba3680 100644 (file)
@@ -643,7 +643,7 @@ read_data_file(FILE *file)
          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);
+                                             INTEL_DEBUG_BLOCK_TYPE_DRIVER);
          if (driver_desc) {
             printf("Driver identifier: %s\n",
                    (const char *) driver_desc->description);
index c0364c7..ef063ec 100644 (file)
@@ -277,7 +277,7 @@ dump_execbuffer2(int fd, struct drm_i915_gem_execbuffer2 *execbuffer2)
                     intel_debug_identifier_size()) == 0) {
             const struct intel_debug_block_frame *frame_desc =
                intel_debug_get_identifier_block(bo->map, bo->size,
-                                                GEN_DEBUG_BLOCK_TYPE_FRAME);
+                                                INTEL_DEBUG_BLOCK_TYPE_FRAME);
 
             current_frame_id = frame_desc ? frame_desc->frame_id : 0;
             break;
index bfcf95e..a3e0c56 100644 (file)
@@ -3216,7 +3216,7 @@ VkResult anv_CreateDevice(
    device->debug_frame_desc =
       intel_debug_get_identifier_block(device->workaround_bo->map,
                                        device->workaround_bo->size,
-                                       GEN_DEBUG_BLOCK_TYPE_FRAME);
+                                       INTEL_DEBUG_BLOCK_TYPE_FRAME);
 
    result = anv_device_init_trivial_batch(device);
    if (result != VK_SUCCESS)