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

nir/lower_io: Expose some explicit I/O lowering helpers

Browse Source 
Reviewed-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
Reviewed-by: Caio Marcelo de Oliveira Filho <caio.oliveira@intel.com>
This commit is contained in:
Jason Ekstrand
2019-01-07 18:00:22 -06:00
committed by Jason Ekstrand
parent 146deec9ef
commit 995dc4e5c3
2 changed files with 65 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/compiler/nir/nir.h
View File

@@ -3088,6 +3088,16 @@ typedef enum {
*/ */
nir_address_format_32bit_index_offset, nir_address_format_32bit_index_offset,
} nir_address_format; } nir_address_format;
nir_ssa_def * nir_explicit_io_address_from_deref(struct nir_builder *b,
nir_deref_instr *deref,
nir_ssa_def *base_addr,
nir_address_format addr_format);
void nir_lower_explicit_io_instr(struct nir_builder *b,
nir_intrinsic_instr *io_instr,
nir_ssa_def *addr,
nir_address_format addr_format);
bool nir_lower_explicit_io(nir_shader *shader, bool nir_lower_explicit_io(nir_shader *shader,
nir_variable_mode modes, nir_variable_mode modes,
nir_address_format); nir_address_format);

93
src/compiler/nir/nir_lower_io.c
View File

