util: remove LIST_IS_EMPTY macro
[mesa.git] / src / gallium / drivers / radeonsi / si_shader_nir.c
index 0a692277f6426d358dfbcae508b3e778591e5550..4df625ed274068e943367053cc95583fc3b25679 100644 (file)
@@ -31,6 +31,8 @@
 
 #include "compiler/nir/nir.h"
 #include "compiler/nir_types.h"
+#include "compiler/nir/nir_builder.h"
+#include "compiler/nir/nir_deref.h"
 
 static nir_variable* tex_get_texture_var(nir_tex_instr *instr)
 {
@@ -51,7 +53,135 @@ static nir_variable* intrinsic_get_var(nir_intrinsic_instr *instr)
        return nir_deref_instr_get_variable(nir_src_as_deref(instr->src[0]));
 }
 
-static void scan_instruction(struct tgsi_shader_info *info,
+static void gather_usage_helper(const nir_deref_instr **deref_ptr,
+                               unsigned location,
+                               uint8_t mask,
+                               uint8_t *usage_mask)
+{
+       for (; *deref_ptr; deref_ptr++) {
+               const nir_deref_instr *deref = *deref_ptr;
+               switch (deref->deref_type) {
+               case nir_deref_type_array: {
+                       unsigned elem_size =
+                               glsl_count_attribute_slots(deref->type, false);
+                       if (nir_src_is_const(deref->arr.index)) {
+                               location += elem_size * nir_src_as_uint(deref->arr.index);
+                       } else {
+                               unsigned array_elems =
+                                       glsl_get_length(deref_ptr[-1]->type);
+                               for (unsigned i = 0; i < array_elems; i++) {
+                                       gather_usage_helper(deref_ptr + 1,
+                                                           location + elem_size * i,
+                                                           mask, usage_mask);
+                               }
+                               return;
+                       }
+                       break;
+               }
+               case nir_deref_type_struct: {
+                       const struct glsl_type *parent_type =
+                               deref_ptr[-1]->type;
+                       unsigned index = deref->strct.index;
+                       for (unsigned i = 0; i < index; i++) {
+                               const struct glsl_type *ft = glsl_get_struct_field(parent_type, i);
+                               location += glsl_count_attribute_slots(ft, false);
+                       }
+                       break;
+               }
+               default:
+                       unreachable("Unhandled deref type in gather_components_used_helper");
+               }
+       }
+
+       usage_mask[location] |= mask & 0xf;
+       if (mask & 0xf0)
+               usage_mask[location + 1] |= (mask >> 4) & 0xf;
+}
+
+static void gather_usage(const nir_deref_instr *deref,
+                        uint8_t mask,
+                        uint8_t *usage_mask)
+{
+       nir_deref_path path;
+       nir_deref_path_init(&path, (nir_deref_instr *)deref, NULL);
+
+       unsigned location_frac = path.path[0]->var->data.location_frac;
+       if (glsl_type_is_64bit(deref->type)) {
+               uint8_t new_mask = 0;
+               for (unsigned i = 0; i < 4; i++) {
+                       if (mask & (1 << i))
+                               new_mask |= 0x3 << (2 * i);
+               }
+               mask = new_mask << location_frac;
+       } else {
+               mask <<= location_frac;
+               mask &= 0xf;
+       }
+
+       gather_usage_helper((const nir_deref_instr **)&path.path[1],
+                           path.path[0]->var->data.driver_location,
+                           mask, usage_mask);
+
+       nir_deref_path_finish(&path);
+}
+
+static void gather_intrinsic_load_deref_input_info(const nir_shader *nir,
+                                                  const nir_intrinsic_instr *instr,
+                                                  const nir_deref_instr *deref,
+                                                  struct tgsi_shader_info *info)
+{
+       switch (nir->info.stage) {
+       case MESA_SHADER_VERTEX:
+               gather_usage(deref, nir_ssa_def_components_read(&instr->dest.ssa),
+                            info->input_usage_mask);
+       default:;
+       }
+}
+
+static void gather_intrinsic_load_deref_output_info(const nir_shader *nir,
+                                                   const nir_intrinsic_instr *instr,
+                                                   nir_variable *var,
+                                                   struct tgsi_shader_info *info)
+{
+       assert(var && var->data.mode == nir_var_shader_out);
+
+       switch (nir->info.stage) {
+       case MESA_SHADER_TESS_CTRL:
+               if (var->data.location == VARYING_SLOT_TESS_LEVEL_INNER ||
+                   var->data.location == VARYING_SLOT_TESS_LEVEL_OUTER)
+                       info->reads_tessfactor_outputs = true;
+               else if (var->data.patch)
+                       info->reads_perpatch_outputs = true;
+               else
+                       info->reads_pervertex_outputs = true;
+               break;
+
+       case MESA_SHADER_FRAGMENT:
+               if (var->data.fb_fetch_output)
+                       info->uses_fbfetch = true;
+               break;
+       default:;
+       }
+}
+
+static void gather_intrinsic_store_deref_output_info(const nir_shader *nir,
+                                                    const nir_intrinsic_instr *instr,
+                                                    const nir_deref_instr *deref,
+                                                    struct tgsi_shader_info *info)
+{
+       switch (nir->info.stage) {
+       case MESA_SHADER_VERTEX: /* needed by LS, ES */
+       case MESA_SHADER_TESS_EVAL: /* needed by ES */
+       case MESA_SHADER_GEOMETRY:
+               gather_usage(deref, nir_intrinsic_write_mask(instr),
+                            info->output_usagemask);
+               break;
+       default:;
+       }
+}
+
+static void scan_instruction(const struct nir_shader *nir,
+                            struct tgsi_shader_info *info,
                             nir_instr *instr)
 {
        if (instr->type == nir_instr_type_alu) {
@@ -133,6 +263,9 @@ static void scan_instruction(struct tgsi_shader_info *info,
                case nir_intrinsic_load_base_vertex:
                        info->uses_basevertex = 1;
                        break;
+               case nir_intrinsic_load_draw_id:
+                       info->uses_drawid = 1;
+                       break;
                case nir_intrinsic_load_primitive_id:
                        info->uses_primid = 1;
                        break;
@@ -143,58 +276,68 @@ static void scan_instruction(struct tgsi_shader_info *info,
                case nir_intrinsic_load_tess_level_outer:
                        info->reads_tess_factors = true;
                        break;
-               case nir_intrinsic_image_deref_load: {
-                       nir_variable *var = intrinsic_get_var(intr);
-                       if (var->data.bindless) {
-                               info->uses_bindless_images = true;
+               case nir_intrinsic_bindless_image_load:
+                       info->uses_bindless_images = true;
 
-                               if (glsl_get_sampler_dim(var->type) == GLSL_SAMPLER_DIM_BUF)
-                                       info->uses_bindless_buffer_load = true;
-                               else
-                                       info->uses_bindless_image_load = true;
-                       }
+                       if (nir_intrinsic_image_dim(intr) == GLSL_SAMPLER_DIM_BUF)
+                               info->uses_bindless_buffer_load = true;
+                       else
+                               info->uses_bindless_image_load = true;
                        break;
-               }
-               case nir_intrinsic_image_deref_size:
-               case nir_intrinsic_image_deref_samples: {
-                       nir_variable *var = intrinsic_get_var(intr);
-                       if (var->data.bindless)
-                               info->uses_bindless_images = true;
+               case nir_intrinsic_bindless_image_size:
+               case nir_intrinsic_bindless_image_samples:
+                       info->uses_bindless_images = true;
                        break;
-               }
-               case nir_intrinsic_image_deref_store: {
-                       nir_variable *var = intrinsic_get_var(intr);
-                       if (var->data.bindless) {
-                               info->uses_bindless_images = true;
+               case nir_intrinsic_bindless_image_store:
+                       info->uses_bindless_images = true;
+
+                       if (nir_intrinsic_image_dim(intr) == GLSL_SAMPLER_DIM_BUF)
+                               info->uses_bindless_buffer_store = true;
+                       else
+                               info->uses_bindless_image_store = true;
 
-                               if (glsl_get_sampler_dim(var->type) == GLSL_SAMPLER_DIM_BUF)
-                                       info->uses_bindless_buffer_store = true;
-                               else
-                                       info->uses_bindless_image_store = true;
-                       }
                        info->writes_memory = true;
+                       info->num_memory_instructions++; /* we only care about stores */
+                       break;
+               case nir_intrinsic_image_deref_store:
+                       info->writes_memory = true;
+                       info->num_memory_instructions++; /* we only care about stores */
+                       break;
+               case nir_intrinsic_bindless_image_atomic_add:
+               case nir_intrinsic_bindless_image_atomic_imin:
+               case nir_intrinsic_bindless_image_atomic_umin:
+               case nir_intrinsic_bindless_image_atomic_imax:
+               case nir_intrinsic_bindless_image_atomic_umax:
+               case nir_intrinsic_bindless_image_atomic_and:
+               case nir_intrinsic_bindless_image_atomic_or:
+               case nir_intrinsic_bindless_image_atomic_xor:
+               case nir_intrinsic_bindless_image_atomic_exchange:
+               case nir_intrinsic_bindless_image_atomic_comp_swap:
+                       info->uses_bindless_images = true;
+
+                       if (nir_intrinsic_image_dim(intr) == GLSL_SAMPLER_DIM_BUF)
+                               info->uses_bindless_buffer_atomic = true;
+                       else
+                               info->uses_bindless_image_atomic = true;
+
+                       info->writes_memory = true;
+                       info->num_memory_instructions++; /* we only care about stores */
                        break;
-               }
                case nir_intrinsic_image_deref_atomic_add:
-               case nir_intrinsic_image_deref_atomic_min:
-               case nir_intrinsic_image_deref_atomic_max:
+               case nir_intrinsic_image_deref_atomic_imin:
+               case nir_intrinsic_image_deref_atomic_umin:
+               case nir_intrinsic_image_deref_atomic_imax:
+               case nir_intrinsic_image_deref_atomic_umax:
                case nir_intrinsic_image_deref_atomic_and:
                case nir_intrinsic_image_deref_atomic_or:
                case nir_intrinsic_image_deref_atomic_xor:
                case nir_intrinsic_image_deref_atomic_exchange:
-               case nir_intrinsic_image_deref_atomic_comp_swap: {
-                       nir_variable *var = intrinsic_get_var(intr);
-                       if (var->data.bindless) {
-                               info->uses_bindless_images = true;
-
-                               if (glsl_get_sampler_dim(var->type) == GLSL_SAMPLER_DIM_BUF)
-                                       info->uses_bindless_buffer_atomic = true;
-                               else
-                                       info->uses_bindless_image_atomic = true;
-                       }
+               case nir_intrinsic_image_deref_atomic_comp_swap:
+               case nir_intrinsic_image_deref_atomic_inc_wrap:
+               case nir_intrinsic_image_deref_atomic_dec_wrap:
                        info->writes_memory = true;
+                       info->num_memory_instructions++; /* we only care about stores */
                        break;
-               }
                case nir_intrinsic_store_ssbo:
                case nir_intrinsic_ssbo_atomic_add:
                case nir_intrinsic_ssbo_atomic_imin:
@@ -207,70 +350,75 @@ static void scan_instruction(struct tgsi_shader_info *info,
                case nir_intrinsic_ssbo_atomic_exchange:
                case nir_intrinsic_ssbo_atomic_comp_swap:
                        info->writes_memory = true;
+                       info->num_memory_instructions++; /* we only care about stores */
+                       break;
+               case nir_intrinsic_load_color0:
+               case nir_intrinsic_load_color1: {
+                       unsigned index = intr->intrinsic == nir_intrinsic_load_color1;
+                       uint8_t mask = nir_ssa_def_components_read(&intr->dest.ssa);
+                       info->colors_read |= mask << (index * 4);
                        break;
+               }
+               case nir_intrinsic_load_barycentric_pixel:
+               case nir_intrinsic_load_barycentric_centroid:
+               case nir_intrinsic_load_barycentric_sample:
+               case nir_intrinsic_load_barycentric_at_offset: /* uses center */
+               case nir_intrinsic_load_barycentric_at_sample: { /* uses center */
+                       unsigned mode = nir_intrinsic_interp_mode(intr);
+
+                       if (mode == INTERP_MODE_FLAT)
+                               break;
+
+                       if (mode == INTERP_MODE_NOPERSPECTIVE) {
+                               if (intr->intrinsic == nir_intrinsic_load_barycentric_sample)
+                                       info->uses_linear_sample = true;
+                               else if (intr->intrinsic == nir_intrinsic_load_barycentric_centroid)
+                                       info->uses_linear_centroid = true;
+                               else
+                                       info->uses_linear_center = true;
+
+                               if (intr->intrinsic == nir_intrinsic_load_barycentric_at_sample)
+                                       info->uses_linear_opcode_interp_sample = true;
+                       } else {
+                               if (intr->intrinsic == nir_intrinsic_load_barycentric_sample)
+                                       info->uses_persp_sample = true;
+                               else if (intr->intrinsic == nir_intrinsic_load_barycentric_centroid)
+                                       info->uses_persp_centroid = true;
+                               else
+                                       info->uses_persp_center = true;
+
+                               if (intr->intrinsic == nir_intrinsic_load_barycentric_at_sample)
+                                       info->uses_persp_opcode_interp_sample = true;
+                       }
+                       break;
+               }
                case nir_intrinsic_load_deref: {
                        nir_variable *var = intrinsic_get_var(intr);
                        nir_variable_mode mode = var->data.mode;
-                       enum glsl_base_type base_type =
-                               glsl_get_base_type(glsl_without_array(var->type));
 
                        if (mode == nir_var_shader_in) {
-                               switch (var->data.interpolation) {
-                               case INTERP_MODE_NONE:
-                                       if (glsl_base_type_is_integer(base_type))
-                                               break;
-
-                                       /* fall-through */
-                               case INTERP_MODE_SMOOTH:
-                                       if (var->data.sample)
-                                               info->uses_persp_sample = true;
-                                       else if (var->data.centroid)
-                                               info->uses_persp_centroid = true;
-                                       else
-                                               info->uses_persp_center = true;
-                                       break;
-
-                               case INTERP_MODE_NOPERSPECTIVE:
-                                       if (var->data.sample)
-                                               info->uses_linear_sample = true;
-                                       else if (var->data.centroid)
-                                               info->uses_linear_centroid = true;
-                                       else
-                                               info->uses_linear_center = true;
-                                       break;
-                               }
+                               /* PS inputs use the interpolated load intrinsics. */
+                               assert(nir->info.stage != MESA_SHADER_FRAGMENT);
+                               gather_intrinsic_load_deref_input_info(nir, intr,
+                                                                      nir_src_as_deref(intr->src[0]), info);
+                       } else if (mode == nir_var_shader_out) {
+                               gather_intrinsic_load_deref_output_info(nir, intr, var, info);
                        }
                        break;
                }
+               case nir_intrinsic_store_deref: {
+                       nir_variable *var = intrinsic_get_var(intr);
+
+                       if (var->data.mode == nir_var_shader_out)
+                               gather_intrinsic_store_deref_output_info(nir, intr,
+                                                                        nir_src_as_deref(intr->src[0]), info);
+                       break;
+               }
                case nir_intrinsic_interp_deref_at_centroid:
                case nir_intrinsic_interp_deref_at_sample:
-               case nir_intrinsic_interp_deref_at_offset: {
-                       enum glsl_interp_mode interp = intrinsic_get_var(intr)->data.interpolation;
-                       switch (interp) {
-                       case INTERP_MODE_SMOOTH:
-                       case INTERP_MODE_NONE:
-                               if (intr->intrinsic == nir_intrinsic_interp_deref_at_centroid)
-                                       info->uses_persp_opcode_interp_centroid = true;
-                               else if (intr->intrinsic == nir_intrinsic_interp_deref_at_sample)
-                                       info->uses_persp_opcode_interp_sample = true;
-                               else
-                                       info->uses_persp_opcode_interp_offset = true;
-                               break;
-                       case INTERP_MODE_NOPERSPECTIVE:
-                               if (intr->intrinsic == nir_intrinsic_interp_deref_at_centroid)
-                                       info->uses_linear_opcode_interp_centroid = true;
-                               else if (intr->intrinsic == nir_intrinsic_interp_deref_at_sample)
-                                       info->uses_linear_opcode_interp_sample = true;
-                               else
-                                       info->uses_linear_opcode_interp_offset = true;
-                               break;
-                       case INTERP_MODE_FLAT:
-                               break;
-                       default:
-                               unreachable("Unsupported interpoation type");
-                       }
+               case nir_intrinsic_interp_deref_at_offset:
+                       unreachable("interp opcodes should have been lowered");
                        break;
-               }
                default:
                        break;
                }
@@ -278,7 +426,6 @@ static void scan_instruction(struct tgsi_shader_info *info,
 }
 
 void si_nir_scan_tess_ctrl(const struct nir_shader *nir,
-                          const struct tgsi_shader_info *info,
                           struct tgsi_tessctrl_info *out)
 {
        memset(out, 0, sizeof(*out));
@@ -286,14 +433,156 @@ void si_nir_scan_tess_ctrl(const struct nir_shader *nir,
        if (nir->info.stage != MESA_SHADER_TESS_CTRL)
                return;
 
-       /* Initial value = true. Here the pass will accumulate results from
-        * multiple segments surrounded by barriers. If tess factors aren't
-        * written at all, it's a shader bug and we don't care if this will be
-        * true.
-        */
-       out->tessfactors_are_def_in_all_invocs = true;
+       out->tessfactors_are_def_in_all_invocs =
+               ac_are_tessfactors_def_in_all_invocs(nir);
+}
+
+static void scan_output_slot(const nir_variable *var,
+                            unsigned var_idx,
+                            unsigned component, unsigned num_components,
+                            struct tgsi_shader_info *info)
+{
+       assert(component + num_components <= 4);
+       assert(component < 4);
+
+       unsigned semantic_name, semantic_index;
+
+       unsigned location = var->data.location + var_idx;
+       unsigned drv_location = var->data.driver_location + var_idx;
 
-       /* TODO: Implement scanning of tess factors, see tgsi backend. */
+       if (info->processor == PIPE_SHADER_FRAGMENT) {
+               tgsi_get_gl_frag_result_semantic(location,
+                       &semantic_name, &semantic_index);
+
+               /* Adjust for dual source blending */
+               if (var->data.index > 0) {
+                       semantic_index++;
+               }
+       } else {
+               tgsi_get_gl_varying_semantic(location, true,
+                                            &semantic_name, &semantic_index);
+       }
+
+       ubyte usagemask = ((1 << num_components) - 1) << component;
+
+       unsigned gs_out_streams;
+       if (var->data.stream & (1u << 31)) {
+               gs_out_streams = var->data.stream & ~(1u << 31);
+       } else {
+               assert(var->data.stream < 4);
+               gs_out_streams = 0;
+               for (unsigned j = 0; j < num_components; ++j)
+                       gs_out_streams |= var->data.stream << (2 * (component + j));
+       }
+
+       unsigned streamx = gs_out_streams & 3;
+       unsigned streamy = (gs_out_streams >> 2) & 3;
+       unsigned streamz = (gs_out_streams >> 4) & 3;
+       unsigned streamw = (gs_out_streams >> 6) & 3;
+
+       if (usagemask & TGSI_WRITEMASK_X) {
+               info->output_streams[drv_location] |= streamx;
+               info->num_stream_output_components[streamx]++;
+       }
+       if (usagemask & TGSI_WRITEMASK_Y) {
+               info->output_streams[drv_location] |= streamy << 2;
+               info->num_stream_output_components[streamy]++;
+       }
+       if (usagemask & TGSI_WRITEMASK_Z) {
+               info->output_streams[drv_location] |= streamz << 4;
+               info->num_stream_output_components[streamz]++;
+       }
+       if (usagemask & TGSI_WRITEMASK_W) {
+               info->output_streams[drv_location] |= streamw << 6;
+               info->num_stream_output_components[streamw]++;
+       }
+
+       info->output_semantic_name[drv_location] = semantic_name;
+       info->output_semantic_index[drv_location] = semantic_index;
+
+       switch (semantic_name) {
+       case TGSI_SEMANTIC_PRIMID:
+               info->writes_primid = true;
+               break;
+       case TGSI_SEMANTIC_VIEWPORT_INDEX:
+               info->writes_viewport_index = true;
+               break;
+       case TGSI_SEMANTIC_LAYER:
+               info->writes_layer = true;
+               break;
+       case TGSI_SEMANTIC_PSIZE:
+               info->writes_psize = true;
+               break;
+       case TGSI_SEMANTIC_CLIPVERTEX:
+               info->writes_clipvertex = true;
+               break;
+       case TGSI_SEMANTIC_COLOR:
+               info->colors_written |= 1 << semantic_index;
+               break;
+       case TGSI_SEMANTIC_STENCIL:
+               info->writes_stencil = true;
+               break;
+       case TGSI_SEMANTIC_SAMPLEMASK:
+               info->writes_samplemask = true;
+               break;
+       case TGSI_SEMANTIC_EDGEFLAG:
+               info->writes_edgeflag = true;
+               break;
+       case TGSI_SEMANTIC_POSITION:
+               if (info->processor == PIPE_SHADER_FRAGMENT)
+                       info->writes_z = true;
+               else
+                       info->writes_position = true;
+               break;
+       }
+}
+
+static void scan_output_helper(const nir_variable *var,
+                              unsigned location,
+                              const struct glsl_type *type,
+                              struct tgsi_shader_info *info)
+{
+       if (glsl_type_is_struct(type)) {
+               for (unsigned i = 0; i < glsl_get_length(type); i++) {
+                       const struct glsl_type *ft = glsl_get_struct_field(type, i);
+                       scan_output_helper(var, location, ft, info);
+                       location += glsl_count_attribute_slots(ft, false);
+               }
+       } else if (glsl_type_is_array_or_matrix(type)) {
+               const struct glsl_type *elem_type =
+                       glsl_get_array_element(type);
+               unsigned num_elems = glsl_get_length(type);
+               if (var->data.compact) {
+                       assert(glsl_type_is_scalar(elem_type));
+                       assert(glsl_get_bit_size(elem_type) == 32);
+                       unsigned component = var->data.location_frac;
+                       scan_output_slot(var, location, component,
+                                        MIN2(num_elems, 4 - component), info);
+                       if (component + num_elems > 4) {
+                               scan_output_slot(var, location + 1, 0,
+                                                component + num_elems - 4, info);
+                       }
+
+               } else {
+                       unsigned elem_count = glsl_count_attribute_slots(elem_type, false);
+                       for (unsigned i = 0; i < num_elems; i++) {
+                               scan_output_helper(var, location, elem_type, info);
+                               location += elem_count;
+                       }
+               }
+       } else if (glsl_type_is_dual_slot(type)) {
+               unsigned component = var->data.location_frac;
+               scan_output_slot(var, location, component, 4 - component, info);
+               scan_output_slot(var, location + 1, 0, component + 2 * glsl_get_components(type) - 4,
+                                info);
+       } else {
+               unsigned component = var->data.location_frac;
+               assert(glsl_type_is_vector_or_scalar(type));
+               unsigned num_components = glsl_get_components(type);
+               if (glsl_type_is_64bit(type))
+                       num_components *= 2;
+               scan_output_slot(var, location, component, num_components, info);
+       }
 }
 
 void si_nir_scan_shader(const struct nir_shader *nir,
@@ -309,6 +598,13 @@ void si_nir_scan_shader(const struct nir_shader *nir,
        info->properties[TGSI_PROPERTY_NEXT_SHADER] =
                pipe_shader_type_from_mesa(nir->info.next_stage);
 
+       if (nir->info.stage == MESA_SHADER_VERTEX) {
+               info->properties[TGSI_PROPERTY_VS_WINDOW_SPACE_POSITION] =
+                       nir->info.vs.window_space_position;
+               info->properties[TGSI_PROPERTY_VS_BLIT_SGPRS_AMD] =
+                       nir->info.vs.blit_sgprs_amd;
+       }
+
        if (nir->info.stage == MESA_SHADER_TESS_CTRL) {
                info->properties[TGSI_PROPERTY_TCS_VERTICES_OUT] =
                        nir->info.tess.tcs_vertices_out;
@@ -368,15 +664,15 @@ void si_nir_scan_shader(const struct nir_shader *nir,
                }
        }
 
-       if (nir->info.stage == MESA_SHADER_COMPUTE) {
+       if (gl_shader_stage_is_compute(nir->info.stage)) {
                info->properties[TGSI_PROPERTY_CS_FIXED_BLOCK_WIDTH] = nir->info.cs.local_size[0];
                info->properties[TGSI_PROPERTY_CS_FIXED_BLOCK_HEIGHT] = nir->info.cs.local_size[1];
                info->properties[TGSI_PROPERTY_CS_FIXED_BLOCK_DEPTH] = nir->info.cs.local_size[2];
+               info->properties[TGSI_PROPERTY_CS_USER_DATA_COMPONENTS_AMD] = nir->info.cs.user_data_components_amd;
        }
 
        i = 0;
        uint64_t processed_inputs = 0;
-       unsigned num_inputs = 0;
        nir_foreach_variable(variable, &nir->inputs) {
                unsigned semantic_name, semantic_index;
 
@@ -395,30 +691,8 @@ void si_nir_scan_shader(const struct nir_shader *nir,
                 * tracker has already mapped them to attributes via
                 * variable->data.driver_location.
                 */
-               if (nir->info.stage == MESA_SHADER_VERTEX) {
-                       /* TODO: gather the actual input useage and remove this. */
-                       info->input_usage_mask[i] = TGSI_WRITEMASK_XYZW;
-
-                       if (glsl_type_is_dual_slot(variable->type)) {
-                               num_inputs += 2;
-
-                               /* TODO: gather the actual input useage and remove this. */
-                               info->input_usage_mask[i+1] = TGSI_WRITEMASK_XYZW;
-                       } else
-                               num_inputs++;
+               if (nir->info.stage == MESA_SHADER_VERTEX)
                        continue;
-               }
-
-               /* Fragment shader position is a system value. */
-               if (nir->info.stage == MESA_SHADER_FRAGMENT &&
-                   variable->data.location == VARYING_SLOT_POS) {
-                       if (variable->data.pixel_center_integer)
-                               info->properties[TGSI_PROPERTY_FS_COORD_PIXEL_CENTER] =
-                                       TGSI_FS_COORD_PIXEL_CENTER_INTEGER;
-
-                       num_inputs++;
-                       continue;
-               }
 
                for (unsigned j = 0; j < attrib_count; j++, i++) {
 
@@ -426,7 +700,6 @@ void si_nir_scan_shader(const struct nir_shader *nir,
                                continue;
 
                        processed_inputs |= ((uint64_t)1 << i);
-                       num_inputs++;
 
                        tgsi_get_gl_varying_semantic(variable->data.location + j, true,
                                                     &semantic_name, &semantic_index);
@@ -437,220 +710,60 @@ void si_nir_scan_shader(const struct nir_shader *nir,
                        if (semantic_name == TGSI_SEMANTIC_PRIMID)
                                info->uses_primid = true;
 
-                       if (variable->data.sample)
-                               info->input_interpolate_loc[i] = TGSI_INTERPOLATE_LOC_SAMPLE;
-                       else if (variable->data.centroid)
-                               info->input_interpolate_loc[i] = TGSI_INTERPOLATE_LOC_CENTROID;
-                       else
-                               info->input_interpolate_loc[i] = TGSI_INTERPOLATE_LOC_CENTER;
+                       if (semantic_name == TGSI_SEMANTIC_COLOR) {
+                               /* We only need this for color inputs. */
+                               if (variable->data.sample)
+                                       info->input_interpolate_loc[i] = TGSI_INTERPOLATE_LOC_SAMPLE;
+                               else if (variable->data.centroid)
+                                       info->input_interpolate_loc[i] = TGSI_INTERPOLATE_LOC_CENTROID;
+                               else
+                                       info->input_interpolate_loc[i] = TGSI_INTERPOLATE_LOC_CENTER;
+                       }
 
-                       enum glsl_base_type base_type =
-                               glsl_get_base_type(glsl_without_array(variable->type));
+                        enum glsl_base_type base_type =
+                                glsl_get_base_type(glsl_without_array(variable->type));
 
-                       switch (variable->data.interpolation) {
-                       case INTERP_MODE_NONE:
-                               if (glsl_base_type_is_integer(base_type)) {
-                                       info->input_interpolate[i] = TGSI_INTERPOLATE_CONSTANT;
-                                       break;
-                               }
+                        switch (variable->data.interpolation) {
+                        case INTERP_MODE_NONE:
+                                if (glsl_base_type_is_integer(base_type)) {
+                                        info->input_interpolate[i] = TGSI_INTERPOLATE_CONSTANT;
+                                        break;
+                                }
 
-                               if (semantic_name == TGSI_SEMANTIC_COLOR) {
-                                       info->input_interpolate[i] = TGSI_INTERPOLATE_COLOR;
-                                       break;
-                               }
-                               /* fall-through */
+                                if (semantic_name == TGSI_SEMANTIC_COLOR) {
+                                        info->input_interpolate[i] = TGSI_INTERPOLATE_COLOR;
+                                        break;
+                                }
+                                /* fall-through */
 
-                       case INTERP_MODE_SMOOTH:
-                               assert(!glsl_base_type_is_integer(base_type));
+                        case INTERP_MODE_SMOOTH:
+                                assert(!glsl_base_type_is_integer(base_type));
 
-                               info->input_interpolate[i] = TGSI_INTERPOLATE_PERSPECTIVE;
-                               break;
+                                info->input_interpolate[i] = TGSI_INTERPOLATE_PERSPECTIVE;
+                                break;
 
-                       case INTERP_MODE_NOPERSPECTIVE:
-                               assert(!glsl_base_type_is_integer(base_type));
+                        case INTERP_MODE_NOPERSPECTIVE:
+                                assert(!glsl_base_type_is_integer(base_type));
 
-                               info->input_interpolate[i] = TGSI_INTERPOLATE_LINEAR;
-                               break;
+                                info->input_interpolate[i] = TGSI_INTERPOLATE_LINEAR;
+                                break;
 
-                       case INTERP_MODE_FLAT:
-                               info->input_interpolate[i] = TGSI_INTERPOLATE_CONSTANT;
-                               break;
-                       }
-
-                       /* TODO make this more precise */
-                       if (variable->data.location == VARYING_SLOT_COL0)
-                               info->colors_read |= 0x0f;
-                       else if (variable->data.location == VARYING_SLOT_COL1)
-                               info->colors_read |= 0xf0;
+                        case INTERP_MODE_FLAT:
+                                info->input_interpolate[i] = TGSI_INTERPOLATE_CONSTANT;
+                                break;
+                        }
                }
        }
 
-       info->num_inputs = num_inputs;
-
-
-       i = 0;
-       uint64_t processed_outputs = 0;
-       unsigned num_outputs = 0;
        nir_foreach_variable(variable, &nir->outputs) {
-               unsigned semantic_name, semantic_index;
-
-               i = variable->data.driver_location;
-
                const struct glsl_type *type = variable->type;
                if (nir_is_per_vertex_io(variable, nir->info.stage)) {
                        assert(glsl_type_is_array(type));
                        type = glsl_get_array_element(type);
                }
 
-               unsigned attrib_count = glsl_count_attribute_slots(type, false);
-               for (unsigned k = 0; k < attrib_count; k++, i++) {
-
-                       if (nir->info.stage == MESA_SHADER_FRAGMENT) {
-                               tgsi_get_gl_frag_result_semantic(variable->data.location + k,
-                                       &semantic_name, &semantic_index);
-
-                               /* Adjust for dual source blending */
-                               if (variable->data.index > 0) {
-                                       semantic_index++;
-                               }
-                       } else {
-                               tgsi_get_gl_varying_semantic(variable->data.location + k, true,
-                                                            &semantic_name, &semantic_index);
-                       }
-
-                       unsigned num_components = 4;
-                       unsigned vector_elements = glsl_get_vector_elements(glsl_without_array(variable->type));
-                       if (vector_elements)
-                               num_components = vector_elements;
-
-                       unsigned component = variable->data.location_frac;
-                       if (glsl_type_is_64bit(glsl_without_array(variable->type))) {
-                               if (glsl_type_is_dual_slot(glsl_without_array(variable->type)) && k % 2) {
-                                       num_components = (num_components * 2) - 4;
-                                       component = 0;
-                               } else {
-                                       num_components = MIN2(num_components * 2, 4);
-                               }
-                       }
-
-                       ubyte usagemask = 0;
-                       for (unsigned j = component; j < num_components + component; j++) {
-                               switch (j) {
-                               case 0:
-                                       usagemask |= TGSI_WRITEMASK_X;
-                                       break;
-                               case 1:
-                                       usagemask |= TGSI_WRITEMASK_Y;
-                                       break;
-                               case 2:
-                                       usagemask |= TGSI_WRITEMASK_Z;
-                                       break;
-                               case 3:
-                                       usagemask |= TGSI_WRITEMASK_W;
-                                       break;
-                               default:
-                                       unreachable("error calculating component index");
-                               }
-                       }
-
-                       unsigned gs_out_streams;
-                       if (variable->data.stream & (1u << 31)) {
-                               gs_out_streams = variable->data.stream & ~(1u << 31);
-                       } else {
-                               assert(variable->data.stream < 4);
-                               gs_out_streams = 0;
-                               for (unsigned j = 0; j < num_components; ++j)
-                                       gs_out_streams |= variable->data.stream << (2 * (component + j));
-                       }
-
-                       unsigned streamx = gs_out_streams & 3;
-                       unsigned streamy = (gs_out_streams >> 2) & 3;
-                       unsigned streamz = (gs_out_streams >> 4) & 3;
-                       unsigned streamw = (gs_out_streams >> 6) & 3;
-
-                       if (usagemask & TGSI_WRITEMASK_X) {
-                               info->output_usagemask[i] |= TGSI_WRITEMASK_X;
-                               info->output_streams[i] |= streamx;
-                               info->num_stream_output_components[streamx]++;
-                       }
-                       if (usagemask & TGSI_WRITEMASK_Y) {
-                               info->output_usagemask[i] |= TGSI_WRITEMASK_Y;
-                               info->output_streams[i] |= streamy << 2;
-                               info->num_stream_output_components[streamy]++;
-                       }
-                       if (usagemask & TGSI_WRITEMASK_Z) {
-                               info->output_usagemask[i] |= TGSI_WRITEMASK_Z;
-                               info->output_streams[i] |= streamz << 4;
-                               info->num_stream_output_components[streamz]++;
-                       }
-                       if (usagemask & TGSI_WRITEMASK_W) {
-                               info->output_usagemask[i] |= TGSI_WRITEMASK_W;
-                               info->output_streams[i] |= streamw << 6;
-                               info->num_stream_output_components[streamw]++;
-                       }
-
-                       /* make sure we only count this location once against
-                        * the num_outputs counter.
-                        */
-                       if (processed_outputs & ((uint64_t)1 << i))
-                               continue;
-
-                       processed_outputs |= ((uint64_t)1 << i);
-                       num_outputs++;
-
-                       info->output_semantic_name[i] = semantic_name;
-                       info->output_semantic_index[i] = semantic_index;
-
-                       switch (semantic_name) {
-                       case TGSI_SEMANTIC_PRIMID:
-                               info->writes_primid = true;
-                               break;
-                       case TGSI_SEMANTIC_VIEWPORT_INDEX:
-                               info->writes_viewport_index = true;
-                               break;
-                       case TGSI_SEMANTIC_LAYER:
-                               info->writes_layer = true;
-                               break;
-                       case TGSI_SEMANTIC_PSIZE:
-                               info->writes_psize = true;
-                               break;
-                       case TGSI_SEMANTIC_CLIPVERTEX:
-                               info->writes_clipvertex = true;
-                               break;
-                       case TGSI_SEMANTIC_COLOR:
-                               info->colors_written |= 1 << semantic_index;
-                               break;
-                       case TGSI_SEMANTIC_STENCIL:
-                               info->writes_stencil = true;
-                               break;
-                       case TGSI_SEMANTIC_SAMPLEMASK:
-                               info->writes_samplemask = true;
-                               break;
-                       case TGSI_SEMANTIC_EDGEFLAG:
-                               info->writes_edgeflag = true;
-                               break;
-                       case TGSI_SEMANTIC_POSITION:
-                               if (info->processor == PIPE_SHADER_FRAGMENT)
-                                       info->writes_z = true;
-                               else
-                                       info->writes_position = true;
-                               break;
-                       }
-
-                       if (nir->info.stage == MESA_SHADER_TESS_CTRL) {
-                               switch (semantic_name) {
-                               case TGSI_SEMANTIC_PATCH:
-                                       info->reads_perpatch_outputs = true;
-                               break;
-                               case TGSI_SEMANTIC_TESSINNER:
-                               case TGSI_SEMANTIC_TESSOUTER:
-                                       info->reads_tessfactor_outputs = true;
-                               break;
-                               default:
-                                       info->reads_pervertex_outputs = true;
-                               }
-                       }
-               }
+               ASSERTED unsigned attrib_count = glsl_count_attribute_slots(type, false);
+               scan_output_helper(variable, 0, type, info);
 
                unsigned loc = variable->data.location;
                if (nir->info.stage == MESA_SHADER_FRAGMENT &&
@@ -661,139 +774,199 @@ void si_nir_scan_shader(const struct nir_shader *nir,
                }
        }
 
-       info->num_outputs = num_outputs;
+       info->num_inputs = nir->num_inputs;
+       info->num_outputs = nir->num_outputs;
 
-       struct set *ubo_set = _mesa_set_create(NULL, _mesa_hash_pointer,
-                                              _mesa_key_pointer_equal);
+       info->const_file_max[0] = nir->num_uniforms - 1;
+       info->shader_buffers_declared = u_bit_consecutive(0, nir->info.num_ssbos);
+       info->const_buffers_declared = u_bit_consecutive(1, nir->info.num_ubos);
+       if (nir->num_uniforms > 0)
+               info->const_buffers_declared |= 1;
+       info->images_declared = u_bit_consecutive(0, nir->info.num_images);
+       info->msaa_images_declared = u_bit_consecutive(0, nir->info.last_msaa_image + 1);
+       info->samplers_declared = nir->info.textures_used;
 
-       /* Intialise const_file_max[0] */
-       info->const_file_max[0] = -1;
+       info->num_written_clipdistance = nir->info.clip_distance_array_size;
+       info->num_written_culldistance = nir->info.cull_distance_array_size;
+       info->clipdist_writemask = u_bit_consecutive(0, info->num_written_clipdistance);
+       info->culldist_writemask = u_bit_consecutive(0, info->num_written_culldistance);
 
-       unsigned ubo_idx = 1;
-       nir_foreach_variable(variable, &nir->uniforms) {
-               const struct glsl_type *type = variable->type;
-               enum glsl_base_type base_type =
-                       glsl_get_base_type(glsl_without_array(type));
-               unsigned aoa_size = MAX2(1, glsl_get_aoa_size(type));
-
-               /* Gather buffers declared bitmasks. Note: radeonsi doesn't
-                * really use the mask (other than ubo_idx == 1 for regular
-                * uniforms) its really only used for getting the buffer count
-                * so we don't need to worry about the ordering.
-                */
-               if (variable->interface_type != NULL) {
-                       if (variable->data.mode == nir_var_uniform) {
-
-                               unsigned block_count;
-                               if (base_type != GLSL_TYPE_INTERFACE) {
-                                       struct set_entry *entry =
-                                               _mesa_set_search(ubo_set, variable->interface_type);
-
-                                       /* Check if we have already processed
-                                        * a member from this ubo.
-                                        */
-                                       if (entry)
-                                               continue;
-
-                                       block_count = 1;
-                               } else {
-                                       block_count = aoa_size;
-                               }
+       if (info->processor == PIPE_SHADER_FRAGMENT)
+               info->uses_kill = nir->info.fs.uses_discard;
 
-                               info->const_buffers_declared |= u_bit_consecutive(ubo_idx, block_count);
-                               ubo_idx += block_count;
+       func = (struct nir_function *)exec_list_get_head_const(&nir->functions);
+       nir_foreach_block(block, func->impl) {
+               nir_foreach_instr(instr, block)
+                       scan_instruction(nir, info, instr);
+       }
+}
 
-                               _mesa_set_add(ubo_set, variable->interface_type);
-                       }
+static void
+si_nir_opts(struct nir_shader *nir)
+{
+       bool progress;
+        unsigned lower_flrp =
+                (nir->options->lower_flrp16 ? 16 : 0) |
+                (nir->options->lower_flrp32 ? 32 : 0) |
+                (nir->options->lower_flrp64 ? 64 : 0);
 
-                       if (variable->data.mode == nir_var_shader_storage) {
-                               /* TODO: make this more accurate */
-                               info->shader_buffers_declared =
-                                       u_bit_consecutive(0, SI_NUM_SHADER_BUFFERS);
-                       }
+       do {
+               progress = false;
 
-                       continue;
+               NIR_PASS_V(nir, nir_lower_vars_to_ssa);
+
+               NIR_PASS(progress, nir, nir_opt_copy_prop_vars);
+               NIR_PASS(progress, nir, nir_opt_dead_write_vars);
+
+               NIR_PASS_V(nir, nir_lower_alu_to_scalar, NULL, NULL);
+               NIR_PASS_V(nir, nir_lower_phis_to_scalar);
+
+               /* (Constant) copy propagation is needed for txf with offsets. */
+               NIR_PASS(progress, nir, nir_copy_prop);
+               NIR_PASS(progress, nir, nir_opt_remove_phis);
+               NIR_PASS(progress, nir, nir_opt_dce);
+               if (nir_opt_trivial_continues(nir)) {
+                       progress = true;
+                       NIR_PASS(progress, nir, nir_copy_prop);
+                       NIR_PASS(progress, nir, nir_opt_dce);
                }
+               NIR_PASS(progress, nir, nir_opt_if, true);
+               NIR_PASS(progress, nir, nir_opt_dead_cf);
+               NIR_PASS(progress, nir, nir_opt_cse);
+               NIR_PASS(progress, nir, nir_opt_peephole_select, 8, true, true);
 
-               /* We rely on the fact that nir_lower_samplers_as_deref has
-                * eliminated struct dereferences.
-                */
-               if (base_type == GLSL_TYPE_SAMPLER) {
-                       if (variable->data.bindless) {
-                               info->const_buffers_declared |= 1;
-                               info->const_file_max[0] +=
-                                       glsl_count_attribute_slots(type, false);
-                       } else {
-                               info->samplers_declared |=
-                                       u_bit_consecutive(variable->data.binding, aoa_size);
-                       }
-               } else if (base_type == GLSL_TYPE_IMAGE) {
-                       if (variable->data.bindless) {
-                               info->const_buffers_declared |= 1;
-                               info->const_file_max[0] +=
-                                       glsl_count_attribute_slots(type, false);
-                       } else {
-                               info->images_declared |=
-                                       u_bit_consecutive(variable->data.binding, aoa_size);
-                       }
-               } else if (base_type != GLSL_TYPE_ATOMIC_UINT) {
-                       if (strncmp(variable->name, "state.", 6) == 0 ||
-                           strncmp(variable->name, "gl_", 3) == 0) {
-                               /* FIXME: figure out why piglit tests with builtin
-                                * uniforms are failing without this.
-                                */
-                               info->const_buffers_declared =
-                                       u_bit_consecutive(0, SI_NUM_CONST_BUFFERS);
-                       } else {
-                               info->const_buffers_declared |= 1;
-                               info->const_file_max[0] +=
-                                       glsl_count_attribute_slots(type, false);
+               /* Needed for algebraic lowering */
+               NIR_PASS(progress, nir, nir_opt_algebraic);
+               NIR_PASS(progress, nir, nir_opt_constant_folding);
+
+               if (lower_flrp != 0) {
+                       bool lower_flrp_progress = false;
+
+                       NIR_PASS(lower_flrp_progress, nir, nir_lower_flrp,
+                                lower_flrp,
+                                false /* always_precise */,
+                                nir->options->lower_ffma);
+                       if (lower_flrp_progress) {
+                               NIR_PASS(progress, nir,
+                                        nir_opt_constant_folding);
+                               progress = true;
                        }
+
+                       /* Nothing should rematerialize any flrps, so we only
+                        * need to do this lowering once.
+                        */
+                       lower_flrp = 0;
                }
-       }
 
-       _mesa_set_destroy(ubo_set, NULL);
+               NIR_PASS(progress, nir, nir_opt_undef);
+               NIR_PASS(progress, nir, nir_opt_conditional_discard);
+               if (nir->options->max_unroll_iterations) {
+                       NIR_PASS(progress, nir, nir_opt_loop_unroll, 0);
+               }
+       } while (progress);
+}
 
-       info->num_written_clipdistance = nir->info.clip_distance_array_size;
-       info->num_written_culldistance = nir->info.cull_distance_array_size;
-       info->clipdist_writemask = u_bit_consecutive(0, info->num_written_clipdistance);
-       info->culldist_writemask = u_bit_consecutive(0, info->num_written_culldistance);
+static int
+type_size_vec4(const struct glsl_type *type, bool bindless)
+{
+       return glsl_count_attribute_slots(type, false);
+}
 
-       if (info->processor == PIPE_SHADER_FRAGMENT)
-               info->uses_kill = nir->info.fs.uses_discard;
+static void
+si_nir_lower_color(nir_shader *nir)
+{
+        nir_function_impl *entrypoint = nir_shader_get_entrypoint(nir);
+
+        nir_builder b;
+        nir_builder_init(&b, entrypoint);
+
+        nir_foreach_block(block, entrypoint) {
+                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)
+                                continue;
+
+                        nir_deref_instr *deref = nir_src_as_deref(intrin->src[0]);
+                        if (deref->mode != nir_var_shader_in)
+                                continue;
+
+                        b.cursor = nir_before_instr(instr);
+                        nir_variable *var = nir_deref_instr_get_variable(deref);
+                        nir_ssa_def *def;
+
+                        if (var->data.location == VARYING_SLOT_COL0) {
+                                def = nir_load_color0(&b);
+                        } else if (var->data.location == VARYING_SLOT_COL1) {
+                                def = nir_load_color1(&b);
+                        } else {
+                                continue;
+                        }
+
+                        nir_ssa_def_rewrite_uses(&intrin->dest.ssa, nir_src_for_ssa(def));
+                        nir_instr_remove(instr);
+                }
+        }
+}
 
-       func = (struct nir_function *)exec_list_get_head_const(&nir->functions);
-       nir_foreach_block(block, func->impl) {
-               nir_foreach_instr(instr, block)
-                       scan_instruction(info, instr);
-       }
+static void si_nir_lower_ps_inputs(struct nir_shader *nir)
+{
+       if (nir->info.stage != MESA_SHADER_FRAGMENT)
+               return;
+
+       NIR_PASS_V(nir, nir_lower_io_to_temporaries,
+                  nir_shader_get_entrypoint(nir), false, true);
+
+       /* Since we're doing nir_lower_io_to_temporaries late, we need
+        * to lower all the copy_deref's introduced by
+        * lower_io_to_temporaries before calling nir_lower_io.
+        */
+       NIR_PASS_V(nir, nir_split_var_copies);
+       NIR_PASS_V(nir, nir_lower_var_copies);
+       NIR_PASS_V(nir, nir_lower_global_vars_to_local);
+
+       si_nir_lower_color(nir);
+       NIR_PASS_V(nir, nir_lower_io, nir_var_shader_in, type_size_vec4, 0);
+
+       /* This pass needs actual constants */
+       NIR_PASS_V(nir, nir_opt_constant_folding);
+       NIR_PASS_V(nir, nir_io_add_const_offset_to_base,
+                  nir_var_shader_in);
 }
 
-/**
- * Perform "lowering" operations on the NIR that are run once when the shader
- * selector is created.
- */
-void
-si_lower_nir(struct si_shader_selector* sel)
+void si_nir_adjust_driver_locations(struct nir_shader *nir)
 {
        /* Adjust the driver location of inputs and outputs. The state tracker
         * interprets them as slots, while the ac/nir backend interprets them
         * as individual components.
         */
-       nir_foreach_variable(variable, &sel->nir->inputs)
-               variable->data.driver_location *= 4;
+       if (nir->info.stage != MESA_SHADER_FRAGMENT) {
+               nir_foreach_variable(variable, &nir->inputs)
+                       variable->data.driver_location *= 4;
+       }
 
-       nir_foreach_variable(variable, &sel->nir->outputs) {
+       nir_foreach_variable(variable, &nir->outputs) {
                variable->data.driver_location *= 4;
 
-               if (sel->nir->info.stage == MESA_SHADER_FRAGMENT) {
+               if (nir->info.stage == MESA_SHADER_FRAGMENT) {
                        if (variable->data.location == FRAG_RESULT_DEPTH)
                                variable->data.driver_location += 2;
                        else if (variable->data.location == FRAG_RESULT_STENCIL)
                                variable->data.driver_location += 1;
                }
        }
+}
 
+/**
+ * Perform "lowering" operations on the NIR that are run once when the shader
+ * selector is created.
+ */
+static void si_lower_nir(struct si_screen *sscreen, struct nir_shader *nir)
+{
        /* Perform lowerings (and optimizations) of code.
         *
         * Performance considerations aside, we must:
@@ -801,15 +974,11 @@ si_lower_nir(struct si_shader_selector* sel)
         * - ensure constant offsets for texture instructions are folded
         *   and copy-propagated
         */
-       NIR_PASS_V(sel->nir, nir_lower_returns);
-       NIR_PASS_V(sel->nir, nir_lower_vars_to_ssa);
-       NIR_PASS_V(sel->nir, nir_lower_alu_to_scalar);
-       NIR_PASS_V(sel->nir, nir_lower_phis_to_scalar);
 
        static const struct nir_lower_tex_options lower_tex_options = {
                .lower_txp = ~0u,
        };
-       NIR_PASS_V(sel->nir, nir_lower_tex, &lower_tex_options);
+       NIR_PASS_V(nir, nir_lower_tex, &lower_tex_options);
 
        const nir_lower_subgroups_options subgroups_options = {
                .subgroup_size = 64,
@@ -819,42 +988,41 @@ si_lower_nir(struct si_shader_selector* sel)
                .lower_vote_trivial = false,
                .lower_vote_eq_to_ballot = true,
        };
-       NIR_PASS_V(sel->nir, nir_lower_subgroups, &subgroups_options);
-
-       ac_lower_indirect_derefs(sel->nir, sel->screen->info.chip_class);
-
-       NIR_PASS_V(sel->nir, nir_lower_load_const_to_scalar);
+       NIR_PASS_V(nir, nir_lower_subgroups, &subgroups_options);
+
+       /* Lower load constants to scalar and then clean up the mess */
+       NIR_PASS_V(nir, nir_lower_load_const_to_scalar);
+       NIR_PASS_V(nir, nir_lower_var_copies);
+       NIR_PASS_V(nir, nir_lower_pack);
+       NIR_PASS_V(nir, nir_opt_access);
+       si_nir_opts(nir);
+
+       /* Lower large variables that are always constant with load_constant
+        * intrinsics, which get turned into PC-relative loads from a data
+        * section next to the shader.
+        *
+        * st/mesa calls finalize_nir twice, but we can't call this pass twice.
+        */
+       if (!nir->constant_data) {
+               NIR_PASS_V(nir, nir_opt_large_constants,
+                          glsl_get_natural_size_align_bytes, 16);
+       }
 
-       bool progress;
-       do {
-               progress = false;
+       ac_lower_indirect_derefs(nir, sscreen->info.chip_class);
 
-               /* (Constant) copy propagation is needed for txf with offsets. */
-               NIR_PASS(progress, sel->nir, nir_copy_prop);
-               NIR_PASS(progress, sel->nir, nir_opt_remove_phis);
-               NIR_PASS(progress, sel->nir, nir_opt_dce);
-               if (nir_opt_trivial_continues(sel->nir)) {
-                       progress = true;
-                       NIR_PASS(progress, sel->nir, nir_copy_prop);
-                       NIR_PASS(progress, sel->nir, nir_opt_dce);
-               }
-               NIR_PASS(progress, sel->nir, nir_opt_if);
-               NIR_PASS(progress, sel->nir, nir_opt_dead_cf);
-               NIR_PASS(progress, sel->nir, nir_opt_cse);
-               NIR_PASS(progress, sel->nir, nir_opt_peephole_select, 8, true, true);
+       si_nir_opts(nir);
 
-               /* Needed for algebraic lowering */
-               NIR_PASS(progress, sel->nir, nir_opt_algebraic);
-               NIR_PASS(progress, sel->nir, nir_opt_constant_folding);
+       NIR_PASS_V(nir, nir_lower_bool_to_int32);
+}
 
-               NIR_PASS(progress, sel->nir, nir_opt_undef);
-               NIR_PASS(progress, sel->nir, nir_opt_conditional_discard);
-               if (sel->nir->options->max_unroll_iterations) {
-                       NIR_PASS(progress, sel->nir, nir_opt_loop_unroll, 0);
-               }
-       } while (progress);
+void si_finalize_nir(struct pipe_screen *screen, void *nirptr, bool optimize)
+{
+       struct si_screen *sscreen = (struct si_screen *)screen;
+       struct nir_shader *nir = (struct nir_shader *)nirptr;
 
-       NIR_PASS_V(sel->nir, nir_lower_bool_to_int32);
+       nir_shader_gather_info(nir, nir_shader_get_entrypoint(nir));
+       si_nir_lower_ps_inputs(nir);
+       si_lower_nir(sscreen, nir);
 }
 
 static void declare_nir_input_vs(struct si_shader_context *ctx,
@@ -865,30 +1033,11 @@ static void declare_nir_input_vs(struct si_shader_context *ctx,
        si_llvm_load_input_vs(ctx, input_index, out);
 }
 
-static void declare_nir_input_fs(struct si_shader_context *ctx,
-                                struct nir_variable *variable,
-                                unsigned input_index,
-                                LLVMValueRef out[4])
-{
-       unsigned slot = variable->data.location;
-       if (slot == VARYING_SLOT_POS) {
-               out[0] = LLVMGetParam(ctx->main_fn, SI_PARAM_POS_X_FLOAT);
-               out[1] = LLVMGetParam(ctx->main_fn, SI_PARAM_POS_Y_FLOAT);
-               out[2] = LLVMGetParam(ctx->main_fn, SI_PARAM_POS_Z_FLOAT);
-               out[3] = ac_build_fdiv(&ctx->ac, ctx->ac.f32_1,
-                               LLVMGetParam(ctx->main_fn, SI_PARAM_POS_W_FLOAT));
-               return;
-       }
-
-       si_llvm_load_input_fs(ctx, input_index, out);
-}
-
 LLVMValueRef
 si_nir_lookup_interp_param(struct ac_shader_abi *abi,
                           enum glsl_interp_mode interp, unsigned location)
 {
        struct si_shader_context *ctx = si_shader_context_from_abi(abi);
-       int interp_param_idx = -1;
 
        switch (interp) {
        case INTERP_MODE_FLAT:
@@ -896,27 +1045,24 @@ si_nir_lookup_interp_param(struct ac_shader_abi *abi,
        case INTERP_MODE_SMOOTH:
        case INTERP_MODE_NONE:
                if (location == INTERP_CENTER)
-                       interp_param_idx = SI_PARAM_PERSP_CENTER;
+                       return ctx->abi.persp_center;
                else if (location == INTERP_CENTROID)
-                       interp_param_idx = SI_PARAM_PERSP_CENTROID;
+                       return ctx->abi.persp_centroid;
                else if (location == INTERP_SAMPLE)
-                       interp_param_idx = SI_PARAM_PERSP_SAMPLE;
+                       return ctx->abi.persp_sample;
                break;
        case INTERP_MODE_NOPERSPECTIVE:
                if (location == INTERP_CENTER)
-                       interp_param_idx = SI_PARAM_LINEAR_CENTER;
+                       return ctx->abi.linear_center;
                else if (location == INTERP_CENTROID)
-                       interp_param_idx = SI_PARAM_LINEAR_CENTROID;
+                       return ctx->abi.linear_centroid;
                else if (location == INTERP_SAMPLE)
-                       interp_param_idx = SI_PARAM_LINEAR_SAMPLE;
+                       return ctx->abi.linear_sample;
                break;
        default:
                assert(!"Unhandled interpolation mode.");
-               return NULL;
        }
-
-       return interp_param_idx != -1 ?
-               LLVMGetParam(ctx->main_fn, interp_param_idx) : NULL;
+       return NULL;
 }
 
 static LLVMValueRef
@@ -927,18 +1073,11 @@ si_nir_load_sampler_desc(struct ac_shader_abi *abi,
                         bool write, bool bindless)
 {
        struct si_shader_context *ctx = si_shader_context_from_abi(abi);
-       const struct tgsi_shader_info *info = &ctx->shader->selector->info;
        LLVMBuilderRef builder = ctx->ac.builder;
        unsigned const_index = base_index + constant_index;
-       bool dcc_off = write;
-
-       /* TODO: images_store and images_atomic are not set */
-       if (!dynamic_index && image &&
-           (info->images_store | info->images_atomic) & (1 << const_index))
-               dcc_off = true;
 
        assert(!descriptor_set);
-       assert(!image || desc_type == AC_DESC_IMAGE || desc_type == AC_DESC_BUFFER);
+       assert(desc_type <= AC_DESC_BUFFER);
 
        if (bindless) {
                LLVMValueRef list =
@@ -946,8 +1085,17 @@ si_nir_load_sampler_desc(struct ac_shader_abi *abi,
 
                /* dynamic_index is the bindless handle */
                if (image) {
+                       /* Bindless image descriptors use 16-dword slots. */
+                       dynamic_index = LLVMBuildMul(ctx->ac.builder, dynamic_index,
+                                            LLVMConstInt(ctx->i64, 2, 0), "");
+                       /* FMASK is right after the image. */
+                       if (desc_type == AC_DESC_FMASK) {
+                               dynamic_index = LLVMBuildAdd(ctx->ac.builder, dynamic_index,
+                                                            ctx->i32_1, "");
+                       }
+
                        return si_load_image_desc(ctx, list, dynamic_index, desc_type,
-                                                 dcc_off, true);
+                                                 write, true);
                }
 
                /* Since bindless handle arithmetic can contain an unsigned integer
@@ -956,13 +1104,13 @@ si_nir_load_sampler_desc(struct ac_shader_abi *abi,
                 * to prevent incorrect code generation and hangs.
                 */
                dynamic_index = LLVMBuildMul(ctx->ac.builder, dynamic_index,
-                                            LLVMConstInt(ctx->i32, 2, 0), "");
+                                            LLVMConstInt(ctx->i64, 2, 0), "");
                list = ac_build_pointer_add(&ctx->ac, list, dynamic_index);
                return si_load_sampler_desc(ctx, list, ctx->i32_0, desc_type);
        }
 
        unsigned num_slots = image ? ctx->num_images : ctx->num_samplers;
-       assert(const_index < num_slots);
+       assert(const_index < num_slots || dynamic_index);
 
        LLVMValueRef list = LLVMGetParam(ctx->main_fn, ctx->param_samplers_and_images);
        LLVMValueRef index = LLVMConstInt(ctx->ac.i32, const_index, false);
@@ -983,14 +1131,19 @@ si_nir_load_sampler_desc(struct ac_shader_abi *abi,
        }
 
        if (image) {
+               /* FMASKs are separate from images. */
+               if (desc_type == AC_DESC_FMASK) {
+                       index = LLVMBuildAdd(ctx->ac.builder, index,
+                                            LLVMConstInt(ctx->i32, SI_NUM_IMAGES, 0), "");
+               }
                index = LLVMBuildSub(ctx->ac.builder,
-                                    LLVMConstInt(ctx->i32, SI_NUM_IMAGES - 1, 0),
+                                    LLVMConstInt(ctx->i32, SI_NUM_IMAGE_SLOTS - 1, 0),
                                     index, "");
-               return si_load_image_desc(ctx, list, index, desc_type, dcc_off, false);
+               return si_load_image_desc(ctx, list, index, desc_type, write, false);
        }
 
        index = LLVMBuildAdd(ctx->ac.builder, index,
-                            LLVMConstInt(ctx->i32, SI_NUM_IMAGES / 2, 0), "");
+                            LLVMConstInt(ctx->i32, SI_NUM_IMAGE_SLOTS / 2, 0), "");
        return si_load_sampler_desc(ctx, list, index, desc_type);
 }
 
@@ -1008,12 +1161,11 @@ bool si_nir_build_llvm(struct si_shader_context *ctx, struct nir_shader *nir)
 {
        struct tgsi_shader_info *info = &ctx->shader->selector->info;
 
-       if (nir->info.stage == MESA_SHADER_VERTEX ||
-           nir->info.stage == MESA_SHADER_FRAGMENT) {
+       if (nir->info.stage == MESA_SHADER_VERTEX) {
                uint64_t processed_inputs = 0;
                nir_foreach_variable(variable, &nir->inputs) {
                        unsigned attrib_count = glsl_count_attribute_slots(variable->type,
-                                                                          nir->info.stage == MESA_SHADER_VERTEX);
+                                                                          true);
                        unsigned input_idx = variable->data.driver_location;
 
                        LLVMValueRef data[4];
@@ -1028,34 +1180,70 @@ bool si_nir_build_llvm(struct si_shader_context *ctx, struct nir_shader *nir)
                                        continue;
                                }
 
-                               if (nir->info.stage == MESA_SHADER_VERTEX) {
+                               declare_nir_input_vs(ctx, variable, input_idx / 4, data);
+                               bitcast_inputs(ctx, data, input_idx);
+                               if (glsl_type_is_dual_slot(variable->type)) {
+                                       input_idx += 4;
                                        declare_nir_input_vs(ctx, variable, input_idx / 4, data);
                                        bitcast_inputs(ctx, data, input_idx);
-                                       if (glsl_type_is_dual_slot(variable->type)) {
-                                               input_idx += 4;
-                                               declare_nir_input_vs(ctx, variable, input_idx / 4, data);
-                                               bitcast_inputs(ctx, data, input_idx);
-                                       }
-                               } else if (nir->info.stage == MESA_SHADER_FRAGMENT) {
-                                       declare_nir_input_fs(ctx, variable, input_idx / 4, data);
-                                       bitcast_inputs(ctx, data, input_idx);
                                }
 
                                processed_inputs |= ((uint64_t)1 << (loc + i));
                                input_idx += 4;
                        }
                }
+       } else if (nir->info.stage == MESA_SHADER_FRAGMENT) {
+                unsigned colors_read =
+                        ctx->shader->selector->info.colors_read;
+                LLVMValueRef main_fn = ctx->main_fn;
+
+                LLVMValueRef undef = LLVMGetUndef(ctx->f32);
+
+                unsigned offset = SI_PARAM_POS_FIXED_PT + 1;
+
+                if (colors_read & 0x0f) {
+                        unsigned mask = colors_read & 0x0f;
+                        LLVMValueRef values[4];
+                        values[0] = mask & 0x1 ? LLVMGetParam(main_fn, offset++) : undef;
+                        values[1] = mask & 0x2 ? LLVMGetParam(main_fn, offset++) : undef;
+                        values[2] = mask & 0x4 ? LLVMGetParam(main_fn, offset++) : undef;
+                        values[3] = mask & 0x8 ? LLVMGetParam(main_fn, offset++) : undef;
+                        ctx->abi.color0 =
+                                ac_to_integer(&ctx->ac,
+                                              ac_build_gather_values(&ctx->ac, values, 4));
+                }
+                if (colors_read & 0xf0) {
+                        unsigned mask = (colors_read & 0xf0) >> 4;
+                        LLVMValueRef values[4];
+                        values[0] = mask & 0x1 ? LLVMGetParam(main_fn, offset++) : undef;
+                        values[1] = mask & 0x2 ? LLVMGetParam(main_fn, offset++) : undef;
+                        values[2] = mask & 0x4 ? LLVMGetParam(main_fn, offset++) : undef;
+                        values[3] = mask & 0x8 ? LLVMGetParam(main_fn, offset++) : undef;
+                        ctx->abi.color1 =
+                                ac_to_integer(&ctx->ac,
+                                              ac_build_gather_values(&ctx->ac, values, 4));
+                }
+
+               ctx->abi.interp_at_sample_force_center =
+                       ctx->shader->key.mono.u.ps.interpolate_at_sample_force_center;
+       } else if (nir->info.stage == MESA_SHADER_COMPUTE) {
+               if (nir->info.cs.user_data_components_amd) {
+                       ctx->abi.user_data = LLVMGetParam(ctx->main_fn, ctx->param_cs_user_data);
+                       ctx->abi.user_data = ac_build_expand_to_vec4(&ctx->ac, ctx->abi.user_data,
+                                                                    nir->info.cs.user_data_components_amd);
+               }
        }
 
        ctx->abi.inputs = &ctx->inputs[0];
        ctx->abi.load_sampler_desc = si_nir_load_sampler_desc;
        ctx->abi.clamp_shadow_reference = true;
+       ctx->abi.robust_buffer_access = true;
 
        ctx->num_samplers = util_last_bit(info->samplers_declared);
        ctx->num_images = util_last_bit(info->images_declared);
 
        if (ctx->shader->selector->info.properties[TGSI_PROPERTY_CS_LOCAL_SIZE]) {
-               assert(nir->info.stage == MESA_SHADER_COMPUTE);
+               assert(gl_shader_stage_is_compute(nir->info.stage));
                si_declare_compute_memory(ctx);
        }
        ac_nir_translate(&ctx->ac, &ctx->abi, nir);