From: Kenneth Graunke Date: Thu, 15 May 2014 23:10:09 +0000 (-0700) Subject: i965: Rename brw/gen8_dump_compile to brw/gen8_disassemble. X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=db1449b7005af190d2ef1f2ad94f96c4b29943db;p=mesa.git i965: Rename brw/gen8_dump_compile to brw/gen8_disassemble. "Disassemble" is an accurate description of what this function does. Signed-off-by: Kenneth Graunke Reviewed-by: Matt Turner --- diff --git a/src/mesa/drivers/dri/i965/brw_blorp_clear.cpp b/src/mesa/drivers/dri/i965/brw_blorp_clear.cpp index 2bb08de447e..28c01c440bd 100644 --- a/src/mesa/drivers/dri/i965/brw_blorp_clear.cpp +++ b/src/mesa/drivers/dri/i965/brw_blorp_clear.cpp @@ -486,7 +486,7 @@ brw_blorp_const_color_program::compile(struct brw_context *brw, if (unlikely(INTEL_DEBUG & DEBUG_BLORP)) { fprintf(stderr, "Native code for BLORP clear:\n"); - brw_dump_compile(brw, &func.store, 0, func.next_insn_offset, stderr); + brw_disassemble(brw, &func.store, 0, func.next_insn_offset, stderr); fprintf(stderr, "\n"); } diff --git a/src/mesa/drivers/dri/i965/brw_clip.c b/src/mesa/drivers/dri/i965/brw_clip.c index a164d15998e..11f0b6938f5 100644 --- a/src/mesa/drivers/dri/i965/brw_clip.c +++ b/src/mesa/drivers/dri/i965/brw_clip.c @@ -118,7 +118,7 @@ static void compile_clip_prog( struct brw_context *brw, if (unlikely(INTEL_DEBUG & DEBUG_CLIP)) { fprintf(stderr, "clip:\n"); - brw_dump_compile(brw, c.func.store, 0, program_size, stderr); + brw_disassemble(brw, c.func.store, 0, program_size, stderr); fprintf(stderr, "\n"); } diff --git a/src/mesa/drivers/dri/i965/brw_eu.c b/src/mesa/drivers/dri/i965/brw_eu.c index a97ea352c7a..4efc1f45a60 100644 --- a/src/mesa/drivers/dri/i965/brw_eu.c +++ b/src/mesa/drivers/dri/i965/brw_eu.c @@ -254,7 +254,8 @@ const unsigned *brw_get_program( struct brw_compile *p, } void -brw_dump_compile(struct brw_context *brw, void *assembly, int start, int end, FILE *out) +brw_disassemble(struct brw_context *brw, + void *assembly, int start, int end, FILE *out) { bool dump_hex = false; diff --git a/src/mesa/drivers/dri/i965/brw_eu.h b/src/mesa/drivers/dri/i965/brw_eu.h index 75ceec2fcb1..51d5214ae89 100644 --- a/src/mesa/drivers/dri/i965/brw_eu.h +++ b/src/mesa/drivers/dri/i965/brw_eu.h @@ -105,8 +105,8 @@ void brw_set_acc_write_control(struct brw_compile *p, unsigned value); void brw_init_compile(struct brw_context *, struct brw_compile *p, void *mem_ctx); -void brw_dump_compile(struct brw_context *brw, void *assembly, - int start,int end, FILE *out); +void brw_disassemble(struct brw_context *brw, void *assembly, + int start, int end, FILE *out); const unsigned *brw_get_program( struct brw_compile *p, unsigned *sz ); struct brw_instruction *brw_next_insn(struct brw_compile *p, unsigned opcode); diff --git a/src/mesa/drivers/dri/i965/brw_eu_compact.c b/src/mesa/drivers/dri/i965/brw_eu_compact.c index ade27c8adee..c85bc89ea3d 100644 --- a/src/mesa/drivers/dri/i965/brw_eu_compact.c +++ b/src/mesa/drivers/dri/i965/brw_eu_compact.c @@ -786,7 +786,7 @@ brw_compact_instructions(struct brw_compile *p) if (0) { fprintf(stderr, "dumping compacted program\n"); - brw_dump_compile(brw, p->store, 0, p->next_insn_offset, stderr); + brw_disassemble(brw, p->store, 0, p->next_insn_offset, stderr); int cmp = 0; for (offset = 0; offset < p->next_insn_offset;) { diff --git a/src/mesa/drivers/dri/i965/brw_fs_generator.cpp b/src/mesa/drivers/dri/i965/brw_fs_generator.cpp index f8819da68f5..6007b5746eb 100644 --- a/src/mesa/drivers/dri/i965/brw_fs_generator.cpp +++ b/src/mesa/drivers/dri/i965/brw_fs_generator.cpp @@ -1802,7 +1802,7 @@ fs_generator::generate_code(exec_list *instructions, FILE *dump_file) } if (unlikely(INTEL_DEBUG & DEBUG_WM)) { - brw_dump_compile(brw, p->store, last_native_insn_offset, p->next_insn_offset, stderr); + brw_disassemble(brw, p->store, last_native_insn_offset, p->next_insn_offset, stderr); foreach_list(node, &cfg->block_list) { bblock_link *link = (bblock_link *)node; @@ -1836,7 +1836,7 @@ fs_generator::generate_code(exec_list *instructions, FILE *dump_file) * case you're doing that. */ if (dump_file) { - brw_dump_compile(brw, p->store, 0, p->next_insn_offset, dump_file); + brw_disassemble(brw, p->store, 0, p->next_insn_offset, dump_file); } } diff --git a/src/mesa/drivers/dri/i965/brw_gs.c b/src/mesa/drivers/dri/i965/brw_gs.c index 72e5f5a14a8..ec1e14a3594 100644 --- a/src/mesa/drivers/dri/i965/brw_gs.c +++ b/src/mesa/drivers/dri/i965/brw_gs.c @@ -136,7 +136,7 @@ static void compile_ff_gs_prog(struct brw_context *brw, if (unlikely(INTEL_DEBUG & DEBUG_GS)) { fprintf(stderr, "gs:\n"); - brw_dump_compile(brw, c.func.store, 0, program_size, stderr); + brw_disassemble(brw, c.func.store, 0, program_size, stderr); fprintf(stderr, "\n"); } diff --git a/src/mesa/drivers/dri/i965/brw_sf.c b/src/mesa/drivers/dri/i965/brw_sf.c index 5556c46d377..152d258cc2f 100644 --- a/src/mesa/drivers/dri/i965/brw_sf.c +++ b/src/mesa/drivers/dri/i965/brw_sf.c @@ -117,7 +117,7 @@ static void compile_sf_prog( struct brw_context *brw, if (unlikely(INTEL_DEBUG & DEBUG_SF)) { fprintf(stderr, "sf:\n"); - brw_dump_compile(brw, c.func.store, 0, program_size, stderr); + brw_disassemble(brw, c.func.store, 0, program_size, stderr); fprintf(stderr, "\n"); } diff --git a/src/mesa/drivers/dri/i965/brw_state_dump.c b/src/mesa/drivers/dri/i965/brw_state_dump.c index 5cc5ac6a8a5..f0f185b0f87 100644 --- a/src/mesa/drivers/dri/i965/brw_state_dump.c +++ b/src/mesa/drivers/dri/i965/brw_state_dump.c @@ -522,8 +522,8 @@ dump_prog_cache(struct brw_context *brw) } fprintf(stderr, "%s:\n", name); - brw_dump_compile(brw, brw->cache.bo->virtual, item->offset, item->size, - stderr); + brw_disassemble(brw, brw->cache.bo->virtual, item->offset, item->size, + stderr); } } diff --git a/src/mesa/drivers/dri/i965/brw_vec4_generator.cpp b/src/mesa/drivers/dri/i965/brw_vec4_generator.cpp index cd9c562e708..4e0fe52ae2c 100644 --- a/src/mesa/drivers/dri/i965/brw_vec4_generator.cpp +++ b/src/mesa/drivers/dri/i965/brw_vec4_generator.cpp @@ -1334,8 +1334,8 @@ vec4_generator::generate_code(exec_list *instructions) } if (unlikely(debug_flag)) { - brw_dump_compile(brw, p->store, - last_native_insn_offset, p->next_insn_offset, stderr); + brw_disassemble(brw, p->store, + last_native_insn_offset, p->next_insn_offset, stderr); } last_native_insn_offset = p->next_insn_offset; @@ -1353,7 +1353,7 @@ vec4_generator::generate_code(exec_list *instructions) * case you're doing that. */ if (0 && unlikely(debug_flag)) { - brw_dump_compile(brw, p->store, 0, p->next_insn_offset, stderr); + brw_disassemble(brw, p->store, 0, p->next_insn_offset, stderr); } } diff --git a/src/mesa/drivers/dri/i965/gen8_fs_generator.cpp b/src/mesa/drivers/dri/i965/gen8_fs_generator.cpp index d25da817062..228de0cd885 100644 --- a/src/mesa/drivers/dri/i965/gen8_fs_generator.cpp +++ b/src/mesa/drivers/dri/i965/gen8_fs_generator.cpp @@ -1293,7 +1293,7 @@ gen8_fs_generator::generate_code(exec_list *instructions) } if (unlikely(INTEL_DEBUG & DEBUG_WM)) { - gen8_dump_compile(brw, store, last_native_inst_offset, next_inst_offset, stderr); + gen8_disassemble(brw, store, last_native_inst_offset, next_inst_offset, stderr); foreach_list(node, &cfg->block_list) { bblock_link *link = (bblock_link *)node; @@ -1327,7 +1327,7 @@ gen8_fs_generator::generate_code(exec_list *instructions) * case you're doing that. */ if (0 && unlikely(INTEL_DEBUG & DEBUG_WM)) { - gen8_dump_compile(brw, store, 0, next_inst_offset, stderr); + gen8_disassemble(brw, store, 0, next_inst_offset, stderr); } } diff --git a/src/mesa/drivers/dri/i965/gen8_generator.cpp b/src/mesa/drivers/dri/i965/gen8_generator.cpp index f6d852968a5..2a9bf83ee40 100644 --- a/src/mesa/drivers/dri/i965/gen8_generator.cpp +++ b/src/mesa/drivers/dri/i965/gen8_generator.cpp @@ -621,8 +621,8 @@ gen8_generator::HALT() } extern "C" void -gen8_dump_compile(struct brw_context *brw, void *assembly, - int start,int end, FILE *out) +gen8_disassemble(struct brw_context *brw, void *assembly, + int start, int end, FILE *out) { bool dump_hex = false; diff --git a/src/mesa/drivers/dri/i965/gen8_generator.h b/src/mesa/drivers/dri/i965/gen8_generator.h index b6ed24c1f33..cdb2741d87e 100644 --- a/src/mesa/drivers/dri/i965/gen8_generator.h +++ b/src/mesa/drivers/dri/i965/gen8_generator.h @@ -196,5 +196,5 @@ protected: }; extern "C" void -gen8_dump_compile(struct brw_context *brw, void *assembly, - int start,int end, FILE *out); +gen8_disassemble(struct brw_context *brw, void *assembly, + int start, int end, FILE *out); diff --git a/src/mesa/drivers/dri/i965/gen8_vec4_generator.cpp b/src/mesa/drivers/dri/i965/gen8_vec4_generator.cpp index 0c54e6ddd74..e53fd35fb60 100644 --- a/src/mesa/drivers/dri/i965/gen8_vec4_generator.cpp +++ b/src/mesa/drivers/dri/i965/gen8_vec4_generator.cpp @@ -910,7 +910,7 @@ gen8_vec4_generator::generate_code(exec_list *instructions) } if (unlikely(debug_flag)) { - gen8_dump_compile(brw, store, last_native_inst_offset, next_inst_offset, stderr); + gen8_disassemble(brw, store, last_native_inst_offset, next_inst_offset, stderr); } last_native_inst_offset = next_inst_offset; @@ -928,7 +928,7 @@ gen8_vec4_generator::generate_code(exec_list *instructions) * case you're doing that. */ if (0 && unlikely(debug_flag)) { - gen8_dump_compile(brw, store, 0, next_inst_offset, stderr); + gen8_disassemble(brw, store, 0, next_inst_offset, stderr); } }