---
src/compiler/nir/nir_lower_indirect_derefs.c | 156 +++
1 file changed, 156 insertions(+)
diff --git a/src/compiler/nir/nir_lower_indirect_derefs.c
b/src/compiler/nir/nir_lower_indirect_derefs.c
index 02f202d..ebeb79b 100644
--- a/src/compiler/nir/nir_lower_indirect_derefs.c
+++ b/src/compiler/nir/nir_lower_indirect_derefs.c
@@ -23,6 +23,7 @@
#include "nir.h"
#include "nir_builder.h"
+#include "nir_deref.h"
static void
emit_load_store(nir_builder *b, nir_intrinsic_instr *orig_instr,
@@ -184,6 +185,160 @@ lower_indirect_block(nir_block *block, nir_builder *b,
return progress;
}
+static void
+emit_load_store_deref(nir_builder *b, nir_intrinsic_instr *orig_instr,
+ nir_deref_instr *parent,
+ nir_deref_instr **deref_arr,
+ nir_ssa_def **dest, nir_ssa_def *src);
+
+static void
+emit_indirect_load_store_deref(nir_builder *b, nir_intrinsic_instr *orig_instr,
+ nir_deref_instr *parent,
+ nir_deref_instr **deref_arr,
+ int start, int end,
+ nir_ssa_def **dest, nir_ssa_def *src)
+{
+ assert(start < end);
+ if (start == end - 1) {
+ nir_ssa_def *index = nir_imm_int(b, start);
+ emit_load_store_deref(b, orig_instr,
+nir_build_deref_array(b, parent, index),
+deref_arr + 1, dest, src);
+ } else {
+ int mid = start + (end - start) / 2;
+
+ nir_ssa_def *then_dest, *else_dest;
+
+ nir_deref_instr *deref = *deref_arr;
+ assert(deref->deref_type == nir_deref_type_array);
+
+ nir_push_if(b, nir_ilt(b, deref->arr.index.ssa, nir_imm_int(b, mid)));
+ emit_indirect_load_store_deref(b, orig_instr, parent, deref_arr,
+ start, mid, _dest, src);
+ nir_push_else(b, NULL);
+ emit_indirect_load_store_deref(b, orig_instr, parent, deref_arr,
+ mid, end, _dest, src);
+ nir_pop_if(b, NULL);
+
+ if (src == NULL)
+ *dest = nir_if_phi(b, then_dest, else_dest);
+ }
+}
+
+static void
+emit_load_store_deref(nir_builder *b, nir_intrinsic_instr *orig_instr,
+ nir_deref_instr *parent,
+ nir_deref_instr **deref_arr,
+ nir_ssa_def **dest, nir_ssa_def *src)
+{
+ for (; *deref_arr; deref_arr++) {
+ nir_deref_instr *deref = *deref_arr;
+ if (deref->deref_type == nir_deref_type_array &&
+ nir_src_as_const_value(deref->arr.index) == NULL) {
+ int length = glsl_get_length(parent->type);
+
+ emit_indirect_load_store_deref(b, orig_instr, parent, deref_arr,
+0, length, dest, src);
+ return;
+ }
+
+ parent = nir_build_deref_follower(b, parent, deref);
+ }
+
+ /* We reached the end of the deref chain. Emit the instruction */
+ assert(*deref_arr == NULL);
+
+ if (src == NULL) {
+ /* This is a load instruction */
+ nir_intrinsic_instr *load =
+ nir_intrinsic_instr_create(b->shader, orig_instr->intrinsic);
+ load->num_components = orig_instr->num_components;
+
+ load->src[0] = nir_src_for_ssa(>dest.ssa);
+
+ /* Copy over any other sources. This is needed for interp_deref_at */
+ for (unsigned i = 1;
+ i < nir_intrinsic_infos[orig_instr->intrinsic].num_srcs; i++)
+ nir_src_copy(>src[i], _instr->src[i], load);
+
+ nir_ssa_dest_init(>instr, >dest,
+orig_instr->dest.ssa.num_components,
+orig_instr->dest.ssa.bit_size, NULL);
+ nir_builder_instr_insert(b, >instr);
+ *dest = >dest.ssa;
+ } else {
+ assert(orig_instr->intrinsic == nir_intrinsic_store_deref);
+ nir_store_deref(b, parent, src, nir_intrinsic_write_mask(orig_instr));
+ }
+}
+
+static bool
+lower_indirect_derefs_block(nir_block *block, nir_builder *b,
+nir_variable_mode modes)
+{
+ bool progress = false;
+
+ nir_foreach_instr_safe(instr, block) {
+ if (instr->type != nir_instr_type_intrinsic)
+ continue;
+
+ nir_intrinsic_instr *intrin = nir_instr_as_intrinsic(instr);
+ if (intrin->intrinsic != nir_intrinsic_load_deref &&
+ intrin->intrinsic != nir_intrinsic_interp_deref_at_centroid &&
+ intrin->intrinsic != nir_intrinsic_interp_deref_at_sample &&
+ intrin->intrinsic != nir_intrinsic_interp_deref_at_offset &&
+ intrin->intrinsic != nir_intrinsic_store_deref)
+ continue;
+
+ nir_deref_instr *deref =
+ nir_instr_as_deref(intrin->src[0].ssa->parent_instr);
+
+ /* Walk the deref chain back to the base and look for indirects */
+ bool has_indirect = false;
+ nir_deref_instr *base = deref;
+ while (base->deref_type != nir_deref_type_var) {
+ if
