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

nir: Drop nir_dest

Browse Source 
Instead, we replace every use of it with nir_def.  Most of this commit
was generated by sed:

   sed -i -e 's/dest.ssa/def/g' src/**/*.h src/**/*.c src/**/*.cpp

A few manual fixups were required in lima and the nir_legacy code.

Acked-by: Alyssa Rosenzweig <alyssa@rosenzweig.io>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/24674>
This commit is contained in:
Faith Ekstrand
2023-08-14 11:56:00 -05:00
committed by Marge Bot
parent 6c1d32581a
commit 4695bebc79
346 changed files with 2929 additions and 2949 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/compiler/nir/nir_opt_dce.c
View File

@@ -64,21 +64,21 @@ is_live(BITSET_WORD *defs_live, nir_instr *instr)
}
case nir_instr_type_deref: {
nir_deref_instr *deref = nir_instr_as_deref(instr);
return is_def_live(&deref->dest.ssa, defs_live);
return is_def_live(&deref->def, defs_live);
}
case nir_instr_type_intrinsic: {
nir_intrinsic_instr *intrin = nir_instr_as_intrinsic(instr);
const nir_intrinsic_info *info = &nir_intrinsic_infos[intrin->intrinsic];
return !(info->flags & NIR_INTRINSIC_CAN_ELIMINATE) ||
(info->has_dest && is_def_live(&intrin->dest.ssa, defs_live));
(info->has_dest && is_def_live(&intrin->def, defs_live));
}
case nir_instr_type_tex: {
nir_tex_instr *tex = nir_instr_as_tex(instr);
return is_def_live(&tex->dest.ssa, defs_live);
return is_def_live(&tex->def, defs_live);
}
case nir_instr_type_phi: {
nir_phi_instr *phi = nir_instr_as_phi(instr);
return is_def_live(&phi->dest.ssa, defs_live);
return is_def_live(&phi->def, defs_live);
}
case nir_instr_type_load_const: {
nir_load_const_instr *lc = nir_instr_as_load_const(instr);
@@ -91,7 +91,7 @@ is_live(BITSET_WORD *defs_live, nir_instr *instr)
case nir_instr_type_parallel_copy: {
nir_parallel_copy_instr *pc = nir_instr_as_parallel_copy(instr);
nir_foreach_parallel_copy_entry(entry, pc) {
if (entry->dest_is_reg || is_def_live(&entry->dest.dest.ssa, defs_live))
if (entry->dest_is_reg || is_def_live(&entry->dest.def, defs_live))
return true;
}
return false;