gallium/radeon: add basic code for setting shader return values
[mesa.git] / src / gallium / drivers / radeonsi / si_shader.c
index 98b42890f7d6fd19631dd9e9186d96cf1cfe2af2..422608eb4cee40f58909d877154ca4742dc4d906 100644 (file)
@@ -67,7 +67,9 @@ struct si_shader_context
        struct radeon_llvm_context radeon_bld;
        struct si_shader *shader;
        struct si_screen *screen;
+
        unsigned type; /* TGSI_PROCESSOR_* specifies the type of shader. */
+       bool is_gs_copy_shader;
        int param_streamout_config;
        int param_streamout_write_index;
        int param_streamout_offset[4];
@@ -80,25 +82,46 @@ struct si_shader_context
        int param_tes_rel_patch_id;
        int param_tes_patch_id;
        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_SAMPLERS];
+       LLVMValueRef sampler_states[SI_NUM_SAMPLERS];
+       LLVMValueRef fmasks[SI_NUM_USER_SAMPLERS];
        LLVMValueRef so_buffers[4];
        LLVMValueRef esgs_ring;
        LLVMValueRef gsvs_ring[4];
        LLVMValueRef gs_next_vertex[4];
+       LLVMValueRef return_value;
+
+       LLVMTypeRef voidt;
+       LLVMTypeRef i1;
+       LLVMTypeRef i8;
+       LLVMTypeRef i32;
+       LLVMTypeRef i128;
+       LLVMTypeRef f32;
+       LLVMTypeRef v16i8;
+       LLVMTypeRef v4i32;
+       LLVMTypeRef v4f32;
+       LLVMTypeRef v8i32;
 };
 
-static struct si_shader_context * si_shader_context(
-       struct lp_build_tgsi_context * bld_base)
+static struct si_shader_context *si_shader_context(
+       struct lp_build_tgsi_context *bld_base)
 {
        return (struct si_shader_context *)bld_base;
 }
 
+static void si_init_shader_ctx(struct si_shader_context *ctx,
+                              struct si_screen *sscreen,
+                              struct si_shader *shader,
+                              LLVMTargetMachineRef tm,
+                              struct tgsi_shader_info *info);
+
 
 #define PERSPECTIVE_BASE 0
 #define LINEAR_BASE 9
@@ -163,58 +186,15 @@ 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.
  */
