radeonsi: move si_shader_binary_upload out of si_compile_llvm
[mesa.git] / src / gallium / drivers / radeonsi / si_shader.c
index fa31f734ff23325b282a889a6d90163198004ebe..2a206dd62908f03ec07d16d6d3e1dcd4f087d9cb 100644 (file)
@@ -31,6 +31,7 @@
 #include "gallivm/lp_bld_intr.h"
 #include "gallivm/lp_bld_logic.h"
 #include "gallivm/lp_bld_arit.h"
+#include "gallivm/lp_bld_bitarit.h"
 #include "gallivm/lp_bld_flow.h"
 #include "radeon/r600_cs.h"
 #include "radeon/radeon_llvm.h"
@@ -72,6 +73,7 @@ struct si_shader_context
        int param_streamout_offset[4];
        int param_vertex_id;
        int param_rel_auto_id;
+       int param_vs_prim_id;
        int param_instance_id;
        int param_tes_u;
        int param_tes_v;
@@ -80,15 +82,15 @@ struct si_shader_context
        int param_es2gs_offset;
        LLVMTargetMachineRef tm;
        LLVMValueRef const_md;
-       LLVMValueRef const_resource[SI_NUM_CONST_BUFFERS];
+       LLVMValueRef const_buffers[SI_NUM_CONST_BUFFERS];
        LLVMValueRef lds;
        LLVMValueRef *constants[SI_NUM_CONST_BUFFERS];
-       LLVMValueRef resources[SI_NUM_SAMPLER_VIEWS];
-       LLVMValueRef samplers[SI_NUM_SAMPLER_STATES];
+       LLVMValueRef sampler_views[SI_NUM_SAMPLER_VIEWS];
+       LLVMValueRef sampler_states[SI_NUM_SAMPLER_STATES];
        LLVMValueRef so_buffers[4];
        LLVMValueRef esgs_ring;
-       LLVMValueRef gsvs_ring;
-       LLVMValueRef gs_next_vertex;
+       LLVMValueRef gsvs_ring[4];
+       LLVMValueRef gs_next_vertex[4];
 };
 
 static struct si_shader_context * si_shader_context(
@@ -135,8 +137,13 @@ unsigned si_shader_io_get_unique_index(unsigned semantic_name, unsigned index)
                assert(index <= 1);
                return 2 + index;
        case TGSI_SEMANTIC_GENERIC:
-               assert(index <= 63-4);
-               return 4 + index;
+               if (index <= 63-4)
+                       return 4 + index;
+               else
+                       /* same explanation as in the default statement,
+                        * the only user hitting this is st/nine.
+                        */
+                       return 0;
 
        /* patch indices are completely separate and thus start from 0 */
        case TGSI_SEMANTIC_TESSOUTER:
@@ -156,49 +163,6 @@ unsigned si_shader_io_get_unique_index(unsigned semantic_name, unsigned index)
        }
 }
 
-/**
- * Given a semantic name and index of a parameter and a mask of used parameters
- * (inputs or outputs), return the index of the parameter in the list of all
- * used parameters.
- *
- * For example, assume this list of parameters:
- *   POSITION, PSIZE, GENERIC0, GENERIC2
- * which has the mask:
- *   11000000000101
- * Then:
- *   querying POSITION returns 0,
- *   querying PSIZE returns 1,
- *   querying GENERIC0 returns 2,
- *   querying GENERIC2 returns 3.
- *
- * Which can be used as an offset to a parameter buffer in units of vec4s.
- */
-static int get_param_index(unsigned semantic_name, unsigned index,
-                          uint64_t mask)
-{
-       unsigned unique_index = si_shader_io_get_unique_index(semantic_name, index);
-       int i, param_index = 0;
-
-       /* If not present... */
-       if (!((1llu << unique_index) & mask))
-               return -1;
-
-       for (i = 0; mask; i++) {
-               uint64_t bit = 1llu << i;
-
-               if (bit & mask) {
-                       if (i == unique_index)
-                               return param_index;
-
-                       mask &= ~bit;
-                       param_index++;
-               }
-       }
-
-       assert(!"unreachable");
-       return -1;
-}
-
 /**
  * Get the value of a shader input parameter and extract a bitfield.
  */
