Module: Mesa Branch: main Commit: 39b5bb080972c9f6fc3249d700cea3ce358fc3f4 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=39b5bb080972c9f6fc3249d700cea3ce358fc3f4
Author: Faith Ekstrand <[email protected]> Date: Wed Jul 12 02:37:17 2023 -0500 intel/fs: Drop support for nir_register Reviewed-by: Alyssa Rosenzweig <[email protected]> Reviewed-by: Lionel Landwerlin <[email protected]> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/24104> --- src/intel/compiler/brw_fs.h | 1 - src/intel/compiler/brw_fs_nir.cpp | 99 +++++++++++++---------------------- src/intel/compiler/brw_fs_visitor.cpp | 1 - 3 files changed, 37 insertions(+), 64 deletions(-) diff --git a/src/intel/compiler/brw_fs.h b/src/intel/compiler/brw_fs.h index 1ef41b4a09a..1286c187f07 100644 --- a/src/intel/compiler/brw_fs.h +++ b/src/intel/compiler/brw_fs.h @@ -475,7 +475,6 @@ public: /** Either BRW_MAX_GRF or GFX7_MRF_HACK_START */ unsigned max_grf; - fs_reg *nir_locals; fs_reg *nir_ssa_values; fs_inst **nir_resource_insts; struct brw_fs_bind_info *nir_ssa_bind_infos; diff --git a/src/intel/compiler/brw_fs_nir.cpp b/src/intel/compiler/brw_fs_nir.cpp index b98e6bf0efd..074dc1e97b3 100644 --- a/src/intel/compiler/brw_fs_nir.cpp +++ b/src/intel/compiler/brw_fs_nir.cpp @@ -306,20 +306,6 @@ fs_visitor::nir_emit_system_values() void fs_visitor::nir_emit_impl(nir_function_impl *impl) { - nir_locals = ralloc_array(mem_ctx, fs_reg, impl->reg_alloc); - for (unsigned i = 0; i < impl->reg_alloc; i++) { - nir_locals[i] = fs_reg(); - } - - foreach_list_typed(nir_register, reg, node, &impl->registers) { - unsigned array_elems = - reg->num_array_elems == 0 ? 1 : reg->num_array_elems; - unsigned size = array_elems * reg->num_components; - const brw_reg_type reg_type = reg->bit_size == 8 ? BRW_REGISTER_TYPE_B : - brw_reg_type_from_bit_size(reg->bit_size, BRW_REGISTER_TYPE_F); - nir_locals[reg->index] = bld.vgrf(reg_type, size); - } - nir_ssa_values = reralloc(mem_ctx, nir_ssa_values, fs_reg, impl->ssa_alloc); @@ -2014,33 +2000,28 @@ fs_visitor::get_resource_nir_src(const nir_src &src) fs_reg fs_visitor::get_nir_src(const nir_src &src) { + assert(src.is_ssa); + nir_intrinsic_instr *load_reg = nir_load_reg_for_def(src.ssa); + fs_reg reg; - if (src.is_ssa) { - nir_intrinsic_instr *load_reg = nir_load_reg_for_def(src.ssa); - if (!load_reg) { - if (nir_src_is_undef(src)) { - const brw_reg_type reg_type = - brw_reg_type_from_bit_size(src.ssa->bit_size, - BRW_REGISTER_TYPE_D); - reg = bld.vgrf(reg_type, src.ssa->num_components); - } else { - reg = nir_ssa_values[src.ssa->index]; - } + if (!load_reg) { + if (nir_src_is_undef(src)) { + const brw_reg_type reg_type = + brw_reg_type_from_bit_size(src.ssa->bit_size, + BRW_REGISTER_TYPE_D); + reg = bld.vgrf(reg_type, src.ssa->num_components); } else { - nir_intrinsic_instr *decl_reg = nir_reg_get_decl(load_reg->src[0].ssa); - const unsigned num_components = - nir_intrinsic_num_components(decl_reg); - /* We don't handle indirects on locals */ - assert(nir_intrinsic_base(load_reg) == 0); - assert(load_reg->intrinsic != nir_intrinsic_load_reg_indirect); - reg = offset(nir_ssa_values[decl_reg->dest.ssa.index], bld, - src.reg.base_offset * num_components); + reg = nir_ssa_values[src.ssa->index]; } } else { + nir_intrinsic_instr *decl_reg = nir_reg_get_decl(load_reg->src[0].ssa); + const unsigned num_components = + nir_intrinsic_num_components(decl_reg); /* We don't handle indirects on locals */ - assert(src.reg.indirect == NULL); - reg = offset(nir_locals[src.reg.reg->index], bld, - src.reg.base_offset * src.reg.reg->num_components); + assert(nir_intrinsic_base(load_reg) == 0); + assert(load_reg->intrinsic != nir_intrinsic_load_reg_indirect); + reg = offset(nir_ssa_values[decl_reg->dest.ssa.index], bld, + src.reg.base_offset * num_components); } if (nir_src_bit_size(src) == 64 && devinfo->ver == 7) { @@ -2078,34 +2059,28 @@ fs_visitor::get_nir_src_imm(const nir_src &src) fs_reg fs_visitor::get_nir_dest(const nir_dest &dest) { - if (dest.is_ssa) { - nir_intrinsic_instr *store_reg = nir_store_reg_for_def(&dest.ssa); - if (!store_reg) { - const brw_reg_type reg_type = - brw_reg_type_from_bit_size(dest.ssa.bit_size, - dest.ssa.bit_size == 8 ? - BRW_REGISTER_TYPE_D : - BRW_REGISTER_TYPE_F); - nir_ssa_values[dest.ssa.index] = - bld.vgrf(reg_type, dest.ssa.num_components); - bld.UNDEF(nir_ssa_values[dest.ssa.index]); - return nir_ssa_values[dest.ssa.index]; - } else { - nir_intrinsic_instr *decl_reg = - nir_reg_get_decl(store_reg->src[1].ssa); - const unsigned num_components = - nir_intrinsic_num_components(decl_reg); - /* We don't handle indirects on locals */ - assert(nir_intrinsic_base(store_reg) == 0); - assert(store_reg->intrinsic != nir_intrinsic_store_reg_indirect); - return offset(nir_ssa_values[decl_reg->dest.ssa.index], bld, - dest.reg.base_offset * num_components); - } + assert(dest.is_ssa); + nir_intrinsic_instr *store_reg = nir_store_reg_for_def(&dest.ssa); + if (!store_reg) { + const brw_reg_type reg_type = + brw_reg_type_from_bit_size(dest.ssa.bit_size, + dest.ssa.bit_size == 8 ? + BRW_REGISTER_TYPE_D : + BRW_REGISTER_TYPE_F); + nir_ssa_values[dest.ssa.index] = + bld.vgrf(reg_type, dest.ssa.num_components); + bld.UNDEF(nir_ssa_values[dest.ssa.index]); + return nir_ssa_values[dest.ssa.index]; } else { + nir_intrinsic_instr *decl_reg = + nir_reg_get_decl(store_reg->src[1].ssa); + const unsigned num_components = + nir_intrinsic_num_components(decl_reg); /* We don't handle indirects on locals */ - assert(dest.reg.indirect == NULL); - return offset(nir_locals[dest.reg.reg->index], bld, - dest.reg.base_offset * dest.reg.reg->num_components); + assert(nir_intrinsic_base(store_reg) == 0); + assert(store_reg->intrinsic != nir_intrinsic_store_reg_indirect); + return offset(nir_ssa_values[decl_reg->dest.ssa.index], bld, + dest.reg.base_offset * num_components); } } diff --git a/src/intel/compiler/brw_fs_visitor.cpp b/src/intel/compiler/brw_fs_visitor.cpp index 53c6158727b..352243d4d7d 100644 --- a/src/intel/compiler/brw_fs_visitor.cpp +++ b/src/intel/compiler/brw_fs_visitor.cpp @@ -1410,7 +1410,6 @@ fs_visitor::init() this->failed = false; this->fail_msg = NULL; - this->nir_locals = NULL; this->nir_ssa_values = NULL; this->nir_resource_insts = NULL; this->nir_ssa_bind_infos = NULL;
