OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

nir/lower_shader_calls: don't insert code after break/continue

Browse Source 
When moving code from below to the insertion cursor point, if the
cursor points to a jump instruction, don't bother inserting the code.
It would break the break/continue assumptions of NIR and would not be
executed anyway.

Signed-off-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
Fixes: 8dfb240b1f ("nir: Add raytracing shader call lowering pass.")
Reviewed-by: Jason Ekstrand <jason.ekstrand@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/16036>
This commit is contained in:
Lionel Landwerlin
2022-04-20 10:54:36 +03:00
committed by Marge Bot
parent 51dea59eb4
commit 9cf986dcff
1 changed files with 27 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/compiler/nir/nir_lower_shader_calls.c
View File

@@ -729,6 +729,21 @@ rewrite_phis_to_pred(nir_block *block, nir_block *pred)
} }
} }
static bool
cursor_is_after_jump(nir_cursor cursor)
{
switch (cursor.option) {
case nir_cursor_before_instr:
case nir_cursor_before_block:
return false;
case nir_cursor_after_instr:
return cursor.instr->type == nir_instr_type_jump;
case nir_cursor_after_block:
return nir_block_ends_in_jump(cursor.block);;
}
unreachable("Invalid cursor option");
}
/** Flattens if ladders leading up to a resume /** Flattens if ladders leading up to a resume
* *
* Given a resume_instr, this function flattens any if ladders leading to the * Given a resume_instr, this function flattens any if ladders leading to the
@@ -948,7 +963,18 @@ found_resume:
nir_cf_extract(&cf_list, nir_after_instr(resume_instr), nir_cf_extract(&cf_list, nir_after_instr(resume_instr),
nir_after_cf_list(child_list)); nir_after_cf_list(child_list));
} }
b->cursor = nir_cf_reinsert(&cf_list, b->cursor);
if (cursor_is_after_jump(b->cursor)) {
/* If the resume instruction is in a loop, it's possible cf_list ends
* in a break or continue instruction, in which case we don't want to
* insert anything. It's also possible we have an early return if
* someone hasn't lowered those yet. In either case, nothing after that
* point executes in this context so we can delete it.
*/
nir_cf_delete(&cf_list);
} else {
b->cursor = nir_cf_reinsert(&cf_list, b->cursor);
}
if (!resume_node) { if (!resume_node) {
/* We want the resume to be the first "interesting" instruction */ /* We want the resume to be the first "interesting" instruction */