@@ -896,38 +896,17 @@ build_explicit_io_atomic(nir_builder *b, nir_intrinsic_instr *intrin,
} }
} }
static void nir_ssa_def *
lower_explicit_io_deref(nir_builder *b, nir_deref_instr *deref, nir_explicit_io_address_from_deref(nir_builder *b, nir_deref_instr *deref,
nir_ssa_def *base_addr,
nir_address_format addr_format) nir_address_format addr_format)
{ {
/* Just delete the deref if it's not used. We can't use
* nir_deref_instr_remove_if_unused here because it may remove more than
* one deref which could break our list walking since we walk the list
* backwards.
*/
assert(list_empty(&deref->dest.ssa.if_uses));
if (list_empty(&deref->dest.ssa.uses)) {
nir_instr_remove(&deref->instr);
return;
}
b->cursor = nir_after_instr(&deref->instr);
nir_ssa_def *parent_addr = NULL;
if (deref->deref_type != nir_deref_type_var) {
assert(deref->parent.is_ssa);
parent_addr = deref->parent.ssa;
}
nir_ssa_def *addr = NULL;
assert(deref->dest.is_ssa); assert(deref->dest.is_ssa);
switch (deref->deref_type) { switch (deref->deref_type) {
case nir_deref_type_var: case nir_deref_type_var:
assert(deref->mode == nir_var_shader_in); assert(deref->mode == nir_var_shader_in);
addr = nir_imm_intN_t(b, deref->var->data.driver_location, return nir_imm_intN_t(b, deref->var->data.driver_location,
deref->dest.ssa.bit_size); deref->dest.ssa.bit_size);
break;
case nir_deref_type_array: { case nir_deref_type_array: {
nir_deref_instr *parent = nir_deref_instr_parent(deref); nir_deref_instr *parent = nir_deref_instr_parent(deref);
@@ -941,19 +920,17 @@ lower_explicit_io_deref(nir_builder *b, nir_deref_instr *deref,
assert(stride > 0); assert(stride > 0);
nir_ssa_def *index = nir_ssa_for_src(b, deref->arr.index, 1); nir_ssa_def *index = nir_ssa_for_src(b, deref->arr.index, 1);
index = nir_i2i(b, index, parent_addr->bit_size); index = nir_i2i(b, index, base_addr->bit_size);
addr = build_addr_iadd(b, parent_addr, addr_format, return build_addr_iadd(b, base_addr, addr_format,
nir_imul_imm(b, index, stride)); nir_imul_imm(b, index, stride));
break;
} }
case nir_deref_type_ptr_as_array: { case nir_deref_type_ptr_as_array: {
nir_ssa_def *index = nir_ssa_for_src(b, deref->arr.index, 1); nir_ssa_def *index = nir_ssa_for_src(b, deref->arr.index, 1);
index = nir_i2i(b, index, parent_addr->bit_size); index = nir_i2i(b, index, base_addr->bit_size);
unsigned stride = nir_deref_instr_ptr_as_array_stride(deref); unsigned stride = nir_deref_instr_ptr_as_array_stride(deref);
addr = build_addr_iadd(b, parent_addr, addr_format, return build_addr_iadd(b, base_addr, addr_format,
nir_imul_imm(b, index, stride)); nir_imul_imm(b, index, stride));
break;
} }
case nir_deref_type_array_wildcard: case nir_deref_type_array_wildcard:
@@ -965,22 +942,21 @@ lower_explicit_io_deref(nir_builder *b, nir_deref_instr *deref,
int offset = glsl_get_struct_field_offset(parent->type, int offset = glsl_get_struct_field_offset(parent->type,
deref->strct.index); deref->strct.index);
assert(offset >= 0); assert(offset >= 0);
addr = build_addr_iadd_imm(b, parent_addr, addr_format, offset); return build_addr_iadd_imm(b, base_addr, addr_format, offset);
break;
} }
case nir_deref_type_cast: case nir_deref_type_cast:
/* Nothing to do here */ /* Nothing to do here */
addr = parent_addr; return base_addr;
break;
} }
nir_instr_remove(&deref->instr); unreachable("Invalid NIR deref type");
nir_ssa_def_rewrite_uses(&deref->dest.ssa, nir_src_for_ssa(addr));
} }
static void void
lower_explicit_io_access(nir_builder *b, nir_intrinsic_instr *intrin, nir_lower_explicit_io_instr(nir_builder *b,
nir_intrinsic_instr *intrin,
nir_ssa_def *addr,
nir_address_format addr_format) nir_address_format addr_format)
{ {
b->cursor = nir_after_instr(&intrin->instr); b->cursor = nir_after_instr(&intrin->instr);
@@ -991,7 +967,6 @@ lower_explicit_io_access(nir_builder *b, nir_intrinsic_instr *intrin,
assert(vec_stride == 0 || glsl_type_is_vector(deref->type)); assert(vec_stride == 0 || glsl_type_is_vector(deref->type));
assert(vec_stride == 0 || vec_stride >= scalar_size); assert(vec_stride == 0 || vec_stride >= scalar_size);
nir_ssa_def *addr = &deref->dest.ssa;
if (intrin->intrinsic == nir_intrinsic_load_deref) { if (intrin->intrinsic == nir_intrinsic_load_deref) {
nir_ssa_def *value; nir_ssa_def *value;
if (vec_stride > scalar_size) { if (vec_stride > scalar_size) {
@@ -1035,6 +1010,44 @@ lower_explicit_io_access(nir_builder *b, nir_intrinsic_instr *intrin,
nir_instr_remove(&intrin->instr); nir_instr_remove(&intrin->instr);
} }
static void
lower_explicit_io_deref(nir_builder *b, nir_deref_instr *deref,
nir_address_format addr_format)
{
/* Just delete the deref if it's not used. We can't use
* nir_deref_instr_remove_if_unused here because it may remove more than
* one deref which could break our list walking since we walk the list
* backwards.
*/
assert(list_empty(&deref->dest.ssa.if_uses));
if (list_empty(&deref->dest.ssa.uses)) {
nir_instr_remove(&deref->instr);
return;
}
b->cursor = nir_after_instr(&deref->instr);
nir_ssa_def *base_addr = NULL;
if (deref->deref_type != nir_deref_type_var) {
assert(deref->parent.is_ssa);
base_addr = deref->parent.ssa;
}
nir_ssa_def *addr = nir_explicit_io_address_from_deref(b, deref, base_addr,
addr_format);
nir_instr_remove(&deref->instr);
nir_ssa_def_rewrite_uses(&deref->dest.ssa, nir_src_for_ssa(addr));
}
static void
lower_explicit_io_access(nir_builder *b, nir_intrinsic_instr *intrin,
nir_address_format addr_format)
{
assert(intrin->src[0].is_ssa);
nir_lower_explicit_io_instr(b, intrin, intrin->src[0].ssa, addr_format);
}
static void static void
lower_explicit_io_array_length(nir_builder *b, nir_intrinsic_instr *intrin, lower_explicit_io_array_length(nir_builder *b, nir_intrinsic_instr *intrin,
nir_address_format addr_format) nir_address_format addr_format)