@@ -430,7 +394,7 @@ static void declare_input_vs(
        LLVMValueRef input;
 
        /* Load the T list */
-       t_list_ptr = LLVMGetParam(si_shader_ctx->radeon_bld.main_fn, SI_PARAM_VERTEX_BUFFER);
+       t_list_ptr = LLVMGetParam(si_shader_ctx->radeon_bld.main_fn, SI_PARAM_VERTEX_BUFFERS);
 
        t_offset = lp_build_const_int32(gallivm, input_index);
 
@@ -456,7 +420,7 @@ static void declare_input_vs(
        args[0] = t_list;
        args[1] = attribute_offset;
        args[2] = buffer_index;
-       input = build_intrinsic(gallivm->builder,
+       input = lp_build_intrinsic(gallivm->builder,
                "llvm.SI.vs.load.input", vec4_type, args, 3,
                LLVMReadNoneAttribute | LLVMNoUnwindAttribute);
 
@@ -480,6 +444,9 @@ static LLVMValueRef get_primitive_id(struct lp_build_tgsi_context *bld_base,
                return bld_base->uint_bld.zero;
 
        switch (si_shader_ctx->type) {
+       case TGSI_PROCESSOR_VERTEX:
+               return LLVMGetParam(si_shader_ctx->radeon_bld.main_fn,
+                                   si_shader_ctx->param_vs_prim_id);
        case TGSI_PROCESSOR_TESS_CTRL:
                return LLVMGetParam(si_shader_ctx->radeon_bld.main_fn,
                                    SI_PARAM_PATCH_ID);
@@ -627,6 +594,14 @@ static LLVMValueRef lds_load(struct lp_build_tgsi_context *bld_base,
                            lp_build_const_int32(gallivm, swizzle));
 
        value = build_indexed_load(si_shader_ctx, si_shader_ctx->lds, dw_addr);
+       if (type == TGSI_TYPE_DOUBLE) {
+               LLVMValueRef value2;
+               dw_addr = lp_build_add(&bld_base->uint_bld, dw_addr,
+                                      lp_build_const_int32(gallivm, swizzle + 1));
+               value2 = build_indexed_load(si_shader_ctx, si_shader_ctx->lds, dw_addr);
+               return radeon_llvm_emit_fetch_double(bld_base, value, value2);
+       }
+
        return LLVMBuildBitCast(gallivm->builder, value,
                                tgsi2llvmtype(bld_base, type), "");
 }
@@ -675,18 +650,8 @@ static LLVMValueRef fetch_output_tcs(
                enum tgsi_opcode_type type, unsigned swizzle)
 {
        struct si_shader_context *si_shader_ctx = si_shader_context(bld_base);
-       struct si_shader *shader = si_shader_ctx->shader;
-       struct tgsi_shader_info *info = &shader->selector->info;
-       unsigned name = info->output_semantic_name[reg->Register.Index];
        LLVMValueRef dw_addr, stride;
 
-       /* Just read the local temp "output" register to get TESSOUTER/INNER. */
-       if (!reg->Register.Indirect &&
-           (name == TGSI_SEMANTIC_TESSOUTER ||
-            name == TGSI_SEMANTIC_TESSINNER)) {
-               return radeon_llvm_emit_fetch(bld_base, reg, type, swizzle);
-       }
-
        if (reg->Register.Dimension) {
                stride = unpack_param(si_shader_ctx, SI_PARAM_TCS_OUT_LAYOUT, 13, 8);
                dw_addr = get_tcs_out_current_patch_offset(si_shader_ctx);
@@ -725,8 +690,6 @@ static void store_output_tcs(struct lp_build_tgsi_context * bld_base,
                             LLVMValueRef dst[4])
 {
        struct si_shader_context *si_shader_ctx = si_shader_context(bld_base);
-       struct si_shader *shader = si_shader_ctx->shader;
-       struct tgsi_shader_info *sinfo = &shader->selector->info;
        const struct tgsi_full_dst_register *reg = &inst->Dst[0];
        unsigned chan_index;
        LLVMValueRef dw_addr, stride;
@@ -740,14 +703,6 @@ static void store_output_tcs(struct lp_build_tgsi_context * bld_base,
                return;
        }
 
-       /* Write tessellation levels to "output" temp registers.
-        * Also write them to LDS as per-patch outputs (below).
-        */
-       if (!reg->Register.Indirect &&
-           (sinfo->output_semantic_name[reg->Register.Index] == TGSI_SEMANTIC_TESSINNER ||
-             sinfo->output_semantic_name[reg->Register.Index] == TGSI_SEMANTIC_TESSOUTER))
-               radeon_llvm_emit_store(bld_base, inst, info, dst);
-
        if (reg->Register.Dimension) {
                stride = unpack_param(si_shader_ctx, SI_PARAM_TCS_OUT_LAYOUT, 13, 8);
                dw_addr = get_tcs_out_current_patch_offset(si_shader_ctx);
@@ -785,6 +740,8 @@ static LLVMValueRef fetch_input_gs(
        struct tgsi_shader_info *info = &shader->selector->info;
        unsigned semantic_name = info->input_semantic_name[reg->Register.Index];
        unsigned semantic_index = info->input_semantic_index[reg->Register.Index];
+       unsigned param;
+       LLVMValueRef value;
 
        if (swizzle != ~0 && semantic_name == TGSI_SEMANTIC_PRIMID)
                return get_primitive_id(bld_base, swizzle);
@@ -815,12 +772,10 @@ static LLVMValueRef fetch_input_gs(
                                                   vtx_offset_param),
                                      4);
 
+       param = si_shader_io_get_unique_index(semantic_name, semantic_index);
        args[0] = si_shader_ctx->esgs_ring;
        args[1] = vtx_offset;
-       args[2] = lp_build_const_int32(gallivm,
-                                      (get_param_index(semantic_name, semantic_index,
-                                                       shader->selector->inputs_read) * 4 +
-                                       swizzle) * 256);
+       args[2] = lp_build_const_int32(gallivm, (param * 4 + swizzle) * 256);
        args[3] = uint->zero;
        args[4] = uint->one;  /* OFFEN */
        args[5] = uint->zero; /* IDXEN */
@@ -828,11 +783,22 @@ static LLVMValueRef fetch_input_gs(
        args[7] = uint->zero; /* SLC */
        args[8] = uint->zero; /* TFE */
 
+       value = lp_build_intrinsic(gallivm->builder,
+                                  "llvm.SI.buffer.load.dword.i32.i32",
+                                  i32, args, 9,
+                                  LLVMReadOnlyAttribute | LLVMNoUnwindAttribute);
+       if (type == TGSI_TYPE_DOUBLE) {
+               LLVMValueRef value2;
+               args[2] = lp_build_const_int32(gallivm, (param * 4 + swizzle + 1) * 256);
+               value2 = lp_build_intrinsic(gallivm->builder,
+                                           "llvm.SI.buffer.load.dword.i32.i32",
+                                           i32, args, 9,
+                                           LLVMReadOnlyAttribute | LLVMNoUnwindAttribute);
+               return radeon_llvm_emit_fetch_double(bld_base,
+                                                    value, value2);
+       }
        return LLVMBuildBitCast(gallivm->builder,
-                               build_intrinsic(gallivm->builder,
-                                               "llvm.SI.buffer.load.dword.i32.i32",
-                                               i32, args, 9,
-                                               LLVMReadOnlyAttribute | LLVMNoUnwindAttribute),
+                               value,
                                tgsi2llvmtype(bld_base, type), "");
 }
 
@@ -865,6 +831,56 @@ static int lookup_interp_param_index(unsigned interpolate, unsigned location)
        }
 }
 
+/* This shouldn't be used by explicit INTERP opcodes. */
+static LLVMValueRef get_interp_param(struct si_shader_context *si_shader_ctx,
+                                    unsigned param)
+{
+       struct gallivm_state *gallivm = &si_shader_ctx->radeon_bld.gallivm;
+       unsigned sample_param = 0;
+       LLVMValueRef default_ij, sample_ij, force_sample;
+
+       default_ij = LLVMGetParam(si_shader_ctx->radeon_bld.main_fn, param);
+
+       /* If the shader doesn't use center/centroid, just return the parameter.
+        *
+        * If the shader only uses one set of (i,j), "si_emit_spi_ps_input" can
+        * switch between center/centroid and sample without shader changes.
+        */
+       switch (param) {
+       case SI_PARAM_PERSP_CENTROID:
+       case SI_PARAM_PERSP_CENTER:
+               if (!si_shader_ctx->shader->selector->forces_persample_interp_for_persp)
+                       return default_ij;
+
+               sample_param = SI_PARAM_PERSP_SAMPLE;
+               break;
+
+       case SI_PARAM_LINEAR_CENTROID:
+       case SI_PARAM_LINEAR_CENTER:
+               if (!si_shader_ctx->shader->selector->forces_persample_interp_for_linear)
+                       return default_ij;
+
+               sample_param = SI_PARAM_LINEAR_SAMPLE;
+               break;
+
+       default:
+               return default_ij;
+       }
+
+       /* Otherwise, we have to select (i,j) based on a user data SGPR. */
+       sample_ij = LLVMGetParam(si_shader_ctx->radeon_bld.main_fn, sample_param);
+
+       /* TODO: this can be done more efficiently by switching between
+        * 2 prologs.
+        */
+       force_sample = LLVMGetParam(si_shader_ctx->radeon_bld.main_fn,
+                                   SI_PARAM_PS_STATE_BITS);
+       force_sample = LLVMBuildTrunc(gallivm->builder, force_sample,
+                                     LLVMInt1TypeInContext(gallivm->context), "");
+       return LLVMBuildSelect(gallivm->builder, force_sample,
+                              sample_ij, default_ij, "");
+}
+
 static void declare_input_fs(
        struct radeon_llvm_context *radeon_bld,
        unsigned input_index,
@@ -935,7 +951,7 @@ static void declare_input_fs(
        if (interp_param_idx == -1)
                return;
        else if (interp_param_idx)
-               interp_param = LLVMGetParam(main_fn, interp_param_idx);
+               interp_param = get_interp_param(si_shader_ctx, interp_param_idx);
 
        /* fs.constant returns the param from the middle vertex, so it's not
         * really useful for flat shading. It's meant to be used for custom
@@ -973,12 +989,12 @@ static void declare_input_fs(
 
                        args[0] = llvm_chan;
                        args[1] = attr_number;
-                       front = build_intrinsic(gallivm->builder, intr_name,
+                       front = lp_build_intrinsic(gallivm->builder, intr_name,
                                                input_type, args, args[3] ? 4 : 3,
                                                LLVMReadNoneAttribute | LLVMNoUnwindAttribute);
 
                        args[1] = back_attr_number;
-                       back = build_intrinsic(gallivm->builder, intr_name,
+                       back = lp_build_intrinsic(gallivm->builder, intr_name,
                                               input_type, args, args[3] ? 4 : 3,
                                               LLVMReadNoneAttribute | LLVMNoUnwindAttribute);
 
@@ -999,7 +1015,7 @@ static void declare_input_fs(
                args[2] = params;
                args[3] = interp_param;
                radeon_bld->inputs[radeon_llvm_reg_index_soa(input_index, 0)] =
-                       build_intrinsic(gallivm->builder, intr_name,
+                       lp_build_intrinsic(gallivm->builder, intr_name,
                                        input_type, args, args[3] ? 4 : 3,
                                        LLVMReadNoneAttribute | LLVMNoUnwindAttribute);
                radeon_bld->inputs[radeon_llvm_reg_index_soa(input_index, 1)] =
@@ -1017,7 +1033,7 @@ static void declare_input_fs(
                        args[2] = params;
                        args[3] = interp_param;
                        radeon_bld->inputs[soa_index] =
-                               build_intrinsic(gallivm->builder, intr_name,
+                               lp_build_intrinsic(gallivm->builder, intr_name,
                                                input_type, args, args[3] ? 4 : 3,
                                                LLVMReadNoneAttribute | LLVMNoUnwindAttribute);
                }
@@ -1038,7 +1054,7 @@ static LLVMValueRef buffer_load_const(LLVMBuilderRef builder, LLVMValueRef resou
 {
        LLVMValueRef args[2] = {resource, offset};
 
-       return build_intrinsic(builder, "llvm.SI.load.const", return_type, args, 2,
+       return lp_build_intrinsic(builder, "llvm.SI.load.const", return_type, args, 2,
                               LLVMReadNoneAttribute | LLVMNoUnwindAttribute);
 }
 
@@ -1049,7 +1065,7 @@ static LLVMValueRef load_sample_position(struct radeon_llvm_context *radeon_bld,
        struct lp_build_context *uint_bld = &radeon_bld->soa.bld_base.uint_bld;
        struct gallivm_state *gallivm = &radeon_bld->gallivm;
        LLVMBuilderRef builder = gallivm->builder;
-       LLVMValueRef desc = LLVMGetParam(si_shader_ctx->radeon_bld.main_fn, SI_PARAM_CONST);
+       LLVMValueRef desc = LLVMGetParam(si_shader_ctx->radeon_bld.main_fn, SI_PARAM_CONST_BUFFERS);
        LLVMValueRef buf_index = lp_build_const_int32(gallivm, SI_DRIVER_STATE_CONST_BUF);
        LLVMValueRef resource = build_indexed_load_const(si_shader_ctx, desc, buf_index);
 
@@ -1217,13 +1233,13 @@ static LLVMValueRef fetch_constant(
        }
 
        if (reg->Register.Dimension && reg->Dimension.Indirect) {
-               LLVMValueRef ptr = LLVMGetParam(si_shader_ctx->radeon_bld.main_fn, SI_PARAM_CONST);
+               LLVMValueRef ptr = LLVMGetParam(si_shader_ctx->radeon_bld.main_fn, SI_PARAM_CONST_BUFFERS);
                LLVMValueRef index;
                index = get_indirect_index(si_shader_ctx, &reg->DimIndirect,
                                                   reg->Dimension.Index);
                bufp = build_indexed_load_const(si_shader_ctx, ptr, index);
        } else
-               bufp = si_shader_ctx->const_resource[buf];
+               bufp = si_shader_ctx->const_buffers[buf];
 
        addr = si_shader_ctx->radeon_bld.soa.addr[ireg->Index][ireg->Swizzle];
        addr = LLVMBuildLoad(base->gallivm->builder, addr, "load addr reg");
@@ -1244,7 +1260,7 @@ static LLVMValueRef fetch_constant(
                addr2 = lp_build_add(&bld_base->uint_bld, addr2,
                                     lp_build_const_int32(base->gallivm, idx * 4));
 
-               result2 = buffer_load_const(base->gallivm->builder, si_shader_ctx->const_resource[buf],
+               result2 = buffer_load_const(base->gallivm->builder, si_shader_ctx->const_buffers[buf],
                                   addr2, bld_base->base.elem_type);
 
                result = radeon_llvm_emit_fetch_double(bld_base,
@@ -1266,58 +1282,12 @@ static void si_llvm_init_export_args(struct lp_build_tgsi_context *bld_base,
        unsigned compressed = 0;
        unsigned chan;
 
-       if (si_shader_ctx->type == TGSI_PROCESSOR_FRAGMENT) {
-               int cbuf = target - V_008DFC_SQ_EXP_MRT;
-
-               if (cbuf >= 0 && cbuf < 8) {
-                       compressed = (si_shader_ctx->shader->key.ps.export_16bpc >> cbuf) & 0x1;
-
-                       if (compressed)
-                               si_shader_ctx->shader->spi_shader_col_format |=
-                                       V_028714_SPI_SHADER_FP16_ABGR << (4 * cbuf);
-                       else
-                               si_shader_ctx->shader->spi_shader_col_format |=
-                                       V_028714_SPI_SHADER_32_ABGR << (4 * cbuf);
-
-                       si_shader_ctx->shader->cb_shader_mask |= 0xf << (4 * cbuf);
-               }
-       }
-
-       if (compressed) {
-               /* Pixel shader needs to pack output values before export */
-               for (chan = 0; chan < 2; chan++ ) {
-                       args[0] = values[2 * chan];
-                       args[1] = values[2 * chan + 1];
-                       args[chan + 5] =
-                               build_intrinsic(base->gallivm->builder,
-                                               "llvm.SI.packf16",
-                                               LLVMInt32TypeInContext(base->gallivm->context),
-                                               args, 2,
-                                               LLVMReadNoneAttribute | LLVMNoUnwindAttribute);
-                       args[chan + 7] = args[chan + 5] =
-                               LLVMBuildBitCast(base->gallivm->builder,
-                                                args[chan + 5],
-                                                LLVMFloatTypeInContext(base->gallivm->context),
-                                                "");
-               }
-
-               /* Set COMPR flag */
-               args[4] = uint->one;
-       } else {
-               for (chan = 0; chan < 4; chan++ )
-                       /* +5 because the first output value will be
-                        * the 6th argument to the intrinsic. */
-                       args[chan + 5] = values[chan];
-
-               /* Clear COMPR flag */
-               args[4] = uint->zero;
-       }
-
        /* XXX: This controls which components of the output
         * registers actually get exported. (e.g bit 0 means export
         * X component, bit 1 means export Y component, etc.)  I'm
         * hard coding this to 0xf for now.  In the future, we might
-        * want to do something else. */
+        * want to do something else.
+        */
        args[0] = lp_build_const_int32(base->gallivm, 0xf);
 
        /* Specify whether the EXEC mask represents the valid mask */
@@ -1329,29 +1299,43 @@ static void si_llvm_init_export_args(struct lp_build_tgsi_context *bld_base,
        /* Specify the target we are exporting */
        args[3] = lp_build_const_int32(base->gallivm, target);
 
-       /* XXX: We probably need to keep track of the output
-        * values, so we know what we are passing to the next
-        * stage. */
-}
+       if (si_shader_ctx->type == TGSI_PROCESSOR_FRAGMENT) {
+               int cbuf = target - V_008DFC_SQ_EXP_MRT;
 
-/* Load from output pointers and initialize arguments for the shader export intrinsic */
-static void si_llvm_init_export_args_load(struct lp_build_tgsi_context *bld_base,
-                                         LLVMValueRef *out_ptr,
-                                         unsigned target,
-                                         LLVMValueRef *args)
-{
-       struct gallivm_state *gallivm = bld_base->base.gallivm;
-       LLVMValueRef values[4];
-       int i;
+               if (cbuf >= 0 && cbuf < 8)
+                       compressed = (si_shader_ctx->shader->key.ps.export_16bpc >> cbuf) & 0x1;
+       }
 
-       for (i = 0; i < 4; i++)
-               values[i] = LLVMBuildLoad(gallivm->builder, out_ptr[i], "");
+       /* Set COMPR flag */
+       args[4] = compressed ? uint->one : uint->zero;
 
-       si_llvm_init_export_args(bld_base, values, target, args);
+       if (compressed) {
+               /* Pixel shader needs to pack output values before export */
+               for (chan = 0; chan < 2; chan++) {
+                       LLVMValueRef pack_args[2] = {
+                               values[2 * chan],
+                               values[2 * chan + 1]
+                       };
+                       LLVMValueRef packed;
+
+                       packed = lp_build_intrinsic(base->gallivm->builder,
+                                                   "llvm.SI.packf16",
+                                                   LLVMInt32TypeInContext(base->gallivm->context),
+                                                   pack_args, 2,
+                                                   LLVMReadNoneAttribute | LLVMNoUnwindAttribute);
+                       args[chan + 5] =
+                               LLVMBuildBitCast(base->gallivm->builder,
+                                                packed,
+                                                LLVMFloatTypeInContext(base->gallivm->context),
+                                                "");
+                       args[chan + 7] = base->undef;
+               }
+       } else
+               memcpy(&args[5], values, sizeof(values[0]) * 4);
 }
 
 static void si_alpha_test(struct lp_build_tgsi_context *bld_base,
-                         LLVMValueRef alpha_ptr)
+                         LLVMValueRef alpha)
 {
        struct si_shader_context *si_shader_ctx = si_shader_context(bld_base);
        struct gallivm_state *gallivm = bld_base->base.gallivm;
@@ -1363,41 +1347,38 @@ static void si_alpha_test(struct lp_build_tgsi_context *bld_base,
                LLVMValueRef alpha_pass =
                        lp_build_cmp(&bld_base->base,
                                     si_shader_ctx->shader->key.ps.alpha_func,
-                                    LLVMBuildLoad(gallivm->builder, alpha_ptr, ""),
-                                    alpha_ref);
+                                    alpha, alpha_ref);
                LLVMValueRef arg =
                        lp_build_select(&bld_base->base,
                                        alpha_pass,
                                        lp_build_const_float(gallivm, 1.0f),
                                        lp_build_const_float(gallivm, -1.0f));
 
-               build_intrinsic(gallivm->builder,
+               lp_build_intrinsic(gallivm->builder,
                                "llvm.AMDGPU.kill",
                                LLVMVoidTypeInContext(gallivm->context),
                                &arg, 1, 0);
        } else {
-               build_intrinsic(gallivm->builder,
+               lp_build_intrinsic(gallivm->builder,
                                "llvm.AMDGPU.kilp",
                                LLVMVoidTypeInContext(gallivm->context),
                                NULL, 0, 0);
        }
-
-       si_shader_ctx->shader->db_shader_control |= S_02880C_KILL_ENABLE(1);
 }
 
-static void si_scale_alpha_by_sample_mask(struct lp_build_tgsi_context *bld_base,
-                                         LLVMValueRef alpha_ptr)
+static LLVMValueRef si_scale_alpha_by_sample_mask(struct lp_build_tgsi_context *bld_base,
+                                                 LLVMValueRef alpha)
 {
        struct si_shader_context *si_shader_ctx = si_shader_context(bld_base);
        struct gallivm_state *gallivm = bld_base->base.gallivm;
-       LLVMValueRef coverage, alpha;
+       LLVMValueRef coverage;
 
        /* alpha = alpha * popcount(coverage) / SI_NUM_SMOOTH_AA_SAMPLES */
        coverage = LLVMGetParam(si_shader_ctx->radeon_bld.main_fn,
                                SI_PARAM_SAMPLE_COVERAGE);
        coverage = bitcast(bld_base, TGSI_TYPE_SIGNED, coverage);
 
-       coverage = build_intrinsic(gallivm->builder, "llvm.ctpop.i32",
+       coverage = lp_build_intrinsic(gallivm->builder, "llvm.ctpop.i32",
                                   bld_base->int_bld.elem_type,
                                   &coverage, 1, LLVMReadNoneAttribute);
 
@@ -1408,9 +1389,7 @@ static void si_scale_alpha_by_sample_mask(struct lp_build_tgsi_context *bld_base
                                 lp_build_const_float(gallivm,
                                        1.0 / SI_NUM_SMOOTH_AA_SAMPLES), "");
 
-       alpha = LLVMBuildLoad(gallivm->builder, alpha_ptr, "");
-       alpha = LLVMBuildFMul(gallivm->builder, alpha, coverage, "");
-       LLVMBuildStore(gallivm->builder, alpha, alpha_ptr);
+       return LLVMBuildFMul(gallivm->builder, alpha, coverage, "");
 }
 
 static void si_llvm_emit_clipvertex(struct lp_build_tgsi_context * bld_base,
@@ -1423,7 +1402,7 @@ static void si_llvm_emit_clipvertex(struct lp_build_tgsi_context * bld_base,
        unsigned chan;
        unsigned const_chan;
        LLVMValueRef base_elt;
-       LLVMValueRef ptr = LLVMGetParam(si_shader_ctx->radeon_bld.main_fn, SI_PARAM_CONST);
+       LLVMValueRef ptr = LLVMGetParam(si_shader_ctx->radeon_bld.main_fn, SI_PARAM_CONST_BUFFERS);
        LLVMValueRef constbuf_index = lp_build_const_int32(base->gallivm, SI_DRIVER_STATE_CONST_BUF);
        LLVMValueRef const_resource = build_indexed_load_const(si_shader_ctx, ptr, constbuf_index);
 
@@ -1527,7 +1506,7 @@ static void build_tbuffer_store(struct si_shader_context *shader,
 
        lp_build_intrinsic(gallivm->builder, name,
                           LLVMVoidTypeInContext(gallivm->context),
-                          args, Elements(args));
+                          args, Elements(args), 0);
 }
 
 static void build_tbuffer_store_dwords(struct si_shader_context *shader,
@@ -1569,13 +1548,16 @@ static void si_llvm_emit_streamout(struct si_shader_context *shader,
        LLVMValueRef so_vtx_count =
                unpack_param(shader, shader->param_streamout_config, 16, 7);
 
-       LLVMValueRef tid = build_intrinsic(builder, "llvm.SI.tid", i32,
+       LLVMValueRef tid = lp_build_intrinsic(builder, "llvm.SI.tid", i32,
                                           NULL, 0, LLVMReadNoneAttribute);
 
        /* can_emit = tid < so_vtx_count; */
        LLVMValueRef can_emit =
                LLVMBuildICmp(builder, LLVMIntULT, tid, so_vtx_count, "");
 
+       LLVMValueRef stream_id =
+               unpack_param(shader, shader->param_streamout_config, 24, 2);
+
        /* Emit the streamout code conditionally. This actually avoids
         * out-of-bounds buffer access. The hw tells us via the SGPR
         * (so_vtx_count) which threads are allowed to emit streamout data. */
@@ -1615,7 +1597,9 @@ static void si_llvm_emit_streamout(struct si_shader_context *shader,
                        unsigned reg = so->output[i].register_index;
                        unsigned start = so->output[i].start_component;
                        unsigned num_comps = so->output[i].num_components;
+                       unsigned stream = so->output[i].stream;
                        LLVMValueRef out[4];
+                       struct lp_build_if_state if_ctx_stream;
 
                        assert(num_comps && num_comps <= 4);
                        if (!num_comps || num_comps > 4)
@@ -1649,11 +1633,18 @@ static void si_llvm_emit_streamout(struct si_shader_context *shader,
                                break;
                        }
 
+                       LLVMValueRef can_emit_stream =
+                               LLVMBuildICmp(builder, LLVMIntEQ,
+                                             stream_id,
+                                             lp_build_const_int32(gallivm, stream), "");
+
+                       lp_build_if(&if_ctx_stream, gallivm, can_emit_stream);
                        build_tbuffer_store_dwords(shader, shader->so_buffers[buf_idx],
                                                   vdata, num_comps,
                                                   so_write_offset[buf_idx],
                                                   LLVMConstInt(i32, 0, 0),
                                                   so->output[i].dst_offset*4);
+                       lp_build_endif(&if_ctx_stream);
                }
        }
        lp_build_endif(&if_ctx);
@@ -1744,7 +1735,7 @@ handle_semantic:
                        lp_build_intrinsic(base->gallivm->builder,
                                           "llvm.SI.export",
                                           LLVMVoidTypeInContext(base->gallivm->context),
-                                          args, 9);
+                                          args, 9, 0);
                }
 
                if (semantic_name == TGSI_SEMANTIC_CLIPDIST) {
@@ -1832,62 +1823,82 @@ handle_semantic:
                lp_build_intrinsic(base->gallivm->builder,
                                   "llvm.SI.export",
                                   LLVMVoidTypeInContext(base->gallivm->context),
-                                  pos_args[i], 9);
+                                  pos_args[i], 9, 0);
        }
 }
 
-static void si_write_tess_factors(struct si_shader_context *si_shader_ctx,
-                                 unsigned name, LLVMValueRef *out_ptr)
+/* This only writes the tessellation factor levels. */
+static void si_llvm_emit_tcs_epilogue(struct lp_build_tgsi_context *bld_base)
 {
-       struct si_shader *shader = si_shader_ctx->shader;
-       struct lp_build_tgsi_context *bld_base = &si_shader_ctx->radeon_bld.soa.bld_base;
+       struct si_shader_context *si_shader_ctx = si_shader_context(bld_base);
        struct gallivm_state *gallivm = bld_base->base.gallivm;
+       struct si_shader *shader = si_shader_ctx->shader;
+       unsigned tess_inner_index, tess_outer_index;
+       LLVMValueRef lds_base, lds_inner, lds_outer;
        LLVMValueRef tf_base, rel_patch_id, byteoffset, buffer, rw_buffers;
-       LLVMValueRef output, out[4];
+       LLVMValueRef out[6], vec0, vec1, invocation_id;
        unsigned stride, outer_comps, inner_comps, i;
+       struct lp_build_if_state if_ctx;
 
-       if (name != TGSI_SEMANTIC_TESSOUTER &&
-           name != TGSI_SEMANTIC_TESSINNER) {
-               assert(0);
-               return;
-       }
+       invocation_id = unpack_param(si_shader_ctx, SI_PARAM_REL_IDS, 8, 5);
+
+       /* Do this only for invocation 0, because the tess levels are per-patch,
+        * not per-vertex.
+        *
+        * This can't jump, because invocation 0 executes this. It should
+        * at least mask out the loads and stores for other invocations.
+        */
+       lp_build_if(&if_ctx, gallivm,
+                   LLVMBuildICmp(gallivm->builder, LLVMIntEQ,
+                                 invocation_id, bld_base->uint_bld.zero, ""));
 
+       /* Determine the layout of one tess factor element in the buffer. */
        switch (shader->key.tcs.prim_mode) {
        case PIPE_PRIM_LINES:
-               stride = 2;
+               stride = 2; /* 2 dwords, 1 vec2 store */
                outer_comps = 2;
                inner_comps = 0;
                break;
        case PIPE_PRIM_TRIANGLES:
-               stride = 4;
+               stride = 4; /* 4 dwords, 1 vec4 store */
                outer_comps = 3;
                inner_comps = 1;
                break;
        case PIPE_PRIM_QUADS:
-               stride = 6;
+               stride = 6; /* 6 dwords, 2 stores (vec4 + vec2) */
                outer_comps = 4;
                inner_comps = 2;
                break;
        default:
                assert(0);
+               return;
        }
 
-       /* Load the outputs as i32. */
-       for (i = 0; i < 4; i++)
-               out[i] = LLVMBuildBitCast(gallivm->builder,
-                               LLVMBuildLoad(gallivm->builder, out_ptr[i], ""),
-                               bld_base->uint_bld.elem_type, "");
-
-       /* Convert the outputs to vectors. */
-       if (name == TGSI_SEMANTIC_TESSOUTER)
-               output = lp_build_gather_values(gallivm, out,
-                                               util_next_power_of_two(outer_comps));
-       else if (inner_comps > 1)
-               output = lp_build_gather_values(gallivm, out, inner_comps);
-       else if (inner_comps == 1)
-               output = out[0];
-       else
-               return;
+       /* Load tess_inner and tess_outer from LDS.
+        * Any invocation can write them, so we can't get them from a temporary.
+        */
+       tess_inner_index = si_shader_io_get_unique_index(TGSI_SEMANTIC_TESSINNER, 0);
+       tess_outer_index = si_shader_io_get_unique_index(TGSI_SEMANTIC_TESSOUTER, 0);
+
+       lds_base = get_tcs_out_current_patch_data_offset(si_shader_ctx);
+       lds_inner = LLVMBuildAdd(gallivm->builder, lds_base,
+                                lp_build_const_int32(gallivm,
+                                                     tess_inner_index * 4), "");
+       lds_outer = LLVMBuildAdd(gallivm->builder, lds_base,
+                                lp_build_const_int32(gallivm,
+                                                     tess_outer_index * 4), "");
+
+       for (i = 0; i < outer_comps; i++)
+               out[i] = lds_load(bld_base, TGSI_TYPE_SIGNED, i, lds_outer);
+       for (i = 0; i < inner_comps; i++)
+               out[outer_comps+i] = lds_load(bld_base, TGSI_TYPE_SIGNED, i, lds_inner);
+
+       /* Convert the outputs to vectors for stores. */
+       vec0 = lp_build_gather_values(gallivm, out, MIN2(stride, 4));
+       vec1 = NULL;
+
+       if (stride > 4)
+               vec1 = lp_build_gather_values(gallivm, out+4, stride - 4);
 
        /* Get the buffer. */
        rw_buffers = LLVMGetParam(si_shader_ctx->radeon_bld.main_fn,
@@ -1895,22 +1906,20 @@ static void si_write_tess_factors(struct si_shader_context *si_shader_ctx,
        buffer = build_indexed_load_const(si_shader_ctx, rw_buffers,
                        lp_build_const_int32(gallivm, SI_RING_TESS_FACTOR));
 
-       /* Get offsets. */
+       /* Get the offset. */
        tf_base = LLVMGetParam(si_shader_ctx->radeon_bld.main_fn,
                               SI_PARAM_TESS_FACTOR_OFFSET);
        rel_patch_id = get_rel_patch_id(si_shader_ctx);
        byteoffset = LLVMBuildMul(gallivm->builder, rel_patch_id,
                                  lp_build_const_int32(gallivm, 4 * stride), "");
 
-       /* Store the output. */
-       if (name == TGSI_SEMANTIC_TESSOUTER) {
-               build_tbuffer_store_dwords(si_shader_ctx, buffer, output,
-                                          outer_comps, byteoffset, tf_base, 0);
-       } else if (inner_comps) {
-               build_tbuffer_store_dwords(si_shader_ctx, buffer, output,
-                                          inner_comps, byteoffset, tf_base,
-                                          outer_comps * 4);
-       }
+       /* Store the outputs. */
+       build_tbuffer_store_dwords(si_shader_ctx, buffer, vec0,
+                                  MIN2(stride, 4), byteoffset, tf_base, 0);
+       if (vec1)
+               build_tbuffer_store_dwords(si_shader_ctx, buffer, vec1,
+                                          stride - 4, byteoffset, tf_base, 16);
+       lp_build_endif(&if_ctx);
 }
 
 static void si_llvm_emit_ls_epilogue(struct lp_build_tgsi_context * bld_base)
@@ -1944,26 +1953,6 @@ static void si_llvm_emit_ls_epilogue(struct lp_build_tgsi_context * bld_base)
        }
 }
 
-static void si_llvm_emit_tcs_epilogue(struct lp_build_tgsi_context * bld_base)
-{
-       struct si_shader_context *si_shader_ctx = si_shader_context(bld_base);
-       struct si_shader *shader = si_shader_ctx->shader;
-       struct tgsi_shader_info *info = &shader->selector->info;
-       unsigned i;
-
-       /* Only write tessellation factors. Other outputs have already been
-        * written to LDS by instructions. */
-       for (i = 0; i < info->num_outputs; i++) {
-               LLVMValueRef *out_ptr = si_shader_ctx->radeon_bld.soa.outputs[i];
-               unsigned name = info->output_semantic_name[i];
-
-               if (name == TGSI_SEMANTIC_TESSINNER ||
-                   name == TGSI_SEMANTIC_TESSOUTER) {
-                       si_write_tess_factors(si_shader_ctx, name, out_ptr);
-               }
-       }
-}
-
 static void si_llvm_emit_es_epilogue(struct lp_build_tgsi_context * bld_base)
 {
        struct si_shader_context *si_shader_ctx = si_shader_context(bld_base);
@@ -1973,9 +1962,6 @@ static void si_llvm_emit_es_epilogue(struct lp_build_tgsi_context * bld_base)
        LLVMTypeRef i32 = LLVMInt32TypeInContext(gallivm->context);
        LLVMValueRef soffset = LLVMGetParam(si_shader_ctx->radeon_bld.main_fn,
                                            si_shader_ctx->param_es2gs_offset);
-       uint64_t enabled_outputs = si_shader_ctx->type == TGSI_PROCESSOR_TESS_EVAL ?
-                                          es->key.tes.es_enabled_outputs :
-                                          es->key.vs.es_enabled_outputs;
        unsigned chan;
        int i;
 
@@ -1988,11 +1974,8 @@ static void si_llvm_emit_es_epilogue(struct lp_build_tgsi_context * bld_base)
                    info->output_semantic_name[i] == TGSI_SEMANTIC_LAYER)
                        continue;
 
-               param_index = get_param_index(info->output_semantic_name[i],
-                                             info->output_semantic_index[i],
-                                             enabled_outputs);
-               if (param_index < 0)
-                       continue;
+               param_index = si_shader_io_get_unique_index(info->output_semantic_name[i],
+                                                           info->output_semantic_index[i]);
 
                for (chan = 0; chan < 4; chan++) {
                        LLVMValueRef out_val = LLVMBuildLoad(gallivm->builder, out_ptr[chan], "");
@@ -2018,7 +2001,7 @@ static void si_llvm_emit_gs_epilogue(struct lp_build_tgsi_context *bld_base)
 
        args[0] = lp_build_const_int32(gallivm, SENDMSG_GS_OP_NOP | SENDMSG_GS_DONE);
        args[1] = LLVMGetParam(si_shader_ctx->radeon_bld.main_fn, SI_PARAM_GS_WAVE_ID);
-       build_intrinsic(gallivm->builder, "llvm.SI.sendmsg",
+       lp_build_intrinsic(gallivm->builder, "llvm.SI.sendmsg",
                        LLVMVoidTypeInContext(gallivm->context), args, 2,
                        LLVMNoUnwindAttribute);
 }
@@ -2031,7 +2014,46 @@ static void si_llvm_emit_vs_epilogue(struct lp_build_tgsi_context * bld_base)
        struct si_shader_output_values *outputs = NULL;
        int i,j;
 
-       outputs = MALLOC(info->num_outputs * sizeof(outputs[0]));
+       outputs = MALLOC((info->num_outputs + 1) * sizeof(outputs[0]));
+
+       /* Vertex color clamping.
+        *
+        * This uses a state constant loaded in a user data SGPR and
+        * an IF statement is added that clamps all colors if the constant
+        * is true.
+        */
+       if (si_shader_ctx->type == TGSI_PROCESSOR_VERTEX &&
+           !si_shader_ctx->shader->is_gs_copy_shader) {
+               struct lp_build_if_state if_ctx;
+               LLVMValueRef cond = NULL;
+               LLVMValueRef addr, val;
+
+               for (i = 0; i < info->num_outputs; i++) {
+                       if (info->output_semantic_name[i] != TGSI_SEMANTIC_COLOR &&
+                           info->output_semantic_name[i] != TGSI_SEMANTIC_BCOLOR)
+                               continue;
+
+                       /* We've found a color. */
+                       if (!cond) {
+                               /* The state is in the first bit of the user SGPR. */
+                               cond = LLVMGetParam(si_shader_ctx->radeon_bld.main_fn,
+                                                   SI_PARAM_VS_STATE_BITS);
+                               cond = LLVMBuildTrunc(gallivm->builder, cond,
+                                                     LLVMInt1TypeInContext(gallivm->context), "");
+                               lp_build_if(&if_ctx, gallivm, cond);
+                       }
+
+                       for (j = 0; j < 4; j++) {
+                               addr = si_shader_ctx->radeon_bld.soa.outputs[i][j];
+                               val = LLVMBuildLoad(gallivm->builder, addr, "");
+                               val = radeon_llvm_saturate(bld_base, val);
+                               LLVMBuildStore(gallivm->builder, val, addr);
+                       }
+               }
+
+               if (cond)
+                       lp_build_endif(&if_ctx);
+       }
 
        for (i = 0; i < info->num_outputs; i++) {
                outputs[i].name = info->output_semantic_name[i];
@@ -2044,214 +2066,324 @@ static void si_llvm_emit_vs_epilogue(struct lp_build_tgsi_context * bld_base)
                                              "");
        }
 
-       si_llvm_export_vs(bld_base, outputs, info->num_outputs);
+       /* Export PrimitiveID when PS needs it. */
+       if (si_vs_exports_prim_id(si_shader_ctx->shader)) {
+               outputs[i].name = TGSI_SEMANTIC_PRIMID;
+               outputs[i].sid = 0;
+               outputs[i].values[0] = bitcast(bld_base, TGSI_TYPE_FLOAT,
+                                              get_primitive_id(bld_base, 0));
+               outputs[i].values[1] = bld_base->base.undef;
+               outputs[i].values[2] = bld_base->base.undef;
+               outputs[i].values[3] = bld_base->base.undef;
+               i++;
+       }
+
+       si_llvm_export_vs(bld_base, outputs, i);
        FREE(outputs);
 }
 
+static void si_export_mrt_z(struct lp_build_tgsi_context *bld_base,
+                          LLVMValueRef depth, LLVMValueRef stencil,
+                          LLVMValueRef samplemask)
+{
+       struct si_screen *sscreen = si_shader_context(bld_base)->screen;
+       struct lp_build_context *base = &bld_base->base;
+       struct lp_build_context *uint = &bld_base->uint_bld;
+       LLVMValueRef args[9];
+       unsigned mask = 0;
+
+       assert(depth || stencil || samplemask);
+
+       args[1] = uint->one; /* whether the EXEC mask is valid */
+       args[2] = uint->one; /* DONE bit */
+
+       /* Specify the target we are exporting */
+       args[3] = lp_build_const_int32(base->gallivm, V_008DFC_SQ_EXP_MRTZ);
+
+       args[4] = uint->zero; /* COMP flag */
+       args[5] = base->undef; /* R, depth */
+       args[6] = base->undef; /* G, stencil test value[0:7], stencil op value[8:15] */
+       args[7] = base->undef; /* B, sample mask */
+       args[8] = base->undef; /* A, alpha to mask */
+
+       if (depth) {
+               args[5] = depth;
+               mask |= 0x1;
+       }
+
+       if (stencil) {
+               args[6] = stencil;
+               mask |= 0x2;
+       }
+
+       if (samplemask) {
+               args[7] = samplemask;
+               mask |= 0x4;
+       }
+
+       /* SI (except OLAND) has a bug that it only looks
+        * at the X writemask component. */
+       if (sscreen->b.chip_class == SI &&
+           sscreen->b.family != CHIP_OLAND)
+               mask |= 0x1;
+
+       /* Specify which components to enable */
+       args[0] = lp_build_const_int32(base->gallivm, mask);
+
+       lp_build_intrinsic(base->gallivm->builder, "llvm.SI.export",
+                          LLVMVoidTypeInContext(base->gallivm->context),
+                          args, 9, 0);
+}
+
+static void si_export_mrt_color(struct lp_build_tgsi_context *bld_base,
+                               LLVMValueRef *color, unsigned index,
+                               bool is_last)
+{
+       struct si_shader_context *si_shader_ctx = si_shader_context(bld_base);
+       struct lp_build_context *base = &bld_base->base;
+       LLVMValueRef args[9];
+       int i;
+
+       /* Clamp color */
+       if (si_shader_ctx->shader->key.ps.clamp_color)
+               for (i = 0; i < 4; i++)
+                       color[i] = radeon_llvm_saturate(bld_base, color[i]);
+
+       /* Alpha to one */
+       if (si_shader_ctx->shader->key.ps.alpha_to_one)
+               color[3] = base->one;
+
+       /* Alpha test */
+       if (index == 0 &&
+           si_shader_ctx->shader->key.ps.alpha_func != PIPE_FUNC_ALWAYS)
+               si_alpha_test(bld_base, color[3]);
+
+       /* Line & polygon smoothing */
+       if (si_shader_ctx->shader->key.ps.poly_line_smoothing)
+               color[3] = si_scale_alpha_by_sample_mask(bld_base, color[3]);
+
+       /* If last_cbuf > 0, FS_COLOR0_WRITES_ALL_CBUFS is true. */
+       if (index == 0 &&
+           si_shader_ctx->shader->key.ps.last_cbuf > 0) {
+               for (int c = 1; c <= si_shader_ctx->shader->key.ps.last_cbuf; c++) {
+                       si_llvm_init_export_args(bld_base, color,
+                                                V_008DFC_SQ_EXP_MRT + c, args);
+                       lp_build_intrinsic(base->gallivm->builder, "llvm.SI.export",
+                                          LLVMVoidTypeInContext(base->gallivm->context),
+                                          args, 9, 0);
+               }
+       }
+
+       /* Export */
+       si_llvm_init_export_args(bld_base, color, V_008DFC_SQ_EXP_MRT + index,
+                                args);
+       if (is_last) {
+               args[1] = bld_base->uint_bld.one; /* whether the EXEC mask is valid */
+               args[2] = bld_base->uint_bld.one; /* DONE bit */
+       }
+       lp_build_intrinsic(base->gallivm->builder, "llvm.SI.export",
+                          LLVMVoidTypeInContext(base->gallivm->context),
+                          args, 9, 0);
+}
+
+static void si_export_null(struct lp_build_tgsi_context *bld_base)
+{
+       struct lp_build_context *base = &bld_base->base;
+       struct lp_build_context *uint = &bld_base->uint_bld;
+       LLVMValueRef args[9];
+
+       args[0] = lp_build_const_int32(base->gallivm, 0x0); /* enabled channels */
+       args[1] = uint->one; /* whether the EXEC mask is valid */
+       args[2] = uint->one; /* DONE bit */
+       args[3] = lp_build_const_int32(base->gallivm, V_008DFC_SQ_EXP_NULL);
+       args[4] = uint->zero; /* COMPR flag (0 = 32-bit export) */
+       args[5] = uint->undef; /* R */
+       args[6] = uint->undef; /* G */
+       args[7] = uint->undef; /* B */
+       args[8] = uint->undef; /* A */
+
+       lp_build_intrinsic(base->gallivm->builder, "llvm.SI.export",
+                          LLVMVoidTypeInContext(base->gallivm->context),
+                          args, 9, 0);
+}
+
 static void si_llvm_emit_fs_epilogue(struct lp_build_tgsi_context * bld_base)
 {
        struct si_shader_context * si_shader_ctx = si_shader_context(bld_base);
        struct si_shader * shader = si_shader_ctx->shader;
        struct lp_build_context * base = &bld_base->base;
-       struct lp_build_context * uint = &bld_base->uint_bld;
        struct tgsi_shader_info *info = &shader->selector->info;
-       LLVMValueRef args[9];
-       LLVMValueRef last_args[9] = { 0 };
-       int depth_index = -1, stencil_index = -1, samplemask_index = -1;
+       LLVMBuilderRef builder = base->gallivm->builder;
+       LLVMValueRef depth = NULL, stencil = NULL, samplemask = NULL;
+       int last_color_export = -1;
        int i;
 
+       /* If there are no outputs, add a dummy export. */
+       if (!info->num_outputs) {
+               si_export_null(bld_base);
+               return;
+       }
+
+       /* Determine the last export. If MRTZ is present, it's always last.
+        * Otherwise, find the last color export.
+        */
+       if (!info->writes_z && !info->writes_stencil && !info->writes_samplemask)
+               for (i = 0; i < info->num_outputs; i++)
+                       if (info->output_semantic_name[i] == TGSI_SEMANTIC_COLOR)
+                               last_color_export = i;
+
        for (i = 0; i < info->num_outputs; i++) {
                unsigned semantic_name = info->output_semantic_name[i];
                unsigned semantic_index = info->output_semantic_index[i];
-               unsigned target;
-               LLVMValueRef alpha_ptr;
+               unsigned j;
+               LLVMValueRef color[4] = {};
 
                /* Select the correct target */
                switch (semantic_name) {
                case TGSI_SEMANTIC_POSITION:
-                       depth_index = i;
-                       continue;
+                       depth = LLVMBuildLoad(builder,
+                                             si_shader_ctx->radeon_bld.soa.outputs[i][2], "");
+                       break;
                case TGSI_SEMANTIC_STENCIL:
-                       stencil_index = i;
-                       continue;
+                       stencil = LLVMBuildLoad(builder,
+                                               si_shader_ctx->radeon_bld.soa.outputs[i][1], "");
+                       break;
                case TGSI_SEMANTIC_SAMPLEMASK:
-                       samplemask_index = i;
-                       continue;
+                       samplemask = LLVMBuildLoad(builder,
+                                                  si_shader_ctx->radeon_bld.soa.outputs[i][0], "");
+                       break;
                case TGSI_SEMANTIC_COLOR:
-                       target = V_008DFC_SQ_EXP_MRT + semantic_index;
-                       alpha_ptr = si_shader_ctx->radeon_bld.soa.outputs[i][3];
-
-                       if (si_shader_ctx->shader->key.ps.alpha_to_one)
-                               LLVMBuildStore(base->gallivm->builder,
-                                              base->one, alpha_ptr);
+                       for (j = 0; j < 4; j++)
+                               color[j] = LLVMBuildLoad(builder,
+                                                        si_shader_ctx->radeon_bld.soa.outputs[i][j], "");
 
-                       if (semantic_index == 0 &&
-                           si_shader_ctx->shader->key.ps.alpha_func != PIPE_FUNC_ALWAYS)
-                               si_alpha_test(bld_base, alpha_ptr);
-
-                       if (si_shader_ctx->shader->key.ps.poly_line_smoothing)
-                               si_scale_alpha_by_sample_mask(bld_base, alpha_ptr);
+                       si_export_mrt_color(bld_base, color, semantic_index,
+                                           last_color_export == i);
                        break;
                default:
-                       target = 0;
                        fprintf(stderr,
                                "Warning: SI unhandled fs output type:%d\n",
                                semantic_name);
                }
-
-               si_llvm_init_export_args_load(bld_base,
-                                             si_shader_ctx->radeon_bld.soa.outputs[i],
-                                             target, args);
-
-               if (semantic_name == TGSI_SEMANTIC_COLOR) {
-                       /* If there is an export instruction waiting to be emitted, do so now. */
-                       if (last_args[0]) {
-                               lp_build_intrinsic(base->gallivm->builder,
-                                                  "llvm.SI.export",
-                                                  LLVMVoidTypeInContext(base->gallivm->context),
-                                                  last_args, 9);
-                       }
-
-                       /* This instruction will be emitted at the end of the shader. */
-                       memcpy(last_args, args, sizeof(args));
-
-                       /* Handle FS_COLOR0_WRITES_ALL_CBUFS. */
-                       if (shader->selector->info.properties[TGSI_PROPERTY_FS_COLOR0_WRITES_ALL_CBUFS] &&
-                           semantic_index == 0 &&
-                           si_shader_ctx->shader->key.ps.last_cbuf > 0) {
-                               for (int c = 1; c <= si_shader_ctx->shader->key.ps.last_cbuf; c++) {
-                                       si_llvm_init_export_args_load(bld_base,
-                                                                     si_shader_ctx->radeon_bld.soa.outputs[i],
-                                                                     V_008DFC_SQ_EXP_MRT + c, args);
-                                       lp_build_intrinsic(base->gallivm->builder,
-                                                          "llvm.SI.export",
-                                                          LLVMVoidTypeInContext(base->gallivm->context),
-                                                          args, 9);
-                               }
-                       }
-               } else {
-                       lp_build_intrinsic(base->gallivm->builder,
-                                          "llvm.SI.export",
-                                          LLVMVoidTypeInContext(base->gallivm->context),
-                                          args, 9);
-               }
        }
 
-       if (depth_index >= 0 || stencil_index >= 0 || samplemask_index >= 0) {
-               LLVMValueRef out_ptr;
-               unsigned mask = 0;
+       if (depth || stencil || samplemask)
+               si_export_mrt_z(bld_base, depth, stencil, samplemask);
+}
 
-               /* Specify the target we are exporting */
-               args[3] = lp_build_const_int32(base->gallivm, V_008DFC_SQ_EXP_MRTZ);
-
-               args[5] = base->zero; /* R, depth */
-               args[6] = base->zero; /* G, stencil test value[0:7], stencil op value[8:15] */
-               args[7] = base->zero; /* B, sample mask */
-               args[8] = base->zero; /* A, alpha to mask */
-
-               if (depth_index >= 0) {
-                       out_ptr = si_shader_ctx->radeon_bld.soa.outputs[depth_index][2];
-                       args[5] = LLVMBuildLoad(base->gallivm->builder, out_ptr, "");
-                       mask |= 0x1;
-                       si_shader_ctx->shader->db_shader_control |= S_02880C_Z_EXPORT_ENABLE(1);
-               }
+static void build_tex_intrinsic(const struct lp_build_tgsi_action * action,
+                               struct lp_build_tgsi_context * bld_base,
+                               struct lp_build_emit_data * emit_data);
 
-               if (stencil_index >= 0) {
-                       out_ptr = si_shader_ctx->radeon_bld.soa.outputs[stencil_index][1];
-                       args[6] = LLVMBuildLoad(base->gallivm->builder, out_ptr, "");
-                       mask |= 0x2;
-                       si_shader_ctx->shader->db_shader_control |=
-                               S_02880C_STENCIL_TEST_VAL_EXPORT_ENABLE(1);
-               }
+static bool tgsi_is_array_sampler(unsigned target)
+{
+       return target == TGSI_TEXTURE_1D_ARRAY ||
+              target == TGSI_TEXTURE_SHADOW1D_ARRAY ||
+              target == TGSI_TEXTURE_2D_ARRAY ||
+              target == TGSI_TEXTURE_SHADOW2D_ARRAY ||
+              target == TGSI_TEXTURE_CUBE_ARRAY ||
+              target == TGSI_TEXTURE_SHADOWCUBE_ARRAY ||
+              target == TGSI_TEXTURE_2D_ARRAY_MSAA;
+}
 
-               if (samplemask_index >= 0) {
-                       out_ptr = si_shader_ctx->radeon_bld.soa.outputs[samplemask_index][0];
-                       args[7] = LLVMBuildLoad(base->gallivm->builder, out_ptr, "");
-                       mask |= 0x4;
-                       si_shader_ctx->shader->db_shader_control |= S_02880C_MASK_EXPORT_ENABLE(1);
-               }
+static void set_tex_fetch_args(struct gallivm_state *gallivm,
+                              struct lp_build_emit_data *emit_data,
+                              unsigned opcode, unsigned target,
+                              LLVMValueRef res_ptr, LLVMValueRef samp_ptr,
+                              LLVMValueRef *param, unsigned count,
+                              unsigned dmask)
+{
+       unsigned num_args;
+       unsigned is_rect = target == TGSI_TEXTURE_RECT;
+       LLVMTypeRef i32 = LLVMInt32TypeInContext(gallivm->context);
 
-               /* SI (except OLAND) has a bug that it only looks
-                * at the X writemask component. */
-               if (si_shader_ctx->screen->b.chip_class == SI &&
-                   si_shader_ctx->screen->b.family != CHIP_OLAND)
-                       mask |= 0x1;
+       /* Pad to power of two vector */
+       while (count < util_next_power_of_two(count))
+               param[count++] = LLVMGetUndef(i32);
 
-               if (samplemask_index >= 0)
-                       si_shader_ctx->shader->spi_shader_z_format = V_028710_SPI_SHADER_32_ABGR;
-               else if (stencil_index >= 0)
-                       si_shader_ctx->shader->spi_shader_z_format = V_028710_SPI_SHADER_32_GR;
-               else
-                       si_shader_ctx->shader->spi_shader_z_format = V_028710_SPI_SHADER_32_R;
+       /* Texture coordinates. */
+       if (count > 1)
+               emit_data->args[0] = lp_build_gather_values(gallivm, param, count);
+       else
+               emit_data->args[0] = param[0];
 
-               /* Specify which components to enable */
-               args[0] = lp_build_const_int32(base->gallivm, mask);
+       /* Resource. */
+       emit_data->args[1] = res_ptr;
+       num_args = 2;
 
-               args[1] =
-               args[2] =
-               args[4] = uint->zero;
+       if (opcode == TGSI_OPCODE_TXF || opcode == TGSI_OPCODE_TXQ)
+               emit_data->dst_type = LLVMVectorType(i32, 4);
+       else {
+               emit_data->dst_type = LLVMVectorType(
+                       LLVMFloatTypeInContext(gallivm->context), 4);
 
-               if (last_args[0])
-                       lp_build_intrinsic(base->gallivm->builder,
-                                          "llvm.SI.export",
-                                          LLVMVoidTypeInContext(base->gallivm->context),
-                                          args, 9);
-               else
-                       memcpy(last_args, args, sizeof(args));
+               emit_data->args[num_args++] = samp_ptr;
        }
 
-       if (!last_args[0]) {
-               /* Specify which components to enable */
-               last_args[0] = lp_build_const_int32(base->gallivm, 0x0);
+       emit_data->args[num_args++] = lp_build_const_int32(gallivm, dmask);
+       emit_data->args[num_args++] = lp_build_const_int32(gallivm, is_rect); /* unorm */
+       emit_data->args[num_args++] = lp_build_const_int32(gallivm, 0); /* r128 */
+       emit_data->args[num_args++] = lp_build_const_int32(gallivm,
+                                       tgsi_is_array_sampler(target)); /* da */
+       emit_data->args[num_args++] = lp_build_const_int32(gallivm, 0); /* glc */
+       emit_data->args[num_args++] = lp_build_const_int32(gallivm, 0); /* slc */
+       emit_data->args[num_args++] = lp_build_const_int32(gallivm, 0); /* tfe */
+       emit_data->args[num_args++] = lp_build_const_int32(gallivm, 0); /* lwe */
+
+       emit_data->arg_count = num_args;
+}
 
-               /* Specify the target we are exporting */
-               last_args[3] = lp_build_const_int32(base->gallivm, V_008DFC_SQ_EXP_MRT);
+static const struct lp_build_tgsi_action tex_action;
 
-               /* Set COMPR flag to zero to export data as 32-bit */
-               last_args[4] = uint->zero;
+static void tex_fetch_ptrs(
+       struct lp_build_tgsi_context * bld_base,
+       struct lp_build_emit_data * emit_data,
+       LLVMValueRef *res_ptr, LLVMValueRef *samp_ptr, LLVMValueRef *fmask_ptr)
+{
+       struct si_shader_context *si_shader_ctx = si_shader_context(bld_base);
+       struct gallivm_state *gallivm = bld_base->base.gallivm;
+       const struct tgsi_full_instruction * inst = emit_data->inst;
+       unsigned target = inst->Texture.Texture;
+       unsigned sampler_src;
+       unsigned sampler_index;
 
-               /* dummy bits */
-               last_args[5]= uint->zero;
-               last_args[6]= uint->zero;
-               last_args[7]= uint->zero;
-               last_args[8]= uint->zero;
-       }
+       sampler_src = emit_data->inst->Instruction.NumSrcRegs - 1;
+       sampler_index = emit_data->inst->Src[sampler_src].Register.Index;
 
-       /* Specify whether the EXEC mask represents the valid mask */
-       last_args[1] = uint->one;
+       if (emit_data->inst->Src[sampler_src].Register.Indirect) {
+               const struct tgsi_full_src_register *reg = &emit_data->inst->Src[sampler_src];
+               LLVMValueRef ind_index;
 
-       /* Specify that this is the last export */
-       last_args[2] = lp_build_const_int32(base->gallivm, 1);
+               ind_index = get_indirect_index(si_shader_ctx, &reg->Indirect, reg->Register.Index);
 
-       lp_build_intrinsic(base->gallivm->builder,
-                          "llvm.SI.export",
-                          LLVMVoidTypeInContext(base->gallivm->context),
-                          last_args, 9);
-}
+               *res_ptr = LLVMGetParam(si_shader_ctx->radeon_bld.main_fn, SI_PARAM_SAMPLER_VIEWS);
+               *res_ptr = build_indexed_load_const(si_shader_ctx, *res_ptr, ind_index);
 
-static void build_tex_intrinsic(const struct lp_build_tgsi_action * action,
-                               struct lp_build_tgsi_context * bld_base,
-                               struct lp_build_emit_data * emit_data);
+               *samp_ptr = LLVMGetParam(si_shader_ctx->radeon_bld.main_fn, SI_PARAM_SAMPLER_STATES);
+               *samp_ptr = build_indexed_load_const(si_shader_ctx, *samp_ptr, ind_index);
 
-static bool tgsi_is_shadow_sampler(unsigned target)
-{
-       return target == TGSI_TEXTURE_SHADOW1D ||
-              target == TGSI_TEXTURE_SHADOW1D_ARRAY ||
-              target == TGSI_TEXTURE_SHADOW2D ||
-              target == TGSI_TEXTURE_SHADOW2D_ARRAY ||
-              target == TGSI_TEXTURE_SHADOWCUBE ||
-              target == TGSI_TEXTURE_SHADOWCUBE_ARRAY ||
-              target == TGSI_TEXTURE_SHADOWRECT;
+               if (target == TGSI_TEXTURE_2D_MSAA ||
+                   target == TGSI_TEXTURE_2D_ARRAY_MSAA) {
+                       ind_index = LLVMBuildAdd(gallivm->builder, ind_index,
+                                                lp_build_const_int32(gallivm,
+                                                                     SI_FMASK_TEX_OFFSET), "");
+                       *fmask_ptr = LLVMGetParam(si_shader_ctx->radeon_bld.main_fn, SI_PARAM_SAMPLER_VIEWS);
+                       *fmask_ptr = build_indexed_load_const(si_shader_ctx, *fmask_ptr, ind_index);
+               }
+       } else {
+               *res_ptr = si_shader_ctx->sampler_views[sampler_index];
+               *samp_ptr = si_shader_ctx->sampler_states[sampler_index];
+               *fmask_ptr = si_shader_ctx->sampler_views[SI_FMASK_TEX_OFFSET + sampler_index];
+       }
 }
 
-static const struct lp_build_tgsi_action tex_action;
-
 static void tex_fetch_args(
        struct lp_build_tgsi_context * bld_base,
        struct lp_build_emit_data * emit_data)
 {
        struct si_shader_context *si_shader_ctx = si_shader_context(bld_base);
        struct gallivm_state *gallivm = bld_base->base.gallivm;
+       LLVMBuilderRef builder = gallivm->builder;
        const struct tgsi_full_instruction * inst = emit_data->inst;
        unsigned opcode = inst->Instruction.Opcode;
        unsigned target = inst->Texture.Texture;
@@ -2261,29 +2393,49 @@ static void tex_fetch_args(
        unsigned num_coords = tgsi_util_get_texture_coord_dim(target, &ref_pos);
        unsigned count = 0;
        unsigned chan;
-       unsigned sampler_src;
-       unsigned sampler_index;
        unsigned num_deriv_channels = 0;
-       bool has_offset = HAVE_LLVM >= 0x0305 ? inst->Texture.NumOffsets > 0 : false;
-       LLVMValueRef res_ptr, samp_ptr;
-
-       sampler_src = emit_data->inst->Instruction.NumSrcRegs - 1;
-       sampler_index = emit_data->inst->Src[sampler_src].Register.Index;
-
-       if (emit_data->inst->Src[sampler_src].Register.Indirect) {
-               const struct tgsi_full_src_register *reg = &emit_data->inst->Src[sampler_src];
-               LLVMValueRef ind_index;
+       bool has_offset = inst->Texture.NumOffsets > 0;
+       LLVMValueRef res_ptr, samp_ptr, fmask_ptr = NULL;
+       LLVMTypeRef i32 = LLVMInt32TypeInContext(gallivm->context);
+       unsigned dmask = 0xf;
+
+       tex_fetch_ptrs(bld_base, emit_data, &res_ptr, &samp_ptr, &fmask_ptr);
+
+       if (opcode == TGSI_OPCODE_TXQ) {
+               if (target == TGSI_TEXTURE_BUFFER) {
+                       LLVMTypeRef v8i32 = LLVMVectorType(i32, 8);
+
+                       /* Read the size from the buffer descriptor directly. */
+                       LLVMValueRef res = LLVMBuildBitCast(builder, res_ptr, v8i32, "");
+                       LLVMValueRef size = LLVMBuildExtractElement(builder, res,
+                                                       lp_build_const_int32(gallivm, 6), "");
+
+                       if (si_shader_ctx->screen->b.chip_class >= VI) {
+                               /* On VI, the descriptor contains the size in bytes,
+                                * but TXQ must return the size in elements.
+                                * The stride is always non-zero for resources using TXQ.
+                                */
+                               LLVMValueRef stride =
+                                       LLVMBuildExtractElement(builder, res,
+                                                               lp_build_const_int32(gallivm, 5), "");
+                               stride = LLVMBuildLShr(builder, stride,
+                                                      lp_build_const_int32(gallivm, 16), "");
+                               stride = LLVMBuildAnd(builder, stride,
+                                                     lp_build_const_int32(gallivm, 0x3FFF), "");
+
+                               size = LLVMBuildUDiv(builder, size, stride, "");
+                       }
 
-               ind_index = get_indirect_index(si_shader_ctx, &reg->Indirect, reg->Register.Index);
+                       emit_data->args[0] = size;
+                       return;
+               }
 
-               res_ptr = LLVMGetParam(si_shader_ctx->radeon_bld.main_fn, SI_PARAM_RESOURCE);
-               res_ptr = build_indexed_load_const(si_shader_ctx, res_ptr, ind_index);
+               /* Textures - set the mip level. */
+               address[count++] = lp_build_emit_fetch(bld_base, inst, 0, TGSI_CHAN_X);
 
-               samp_ptr = LLVMGetParam(si_shader_ctx->radeon_bld.main_fn, SI_PARAM_SAMPLER);
-               samp_ptr = build_indexed_load_const(si_shader_ctx, samp_ptr, ind_index);
-       } else {
-               res_ptr = si_shader_ctx->resources[sampler_index];
-               samp_ptr = si_shader_ctx->samplers[sampler_index];
+               set_tex_fetch_args(gallivm, emit_data, opcode, target, res_ptr,
+                                  NULL, address, count, 0xf);
+               return;
        }
 
        if (target == TGSI_TEXTURE_BUFFER) {
@@ -2353,7 +2505,7 @@ static void tex_fetch_args(
                address[count++] = lp_build_emit_fetch(bld_base, inst, 1, 0);
 
        /* Pack depth comparison value */
-       if (tgsi_is_shadow_sampler(target) && opcode != TGSI_OPCODE_LODQ) {
+       if (tgsi_is_shadow_target(target) && opcode != TGSI_OPCODE_LODQ) {
                if (target == TGSI_TEXTURE_SHADOWCUBE_ARRAY) {
                        address[count++] = lp_build_emit_fetch(bld_base, inst, 1, 0);
                } else {
@@ -2396,7 +2548,7 @@ static void tex_fetch_args(
                        num_deriv_channels = 1;
                        break;
                default:
-                       assert(0); /* no other targets are valid here */
+                       unreachable("invalid target");
                }
 
                for (param = 0; param < 2; param++)
@@ -2435,9 +2587,7 @@ static void tex_fetch_args(
 
        for (chan = 0; chan < count; chan++ ) {
                address[chan] = LLVMBuildBitCast(gallivm->builder,
-                                                address[chan],
-                                                LLVMInt32TypeInContext(gallivm->context),
-                                                "");
+                                                address[chan], i32, "");
        }
 
        /* Adjust the sample index according to FMASK.
@@ -2469,22 +2619,14 @@ static void tex_fetch_args(
                }
                txf_address[3] = bld_base->uint_bld.zero;
 
-               /* Pad to a power-of-two size. */
-               while (txf_count < util_next_power_of_two(txf_count))
-                       txf_address[txf_count++] = LLVMGetUndef(LLVMInt32TypeInContext(gallivm->context));
-
                /* Read FMASK using TXF. */
                inst.Instruction.Opcode = TGSI_OPCODE_TXF;
-               inst.Texture.Texture = target == TGSI_TEXTURE_2D_MSAA ? TGSI_TEXTURE_2D : TGSI_TEXTURE_2D_ARRAY;
+               inst.Texture.Texture = target;
                txf_emit_data.inst = &inst;
                txf_emit_data.chan = 0;
-               txf_emit_data.dst_type = LLVMVectorType(
-                       LLVMInt32TypeInContext(gallivm->context), 4);
-               txf_emit_data.args[0] = lp_build_gather_values(gallivm, txf_address, txf_count);
-               txf_emit_data.args[1] = si_shader_ctx->resources[SI_FMASK_TEX_OFFSET + sampler_index];
-               txf_emit_data.args[2] = lp_build_const_int32(gallivm, inst.Texture.Texture);
-               txf_emit_data.arg_count = 3;
-
+               set_tex_fetch_args(gallivm, &txf_emit_data, TGSI_OPCODE_TXF,
+                                  target, fmask_ptr, NULL,
+                                  txf_address, txf_count, 0xf);
                build_tex_intrinsic(&tex_action, bld_base, &txf_emit_data);
 
                /* Initialize some constants. */
@@ -2512,8 +2654,7 @@ static void tex_fetch_args(
                 * resource descriptor is 0 (invalid),
                 */
                LLVMValueRef fmask_desc =
-                       LLVMBuildBitCast(gallivm->builder,
-                                        si_shader_ctx->resources[SI_FMASK_TEX_OFFSET + sampler_index],
+                       LLVMBuildBitCast(gallivm->builder, fmask_ptr,
                                         LLVMVectorType(uint_bld->elem_type, 8), "");
 
                LLVMValueRef fmask_word1 =
@@ -2530,9 +2671,6 @@ static void tex_fetch_args(
                                        final_sample, address[sample_chan], "");
        }
 
-       /* Resource */
-       emit_data->args[1] = res_ptr;
-
        if (opcode == TGSI_OPCODE_TXF) {
                /* add tex offsets */
                if (inst->Texture.NumOffsets) {
@@ -2568,89 +2706,37 @@ static void tex_fetch_args(
                                /* texture offsets do not apply to other texture targets */
                        }
                }
+       }
 
-               emit_data->args[2] = lp_build_const_int32(gallivm, target);
-               emit_data->arg_count = 3;
+       if (opcode == TGSI_OPCODE_TG4) {
+               unsigned gather_comp = 0;
 
-               emit_data->dst_type = LLVMVectorType(
-                       LLVMInt32TypeInContext(gallivm->context),
-                       4);
-       } else if (opcode == TGSI_OPCODE_TG4 ||
-                  opcode == TGSI_OPCODE_LODQ ||
-                  has_offset) {
-               unsigned is_array = target == TGSI_TEXTURE_1D_ARRAY ||
-                                   target == TGSI_TEXTURE_SHADOW1D_ARRAY ||
-                                   target == TGSI_TEXTURE_2D_ARRAY ||
-                                   target == TGSI_TEXTURE_SHADOW2D_ARRAY ||
-                                   target == TGSI_TEXTURE_CUBE_ARRAY ||
-                                   target == TGSI_TEXTURE_SHADOWCUBE_ARRAY;
-               unsigned is_rect = target == TGSI_TEXTURE_RECT;
-               unsigned dmask = 0xf;
-
-               if (opcode == TGSI_OPCODE_TG4) {
-                       unsigned gather_comp = 0;
-
-                       /* DMASK was repurposed for GATHER4. 4 components are always
-                        * returned and DMASK works like a swizzle - it selects
-                        * the component to fetch. The only valid DMASK values are
-                        * 1=red, 2=green, 4=blue, 8=alpha. (e.g. 1 returns
-                        * (red,red,red,red) etc.) The ISA document doesn't mention
-                        * this.
-                        */
-
-                       /* Get the component index from src1.x for Gather4. */
-                       if (!tgsi_is_shadow_sampler(target)) {
-                               LLVMValueRef (*imms)[4] = lp_soa_context(bld_base)->immediates;
-                               LLVMValueRef comp_imm;
-                               struct tgsi_src_register src1 = inst->Src[1].Register;
+               /* DMASK was repurposed for GATHER4. 4 components are always
+                * returned and DMASK works like a swizzle - it selects
+                * the component to fetch. The only valid DMASK values are
+                * 1=red, 2=green, 4=blue, 8=alpha. (e.g. 1 returns
+                * (red,red,red,red) etc.) The ISA document doesn't mention
+                * this.
+                */
 
-                               assert(src1.File == TGSI_FILE_IMMEDIATE);
+               /* Get the component index from src1.x for Gather4. */
+               if (!tgsi_is_shadow_target(target)) {
+                       LLVMValueRef (*imms)[4] = lp_soa_context(bld_base)->immediates;
+                       LLVMValueRef comp_imm;
+                       struct tgsi_src_register src1 = inst->Src[1].Register;
 
-                               comp_imm = imms[src1.Index][src1.SwizzleX];
-                               gather_comp = LLVMConstIntGetZExtValue(comp_imm);
-                               gather_comp = CLAMP(gather_comp, 0, 3);
-                       }
+                       assert(src1.File == TGSI_FILE_IMMEDIATE);
 
-                       dmask = 1 << gather_comp;
+                       comp_imm = imms[src1.Index][src1.SwizzleX];
+                       gather_comp = LLVMConstIntGetZExtValue(comp_imm);
+                       gather_comp = CLAMP(gather_comp, 0, 3);
                }
 
-               emit_data->args[2] = samp_ptr;
-               emit_data->args[3] = lp_build_const_int32(gallivm, dmask);
-               emit_data->args[4] = lp_build_const_int32(gallivm, is_rect); /* unorm */
-               emit_data->args[5] = lp_build_const_int32(gallivm, 0); /* r128 */
-               emit_data->args[6] = lp_build_const_int32(gallivm, is_array); /* da */
-               emit_data->args[7] = lp_build_const_int32(gallivm, 0); /* glc */
-               emit_data->args[8] = lp_build_const_int32(gallivm, 0); /* slc */
-               emit_data->args[9] = lp_build_const_int32(gallivm, 0); /* tfe */
-               emit_data->args[10] = lp_build_const_int32(gallivm, 0); /* lwe */
-
-               emit_data->arg_count = 11;
-
-               emit_data->dst_type = LLVMVectorType(
-                       LLVMFloatTypeInContext(gallivm->context),
-                       4);
-       } else {
-               emit_data->args[2] = samp_ptr;
-               emit_data->args[3] = lp_build_const_int32(gallivm, target);
-               emit_data->arg_count = 4;
-
-               emit_data->dst_type = LLVMVectorType(
-                       LLVMFloatTypeInContext(gallivm->context),
-                       4);
+               dmask = 1 << gather_comp;
        }
 
-       /* The fetch opcode has been converted to a 2D array fetch.
-        * This simplifies the LLVM backend. */
-       if (target == TGSI_TEXTURE_CUBE_ARRAY)
-               target = TGSI_TEXTURE_2D_ARRAY;
-       else if (target == TGSI_TEXTURE_SHADOWCUBE_ARRAY)
-               target = TGSI_TEXTURE_SHADOW2D_ARRAY;
-
-       /* Pad to power of two vector */
-       while (count < util_next_power_of_two(count))
-               address[count++] = LLVMGetUndef(LLVMInt32TypeInContext(gallivm->context));
-
-       emit_data->args[0] = lp_build_gather_values(gallivm, address, count);
+       set_tex_fetch_args(gallivm, emit_data, opcode, target, res_ptr,
+                          samp_ptr, address, count, dmask);
 }
 
 static void build_tex_intrinsic(const struct lp_build_tgsi_action * action,
@@ -2661,11 +2747,20 @@ static void build_tex_intrinsic(const struct lp_build_tgsi_action * action,
        unsigned opcode = emit_data->inst->Instruction.Opcode;
        unsigned target = emit_data->inst->Texture.Texture;
        char intr_name[127];
-       bool has_offset = HAVE_LLVM >= 0x0305 ?
-                               emit_data->inst->Texture.NumOffsets > 0 : false;
+       bool has_offset = emit_data->inst->Texture.NumOffsets > 0;
+       bool is_shadow = tgsi_is_shadow_target(target);
+       char type[64];
+       const char *name = "llvm.SI.image.sample";
+       const char *infix = "";
+
+       if (opcode == TGSI_OPCODE_TXQ && target == TGSI_TEXTURE_BUFFER) {
+               /* Just return the buffer size. */
+               emit_data->output[emit_data->chan] = emit_data->args[0];
+               return;
+       }
 
        if (target == TGSI_TEXTURE_BUFFER) {
-               emit_data->output[emit_data->chan] = build_intrinsic(
+               emit_data->output[emit_data->chan] = lp_build_intrinsic(
                        base->gallivm->builder,
                        "llvm.SI.vs.load.input", emit_data->dst_type,
                        emit_data->args, emit_data->arg_count,
@@ -2673,174 +2768,68 @@ static void build_tex_intrinsic(const struct lp_build_tgsi_action * action,
                return;
        }
 
-       if (opcode == TGSI_OPCODE_TG4 ||
-           opcode == TGSI_OPCODE_LODQ ||
-           (opcode != TGSI_OPCODE_TXF && has_offset)) {
-               bool is_shadow = tgsi_is_shadow_sampler(target);
-               const char *name = "llvm.SI.image.sample";
-               const char *infix = "";
-
-               switch (opcode) {
-               case TGSI_OPCODE_TEX:
-               case TGSI_OPCODE_TEX2:
-               case TGSI_OPCODE_TXP:
-                       break;
-               case TGSI_OPCODE_TXB:
-               case TGSI_OPCODE_TXB2:
-                       infix = ".b";
-                       break;
-               case TGSI_OPCODE_TXL:
-               case TGSI_OPCODE_TXL2:
-                       infix = ".l";
-                       break;
-               case TGSI_OPCODE_TXD:
-                       infix = ".d";
-                       break;
-               case TGSI_OPCODE_TG4:
-                       name = "llvm.SI.gather4";
-                       break;
-               case TGSI_OPCODE_LODQ:
-                       name = "llvm.SI.getlod";
-                       is_shadow = false;
-                       has_offset = false;
-                       break;
-               default:
-                       assert(0);
-                       return;
-               }
-
-               /* Add the type and suffixes .c, .o if needed. */
-               sprintf(intr_name, "%s%s%s%s.v%ui32", name,
-                       is_shadow ? ".c" : "", infix, has_offset ? ".o" : "",
-                       LLVMGetVectorSize(LLVMTypeOf(emit_data->args[0])));
-
-               emit_data->output[emit_data->chan] = build_intrinsic(
-                       base->gallivm->builder, intr_name, emit_data->dst_type,
-                       emit_data->args, emit_data->arg_count,
-                       LLVMReadNoneAttribute | LLVMNoUnwindAttribute);
-       } else {
-               LLVMTypeRef i8, v16i8, v32i8;
-               const char *name;
-
-               switch (opcode) {
-               case TGSI_OPCODE_TEX:
-               case TGSI_OPCODE_TEX2:
-               case TGSI_OPCODE_TXP:
-                       name = "llvm.SI.sample";
-                       break;
-               case TGSI_OPCODE_TXB:
-               case TGSI_OPCODE_TXB2:
-                       name = "llvm.SI.sampleb";
-                       break;
-               case TGSI_OPCODE_TXD:
-                       name = "llvm.SI.sampled";
-                       break;
-               case TGSI_OPCODE_TXF:
-                       name = "llvm.SI.imageload";
-                       break;
-               case TGSI_OPCODE_TXL:
-               case TGSI_OPCODE_TXL2:
-                       name = "llvm.SI.samplel";
-                       break;
-               default:
-                       assert(0);
-                       return;
-               }
-
-               i8 = LLVMInt8TypeInContext(base->gallivm->context);
-               v16i8 = LLVMVectorType(i8, 16);
-               v32i8 = LLVMVectorType(i8, 32);
-
-               emit_data->args[1] = LLVMBuildBitCast(base->gallivm->builder,
-                                               emit_data->args[1], v32i8, "");
-               if (opcode != TGSI_OPCODE_TXF) {
-                       emit_data->args[2] = LLVMBuildBitCast(base->gallivm->builder,
-                                               emit_data->args[2], v16i8, "");
-               }
-
-               sprintf(intr_name, "%s.v%ui32", name,
-                       LLVMGetVectorSize(LLVMTypeOf(emit_data->args[0])));
-
-               emit_data->output[emit_data->chan] = build_intrinsic(
-                       base->gallivm->builder, intr_name, emit_data->dst_type,
-                       emit_data->args, emit_data->arg_count,
-                       LLVMReadNoneAttribute | LLVMNoUnwindAttribute);
-       }
-}
-
-static void txq_fetch_args(
-       struct lp_build_tgsi_context * bld_base,
-       struct lp_build_emit_data * emit_data)
-{
-       struct si_shader_context *si_shader_ctx = si_shader_context(bld_base);
-       const struct tgsi_full_instruction *inst = emit_data->inst;
-       struct gallivm_state *gallivm = bld_base->base.gallivm;
-       unsigned target = inst->Texture.Texture;
-       LLVMValueRef res_ptr;
-
-       if (inst->Src[1].Register.Indirect) {
-               const struct tgsi_full_src_register *reg = &inst->Src[1];
-               LLVMValueRef ind_index;
-
-               ind_index = get_indirect_index(si_shader_ctx, &reg->Indirect, reg->Register.Index);
-
-               res_ptr = LLVMGetParam(si_shader_ctx->radeon_bld.main_fn, SI_PARAM_RESOURCE);
-               res_ptr = build_indexed_load_const(si_shader_ctx, res_ptr,
-                                                  ind_index);
-       } else
-               res_ptr = si_shader_ctx->resources[inst->Src[1].Register.Index];
-
-       if (target == TGSI_TEXTURE_BUFFER) {
-               LLVMTypeRef i32 = LLVMInt32TypeInContext(gallivm->context);
-               LLVMTypeRef v8i32 = LLVMVectorType(i32, 8);
-
-               /* Read the size from the buffer descriptor directly. */
-               LLVMValueRef size = res_ptr;
-               size = LLVMBuildBitCast(gallivm->builder, size, v8i32, "");
-               size = LLVMBuildExtractElement(gallivm->builder, size,
-                                             lp_build_const_int32(gallivm, 6), "");
-               emit_data->args[0] = size;
+       switch (opcode) {
+       case TGSI_OPCODE_TXF:
+               name = target == TGSI_TEXTURE_2D_MSAA ||
+                      target == TGSI_TEXTURE_2D_ARRAY_MSAA ?
+                              "llvm.SI.image.load" :
+                              "llvm.SI.image.load.mip";
+               is_shadow = false;
+               has_offset = false;
+               break;
+       case TGSI_OPCODE_TXQ:
+               name = "llvm.SI.getresinfo";
+               is_shadow = false;
+               has_offset = false;
+               break;
+       case TGSI_OPCODE_LODQ:
+               name = "llvm.SI.getlod";
+               is_shadow = false;
+               has_offset = false;
+               break;
+       case TGSI_OPCODE_TEX:
+       case TGSI_OPCODE_TEX2:
+       case TGSI_OPCODE_TXP:
+               break;
+       case TGSI_OPCODE_TXB:
+       case TGSI_OPCODE_TXB2:
+               infix = ".b";
+               break;
+       case TGSI_OPCODE_TXL:
+       case TGSI_OPCODE_TXL2:
+               infix = ".l";
+               break;
+       case TGSI_OPCODE_TXD:
+               infix = ".d";
+               break;
+       case TGSI_OPCODE_TG4:
+               name = "llvm.SI.gather4";
+               break;
+       default:
+               assert(0);
                return;
        }
 
-       /* Mip level */
-       emit_data->args[0] = lp_build_emit_fetch(bld_base, inst, 0, TGSI_CHAN_X);
-
-       /* Resource */
-       emit_data->args[1] = res_ptr;
-
-       /* Texture target */
-       if (target == TGSI_TEXTURE_CUBE_ARRAY ||
-           target == TGSI_TEXTURE_SHADOWCUBE_ARRAY)
-               target = TGSI_TEXTURE_2D_ARRAY;
-
-       emit_data->args[2] = lp_build_const_int32(bld_base->base.gallivm,
-                                                 target);
-
-       emit_data->arg_count = 3;
-
-       emit_data->dst_type = LLVMVectorType(
-               LLVMInt32TypeInContext(bld_base->base.gallivm->context),
-               4);
-}
-
-static void build_txq_intrinsic(const struct lp_build_tgsi_action * action,
-                               struct lp_build_tgsi_context * bld_base,
-                               struct lp_build_emit_data * emit_data)
-{
-       unsigned target = emit_data->inst->Texture.Texture;
+       if (LLVMGetTypeKind(LLVMTypeOf(emit_data->args[0])) == LLVMVectorTypeKind)
+               sprintf(type, ".v%ui32",
+                       LLVMGetVectorSize(LLVMTypeOf(emit_data->args[0])));
+       else
+               strcpy(type, ".i32");
 
-       if (target == TGSI_TEXTURE_BUFFER) {
-               /* Just return the buffer size. */
-               emit_data->output[emit_data->chan] = emit_data->args[0];
-               return;
-       }
+       /* Add the type and suffixes .c, .o if needed. */
+       sprintf(intr_name, "%s%s%s%s%s",
+               name, is_shadow ? ".c" : "", infix,
+               has_offset ? ".o" : "", type);
 
-       build_tgsi_intrinsic_nomem(action, bld_base, emit_data);
+       emit_data->output[emit_data->chan] = lp_build_intrinsic(
+               base->gallivm->builder, intr_name, emit_data->dst_type,
+               emit_data->args, emit_data->arg_count,
+               LLVMReadNoneAttribute | LLVMNoUnwindAttribute);
 
        /* Divide the number of layers by 6 to get the number of cubes. */
-       if (target == TGSI_TEXTURE_CUBE_ARRAY ||
-           target == TGSI_TEXTURE_SHADOWCUBE_ARRAY) {
+       if (opcode == TGSI_OPCODE_TXQ &&
+           (target == TGSI_TEXTURE_CUBE_ARRAY ||
+            target == TGSI_TEXTURE_SHADOWCUBE_ARRAY)) {
                LLVMBuilderRef builder = bld_base->base.gallivm->builder;
                LLVMValueRef two = lp_build_const_int32(bld_base->base.gallivm, 2);
                LLVMValueRef six = lp_build_const_int32(bld_base->base.gallivm, 6);
@@ -2854,6 +2843,36 @@ static void build_txq_intrinsic(const struct lp_build_tgsi_action * action,
        }
 }
 
+static void si_llvm_emit_txqs(
+       const struct lp_build_tgsi_action * action,
+       struct lp_build_tgsi_context * bld_base,
+       struct lp_build_emit_data * emit_data)
+{
+       struct gallivm_state *gallivm = bld_base->base.gallivm;
+       LLVMBuilderRef builder = gallivm->builder;
+       LLVMTypeRef i32 = LLVMInt32TypeInContext(gallivm->context);
+       LLVMTypeRef v8i32 = LLVMVectorType(i32, 8);
+       LLVMValueRef res, samples;
+       LLVMValueRef res_ptr, samp_ptr, fmask_ptr = NULL;
+
+       tex_fetch_ptrs(bld_base, emit_data, &res_ptr, &samp_ptr, &fmask_ptr);
+
+
+       /* Read the samples from the descriptor directly. */
+       res = LLVMBuildBitCast(builder, res_ptr, v8i32, "");
+       samples = LLVMBuildExtractElement(
+               builder, res,
+               lp_build_const_int32(gallivm, 3), "");
+       samples = LLVMBuildLShr(builder, samples,
+                               lp_build_const_int32(gallivm, 16), "");
+       samples = LLVMBuildAnd(builder, samples,
+                              lp_build_const_int32(gallivm, 0xf), "");
+       samples = LLVMBuildShl(builder, lp_build_const_int32(gallivm, 1),
+                              samples, "");
+
+       emit_data->output[emit_data->chan] = samples;
+}
+
 /*
  * SI implements derivatives using the local data store (LDS)
  * All writes to the LDS happen in all executing threads at
@@ -2905,7 +2924,7 @@ static void si_llvm_emit_ddxy(
        i32 = LLVMInt32TypeInContext(gallivm->context);
 
        indices[0] = bld_base->uint_bld.zero;
-       indices[1] = build_intrinsic(gallivm->builder, "llvm.SI.tid", i32,
+       indices[1] = lp_build_intrinsic(gallivm->builder, "llvm.SI.tid", i32,
                                     NULL, 0, LLVMReadNoneAttribute);
        store_ptr = LLVMBuildGEP(gallivm->builder, si_shader_ctx->lds,
                                 indices, 2, "");
@@ -2981,8 +3000,8 @@ static LLVMValueRef si_llvm_emit_ddxy_interp(
        i32 = LLVMInt32TypeInContext(gallivm->context);
 
        indices[0] = bld_base->uint_bld.zero;
-       indices[1] = build_intrinsic(gallivm->builder, "llvm.SI.tid", i32,
-                                    NULL, 0, LLVMReadNoneAttribute);
+       indices[1] = lp_build_intrinsic(gallivm->builder, "llvm.SI.tid", i32,
+                                       NULL, 0, LLVMReadNoneAttribute);
        store_ptr = LLVMBuildGEP(gallivm->builder, si_shader_ctx->lds,
                                 indices, 2, "");
 
@@ -3182,12 +3201,25 @@ static void build_interp_intrinsic(const struct lp_build_tgsi_action *action,
                args[3] = interp_param;
 
                emit_data->output[chan] =
-                       build_intrinsic(gallivm->builder, intr_name,
-                                       input_type, args, args[3] ? 4 : 3,
-                                       LLVMReadNoneAttribute | LLVMNoUnwindAttribute);
+                       lp_build_intrinsic(gallivm->builder, intr_name,
+                                          input_type, args, args[3] ? 4 : 3,
+                                          LLVMReadNoneAttribute | LLVMNoUnwindAttribute);
        }
 }
 
+static unsigned si_llvm_get_stream(struct lp_build_tgsi_context *bld_base,
+                                      struct lp_build_emit_data *emit_data)
+{
+       LLVMValueRef (*imms)[4] = lp_soa_context(bld_base)->immediates;
+       struct tgsi_src_register src0 = emit_data->inst->Src[0].Register;
+       unsigned stream;
+
+       assert(src0.File == TGSI_FILE_IMMEDIATE);
+
+       stream = LLVMConstIntGetZExtValue(imms[src0.Index][src0.SwizzleX]) & 0x3;
+       return stream;
+}
+
 /* Emit one vertex from the geometry shader */
 static void si_llvm_emit_vertex(
        const struct lp_build_tgsi_action *action,
@@ -3207,9 +3239,14 @@ static void si_llvm_emit_vertex(
        LLVMValueRef args[2];
        unsigned chan;
        int i;
+       unsigned stream;
+
+       stream = si_llvm_get_stream(bld_base, emit_data);
 
        /* Write vertex attribute values to GSVS ring */
-       gs_next_vertex = LLVMBuildLoad(gallivm->builder, si_shader_ctx->gs_next_vertex, "");
+       gs_next_vertex = LLVMBuildLoad(gallivm->builder,
+                                      si_shader_ctx->gs_next_vertex[stream],
+                                      "");
 
        /* If this thread has already emitted the declared maximum number of
         * vertices, kill it: excessive vertex emissions are not supposed to
@@ -3222,8 +3259,9 @@ static void si_llvm_emit_vertex(
        kill = lp_build_select(&bld_base->base, can_emit,
                               lp_build_const_float(gallivm, 1.0f),
                               lp_build_const_float(gallivm, -1.0f));
-       build_intrinsic(gallivm->builder, "llvm.AMDGPU.kill",
-                       LLVMVoidTypeInContext(gallivm->context), &kill, 1, 0);
+
+       lp_build_intrinsic(gallivm->builder, "llvm.AMDGPU.kill",
+                          LLVMVoidTypeInContext(gallivm->context), &kill, 1, 0);
 
        for (i = 0; i < info->num_outputs; i++) {
                LLVMValueRef *out_ptr =
@@ -3241,7 +3279,7 @@ static void si_llvm_emit_vertex(
                        out_val = LLVMBuildBitCast(gallivm->builder, out_val, i32, "");
 
                        build_tbuffer_store(si_shader_ctx,
-                                           si_shader_ctx->gsvs_ring,
+                                           si_shader_ctx->gsvs_ring[stream],
                                            out_val, 1,
                                            voffset, soffset, 0,
                                            V_008F0C_BUF_DATA_FORMAT_32,
@@ -3251,12 +3289,13 @@ static void si_llvm_emit_vertex(
        }
        gs_next_vertex = lp_build_add(uint, gs_next_vertex,
                                      lp_build_const_int32(gallivm, 1));
-       LLVMBuildStore(gallivm->builder, gs_next_vertex, si_shader_ctx->gs_next_vertex);
+
+       LLVMBuildStore(gallivm->builder, gs_next_vertex, si_shader_ctx->gs_next_vertex[stream]);
 
        /* Signal vertex emission */
-       args[0] = lp_build_const_int32(gallivm, SENDMSG_GS_OP_EMIT | SENDMSG_GS);
+       args[0] = lp_build_const_int32(gallivm, SENDMSG_GS_OP_EMIT | SENDMSG_GS | (stream << 8));
        args[1] = LLVMGetParam(si_shader_ctx->radeon_bld.main_fn, SI_PARAM_GS_WAVE_ID);
-       build_intrinsic(gallivm->builder, "llvm.SI.sendmsg",
+       lp_build_intrinsic(gallivm->builder, "llvm.SI.sendmsg",
                        LLVMVoidTypeInContext(gallivm->context), args, 2,
                        LLVMNoUnwindAttribute);
 }
@@ -3270,11 +3309,13 @@ static void si_llvm_emit_primitive(
        struct si_shader_context *si_shader_ctx = si_shader_context(bld_base);
        struct gallivm_state *gallivm = bld_base->base.gallivm;
        LLVMValueRef args[2];
+       unsigned stream;
 
        /* Signal primitive cut */
-       args[0] = lp_build_const_int32(gallivm, SENDMSG_GS_OP_CUT | SENDMSG_GS);
+       stream = si_llvm_get_stream(bld_base, emit_data);
+       args[0] = lp_build_const_int32(gallivm, SENDMSG_GS_OP_CUT | SENDMSG_GS | (stream << 8));
        args[1] = LLVMGetParam(si_shader_ctx->radeon_bld.main_fn, SI_PARAM_GS_WAVE_ID);
-       build_intrinsic(gallivm->builder, "llvm.SI.sendmsg",
+       lp_build_intrinsic(gallivm->builder, "llvm.SI.sendmsg",
                        LLVMVoidTypeInContext(gallivm->context), args, 2,
                        LLVMNoUnwindAttribute);
 }
@@ -3285,7 +3326,7 @@ static void si_llvm_emit_barrier(const struct lp_build_tgsi_action *action,
 {
        struct gallivm_state *gallivm = bld_base->base.gallivm;
 
-       build_intrinsic(gallivm->builder, "llvm.AMDGPU.barrier.local",
+       lp_build_intrinsic(gallivm->builder, "llvm.AMDGPU.barrier.local",
                        LLVMVoidTypeInContext(gallivm->context), NULL, 0,
                        LLVMNoUnwindAttribute);
 }
@@ -3295,12 +3336,6 @@ static const struct lp_build_tgsi_action tex_action = {
        .emit = build_tex_intrinsic,
 };
 
-static const struct lp_build_tgsi_action txq_action = {
-       .fetch_args = txq_fetch_args,
-       .emit = build_txq_intrinsic,
-       .intr_name = "llvm.SI.resinfo"
-};
-
 static const struct lp_build_tgsi_action interp_action = {
        .fetch_args = interp_fetch_args,
        .emit = build_interp_intrinsic,
@@ -3363,15 +3398,15 @@ static void create_function(struct si_shader_context *si_shader_ctx)
        v16i8 = LLVMVectorType(i8, 16);
 
        params[SI_PARAM_RW_BUFFERS] = const_array(v16i8, SI_NUM_RW_BUFFERS);
-       params[SI_PARAM_CONST] = const_array(v16i8, SI_NUM_CONST_BUFFERS);
-       params[SI_PARAM_SAMPLER] = const_array(v4i32, SI_NUM_SAMPLER_STATES);
-       params[SI_PARAM_RESOURCE] = const_array(v8i32, SI_NUM_SAMPLER_VIEWS);
-       last_array_pointer = SI_PARAM_RESOURCE;
+       params[SI_PARAM_CONST_BUFFERS] = const_array(v16i8, SI_NUM_CONST_BUFFERS);
+       params[SI_PARAM_SAMPLER_STATES] = const_array(v4i32, SI_NUM_SAMPLER_STATES);
+       params[SI_PARAM_SAMPLER_VIEWS] = const_array(v8i32, SI_NUM_SAMPLER_VIEWS);
+       last_array_pointer = SI_PARAM_SAMPLER_VIEWS;
 
        switch (si_shader_ctx->type) {
        case TGSI_PROCESSOR_VERTEX:
-               params[SI_PARAM_VERTEX_BUFFER] = const_array(v16i8, SI_NUM_VERTEX_BUFFERS);
-               last_array_pointer = SI_PARAM_VERTEX_BUFFER;
+               params[SI_PARAM_VERTEX_BUFFERS] = const_array(v16i8, SI_NUM_VERTEX_BUFFERS);
+               last_array_pointer = SI_PARAM_VERTEX_BUFFERS;
                params[SI_PARAM_BASE_VERTEX] = i32;
                params[SI_PARAM_START_INSTANCE] = i32;
                num_params = SI_PARAM_START_INSTANCE+1;
@@ -3383,8 +3418,11 @@ static void create_function(struct si_shader_context *si_shader_ctx)
                        num_params = SI_PARAM_LS_OUT_LAYOUT+1;
                } else {
                        if (shader->is_gs_copy_shader) {
-                               last_array_pointer = SI_PARAM_CONST;
-                               num_params = SI_PARAM_CONST+1;
+                               last_array_pointer = SI_PARAM_CONST_BUFFERS;
+                               num_params = SI_PARAM_CONST_BUFFERS+1;
+                       } else {
+                               params[SI_PARAM_VS_STATE_BITS] = i32;
+                               num_params = SI_PARAM_VS_STATE_BITS+1;
                        }
 
                        /* The locations of the other parameters are assigned dynamically. */
@@ -3397,7 +3435,7 @@ static void create_function(struct si_shader_context *si_shader_ctx)
                /* VGPRs */
                params[si_shader_ctx->param_vertex_id = num_params++] = i32;
                params[si_shader_ctx->param_rel_auto_id = num_params++] = i32;
-               params[num_params++] = i32; /* unused */
+               params[si_shader_ctx->param_vs_prim_id = num_params++] = i32;
                params[si_shader_ctx->param_instance_id = num_params++] = i32;
                break;
 
@@ -3453,6 +3491,7 @@ static void create_function(struct si_shader_context *si_shader_ctx)
 
        case TGSI_PROCESSOR_FRAGMENT:
                params[SI_PARAM_ALPHA_REF] = f32;
+               params[SI_PARAM_PS_STATE_BITS] = i32;
                params[SI_PARAM_PRIM_MASK] = i32;
                last_sgpr = SI_PARAM_PRIM_MASK;
                params[SI_PARAM_PERSP_SAMPLE] = v2i32;
@@ -3537,7 +3576,7 @@ static void preload_constants(struct si_shader_context *si_shader_ctx)
        struct gallivm_state * gallivm = bld_base->base.gallivm;
        const struct tgsi_shader_info * info = bld_base->info;
        unsigned buf;
-       LLVMValueRef ptr = LLVMGetParam(si_shader_ctx->radeon_bld.main_fn, SI_PARAM_CONST);
+       LLVMValueRef ptr = LLVMGetParam(si_shader_ctx->radeon_bld.main_fn, SI_PARAM_CONST_BUFFERS);
 
        for (buf = 0; buf < SI_NUM_CONST_BUFFERS; buf++) {
                unsigned i, num_const = info->const_file_max[buf] + 1;
@@ -3549,14 +3588,14 @@ static void preload_constants(struct si_shader_context *si_shader_ctx)
                si_shader_ctx->constants[buf] = CALLOC(num_const * 4, sizeof(LLVMValueRef));
 
                /* Load the resource descriptor */
-               si_shader_ctx->const_resource[buf] =
+               si_shader_ctx->const_buffers[buf] =
                        build_indexed_load_const(si_shader_ctx, ptr, lp_build_const_int32(gallivm, buf));
 
                /* Load the constants, we rely on the code sinking to do the rest */
                for (i = 0; i < num_const * 4; ++i) {
                        si_shader_ctx->constants[buf][i] =
                                buffer_load_const(gallivm->builder,
-                                       si_shader_ctx->const_resource[buf],
+                                       si_shader_ctx->const_buffers[buf],
                                        lp_build_const_int32(gallivm, i * 4),
                                        bld_base->base.elem_type);
                }
@@ -3577,23 +3616,23 @@ static void preload_samplers(struct si_shader_context *si_shader_ctx)
        if (num_samplers == 0)
                return;
 
-       res_ptr = LLVMGetParam(si_shader_ctx->radeon_bld.main_fn, SI_PARAM_RESOURCE);
-       samp_ptr = LLVMGetParam(si_shader_ctx->radeon_bld.main_fn, SI_PARAM_SAMPLER);
+       res_ptr = LLVMGetParam(si_shader_ctx->radeon_bld.main_fn, SI_PARAM_SAMPLER_VIEWS);
+       samp_ptr = LLVMGetParam(si_shader_ctx->radeon_bld.main_fn, SI_PARAM_SAMPLER_STATES);
 
        /* Load the resources and samplers, we rely on the code sinking to do the rest */
        for (i = 0; i < num_samplers; ++i) {
                /* Resource */
                offset = lp_build_const_int32(gallivm, i);
-               si_shader_ctx->resources[i] = build_indexed_load_const(si_shader_ctx, res_ptr, offset);
+               si_shader_ctx->sampler_views[i] = build_indexed_load_const(si_shader_ctx, res_ptr, offset);
 
                /* Sampler */
                offset = lp_build_const_int32(gallivm, i);
-               si_shader_ctx->samplers[i] = build_indexed_load_const(si_shader_ctx, samp_ptr, offset);
+               si_shader_ctx->sampler_states[i] = build_indexed_load_const(si_shader_ctx, samp_ptr, offset);
 
                /* FMASK resource */
                if (info->is_msaa_sampler[i]) {
                        offset = lp_build_const_int32(gallivm, SI_FMASK_TEX_OFFSET + i);
-                       si_shader_ctx->resources[SI_FMASK_TEX_OFFSET + i] =
+                       si_shader_ctx->sampler_views[SI_FMASK_TEX_OFFSET + i] =
                                build_indexed_load_const(si_shader_ctx, res_ptr, offset);
                }
        }
@@ -3651,29 +3690,36 @@ static void preload_ring_buffers(struct si_shader_context *si_shader_ctx)
                        build_indexed_load_const(si_shader_ctx, buf_ptr, offset);
        }
 
-       if (si_shader_ctx->type == TGSI_PROCESSOR_GEOMETRY ||
-           si_shader_ctx->shader->is_gs_copy_shader) {
+       if (si_shader_ctx->shader->is_gs_copy_shader) {
                LLVMValueRef offset = lp_build_const_int32(gallivm, SI_RING_GSVS);
 
-               si_shader_ctx->gsvs_ring =
+               si_shader_ctx->gsvs_ring[0] =
                        build_indexed_load_const(si_shader_ctx, buf_ptr, offset);
        }
+       if (si_shader_ctx->type == TGSI_PROCESSOR_GEOMETRY) {
+               int i;
+               for (i = 0; i < 4; i++) {
+                       LLVMValueRef offset = lp_build_const_int32(gallivm, SI_RING_GSVS + i);
+
+                       si_shader_ctx->gsvs_ring[i] =
+                               build_indexed_load_const(si_shader_ctx, buf_ptr, offset);
+               }
+       }
 }
 
-void si_shader_binary_read_config(const struct si_screen *sscreen,
-                               struct si_shader *shader,
-                               unsigned symbol_offset)
+void si_shader_binary_read_config(struct radeon_shader_binary *binary,
+                                 struct si_shader_config *conf,
+                                 unsigned symbol_offset)
 {
        unsigned i;
        const unsigned char *config =
-               radeon_shader_binary_config_start(&shader->binary,
-                                               symbol_offset);
+               radeon_shader_binary_config_start(binary, symbol_offset);
 
        /* XXX: We may be able to emit some of these values directly rather than
         * extracting fields to be emitted later.
         */
 
-       for (i = 0; i < shader->binary.config_size_per_symbol; i+= 8) {
+       for (i = 0; i < binary->config_size_per_symbol; i+= 8) {
                unsigned reg = util_le32_to_cpu(*(uint32_t*)(config + i));
                unsigned value = util_le32_to_cpu(*(uint32_t*)(config + i + 4));
                switch (reg) {
@@ -3681,23 +3727,25 @@ void si_shader_binary_read_config(const struct si_screen *sscreen,
                case R_00B128_SPI_SHADER_PGM_RSRC1_VS:
                case R_00B228_SPI_SHADER_PGM_RSRC1_GS:
                case R_00B848_COMPUTE_PGM_RSRC1:
-                       shader->num_sgprs = MAX2(shader->num_sgprs, (G_00B028_SGPRS(value) + 1) * 8);
-                       shader->num_vgprs = MAX2(shader->num_vgprs, (G_00B028_VGPRS(value) + 1) * 4);
-                       shader->float_mode =  G_00B028_FLOAT_MODE(value);
+                       conf->num_sgprs = MAX2(conf->num_sgprs, (G_00B028_SGPRS(value) + 1) * 8);
+                       conf->num_vgprs = MAX2(conf->num_vgprs, (G_00B028_VGPRS(value) + 1) * 4);
+                       conf->float_mode =  G_00B028_FLOAT_MODE(value);
+                       conf->rsrc1 = value;
                        break;
                case R_00B02C_SPI_SHADER_PGM_RSRC2_PS:
-                       shader->lds_size = MAX2(shader->lds_size, G_00B02C_EXTRA_LDS_SIZE(value));
+                       conf->lds_size = MAX2(conf->lds_size, G_00B02C_EXTRA_LDS_SIZE(value));
                        break;
                case R_00B84C_COMPUTE_PGM_RSRC2:
-                       shader->lds_size = MAX2(shader->lds_size, G_00B84C_LDS_SIZE(value));
+                       conf->lds_size = MAX2(conf->lds_size, G_00B84C_LDS_SIZE(value));
+                       conf->rsrc2 = value;
                        break;
                case R_0286CC_SPI_PS_INPUT_ENA:
-                       shader->spi_ps_input_ena = value;
+                       conf->spi_ps_input_ena = value;
                        break;
                case R_0286E8_SPI_TMPRING_SIZE:
                case R_00B860_COMPUTE_TMPRING_SIZE:
                        /* WAVESIZE is in units of 256 dwords. */
-                       shader->scratch_bytes_per_wave =
+                       conf->scratch_bytes_per_wave =
                                G_00B860_WAVESIZE(value) * 256 * 4 * 1;
                        break;
                default:
@@ -3713,10 +3761,10 @@ void si_shader_apply_scratch_relocs(struct si_context *sctx,
                        uint64_t scratch_va)
 {
        unsigned i;
-       uint32_t scratch_rsrc_dword0 = scratch_va & 0xffffffff;
+       uint32_t scratch_rsrc_dword0 = scratch_va;
        uint32_t scratch_rsrc_dword1 =
                S_008F04_BASE_ADDRESS_HI(scratch_va >> 32)
-               |  S_008F04_STRIDE(shader->scratch_bytes_per_wave / 64);
+               |  S_008F04_STRIDE(shader->config.scratch_bytes_per_wave / 64);
 
        for (i = 0 ; i < shader->binary.reloc_count; i++) {
                const struct radeon_shader_reloc *reloc =
@@ -3744,7 +3792,7 @@ int si_shader_binary_upload(struct si_screen *sscreen, struct si_shader *shader)
        if (!shader->bo)
                return -ENOMEM;
 
-       ptr = sscreen->b.ws->buffer_map(shader->bo->cs_buf, NULL,
+       ptr = sscreen->b.ws->buffer_map(shader->bo->buf, NULL,
                                        PIPE_TRANSFER_READ_WRITE);
        util_memcpy_cpu_to_le32(ptr, binary->code, binary->code_size);
        if (binary->rodata_size > 0) {
@@ -3753,68 +3801,119 @@ int si_shader_binary_upload(struct si_screen *sscreen, struct si_shader *shader)
                                        binary->rodata_size);
        }
 
-       sscreen->b.ws->buffer_unmap(shader->bo->cs_buf);
+       sscreen->b.ws->buffer_unmap(shader->bo->buf);
        return 0;
 }
 
-int si_shader_binary_read(struct si_screen *sscreen, struct si_shader *shader)
+static void si_shader_dump_disassembly(const struct radeon_shader_binary *binary,
+                                      struct pipe_debug_callback *debug)
 {
-       const struct radeon_shader_binary *binary = &shader->binary;
-       unsigned i;
-       bool dump  = r600_can_dump_shader(&sscreen->b,
-               shader->selector ? shader->selector->tokens : NULL);
-
-       si_shader_binary_read_config(sscreen, shader, 0);
-       si_shader_binary_upload(sscreen, shader);
-
-       if (dump) {
-               if (!binary->disassembled) {
-                       fprintf(stderr, "SI CODE:\n");
-                       for (i = 0; i < binary->code_size; i+=4 ) {
-                               fprintf(stderr, "@0x%x: %02x%02x%02x%02x\n", i, binary->code[i + 3],
-                               binary->code[i + 2], binary->code[i + 1],
-                               binary->code[i]);
+       char *line, *p;
+       unsigned i, count;
+
+       if (binary->disasm_string) {
+               fprintf(stderr, "\nShader Disassembly:\n\n");
+               fprintf(stderr, "%s\n", binary->disasm_string);
+
+               if (debug && debug->debug_message) {
+                       /* Very long debug messages are cut off, so send the
+                        * disassembly one line at a time. This causes more
+                        * overhead, but on the plus side it simplifies
+                        * parsing of resulting logs.
+                        */
+                       pipe_debug_message(debug, SHADER_INFO,
+                                          "Shader Disassembly Begin");
+
+                       line = binary->disasm_string;
+                       while (*line) {
+                               p = strchrnul(line, '\n');
+                               count = p - line;
+
+                               if (count) {
+                                       pipe_debug_message(debug, SHADER_INFO,
+                                                          "%.*s", count, line);
+                               }
+
+                               if (!*p)
+                                       break;
+                               line = p + 1;
                        }
+
+                       pipe_debug_message(debug, SHADER_INFO,
+                                          "Shader Disassembly End");
+               }
+       } else {
+               fprintf(stderr, "SI CODE:\n");
+               for (i = 0; i < binary->code_size; i += 4) {
+                       fprintf(stderr, "@0x%x: %02x%02x%02x%02x\n", i,
+                               binary->code[i + 3], binary->code[i + 2],
+                               binary->code[i + 1], binary->code[i]);
                }
+       }
+}
+
+void si_shader_binary_read(struct si_screen *sscreen,
+                          struct radeon_shader_binary *binary,
+                          struct si_shader_config *conf,
+                          struct pipe_debug_callback *debug,
+                          unsigned processor)
+{
+       si_shader_binary_read_config(binary, conf, 0);
+
+       if (r600_can_dump_shader(&sscreen->b, processor)) {
+               if (!(sscreen->b.debug_flags & DBG_NO_ASM))
+                       si_shader_dump_disassembly(binary, debug);
 
                fprintf(stderr, "*** SHADER STATS ***\n"
                        "SGPRS: %d\nVGPRS: %d\nCode Size: %d bytes\nLDS: %d blocks\n"
                        "Scratch: %d bytes per wave\n********************\n",
-                       shader->num_sgprs, shader->num_vgprs, binary->code_size,
-                       shader->lds_size, shader->scratch_bytes_per_wave);
+                       conf->num_sgprs, conf->num_vgprs, binary->code_size,
+                       conf->lds_size, conf->scratch_bytes_per_wave);
        }
-       return 0;
+
+       pipe_debug_message(debug, SHADER_INFO,
+                          "Shader Stats: SGPRS: %d VGPRS: %d Code Size: %d LDS: %d Scratch: %d",
+                          conf->num_sgprs, conf->num_vgprs, binary->code_size,
+                          conf->lds_size, conf->scratch_bytes_per_wave);
 }
 
 int si_compile_llvm(struct si_screen *sscreen, struct si_shader *shader,
-                   LLVMTargetMachineRef tm, LLVMModuleRef mod)
+                   LLVMTargetMachineRef tm, LLVMModuleRef mod,
+                   struct pipe_debug_callback *debug, unsigned processor)
 {
        int r = 0;
-       bool dump = r600_can_dump_shader(&sscreen->b,
-                       shader->selector ? shader->selector->tokens : NULL);
-       r = radeon_llvm_compile(mod, &shader->binary,
-               r600_get_llvm_processor_name(sscreen->b.family), dump, tm);
+       unsigned count = p_atomic_inc_return(&sscreen->b.num_compilations);
 
-       if (r) {
-               return r;
+       if (r600_can_dump_shader(&sscreen->b, processor)) {
+               fprintf(stderr, "radeonsi: Compiling shader %d\n", count);
+
+               if (!(sscreen->b.debug_flags & DBG_NO_IR))
+                       LLVMDumpModule(mod);
+       }
+
+       if (!si_replace_shader(count, &shader->binary)) {
+               r = radeon_llvm_compile(mod, &shader->binary,
+                       r600_get_llvm_processor_name(sscreen->b.family), tm,
+                       debug);
+               if (r)
+                       return r;
        }
-       r = si_shader_binary_read(sscreen, shader);
+
+       si_shader_binary_read(sscreen, &shader->binary, &shader->config,
+                             debug, processor);
 
        FREE(shader->binary.config);
-       FREE(shader->binary.rodata);
        FREE(shader->binary.global_symbol_offsets);
-       if (shader->scratch_bytes_per_wave == 0) {
-               FREE(shader->binary.code);
-               FREE(shader->binary.relocs);
-               memset(&shader->binary, 0, sizeof(shader->binary));
-       }
+       shader->binary.config = NULL;
+       shader->binary.global_symbol_offsets = NULL;
        return r;
 }
 
 /* Generate code for the hardware VS shader stage to go with a geometry shader */
 static int si_generate_gs_copy_shader(struct si_screen *sscreen,
                                      struct si_shader_context *si_shader_ctx,
-                                     struct si_shader *gs, bool dump)
+                                     struct si_shader *gs, bool dump,
+                                     struct pipe_debug_callback *debug)
 {
        struct gallivm_state *gallivm = &si_shader_ctx->radeon_bld.gallivm;
        struct lp_build_tgsi_context *bld_base = &si_shader_ctx->radeon_bld.soa.bld_base;
@@ -3838,7 +3937,7 @@ static int si_generate_gs_copy_shader(struct si_screen *sscreen,
        preload_streamout_buffers(si_shader_ctx);
        preload_ring_buffers(si_shader_ctx);
 
-       args[0] = si_shader_ctx->gsvs_ring;
+       args[0] = si_shader_ctx->gsvs_ring[0];
        args[1] = lp_build_mul_imm(uint,
                                   LLVMGetParam(si_shader_ctx->radeon_bld.main_fn,
                                                si_shader_ctx->param_vertex_id),
@@ -3864,7 +3963,7 @@ static int si_generate_gs_copy_shader(struct si_screen *sscreen,
 
                        outputs[i].values[chan] =
                                LLVMBuildBitCast(gallivm->builder,
-                                                build_intrinsic(gallivm->builder,
+                                                lp_build_intrinsic(gallivm->builder,
                                                                 "llvm.SI.buffer.load.dword.i32.i32",
                                                                 LLVMInt32TypeInContext(gallivm->context),
                                                                 args, 9,
@@ -3881,7 +3980,10 @@ static int si_generate_gs_copy_shader(struct si_screen *sscreen,
                fprintf(stderr, "Copy Vertex Shader for Geometry Shader:\n\n");
 
        r = si_compile_llvm(sscreen, si_shader_ctx->shader,
-                           si_shader_ctx->tm, bld_base->base.gallivm->module);
+                           si_shader_ctx->tm, bld_base->base.gallivm->module,
+                           debug, TGSI_PROCESSOR_GEOMETRY);
+       if (!r)
+               r = si_shader_binary_upload(sscreen, si_shader_ctx->shader);
 
        radeon_llvm_dispose(&si_shader_ctx->radeon_bld);
 
@@ -3889,48 +3991,44 @@ static int si_generate_gs_copy_shader(struct si_screen *sscreen,
        return r;
 }
 
-static void si_dump_key(unsigned shader, union si_shader_key *key)
+void si_dump_shader_key(unsigned shader, union si_shader_key *key, FILE *f)
 {
        int i;
 
-       fprintf(stderr, "SHADER KEY\n");
+       fprintf(f, "SHADER KEY\n");
 
        switch (shader) {
        case PIPE_SHADER_VERTEX:
-               fprintf(stderr, "  instance_divisors = {");
+               fprintf(f, "  instance_divisors = {");
                for (i = 0; i < Elements(key->vs.instance_divisors); i++)
-                       fprintf(stderr, !i ? "%u" : ", %u",
+                       fprintf(f, !i ? "%u" : ", %u",
                                key->vs.instance_divisors[i]);
-               fprintf(stderr, "}\n");
-
-               if (key->vs.as_es)
-                       fprintf(stderr, "  es_enabled_outputs = 0x%"PRIx64"\n",
-                               key->vs.es_enabled_outputs);
-               fprintf(stderr, "  as_es = %u\n", key->vs.as_es);
-               fprintf(stderr, "  as_es = %u\n", key->vs.as_ls);
+               fprintf(f, "}\n");
+               fprintf(f, "  as_es = %u\n", key->vs.as_es);
+               fprintf(f, "  as_ls = %u\n", key->vs.as_ls);
+               fprintf(f, "  export_prim_id = %u\n", key->vs.export_prim_id);
                break;
 
        case PIPE_SHADER_TESS_CTRL:
-               fprintf(stderr, "  prim_mode = %u\n", key->tcs.prim_mode);
+               fprintf(f, "  prim_mode = %u\n", key->tcs.prim_mode);
                break;
 
        case PIPE_SHADER_TESS_EVAL:
-               if (key->tes.as_es)
-                       fprintf(stderr, "  es_enabled_outputs = 0x%"PRIx64"\n",
-                               key->tes.es_enabled_outputs);
-               fprintf(stderr, "  as_es = %u\n", key->tes.as_es);
+               fprintf(f, "  as_es = %u\n", key->tes.as_es);
+               fprintf(f, "  export_prim_id = %u\n", key->tes.export_prim_id);
                break;
 
        case PIPE_SHADER_GEOMETRY:
                break;
 
        case PIPE_SHADER_FRAGMENT:
-               fprintf(stderr, "  export_16bpc = 0x%X\n", key->ps.export_16bpc);
-               fprintf(stderr, "  last_cbuf = %u\n", key->ps.last_cbuf);
-               fprintf(stderr, "  color_two_side = %u\n", key->ps.color_two_side);
-               fprintf(stderr, "  alpha_func = %u\n", key->ps.alpha_func);
-               fprintf(stderr, "  alpha_to_one = %u\n", key->ps.alpha_to_one);
-               fprintf(stderr, "  poly_stipple = %u\n", key->ps.poly_stipple);
+               fprintf(f, "  export_16bpc = 0x%X\n", key->ps.export_16bpc);
+               fprintf(f, "  last_cbuf = %u\n", key->ps.last_cbuf);
+               fprintf(f, "  color_two_side = %u\n", key->ps.color_two_side);
+               fprintf(f, "  alpha_func = %u\n", key->ps.alpha_func);
+               fprintf(f, "  alpha_to_one = %u\n", key->ps.alpha_to_one);
+               fprintf(f, "  poly_stipple = %u\n", key->ps.poly_stipple);
+               fprintf(f, "  clamp_color = %u\n", key->ps.clamp_color);
                break;
 
        default:
@@ -3939,7 +4037,8 @@ static void si_dump_key(unsigned shader, union si_shader_key *key)
 }
 
 int si_shader_create(struct si_screen *sscreen, LLVMTargetMachineRef tm,
-                    struct si_shader *shader)
+                    struct si_shader *shader,
+                    struct pipe_debug_callback *debug)
 {
        struct si_shader_selector *sel = shader->selector;
        struct tgsi_token *tokens = sel->tokens;
@@ -3950,7 +4049,7 @@ int si_shader_create(struct si_screen *sscreen, LLVMTargetMachineRef tm,
        int r = 0;
        bool poly_stipple = sel->type == PIPE_SHADER_FRAGMENT &&
                            shader->key.ps.poly_stipple;
-       bool dump = r600_can_dump_shader(&sscreen->b, sel->tokens);
+       bool dump = r600_can_dump_shader(&sscreen->b, sel->info.processor);
 
        if (poly_stipple) {
                tokens = util_pstipple_create_fragment_shader(tokens, NULL,
@@ -3960,8 +4059,8 @@ int si_shader_create(struct si_screen *sscreen, LLVMTargetMachineRef tm,
 
        /* Dump TGSI code before doing TGSI->LLVM conversion in case the
         * conversion fails. */
-       if (dump) {
-               si_dump_key(sel->type, &shader->key);
+       if (dump && !(sscreen->b.debug_flags & DBG_NO_TGSI)) {
+               si_dump_shader_key(sel->type, &shader->key, stderr);
                tgsi_dump(tokens, 0);
                si_dump_streamout(&sel->so);
        }
@@ -3975,9 +4074,6 @@ int si_shader_create(struct si_screen *sscreen, LLVMTargetMachineRef tm,
        if (sel->type != PIPE_SHADER_COMPUTE)
                shader->dx10_clamp_mode = true;
 
-       if (sel->info.uses_kill)
-               shader->db_shader_control |= S_02880C_KILL_ENABLE(1);
-
        shader->uses_instanceid = sel->info.uses_instanceid;
        bld_base->info = poly_stipple ? &stipple_shader_info : &sel->info;
        bld_base->emit_fetch_funcs[TGSI_FILE_CONSTANT] = fetch_constant;
@@ -3995,9 +4091,10 @@ int si_shader_create(struct si_screen *sscreen, LLVMTargetMachineRef tm,
        bld_base->op_actions[TGSI_OPCODE_TXL] = tex_action;
        bld_base->op_actions[TGSI_OPCODE_TXL2] = tex_action;
        bld_base->op_actions[TGSI_OPCODE_TXP] = tex_action;
-       bld_base->op_actions[TGSI_OPCODE_TXQ] = txq_action;
+       bld_base->op_actions[TGSI_OPCODE_TXQ] = tex_action;
        bld_base->op_actions[TGSI_OPCODE_TG4] = tex_action;
        bld_base->op_actions[TGSI_OPCODE_LODQ] = tex_action;
+       bld_base->op_actions[TGSI_OPCODE_TXQS].emit = si_llvm_emit_txqs;
 
        bld_base->op_actions[TGSI_OPCODE_DDX].emit = si_llvm_emit_ddxy;
        bld_base->op_actions[TGSI_OPCODE_DDY].emit = si_llvm_emit_ddxy;
@@ -4051,17 +4148,6 @@ int si_shader_create(struct si_screen *sscreen, LLVMTargetMachineRef tm,
        case TGSI_PROCESSOR_FRAGMENT:
                si_shader_ctx.radeon_bld.load_input = declare_input_fs;
                bld_base->emit_epilogue = si_llvm_emit_fs_epilogue;
-
-               switch (sel->info.properties[TGSI_PROPERTY_FS_DEPTH_LAYOUT]) {
-               case TGSI_FS_DEPTH_LAYOUT_GREATER:
-                       shader->db_shader_control |=
-                               S_02880C_CONSERVATIVE_Z_EXPORT(V_02880C_EXPORT_GREATER_THAN_Z);
-                       break;
-               case TGSI_FS_DEPTH_LAYOUT_LESS:
-                       shader->db_shader_control |=
-                               S_02880C_CONSERVATIVE_Z_EXPORT(V_02880C_EXPORT_LESS_THAN_Z);
-                       break;
-               }
                break;
        default:
                assert(!"Unsupported shader type");
@@ -4076,9 +4162,12 @@ int si_shader_create(struct si_screen *sscreen, LLVMTargetMachineRef tm,
        preload_ring_buffers(&si_shader_ctx);
 
        if (si_shader_ctx.type == TGSI_PROCESSOR_GEOMETRY) {
-               si_shader_ctx.gs_next_vertex =
-                       lp_build_alloca(bld_base->base.gallivm,
-                                       bld_base->uint_bld.elem_type, "");
+               int i;
+               for (i = 0; i < 4; i++) {
+                       si_shader_ctx.gs_next_vertex[i] =
+                               lp_build_alloca(bld_base->base.gallivm,
+                                               bld_base->uint_bld.elem_type, "");
+               }
        }
 
        if (!lp_build_tgsi_llvm(bld_base, tokens)) {
@@ -4089,12 +4178,18 @@ int si_shader_create(struct si_screen *sscreen, LLVMTargetMachineRef tm,
        radeon_llvm_finalize_module(&si_shader_ctx.radeon_bld);
 
        mod = bld_base->base.gallivm->module;
-       r = si_compile_llvm(sscreen, shader, tm, mod);
+       r = si_compile_llvm(sscreen, shader, tm, mod, debug, si_shader_ctx.type);
        if (r) {
                fprintf(stderr, "LLVM failed to compile shader\n");
                goto out;
        }
 
+       r = si_shader_binary_upload(sscreen, shader);
+       if (r) {
+               fprintf(stderr, "LLVM failed to upload shader\n");
+               goto out;
+       }
+
        radeon_llvm_dispose(&si_shader_ctx.radeon_bld);
 
        if (si_shader_ctx.type == TGSI_PROCESSOR_GEOMETRY) {
@@ -4103,7 +4198,7 @@ int si_shader_create(struct si_screen *sscreen, LLVMTargetMachineRef tm,
                shader->gs_copy_shader->key = shader->key;
                si_shader_ctx.shader = shader->gs_copy_shader;
                if ((r = si_generate_gs_copy_shader(sscreen, &si_shader_ctx,
-                                                   shader, dump))) {
+                                                   shader, dump, debug))) {
                        free(shader->gs_copy_shader);
                        shader->gs_copy_shader = NULL;
                        goto out;
@@ -4118,10 +4213,12 @@ out:
        return r;
 }
 
-void si_shader_destroy(struct pipe_context *ctx, struct si_shader *shader)
+void si_shader_destroy(struct si_shader *shader)
 {
-       if (shader->gs_copy_shader)
-               si_shader_destroy(ctx, shader->gs_copy_shader);
+       if (shader->gs_copy_shader) {
+               si_shader_destroy(shader->gs_copy_shader);
+               FREE(shader->gs_copy_shader);
+       }
 
        if (shader->scratch_bo)
                r600_resource_reference(&shader->scratch_bo, NULL);
@@ -4129,5 +4226,7 @@ void si_shader_destroy(struct pipe_context *ctx, struct si_shader *shader)
        r600_resource_reference(&shader->bo, NULL);
 
        FREE(shader->binary.code);
+       FREE(shader->binary.rodata);
        FREE(shader->binary.relocs);
+       FREE(shader->binary.disasm_string);
 }