i965: Pass brw_context and assembly separately to brw_dump_compile.
brw_dump_compile will be called indirectly by code common used by generations before and after the gen8 instruction format change. Acked-by: Eric Anholt <eric@anholt.net> Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
This commit is contained in:
parent
74b252d270
commit
1ef52d6ab3
|
@ -486,7 +486,7 @@ brw_blorp_const_color_program::compile(struct brw_context *brw,
|
||||||
|
|
||||||
if (unlikely(INTEL_DEBUG & DEBUG_BLORP)) {
|
if (unlikely(INTEL_DEBUG & DEBUG_BLORP)) {
|
||||||
fprintf(stderr, "Native code for BLORP clear:\n");
|
fprintf(stderr, "Native code for BLORP clear:\n");
|
||||||
brw_dump_compile(&func, stderr, 0, func.next_insn_offset);
|
brw_dump_compile(brw, &func.store, 0, func.next_insn_offset, stderr);
|
||||||
fprintf(stderr, "\n");
|
fprintf(stderr, "\n");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -254,14 +254,12 @@ const unsigned *brw_get_program( struct brw_compile *p,
|
||||||
}
|
}
|
||||||
|
|
||||||
void
|
void
|
||||||
brw_dump_compile(struct brw_compile *p, FILE *out, int start, int end)
|
brw_dump_compile(struct brw_context *brw, void *assembly, int start, int end, FILE *out)
|
||||||
{
|
{
|
||||||
struct brw_context *brw = p->brw;
|
|
||||||
void *store = p->store;
|
|
||||||
bool dump_hex = false;
|
bool dump_hex = false;
|
||||||
|
|
||||||
for (int offset = start; offset < end;) {
|
for (int offset = start; offset < end;) {
|
||||||
struct brw_instruction *insn = store + offset;
|
struct brw_instruction *insn = assembly + offset;
|
||||||
struct brw_instruction uncompacted;
|
struct brw_instruction uncompacted;
|
||||||
bool compacted = insn->header.cmpt_control;
|
bool compacted = insn->header.cmpt_control;
|
||||||
fprintf(out, "0x%08x: ", offset);
|
fprintf(out, "0x%08x: ", offset);
|
||||||
|
@ -288,6 +286,6 @@ brw_dump_compile(struct brw_compile *p, FILE *out, int start, int end)
|
||||||
offset += 16;
|
offset += 16;
|
||||||
}
|
}
|
||||||
|
|
||||||
brw_disasm(out, insn, p->brw->gen, compacted);
|
brw_disasm(out, insn, brw->gen, compacted);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -105,7 +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 brw_init_compile(struct brw_context *, struct brw_compile *p,
|
||||||
void *mem_ctx);
|
void *mem_ctx);
|
||||||
void brw_dump_compile(struct brw_compile *p, FILE *out, int start, int end);
|
void brw_dump_compile(struct brw_context *brw, void *assembly,
|
||||||
|
int start,int end, FILE *out);
|
||||||
const unsigned *brw_get_program( struct brw_compile *p, unsigned *sz );
|
const unsigned *brw_get_program( struct brw_compile *p, unsigned *sz );
|
||||||
|
|
||||||
struct brw_instruction *brw_next_insn(struct brw_compile *p, unsigned opcode);
|
struct brw_instruction *brw_next_insn(struct brw_compile *p, unsigned opcode);
|
||||||
|
|
|
@ -786,7 +786,7 @@ brw_compact_instructions(struct brw_compile *p)
|
||||||
|
|
||||||
if (0) {
|
if (0) {
|
||||||
fprintf(stderr, "dumping compacted program\n");
|
fprintf(stderr, "dumping compacted program\n");
|
||||||
brw_dump_compile(p, stderr, 0, p->next_insn_offset);
|
brw_dump_compile(brw, p->store, 0, p->next_insn_offset, stderr);
|
||||||
|
|
||||||
int cmp = 0;
|
int cmp = 0;
|
||||||
for (offset = 0; offset < p->next_insn_offset;) {
|
for (offset = 0; offset < p->next_insn_offset;) {
|
||||||
|
|
|
@ -1802,8 +1802,7 @@ fs_generator::generate_code(exec_list *instructions, FILE *dump_file)
|
||||||
}
|
}
|
||||||
|
|
||||||
if (unlikely(INTEL_DEBUG & DEBUG_WM)) {
|
if (unlikely(INTEL_DEBUG & DEBUG_WM)) {
|
||||||
brw_dump_compile(p, stderr,
|
brw_dump_compile(brw, p->store, last_native_insn_offset, p->next_insn_offset, stderr);
|
||||||
last_native_insn_offset, p->next_insn_offset);
|
|
||||||
|
|
||||||
foreach_list(node, &cfg->block_list) {
|
foreach_list(node, &cfg->block_list) {
|
||||||
bblock_link *link = (bblock_link *)node;
|
bblock_link *link = (bblock_link *)node;
|
||||||
|
@ -1837,7 +1836,7 @@ fs_generator::generate_code(exec_list *instructions, FILE *dump_file)
|
||||||
* case you're doing that.
|
* case you're doing that.
|
||||||
*/
|
*/
|
||||||
if (dump_file) {
|
if (dump_file) {
|
||||||
brw_dump_compile(p, dump_file, 0, p->next_insn_offset);
|
brw_dump_compile(brw, p->store, 0, p->next_insn_offset, dump_file);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -1334,8 +1334,8 @@ vec4_generator::generate_code(exec_list *instructions)
|
||||||
}
|
}
|
||||||
|
|
||||||
if (unlikely(debug_flag)) {
|
if (unlikely(debug_flag)) {
|
||||||
brw_dump_compile(p, stderr,
|
brw_dump_compile(brw, p->store,
|
||||||
last_native_insn_offset, p->next_insn_offset);
|
last_native_insn_offset, p->next_insn_offset, stderr);
|
||||||
}
|
}
|
||||||
|
|
||||||
last_native_insn_offset = p->next_insn_offset;
|
last_native_insn_offset = p->next_insn_offset;
|
||||||
|
@ -1353,7 +1353,7 @@ vec4_generator::generate_code(exec_list *instructions)
|
||||||
* case you're doing that.
|
* case you're doing that.
|
||||||
*/
|
*/
|
||||||
if (0 && unlikely(debug_flag)) {
|
if (0 && unlikely(debug_flag)) {
|
||||||
brw_dump_compile(p, stderr, 0, p->next_insn_offset);
|
brw_dump_compile(brw, p->store, 0, p->next_insn_offset, stderr);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue