AlexIndustrial/mesa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

treewide: Collapse more SSA checks

Browse Source 
Via Coccinelle patch:

    @@
    expression x;
    @@

    -if (x->is_ssa) {
    ...
    -}

Signed-off-by: Alyssa Rosenzweig <alyssa@rosenzweig.io>
Reviewed-by: Faith Ekstrand <faith.ekstrand@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/24432>
This commit is contained in:
Alyssa Rosenzweig
2023-08-01 12:31:54 -04:00
committed by Marge Bot
parent 700e270df5
commit 306182c63e
2 changed files with 22 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/compiler/nir/nir.c
+5 -7
View File
@@ -1254,14 +1254,12 @@ nir_instr_dce_add_dead_srcs_cb(nir_src *src, void *state)
{
nir_instr_worklist *wl = state;
if (src->is_ssa) {
list_del(&src->use_link);
if (!nir_instr_free_and_dce_is_live(src->ssa->parent_instr))
nir_instr_worklist_push_tail(wl, src->ssa->parent_instr);
list_del(&src->use_link);
if (!nir_instr_free_and_dce_is_live(src->ssa->parent_instr))
nir_instr_worklist_push_tail(wl, src->ssa->parent_instr);
/* Stop nir_instr_remove from trying to delete the link again. */
src->ssa = NULL;
}
/* Stop nir_instr_remove from trying to delete the link again. */
src->ssa = NULL;
return true;
}
src/gallium/drivers/etnaviv/etnaviv_compiler_nir_liveness.c
+17 -18
View File
@@ -72,28 +72,27 @@ set_src_live(nir_src *src, void *void_state)
{
struct live_defs_state *state = void_state;
if (src->is_ssa) {
nir_instr *instr = src->ssa->parent_instr;
nir_instr *instr = src->ssa->parent_instr;
if (is_sysval(instr) || instr->type == nir_instr_type_deref)
return true;
if (is_sysval(instr) || instr->type == nir_instr_type_deref)
return true;
switch (instr->type) {
case nir_instr_type_load_const:
case nir_instr_type_ssa_undef:
switch (instr->type) {
case nir_instr_type_load_const:
case nir_instr_type_ssa_undef:
return true;
case nir_instr_type_alu: {
/* alu op bypass */
nir_alu_instr *alu = nir_instr_as_alu(instr);
if (instr->pass_flags & BYPASS_SRC) {
for (unsigned i = 0; i < nir_op_infos[alu->op].num_inputs; i++)
set_src_live(&alu->src[i].src, state);
return true;
case nir_instr_type_alu: {
/* alu op bypass */
nir_alu_instr *alu = nir_instr_as_alu(instr);
if (instr->pass_flags & BYPASS_SRC) {
for (unsigned i = 0; i < nir_op_infos[alu->op].num_inputs; i++)
set_src_live(&alu->src[i].src, state);
return true;
}
} break;
default:
break;
}
break;
}
default:
break;
}
unsigned i = state->live_map[src_index(state->impl, src)];