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

nir/opt_load_skip_helpers: optionally handle intrinsics
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: Marek Olšák <marek.olsak@amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/36610>
This commit is contained in:
Georg Lehmann 2025-08-06 14:01:03 +02:00 • committed by Marge Bot
parent cd687e277f
commit 8818d7367d
2 changed files with 21 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/compiler/nir/nir.h
View file

@ -6379,8 +6379,13 @@ bool nir_opt_ray_queries(nir_shader *shader);
bool nir_opt_ray_query_ranges(nir_shader *shader); bool nir_opt_ray_query_ranges(nir_shader *shader);
typedef bool (*nir_skip_helpers_instrinsic_cb)(
nir_intrinsic_instr *intr, void *data);
typedef struct nir_opt_load_skip_helpers_options { typedef struct nir_opt_load_skip_helpers_options {
bool no_add_divergence : 1; bool no_add_divergence : 1;
nir_skip_helpers_instrinsic_cb intrinsic_cb;
void *intrinsic_cb_data;
} nir_opt_load_skip_helpers_options; } nir_opt_load_skip_helpers_options;
bool nir_opt_load_skip_helpers(nir_shader *shader, nir_opt_load_skip_helpers_options *options); bool nir_opt_load_skip_helpers(nir_shader *shader, nir_opt_load_skip_helpers_options *options);

19
src/compiler/nir/nir_opt_load_skip_helpers.c
View file

@ -156,6 +156,9 @@ nir_opt_load_skip_helpers(nir_shader *shader, nir_opt_load_skip_helpers_options
set_src_needs_helpers(&intr->src[0], &hs); set_src_needs_helpers(&intr->src[0], &hs);
} else if (instr_never_needs_helpers(instr)) { } else if (instr_never_needs_helpers(instr)) {
continue; continue;
} else if (hs.options->intrinsic_cb &&
hs.options->intrinsic_cb(intr, hs.options->intrinsic_cb_data)) {
nir_instr_worklist_push_tail(hs.load_instrs, instr);
} else { } else {
/* All I/O addresses need helpers because getting them wrong /* All I/O addresses need helpers because getting them wrong
* may cause a fault. * may cause a fault.
@ -188,7 +191,7 @@ nir_opt_load_skip_helpers(nir_shader *shader, nir_opt_load_skip_helpers_options
while (!nir_instr_worklist_is_empty(hs.load_instrs)) { while (!nir_instr_worklist_is_empty(hs.load_instrs)) {
nir_instr *instr = nir_instr_worklist_pop_head(hs.load_instrs); nir_instr *instr = nir_instr_worklist_pop_head(hs.load_instrs);
nir_tex_instr *tex = nir_instr_as_tex(instr); nir_def *def = nir_instr_def(instr);
/* If a load is uniform, we don't want to set skip_helpers because /* If a load is uniform, we don't want to set skip_helpers because
* then it might not be uniform if the helpers don't fetch. Also, * then it might not be uniform if the helpers don't fetch. Also,
@ -206,12 +209,20 @@ nir_opt_load_skip_helpers(nir_shader *shader, nir_opt_load_skip_helpers_options
* always leave skip_helpers=false on all uniform load ops, we'll * always leave skip_helpers=false on all uniform load ops, we'll
* have valid helper data in this load op. * have valid helper data in this load op.
*/ */
if (!tex->def.divergent && hs.options->no_add_divergence) if (hs.options->no_add_divergence && !def->divergent)
continue; continue;
if (!def_needs_helpers(&tex->def, &hs) && !tex->skip_helpers) { if (!def_needs_helpers(def, &hs)) {
if (instr->type == nir_instr_type_tex) {
nir_tex_instr *tex = nir_instr_as_tex(instr);
progress |= !tex->skip_helpers;
tex->skip_helpers = true; tex->skip_helpers = true;
progress = true; } else if (instr->type == nir_instr_type_intrinsic) {
nir_intrinsic_instr *intr = nir_instr_as_intrinsic(instr);
enum gl_access_qualifier access = nir_intrinsic_access(intr);
progress |= !(access & ACCESS_SKIP_HELPERS);
nir_intrinsic_set_access(intr, access | ACCESS_SKIP_HELPERS);
}
} }
} }
} }