-static LLVMValueRef unpack_param(struct si_shader_context *si_shader_ctx,
+static LLVMValueRef unpack_param(struct si_shader_context *ctx,
                                 unsigned param, unsigned rshift,
                                 unsigned bitwidth)
 {
-       struct gallivm_state *gallivm = &si_shader_ctx->radeon_bld.gallivm;
-       LLVMValueRef value = LLVMGetParam(si_shader_ctx->radeon_bld.main_fn,
+       struct gallivm_state *gallivm = &ctx->radeon_bld.gallivm;
+       LLVMValueRef value = LLVMGetParam(ctx->radeon_bld.main_fn,
                                          param);
 
        if (rshift)
@@ -230,15 +210,15 @@ static LLVMValueRef unpack_param(struct si_shader_context *si_shader_ctx,
        return value;
 }
 
-static LLVMValueRef get_rel_patch_id(struct si_shader_context *si_shader_ctx)
+static LLVMValueRef get_rel_patch_id(struct si_shader_context *ctx)
 {
-       switch (si_shader_ctx->type) {
+       switch (ctx->type) {
        case TGSI_PROCESSOR_TESS_CTRL:
-               return unpack_param(si_shader_ctx, SI_PARAM_REL_IDS, 0, 8);
+               return unpack_param(ctx, SI_PARAM_REL_IDS, 0, 8);
 
        case TGSI_PROCESSOR_TESS_EVAL:
-               return LLVMGetParam(si_shader_ctx->radeon_bld.main_fn,
-                                   si_shader_ctx->param_tes_rel_patch_id);
+               return LLVMGetParam(ctx->radeon_bld.main_fn,
+                                   ctx->param_tes_rel_patch_id);
 
        default:
                assert(0);
@@ -268,12 +248,12 @@ static LLVMValueRef get_rel_patch_id(struct si_shader_context *si_shader_ctx)
  */
 
 static LLVMValueRef
-get_tcs_in_patch_stride(struct si_shader_context *si_shader_ctx)
+get_tcs_in_patch_stride(struct si_shader_context *ctx)
 {
-       if (si_shader_ctx->type == TGSI_PROCESSOR_VERTEX)
-               return unpack_param(si_shader_ctx, SI_PARAM_LS_OUT_LAYOUT, 0, 13);
-       else if (si_shader_ctx->type == TGSI_PROCESSOR_TESS_CTRL)
-               return unpack_param(si_shader_ctx, SI_PARAM_TCS_IN_LAYOUT, 0, 13);
+       if (ctx->type == TGSI_PROCESSOR_VERTEX)
+               return unpack_param(ctx, SI_PARAM_LS_OUT_LAYOUT, 0, 13);
+       else if (ctx->type == TGSI_PROCESSOR_TESS_CTRL)
+               return unpack_param(ctx, SI_PARAM_TCS_IN_LAYOUT, 0, 13);
        else {
                assert(0);
                return NULL;
@@ -281,48 +261,48 @@ get_tcs_in_patch_stride(struct si_shader_context *si_shader_ctx)
 }
 
 static LLVMValueRef
-get_tcs_out_patch_stride(struct si_shader_context *si_shader_ctx)
+get_tcs_out_patch_stride(struct si_shader_context *ctx)
 {
-       return unpack_param(si_shader_ctx, SI_PARAM_TCS_OUT_LAYOUT, 0, 13);
+       return unpack_param(ctx, SI_PARAM_TCS_OUT_LAYOUT, 0, 13);
 }
 
 static LLVMValueRef
-get_tcs_out_patch0_offset(struct si_shader_context *si_shader_ctx)
+get_tcs_out_patch0_offset(struct si_shader_context *ctx)
 {
-       return lp_build_mul_imm(&si_shader_ctx->radeon_bld.soa.bld_base.uint_bld,
-                               unpack_param(si_shader_ctx,
+       return lp_build_mul_imm(&ctx->radeon_bld.soa.bld_base.uint_bld,
+                               unpack_param(ctx,
                                             SI_PARAM_TCS_OUT_OFFSETS,
                                             0, 16),
                                4);
 }
 
 static LLVMValueRef
-get_tcs_out_patch0_patch_data_offset(struct si_shader_context *si_shader_ctx)
+get_tcs_out_patch0_patch_data_offset(struct si_shader_context *ctx)
 {
-       return lp_build_mul_imm(&si_shader_ctx->radeon_bld.soa.bld_base.uint_bld,
-                               unpack_param(si_shader_ctx,
+       return lp_build_mul_imm(&ctx->radeon_bld.soa.bld_base.uint_bld,
+                               unpack_param(ctx,
                                             SI_PARAM_TCS_OUT_OFFSETS,
                                             16, 16),
                                4);
 }
 
 static LLVMValueRef
-get_tcs_in_current_patch_offset(struct si_shader_context *si_shader_ctx)
+get_tcs_in_current_patch_offset(struct si_shader_context *ctx)
 {
-       struct gallivm_state *gallivm = &si_shader_ctx->radeon_bld.gallivm;
-       LLVMValueRef patch_stride = get_tcs_in_patch_stride(si_shader_ctx);
-       LLVMValueRef rel_patch_id = get_rel_patch_id(si_shader_ctx);
+       struct gallivm_state *gallivm = &ctx->radeon_bld.gallivm;
+       LLVMValueRef patch_stride = get_tcs_in_patch_stride(ctx);
+       LLVMValueRef rel_patch_id = get_rel_patch_id(ctx);
 
        return LLVMBuildMul(gallivm->builder, patch_stride, rel_patch_id, "");
 }
 
 static LLVMValueRef
-get_tcs_out_current_patch_offset(struct si_shader_context *si_shader_ctx)
+get_tcs_out_current_patch_offset(struct si_shader_context *ctx)
 {
-       struct gallivm_state *gallivm = &si_shader_ctx->radeon_bld.gallivm;
-       LLVMValueRef patch0_offset = get_tcs_out_patch0_offset(si_shader_ctx);
-       LLVMValueRef patch_stride = get_tcs_out_patch_stride(si_shader_ctx);
-       LLVMValueRef rel_patch_id = get_rel_patch_id(si_shader_ctx);
+       struct gallivm_state *gallivm = &ctx->radeon_bld.gallivm;
+       LLVMValueRef patch0_offset = get_tcs_out_patch0_offset(ctx);
+       LLVMValueRef patch_stride = get_tcs_out_patch_stride(ctx);
+       LLVMValueRef rel_patch_id = get_rel_patch_id(ctx);
 
        return LLVMBuildAdd(gallivm->builder, patch0_offset,
                            LLVMBuildMul(gallivm->builder, patch_stride,
@@ -331,13 +311,13 @@ get_tcs_out_current_patch_offset(struct si_shader_context *si_shader_ctx)
 }
 
 static LLVMValueRef
-get_tcs_out_current_patch_data_offset(struct si_shader_context *si_shader_ctx)
+get_tcs_out_current_patch_data_offset(struct si_shader_context *ctx)
 {
-       struct gallivm_state *gallivm = &si_shader_ctx->radeon_bld.gallivm;
+       struct gallivm_state *gallivm = &ctx->radeon_bld.gallivm;
        LLVMValueRef patch0_patch_data_offset =
-               get_tcs_out_patch0_patch_data_offset(si_shader_ctx);
-       LLVMValueRef patch_stride = get_tcs_out_patch_stride(si_shader_ctx);
-       LLVMValueRef rel_patch_id = get_rel_patch_id(si_shader_ctx);
+               get_tcs_out_patch0_patch_data_offset(ctx);
+       LLVMValueRef patch_stride = get_tcs_out_patch_stride(ctx);
+       LLVMValueRef rel_patch_id = get_rel_patch_id(ctx);
 
        return LLVMBuildAdd(gallivm->builder, patch0_patch_data_offset,
                            LLVMBuildMul(gallivm->builder, patch_stride,
@@ -345,11 +325,11 @@ get_tcs_out_current_patch_data_offset(struct si_shader_context *si_shader_ctx)
                            "");
 }
 
-static void build_indexed_store(struct si_shader_context *si_shader_ctx,
+static void build_indexed_store(struct si_shader_context *ctx,
                                LLVMValueRef base_ptr, LLVMValueRef index,
                                LLVMValueRef value)
 {
-       struct lp_build_tgsi_context *bld_base = &si_shader_ctx->radeon_bld.soa.bld_base;
+       struct lp_build_tgsi_context *bld_base = &ctx->radeon_bld.soa.bld_base;
        struct gallivm_state *gallivm = bld_base->base.gallivm;
        LLVMValueRef indices[2], pointer;
 
@@ -367,10 +347,10 @@ static void build_indexed_store(struct si_shader_context *si_shader_ctx,
  * \param base_ptr  Where the array starts.
  * \param index     The element index into the array.
  */
-static LLVMValueRef build_indexed_load(struct si_shader_context *si_shader_ctx,
+static LLVMValueRef build_indexed_load(struct si_shader_context *ctx,
                                       LLVMValueRef base_ptr, LLVMValueRef index)
 {
-       struct lp_build_tgsi_context *bld_base = &si_shader_ctx->radeon_bld.soa.bld_base;
+       struct lp_build_tgsi_context *bld_base = &ctx->radeon_bld.soa.bld_base;
        struct gallivm_state *gallivm = bld_base->base.gallivm;
        LLVMValueRef indices[2], pointer;
 
@@ -386,24 +366,24 @@ static LLVMValueRef build_indexed_load(struct si_shader_context *si_shader_ctx,
  * a constant.
  */
 static LLVMValueRef build_indexed_load_const(
-       struct si_shader_context * si_shader_ctx,
+       struct si_shader_context *ctx,
        LLVMValueRef base_ptr, LLVMValueRef index)
 {
-       LLVMValueRef result = build_indexed_load(si_shader_ctx, base_ptr, index);
-       LLVMSetMetadata(result, 1, si_shader_ctx->const_md);
+       LLVMValueRef result = build_indexed_load(ctx, base_ptr, index);
+       LLVMSetMetadata(result, 1, ctx->const_md);
        return result;
 }
 
 static LLVMValueRef get_instance_index_for_fetch(
-       struct radeon_llvm_context * radeon_bld,
+       struct radeon_llvm_context *radeon_bld,
        unsigned divisor)
 {
-       struct si_shader_context *si_shader_ctx =
+       struct si_shader_context *ctx =
                si_shader_context(&radeon_bld->soa.bld_base);
-       struct gallivm_state * gallivm = radeon_bld->soa.bld_base.base.gallivm;
+       struct gallivm_state *gallivm = radeon_bld->soa.bld_base.base.gallivm;
 
        LLVMValueRef result = LLVMGetParam(radeon_bld->main_fn,
-                                          si_shader_ctx->param_instance_id);
+                                          ctx->param_instance_id);
 
        /* The division must be done before START_INSTANCE is added. */
        if (divisor > 1)
@@ -421,9 +401,9 @@ static void declare_input_vs(
 {
        struct lp_build_context *base = &radeon_bld->soa.bld_base.base;
        struct gallivm_state *gallivm = base->gallivm;
-       struct si_shader_context *si_shader_ctx =
+       struct si_shader_context *ctx =
                si_shader_context(&radeon_bld->soa.bld_base);
-       unsigned divisor = si_shader_ctx->shader->key.vs.instance_divisors[input_index];
+       unsigned divisor = ctx->shader->key.vs.instance_divisors[input_index];
 
        unsigned chan;
 
@@ -433,38 +413,36 @@ static void declare_input_vs(
        LLVMValueRef attribute_offset;
        LLVMValueRef buffer_index;
        LLVMValueRef args[3];
-       LLVMTypeRef vec4_type;
        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(ctx->radeon_bld.main_fn, SI_PARAM_VERTEX_BUFFERS);
 
        t_offset = lp_build_const_int32(gallivm, input_index);
 
-       t_list = build_indexed_load_const(si_shader_ctx, t_list_ptr, t_offset);
+       t_list = build_indexed_load_const(ctx, t_list_ptr, t_offset);
 
        /* Build the attribute offset */
        attribute_offset = lp_build_const_int32(gallivm, 0);
 
        if (divisor) {
                /* Build index from instance ID, start instance and divisor */
-               si_shader_ctx->shader->uses_instanceid = true;
-               buffer_index = get_instance_index_for_fetch(&si_shader_ctx->radeon_bld, divisor);
+               ctx->shader->uses_instanceid = true;
+               buffer_index = get_instance_index_for_fetch(&ctx->radeon_bld, divisor);
        } else {
                /* Load the buffer index for vertices. */
-               LLVMValueRef vertex_id = LLVMGetParam(si_shader_ctx->radeon_bld.main_fn,
-                                                     si_shader_ctx->param_vertex_id);
+               LLVMValueRef vertex_id = LLVMGetParam(ctx->radeon_bld.main_fn,
+                                                     ctx->param_vertex_id);
                LLVMValueRef base_vertex = LLVMGetParam(radeon_bld->main_fn,
                                                        SI_PARAM_BASE_VERTEX);
                buffer_index = LLVMBuildAdd(gallivm->builder, base_vertex, vertex_id, "");
        }
 
-       vec4_type = LLVMVectorType(base->elem_type, 4);
        args[0] = t_list;
        args[1] = attribute_offset;
        args[2] = buffer_index;
        input = lp_build_intrinsic(gallivm->builder,
-               "llvm.SI.vs.load.input", vec4_type, args, 3,
+               "llvm.SI.vs.load.input", ctx->v4f32, args, 3,
                LLVMReadNoneAttribute | LLVMNoUnwindAttribute);
 
        /* Break up the vec4 into individual components */
@@ -472,7 +450,7 @@ static void declare_input_vs(
                LLVMValueRef llvm_chan = lp_build_const_int32(gallivm, chan);
                /* XXX: Use a helper function for this.  There is one in
                 * tgsi_llvm.c. */
-               si_shader_ctx->radeon_bld.inputs[radeon_llvm_reg_index_soa(input_index, chan)] =
+               ctx->radeon_bld.inputs[radeon_llvm_reg_index_soa(input_index, chan)] =
                                LLVMBuildExtractElement(gallivm->builder,
                                input, llvm_chan, "");
        }
@@ -481,23 +459,23 @@ static void declare_input_vs(
 static LLVMValueRef get_primitive_id(struct lp_build_tgsi_context *bld_base,
                                     unsigned swizzle)
 {
-       struct si_shader_context *si_shader_ctx = si_shader_context(bld_base);
+       struct si_shader_context *ctx = si_shader_context(bld_base);
 
        if (swizzle > 0)
                return bld_base->uint_bld.zero;
 
-       switch (si_shader_ctx->type) {
+       switch (ctx->type) {
        case TGSI_PROCESSOR_VERTEX:
-               return LLVMGetParam(si_shader_ctx->radeon_bld.main_fn,
-                                   si_shader_ctx->param_vs_prim_id);
+               return LLVMGetParam(ctx->radeon_bld.main_fn,
+                                   ctx->param_vs_prim_id);
        case TGSI_PROCESSOR_TESS_CTRL:
-               return LLVMGetParam(si_shader_ctx->radeon_bld.main_fn,
+               return LLVMGetParam(ctx->radeon_bld.main_fn,
                                    SI_PARAM_PATCH_ID);
        case TGSI_PROCESSOR_TESS_EVAL:
-               return LLVMGetParam(si_shader_ctx->radeon_bld.main_fn,
-                                   si_shader_ctx->param_tes_patch_id);
+               return LLVMGetParam(ctx->radeon_bld.main_fn,
+                                   ctx->param_tes_patch_id);
        case TGSI_PROCESSOR_GEOMETRY:
-               return LLVMGetParam(si_shader_ctx->radeon_bld.main_fn,
+               return LLVMGetParam(ctx->radeon_bld.main_fn,
                                    SI_PARAM_PRIMITIVE_ID);
        default:
                assert(0);
@@ -509,14 +487,14 @@ static LLVMValueRef get_primitive_id(struct lp_build_tgsi_context *bld_base,
  * Return the value of tgsi_ind_register for indexing.
  * This is the indirect index with the constant offset added to it.
  */
-static LLVMValueRef get_indirect_index(struct si_shader_context *si_shader_ctx,
+static LLVMValueRef get_indirect_index(struct si_shader_context *ctx,
                                       const struct tgsi_ind_register *ind,
                                       int rel_index)
 {
-       struct gallivm_state *gallivm = si_shader_ctx->radeon_bld.soa.bld_base.base.gallivm;
+       struct gallivm_state *gallivm = ctx->radeon_bld.soa.bld_base.base.gallivm;
        LLVMValueRef result;
 
-       result = si_shader_ctx->radeon_bld.soa.addr[ind->Index][ind->Swizzle];
+       result = ctx->radeon_bld.soa.addr[ind->Index][ind->Swizzle];
        result = LLVMBuildLoad(gallivm->builder, result, "");
        result = LLVMBuildAdd(gallivm->builder, result,
                              lp_build_const_int32(gallivm, rel_index), "");
@@ -526,14 +504,14 @@ static LLVMValueRef get_indirect_index(struct si_shader_context *si_shader_ctx,
 /**
  * Calculate a dword address given an input or output register and a stride.
  */
-static LLVMValueRef get_dw_address(struct si_shader_context *si_shader_ctx,
+static LLVMValueRef get_dw_address(struct si_shader_context *ctx,
                                   const struct tgsi_full_dst_register *dst,
                                   const struct tgsi_full_src_register *src,
                                   LLVMValueRef vertex_dw_stride,
                                   LLVMValueRef base_addr)
 {
-       struct gallivm_state *gallivm = si_shader_ctx->radeon_bld.soa.bld_base.base.gallivm;
-       struct tgsi_shader_info *info = &si_shader_ctx->shader->selector->info;
+       struct gallivm_state *gallivm = ctx->radeon_bld.soa.bld_base.base.gallivm;
+       struct tgsi_shader_info *info = &ctx->shader->selector->info;
        ubyte *name, *index, *array_first;
        int first, param;
        struct tgsi_full_dst_register reg;
@@ -557,7 +535,7 @@ static LLVMValueRef get_dw_address(struct si_shader_context *si_shader_ctx,
                LLVMValueRef index;
 
                if (reg.Dimension.Indirect)
-                       index = get_indirect_index(si_shader_ctx, &reg.DimIndirect,
+                       index = get_indirect_index(ctx, &reg.DimIndirect,
                                                   reg.Dimension.Index);
                else
                        index = lp_build_const_int32(gallivm, reg.Dimension.Index);
@@ -590,7 +568,7 @@ static LLVMValueRef get_dw_address(struct si_shader_context *si_shader_ctx,
                else
                        first = reg.Register.Index;
 
-               ind_index = get_indirect_index(si_shader_ctx, &reg.Indirect,
+               ind_index = get_indirect_index(ctx, &reg.Indirect,
                                           reg.Register.Index - first);
 
                base_addr = LLVMBuildAdd(gallivm->builder, base_addr,
@@ -619,7 +597,7 @@ static LLVMValueRef lds_load(struct lp_build_tgsi_context *bld_base,
                             enum tgsi_opcode_type type, unsigned swizzle,
                             LLVMValueRef dw_addr)
 {
-       struct si_shader_context *si_shader_ctx = si_shader_context(bld_base);
+       struct si_shader_context *ctx = si_shader_context(bld_base);
        struct gallivm_state *gallivm = bld_base->base.gallivm;
        LLVMValueRef value;
 
@@ -636,7 +614,15 @@ static LLVMValueRef lds_load(struct lp_build_tgsi_context *bld_base,
        dw_addr = lp_build_add(&bld_base->uint_bld, dw_addr,
                            lp_build_const_int32(gallivm, swizzle));
 
-       value = build_indexed_load(si_shader_ctx, si_shader_ctx->lds, dw_addr);
+       value = build_indexed_load(ctx, 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(ctx, ctx->lds, dw_addr);
+               return radeon_llvm_emit_fetch_double(bld_base, value, value2);
+       }
+
        return LLVMBuildBitCast(gallivm->builder, value,
                                tgsi2llvmtype(bld_base, type), "");
 }
@@ -648,19 +634,18 @@ static LLVMValueRef lds_load(struct lp_build_tgsi_context *bld_base,
  * \param dw_addr      address in dwords
  * \param value                value to store
  */
-static void lds_store(struct lp_build_tgsi_context * bld_base,
+static void lds_store(struct lp_build_tgsi_context *bld_base,
                      unsigned swizzle, LLVMValueRef dw_addr,
                      LLVMValueRef value)
 {
-       struct si_shader_context *si_shader_ctx = si_shader_context(bld_base);
+       struct si_shader_context *ctx = si_shader_context(bld_base);
        struct gallivm_state *gallivm = bld_base->base.gallivm;
 
        dw_addr = lp_build_add(&bld_base->uint_bld, dw_addr,
                            lp_build_const_int32(gallivm, swizzle));
 
-       value = LLVMBuildBitCast(gallivm->builder, value,
-                                LLVMInt32TypeInContext(gallivm->context), "");
-       build_indexed_store(si_shader_ctx, si_shader_ctx->lds,
+       value = LLVMBuildBitCast(gallivm->builder, value, ctx->i32, "");
+       build_indexed_store(ctx, ctx->lds,
                            dw_addr, value);
 }
 
@@ -669,12 +654,12 @@ static LLVMValueRef fetch_input_tcs(
        const struct tgsi_full_src_register *reg,
        enum tgsi_opcode_type type, unsigned swizzle)
 {
-       struct si_shader_context *si_shader_ctx = si_shader_context(bld_base);
+       struct si_shader_context *ctx = si_shader_context(bld_base);
        LLVMValueRef dw_addr, stride;
 
-       stride = unpack_param(si_shader_ctx, SI_PARAM_TCS_IN_LAYOUT, 13, 8);
-       dw_addr = get_tcs_in_current_patch_offset(si_shader_ctx);
-       dw_addr = get_dw_address(si_shader_ctx, NULL, reg, stride, dw_addr);
+       stride = unpack_param(ctx, SI_PARAM_TCS_IN_LAYOUT, 13, 8);
+       dw_addr = get_tcs_in_current_patch_offset(ctx);
+       dw_addr = get_dw_address(ctx, NULL, reg, stride, dw_addr);
 
        return lds_load(bld_base, type, swizzle, dw_addr);
 }
@@ -684,16 +669,16 @@ static LLVMValueRef fetch_output_tcs(
                const struct tgsi_full_src_register *reg,
                enum tgsi_opcode_type type, unsigned swizzle)
 {
-       struct si_shader_context *si_shader_ctx = si_shader_context(bld_base);
+       struct si_shader_context *ctx = si_shader_context(bld_base);
        LLVMValueRef dw_addr, stride;
 
        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);
-               dw_addr = get_dw_address(si_shader_ctx, NULL, reg, stride, dw_addr);
+               stride = unpack_param(ctx, SI_PARAM_TCS_OUT_LAYOUT, 13, 8);
+               dw_addr = get_tcs_out_current_patch_offset(ctx);
+               dw_addr = get_dw_address(ctx, NULL, reg, stride, dw_addr);
        } else {
-               dw_addr = get_tcs_out_current_patch_data_offset(si_shader_ctx);
-               dw_addr = get_dw_address(si_shader_ctx, NULL, reg, NULL, dw_addr);
+               dw_addr = get_tcs_out_current_patch_data_offset(ctx);
+               dw_addr = get_dw_address(ctx, NULL, reg, NULL, dw_addr);
        }
 
        return lds_load(bld_base, type, swizzle, dw_addr);
@@ -704,27 +689,27 @@ static LLVMValueRef fetch_input_tes(
        const struct tgsi_full_src_register *reg,
        enum tgsi_opcode_type type, unsigned swizzle)
 {
-       struct si_shader_context *si_shader_ctx = si_shader_context(bld_base);
+       struct si_shader_context *ctx = si_shader_context(bld_base);
        LLVMValueRef dw_addr, stride;
 
        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);
-               dw_addr = get_dw_address(si_shader_ctx, NULL, reg, stride, dw_addr);
+               stride = unpack_param(ctx, SI_PARAM_TCS_OUT_LAYOUT, 13, 8);
+               dw_addr = get_tcs_out_current_patch_offset(ctx);
+               dw_addr = get_dw_address(ctx, NULL, reg, stride, dw_addr);
        } else {
-               dw_addr = get_tcs_out_current_patch_data_offset(si_shader_ctx);
-               dw_addr = get_dw_address(si_shader_ctx, NULL, reg, NULL, dw_addr);
+               dw_addr = get_tcs_out_current_patch_data_offset(ctx);
+               dw_addr = get_dw_address(ctx, NULL, reg, NULL, dw_addr);
        }
 
        return lds_load(bld_base, type, swizzle, dw_addr);
 }
 
-static void store_output_tcs(struct lp_build_tgsi_context * bld_base,
-                            const struct tgsi_full_instruction * inst,
-                            const struct tgsi_opcode_info * info,
+static void store_output_tcs(struct lp_build_tgsi_context *bld_base,
+                            const struct tgsi_full_instruction *inst,
+                            const struct tgsi_opcode_info *info,
                             LLVMValueRef dst[4])
 {
-       struct si_shader_context *si_shader_ctx = si_shader_context(bld_base);
+       struct si_shader_context *ctx = si_shader_context(bld_base);
        const struct tgsi_full_dst_register *reg = &inst->Dst[0];
        unsigned chan_index;
        LLVMValueRef dw_addr, stride;
@@ -739,12 +724,12 @@ static void store_output_tcs(struct lp_build_tgsi_context * bld_base,
        }
 
        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);
-               dw_addr = get_dw_address(si_shader_ctx, reg, NULL, stride, dw_addr);
+               stride = unpack_param(ctx, SI_PARAM_TCS_OUT_LAYOUT, 13, 8);
+               dw_addr = get_tcs_out_current_patch_offset(ctx);
+               dw_addr = get_dw_address(ctx, reg, NULL, stride, dw_addr);
        } else {
-               dw_addr = get_tcs_out_current_patch_data_offset(si_shader_ctx);
-               dw_addr = get_dw_address(si_shader_ctx, reg, NULL, NULL, dw_addr);
+               dw_addr = get_tcs_out_current_patch_data_offset(ctx);
+               dw_addr = get_dw_address(ctx, reg, NULL, NULL, dw_addr);
        }
 
        TGSI_FOR_EACH_DST0_ENABLED_CHANNEL(inst, chan_index) {
@@ -764,17 +749,18 @@ static LLVMValueRef fetch_input_gs(
        unsigned swizzle)
 {
        struct lp_build_context *base = &bld_base->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 *uint = &si_shader_ctx->radeon_bld.soa.bld_base.uint_bld;
+       struct si_shader_context *ctx = si_shader_context(bld_base);
+       struct si_shader *shader = ctx->shader;
+       struct lp_build_context *uint = &ctx->radeon_bld.soa.bld_base.uint_bld;
        struct gallivm_state *gallivm = base->gallivm;
-       LLVMTypeRef i32 = LLVMInt32TypeInContext(gallivm->context);
        LLVMValueRef vtx_offset;
        LLVMValueRef args[9];
        unsigned vtx_offset_param;
        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);
@@ -801,16 +787,14 @@ static LLVMValueRef fetch_input_gs(
                vtx_offset_param += SI_PARAM_VTX2_OFFSET - 2;
        }
        vtx_offset = lp_build_mul_imm(uint,
-                                     LLVMGetParam(si_shader_ctx->radeon_bld.main_fn,
+                                     LLVMGetParam(ctx->radeon_bld.main_fn,
                                                   vtx_offset_param),
                                      4);
 
-       args[0] = si_shader_ctx->esgs_ring;
+       param = si_shader_io_get_unique_index(semantic_name, semantic_index);
+       args[0] = 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 */
@@ -818,11 +802,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",
+                                  ctx->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",
+                                           ctx->i32, args, 9,
+                                           LLVMReadOnlyAttribute | LLVMNoUnwindAttribute);
+               return radeon_llvm_emit_fetch_double(bld_base,
+                                                    value, value2);
+       }
        return LLVMBuildBitCast(gallivm->builder,
-                               lp_build_intrinsic(gallivm->builder,
-                                               "llvm.SI.buffer.load.dword.i32.i32",
-                                               i32, args, 9,
-                                               LLVMReadOnlyAttribute | LLVMNoUnwindAttribute),
+                               value,
                                tgsi2llvmtype(bld_base, type), "");
 }
 
@@ -855,77 +850,66 @@ static int lookup_interp_param_index(unsigned interpolate, unsigned location)
        }
 }
 
-static void declare_input_fs(
-       struct radeon_llvm_context *radeon_bld,
-       unsigned input_index,
-       const struct tgsi_full_declaration *decl)
+/* This shouldn't be used by explicit INTERP opcodes. */
+static unsigned select_interp_param(struct si_shader_context *ctx,
+                                   unsigned param)
 {
-       struct lp_build_context *base = &radeon_bld->soa.bld_base.base;
-       struct si_shader_context *si_shader_ctx =
-               si_shader_context(&radeon_bld->soa.bld_base);
-       struct si_shader *shader = si_shader_ctx->shader;
-       struct lp_build_context *uint = &radeon_bld->soa.bld_base.uint_bld;
-       struct gallivm_state *gallivm = base->gallivm;
-       LLVMTypeRef input_type = LLVMFloatTypeInContext(gallivm->context);
-       LLVMValueRef main_fn = radeon_bld->main_fn;
-
-       LLVMValueRef interp_param = NULL;
-       int interp_param_idx;
-       const char * intr_name;
+       if (!ctx->shader->key.ps.force_persample_interp)
+               return param;
 
-       /* This value is:
-        * [15:0] NewPrimMask (Bit mask for each quad.  It is set it the
-        *                     quad begins a new primitive.  Bit 0 always needs
-        *                     to be unset)
-        * [32:16] ParamOffset
+       /* 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.
         */
-       LLVMValueRef params = LLVMGetParam(main_fn, SI_PARAM_PRIM_MASK);
-       LLVMValueRef attr_number;
+       switch (param) {
+       case SI_PARAM_PERSP_CENTROID:
+       case SI_PARAM_PERSP_CENTER:
+               return SI_PARAM_PERSP_SAMPLE;
 
-       unsigned chan;
+       case SI_PARAM_LINEAR_CENTROID:
+       case SI_PARAM_LINEAR_CENTER:
+               return SI_PARAM_LINEAR_SAMPLE;
 
-       if (decl->Semantic.Name == TGSI_SEMANTIC_POSITION) {
-               for (chan = 0; chan < TGSI_NUM_CHANNELS; chan++) {
-                       unsigned soa_index =
-                               radeon_llvm_reg_index_soa(input_index, chan);
-                       radeon_bld->inputs[soa_index] =
-                               LLVMGetParam(main_fn, SI_PARAM_POS_X_FLOAT + chan);
-
-                       if (chan == 3)
-                               /* RCP for fragcoord.w */
-                               radeon_bld->inputs[soa_index] =
-                                       LLVMBuildFDiv(gallivm->builder,
-                                                     lp_build_const_float(gallivm, 1.0f),
-                                                     radeon_bld->inputs[soa_index],
-                                                     "");
-               }
-               return;
+       default:
+               return param;
        }
+}
 
-       if (decl->Semantic.Name == TGSI_SEMANTIC_FACE) {
-               radeon_bld->inputs[radeon_llvm_reg_index_soa(input_index, 0)] =
-                       LLVMGetParam(main_fn, SI_PARAM_FRONT_FACE);
-               radeon_bld->inputs[radeon_llvm_reg_index_soa(input_index, 1)] =
-               radeon_bld->inputs[radeon_llvm_reg_index_soa(input_index, 2)] =
-                       lp_build_const_float(gallivm, 0.0f);
-               radeon_bld->inputs[radeon_llvm_reg_index_soa(input_index, 3)] =
-                       lp_build_const_float(gallivm, 1.0f);
-
-               return;
-       }
+/**
+ * Interpolate a fragment shader input.
+ *
+ * @param ctx          context
+ * @param input_index          index of the input in hardware
+ * @param semantic_name                TGSI_SEMANTIC_*
+ * @param semantic_index       semantic index
+ * @param num_interp_inputs    number of all interpolated inputs (= BCOLOR offset)
+ * @param colors_read_mask     color components read (4 bits for each color, 8 bits in total)
+ * @param interp_param         interpolation weights (i,j)
+ * @param prim_mask            SI_PARAM_PRIM_MASK
+ * @param face                 SI_PARAM_FRONT_FACE
+ * @param result               the return value (4 components)
+ */
+static void interp_fs_input(struct si_shader_context *ctx,
+                           unsigned input_index,
+                           unsigned semantic_name,
+                           unsigned semantic_index,
+                           unsigned num_interp_inputs,
+                           unsigned colors_read_mask,
+                           LLVMValueRef interp_param,
+                           LLVMValueRef prim_mask,
+                           LLVMValueRef face,
+                           LLVMValueRef result[4])
+{
+       struct lp_build_context *base = &ctx->radeon_bld.soa.bld_base.base;
+       struct lp_build_context *uint = &ctx->radeon_bld.soa.bld_base.uint_bld;
+       struct gallivm_state *gallivm = base->gallivm;
+       const char *intr_name;
+       LLVMValueRef attr_number;
 
-       shader->ps_input_param_offset[input_index] = shader->nparam++;
-       attr_number = lp_build_const_int32(gallivm,
-                                          shader->ps_input_param_offset[input_index]);
+       unsigned chan;
 
-       shader->ps_input_interpolate[input_index] = decl->Interp.Interpolate;
-       interp_param_idx = lookup_interp_param_index(decl->Interp.Interpolate,
-                                                    decl->Interp.Location);
-       if (interp_param_idx == -1)
-               return;
-       else if (interp_param_idx)
-               interp_param = LLVMGetParam(main_fn, interp_param_idx);
+       attr_number = lp_build_const_int32(gallivm, input_index);
 
        /* 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
@@ -939,81 +923,106 @@ static void declare_input_fs(
         */
        intr_name = interp_param ? "llvm.SI.fs.interp" : "llvm.SI.fs.constant";
 
-       if (decl->Semantic.Name == TGSI_SEMANTIC_COLOR &&
-           si_shader_ctx->shader->key.ps.color_two_side) {
+       if (semantic_name == TGSI_SEMANTIC_COLOR &&
+           ctx->shader->key.ps.color_two_side) {
                LLVMValueRef args[4];
-               LLVMValueRef face, is_face_positive;
-               LLVMValueRef back_attr_number =
-                       lp_build_const_int32(gallivm,
-                                            shader->ps_input_param_offset[input_index] + 1);
+               LLVMValueRef is_face_positive;
+               LLVMValueRef back_attr_number;
+
+               /* If BCOLOR0 is used, BCOLOR1 is at offset "num_inputs + 1",
+                * otherwise it's at offset "num_inputs".
+                */
+               unsigned back_attr_offset = num_interp_inputs;
+               if (semantic_index == 1 && colors_read_mask & 0xf)
+                       back_attr_offset += 1;
 
-               face = LLVMGetParam(main_fn, SI_PARAM_FRONT_FACE);
+               back_attr_number = lp_build_const_int32(gallivm, back_attr_offset);
 
-               is_face_positive = LLVMBuildFCmp(gallivm->builder,
-                                                LLVMRealOGT, face,
-                                                lp_build_const_float(gallivm, 0.0f),
-                                                "");
+               is_face_positive = LLVMBuildICmp(gallivm->builder, LLVMIntNE,
+                                                face, uint->zero, "");
 
-               args[2] = params;
+               args[2] = prim_mask;
                args[3] = interp_param;
                for (chan = 0; chan < TGSI_NUM_CHANNELS; chan++) {
                        LLVMValueRef llvm_chan = lp_build_const_int32(gallivm, chan);
-                       unsigned soa_index = radeon_llvm_reg_index_soa(input_index, chan);
                        LLVMValueRef front, back;
 
                        args[0] = llvm_chan;
                        args[1] = attr_number;
                        front = lp_build_intrinsic(gallivm->builder, intr_name,
-                                               input_type, args, args[3] ? 4 : 3,
+                                               ctx->f32, args, args[3] ? 4 : 3,
                                                LLVMReadNoneAttribute | LLVMNoUnwindAttribute);
 
                        args[1] = back_attr_number;
                        back = lp_build_intrinsic(gallivm->builder, intr_name,
-                                              input_type, args, args[3] ? 4 : 3,
+                                              ctx->f32, args, args[3] ? 4 : 3,
                                               LLVMReadNoneAttribute | LLVMNoUnwindAttribute);
 
-                       radeon_bld->inputs[soa_index] =
-                               LLVMBuildSelect(gallivm->builder,
+                       result[chan] = LLVMBuildSelect(gallivm->builder,
                                                is_face_positive,
                                                front,
                                                back,
                                                "");
                }
-
-               shader->nparam++;
-       } else if (decl->Semantic.Name == TGSI_SEMANTIC_FOG) {
+       } else if (semantic_name == TGSI_SEMANTIC_FOG) {
                LLVMValueRef args[4];
 
                args[0] = uint->zero;
                args[1] = attr_number;
-               args[2] = params;
+               args[2] = prim_mask;
                args[3] = interp_param;
-               radeon_bld->inputs[radeon_llvm_reg_index_soa(input_index, 0)] =
-                       lp_build_intrinsic(gallivm->builder, intr_name,
-                                       input_type, args, args[3] ? 4 : 3,
+               result[0] = lp_build_intrinsic(gallivm->builder, intr_name,
+                                       ctx->f32, args, args[3] ? 4 : 3,
                                        LLVMReadNoneAttribute | LLVMNoUnwindAttribute);
-               radeon_bld->inputs[radeon_llvm_reg_index_soa(input_index, 1)] =
-               radeon_bld->inputs[radeon_llvm_reg_index_soa(input_index, 2)] =
-                       lp_build_const_float(gallivm, 0.0f);
-               radeon_bld->inputs[radeon_llvm_reg_index_soa(input_index, 3)] =
-                       lp_build_const_float(gallivm, 1.0f);
+               result[1] =
+               result[2] = lp_build_const_float(gallivm, 0.0f);
+               result[3] = lp_build_const_float(gallivm, 1.0f);
        } else {
                for (chan = 0; chan < TGSI_NUM_CHANNELS; chan++) {
                        LLVMValueRef args[4];
                        LLVMValueRef llvm_chan = lp_build_const_int32(gallivm, chan);
-                       unsigned soa_index = radeon_llvm_reg_index_soa(input_index, chan);
+
                        args[0] = llvm_chan;
                        args[1] = attr_number;
-                       args[2] = params;
+                       args[2] = prim_mask;
                        args[3] = interp_param;
-                       radeon_bld->inputs[soa_index] =
-                               lp_build_intrinsic(gallivm->builder, intr_name,
-                                               input_type, args, args[3] ? 4 : 3,
+                       result[chan] = lp_build_intrinsic(gallivm->builder, intr_name,
+                                               ctx->f32, args, args[3] ? 4 : 3,
                                                LLVMReadNoneAttribute | LLVMNoUnwindAttribute);
                }
        }
 }
 
+static void declare_input_fs(
+       struct radeon_llvm_context *radeon_bld,
+       unsigned input_index,
+       const struct tgsi_full_declaration *decl)
+{
+       struct si_shader_context *ctx =
+               si_shader_context(&radeon_bld->soa.bld_base);
+       struct si_shader *shader = ctx->shader;
+       LLVMValueRef main_fn = radeon_bld->main_fn;
+       LLVMValueRef interp_param = NULL;
+       int interp_param_idx;
+
+       interp_param_idx = lookup_interp_param_index(decl->Interp.Interpolate,
+                                                    decl->Interp.Location);
+       if (interp_param_idx == -1)
+               return;
+       else if (interp_param_idx) {
+               interp_param_idx = select_interp_param(ctx,
+                                                      interp_param_idx);
+               interp_param = LLVMGetParam(main_fn, interp_param_idx);
+       }
+
+       interp_fs_input(ctx, input_index, decl->Semantic.Name,
+                       decl->Semantic.Index, shader->selector->info.num_inputs,
+                       shader->selector->info.colors_read, interp_param,
+                       LLVMGetParam(main_fn, SI_PARAM_PRIM_MASK),
+                       LLVMGetParam(main_fn, SI_PARAM_FRONT_FACE),
+                       &radeon_bld->inputs[radeon_llvm_reg_index_soa(input_index, 0)]);
+}
+
 static LLVMValueRef get_sample_id(struct radeon_llvm_context *radeon_bld)
 {
        return unpack_param(si_shader_context(&radeon_bld->soa.bld_base),
@@ -1034,22 +1043,22 @@ static LLVMValueRef buffer_load_const(LLVMBuilderRef builder, LLVMValueRef resou
 
 static LLVMValueRef load_sample_position(struct radeon_llvm_context *radeon_bld, LLVMValueRef sample_id)
 {
-       struct si_shader_context *si_shader_ctx =
+       struct si_shader_context *ctx =
                si_shader_context(&radeon_bld->soa.bld_base);
        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(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);
+       LLVMValueRef resource = build_indexed_load_const(ctx, desc, buf_index);
 
        /* offset = sample_id * 8  (8 = 2 floats containing samplepos.xy) */
        LLVMValueRef offset0 = lp_build_mul_imm(uint_bld, sample_id, 8);
        LLVMValueRef offset1 = LLVMBuildAdd(builder, offset0, lp_build_const_int32(gallivm, 4), "");
 
        LLVMValueRef pos[4] = {
-               buffer_load_const(builder, resource, offset0, radeon_bld->soa.bld_base.base.elem_type),
-               buffer_load_const(builder, resource, offset1, radeon_bld->soa.bld_base.base.elem_type),
+               buffer_load_const(builder, resource, offset0, ctx->f32),
+               buffer_load_const(builder, resource, offset1, ctx->f32),
                lp_build_const_float(gallivm, 0),
                lp_build_const_float(gallivm, 0)
        };
@@ -1058,34 +1067,33 @@ static LLVMValueRef load_sample_position(struct radeon_llvm_context *radeon_bld,
 }
 
 static void declare_system_value(
-       struct radeon_llvm_context * radeon_bld,
+       struct radeon_llvm_context *radeon_bld,
        unsigned index,
        const struct tgsi_full_declaration *decl)
 {
-       struct si_shader_context *si_shader_ctx =
+       struct si_shader_context *ctx =
                si_shader_context(&radeon_bld->soa.bld_base);
        struct lp_build_context *bld = &radeon_bld->soa.bld_base.base;
-       struct lp_build_context *uint_bld = &radeon_bld->soa.bld_base.uint_bld;
        struct gallivm_state *gallivm = &radeon_bld->gallivm;
        LLVMValueRef value = 0;
 
        switch (decl->Semantic.Name) {
        case TGSI_SEMANTIC_INSTANCEID:
                value = LLVMGetParam(radeon_bld->main_fn,
-                                    si_shader_ctx->param_instance_id);
+                                    ctx->param_instance_id);
                break;
 
        case TGSI_SEMANTIC_VERTEXID:
                value = LLVMBuildAdd(gallivm->builder,
                                     LLVMGetParam(radeon_bld->main_fn,
-                                                 si_shader_ctx->param_vertex_id),
+                                                 ctx->param_vertex_id),
                                     LLVMGetParam(radeon_bld->main_fn,
                                                  SI_PARAM_BASE_VERTEX), "");
                break;
 
        case TGSI_SEMANTIC_VERTEXID_NOBASE:
                value = LLVMGetParam(radeon_bld->main_fn,
-                                    si_shader_ctx->param_vertex_id);
+                                    ctx->param_vertex_id);
                break;
 
        case TGSI_SEMANTIC_BASEVERTEX:
@@ -1094,43 +1102,70 @@ static void declare_system_value(
                break;
 
        case TGSI_SEMANTIC_INVOCATIONID:
-               if (si_shader_ctx->type == TGSI_PROCESSOR_TESS_CTRL)
-                       value = unpack_param(si_shader_ctx, SI_PARAM_REL_IDS, 8, 5);
-               else if (si_shader_ctx->type == TGSI_PROCESSOR_GEOMETRY)
+               if (ctx->type == TGSI_PROCESSOR_TESS_CTRL)
+                       value = unpack_param(ctx, SI_PARAM_REL_IDS, 8, 5);
+               else if (ctx->type == TGSI_PROCESSOR_GEOMETRY)
                        value = LLVMGetParam(radeon_bld->main_fn,
                                             SI_PARAM_GS_INSTANCE_ID);
                else
                        assert(!"INVOCATIONID not implemented");
                break;
 
+       case TGSI_SEMANTIC_POSITION:
+       {
+               LLVMValueRef pos[4] = {
+                       LLVMGetParam(radeon_bld->main_fn, SI_PARAM_POS_X_FLOAT),
+                       LLVMGetParam(radeon_bld->main_fn, SI_PARAM_POS_Y_FLOAT),
+                       LLVMGetParam(radeon_bld->main_fn, SI_PARAM_POS_Z_FLOAT),
+                       lp_build_emit_llvm_unary(&radeon_bld->soa.bld_base, TGSI_OPCODE_RCP,
+                                                LLVMGetParam(radeon_bld->main_fn,
+                                                             SI_PARAM_POS_W_FLOAT)),
+               };
+               value = lp_build_gather_values(gallivm, pos, 4);
+               break;
+       }
+
+       case TGSI_SEMANTIC_FACE:
+               value = LLVMGetParam(radeon_bld->main_fn, SI_PARAM_FRONT_FACE);
+               break;
+
        case TGSI_SEMANTIC_SAMPLEID:
                value = get_sample_id(radeon_bld);
                break;
 
-       case TGSI_SEMANTIC_SAMPLEPOS:
-               value = load_sample_position(radeon_bld, get_sample_id(radeon_bld));
+       case TGSI_SEMANTIC_SAMPLEPOS: {
+               LLVMValueRef pos[4] = {
+                       LLVMGetParam(radeon_bld->main_fn, SI_PARAM_POS_X_FLOAT),
+                       LLVMGetParam(radeon_bld->main_fn, SI_PARAM_POS_Y_FLOAT),
+                       lp_build_const_float(gallivm, 0),
+                       lp_build_const_float(gallivm, 0)
+               };
+               pos[0] = lp_build_emit_llvm_unary(&radeon_bld->soa.bld_base,
+                                                 TGSI_OPCODE_FRC, pos[0]);
+               pos[1] = lp_build_emit_llvm_unary(&radeon_bld->soa.bld_base,
+                                                 TGSI_OPCODE_FRC, pos[1]);
+               value = lp_build_gather_values(gallivm, pos, 4);
                break;
+       }
 
        case TGSI_SEMANTIC_SAMPLEMASK:
-               /* Smoothing isn't MSAA in GL, but it's MSAA in hardware.
-                * Therefore, force gl_SampleMaskIn to 1 for GL. */
-               if (si_shader_ctx->shader->key.ps.poly_line_smoothing)
-                       value = uint_bld->one;
-               else
-                       value = LLVMGetParam(radeon_bld->main_fn, SI_PARAM_SAMPLE_COVERAGE);
+               /* This can only occur with the OpenGL Core profile, which
+                * doesn't support smoothing.
+                */
+               value = LLVMGetParam(radeon_bld->main_fn, SI_PARAM_SAMPLE_COVERAGE);
                break;
 
        case TGSI_SEMANTIC_TESSCOORD:
        {
                LLVMValueRef coord[4] = {
-                       LLVMGetParam(radeon_bld->main_fn, si_shader_ctx->param_tes_u),
-                       LLVMGetParam(radeon_bld->main_fn, si_shader_ctx->param_tes_v),
+                       LLVMGetParam(radeon_bld->main_fn, ctx->param_tes_u),
+                       LLVMGetParam(radeon_bld->main_fn, ctx->param_tes_v),
                        bld->zero,
                        bld->zero
                };
 
                /* For triangles, the vector should be (u, v, 1-u-v). */
-               if (si_shader_ctx->shader->selector->info.properties[TGSI_PROPERTY_TES_PRIM_MODE] ==
+               if (ctx->shader->selector->info.properties[TGSI_PROPERTY_TES_PRIM_MODE] ==
                    PIPE_PRIM_TRIANGLES)
                        coord[2] = lp_build_sub(bld, bld->one,
                                                lp_build_add(bld, coord[0], coord[1]));
@@ -1140,7 +1175,7 @@ static void declare_system_value(
        }
 
        case TGSI_SEMANTIC_VERTICESIN:
-               value = unpack_param(si_shader_ctx, SI_PARAM_TCS_OUT_LAYOUT, 26, 6);
+               value = unpack_param(ctx, SI_PARAM_TCS_OUT_LAYOUT, 26, 6);
                break;
 
        case TGSI_SEMANTIC_TESSINNER:
@@ -1149,7 +1184,7 @@ static void declare_system_value(
                LLVMValueRef dw_addr;
                int param = si_shader_io_get_unique_index(decl->Semantic.Name, 0);
 
-               dw_addr = get_tcs_out_current_patch_data_offset(si_shader_ctx);
+               dw_addr = get_tcs_out_current_patch_data_offset(ctx);
                dw_addr = LLVMBuildAdd(gallivm->builder, dw_addr,
                                       lp_build_const_int32(gallivm, param * 4), "");
 
@@ -1171,13 +1206,13 @@ static void declare_system_value(
 }
 
 static LLVMValueRef fetch_constant(
-       struct lp_build_tgsi_context * bld_base,
+       struct lp_build_tgsi_context *bld_base,
        const struct tgsi_full_src_register *reg,
        enum tgsi_opcode_type type,
        unsigned swizzle)
 {
-       struct si_shader_context *si_shader_ctx = si_shader_context(bld_base);
-       struct lp_build_context * base = &bld_base->base;
+       struct si_shader_context *ctx = si_shader_context(bld_base);
+       struct lp_build_context *base = &bld_base->base;
        const struct tgsi_ind_register *ireg = &reg->Indirect;
        unsigned buf, idx;
 
@@ -1198,44 +1233,44 @@ static LLVMValueRef fetch_constant(
 
        if (!reg->Register.Indirect && !reg->Dimension.Indirect) {
                if (type != TGSI_TYPE_DOUBLE)
-                       return bitcast(bld_base, type, si_shader_ctx->constants[buf][idx]);
+                       return bitcast(bld_base, type, ctx->constants[buf][idx]);
                else {
                        return radeon_llvm_emit_fetch_double(bld_base,
-                                                            si_shader_ctx->constants[buf][idx],
-                                                            si_shader_ctx->constants[buf][idx + 1]);
+                                                            ctx->constants[buf][idx],
+                                                            ctx->constants[buf][idx + 1]);
                }
        }
 
        if (reg->Register.Dimension && reg->Dimension.Indirect) {
-               LLVMValueRef ptr = LLVMGetParam(si_shader_ctx->radeon_bld.main_fn, SI_PARAM_CONST);
+               LLVMValueRef ptr = LLVMGetParam(ctx->radeon_bld.main_fn, SI_PARAM_CONST_BUFFERS);
                LLVMValueRef index;
-               index = get_indirect_index(si_shader_ctx, &reg->DimIndirect,
+               index = get_indirect_index(ctx, &reg->DimIndirect,
                                                   reg->Dimension.Index);
-               bufp = build_indexed_load_const(si_shader_ctx, ptr, index);
+               bufp = build_indexed_load_const(ctx, ptr, index);
        } else
-               bufp = si_shader_ctx->const_resource[buf];
+               bufp = ctx->const_buffers[buf];
 
-       addr = si_shader_ctx->radeon_bld.soa.addr[ireg->Index][ireg->Swizzle];
+       addr = ctx->radeon_bld.soa.addr[ireg->Index][ireg->Swizzle];
        addr = LLVMBuildLoad(base->gallivm->builder, addr, "load addr reg");
        addr = lp_build_mul_imm(&bld_base->uint_bld, addr, 16);
        addr = lp_build_add(&bld_base->uint_bld, addr,
                            lp_build_const_int32(base->gallivm, idx * 4));
 
        result = buffer_load_const(base->gallivm->builder, bufp,
-                                  addr, bld_base->base.elem_type);
+                                  addr, ctx->f32);
 
        if (type != TGSI_TYPE_DOUBLE)
                result = bitcast(bld_base, type, result);
        else {
                LLVMValueRef addr2, result2;
-               addr2 = si_shader_ctx->radeon_bld.soa.addr[ireg->Index][ireg->Swizzle + 1];
+               addr2 = ctx->radeon_bld.soa.addr[ireg->Index][ireg->Swizzle + 1];
                addr2 = LLVMBuildLoad(base->gallivm->builder, addr2, "load addr reg2");
                addr2 = lp_build_mul_imm(&bld_base->uint_bld, addr2, 16);
                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],
-                                  addr2, bld_base->base.elem_type);
+               result2 = buffer_load_const(base->gallivm->builder, ctx->const_buffers[buf],
+                                  addr2, ctx->f32);
 
                result = radeon_llvm_emit_fetch_double(bld_base,
                                                       result, result2);
@@ -1243,179 +1278,278 @@ static LLVMValueRef fetch_constant(
        return result;
 }
 
+/* Upper 16 bits must be zero. */
+static LLVMValueRef si_llvm_pack_two_int16(struct gallivm_state *gallivm,
+                                          LLVMValueRef val[2])
+{
+       return LLVMBuildOr(gallivm->builder, val[0],
+                          LLVMBuildShl(gallivm->builder, val[1],
+                                       lp_build_const_int32(gallivm, 16),
+                                       ""), "");
+}
+
+/* Upper 16 bits are ignored and will be dropped. */
+static LLVMValueRef si_llvm_pack_two_int32_as_int16(struct gallivm_state *gallivm,
+                                                   LLVMValueRef val[2])
+{
+       LLVMValueRef v[2] = {
+               LLVMBuildAnd(gallivm->builder, val[0],
+                            lp_build_const_int32(gallivm, 0xffff), ""),
+               val[1],
+       };
+       return si_llvm_pack_two_int16(gallivm, v);
+}
+
 /* Initialize arguments for the shader export intrinsic */
 static void si_llvm_init_export_args(struct lp_build_tgsi_context *bld_base,
                                     LLVMValueRef *values,
                                     unsigned target,
                                     LLVMValueRef *args)
 {
-       struct si_shader_context *si_shader_ctx = si_shader_context(bld_base);
+       struct si_shader_context *ctx = si_shader_context(bld_base);
        struct lp_build_context *uint =
-                               &si_shader_ctx->radeon_bld.soa.bld_base.uint_bld;
+                               &ctx->radeon_bld.soa.bld_base.uint_bld;
        struct lp_build_context *base = &bld_base->base;
-       unsigned compressed = 0;
+       struct gallivm_state *gallivm = base->gallivm;
+       LLVMBuilderRef builder = base->gallivm->builder;
+       LLVMValueRef val[4];
+       unsigned spi_shader_col_format = V_028714_SPI_SHADER_32_ABGR;
        unsigned chan;
+       bool is_int8;
 
-       if (si_shader_ctx->type == TGSI_PROCESSOR_FRAGMENT) {
-               int cbuf = target - V_008DFC_SQ_EXP_MRT;
+       /* Default is 0xf. Adjusted below depending on the format. */
+       args[0] = lp_build_const_int32(base->gallivm, 0xf); /* writemask */
 
-               if (cbuf >= 0 && cbuf < 8) {
-                       compressed = (si_shader_ctx->shader->key.ps.export_16bpc >> cbuf) & 0x1;
+       /* Specify whether the EXEC mask represents the valid mask */
+       args[1] = uint->zero;
+
+       /* Specify whether this is the last export */
+       args[2] = uint->zero;
 
-                       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);
+       /* Specify the target we are exporting */
+       args[3] = lp_build_const_int32(base->gallivm, target);
 
-                       si_shader_ctx->shader->cb_shader_mask |= 0xf << (4 * cbuf);
-               }
+       if (ctx->type == TGSI_PROCESSOR_FRAGMENT) {
+               const union si_shader_key *key = &ctx->shader->key;
+               unsigned col_formats = key->ps.spi_shader_col_format;
+               int cbuf = target - V_008DFC_SQ_EXP_MRT;
+
+               assert(cbuf >= 0 && cbuf < 8);
+               spi_shader_col_format = (col_formats >> (cbuf * 4)) & 0xf;
+               is_int8 = (key->ps.color_is_int8 >> cbuf) & 0x1;
        }
 
-       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[4] = uint->zero; /* COMPR flag */
+       args[5] = base->undef;
+       args[6] = base->undef;
+       args[7] = base->undef;
+       args[8] = base->undef;
+
+       switch (spi_shader_col_format) {
+       case V_028714_SPI_SHADER_ZERO:
+               args[0] = uint->zero; /* writemask */
+               args[3] = lp_build_const_int32(base->gallivm, V_008DFC_SQ_EXP_NULL);
+               break;
+
+       case V_028714_SPI_SHADER_32_R:
+               args[0] = uint->one; /* writemask */
+               args[5] = values[0];
+               break;
+
+       case V_028714_SPI_SHADER_32_GR:
+               args[0] = lp_build_const_int32(base->gallivm, 0x3); /* writemask */
+               args[5] = values[0];
+               args[6] = values[1];
+               break;
+
+       case V_028714_SPI_SHADER_32_AR:
+               args[0] = lp_build_const_int32(base->gallivm, 0x9); /* writemask */
+               args[5] = values[0];
+               args[8] = values[3];
+               break;
+
+       case V_028714_SPI_SHADER_FP16_ABGR:
+               args[4] = uint->one; /* COMPR flag */
+
+               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",
+                                                   ctx->i32, pack_args, 2,
+                                                   LLVMReadNoneAttribute | LLVMNoUnwindAttribute);
                        args[chan + 5] =
-                               lp_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),
-                                                "");
+                                                packed, ctx->f32, "");
                }
+               break;
 
-               /* 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;
-       }
+       case V_028714_SPI_SHADER_UNORM16_ABGR:
+               for (chan = 0; chan < 4; chan++) {
+                       val[chan] = radeon_llvm_saturate(bld_base, values[chan]);
+                       val[chan] = LLVMBuildFMul(builder, val[chan],
+                                                 lp_build_const_float(gallivm, 65535), "");
+                       val[chan] = LLVMBuildFAdd(builder, val[chan],
+                                                 lp_build_const_float(gallivm, 0.5), "");
+                       val[chan] = LLVMBuildFPToUI(builder, val[chan],
+                                                   ctx->i32, "");
+               }
 
-       /* 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. */
-       args[0] = lp_build_const_int32(base->gallivm, 0xf);
+               args[4] = uint->one; /* COMPR flag */
+               args[5] = bitcast(bld_base, TGSI_TYPE_FLOAT,
+                                 si_llvm_pack_two_int16(gallivm, val));
+               args[6] = bitcast(bld_base, TGSI_TYPE_FLOAT,
+                                 si_llvm_pack_two_int16(gallivm, val+2));
+               break;
 
-       /* Specify whether the EXEC mask represents the valid mask */
-       args[1] = uint->zero;
+       case V_028714_SPI_SHADER_SNORM16_ABGR:
+               for (chan = 0; chan < 4; chan++) {
+                       /* Clamp between [-1, 1]. */
+                       val[chan] = lp_build_emit_llvm_binary(bld_base, TGSI_OPCODE_MIN,
+                                                             values[chan],
+                                                             lp_build_const_float(gallivm, 1));
+                       val[chan] = lp_build_emit_llvm_binary(bld_base, TGSI_OPCODE_MAX,
+                                                             val[chan],
+                                                             lp_build_const_float(gallivm, -1));
+                       /* Convert to a signed integer in [-32767, 32767]. */
+                       val[chan] = LLVMBuildFMul(builder, val[chan],
+                                                 lp_build_const_float(gallivm, 32767), "");
+                       /* If positive, add 0.5, else add -0.5. */
+                       val[chan] = LLVMBuildFAdd(builder, val[chan],
+                                       LLVMBuildSelect(builder,
+                                               LLVMBuildFCmp(builder, LLVMRealOGE,
+                                                             val[chan], base->zero, ""),
+                                               lp_build_const_float(gallivm, 0.5),
+                                               lp_build_const_float(gallivm, -0.5), ""), "");
+                       val[chan] = LLVMBuildFPToSI(builder, val[chan], ctx->i32, "");
+               }
 
-       /* Specify whether this is the last export */
-       args[2] = uint->zero;
+               args[4] = uint->one; /* COMPR flag */
+               args[5] = bitcast(bld_base, TGSI_TYPE_FLOAT,
+                                 si_llvm_pack_two_int32_as_int16(gallivm, val));
+               args[6] = bitcast(bld_base, TGSI_TYPE_FLOAT,
+                                 si_llvm_pack_two_int32_as_int16(gallivm, val+2));
+               break;
 
-       /* Specify the target we are exporting */
-       args[3] = lp_build_const_int32(base->gallivm, target);
+       case V_028714_SPI_SHADER_UINT16_ABGR: {
+               LLVMValueRef max = lp_build_const_int32(gallivm, is_int8 ?
+                                                       255 : 65535);
+               /* Clamp. */
+               for (chan = 0; chan < 4; chan++) {
+                       val[chan] = bitcast(bld_base, TGSI_TYPE_UNSIGNED, values[chan]);
+                       val[chan] = lp_build_emit_llvm_binary(bld_base, TGSI_OPCODE_UMIN,
+                                                             val[chan], max);
+               }
 
-       /* XXX: We probably need to keep track of the output
-        * values, so we know what we are passing to the next
-        * stage. */
-}
+               args[4] = uint->one; /* COMPR flag */
+               args[5] = bitcast(bld_base, TGSI_TYPE_FLOAT,
+                                 si_llvm_pack_two_int16(gallivm, val));
+               args[6] = bitcast(bld_base, TGSI_TYPE_FLOAT,
+                                 si_llvm_pack_two_int16(gallivm, val+2));
+               break;
+       }
 
-/* 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;
+       case V_028714_SPI_SHADER_SINT16_ABGR: {
+               LLVMValueRef max = lp_build_const_int32(gallivm, is_int8 ?
+                                                       127 : 32767);
+               LLVMValueRef min = lp_build_const_int32(gallivm, is_int8 ?
+                                                       -128 : -32768);
+               /* Clamp. */
+               for (chan = 0; chan < 4; chan++) {
+                       val[chan] = bitcast(bld_base, TGSI_TYPE_UNSIGNED, values[chan]);
+                       val[chan] = lp_build_emit_llvm_binary(bld_base,
+                                                             TGSI_OPCODE_IMIN,
+                                                             val[chan], max);
+                       val[chan] = lp_build_emit_llvm_binary(bld_base,
+                                                             TGSI_OPCODE_IMAX,
+                                                             val[chan], min);
+               }
 
-       for (i = 0; i < 4; i++)
-               values[i] = LLVMBuildLoad(gallivm->builder, out_ptr[i], "");
+               args[4] = uint->one; /* COMPR flag */
+               args[5] = bitcast(bld_base, TGSI_TYPE_FLOAT,
+                                 si_llvm_pack_two_int32_as_int16(gallivm, val));
+               args[6] = bitcast(bld_base, TGSI_TYPE_FLOAT,
+                                 si_llvm_pack_two_int32_as_int16(gallivm, val+2));
+               break;
+       }
 
-       si_llvm_init_export_args(bld_base, values, target, args);
+       case V_028714_SPI_SHADER_32_ABGR:
+               memcpy(&args[5], values, sizeof(values[0]) * 4);
+               break;
+       }
 }
 
 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 si_shader_context *ctx = si_shader_context(bld_base);
        struct gallivm_state *gallivm = bld_base->base.gallivm;
 
-       if (si_shader_ctx->shader->key.ps.alpha_func != PIPE_FUNC_NEVER) {
-               LLVMValueRef alpha_ref = LLVMGetParam(si_shader_ctx->radeon_bld.main_fn,
+       if (ctx->shader->key.ps.alpha_func != PIPE_FUNC_NEVER) {
+               LLVMValueRef alpha_ref = LLVMGetParam(ctx->radeon_bld.main_fn,
                                SI_PARAM_ALPHA_REF);
 
                LLVMValueRef alpha_pass =
                        lp_build_cmp(&bld_base->base,
-                                    si_shader_ctx->shader->key.ps.alpha_func,
-                                    LLVMBuildLoad(gallivm->builder, alpha_ptr, ""),
-                                    alpha_ref);
+                                    ctx->shader->key.ps.alpha_func,
+                                    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));
 
-               lp_build_intrinsic(gallivm->builder,
-                               "llvm.AMDGPU.kill",
-                               LLVMVoidTypeInContext(gallivm->context),
-                               &arg, 1, 0);
+               lp_build_intrinsic(gallivm->builder, "llvm.AMDGPU.kill",
+                                  ctx->voidt, &arg, 1, 0);
        } else {
-               lp_build_intrinsic(gallivm->builder,
-                               "llvm.AMDGPU.kilp",
-                               LLVMVoidTypeInContext(gallivm->context),
-                               NULL, 0, 0);
+               lp_build_intrinsic(gallivm->builder, "llvm.AMDGPU.kilp",
+                                  ctx->voidt, 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 si_shader_context *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,
+       coverage = LLVMGetParam(ctx->radeon_bld.main_fn,
                                SI_PARAM_SAMPLE_COVERAGE);
        coverage = bitcast(bld_base, TGSI_TYPE_SIGNED, coverage);
 
        coverage = lp_build_intrinsic(gallivm->builder, "llvm.ctpop.i32",
-                                  bld_base->int_bld.elem_type,
+                                  ctx->i32,
                                   &coverage, 1, LLVMReadNoneAttribute);
 
        coverage = LLVMBuildUIToFP(gallivm->builder, coverage,
-                                  bld_base->base.elem_type, "");
+                                  ctx->f32, "");
 
        coverage = LLVMBuildFMul(gallivm->builder, coverage,
                                 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,
+static void si_llvm_emit_clipvertex(struct lp_build_tgsi_context *bld_base,
                                    LLVMValueRef (*pos)[9], LLVMValueRef *out_elts)
 {
-       struct si_shader_context *si_shader_ctx = si_shader_context(bld_base);
+       struct si_shader_context *ctx = si_shader_context(bld_base);
        struct lp_build_context *base = &bld_base->base;
-       struct lp_build_context *uint = &si_shader_ctx->radeon_bld.soa.bld_base.uint_bld;
+       struct lp_build_context *uint = &ctx->radeon_bld.soa.bld_base.uint_bld;
        unsigned reg_index;
        unsigned chan;
        unsigned const_chan;
        LLVMValueRef base_elt;
-       LLVMValueRef ptr = LLVMGetParam(si_shader_ctx->radeon_bld.main_fn, SI_PARAM_CONST);
+       LLVMValueRef ptr = LLVMGetParam(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);
+       LLVMValueRef const_resource = build_indexed_load_const(ctx, ptr, constbuf_index);
 
        for (reg_index = 0; reg_index < 2; reg_index ++) {
                LLVMValueRef *args = pos[2 + reg_index];
@@ -1432,7 +1566,7 @@ static void si_llvm_emit_clipvertex(struct lp_build_tgsi_context * bld_base,
                                                               ((reg_index * 4 + chan) * 4 +
                                                                const_chan) * 4);
                                base_elt = buffer_load_const(base->gallivm->builder, const_resource,
-                                                     args[1], base->elem_type);
+                                                     args[1], ctx->f32);
                                args[5 + chan] =
                                        lp_build_add(base, args[5 + chan],
                                                     lp_build_mul(base, base_elt,
@@ -1473,7 +1607,7 @@ static void si_dump_streamout(struct pipe_stream_output_info *so)
 /* TBUFFER_STORE_FORMAT_{X,XY,XYZ,XYZW} <- the suffix is selected by num_channels=1..4.
  * The type of vdata must be one of i32 (num_channels=1), v2i32 (num_channels=2),
  * or v4i32 (num_channels=3,4). */
-static void build_tbuffer_store(struct si_shader_context *shader,
+static void build_tbuffer_store(struct si_shader_context *ctx,
                                LLVMValueRef rsrc,
                                LLVMValueRef vdata,
                                unsigned num_channels,
@@ -1488,22 +1622,21 @@ static void build_tbuffer_store(struct si_shader_context *shader,
                                unsigned slc,
                                unsigned tfe)
 {
-       struct gallivm_state *gallivm = &shader->radeon_bld.gallivm;
-       LLVMTypeRef i32 = LLVMInt32TypeInContext(gallivm->context);
+       struct gallivm_state *gallivm = &ctx->radeon_bld.gallivm;
        LLVMValueRef args[] = {
                rsrc,
                vdata,
-               LLVMConstInt(i32, num_channels, 0),
+               LLVMConstInt(ctx->i32, num_channels, 0),
                vaddr,
                soffset,
-               LLVMConstInt(i32, inst_offset, 0),
-               LLVMConstInt(i32, dfmt, 0),
-               LLVMConstInt(i32, nfmt, 0),
-               LLVMConstInt(i32, offen, 0),
-               LLVMConstInt(i32, idxen, 0),
-               LLVMConstInt(i32, glc, 0),
-               LLVMConstInt(i32, slc, 0),
-               LLVMConstInt(i32, tfe, 0)
+               LLVMConstInt(ctx->i32, inst_offset, 0),
+               LLVMConstInt(ctx->i32, dfmt, 0),
+               LLVMConstInt(ctx->i32, nfmt, 0),
+               LLVMConstInt(ctx->i32, offen, 0),
+               LLVMConstInt(ctx->i32, idxen, 0),
+               LLVMConstInt(ctx->i32, glc, 0),
+               LLVMConstInt(ctx->i32, slc, 0),
+               LLVMConstInt(ctx->i32, tfe, 0)
        };
 
        /* The instruction offset field has 12 bits */
@@ -1515,12 +1648,11 @@ static void build_tbuffer_store(struct si_shader_context *shader,
        char name[256];
        snprintf(name, sizeof(name), "llvm.SI.tbuffer.store.%s", types[func]);
 
-       lp_build_intrinsic(gallivm->builder, name,
-                          LLVMVoidTypeInContext(gallivm->context),
+       lp_build_intrinsic(gallivm->builder, name, ctx->voidt,
                           args, Elements(args), 0);
 }
 
-static void build_tbuffer_store_dwords(struct si_shader_context *shader,
+static void build_tbuffer_store_dwords(struct si_shader_context *ctx,
                                     LLVMValueRef rsrc,
                                     LLVMValueRef vdata,
                                     unsigned num_channels,
@@ -1536,30 +1668,28 @@ static void build_tbuffer_store_dwords(struct si_shader_context *shader,
        };
        assert(num_channels >= 1 && num_channels <= 4);
 
-       build_tbuffer_store(shader, rsrc, vdata, num_channels, vaddr, soffset,
+       build_tbuffer_store(ctx, rsrc, vdata, num_channels, vaddr, soffset,
                            inst_offset, dfmt[num_channels-1],
                            V_008F0C_BUF_NUM_FORMAT_UINT, 1, 0, 1, 1, 0);
 }
 
 /* On SI, the vertex shader is responsible for writing streamout data
  * to buffers. */
-static void si_llvm_emit_streamout(struct si_shader_context *shader,
+static void si_llvm_emit_streamout(struct si_shader_context *ctx,
                                   struct si_shader_output_values *outputs,
                                   unsigned noutput)
 {
-       struct pipe_stream_output_info *so = &shader->shader->selector->so;
-       struct gallivm_state *gallivm = &shader->radeon_bld.gallivm;
+       struct pipe_stream_output_info *so = &ctx->shader->selector->so;
+       struct gallivm_state *gallivm = &ctx->radeon_bld.gallivm;
        LLVMBuilderRef builder = gallivm->builder;
        int i, j;
        struct lp_build_if_state if_ctx;
 
-       LLVMTypeRef i32 = LLVMInt32TypeInContext(gallivm->context);
-
        /* Get bits [22:16], i.e. (so_param >> 16) & 127; */
        LLVMValueRef so_vtx_count =
-               unpack_param(shader, shader->param_streamout_config, 16, 7);
+               unpack_param(ctx, ctx->param_streamout_config, 16, 7);
 
-       LLVMValueRef tid = lp_build_intrinsic(builder, "llvm.SI.tid", i32,
+       LLVMValueRef tid = lp_build_intrinsic(builder, "llvm.SI.tid", ctx->i32,
                                           NULL, 0, LLVMReadNoneAttribute);
 
        /* can_emit = tid < so_vtx_count; */
@@ -1567,7 +1697,7 @@ static void si_llvm_emit_streamout(struct si_shader_context *shader,
                LLVMBuildICmp(builder, LLVMIntULT, tid, so_vtx_count, "");
 
        LLVMValueRef stream_id =
-               unpack_param(shader, shader->param_streamout_config, 24, 2);
+               unpack_param(ctx, ctx->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
@@ -1581,8 +1711,8 @@ static void si_llvm_emit_streamout(struct si_shader_context *shader,
                  */
 
                LLVMValueRef so_write_index =
-                       LLVMGetParam(shader->radeon_bld.main_fn,
-                                    shader->param_streamout_write_index);
+                       LLVMGetParam(ctx->radeon_bld.main_fn,
+                                    ctx->param_streamout_write_index);
 
                /* Compute (streamout_write_index + thread_id). */
                so_write_index = LLVMBuildAdd(builder, so_write_index, tid, "");
@@ -1593,12 +1723,12 @@ static void si_llvm_emit_streamout(struct si_shader_context *shader,
                        if (!so->stride[i])
                                continue;
 
-                       LLVMValueRef so_offset = LLVMGetParam(shader->radeon_bld.main_fn,
-                                                             shader->param_streamout_offset[i]);
-                       so_offset = LLVMBuildMul(builder, so_offset, LLVMConstInt(i32, 4, 0), "");
+                       LLVMValueRef so_offset = LLVMGetParam(ctx->radeon_bld.main_fn,
+                                                             ctx->param_streamout_offset[i]);
+                       so_offset = LLVMBuildMul(builder, so_offset, LLVMConstInt(ctx->i32, 4, 0), "");
 
                        so_write_offset[i] = LLVMBuildMul(builder, so_write_index,
-                                                         LLVMConstInt(i32, so->stride[i]*4, 0), "");
+                                                         LLVMConstInt(ctx->i32, so->stride[i]*4, 0), "");
                        so_write_offset[i] = LLVMBuildAdd(builder, so_write_offset[i], so_offset, "");
                }
 
@@ -1623,7 +1753,7 @@ static void si_llvm_emit_streamout(struct si_shader_context *shader,
                        for (j = 0; j < num_comps; j++) {
                                out[j] = LLVMBuildBitCast(builder,
                                                          outputs[reg].values[start+j],
-                                               i32, "");
+                                               ctx->i32, "");
                        }
 
                        /* Pack the output. */
@@ -1636,10 +1766,10 @@ static void si_llvm_emit_streamout(struct si_shader_context *shader,
                        case 2: /* as v2i32 */
                        case 3: /* as v4i32 (aligned to 4) */
                        case 4: /* as v4i32 */
-                               vdata = LLVMGetUndef(LLVMVectorType(i32, util_next_power_of_two(num_comps)));
+                               vdata = LLVMGetUndef(LLVMVectorType(ctx->i32, util_next_power_of_two(num_comps)));
                                for (j = 0; j < num_comps; j++) {
                                        vdata = LLVMBuildInsertElement(builder, vdata, out[j],
-                                                                      LLVMConstInt(i32, j, 0), "");
+                                                                      LLVMConstInt(ctx->i32, j, 0), "");
                                }
                                break;
                        }
@@ -1650,10 +1780,10 @@ static void si_llvm_emit_streamout(struct si_shader_context *shader,
                                              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],
+                       build_tbuffer_store_dwords(ctx, ctx->so_buffers[buf_idx],
                                                   vdata, num_comps,
                                                   so_write_offset[buf_idx],
-                                                  LLVMConstInt(i32, 0, 0),
+                                                  LLVMConstInt(ctx->i32, 0, 0),
                                                   so->output[i].dst_offset*4);
                        lp_build_endif(&if_ctx_stream);
                }
@@ -1667,11 +1797,11 @@ static void si_llvm_export_vs(struct lp_build_tgsi_context *bld_base,
                              struct si_shader_output_values *outputs,
                              unsigned noutput)
 {
-       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 =
-                               &si_shader_ctx->radeon_bld.soa.bld_base.uint_bld;
+       struct si_shader_context *ctx = si_shader_context(bld_base);
+       struct si_shader *shader = ctx->shader;
+       struct lp_build_context *base = &bld_base->base;
+       struct lp_build_context *uint =
+                               &ctx->radeon_bld.soa.bld_base.uint_bld;
        LLVMValueRef args[9];
        LLVMValueRef pos_args[4][9] = { { 0 } };
        LLVMValueRef psize_value = NULL, edgeflag_value = NULL, layer_value = NULL, viewport_index_value = NULL;
@@ -1681,8 +1811,8 @@ static void si_llvm_export_vs(struct lp_build_tgsi_context *bld_base,
        unsigned pos_idx;
        int i;
 
-       if (outputs && si_shader_ctx->shader->selector->so.num_outputs) {
-               si_llvm_emit_streamout(si_shader_ctx, outputs, noutput);
+       if (outputs && ctx->shader->selector->so.num_outputs) {
+               si_llvm_emit_streamout(ctx, outputs, noutput);
        }
 
        for (i = 0; i < noutput; i++) {
@@ -1744,8 +1874,7 @@ handle_semantic:
                               args, sizeof(args));
                } else {
                        lp_build_intrinsic(base->gallivm->builder,
-                                          "llvm.SI.export",
-                                          LLVMVoidTypeInContext(base->gallivm->context),
+                                          "llvm.SI.export", ctx->voidt,
                                           args, 9, 0);
                }
 
@@ -1797,7 +1926,7 @@ handle_semantic:
                         * with the first bit containing the edge flag. */
                        edgeflag_value = LLVMBuildFPToUI(base->gallivm->builder,
                                                         edgeflag_value,
-                                                        bld_base->uint_bld.elem_type, "");
+                                                        ctx->i32, "");
                        edgeflag_value = lp_build_min(&bld_base->int_bld,
                                                      edgeflag_value,
                                                      bld_base->int_bld.one);
@@ -1805,7 +1934,7 @@ handle_semantic:
                        /* The LLVM intrinsic expects a float. */
                        pos_args[1][6] = LLVMBuildBitCast(base->gallivm->builder,
                                                          edgeflag_value,
-                                                         base->elem_type, "");
+                                                         ctx->f32, "");
                }
 
                if (shader->selector->info.writes_layer)
@@ -1831,28 +1960,25 @@ handle_semantic:
                        /* Specify that this is the last export */
                        pos_args[i][2] = uint->one;
 
-               lp_build_intrinsic(base->gallivm->builder,
-                                  "llvm.SI.export",
-                                  LLVMVoidTypeInContext(base->gallivm->context),
-                                  pos_args[i], 9, 0);
+               lp_build_intrinsic(base->gallivm->builder, "llvm.SI.export",
+                                  ctx->voidt, pos_args[i], 9, 0);
        }
 }
 
-/* This only writes the tessellation factor levels. */
-static void si_llvm_emit_tcs_epilogue(struct lp_build_tgsi_context *bld_base)
+static void si_write_tess_factors(struct lp_build_tgsi_context *bld_base,
+                                 LLVMValueRef rel_patch_id,
+                                 LLVMValueRef invocation_id,
+                                 LLVMValueRef tcs_out_current_patch_data_offset)
 {
-       struct si_shader_context *si_shader_ctx = si_shader_context(bld_base);
+       struct si_shader_context *ctx = si_shader_context(bld_base);
        struct gallivm_state *gallivm = bld_base->base.gallivm;
-       struct si_shader *shader = si_shader_ctx->shader;
+       struct si_shader *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 out[6], vec0, vec1, invocation_id;
+       LLVMValueRef lds_base, lds_inner, lds_outer, byteoffset, buffer;
+       LLVMValueRef out[6], vec0, vec1, rw_buffers, tf_base;
        unsigned stride, outer_comps, inner_comps, i;
        struct lp_build_if_state if_ctx;
 
-       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.
         *
@@ -1891,7 +2017,7 @@ static void si_llvm_emit_tcs_epilogue(struct lp_build_tgsi_context *bld_base)
        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_base = tcs_out_current_patch_data_offset;
        lds_inner = LLVMBuildAdd(gallivm->builder, lds_base,
                                 lp_build_const_int32(gallivm,
                                                      tess_inner_index * 4), "");
@@ -1912,45 +2038,58 @@ static void si_llvm_emit_tcs_epilogue(struct lp_build_tgsi_context *bld_base)
                vec1 = lp_build_gather_values(gallivm, out+4, stride - 4);
 
        /* Get the buffer. */
-       rw_buffers = LLVMGetParam(si_shader_ctx->radeon_bld.main_fn,
+       rw_buffers = LLVMGetParam(ctx->radeon_bld.main_fn,
                                  SI_PARAM_RW_BUFFERS);
-       buffer = build_indexed_load_const(si_shader_ctx, rw_buffers,
+       buffer = build_indexed_load_const(ctx, rw_buffers,
                        lp_build_const_int32(gallivm, SI_RING_TESS_FACTOR));
 
        /* Get the offset. */
-       tf_base = LLVMGetParam(si_shader_ctx->radeon_bld.main_fn,
+       tf_base = LLVMGetParam(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 outputs. */
-       build_tbuffer_store_dwords(si_shader_ctx, buffer, vec0,
+       build_tbuffer_store_dwords(ctx, buffer, vec0,
                                   MIN2(stride, 4), byteoffset, tf_base, 0);
        if (vec1)
-               build_tbuffer_store_dwords(si_shader_ctx, buffer, vec1,
+               build_tbuffer_store_dwords(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)
+/* This only writes the tessellation factor levels. */
+static void si_llvm_emit_tcs_epilogue(struct lp_build_tgsi_context *bld_base)
+{
+       struct si_shader_context *ctx = si_shader_context(bld_base);
+       LLVMValueRef invocation_id;
+
+       invocation_id = unpack_param(ctx, SI_PARAM_REL_IDS, 8, 5);
+
+       si_write_tess_factors(bld_base,
+                             get_rel_patch_id(ctx),
+                             invocation_id,
+                             get_tcs_out_current_patch_data_offset(ctx));
+}
+
+static void si_llvm_emit_ls_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 si_shader_context *ctx = si_shader_context(bld_base);
+       struct si_shader *shader = ctx->shader;
        struct tgsi_shader_info *info = &shader->selector->info;
        struct gallivm_state *gallivm = bld_base->base.gallivm;
        unsigned i, chan;
-       LLVMValueRef vertex_id = LLVMGetParam(si_shader_ctx->radeon_bld.main_fn,
-                                             si_shader_ctx->param_rel_auto_id);
+       LLVMValueRef vertex_id = LLVMGetParam(ctx->radeon_bld.main_fn,
+                                             ctx->param_rel_auto_id);
        LLVMValueRef vertex_dw_stride =
-               unpack_param(si_shader_ctx, SI_PARAM_LS_OUT_LAYOUT, 13, 8);
+               unpack_param(ctx, SI_PARAM_LS_OUT_LAYOUT, 13, 8);
        LLVMValueRef base_dw_addr = LLVMBuildMul(gallivm->builder, vertex_id,
                                                 vertex_dw_stride, "");
 
        /* Write outputs to LDS. The next shader (TCS aka HS) will read
         * its inputs from it. */
        for (i = 0; i < info->num_outputs; i++) {
-               LLVMValueRef *out_ptr = si_shader_ctx->radeon_bld.soa.outputs[i];
+               LLVMValueRef *out_ptr = ctx->radeon_bld.soa.outputs[i];
                unsigned name = info->output_semantic_name[i];
                unsigned index = info->output_semantic_index[i];
                int param = si_shader_io_get_unique_index(name, index);
@@ -1964,44 +2103,37 @@ static void si_llvm_emit_ls_epilogue(struct lp_build_tgsi_context * bld_base)
        }
 }
 
-static void si_llvm_emit_es_epilogue(struct lp_build_tgsi_context * bld_base)
+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);
+       struct si_shader_context *ctx = si_shader_context(bld_base);
        struct gallivm_state *gallivm = bld_base->base.gallivm;
-       struct si_shader *es = si_shader_ctx->shader;
+       struct si_shader *es = ctx->shader;
        struct tgsi_shader_info *info = &es->selector->info;
-       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;
+       LLVMValueRef soffset = LLVMGetParam(ctx->radeon_bld.main_fn,
+                                           ctx->param_es2gs_offset);
        unsigned chan;
        int i;
 
        for (i = 0; i < info->num_outputs; i++) {
                LLVMValueRef *out_ptr =
-                       si_shader_ctx->radeon_bld.soa.outputs[i];
+                       ctx->radeon_bld.soa.outputs[i];
                int param_index;
 
                if (info->output_semantic_name[i] == TGSI_SEMANTIC_VIEWPORT_INDEX ||
                    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], "");
-                       out_val = LLVMBuildBitCast(gallivm->builder, out_val, i32, "");
+                       out_val = LLVMBuildBitCast(gallivm->builder, out_val, ctx->i32, "");
 
-                       build_tbuffer_store(si_shader_ctx,
-                                           si_shader_ctx->esgs_ring,
+                       build_tbuffer_store(ctx,
+                                           ctx->esgs_ring,
                                            out_val, 1,
-                                           LLVMGetUndef(i32), soffset,
+                                           LLVMGetUndef(ctx->i32), soffset,
                                            (4 * param_index + chan) * 4,
                                            V_008F0C_BUF_DATA_FORMAT_32,
                                            V_008F0C_BUF_NUM_FORMAT_UINT,
@@ -2012,27 +2144,66 @@ static void si_llvm_emit_es_epilogue(struct lp_build_tgsi_context * bld_base)
 
 static void si_llvm_emit_gs_epilogue(struct lp_build_tgsi_context *bld_base)
 {
-       struct si_shader_context *si_shader_ctx = si_shader_context(bld_base);
+       struct si_shader_context *ctx = si_shader_context(bld_base);
        struct gallivm_state *gallivm = bld_base->base.gallivm;
        LLVMValueRef args[2];
 
        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);
+       args[1] = LLVMGetParam(ctx->radeon_bld.main_fn, SI_PARAM_GS_WAVE_ID);
        lp_build_intrinsic(gallivm->builder, "llvm.SI.sendmsg",
-                       LLVMVoidTypeInContext(gallivm->context), args, 2,
-                       LLVMNoUnwindAttribute);
+                          ctx->voidt, args, 2, LLVMNoUnwindAttribute);
 }
 
-static void si_llvm_emit_vs_epilogue(struct lp_build_tgsi_context * bld_base)
+static void si_llvm_emit_vs_epilogue(struct lp_build_tgsi_context *bld_base)
 {
-       struct si_shader_context *si_shader_ctx = si_shader_context(bld_base);
+       struct si_shader_context *ctx = si_shader_context(bld_base);
        struct gallivm_state *gallivm = bld_base->base.gallivm;
-       struct tgsi_shader_info *info = &si_shader_ctx->shader->selector->info;
+       struct tgsi_shader_info *info = &ctx->shader->selector->info;
        struct si_shader_output_values *outputs = NULL;
        int i,j;
 
+       assert(!ctx->is_gs_copy_shader);
+
        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 (ctx->type == TGSI_PROCESSOR_VERTEX) {
+               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(ctx->radeon_bld.main_fn,
+                                                   SI_PARAM_VS_STATE_BITS);
+                               cond = LLVMBuildTrunc(gallivm->builder, cond,
+                                                     ctx->i1, "");
+                               lp_build_if(&if_ctx, gallivm, cond);
+                       }
+
+                       for (j = 0; j < 4; j++) {
+                               addr = 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];
                outputs[i].sid = info->output_semantic_index[i];
@@ -2040,12 +2211,12 @@ static void si_llvm_emit_vs_epilogue(struct lp_build_tgsi_context * bld_base)
                for (j = 0; j < 4; j++)
                        outputs[i].values[j] =
                                LLVMBuildLoad(gallivm->builder,
-                                             si_shader_ctx->radeon_bld.soa.outputs[i][j],
+                                             ctx->radeon_bld.soa.outputs[i][j],
                                              "");
        }
 
        /* Export PrimitiveID when PS needs it. */
-       if (si_vs_exports_prim_id(si_shader_ctx->shader)) {
+       if (si_vs_exports_prim_id(ctx->shader)) {
                outputs[i].name = TGSI_SEMANTIC_PRIMID;
                outputs[i].sid = 0;
                outputs[i].values[0] = bitcast(bld_base, TGSI_TYPE_FLOAT,
@@ -2060,224 +2231,352 @@ static void si_llvm_emit_vs_epilogue(struct lp_build_tgsi_context * bld_base)
        FREE(outputs);
 }
 
-static void si_llvm_emit_fs_epilogue(struct lp_build_tgsi_context * bld_base)
+static void si_export_mrt_z(struct lp_build_tgsi_context *bld_base,
+                          LLVMValueRef depth, LLVMValueRef stencil,
+                          LLVMValueRef samplemask)
 {
-       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;
+       struct si_shader_context *ctx = si_shader_context(bld_base);
+       struct lp_build_context *base = &bld_base->base;
+       struct lp_build_context *uint = &bld_base->uint_bld;
        LLVMValueRef args[9];
-       LLVMValueRef last_args[9] = { 0 };
-       int depth_index = -1, stencil_index = -1, samplemask_index = -1;
-       int i;
+       unsigned mask = 0;
 
-       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;
+       assert(depth || stencil || samplemask);
 
-               /* Select the correct target */
-               switch (semantic_name) {
-               case TGSI_SEMANTIC_POSITION:
-                       depth_index = i;
-                       continue;
-               case TGSI_SEMANTIC_STENCIL:
-                       stencil_index = i;
-                       continue;
-               case TGSI_SEMANTIC_SAMPLEMASK:
-                       samplemask_index = i;
-                       continue;
-               case TGSI_SEMANTIC_COLOR:
-                       target = V_008DFC_SQ_EXP_MRT + semantic_index;
-                       alpha_ptr = si_shader_ctx->radeon_bld.soa.outputs[i][3];
+       args[1] = uint->one; /* whether the EXEC mask is valid */
+       args[2] = uint->one; /* DONE bit */
 
-                       if (si_shader_ctx->shader->key.ps.alpha_to_one)
-                               LLVMBuildStore(base->gallivm->builder,
-                                              base->one, alpha_ptr);
+       /* Specify the target we are exporting */
+       args[3] = lp_build_const_int32(base->gallivm, V_008DFC_SQ_EXP_MRTZ);
 
-                       if (semantic_index == 0 &&
-                           si_shader_ctx->shader->key.ps.alpha_func != PIPE_FUNC_ALWAYS)
-                               si_alpha_test(bld_base, alpha_ptr);
+       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 (si_shader_ctx->shader->key.ps.poly_line_smoothing)
-                               si_scale_alpha_by_sample_mask(bld_base, alpha_ptr);
-                       break;
-               default:
-                       target = 0;
-                       fprintf(stderr,
-                               "Warning: SI unhandled fs output type:%d\n",
-                               semantic_name);
-               }
+       if (depth) {
+               args[5] = depth;
+               mask |= 0x1;
+       }
 
-               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, 0);
-                       }
+       if (stencil) {
+               args[6] = stencil;
+               mask |= 0x2;
+       }
 
-                       /* 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, 0);
-                               }
-                       }
-               } else {
-                       lp_build_intrinsic(base->gallivm->builder,
-                                          "llvm.SI.export",
-                                          LLVMVoidTypeInContext(base->gallivm->context),
-                                          args, 9, 0);
-               }
+       if (samplemask) {
+               args[7] = samplemask;
+               mask |= 0x4;
        }
 
-       if (depth_index >= 0 || stencil_index >= 0 || samplemask_index >= 0) {
-               LLVMValueRef out_ptr;
-               unsigned mask = 0;
+       /* SI (except OLAND) has a bug that it only looks
+        * at the X writemask component. */
+       if (ctx->screen->b.chip_class == SI &&
+           ctx->screen->b.family != CHIP_OLAND)
+               mask |= 0x1;
 
-               /* 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);
-               }
+       /* Specify which components to enable */
+       args[0] = lp_build_const_int32(base->gallivm, mask);
 
-               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);
-               }
+       lp_build_intrinsic(base->gallivm->builder, "llvm.SI.export",
+                          ctx->voidt, 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 *ctx = si_shader_context(bld_base);
+       struct lp_build_context *base = &bld_base->base;
+       int i;
 
-               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);
+       /* Clamp color */
+       if (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 (ctx->shader->key.ps.alpha_to_one)
+               color[3] = base->one;
+
+       /* Alpha test */
+       if (index == 0 &&
+           ctx->shader->key.ps.alpha_func != PIPE_FUNC_ALWAYS)
+               si_alpha_test(bld_base, color[3]);
+
+       /* Line & polygon smoothing */
+       if (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 (ctx->shader->key.ps.last_cbuf > 0) {
+               LLVMValueRef args[8][9];
+               int c, last = -1;
+
+               /* Get the export arguments, also find out what the last one is. */
+               for (c = 0; c <= ctx->shader->key.ps.last_cbuf; c++) {
+                       si_llvm_init_export_args(bld_base, color,
+                                                V_008DFC_SQ_EXP_MRT + c, args[c]);
+                       if (args[c][0] != bld_base->uint_bld.zero)
+                               last = c;
                }
 
-               /* 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;
+               /* Emit all exports. */
+               for (c = 0; c <= ctx->shader->key.ps.last_cbuf; c++) {
+                       if (is_last && last == c) {
+                               args[c][1] = bld_base->uint_bld.one; /* whether the EXEC mask is valid */
+                               args[c][2] = bld_base->uint_bld.one; /* DONE bit */
+                       } else if (args[c][0] == bld_base->uint_bld.zero)
+                               continue; /* unnecessary NULL export */
 
-               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;
+                       lp_build_intrinsic(base->gallivm->builder, "llvm.SI.export",
+                                          ctx->voidt, args[c], 9, 0);
+               }
+       } else {
+               LLVMValueRef args[9];
+
+               /* 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 */
+               } else if (args[0] == bld_base->uint_bld.zero)
+                       return; /* unnecessary NULL export */
+
+               lp_build_intrinsic(base->gallivm->builder, "llvm.SI.export",
+                                  ctx->voidt, args, 9, 0);
+       }
+}
 
-               /* Specify which components to enable */
-               args[0] = lp_build_const_int32(base->gallivm, mask);
+static void si_export_null(struct lp_build_tgsi_context *bld_base)
+{
+       struct si_shader_context *ctx = si_shader_context(bld_base);
+       struct lp_build_context *base = &bld_base->base;
+       struct lp_build_context *uint = &bld_base->uint_bld;
+       LLVMValueRef args[9];
 
-               args[1] =
-               args[2] =
-               args[4] = uint->zero;
+       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",
+                          ctx->voidt, args, 9, 0);
+}
 
-               if (last_args[0])
-                       lp_build_intrinsic(base->gallivm->builder,
-                                          "llvm.SI.export",
-                                          LLVMVoidTypeInContext(base->gallivm->context),
-                                          args, 9, 0);
-               else
-                       memcpy(last_args, args, sizeof(args));
-       }
+static void si_llvm_emit_fs_epilogue(struct lp_build_tgsi_context *bld_base)
+{
+       struct si_shader_context *ctx = si_shader_context(bld_base);
+       struct si_shader *shader = ctx->shader;
+       struct lp_build_context *base = &bld_base->base;
+       struct tgsi_shader_info *info = &shader->selector->info;
+       LLVMBuilderRef builder = base->gallivm->builder;
+       LLVMValueRef depth = NULL, stencil = NULL, samplemask = NULL;
+       int last_color_export = -1;
+       int i;
 
-       if (!last_args[0]) {
-               /* Specify which components to enable */
-               last_args[0] = lp_build_const_int32(base->gallivm, 0x0);
+       /* 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) {
+               unsigned spi_format = shader->key.ps.spi_shader_col_format;
 
-               /* Specify the target we are exporting */
-               last_args[3] = lp_build_const_int32(base->gallivm, V_008DFC_SQ_EXP_MRT);
+               /* Don't export NULL and return if alpha-test is enabled. */
+               if (shader->key.ps.alpha_func != PIPE_FUNC_ALWAYS &&
+                   shader->key.ps.alpha_func != PIPE_FUNC_NEVER &&
+                   (spi_format & 0xf) == 0)
+                       spi_format |= V_028714_SPI_SHADER_32_AR;
 
-               /* Set COMPR flag to zero to export data as 32-bit */
-               last_args[4] = uint->zero;
+               for (i = 0; i < info->num_outputs; i++) {
+                       unsigned index = info->output_semantic_index[i];
 
-               /* dummy bits */
-               last_args[5]= uint->zero;
-               last_args[6]= uint->zero;
-               last_args[7]= uint->zero;
-               last_args[8]= uint->zero;
+                       if (info->output_semantic_name[i] != TGSI_SEMANTIC_COLOR)
+                               continue;
+
+                       /* If last_cbuf > 0, FS_COLOR0_WRITES_ALL_CBUFS is true. */
+                       if (shader->key.ps.last_cbuf > 0) {
+                               /* Just set this if any of the colorbuffers are enabled. */
+                               if (spi_format &
+                                   ((1llu << (4 * (shader->key.ps.last_cbuf + 1))) - 1))
+                                       last_color_export = i;
+                               continue;
+                       }
+
+                       if ((spi_format >> (index * 4)) & 0xf)
+                               last_color_export = i;
+               }
+
+               /* If there are no outputs, export NULL. */
+               if (last_color_export == -1) {
+                       si_export_null(bld_base);
+                       return;
+               }
        }
 
-       /* Specify whether the EXEC mask represents the valid mask */
-       last_args[1] = uint->one;
+       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 j;
+               LLVMValueRef color[4] = {};
 
-       /* Specify that this is the last export */
-       last_args[2] = lp_build_const_int32(base->gallivm, 1);
+               /* Select the correct target */
+               switch (semantic_name) {
+               case TGSI_SEMANTIC_POSITION:
+                       depth = LLVMBuildLoad(builder,
+                                             ctx->radeon_bld.soa.outputs[i][2], "");
+                       break;
+               case TGSI_SEMANTIC_STENCIL:
+                       stencil = LLVMBuildLoad(builder,
+                                               ctx->radeon_bld.soa.outputs[i][1], "");
+                       break;
+               case TGSI_SEMANTIC_SAMPLEMASK:
+                       samplemask = LLVMBuildLoad(builder,
+                                                  ctx->radeon_bld.soa.outputs[i][0], "");
+                       break;
+               case TGSI_SEMANTIC_COLOR:
+                       for (j = 0; j < 4; j++)
+                               color[j] = LLVMBuildLoad(builder,
+                                                        ctx->radeon_bld.soa.outputs[i][j], "");
 
-       lp_build_intrinsic(base->gallivm->builder,
-                          "llvm.SI.export",
-                          LLVMVoidTypeInContext(base->gallivm->context),
-                          last_args, 9, 0);
+                       si_export_mrt_color(bld_base, color, semantic_index,
+                                           last_color_export == i);
+                       break;
+               default:
+                       fprintf(stderr,
+                               "Warning: SI unhandled fs output type:%d\n",
+                               semantic_name);
+               }
+       }
+
+       if (depth || stencil || samplemask)
+               si_export_mrt_z(bld_base, depth, stencil, samplemask);
 }
 
-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);
+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);
 
-static bool tgsi_is_shadow_sampler(unsigned target)
+static bool tgsi_is_array_sampler(unsigned target)
 {
-       return target == TGSI_TEXTURE_SHADOW1D ||
+       return target == TGSI_TEXTURE_1D_ARRAY ||
               target == TGSI_TEXTURE_SHADOW1D_ARRAY ||
-              target == TGSI_TEXTURE_SHADOW2D ||
+              target == TGSI_TEXTURE_2D_ARRAY ||
               target == TGSI_TEXTURE_SHADOW2D_ARRAY ||
-              target == TGSI_TEXTURE_SHADOWCUBE ||
+              target == TGSI_TEXTURE_CUBE_ARRAY ||
               target == TGSI_TEXTURE_SHADOWCUBE_ARRAY ||
-              target == TGSI_TEXTURE_SHADOWRECT;
+              target == TGSI_TEXTURE_2D_ARRAY_MSAA;
+}
+
+static void set_tex_fetch_args(struct si_shader_context *ctx,
+                              struct lp_build_emit_data *emit_data,
+                              unsigned opcode, unsigned target,
+                              LLVMValueRef res_ptr, LLVMValueRef samp_ptr,
+                              LLVMValueRef *param, unsigned count,
+                              unsigned dmask)
+{
+       struct gallivm_state *gallivm = &ctx->radeon_bld.gallivm;
+       unsigned num_args;
+       unsigned is_rect = target == TGSI_TEXTURE_RECT;
+
+       /* Pad to power of two vector */
+       while (count < util_next_power_of_two(count))
+               param[count++] = LLVMGetUndef(ctx->i32);
+
+       /* Texture coordinates. */
+       if (count > 1)
+               emit_data->args[0] = lp_build_gather_values(gallivm, param, count);
+       else
+               emit_data->args[0] = param[0];
+
+       /* Resource. */
+       emit_data->args[1] = res_ptr;
+       num_args = 2;
+
+       if (opcode == TGSI_OPCODE_TXF || opcode == TGSI_OPCODE_TXQ)
+               emit_data->dst_type = ctx->v4i32;
+       else {
+               emit_data->dst_type = ctx->v4f32;
+
+               emit_data->args[num_args++] = samp_ptr;
+       }
+
+       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;
 }
 
 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)
+enum desc_type {
+       DESC_IMAGE,
+       DESC_FMASK,
+       DESC_SAMPLER
+};
+
+static LLVMTypeRef const_array(LLVMTypeRef elem_type, int num_elements)
 {
-       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 opcode = inst->Instruction.Opcode;
+       return LLVMPointerType(LLVMArrayType(elem_type, num_elements),
+                              CONST_ADDR_SPACE);
+}
+
+/**
+ * Load an image view, fmask view. or sampler state descriptor.
+ */
+static LLVMValueRef get_sampler_desc(struct si_shader_context *ctx,
+                                    LLVMValueRef index, enum desc_type type)
+{
+       struct gallivm_state *gallivm = &ctx->radeon_bld.gallivm;
+       LLVMBuilderRef builder = gallivm->builder;
+       LLVMValueRef ptr = LLVMGetParam(ctx->radeon_bld.main_fn,
+                                       SI_PARAM_SAMPLERS);
+
+       switch (type) {
+       case DESC_IMAGE:
+               /* The image is at [0:7]. */
+               index = LLVMBuildMul(builder, index, LLVMConstInt(ctx->i32, 2, 0), "");
+               break;
+       case DESC_FMASK:
+               /* The FMASK is at [8:15]. */
+               index = LLVMBuildMul(builder, index, LLVMConstInt(ctx->i32, 2, 0), "");
+               index = LLVMBuildAdd(builder, index, LLVMConstInt(ctx->i32, 1, 0), "");
+               break;
+       case DESC_SAMPLER:
+               /* The sampler state is at [12:15]. */
+               index = LLVMBuildMul(builder, index, LLVMConstInt(ctx->i32, 4, 0), "");
+               index = LLVMBuildAdd(builder, index, LLVMConstInt(ctx->i32, 3, 0), "");
+               ptr = LLVMBuildPointerCast(builder, ptr,
+                                          const_array(ctx->v4i32, 0), "");
+               break;
+       }
+
+       return build_indexed_load_const(ctx, ptr, index);
+}
+
+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 *ctx = si_shader_context(bld_base);
+       const struct tgsi_full_instruction *inst = emit_data->inst;
        unsigned target = inst->Texture.Texture;
-       LLVMValueRef coords[5], derivs[6];
-       LLVMValueRef address[16];
-       int ref_pos;
-       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, fmask_ptr = NULL;
 
        sampler_src = emit_data->inst->Instruction.NumSrcRegs - 1;
        sampler_index = emit_data->inst->Src[sampler_src].Register.Index;
@@ -2286,44 +2585,96 @@ static void tex_fetch_args(
                const struct tgsi_full_src_register *reg = &emit_data->inst->Src[sampler_src];
                LLVMValueRef ind_index;
 
-               ind_index = get_indirect_index(si_shader_ctx, &reg->Indirect, reg->Register.Index);
+               ind_index = get_indirect_index(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);
-
-               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);
+               *res_ptr = get_sampler_desc(ctx, ind_index, DESC_IMAGE);
 
                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_RESOURCE);
-                       fmask_ptr = build_indexed_load_const(si_shader_ctx, res_ptr, ind_index);
+                       *samp_ptr = NULL;
+                       *fmask_ptr = get_sampler_desc(ctx, ind_index, DESC_FMASK);
+               } else {
+                       *samp_ptr = get_sampler_desc(ctx, ind_index, DESC_SAMPLER);
+                       *fmask_ptr = NULL;
                }
        } else {
-               res_ptr = si_shader_ctx->resources[sampler_index];
-               samp_ptr = si_shader_ctx->samplers[sampler_index];
-               fmask_ptr = si_shader_ctx->resources[SI_FMASK_TEX_OFFSET + sampler_index];
+               *res_ptr = ctx->sampler_views[sampler_index];
+               *samp_ptr = ctx->sampler_states[sampler_index];
+               *fmask_ptr = ctx->fmasks[sampler_index];
+       }
+}
+
+static void tex_fetch_args(
+       struct lp_build_tgsi_context *bld_base,
+       struct lp_build_emit_data *emit_data)
+{
+       struct si_shader_context *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;
+       LLVMValueRef coords[5], derivs[6];
+       LLVMValueRef address[16];
+       int ref_pos;
+       unsigned num_coords = tgsi_util_get_texture_coord_dim(target, &ref_pos);
+       unsigned count = 0;
+       unsigned chan;
+       unsigned num_deriv_channels = 0;
+       bool has_offset = inst->Texture.NumOffsets > 0;
+       LLVMValueRef res_ptr, samp_ptr, fmask_ptr = NULL;
+       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) {
+                       /* Read the size from the buffer descriptor directly. */
+                       LLVMValueRef res = LLVMBuildBitCast(builder, res_ptr, ctx->v8i32, "");
+                       LLVMValueRef size = LLVMBuildExtractElement(builder, res,
+                                                       lp_build_const_int32(gallivm, 6), "");
+
+                       if (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, "");
+                       }
+
+                       emit_data->args[0] = size;
+                       return;
+               }
+
+               /* Textures - set the mip level. */
+               address[count++] = lp_build_emit_fetch(bld_base, inst, 0, TGSI_CHAN_X);
+
+               set_tex_fetch_args(ctx, emit_data, opcode, target, res_ptr,
+                                  NULL, address, count, 0xf);
+               return;
        }
 
        if (target == TGSI_TEXTURE_BUFFER) {
-               LLVMTypeRef i128 = LLVMIntTypeInContext(gallivm->context, 128);
-               LLVMTypeRef v2i128 = LLVMVectorType(i128, 2);
-               LLVMTypeRef i8 = LLVMInt8TypeInContext(gallivm->context);
-               LLVMTypeRef v16i8 = LLVMVectorType(i8, 16);
+               LLVMTypeRef v2i128 = LLVMVectorType(ctx->i128, 2);
 
                /* Bitcast and truncate v8i32 to v16i8. */
                LLVMValueRef res = res_ptr;
                res = LLVMBuildBitCast(gallivm->builder, res, v2i128, "");
                res = LLVMBuildExtractElement(gallivm->builder, res, bld_base->uint_bld.one, "");
-               res = LLVMBuildBitCast(gallivm->builder, res, v16i8, "");
+               res = LLVMBuildBitCast(gallivm->builder, res, ctx->v16i8, "");
 
-               emit_data->dst_type = LLVMVectorType(bld_base->base.elem_type, 4);
+               emit_data->dst_type = ctx->v4f32;
                emit_data->args[0] = res;
                emit_data->args[1] = bld_base->uint_bld.zero;
-               emit_data->args[2] = lp_build_emit_fetch(bld_base, emit_data->inst, 0, 0);
+               emit_data->args[2] = lp_build_emit_fetch(bld_base, emit_data->inst, 0, TGSI_CHAN_X);
                emit_data->arg_count = 3;
                return;
        }
@@ -2372,12 +2723,12 @@ static void tex_fetch_args(
        if (opcode == TGSI_OPCODE_TXB)
                address[count++] = coords[3];
        if (opcode == TGSI_OPCODE_TXB2)
-               address[count++] = lp_build_emit_fetch(bld_base, inst, 1, 0);
+               address[count++] = lp_build_emit_fetch(bld_base, inst, 1, TGSI_CHAN_X);
 
        /* 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);
+                       address[count++] = lp_build_emit_fetch(bld_base, inst, 1, TGSI_CHAN_X);
                } else {
                        assert(ref_pos >= 0);
                        address[count++] = coords[ref_pos];
@@ -2448,7 +2799,7 @@ static void tex_fetch_args(
        if (opcode == TGSI_OPCODE_TXL || opcode == TGSI_OPCODE_TXF)
                address[count++] = coords[3];
        else if (opcode == TGSI_OPCODE_TXL2)
-               address[count++] = lp_build_emit_fetch(bld_base, inst, 1, 0);
+               address[count++] = lp_build_emit_fetch(bld_base, inst, 1, TGSI_CHAN_X);
 
        if (count > 16) {
                assert(!"Cannot handle more than 16 texture address parameters");
@@ -2457,9 +2808,7 @@ static void tex_fetch_args(
 
        for (chan = 0; chan < count; chan++ ) {
                address[chan] = LLVMBuildBitCast(gallivm->builder,
-                                                address[chan],
-                                                LLVMInt32TypeInContext(gallivm->context),
-                                                "");
+                                                address[chan], ctx->i32, "");
        }
 
        /* Adjust the sample index according to FMASK.
@@ -2491,27 +2840,19 @@ 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] = fmask_ptr;
-               txf_emit_data.args[2] = lp_build_const_int32(gallivm, inst.Texture.Texture);
-               txf_emit_data.arg_count = 3;
-
+               set_tex_fetch_args(ctx, &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. */
-               LLVMValueRef four = LLVMConstInt(uint_bld->elem_type, 4, 0);
-               LLVMValueRef F = LLVMConstInt(uint_bld->elem_type, 0xF, 0);
+               LLVMValueRef four = LLVMConstInt(ctx->i32, 4, 0);
+               LLVMValueRef F = LLVMConstInt(ctx->i32, 0xF, 0);
 
                /* Apply the formula. */
                LLVMValueRef fmask =
@@ -2535,7 +2876,7 @@ static void tex_fetch_args(
                 */
                LLVMValueRef fmask_desc =
                        LLVMBuildBitCast(gallivm->builder, fmask_ptr,
-                                        LLVMVectorType(uint_bld->elem_type, 8), "");
+                                        ctx->v8i32, "");
 
                LLVMValueRef fmask_word1 =
                        LLVMBuildExtractElement(gallivm->builder, fmask_desc,
@@ -2551,15 +2892,12 @@ 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) {
                        struct lp_build_context *uint_bld = &bld_base->uint_bld;
                        struct lp_build_tgsi_soa_context *bld = lp_soa_context(bld_base);
-                       const struct tgsi_texture_offset * off = inst->TexOffsets;
+                       const struct tgsi_texture_offset *off = inst->TexOffsets;
 
                        assert(inst->Texture.NumOffsets == 1);
 
@@ -2589,101 +2927,58 @@ 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;
-
-               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.
-                        */
+       if (opcode == TGSI_OPCODE_TG4) {
+               unsigned gather_comp = 0;
 
-                       /* 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(ctx, emit_data, opcode, target, res_ptr,
+                          samp_ptr, address, count, dmask);
 }
 
-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)
+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)
 {
-       struct lp_build_context * base = &bld_base->base;
+       struct lp_build_context *base = &bld_base->base;
        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] = lp_build_intrinsic(
@@ -2694,191 +2989,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] = lp_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] = lp_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;
-       LLVMBuilderRef builder = gallivm->builder;
-       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 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, "");
-               }
-
-               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);
-}
+       if (LLVMGetTypeKind(LLVMTypeOf(emit_data->args[0])) == LLVMVectorTypeKind)
+               sprintf(type, ".v%ui32",
+                       LLVMGetVectorSize(LLVMTypeOf(emit_data->args[0])));
+       else
+               strcpy(type, ".i32");
 
-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;
+       /* 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);
 
-       if (target == TGSI_TEXTURE_BUFFER) {
-               /* Just return the buffer size. */
-               emit_data->output[emit_data->chan] = emit_data->args[0];
-               return;
-       }
-
-       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);
@@ -2892,6 +3064,35 @@ 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 si_shader_context *ctx = si_shader_context(bld_base);
+       struct gallivm_state *gallivm = bld_base->base.gallivm;
+       LLVMBuilderRef builder = gallivm->builder;
+       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, ctx->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
@@ -2922,30 +3123,26 @@ static void build_txq_intrinsic(const struct lp_build_tgsi_action * action,
 #define TID_MASK_LEFT     0xfffffffe
 
 static void si_llvm_emit_ddxy(
-       const struct lp_build_tgsi_action * action,
-       struct lp_build_tgsi_context * bld_base,
-       struct lp_build_emit_data * emit_data)
+       const struct lp_build_tgsi_action *action,
+       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 si_shader_context *ctx = si_shader_context(bld_base);
        struct gallivm_state *gallivm = bld_base->base.gallivm;
-       struct lp_build_context * base = &bld_base->base;
        const struct tgsi_full_instruction *inst = emit_data->inst;
        unsigned opcode = inst->Instruction.Opcode;
        LLVMValueRef indices[2];
        LLVMValueRef store_ptr, load_ptr0, load_ptr1;
        LLVMValueRef tl, trbl, result[4];
-       LLVMTypeRef i32;
        unsigned swizzle[4];
        unsigned c;
        int idx;
        unsigned mask;
 
-       i32 = LLVMInt32TypeInContext(gallivm->context);
-
        indices[0] = bld_base->uint_bld.zero;
-       indices[1] = lp_build_intrinsic(gallivm->builder, "llvm.SI.tid", i32,
+       indices[1] = lp_build_intrinsic(gallivm->builder, "llvm.SI.tid", ctx->i32,
                                     NULL, 0, LLVMReadNoneAttribute);
-       store_ptr = LLVMBuildGEP(gallivm->builder, si_shader_ctx->lds,
+       store_ptr = LLVMBuildGEP(gallivm->builder, ctx->lds,
                                 indices, 2, "");
 
        if (opcode == TGSI_OPCODE_DDX_FINE)
@@ -2957,14 +3154,14 @@ static void si_llvm_emit_ddxy(
 
        indices[1] = LLVMBuildAnd(gallivm->builder, indices[1],
                                  lp_build_const_int32(gallivm, mask), "");
-       load_ptr0 = LLVMBuildGEP(gallivm->builder, si_shader_ctx->lds,
+       load_ptr0 = LLVMBuildGEP(gallivm->builder, ctx->lds,
                                 indices, 2, "");
 
        /* for DDX we want to next X pixel, DDY next Y pixel. */
        idx = (opcode == TGSI_OPCODE_DDX || opcode == TGSI_OPCODE_DDX_FINE) ? 1 : 2;
        indices[1] = LLVMBuildAdd(gallivm->builder, indices[1],
                                  lp_build_const_int32(gallivm, idx), "");
-       load_ptr1 = LLVMBuildGEP(gallivm->builder, si_shader_ctx->lds,
+       load_ptr1 = LLVMBuildGEP(gallivm->builder, ctx->lds,
                                 indices, 2, "");
 
        for (c = 0; c < 4; ++c) {
@@ -2983,14 +3180,14 @@ static void si_llvm_emit_ddxy(
                LLVMBuildStore(gallivm->builder,
                               LLVMBuildBitCast(gallivm->builder,
                                                lp_build_emit_fetch(bld_base, inst, 0, c),
-                                               i32, ""),
+                                               ctx->i32, ""),
                               store_ptr);
 
                tl = LLVMBuildLoad(gallivm->builder, load_ptr0, "");
-               tl = LLVMBuildBitCast(gallivm->builder, tl, base->elem_type, "");
+               tl = LLVMBuildBitCast(gallivm->builder, tl, ctx->f32, "");
 
                trbl = LLVMBuildLoad(gallivm->builder, load_ptr1, "");
-               trbl = LLVMBuildBitCast(gallivm->builder, trbl, base->elem_type, "");
+               trbl = LLVMBuildBitCast(gallivm->builder, trbl, ctx->f32, "");
 
                result[c] = LLVMBuildFSub(gallivm->builder, trbl, tl, "");
        }
@@ -3007,21 +3204,17 @@ static LLVMValueRef si_llvm_emit_ddxy_interp(
        struct lp_build_tgsi_context *bld_base,
        LLVMValueRef interp_ij)
 {
-       struct si_shader_context *si_shader_ctx = si_shader_context(bld_base);
+       struct si_shader_context *ctx = si_shader_context(bld_base);
        struct gallivm_state *gallivm = bld_base->base.gallivm;
-       struct lp_build_context *base = &bld_base->base;
        LLVMValueRef indices[2];
        LLVMValueRef store_ptr, load_ptr_x, load_ptr_y, load_ptr_ddx, load_ptr_ddy, temp, temp2;
        LLVMValueRef tl, tr, bl, result[4];
-       LLVMTypeRef i32;
        unsigned c;
 
-       i32 = LLVMInt32TypeInContext(gallivm->context);
-
        indices[0] = bld_base->uint_bld.zero;
-       indices[1] = lp_build_intrinsic(gallivm->builder, "llvm.SI.tid", i32,
+       indices[1] = lp_build_intrinsic(gallivm->builder, "llvm.SI.tid", ctx->i32,
                                        NULL, 0, LLVMReadNoneAttribute);
-       store_ptr = LLVMBuildGEP(gallivm->builder, si_shader_ctx->lds,
+       store_ptr = LLVMBuildGEP(gallivm->builder, ctx->lds,
                                 indices, 2, "");
 
        temp = LLVMBuildAnd(gallivm->builder, indices[1],
@@ -3031,21 +3224,21 @@ static LLVMValueRef si_llvm_emit_ddxy_interp(
                             lp_build_const_int32(gallivm, TID_MASK_TOP), "");
 
        indices[1] = temp;
-       load_ptr_x = LLVMBuildGEP(gallivm->builder, si_shader_ctx->lds,
+       load_ptr_x = LLVMBuildGEP(gallivm->builder, ctx->lds,
                                  indices, 2, "");
 
        indices[1] = temp2;
-       load_ptr_y = LLVMBuildGEP(gallivm->builder, si_shader_ctx->lds,
+       load_ptr_y = LLVMBuildGEP(gallivm->builder, ctx->lds,
                                  indices, 2, "");
 
        indices[1] = LLVMBuildAdd(gallivm->builder, temp,
                                  lp_build_const_int32(gallivm, 1), "");
-       load_ptr_ddx = LLVMBuildGEP(gallivm->builder, si_shader_ctx->lds,
+       load_ptr_ddx = LLVMBuildGEP(gallivm->builder, ctx->lds,
                                   indices, 2, "");
 
        indices[1] = LLVMBuildAdd(gallivm->builder, temp2,
                                  lp_build_const_int32(gallivm, 2), "");
-       load_ptr_ddy = LLVMBuildGEP(gallivm->builder, si_shader_ctx->lds,
+       load_ptr_ddy = LLVMBuildGEP(gallivm->builder, ctx->lds,
                                   indices, 2, "");
 
        for (c = 0; c < 2; ++c) {
@@ -3059,18 +3252,18 @@ static LLVMValueRef si_llvm_emit_ddxy_interp(
                               store_ptr);
 
                tl = LLVMBuildLoad(gallivm->builder, load_ptr_x, "");
-               tl = LLVMBuildBitCast(gallivm->builder, tl, base->elem_type, "");
+               tl = LLVMBuildBitCast(gallivm->builder, tl, ctx->f32, "");
 
                tr = LLVMBuildLoad(gallivm->builder, load_ptr_ddx, "");
-               tr = LLVMBuildBitCast(gallivm->builder, tr, base->elem_type, "");
+               tr = LLVMBuildBitCast(gallivm->builder, tr, ctx->f32, "");
 
                result[c] = LLVMBuildFSub(gallivm->builder, tr, tl, "");
 
                tl = LLVMBuildLoad(gallivm->builder, load_ptr_y, "");
-               tl = LLVMBuildBitCast(gallivm->builder, tl, base->elem_type, "");
+               tl = LLVMBuildBitCast(gallivm->builder, tl, ctx->f32, "");
 
                bl = LLVMBuildLoad(gallivm->builder, load_ptr_ddy, "");
-               bl = LLVMBuildBitCast(gallivm->builder, bl, base->elem_type, "");
+               bl = LLVMBuildBitCast(gallivm->builder, bl, ctx->f32, "");
 
                result[c + 2] = LLVMBuildFSub(gallivm->builder, bl, tl, "");
        }
@@ -3082,7 +3275,7 @@ static void interp_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 si_shader_context *ctx = si_shader_context(bld_base);
        struct gallivm_state *gallivm = bld_base->base.gallivm;
        const struct tgsi_full_instruction *inst = emit_data->inst;
 
@@ -3090,10 +3283,10 @@ static void interp_fetch_args(
                /* offset is in second src, first two channels */
                emit_data->args[0] = lp_build_emit_fetch(bld_base,
                                                         emit_data->inst, 1,
-                                                        0);
+                                                        TGSI_CHAN_X);
                emit_data->args[1] = lp_build_emit_fetch(bld_base,
                                                         emit_data->inst, 1,
-                                                        1);
+                                                        TGSI_CHAN_Y);
                emit_data->arg_count = 2;
        } else if (inst->Instruction.Opcode == TGSI_OPCODE_INTERP_SAMPLE) {
                LLVMValueRef sample_position;
@@ -3104,11 +3297,10 @@ static void interp_fetch_args(
                 * and place into first two channels.
                 */
                sample_id = lp_build_emit_fetch(bld_base,
-                                               emit_data->inst, 1, 0);
+                                               emit_data->inst, 1, TGSI_CHAN_X);
                sample_id = LLVMBuildBitCast(gallivm->builder, sample_id,
-                                            LLVMInt32TypeInContext(gallivm->context),
-                                            "");
-               sample_position = load_sample_position(&si_shader_ctx->radeon_bld, sample_id);
+                                            ctx->i32, "");
+               sample_position = load_sample_position(&ctx->radeon_bld, sample_id);
 
                emit_data->args[0] = LLVMBuildExtractElement(gallivm->builder,
                                                             sample_position,
@@ -3127,23 +3319,22 @@ static void build_interp_intrinsic(const struct lp_build_tgsi_action *action,
                                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 si_shader *shader = si_shader_ctx->shader;
+       struct si_shader_context *ctx = si_shader_context(bld_base);
+       struct si_shader *shader = ctx->shader;
        struct gallivm_state *gallivm = bld_base->base.gallivm;
        LLVMValueRef interp_param;
        const struct tgsi_full_instruction *inst = emit_data->inst;
        const char *intr_name;
-       int input_index;
+       int input_index = inst->Src[0].Register.Index;
        int chan;
        int i;
        LLVMValueRef attr_number;
-       LLVMTypeRef input_type = LLVMFloatTypeInContext(gallivm->context);
-       LLVMValueRef params = LLVMGetParam(si_shader_ctx->radeon_bld.main_fn, SI_PARAM_PRIM_MASK);
+       LLVMValueRef params = LLVMGetParam(ctx->radeon_bld.main_fn, SI_PARAM_PRIM_MASK);
        int interp_param_idx;
+       unsigned interp = shader->selector->info.input_interpolate[input_index];
        unsigned location;
 
        assert(inst->Src[0].Register.File == TGSI_FILE_INPUT);
-       input_index = inst->Src[0].Register.Index;
 
        if (inst->Instruction.Opcode == TGSI_OPCODE_INTERP_OFFSET ||
            inst->Instruction.Opcode == TGSI_OPCODE_INTERP_SAMPLE)
@@ -3151,17 +3342,15 @@ static void build_interp_intrinsic(const struct lp_build_tgsi_action *action,
        else
                location = TGSI_INTERPOLATE_LOC_CENTROID;
 
-       interp_param_idx = lookup_interp_param_index(shader->ps_input_interpolate[input_index],
-                                                    location);
+       interp_param_idx = lookup_interp_param_index(interp, location);
        if (interp_param_idx == -1)
                return;
        else if (interp_param_idx)
-               interp_param = LLVMGetParam(si_shader_ctx->radeon_bld.main_fn, interp_param_idx);
+               interp_param = LLVMGetParam(ctx->radeon_bld.main_fn, interp_param_idx);
        else
                interp_param = NULL;
 
-       attr_number = lp_build_const_int32(gallivm,
-                                          shader->ps_input_param_offset[input_index]);
+       attr_number = lp_build_const_int32(gallivm, input_index);
 
        if (inst->Instruction.Opcode == TGSI_OPCODE_INTERP_OFFSET ||
            inst->Instruction.Opcode == TGSI_OPCODE_INTERP_SAMPLE) {
@@ -3188,7 +3377,7 @@ static void build_interp_intrinsic(const struct lp_build_tgsi_action *action,
                        LLVMValueRef temp1, temp2;
 
                        interp_el = LLVMBuildBitCast(gallivm->builder, interp_el,
-                                                    LLVMFloatTypeInContext(gallivm->context), "");
+                                                    ctx->f32, "");
 
                        temp1 = LLVMBuildFMul(gallivm->builder, ddx_el, emit_data->args[0], "");
 
@@ -3199,8 +3388,7 @@ static void build_interp_intrinsic(const struct lp_build_tgsi_action *action,
                        temp2 = LLVMBuildFAdd(gallivm->builder, temp2, temp1, "");
 
                        ij_out[i] = LLVMBuildBitCast(gallivm->builder,
-                                                    temp2,
-                                                    LLVMIntTypeInContext(gallivm->context, 32), "");
+                                                    temp2, ctx->i32, "");
                }
                interp_param = lp_build_gather_values(bld_base->base.gallivm, ij_out, 2);
        }
@@ -3221,7 +3409,7 @@ static void build_interp_intrinsic(const struct lp_build_tgsi_action *action,
 
                emit_data->output[chan] =
                        lp_build_intrinsic(gallivm->builder, intr_name,
-                                          input_type, args, args[3] ? 4 : 3,
+                                          ctx->f32, args, args[3] ? 4 : 3,
                                           LLVMReadNoneAttribute | LLVMNoUnwindAttribute);
        }
 }
@@ -3245,13 +3433,12 @@ static void si_llvm_emit_vertex(
        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 si_shader_context *ctx = si_shader_context(bld_base);
        struct lp_build_context *uint = &bld_base->uint_bld;
-       struct si_shader *shader = si_shader_ctx->shader;
+       struct si_shader *shader = ctx->shader;
        struct tgsi_shader_info *info = &shader->selector->info;
        struct gallivm_state *gallivm = bld_base->base.gallivm;
-       LLVMTypeRef i32 = LLVMInt32TypeInContext(gallivm->context);
-       LLVMValueRef soffset = LLVMGetParam(si_shader_ctx->radeon_bld.main_fn,
+       LLVMValueRef soffset = LLVMGetParam(ctx->radeon_bld.main_fn,
                                            SI_PARAM_GS2VS_OFFSET);
        LLVMValueRef gs_next_vertex;
        LLVMValueRef can_emit, kill;
@@ -3264,7 +3451,7 @@ static void si_llvm_emit_vertex(
 
        /* Write vertex attribute values to GSVS ring */
        gs_next_vertex = LLVMBuildLoad(gallivm->builder,
-                                      si_shader_ctx->gs_next_vertex[stream],
+                                      ctx->gs_next_vertex[stream],
                                       "");
 
        /* If this thread has already emitted the declared maximum number of
@@ -3280,11 +3467,11 @@ static void si_llvm_emit_vertex(
                               lp_build_const_float(gallivm, -1.0f));
 
        lp_build_intrinsic(gallivm->builder, "llvm.AMDGPU.kill",
-                          LLVMVoidTypeInContext(gallivm->context), &kill, 1, 0);
+                          ctx->voidt, &kill, 1, 0);
 
        for (i = 0; i < info->num_outputs; i++) {
                LLVMValueRef *out_ptr =
-                       si_shader_ctx->radeon_bld.soa.outputs[i];
+                       ctx->radeon_bld.soa.outputs[i];
 
                for (chan = 0; chan < 4; chan++) {
                        LLVMValueRef out_val = LLVMBuildLoad(gallivm->builder, out_ptr[chan], "");
@@ -3295,10 +3482,10 @@ static void si_llvm_emit_vertex(
                        voffset = lp_build_add(uint, voffset, gs_next_vertex);
                        voffset = lp_build_mul_imm(uint, voffset, 4);
 
-                       out_val = LLVMBuildBitCast(gallivm->builder, out_val, i32, "");
+                       out_val = LLVMBuildBitCast(gallivm->builder, out_val, ctx->i32, "");
 
-                       build_tbuffer_store(si_shader_ctx,
-                                           si_shader_ctx->gsvs_ring[stream],
+                       build_tbuffer_store(ctx,
+                                           ctx->gsvs_ring[stream],
                                            out_val, 1,
                                            voffset, soffset, 0,
                                            V_008F0C_BUF_DATA_FORMAT_32,
@@ -3309,14 +3496,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[stream]);
+       LLVMBuildStore(gallivm->builder, gs_next_vertex, ctx->gs_next_vertex[stream]);
 
        /* Signal vertex emission */
        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);
+       args[1] = LLVMGetParam(ctx->radeon_bld.main_fn, SI_PARAM_GS_WAVE_ID);
        lp_build_intrinsic(gallivm->builder, "llvm.SI.sendmsg",
-                       LLVMVoidTypeInContext(gallivm->context), args, 2,
-                       LLVMNoUnwindAttribute);
+                          ctx->voidt, args, 2, LLVMNoUnwindAttribute);
 }
 
 /* Cut one primitive from the geometry shader */
@@ -3325,7 +3511,7 @@ static void si_llvm_emit_primitive(
        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 si_shader_context *ctx = si_shader_context(bld_base);
        struct gallivm_state *gallivm = bld_base->base.gallivm;
        LLVMValueRef args[2];
        unsigned stream;
@@ -3333,21 +3519,22 @@ static void si_llvm_emit_primitive(
        /* Signal primitive cut */
        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);
+       args[1] = LLVMGetParam(ctx->radeon_bld.main_fn, SI_PARAM_GS_WAVE_ID);
        lp_build_intrinsic(gallivm->builder, "llvm.SI.sendmsg",
-                       LLVMVoidTypeInContext(gallivm->context), args, 2,
-                       LLVMNoUnwindAttribute);
+                          ctx->voidt, args, 2, LLVMNoUnwindAttribute);
 }
 
 static void si_llvm_emit_barrier(const struct lp_build_tgsi_action *action,
                                 struct lp_build_tgsi_context *bld_base,
                                 struct lp_build_emit_data *emit_data)
 {
+       struct si_shader_context *ctx = si_shader_context(bld_base);
        struct gallivm_state *gallivm = bld_base->base.gallivm;
 
-       lp_build_intrinsic(gallivm->builder, "llvm.AMDGPU.barrier.local",
-                       LLVMVoidTypeInContext(gallivm->context), NULL, 0,
-                       LLVMNoUnwindAttribute);
+       lp_build_intrinsic(gallivm->builder,
+                          HAVE_LLVM >= 0x0309 ? "llvm.amdgcn.s.barrier"
+                                              : "llvm.AMDGPU.barrier.local",
+                          ctx->voidt, NULL, 0, LLVMNoUnwindAttribute);
 }
 
 static const struct lp_build_tgsi_action tex_action = {
@@ -3355,36 +3542,24 @@ 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,
 };
 
-static void create_meta_data(struct si_shader_context *si_shader_ctx)
+static void create_meta_data(struct si_shader_context *ctx)
 {
-       struct gallivm_state *gallivm = si_shader_ctx->radeon_bld.soa.bld_base.base.gallivm;
+       struct gallivm_state *gallivm = ctx->radeon_bld.soa.bld_base.base.gallivm;
        LLVMValueRef args[3];
 
        args[0] = LLVMMDStringInContext(gallivm->context, "const", 5);
        args[1] = 0;
        args[2] = lp_build_const_int32(gallivm, 1);
 
-       si_shader_ctx->const_md = LLVMMDNodeInContext(gallivm->context, args, 3);
-}
-
-static LLVMTypeRef const_array(LLVMTypeRef elem_type, int num_elements)
-{
-       return LLVMPointerType(LLVMArrayType(elem_type, num_elements),
-                              CONST_ADDR_SPACE);
+       ctx->const_md = LLVMMDNodeInContext(gallivm->context, args, 3);
 }
 
-static void declare_streamout_params(struct si_shader_context *si_shader_ctx,
+static void declare_streamout_params(struct si_shader_context *ctx,
                                     struct pipe_stream_output_info *so,
                                     LLVMTypeRef *params, LLVMTypeRef i32,
                                     unsigned *num_params)
@@ -3393,127 +3568,124 @@ static void declare_streamout_params(struct si_shader_context *si_shader_ctx,
 
        /* Streamout SGPRs. */
        if (so->num_outputs) {
-               params[si_shader_ctx->param_streamout_config = (*num_params)++] = i32;
-               params[si_shader_ctx->param_streamout_write_index = (*num_params)++] = i32;
+               params[ctx->param_streamout_config = (*num_params)++] = i32;
+               params[ctx->param_streamout_write_index = (*num_params)++] = i32;
        }
        /* A streamout buffer offset is loaded if the stride is non-zero. */
        for (i = 0; i < 4; i++) {
                if (!so->stride[i])
                        continue;
 
-               params[si_shader_ctx->param_streamout_offset[i] = (*num_params)++] = i32;
+               params[ctx->param_streamout_offset[i] = (*num_params)++] = i32;
        }
 }
 
-static void create_function(struct si_shader_context *si_shader_ctx)
+static void create_function(struct si_shader_context *ctx)
 {
-       struct lp_build_tgsi_context *bld_base = &si_shader_ctx->radeon_bld.soa.bld_base;
+       struct lp_build_tgsi_context *bld_base = &ctx->radeon_bld.soa.bld_base;
        struct gallivm_state *gallivm = bld_base->base.gallivm;
-       struct si_shader *shader = si_shader_ctx->shader;
-       LLVMTypeRef params[SI_NUM_PARAMS], f32, i8, i32, v2i32, v3i32, v16i8, v4i32, v8i32;
+       struct si_shader *shader = ctx->shader;
+       LLVMTypeRef params[SI_NUM_PARAMS], v2i32, v3i32;
        unsigned i, last_array_pointer, last_sgpr, num_params;
 
-       i8 = LLVMInt8TypeInContext(gallivm->context);
-       i32 = LLVMInt32TypeInContext(gallivm->context);
-       f32 = LLVMFloatTypeInContext(gallivm->context);
-       v2i32 = LLVMVectorType(i32, 2);
-       v3i32 = LLVMVectorType(i32, 3);
-       v4i32 = LLVMVectorType(i32, 4);
-       v8i32 = LLVMVectorType(i32, 8);
-       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;
-
-       switch (si_shader_ctx->type) {
+       v2i32 = LLVMVectorType(ctx->i32, 2);
+       v3i32 = LLVMVectorType(ctx->i32, 3);
+
+       params[SI_PARAM_RW_BUFFERS] = const_array(ctx->v16i8, SI_NUM_RW_BUFFERS);
+       params[SI_PARAM_CONST_BUFFERS] = const_array(ctx->v16i8, SI_NUM_CONST_BUFFERS);
+       params[SI_PARAM_SAMPLERS] = const_array(ctx->v8i32, SI_NUM_SAMPLERS);
+       params[SI_PARAM_UNUSED] = LLVMPointerType(ctx->i32, CONST_ADDR_SPACE);
+       last_array_pointer = SI_PARAM_UNUSED;
+
+       switch (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_BASE_VERTEX] = i32;
-               params[SI_PARAM_START_INSTANCE] = i32;
+               params[SI_PARAM_VERTEX_BUFFERS] = const_array(ctx->v16i8, SI_NUM_VERTEX_BUFFERS);
+               last_array_pointer = SI_PARAM_VERTEX_BUFFERS;
+               params[SI_PARAM_BASE_VERTEX] = ctx->i32;
+               params[SI_PARAM_START_INSTANCE] = ctx->i32;
                num_params = SI_PARAM_START_INSTANCE+1;
 
                if (shader->key.vs.as_es) {
-                       params[si_shader_ctx->param_es2gs_offset = num_params++] = i32;
+                       params[ctx->param_es2gs_offset = num_params++] = ctx->i32;
                } else if (shader->key.vs.as_ls) {
-                       params[SI_PARAM_LS_OUT_LAYOUT] = i32;
+                       params[SI_PARAM_LS_OUT_LAYOUT] = ctx->i32;
                        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;
+                       if (ctx->is_gs_copy_shader) {
+                               last_array_pointer = SI_PARAM_CONST_BUFFERS;
+                               num_params = SI_PARAM_CONST_BUFFERS+1;
+                       } else {
+                               params[SI_PARAM_VS_STATE_BITS] = ctx->i32;
+                               num_params = SI_PARAM_VS_STATE_BITS+1;
                        }
 
                        /* The locations of the other parameters are assigned dynamically. */
-                       declare_streamout_params(si_shader_ctx, &shader->selector->so,
-                                                params, i32, &num_params);
+                       declare_streamout_params(ctx, &shader->selector->so,
+                                                params, ctx->i32, &num_params);
                }
 
                last_sgpr = num_params-1;
 
                /* VGPRs */
-               params[si_shader_ctx->param_vertex_id = num_params++] = i32;
-               params[si_shader_ctx->param_rel_auto_id = num_params++] = i32;
-               params[si_shader_ctx->param_vs_prim_id = num_params++] = i32;
-               params[si_shader_ctx->param_instance_id = num_params++] = i32;
+               params[ctx->param_vertex_id = num_params++] = ctx->i32;
+               params[ctx->param_rel_auto_id = num_params++] = ctx->i32;
+               params[ctx->param_vs_prim_id = num_params++] = ctx->i32;
+               params[ctx->param_instance_id = num_params++] = ctx->i32;
                break;
 
        case TGSI_PROCESSOR_TESS_CTRL:
-               params[SI_PARAM_TCS_OUT_OFFSETS] = i32;
-               params[SI_PARAM_TCS_OUT_LAYOUT] = i32;
-               params[SI_PARAM_TCS_IN_LAYOUT] = i32;
-               params[SI_PARAM_TESS_FACTOR_OFFSET] = i32;
+               params[SI_PARAM_TCS_OUT_OFFSETS] = ctx->i32;
+               params[SI_PARAM_TCS_OUT_LAYOUT] = ctx->i32;
+               params[SI_PARAM_TCS_IN_LAYOUT] = ctx->i32;
+               params[SI_PARAM_TESS_FACTOR_OFFSET] = ctx->i32;
                last_sgpr = SI_PARAM_TESS_FACTOR_OFFSET;
 
                /* VGPRs */
-               params[SI_PARAM_PATCH_ID] = i32;
-               params[SI_PARAM_REL_IDS] = i32;
+               params[SI_PARAM_PATCH_ID] = ctx->i32;
+               params[SI_PARAM_REL_IDS] = ctx->i32;
                num_params = SI_PARAM_REL_IDS+1;
                break;
 
        case TGSI_PROCESSOR_TESS_EVAL:
-               params[SI_PARAM_TCS_OUT_OFFSETS] = i32;
-               params[SI_PARAM_TCS_OUT_LAYOUT] = i32;
+               params[SI_PARAM_TCS_OUT_OFFSETS] = ctx->i32;
+               params[SI_PARAM_TCS_OUT_LAYOUT] = ctx->i32;
                num_params = SI_PARAM_TCS_OUT_LAYOUT+1;
 
                if (shader->key.tes.as_es) {
-                       params[si_shader_ctx->param_es2gs_offset = num_params++] = i32;
+                       params[ctx->param_es2gs_offset = num_params++] = ctx->i32;
                } else {
-                       declare_streamout_params(si_shader_ctx, &shader->selector->so,
-                                                params, i32, &num_params);
+                       declare_streamout_params(ctx, &shader->selector->so,
+                                                params, ctx->i32, &num_params);
                }
                last_sgpr = num_params - 1;
 
                /* VGPRs */
-               params[si_shader_ctx->param_tes_u = num_params++] = f32;
-               params[si_shader_ctx->param_tes_v = num_params++] = f32;
-               params[si_shader_ctx->param_tes_rel_patch_id = num_params++] = i32;
-               params[si_shader_ctx->param_tes_patch_id = num_params++] = i32;
+               params[ctx->param_tes_u = num_params++] = ctx->f32;
+               params[ctx->param_tes_v = num_params++] = ctx->f32;
+               params[ctx->param_tes_rel_patch_id = num_params++] = ctx->i32;
+               params[ctx->param_tes_patch_id = num_params++] = ctx->i32;
                break;
 
        case TGSI_PROCESSOR_GEOMETRY:
-               params[SI_PARAM_GS2VS_OFFSET] = i32;
-               params[SI_PARAM_GS_WAVE_ID] = i32;
+               params[SI_PARAM_GS2VS_OFFSET] = ctx->i32;
+               params[SI_PARAM_GS_WAVE_ID] = ctx->i32;
                last_sgpr = SI_PARAM_GS_WAVE_ID;
 
                /* VGPRs */
-               params[SI_PARAM_VTX0_OFFSET] = i32;
-               params[SI_PARAM_VTX1_OFFSET] = i32;
-               params[SI_PARAM_PRIMITIVE_ID] = i32;
-               params[SI_PARAM_VTX2_OFFSET] = i32;
-               params[SI_PARAM_VTX3_OFFSET] = i32;
-               params[SI_PARAM_VTX4_OFFSET] = i32;
-               params[SI_PARAM_VTX5_OFFSET] = i32;
-               params[SI_PARAM_GS_INSTANCE_ID] = i32;
+               params[SI_PARAM_VTX0_OFFSET] = ctx->i32;
+               params[SI_PARAM_VTX1_OFFSET] = ctx->i32;
+               params[SI_PARAM_PRIMITIVE_ID] = ctx->i32;
+               params[SI_PARAM_VTX2_OFFSET] = ctx->i32;
+               params[SI_PARAM_VTX3_OFFSET] = ctx->i32;
+               params[SI_PARAM_VTX4_OFFSET] = ctx->i32;
+               params[SI_PARAM_VTX5_OFFSET] = ctx->i32;
+               params[SI_PARAM_GS_INSTANCE_ID] = ctx->i32;
                num_params = SI_PARAM_GS_INSTANCE_ID+1;
                break;
 
        case TGSI_PROCESSOR_FRAGMENT:
-               params[SI_PARAM_ALPHA_REF] = f32;
-               params[SI_PARAM_PRIM_MASK] = i32;
+               params[SI_PARAM_ALPHA_REF] = ctx->f32;
+               params[SI_PARAM_PRIM_MASK] = ctx->i32;
                last_sgpr = SI_PARAM_PRIM_MASK;
                params[SI_PARAM_PERSP_SAMPLE] = v2i32;
                params[SI_PARAM_PERSP_CENTER] = v2i32;
@@ -3522,15 +3694,15 @@ static void create_function(struct si_shader_context *si_shader_ctx)
                params[SI_PARAM_LINEAR_SAMPLE] = v2i32;
                params[SI_PARAM_LINEAR_CENTER] = v2i32;
                params[SI_PARAM_LINEAR_CENTROID] = v2i32;
-               params[SI_PARAM_LINE_STIPPLE_TEX] = f32;
-               params[SI_PARAM_POS_X_FLOAT] = f32;
-               params[SI_PARAM_POS_Y_FLOAT] = f32;
-               params[SI_PARAM_POS_Z_FLOAT] = f32;
-               params[SI_PARAM_POS_W_FLOAT] = f32;
-               params[SI_PARAM_FRONT_FACE] = f32;
-               params[SI_PARAM_ANCILLARY] = i32;
-               params[SI_PARAM_SAMPLE_COVERAGE] = f32;
-               params[SI_PARAM_POS_FIXED_PT] = f32;
+               params[SI_PARAM_LINE_STIPPLE_TEX] = ctx->f32;
+               params[SI_PARAM_POS_X_FLOAT] = ctx->f32;
+               params[SI_PARAM_POS_Y_FLOAT] = ctx->f32;
+               params[SI_PARAM_POS_Z_FLOAT] = ctx->f32;
+               params[SI_PARAM_POS_W_FLOAT] = ctx->f32;
+               params[SI_PARAM_FRONT_FACE] = ctx->i32;
+               params[SI_PARAM_ANCILLARY] = ctx->i32;
+               params[SI_PARAM_SAMPLE_COVERAGE] = ctx->f32;
+               params[SI_PARAM_POS_FIXED_PT] = ctx->f32;
                num_params = SI_PARAM_POS_FIXED_PT+1;
                break;
 
@@ -3540,15 +3712,13 @@ static void create_function(struct si_shader_context *si_shader_ctx)
        }
 
        assert(num_params <= Elements(params));
-       radeon_llvm_create_func(&si_shader_ctx->radeon_bld, params, num_params);
-       radeon_llvm_shader_type(si_shader_ctx->radeon_bld.main_fn, si_shader_ctx->type);
-
-       if (shader->dx10_clamp_mode)
-               LLVMAddTargetDependentFunctionAttr(si_shader_ctx->radeon_bld.main_fn,
-                                                  "enable-no-nans-fp-math", "true");
+       radeon_llvm_create_func(&ctx->radeon_bld, NULL, 0,
+                               params, num_params);
+       radeon_llvm_shader_type(ctx->radeon_bld.main_fn, ctx->type);
+       ctx->return_value = LLVMGetUndef(ctx->radeon_bld.return_type);
 
        for (i = 0; i <= last_sgpr; ++i) {
-               LLVMValueRef P = LLVMGetParam(si_shader_ctx->radeon_bld.main_fn, i);
+               LLVMValueRef P = LLVMGetParam(ctx->radeon_bld.main_fn, i);
 
                /* We tell llvm that array inputs are passed by value to allow Sinking pass
                 * to move load. Inputs are constant so this is fine. */
@@ -3565,15 +3735,15 @@ static void create_function(struct si_shader_context *si_shader_ctx)
             bld_base->info->opcode_count[TGSI_OPCODE_DDY_FINE] > 0 ||
             bld_base->info->opcode_count[TGSI_OPCODE_INTERP_OFFSET] > 0 ||
             bld_base->info->opcode_count[TGSI_OPCODE_INTERP_SAMPLE] > 0))
-               si_shader_ctx->lds =
+               ctx->lds =
                        LLVMAddGlobalInAddressSpace(gallivm->module,
-                                                   LLVMArrayType(i32, 64),
+                                                   LLVMArrayType(ctx->i32, 64),
                                                    "ddxy_lds",
                                                    LOCAL_ADDR_SPACE);
 
-       if ((si_shader_ctx->type == TGSI_PROCESSOR_VERTEX && shader->key.vs.as_ls) ||
-           si_shader_ctx->type == TGSI_PROCESSOR_TESS_CTRL ||
-           si_shader_ctx->type == TGSI_PROCESSOR_TESS_EVAL) {
+       if ((ctx->type == TGSI_PROCESSOR_VERTEX && shader->key.vs.as_ls) ||
+           ctx->type == TGSI_PROCESSOR_TESS_CTRL ||
+           ctx->type == TGSI_PROCESSOR_TESS_EVAL) {
                /* This is the upper bound, maximum is 32 inputs times 32 vertices */
                unsigned vertex_data_dw_size = 32*32*4;
                unsigned patch_data_dw_size = 32*4;
@@ -3583,21 +3753,21 @@ static void create_function(struct si_shader_context *si_shader_ctx)
 
                /* The actual size is computed outside of the shader to reduce
                 * the number of shader variants. */
-               si_shader_ctx->lds =
+               ctx->lds =
                        LLVMAddGlobalInAddressSpace(gallivm->module,
-                                                   LLVMArrayType(i32, lds_dwords),
+                                                   LLVMArrayType(ctx->i32, lds_dwords),
                                                    "tess_lds",
                                                    LOCAL_ADDR_SPACE);
        }
 }
 
-static void preload_constants(struct si_shader_context *si_shader_ctx)
+static void preload_constants(struct si_shader_context *ctx)
 {
-       struct lp_build_tgsi_context * bld_base = &si_shader_ctx->radeon_bld.soa.bld_base;
-       struct gallivm_state * gallivm = bld_base->base.gallivm;
-       const struct tgsi_shader_info * info = bld_base->info;
+       struct lp_build_tgsi_context *bld_base = &ctx->radeon_bld.soa.bld_base;
+       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(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;
@@ -3606,84 +3776,76 @@ static void preload_constants(struct si_shader_context *si_shader_ctx)
                        continue;
 
                /* Allocate space for the constant values */
-               si_shader_ctx->constants[buf] = CALLOC(num_const * 4, sizeof(LLVMValueRef));
+               ctx->constants[buf] = CALLOC(num_const * 4, sizeof(LLVMValueRef));
 
                /* Load the resource descriptor */
-               si_shader_ctx->const_resource[buf] =
-                       build_indexed_load_const(si_shader_ctx, ptr, lp_build_const_int32(gallivm, buf));
+               ctx->const_buffers[buf] =
+                       build_indexed_load_const(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] =
+                       ctx->constants[buf][i] =
                                buffer_load_const(gallivm->builder,
-                                       si_shader_ctx->const_resource[buf],
+                                       ctx->const_buffers[buf],
                                        lp_build_const_int32(gallivm, i * 4),
-                                       bld_base->base.elem_type);
+                                       ctx->f32);
                }
        }
 }
 
-static void preload_samplers(struct si_shader_context *si_shader_ctx)
+static void preload_samplers(struct si_shader_context *ctx)
 {
-       struct lp_build_tgsi_context * bld_base = &si_shader_ctx->radeon_bld.soa.bld_base;
-       struct gallivm_state * gallivm = bld_base->base.gallivm;
-       const struct tgsi_shader_info * info = bld_base->info;
-
+       struct lp_build_tgsi_context *bld_base = &ctx->radeon_bld.soa.bld_base;
+       struct gallivm_state *gallivm = bld_base->base.gallivm;
+       const struct tgsi_shader_info *info = bld_base->info;
        unsigned i, num_samplers = info->file_max[TGSI_FILE_SAMPLER] + 1;
-
-       LLVMValueRef res_ptr, samp_ptr;
        LLVMValueRef offset;
 
        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);
-
        /* 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);
-
-               /* Sampler */
-               offset = lp_build_const_int32(gallivm, i);
-               si_shader_ctx->samplers[i] = build_indexed_load_const(si_shader_ctx, samp_ptr, offset);
+               ctx->sampler_views[i] =
+                       get_sampler_desc(ctx, offset, DESC_IMAGE);
 
                /* 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] =
-                               build_indexed_load_const(si_shader_ctx, res_ptr, offset);
-               }
+               if (info->is_msaa_sampler[i])
+                       ctx->fmasks[i] =
+                               get_sampler_desc(ctx, offset, DESC_FMASK);
+               else
+                       ctx->sampler_states[i] =
+                               get_sampler_desc(ctx, offset, DESC_SAMPLER);
        }
 }
 
-static void preload_streamout_buffers(struct si_shader_context *si_shader_ctx)
+static void preload_streamout_buffers(struct si_shader_context *ctx)
 {
-       struct lp_build_tgsi_context * bld_base = &si_shader_ctx->radeon_bld.soa.bld_base;
-       struct gallivm_state * gallivm = bld_base->base.gallivm;
+       struct lp_build_tgsi_context *bld_base = &ctx->radeon_bld.soa.bld_base;
+       struct gallivm_state *gallivm = bld_base->base.gallivm;
        unsigned i;
 
        /* Streamout can only be used if the shader is compiled as VS. */
-       if (!si_shader_ctx->shader->selector->so.num_outputs ||
-           (si_shader_ctx->type == TGSI_PROCESSOR_VERTEX &&
-            (si_shader_ctx->shader->key.vs.as_es ||
-             si_shader_ctx->shader->key.vs.as_ls)) ||
-           (si_shader_ctx->type == TGSI_PROCESSOR_TESS_EVAL &&
-            si_shader_ctx->shader->key.tes.as_es))
+       if (!ctx->shader->selector->so.num_outputs ||
+           (ctx->type == TGSI_PROCESSOR_VERTEX &&
+            (ctx->shader->key.vs.as_es ||
+             ctx->shader->key.vs.as_ls)) ||
+           (ctx->type == TGSI_PROCESSOR_TESS_EVAL &&
+            ctx->shader->key.tes.as_es))
                return;
 
-       LLVMValueRef buf_ptr = LLVMGetParam(si_shader_ctx->radeon_bld.main_fn,
+       LLVMValueRef buf_ptr = LLVMGetParam(ctx->radeon_bld.main_fn,
                                            SI_PARAM_RW_BUFFERS);
 
        /* Load the resources, we rely on the code sinking to do the rest */
        for (i = 0; i < 4; ++i) {
-               if (si_shader_ctx->shader->selector->so.stride[i]) {
+               if (ctx->shader->selector->so.stride[i]) {
                        LLVMValueRef offset = lp_build_const_int32(gallivm,
                                                                   SI_SO_BUF_OFFSET + i);
 
-                       si_shader_ctx->so_buffers[i] = build_indexed_load_const(si_shader_ctx, buf_ptr, offset);
+                       ctx->so_buffers[i] = build_indexed_load_const(ctx, buf_ptr, offset);
                }
        }
 }
@@ -3692,56 +3854,55 @@ static void preload_streamout_buffers(struct si_shader_context *si_shader_ctx)
  * Load ESGS and GSVS ring buffer resource descriptors and save the variables
  * for later use.
  */
-static void preload_ring_buffers(struct si_shader_context *si_shader_ctx)
+static void preload_ring_buffers(struct si_shader_context *ctx)
 {
        struct gallivm_state *gallivm =
-               si_shader_ctx->radeon_bld.soa.bld_base.base.gallivm;
+               ctx->radeon_bld.soa.bld_base.base.gallivm;
 
-       LLVMValueRef buf_ptr = LLVMGetParam(si_shader_ctx->radeon_bld.main_fn,
+       LLVMValueRef buf_ptr = LLVMGetParam(ctx->radeon_bld.main_fn,
                                            SI_PARAM_RW_BUFFERS);
 
-       if ((si_shader_ctx->type == TGSI_PROCESSOR_VERTEX &&
-            si_shader_ctx->shader->key.vs.as_es) ||
-           (si_shader_ctx->type == TGSI_PROCESSOR_TESS_EVAL &&
-            si_shader_ctx->shader->key.tes.as_es) ||
-           si_shader_ctx->type == TGSI_PROCESSOR_GEOMETRY) {
+       if ((ctx->type == TGSI_PROCESSOR_VERTEX &&
+            ctx->shader->key.vs.as_es) ||
+           (ctx->type == TGSI_PROCESSOR_TESS_EVAL &&
+            ctx->shader->key.tes.as_es) ||
+           ctx->type == TGSI_PROCESSOR_GEOMETRY) {
                LLVMValueRef offset = lp_build_const_int32(gallivm, SI_RING_ESGS);
 
-               si_shader_ctx->esgs_ring =
-                       build_indexed_load_const(si_shader_ctx, buf_ptr, offset);
+               ctx->esgs_ring =
+                       build_indexed_load_const(ctx, buf_ptr, offset);
        }
 
-       if (si_shader_ctx->shader->is_gs_copy_shader) {
+       if (ctx->is_gs_copy_shader) {
                LLVMValueRef offset = lp_build_const_int32(gallivm, SI_RING_GSVS);
 
-               si_shader_ctx->gsvs_ring[0] =
-                       build_indexed_load_const(si_shader_ctx, buf_ptr, offset);
+               ctx->gsvs_ring[0] =
+                       build_indexed_load_const(ctx, buf_ptr, offset);
        }
-       if (si_shader_ctx->type == TGSI_PROCESSOR_GEOMETRY) {
+       if (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);
+                       ctx->gsvs_ring[i] =
+                               build_indexed_load_const(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) {
@@ -3749,30 +3910,45 @@ 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_0286D0_SPI_PS_INPUT_ADDR:
+                       conf->spi_ps_input_addr = 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:
-                       fprintf(stderr, "Warning: Compiler emitted unknown "
-                               "config register: 0x%x\n", reg);
+                       {
+                               static bool printed;
+
+                               if (!printed) {
+                                       fprintf(stderr, "Warning: LLVM emitted unknown "
+                                               "config register: 0x%x\n", reg);
+                                       printed = true;
+                               }
+                       }
                        break;
                }
+
+               if (!conf->spi_ps_input_addr)
+                       conf->spi_ps_input_addr = conf->spi_ps_input_ena;
        }
 }
 
@@ -3781,10 +3957,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 =
@@ -3812,7 +3988,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) {
@@ -3821,81 +3997,201 @@ 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);
+       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");
 
-       si_shader_binary_read_config(sscreen, shader, 0);
-       si_shader_binary_upload(sscreen, shader);
+                       line = binary->disasm_string;
+                       while (*line) {
+                               p = strchrnul(line, '\n');
+                               count = p - line;
 
-       if (dump) {
-               if (!(sscreen->b.debug_flags & DBG_NO_ASM)) {
-                       if (binary->disasm_string) {
-                               fprintf(stderr, "\nShader Disassembly:\n\n");
-                               fprintf(stderr, "%s\n", binary->disasm_string);
-                       } 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]);
+                               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]);
+               }
+       }
+}
+
+static void si_shader_dump_stats(struct si_screen *sscreen,
+                                struct si_shader_config *conf,
+                                unsigned num_inputs,
+                                unsigned code_size,
+                                struct pipe_debug_callback *debug,
+                                unsigned processor)
+{
+       unsigned lds_increment = sscreen->b.chip_class >= CIK ? 512 : 256;
+       unsigned lds_per_wave = 0;
+       unsigned max_simd_waves = 10;
+
+       /* Compute LDS usage for PS. */
+       if (processor == TGSI_PROCESSOR_FRAGMENT) {
+               /* The minimum usage per wave is (num_inputs * 36). The maximum
+                * usage is (num_inputs * 36 * 16).
+                * We can get anything in between and it varies between waves.
+                *
+                * Other stages don't know the size at compile time or don't
+                * allocate LDS per wave, but instead they do it per thread group.
+                */
+               lds_per_wave = conf->lds_size * lds_increment +
+                              align(num_inputs * 36, lds_increment);
+       }
+
+       /* Compute the per-SIMD wave counts. */
+       if (conf->num_sgprs) {
+               if (sscreen->b.chip_class >= VI)
+                       max_simd_waves = MIN2(max_simd_waves, 800 / conf->num_sgprs);
+               else
+                       max_simd_waves = MIN2(max_simd_waves, 512 / conf->num_sgprs);
+       }
+
+       if (conf->num_vgprs)
+               max_simd_waves = MIN2(max_simd_waves, 256 / conf->num_vgprs);
+
+       /* LDS is 64KB per CU (4 SIMDs), divided into 16KB blocks per SIMD
+        * that PS can use.
+        */
+       if (lds_per_wave)
+               max_simd_waves = MIN2(max_simd_waves, 16384 / lds_per_wave);
+
+       if (r600_can_dump_shader(&sscreen->b, processor)) {
+               if (processor == TGSI_PROCESSOR_FRAGMENT) {
+                       fprintf(stderr, "*** SHADER CONFIG ***\n"
+                               "SPI_PS_INPUT_ADDR = 0x%04x\n"
+                               "SPI_PS_INPUT_ENA  = 0x%04x\n",
+                               conf->spi_ps_input_addr, conf->spi_ps_input_ena);
                }
 
                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);
+                       "SGPRS: %d\n"
+                       "VGPRS: %d\n"
+                       "Code Size: %d bytes\n"
+                       "LDS: %d blocks\n"
+                       "Scratch: %d bytes per wave\n"
+                       "Max Waves: %d\n"
+                       "********************\n",
+                       conf->num_sgprs, conf->num_vgprs, code_size,
+                       conf->lds_size, conf->scratch_bytes_per_wave,
+                       max_simd_waves);
        }
-       return 0;
+
+       pipe_debug_message(debug, SHADER_INFO,
+                          "Shader Stats: SGPRS: %d VGPRS: %d Code Size: %d "
+                          "LDS: %d Scratch: %d Max Waves: %d",
+                          conf->num_sgprs, conf->num_vgprs, code_size,
+                          conf->lds_size, conf->scratch_bytes_per_wave,
+                          max_simd_waves);
+}
+
+void si_shader_dump(struct si_screen *sscreen, struct si_shader *shader,
+                   struct pipe_debug_callback *debug, unsigned processor)
+{
+       if (r600_can_dump_shader(&sscreen->b, processor))
+               if (!(sscreen->b.debug_flags & DBG_NO_ASM))
+                       si_shader_dump_disassembly(&shader->binary, debug);
+
+       si_shader_dump_stats(sscreen, &shader->config,
+                            shader->selector ? shader->selector->info.num_inputs : 0,
+                            shader->binary.code_size, debug, processor);
 }
 
-int si_compile_llvm(struct si_screen *sscreen, struct si_shader *shader,
-                   LLVMTargetMachineRef tm, LLVMModuleRef mod)
+int si_compile_llvm(struct si_screen *sscreen,
+                   struct radeon_shader_binary *binary,
+                   struct si_shader_config *conf,
+                   LLVMTargetMachineRef tm,
+                   LLVMModuleRef mod,
+                   struct pipe_debug_callback *debug,
+                   unsigned processor,
+                   const char *name)
 {
        int r = 0;
-       bool dump_asm = r600_can_dump_shader(&sscreen->b,
-                               shader->selector ? shader->selector->tokens : NULL);
-       bool dump_ir = dump_asm && !(sscreen->b.debug_flags & DBG_NO_IR);
-
-       r = radeon_llvm_compile(mod, &shader->binary,
-               r600_get_llvm_processor_name(sscreen->b.family), dump_ir, dump_asm, tm);
-       if (r)
-               return r;
-
-       r = si_shader_binary_read(sscreen, shader);
-
-       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,
-                      offsetof(struct radeon_shader_binary, disasm_string));
+       unsigned count = p_atomic_inc_return(&sscreen->b.num_compilations);
+
+       if (r600_can_dump_shader(&sscreen->b, processor)) {
+               fprintf(stderr, "radeonsi: Compiling shader %d\n", count);
+
+               if (!(sscreen->b.debug_flags & (DBG_NO_IR | DBG_PREOPT_IR))) {
+                       fprintf(stderr, "%s LLVM IR:\n\n", name);
+                       LLVMDumpModule(mod);
+                       fprintf(stderr, "\n");
+               }
        }
+
+       if (!si_replace_shader(count, binary)) {
+               r = radeon_llvm_compile(mod, binary,
+                       r600_get_llvm_processor_name(sscreen->b.family), tm,
+                       debug);
+               if (r)
+                       return r;
+       }
+
+       si_shader_binary_read_config(binary, conf, 0);
+
+       /* Enable 64-bit and 16-bit denormals, because there is no performance
+        * cost.
+        *
+        * If denormals are enabled, all floating-point output modifiers are
+        * ignored.
+        *
+        * Don't enable denormals for 32-bit floats, because:
+        * - Floating-point output modifiers would be ignored by the hw.
+        * - Some opcodes don't support denormals, such as v_mad_f32. We would
+        *   have to stop using those.
+        * - SI & CI would be very slow.
+        */
+       conf->float_mode |= V_00B028_FP_64_DENORMS;
+
+       FREE(binary->config);
+       FREE(binary->global_symbol_offsets);
+       binary->config = NULL;
+       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_context *ctx,
+                                     struct si_shader *gs,
+                                     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;
-       struct lp_build_context *base = &bld_base->base;
+       struct gallivm_state *gallivm = &ctx->radeon_bld.gallivm;
+       struct lp_build_tgsi_context *bld_base = &ctx->radeon_bld.soa.bld_base;
        struct lp_build_context *uint = &bld_base->uint_bld;
-       struct si_shader *shader = si_shader_ctx->shader;
        struct si_shader_output_values *outputs;
        struct tgsi_shader_info *gsinfo = &gs->selector->info;
        LLVMValueRef args[9];
@@ -3903,20 +4199,19 @@ static int si_generate_gs_copy_shader(struct si_screen *sscreen,
 
        outputs = MALLOC(gsinfo->num_outputs * sizeof(outputs[0]));
 
-       si_shader_ctx->type = TGSI_PROCESSOR_VERTEX;
-       shader->is_gs_copy_shader = true;
+       si_init_shader_ctx(ctx, sscreen, ctx->shader, ctx->tm, gsinfo);
+       ctx->type = TGSI_PROCESSOR_VERTEX;
+       ctx->is_gs_copy_shader = true;
 
-       radeon_llvm_context_init(&si_shader_ctx->radeon_bld);
+       create_meta_data(ctx);
+       create_function(ctx);
+       preload_streamout_buffers(ctx);
+       preload_ring_buffers(ctx);
 
-       create_meta_data(si_shader_ctx);
-       create_function(si_shader_ctx);
-       preload_streamout_buffers(si_shader_ctx);
-       preload_ring_buffers(si_shader_ctx);
-
-       args[0] = si_shader_ctx->gsvs_ring[0];
+       args[0] = 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),
+                                  LLVMGetParam(ctx->radeon_bld.main_fn,
+                                               ctx->param_vertex_id),
                                   4);
        args[3] = uint->zero;
        args[4] = uint->one;  /* OFFEN */
@@ -3941,24 +4236,37 @@ static int si_generate_gs_copy_shader(struct si_screen *sscreen,
                                LLVMBuildBitCast(gallivm->builder,
                                                 lp_build_intrinsic(gallivm->builder,
                                                                 "llvm.SI.buffer.load.dword.i32.i32",
-                                                                LLVMInt32TypeInContext(gallivm->context),
-                                                                args, 9,
+                                                                ctx->i32, args, 9,
                                                                 LLVMReadOnlyAttribute | LLVMNoUnwindAttribute),
-                                                base->elem_type, "");
+                                                ctx->f32, "");
                }
        }
 
        si_llvm_export_vs(bld_base, outputs, gsinfo->num_outputs);
 
-       radeon_llvm_finalize_module(&si_shader_ctx->radeon_bld);
-
-       if (dump)
-               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);
+       LLVMBuildRet(gallivm->builder, ctx->return_value);
+
+       /* Dump LLVM IR before any optimization passes */
+       if (sscreen->b.debug_flags & DBG_PREOPT_IR &&
+           r600_can_dump_shader(&sscreen->b, TGSI_PROCESSOR_GEOMETRY))
+               LLVMDumpModule(bld_base->base.gallivm->module);
+
+       radeon_llvm_finalize_module(&ctx->radeon_bld);
+
+       r = si_compile_llvm(sscreen, &ctx->shader->binary,
+                           &ctx->shader->config, ctx->tm,
+                           bld_base->base.gallivm->module,
+                           debug, TGSI_PROCESSOR_GEOMETRY,
+                           "GS Copy Shader");
+       if (!r) {
+               if (r600_can_dump_shader(&sscreen->b, TGSI_PROCESSOR_GEOMETRY))
+                       fprintf(stderr, "GS Copy Shader:\n");
+               si_shader_dump(sscreen, ctx->shader, debug,
+                              TGSI_PROCESSOR_GEOMETRY);
+               r = si_shader_binary_upload(sscreen, ctx->shader);
+       }
 
-       radeon_llvm_dispose(&si_shader_ctx->radeon_bld);
+       radeon_llvm_dispose(&ctx->radeon_bld);
 
        FREE(outputs);
        return r;
@@ -3977,12 +4285,9 @@ void si_dump_shader_key(unsigned shader, union si_shader_key *key, FILE *f)
                        fprintf(f, !i ? "%u" : ", %u",
                                key->vs.instance_divisors[i]);
                fprintf(f, "}\n");
-
-               if (key->vs.as_es)
-                       fprintf(f, "  es_enabled_outputs = 0x%"PRIx64"\n",
-                               key->vs.es_enabled_outputs);
                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:
@@ -3990,22 +4295,21 @@ void si_dump_shader_key(unsigned shader, union si_shader_key *key, FILE *f)
                break;
 
        case PIPE_SHADER_TESS_EVAL:
-               if (key->tes.as_es)
-                       fprintf(f, "  es_enabled_outputs = 0x%"PRIx64"\n",
-                               key->tes.es_enabled_outputs);
                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(f, "  export_16bpc = 0x%X\n", key->ps.export_16bpc);
+               fprintf(f, "  spi_shader_col_format = 0x%x\n", key->ps.spi_shader_col_format);
                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:
@@ -4013,48 +4317,37 @@ void si_dump_shader_key(unsigned shader, union si_shader_key *key, FILE *f)
        }
 }
 
-int si_shader_create(struct si_screen *sscreen, LLVMTargetMachineRef tm,
-                    struct si_shader *shader)
+static void si_init_shader_ctx(struct si_shader_context *ctx,
+                              struct si_screen *sscreen,
+                              struct si_shader *shader,
+                              LLVMTargetMachineRef tm,
+                              struct tgsi_shader_info *info)
 {
-       struct si_shader_selector *sel = shader->selector;
-       struct tgsi_token *tokens = sel->tokens;
-       struct si_shader_context si_shader_ctx;
-       struct lp_build_tgsi_context * bld_base;
-       struct tgsi_shader_info stipple_shader_info;
-       LLVMModuleRef mod;
-       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);
-
-       if (poly_stipple) {
-               tokens = util_pstipple_create_fragment_shader(tokens, NULL,
-                                               SI_POLY_STIPPLE_SAMPLER);
-               tgsi_scan_shader(tokens, &stipple_shader_info);
-       }
-
-       /* Dump TGSI code before doing TGSI->LLVM conversion in case the
-        * conversion fails. */
-       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);
-       }
-
-       assert(shader->nparam == 0);
-
-       memset(&si_shader_ctx, 0, sizeof(si_shader_ctx));
-       radeon_llvm_context_init(&si_shader_ctx.radeon_bld);
-       bld_base = &si_shader_ctx.radeon_bld.soa.bld_base;
-
-       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;
+       struct lp_build_tgsi_context *bld_base;
+
+       memset(ctx, 0, sizeof(*ctx));
+       radeon_llvm_context_init(&ctx->radeon_bld, "amdgcn--");
+       ctx->tm = tm;
+       ctx->screen = sscreen;
+       if (shader && shader->selector)
+               ctx->type = shader->selector->info.processor;
+       else
+               ctx->type = -1;
+       ctx->shader = shader;
+
+       ctx->voidt = LLVMVoidTypeInContext(ctx->radeon_bld.gallivm.context);
+       ctx->i1 = LLVMInt1TypeInContext(ctx->radeon_bld.gallivm.context);
+       ctx->i8 = LLVMInt8TypeInContext(ctx->radeon_bld.gallivm.context);
+       ctx->i32 = LLVMInt32TypeInContext(ctx->radeon_bld.gallivm.context);
+       ctx->i128 = LLVMIntTypeInContext(ctx->radeon_bld.gallivm.context, 128);
+       ctx->f32 = LLVMFloatTypeInContext(ctx->radeon_bld.gallivm.context);
+       ctx->v16i8 = LLVMVectorType(ctx->i8, 16);
+       ctx->v4i32 = LLVMVectorType(ctx->i32, 4);
+       ctx->v4f32 = LLVMVectorType(ctx->f32, 4);
+       ctx->v8i32 = LLVMVectorType(ctx->i32, 8);
+
+       bld_base = &ctx->radeon_bld.soa.bld_base;
+       bld_base->info = info;
        bld_base->emit_fetch_funcs[TGSI_FILE_CONSTANT] = fetch_constant;
 
        bld_base->op_actions[TGSI_OPCODE_INTERP_CENTROID] = interp_action;
@@ -4070,9 +4363,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;
@@ -4083,22 +4377,53 @@ int si_shader_create(struct si_screen *sscreen, LLVMTargetMachineRef tm,
        bld_base->op_actions[TGSI_OPCODE_ENDPRIM].emit = si_llvm_emit_primitive;
        bld_base->op_actions[TGSI_OPCODE_BARRIER].emit = si_llvm_emit_barrier;
 
-       if (HAVE_LLVM >= 0x0306) {
-               bld_base->op_actions[TGSI_OPCODE_MAX].emit = build_tgsi_intrinsic_nomem;
-               bld_base->op_actions[TGSI_OPCODE_MAX].intr_name = "llvm.maxnum.f32";
-               bld_base->op_actions[TGSI_OPCODE_MIN].emit = build_tgsi_intrinsic_nomem;
-               bld_base->op_actions[TGSI_OPCODE_MIN].intr_name = "llvm.minnum.f32";
+       bld_base->op_actions[TGSI_OPCODE_MAX].emit = build_tgsi_intrinsic_nomem;
+       bld_base->op_actions[TGSI_OPCODE_MAX].intr_name = "llvm.maxnum.f32";
+       bld_base->op_actions[TGSI_OPCODE_MIN].emit = build_tgsi_intrinsic_nomem;
+       bld_base->op_actions[TGSI_OPCODE_MIN].intr_name = "llvm.minnum.f32";
+}
+
+int si_shader_create(struct si_screen *sscreen, LLVMTargetMachineRef tm,
+                    struct si_shader *shader,
+                    struct pipe_debug_callback *debug)
+{
+       struct si_shader_selector *sel = shader->selector;
+       struct tgsi_token *tokens = sel->tokens;
+       struct si_shader_context ctx;
+       struct lp_build_tgsi_context *bld_base;
+       struct tgsi_shader_info stipple_shader_info;
+       LLVMModuleRef mod;
+       int r = 0;
+       bool poly_stipple = sel->type == PIPE_SHADER_FRAGMENT &&
+                           shader->key.ps.poly_stipple;
+
+       if (poly_stipple) {
+               tokens = util_pstipple_create_fragment_shader(tokens, NULL,
+                                               SI_POLY_STIPPLE_SAMPLER,
+                                               TGSI_FILE_SYSTEM_VALUE);
+               tgsi_scan_shader(tokens, &stipple_shader_info);
+       }
+
+       /* Dump TGSI code before doing TGSI->LLVM conversion in case the
+        * conversion fails. */
+       if (r600_can_dump_shader(&sscreen->b, sel->info.processor) &&
+           !(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);
        }
 
-       si_shader_ctx.radeon_bld.load_system_value = declare_system_value;
-       si_shader_ctx.shader = shader;
-       si_shader_ctx.type = tgsi_get_processor_type(tokens);
-       si_shader_ctx.screen = sscreen;
-       si_shader_ctx.tm = tm;
+       si_init_shader_ctx(&ctx, sscreen, shader, tm,
+                          poly_stipple ? &stipple_shader_info : &sel->info);
 
-       switch (si_shader_ctx.type) {
+       shader->uses_instanceid = sel->info.uses_instanceid;
+
+       bld_base = &ctx.radeon_bld.soa.bld_base;
+       ctx.radeon_bld.load_system_value = declare_system_value;
+
+       switch (ctx.type) {
        case TGSI_PROCESSOR_VERTEX:
-               si_shader_ctx.radeon_bld.load_input = declare_input_vs;
+               ctx.radeon_bld.load_input = declare_input_vs;
                if (shader->key.vs.as_ls)
                        bld_base->emit_epilogue = si_llvm_emit_ls_epilogue;
                else if (shader->key.vs.as_es)
@@ -4124,38 +4449,27 @@ int si_shader_create(struct si_screen *sscreen, LLVMTargetMachineRef tm,
                bld_base->emit_epilogue = si_llvm_emit_gs_epilogue;
                break;
        case TGSI_PROCESSOR_FRAGMENT:
-               si_shader_ctx.radeon_bld.load_input = declare_input_fs;
+               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");
                return -1;
        }
 
-       create_meta_data(&si_shader_ctx);
-       create_function(&si_shader_ctx);
-       preload_constants(&si_shader_ctx);
-       preload_samplers(&si_shader_ctx);
-       preload_streamout_buffers(&si_shader_ctx);
-       preload_ring_buffers(&si_shader_ctx);
+       create_meta_data(&ctx);
+       create_function(&ctx);
+       preload_constants(&ctx);
+       preload_samplers(&ctx);
+       preload_streamout_buffers(&ctx);
+       preload_ring_buffers(&ctx);
 
-       if (si_shader_ctx.type == TGSI_PROCESSOR_GEOMETRY) {
+       if (ctx.type == TGSI_PROCESSOR_GEOMETRY) {
                int i;
                for (i = 0; i < 4; i++) {
-                       si_shader_ctx.gs_next_vertex[i] =
+                       ctx.gs_next_vertex[i] =
                                lp_build_alloca(bld_base->base.gallivm,
-                                               bld_base->uint_bld.elem_type, "");
+                                               ctx.i32, "");
                }
        }
 
@@ -4164,24 +4478,39 @@ int si_shader_create(struct si_screen *sscreen, LLVMTargetMachineRef tm,
                goto out;
        }
 
-       radeon_llvm_finalize_module(&si_shader_ctx.radeon_bld);
-
+       LLVMBuildRet(bld_base->base.gallivm->builder, ctx.return_value);
        mod = bld_base->base.gallivm->module;
-       r = si_compile_llvm(sscreen, shader, tm, mod);
+
+       /* Dump LLVM IR before any optimization passes */
+       if (sscreen->b.debug_flags & DBG_PREOPT_IR &&
+           r600_can_dump_shader(&sscreen->b, ctx.type))
+               LLVMDumpModule(mod);
+
+       radeon_llvm_finalize_module(&ctx.radeon_bld);
+
+       r = si_compile_llvm(sscreen, &shader->binary, &shader->config, tm,
+                           mod, debug, ctx.type, "TGSI shader");
        if (r) {
                fprintf(stderr, "LLVM failed to compile shader\n");
                goto out;
        }
 
-       radeon_llvm_dispose(&si_shader_ctx.radeon_bld);
+       si_shader_dump(sscreen, shader, debug, ctx.type);
 
-       if (si_shader_ctx.type == TGSI_PROCESSOR_GEOMETRY) {
+       r = si_shader_binary_upload(sscreen, shader);
+       if (r) {
+               fprintf(stderr, "LLVM failed to upload shader\n");
+               goto out;
+       }
+
+       radeon_llvm_dispose(&ctx.radeon_bld);
+
+       if (ctx.type == TGSI_PROCESSOR_GEOMETRY) {
                shader->gs_copy_shader = CALLOC_STRUCT(si_shader);
                shader->gs_copy_shader->selector = shader->selector;
-               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))) {
+               ctx.shader = shader->gs_copy_shader;
+               if ((r = si_generate_gs_copy_shader(sscreen, &ctx,
+                                                   shader, debug))) {
                        free(shader->gs_copy_shader);
                        shader->gs_copy_shader = NULL;
                        goto out;
@@ -4190,23 +4519,23 @@ int si_shader_create(struct si_screen *sscreen, LLVMTargetMachineRef tm,
 
 out:
        for (int i = 0; i < SI_NUM_CONST_BUFFERS; i++)
-               FREE(si_shader_ctx.constants[i]);
+               FREE(ctx.constants[i]);
        if (poly_stipple)
                tgsi_free_tokens(tokens);
        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);
 
        r600_resource_reference(&shader->bo, NULL);
 
-       FREE(shader->binary.code);
-       FREE(shader->binary.relocs);
-       FREE(shader->binary.disasm_string);
+       radeon_shader_binary_clean(&shader->binary);
 }