fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-01-06 00:10:20 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

intel/compiler: fix SHA generation for shader replace
Some checks are pending
macOS-CI / macOS-CI (dri) (push) Waiting to run
Details
macOS-CI / macOS-CI (xlib) (push) Waiting to run
Details

Browse source 
Reviewed-by: Jordan Justen <jordan.l.justen@intel.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/35140>
This commit is contained in:
Caleb Callaway 2025-05-23 22:29:10 +00:00 • committed by Marge Bot
parent 8ffe0098be
commit 52db0e1480
3 changed files with 10 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -342,10 +342,8 @@ void brw_dump_shader_bin(void *assembly, int start_offset, int end_offset,
}
bool brw_try_override_assembly(struct brw_codegen *p, int start_offset,
const char *identifier)
const char *read_path, const char *identifier)
{
const char *read_path = getenv("INTEL_SHADER_ASM_READ_PATH");
char *name = ralloc_asprintf(NULL, "%s/%s.bin", read_path, identifier);
int fd = open(name, O_RDONLY);

2
src/intel/compiler/brw_eu.h
View file

@ -165,7 +165,7 @@ void brw_dump_shader_bin(void *assembly, int start_offset, int end_offset,
const char *identifier);
bool brw_try_override_assembly(struct brw_codegen *p, int start_offset,
const char *identifier);
const char *read_path, const char *identifier);
void brw_realign(struct brw_codegen *p, unsigned alignment);
int brw_append_data(struct brw_codegen *p, void *data,

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

@ -642,6 +642,9 @@ brw_generator::generate_halt(brw_inst *)
brw_HALT(p);
}
DEBUG_GET_ONCE_OPTION(shader_bin_override_path, "INTEL_SHADER_ASM_READ_PATH",
NULL);
/* The A32 messages take a buffer base address in header.5:[31:0] (See
* MH1_A32_PSM for typed messages or MH_A32_GO for byte/dword scattered
* and OWord block messages in the SKL PRM Vol. 2d for more details.)
@ -1393,7 +1396,8 @@ brw_generator::generate_code(const cfg_t *cfg, int dispatch_width,
unsigned char sha1[21];
char sha1buf[41];
if (unlikely(debug_flag || dump_shader_bin)) {
auto override_path = debug_get_option_shader_bin_override_path();
if (unlikely(debug_flag || dump_shader_bin || override_path != NULL)) {
_mesa_sha1_compute(p->store + start_offset / sizeof(brw_eu_inst),
after_size, sha1);
_mesa_sha1_format(sha1buf, sha1);
@ -1403,8 +1407,9 @@ 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)) {
if (unlikely(override_path != NULL &&
brw_try_override_assembly(p, start_offset, override_path,
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.