fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-25 13:00:09 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

intel/compiler: Call brw_try_override_assembly independent of debug flag

Browse source 
Previously, brw_try_override_assembly was only called when a debug flag was
enabled. However, during investigations involving workloads such as Steam
games, enabling the debug flag results in excessive NIR and ISA output to
stderr, making debugging more difficult.

This change ensures that brw_try_override_assembly is called when the
INTEL_SHADER_ASM_READ_PATH is set, regardless of the debug flag. This
improves usability in scenarios where minimal debug output is desired.

Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/35115>
This commit is contained in:
Sushma Venkatesh Reddy 2025-05-22 17:27:57 +00:00 • committed by Marge Bot
parent 51b51eb676
commit 6d226ceca1
2 changed files with 16 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/intel/compiler/brw_eu.c
View file

@ -345,9 +345,6 @@ bool brw_try_override_assembly(struct brw_codegen *p, int start_offset,
const char *identifier)
{
const char *read_path = getenv("INTEL_SHADER_ASM_READ_PATH");
if (!read_path) {
return false;
}
char *name = ralloc_asprintf(NULL, "%s/%s.bin", read_path, identifier);

24
src/intel/compiler/brw_generator.cpp
View file

@ -1403,6 +1403,20 @@ brw_generator::generate_code(const cfg_t *cfg, int dispatch_width,
brw_dump_shader_bin(p->store, start_offset, p->next_insn_offset,
sha1buf);
const char *override_path = getenv("INTEL_SHADER_ASM_READ_PATH");
if (override_path && brw_try_override_assembly(p, start_offset, sha1buf)) {
fprintf(stderr, "Successfully overrode shader with sha1 %s\n", sha1buf);
/* disasm_info and stats are no longer valid as we gathered
* them based on the original shader.
*/
if (debug_flag) {
fprintf(stderr, "Skipping disassembly and statistics "
"output for this shader.\n\n");
}
ralloc_free(disasm_info);
return start_offset;
}
if (unlikely(debug_flag)) {
fprintf(stderr, "Native code for %s (src_hash 0x%08x) (sha1 %s)\n"
"SIMD%d shader: %d instructions. %d loops. %u cycles. "
@ -1423,14 +1437,8 @@ brw_generator::generate_code(const cfg_t *cfg, int dispatch_width,
shader_stats.non_ssa_registers_after_nir,
before_size, after_size,
100.0f * (before_size - after_size) / before_size);
/* overriding the shader makes disasm_info invalid */
if (!brw_try_override_assembly(p, start_offset, sha1buf)) {
dump_assembly(p->store, start_offset, p->next_insn_offset,
disasm_info, perf.block_latency);
} else {
fprintf(stderr, "Successfully overrode shader with sha1 %s\n\n", sha1buf);
}
dump_assembly(p->store, start_offset, p->next_insn_offset,
disasm_info, perf.block_latency);
}
ralloc_free(disasm_info);
#ifndef NDEBUG