commit 1211d05befaf82e56c8f30d1b5ab02cd3fed6a00
author Samuel Pitoiset <samuel.pitoiset@gmail.com> Mon Oct 05 11:28:02 2020 +0200
committer Samuel Pitoiset <samuel.pitoiset@gmail.com> Wed Oct 07 13:31:25 2020 +0200
tree b3b50d63f2233a9a555520e9d50a6338c0a7e5c4
parent 9d5ec7f6f2c480093b2880387acf4a892c1d28f3

aco: bail out if the NIR IO base offset isn't zero

nir_io_add_const_offset_to_base takes care of this.

Signed-off-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Reviewed-by: Rhys Perry <pendingchaos02@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/7003>

src/amd/compiler/aco_instruction_selection.cpp

diff --git a/src/amd/compiler/aco_instruction_selection.cpp b/src/amd/compiler/aco_instruction_selection.cpp
index d3236c8..f72dda5 100644
--- a/src/amd/compiler/aco_instruction_selection.cpp
+++ b/src/amd/compiler/aco_instruction_selection.cpp
@@ -4124,11 +4124,10 @@
    unsigned component = nir_intrinsic_component(instr);
    unsigned idx = nir_intrinsic_base(instr) * 4u + component;
 
-   if (!nir_src_is_const(instr->src[1]))
+   if (!nir_src_is_const(instr->src[1]) || nir_src_as_uint(instr->src[1]))
       return false;
 
    Temp src = get_ssa_temp(ctx, instr->src[0].ssa);
-   idx += nir_src_as_uint(instr->src[1]) * 4u;
 
    if (instr->src[0].ssa->bit_size == 64)
       write_mask = widen_mask(write_mask, 2);
@@ -4510,13 +4509,12 @@
    Temp dst = get_ssa_temp(ctx, &instr->dest.ssa);
    if (ctx->shader->info.stage == MESA_SHADER_VERTEX) {
 
-      if (!nir_src_is_const(instr->src[0]))
-         isel_err(instr->src[0].ssa->parent_instr, "Unimplemented non-const nir_intrinsic_load_input offset");
-      uint32_t offset = nir_src_as_uint(instr->src[0]);
+      if (!nir_src_is_const(instr->src[0]) || nir_src_as_uint(instr->src[0]))
+         isel_err(instr->src[0].ssa->parent_instr, "Unimplemented non-zero nir_intrinsic_load_input offset");
 
       Temp vertex_buffers = convert_pointer_to_64_bit(ctx, get_arg(ctx, ctx->args->vertex_buffers));
 
-      unsigned location = nir_intrinsic_base(instr) - VERT_ATTRIB_GENERIC0 + offset;
+      unsigned location = nir_intrinsic_base(instr) - VERT_ATTRIB_GENERIC0;
       unsigned component = nir_intrinsic_component(instr);
       unsigned bitsize = instr->dest.ssa.bit_size;
       unsigned attrib_binding = ctx->options->key.vs.vertex_attribute_bindings[location];