radeonsi: Add header and footer to shader stat dump
[mesa.git] / src / gallium / drivers / radeonsi / si_shader.c
index 54270cdb7334112b0fb0c11179cf869e15423095..89f02ab041097b9fb58693fd4d2792ee83fba619 100644 (file)
 #include "gallivm/lp_bld_logic.h"
 #include "gallivm/lp_bld_arit.h"
 #include "gallivm/lp_bld_flow.h"
-#include "radeon_llvm.h"
-#include "radeon_llvm_emit.h"
+#include "radeon/r600_cs.h"
+#include "radeon/radeon_llvm.h"
+#include "radeon/radeon_elf_util.h"
+#include "radeon/radeon_llvm_emit.h"
 #include "util/u_memory.h"
+#include "util/u_pstipple.h"
 #include "tgsi/tgsi_parse.h"
 #include "tgsi/tgsi_util.h"
 #include "tgsi/tgsi_dump.h"
 
 #include <errno.h>
 
+static const char *scratch_rsrc_dword0_symbol =
+       "SCRATCH_RSRC_DWORD0";
+
+static const char *scratch_rsrc_dword1_symbol =
+       "SCRATCH_RSRC_DWORD1";
+
 struct si_shader_output_values
 {
        LLVMValueRef values[4];
        unsigned name;
-       unsigned index;
        unsigned sid;
-       unsigned usage;
 };
 
 struct si_shader_context
 {
        struct radeon_llvm_context radeon_bld;
-       struct tgsi_parse_context parse;
-       struct tgsi_token * tokens;
-       struct si_pipe_shader *shader;
-       struct si_shader *gs_for_vs;
+       struct si_shader *shader;
+       struct si_screen *screen;
        unsigned type; /* TGSI_PROCESSOR_* specifies the type of shader. */
        int param_streamout_config;
        int param_streamout_write_index;
        int param_streamout_offset[4];
        int param_vertex_id;
        int param_instance_id;
+       LLVMTargetMachineRef tm;
        LLVMValueRef const_md;
-       LLVMValueRef const_resource[NUM_CONST_BUFFERS];
-#if HAVE_LLVM >= 0x0304
+       LLVMValueRef const_resource[SI_NUM_CONST_BUFFERS];
        LLVMValueRef ddxy_lds;
-#endif
-       LLVMValueRef *constants[NUM_CONST_BUFFERS];
-       LLVMValueRef *resources;
-       LLVMValueRef *samplers;
+       LLVMValueRef *constants[SI_NUM_CONST_BUFFERS];
+       LLVMValueRef resources[SI_NUM_SAMPLER_VIEWS];
+       LLVMValueRef samplers[SI_NUM_SAMPLER_STATES];
        LLVMValueRef so_buffers[4];
+       LLVMValueRef esgs_ring;
+       LLVMValueRef gsvs_ring;
        LLVMValueRef gs_next_vertex;
 };
 
@@ -107,34 +113,139 @@ static struct si_shader_context * si_shader_context(
 #define SENDMSG_GS_OP_EMIT     (2 << 4)
 #define SENDMSG_GS_OP_EMIT_CUT (3 << 4)
 
+/**
+ * Returns a unique index for a semantic name and index. The index must be
+ * less than 64, so that a 64-bit bitmask of used inputs or outputs can be
+ * calculated.
+ */
+unsigned si_shader_io_get_unique_index(unsigned semantic_name, unsigned index)
+{
+       switch (semantic_name) {
+       case TGSI_SEMANTIC_POSITION:
+               return 0;
+       case TGSI_SEMANTIC_PSIZE:
+               return 1;
+       case TGSI_SEMANTIC_CLIPDIST:
+               assert(index <= 1);
+               return 2 + index;
+       case TGSI_SEMANTIC_CLIPVERTEX:
+               return 4;
+       case TGSI_SEMANTIC_COLOR:
+               assert(index <= 1);
+               return 5 + index;
+       case TGSI_SEMANTIC_BCOLOR:
+               assert(index <= 1);
+               return 7 + index;
+       case TGSI_SEMANTIC_FOG:
+               return 9;
+       case TGSI_SEMANTIC_EDGEFLAG:
+               return 10;
+       case TGSI_SEMANTIC_GENERIC:
+               assert(index <= 63-11);
+               return 11 + index;
+       default:
+               assert(0);
+               return 63;
+       }
+}
 
 /**
- * Build an LLVM bytecode indexed load using LLVMBuildGEP + LLVMBuildLoad
+ * 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.
  *
- * @param offset The offset parameter specifies the number of
- * elements to offset, not the number of bytes or dwords.  An element is the
- * the type pointed to by the base_ptr parameter (e.g. int is the element of
- * an int* pointer)
+ * 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.
  *
- * When LLVM lowers the load instruction, it will convert the element offset
- * into a dword offset automatically.
+ * 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,
+                                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,
+                                         param);
+
+       if (rshift)
+               value = LLVMBuildLShr(gallivm->builder, value,
+                                     lp_build_const_int32(gallivm, rshift), "");
+
+       if (rshift + bitwidth < 32) {
+               unsigned mask = (1 << bitwidth) - 1;
+               value = LLVMBuildAnd(gallivm->builder, value,
+                                    lp_build_const_int32(gallivm, mask), "");
+       }
+
+       return value;
+}
+
+/**
+ * Build an LLVM bytecode indexed load using LLVMBuildGEP + LLVMBuildLoad.
+ * It's equivalent to doing a load from &base_ptr[index].
  *
+ * \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,
-       LLVMValueRef base_ptr,
-       LLVMValueRef offset)
+static LLVMValueRef build_indexed_load(struct si_shader_context *si_shader_ctx,
+                                      LLVMValueRef base_ptr, LLVMValueRef index)
 {
-       struct lp_build_context * base = &si_shader_ctx->radeon_bld.soa.bld_base.base;
+       struct lp_build_tgsi_context *bld_base = &si_shader_ctx->radeon_bld.soa.bld_base;
+       struct gallivm_state *gallivm = bld_base->base.gallivm;
+       LLVMValueRef indices[2], pointer;
 
-       LLVMValueRef indices[2] = {
-               LLVMConstInt(LLVMInt64TypeInContext(base->gallivm->context), 0, false),
-               offset
-       };
-       LLVMValueRef computed_ptr = LLVMBuildGEP(
-               base->gallivm->builder, base_ptr, indices, 2, "");
+       indices[0] = bld_base->uint_bld.zero;
+       indices[1] = index;
 
-       LLVMValueRef result = LLVMBuildLoad(base->gallivm->builder, computed_ptr, "");
+       pointer = LLVMBuildGEP(gallivm->builder, base_ptr, indices, 2, "");
+       return LLVMBuildLoad(gallivm->builder, pointer, "");
+}
+
+/**
+ * Do a load from &base_ptr[index], but also add a flag that it's loading
+ * a constant.
+ */
+static LLVMValueRef build_indexed_load_const(
+       struct si_shader_context * si_shader_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);
        return result;
 }
@@ -149,43 +260,14 @@ static LLVMValueRef get_instance_index_for_fetch(
 
        LLVMValueRef result = LLVMGetParam(radeon_bld->main_fn,
                                           si_shader_ctx->param_instance_id);
-       result = LLVMBuildAdd(gallivm->builder, result, LLVMGetParam(
-                       radeon_bld->main_fn, SI_PARAM_START_INSTANCE), "");
 
+       /* The division must be done before START_INSTANCE is added. */
        if (divisor > 1)
                result = LLVMBuildUDiv(gallivm->builder, result,
                                lp_build_const_int32(gallivm, divisor), "");
 
-       return result;
-}
-
-static int si_store_shader_io_attribs(struct si_shader *shader,
-                                     const struct tgsi_full_declaration *d)
-{
-       int i = -1;
-
-       switch (d->Declaration.File) {
-       case TGSI_FILE_INPUT:
-               i = shader->ninput++;
-               assert(i < Elements(shader->input));
-               shader->input[i].name = d->Semantic.Name;
-               shader->input[i].sid = d->Semantic.Index;
-               shader->input[i].index = d->Range.First;
-               shader->input[i].interpolate = d->Interp.Interpolate;
-               shader->input[i].centroid = d->Interp.Centroid;
-               return -1;
-
-       case TGSI_FILE_OUTPUT:
-               i = shader->noutput++;
-               assert(i < Elements(shader->output));
-               shader->output[i].name = d->Semantic.Name;
-               shader->output[i].sid = d->Semantic.Index;
-               shader->output[i].index = d->Range.First;
-               shader->output[i].usage = d->Declaration.UsageMask;
-               break;
-       }
-
-       return i;
+       return LLVMBuildAdd(gallivm->builder, result, LLVMGetParam(
+                       radeon_bld->main_fn, SI_PARAM_START_INSTANCE), "");
 }
 
 static void declare_input_vs(
@@ -215,20 +297,22 @@ static void declare_input_vs(
 
        t_offset = lp_build_const_int32(gallivm, input_index);
 
-       t_list = build_indexed_load(si_shader_ctx, t_list_ptr, t_offset);
+       t_list = build_indexed_load_const(si_shader_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->shader.uses_instanceid = true;
+               si_shader_ctx->shader->uses_instanceid = true;
                buffer_index = get_instance_index_for_fetch(&si_shader_ctx->radeon_bld, divisor);
        } else {
-               /* Load the buffer index, which is always stored in VGPR0
-                * for Vertex Shaders */
-               buffer_index = LLVMGetParam(si_shader_ctx->radeon_bld.main_fn,
-                                           si_shader_ctx->param_vertex_id);
+               /* Load the buffer index for vertices. */
+               LLVMValueRef vertex_id = LLVMGetParam(si_shader_ctx->radeon_bld.main_fn,
+                                                     si_shader_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);
@@ -250,21 +334,6 @@ static void declare_input_vs(
        }
 }
 
-static void declare_input_gs(
-       struct radeon_llvm_context *radeon_bld,
-       unsigned input_index,
-       const struct tgsi_full_declaration *decl)
-{
-       struct si_shader_context *si_shader_ctx =
-               si_shader_context(&radeon_bld->soa.bld_base);
-       struct si_shader *shader = &si_shader_ctx->shader->shader;
-
-       si_store_shader_io_attribs(shader, decl);
-
-       if (decl->Semantic.Name != TGSI_SEMANTIC_PRIMID)
-               shader->input[input_index].param_offset = shader->nparam++;
-}
-
 static LLVMValueRef fetch_input_gs(
        struct lp_build_tgsi_context *bld_base,
        const struct tgsi_full_src_register *reg,
@@ -273,18 +342,18 @@ static LLVMValueRef fetch_input_gs(
 {
        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->shader;
+       struct si_shader *shader = si_shader_ctx->shader;
        struct lp_build_context *uint = &si_shader_ctx->radeon_bld.soa.bld_base.uint_bld;
        struct gallivm_state *gallivm = base->gallivm;
        LLVMTypeRef i32 = LLVMInt32TypeInContext(gallivm->context);
        LLVMValueRef vtx_offset;
-       LLVMValueRef t_list_ptr;
-       LLVMValueRef t_list;
        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];
 
-       if (swizzle != ~0 &&
-           shader->input[reg->Register.Index].name == TGSI_SEMANTIC_PRIMID) {
+       if (swizzle != ~0 && semantic_name == TGSI_SEMANTIC_PRIMID) {
                if (swizzle == 0)
                        return LLVMGetParam(si_shader_ctx->radeon_bld.main_fn,
                                            SI_PARAM_PRIMITIVE_ID);
@@ -318,16 +387,11 @@ static LLVMValueRef fetch_input_gs(
                                                   vtx_offset_param),
                                      4);
 
-       /* Load the ESGS ring resource descriptor */
-       t_list_ptr = LLVMGetParam(si_shader_ctx->radeon_bld.main_fn,
-                                 SI_PARAM_RW_BUFFERS);
-       t_list = build_indexed_load(si_shader_ctx, t_list_ptr,
-                                   lp_build_const_int32(gallivm, SI_RING_ESGS));
-
-       args[0] = t_list;
+       args[0] = si_shader_ctx->esgs_ring;
        args[1] = vtx_offset;
        args[2] = lp_build_const_int32(gallivm,
-                                      ((shader->input[reg->Register.Index].param_offset * 4) +
+                                      (get_param_index(semantic_name, semantic_index,
+                                                       shader->selector->gs_used_inputs) * 4 +
                                        swizzle) * 256);
        args[3] = uint->zero;
        args[4] = uint->one;  /* OFFEN */
@@ -352,7 +416,7 @@ static void declare_input_fs(
        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->shader;
+       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);
@@ -392,21 +456,8 @@ static void declare_input_fs(
        }
 
        if (decl->Semantic.Name == TGSI_SEMANTIC_FACE) {
-               LLVMValueRef face, is_face_positive;
-
-               face = LLVMGetParam(main_fn, SI_PARAM_FRONT_FACE);
-
-               is_face_positive = LLVMBuildFCmp(gallivm->builder,
-                                                LLVMRealUGT, face,
-                                                lp_build_const_float(gallivm, 0.0f),
-                                                "");
-
                radeon_bld->inputs[radeon_llvm_reg_index_soa(input_index, 0)] =
-                       LLVMBuildSelect(gallivm->builder,
-                                       is_face_positive,
-                                       lp_build_const_float(gallivm, 1.0f),
-                                       lp_build_const_float(gallivm, 0.0f),
-                                       "");
+                       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);
@@ -416,32 +467,27 @@ static void declare_input_fs(
                return;
        }
 
-       shader->input[input_index].param_offset = shader->nparam++;
+       shader->ps_input_param_offset[input_index] = shader->nparam++;
        attr_number = lp_build_const_int32(gallivm,
-                                          shader->input[input_index].param_offset);
+                                          shader->ps_input_param_offset[input_index]);
 
        switch (decl->Interp.Interpolate) {
-       case TGSI_INTERPOLATE_COLOR:
-               if (si_shader_ctx->shader->key.ps.flatshade) {
-                       interp_param = 0;
-               } else {
-                       if (decl->Interp.Centroid)
-                               interp_param = LLVMGetParam(main_fn, SI_PARAM_PERSP_CENTROID);
-                       else
-                               interp_param = LLVMGetParam(main_fn, SI_PARAM_PERSP_CENTER);
-               }
-               break;
        case TGSI_INTERPOLATE_CONSTANT:
                interp_param = 0;
                break;
        case TGSI_INTERPOLATE_LINEAR:
-               if (decl->Interp.Centroid)
+               if (decl->Interp.Location == TGSI_INTERPOLATE_LOC_SAMPLE)
+                       interp_param = LLVMGetParam(main_fn, SI_PARAM_LINEAR_SAMPLE);
+               else if (decl->Interp.Location == TGSI_INTERPOLATE_LOC_CENTROID)
                        interp_param = LLVMGetParam(main_fn, SI_PARAM_LINEAR_CENTROID);
                else
                        interp_param = LLVMGetParam(main_fn, SI_PARAM_LINEAR_CENTER);
                break;
+       case TGSI_INTERPOLATE_COLOR:
        case TGSI_INTERPOLATE_PERSPECTIVE:
-               if (decl->Interp.Centroid)
+               if (decl->Interp.Location == TGSI_INTERPOLATE_LOC_SAMPLE)
+                       interp_param = LLVMGetParam(main_fn, SI_PARAM_PERSP_SAMPLE);
+               else if (decl->Interp.Location == TGSI_INTERPOLATE_LOC_CENTROID)
                        interp_param = LLVMGetParam(main_fn, SI_PARAM_PERSP_CENTROID);
                else
                        interp_param = LLVMGetParam(main_fn, SI_PARAM_PERSP_CENTER);
@@ -451,21 +497,30 @@ static void declare_input_fs(
                return;
        }
 
+       /* 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
+        * interpolation (but the intrinsic can't fetch from the other two
+        * vertices).
+        *
+        * Luckily, it doesn't matter, because we rely on the FLAT_SHADE state
+        * to do the right thing. The only reason we use fs.constant is that
+        * fs.interp cannot be used on integers, because they can be equal
+        * to NaN.
+        */
        intr_name = interp_param ? "llvm.SI.fs.interp" : "llvm.SI.fs.constant";
 
-       /* XXX: Could there be more than TGSI_NUM_CHANNELS (4) ? */
        if (decl->Semantic.Name == TGSI_SEMANTIC_COLOR &&
            si_shader_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->input[input_index].param_offset + 1);
+                                            shader->ps_input_param_offset[input_index] + 1);
 
                face = LLVMGetParam(main_fn, SI_PARAM_FRONT_FACE);
 
                is_face_positive = LLVMBuildFCmp(gallivm->builder,
-                                                LLVMRealUGT, face,
+                                                LLVMRealOGT, face,
                                                 lp_build_const_float(gallivm, 0.0f),
                                                 "");
 
@@ -529,6 +584,24 @@ static void declare_input_fs(
        }
 }
 
+static LLVMValueRef get_sample_id(struct radeon_llvm_context *radeon_bld)
+{
+       return unpack_param(si_shader_context(&radeon_bld->soa.bld_base),
+                           SI_PARAM_ANCILLARY, 8, 4);
+}
+
+/**
+ * Load a dword from a constant buffer.
+ */
+static LLVMValueRef buffer_load_const(LLVMBuilderRef builder, LLVMValueRef resource,
+                                     LLVMValueRef offset, LLVMTypeRef return_type)
+{
+       LLVMValueRef args[2] = {resource, offset};
+
+       return build_intrinsic(builder, "llvm.SI.load.const", return_type, args, 2,
+                              LLVMReadNoneAttribute | LLVMNoUnwindAttribute);
+}
+
 static void declare_system_value(
        struct radeon_llvm_context * radeon_bld,
        unsigned index,
@@ -536,6 +609,8 @@ static void declare_system_value(
 {
        struct si_shader_context *si_shader_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;
        LLVMValueRef value = 0;
 
        switch (decl->Semantic.Name) {
@@ -545,10 +620,57 @@ static void declare_system_value(
                break;
 
        case TGSI_SEMANTIC_VERTEXID:
+               value = LLVMBuildAdd(gallivm->builder,
+                                    LLVMGetParam(radeon_bld->main_fn,
+                                                 si_shader_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);
                break;
 
+       case TGSI_SEMANTIC_BASEVERTEX:
+               value = LLVMGetParam(radeon_bld->main_fn,
+                                    SI_PARAM_BASE_VERTEX);
+               break;
+
+       case TGSI_SEMANTIC_SAMPLEID:
+               value = get_sample_id(radeon_bld);
+               break;
+
+       case TGSI_SEMANTIC_SAMPLEPOS:
+       {
+               LLVMBuilderRef builder = gallivm->builder;
+               LLVMValueRef desc = LLVMGetParam(si_shader_ctx->radeon_bld.main_fn, SI_PARAM_CONST);
+               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);
+
+               /* offset = sample_id * 8  (8 = 2 floats containing samplepos.xy) */
+               LLVMValueRef offset0 = lp_build_mul_imm(uint_bld, get_sample_id(radeon_bld), 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),
+                       lp_build_const_float(gallivm, 0),
+                       lp_build_const_float(gallivm, 0)
+               };
+               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);
+               break;
+
        default:
                assert(!"unknown system value");
                return;
@@ -568,7 +690,6 @@ static LLVMValueRef fetch_constant(
        const struct tgsi_ind_register *ireg = &reg->Indirect;
        unsigned buf, idx;
 
-       LLVMValueRef args[2];
        LLVMValueRef addr;
        LLVMValueRef result;
 
@@ -587,15 +708,14 @@ static LLVMValueRef fetch_constant(
        if (!reg->Register.Indirect)
                return bitcast(bld_base, type, si_shader_ctx->constants[buf][idx]);
 
-       args[0] = si_shader_ctx->const_resource[buf];
-       args[1] = lp_build_const_int32(base->gallivm, idx * 4);
        addr = si_shader_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);
-       args[1] = lp_build_add(&bld_base->uint_bld, addr, args[1]);
+       addr = lp_build_add(&bld_base->uint_bld, addr,
+                           lp_build_const_int32(base->gallivm, idx * 4));
 
-       result = build_intrinsic(base->gallivm->builder, "llvm.SI.load.const", base->elem_type,
-                                 args, 2, LLVMReadNoneAttribute | LLVMNoUnwindAttribute);
+       result = buffer_load_const(base->gallivm->builder, si_shader_ctx->const_resource[buf],
+                           addr, base->elem_type);
 
        return bitcast(bld_base, type, result);
 }
@@ -698,7 +818,7 @@ static void si_llvm_init_export_args_load(struct lp_build_tgsi_context *bld_base
 }
 
 static void si_alpha_test(struct lp_build_tgsi_context *bld_base,
-                         LLVMValueRef *out_ptr)
+                         LLVMValueRef alpha_ptr)
 {
        struct si_shader_context *si_shader_ctx = si_shader_context(bld_base);
        struct gallivm_state *gallivm = bld_base->base.gallivm;
@@ -710,7 +830,7 @@ static void si_alpha_test(struct lp_build_tgsi_context *bld_base,
                LLVMValueRef alpha_pass =
                        lp_build_cmp(&bld_base->base,
                                     si_shader_ctx->shader->key.ps.alpha_func,
-                                    LLVMBuildLoad(gallivm->builder, out_ptr[3], ""),
+                                    LLVMBuildLoad(gallivm->builder, alpha_ptr, ""),
                                     alpha_ref);
                LLVMValueRef arg =
                        lp_build_select(&bld_base->base,
@@ -728,13 +848,42 @@ static void si_alpha_test(struct lp_build_tgsi_context *bld_base,
                                LLVMVoidTypeInContext(gallivm->context),
                                NULL, 0, 0);
        }
+
+       si_shader_ctx->shader->db_shader_control |= S_02880C_KILL_ENABLE(1);
+}
+
+static void si_scale_alpha_by_sample_mask(struct lp_build_tgsi_context *bld_base,
+                                         LLVMValueRef alpha_ptr)
+{
+       struct si_shader_context *si_shader_ctx = si_shader_context(bld_base);
+       struct gallivm_state *gallivm = bld_base->base.gallivm;
+       LLVMValueRef coverage, alpha;
+
+       /* alpha = alpha * popcount(coverage) / SI_NUM_SMOOTH_AA_SAMPLES */
+       coverage = LLVMGetParam(si_shader_ctx->radeon_bld.main_fn,
+                               SI_PARAM_SAMPLE_COVERAGE);
+       coverage = bitcast(bld_base, TGSI_TYPE_SIGNED, coverage);
+
+       coverage = build_intrinsic(gallivm->builder, "llvm.ctpop.i32",
+                                  bld_base->int_bld.elem_type,
+                                  &coverage, 1, LLVMReadNoneAttribute);
+
+       coverage = LLVMBuildUIToFP(gallivm->builder, coverage,
+                                  bld_base->base.elem_type, "");
+
+       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);
 }
 
 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_pipe_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;
        unsigned reg_index;
@@ -742,17 +891,12 @@ static void si_llvm_emit_clipvertex(struct lp_build_tgsi_context * bld_base,
        unsigned const_chan;
        LLVMValueRef base_elt;
        LLVMValueRef ptr = LLVMGetParam(si_shader_ctx->radeon_bld.main_fn, SI_PARAM_CONST);
-       LLVMValueRef constbuf_index = lp_build_const_int32(base->gallivm, NUM_PIPE_CONST_BUFFERS);
-       LLVMValueRef const_resource = build_indexed_load(si_shader_ctx, ptr, constbuf_index);
+       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);
 
        for (reg_index = 0; reg_index < 2; reg_index ++) {
                LLVMValueRef *args = pos[2 + reg_index];
 
-               if (!(shader->key.vs.ucps_enabled & (1 << reg_index)))
-                       continue;
-
-               shader->shader.clip_dist_write |= 0xf << (4 * reg_index);
-
                args[5] =
                args[6] =
                args[7] =
@@ -761,15 +905,11 @@ static void si_llvm_emit_clipvertex(struct lp_build_tgsi_context * bld_base,
                /* Compute dot products of position and user clip plane vectors */
                for (chan = 0; chan < TGSI_NUM_CHANNELS; chan++) {
                        for (const_chan = 0; const_chan < TGSI_NUM_CHANNELS; const_chan++) {
-                               args[0] = const_resource;
                                args[1] = lp_build_const_int32(base->gallivm,
                                                               ((reg_index * 4 + chan) * 4 +
                                                                const_chan) * 4);
-                               base_elt = build_intrinsic(base->gallivm->builder,
-                                                          "llvm.SI.load.const",
-                                                          base->elem_type,
-                                                          args, 2,
-                                                          LLVMReadNoneAttribute | LLVMNoUnwindAttribute);
+                               base_elt = buffer_load_const(base->gallivm->builder, const_resource,
+                                                     args[1], base->elem_type);
                                args[5 + chan] =
                                        lp_build_add(base, args[5 + chan],
                                                     lp_build_mul(base, base_elt,
@@ -892,16 +1032,9 @@ static void si_llvm_emit_streamout(struct si_shader_context *shader,
 
        LLVMTypeRef i32 = LLVMInt32TypeInContext(gallivm->context);
 
-       LLVMValueRef so_param =
-               LLVMGetParam(shader->radeon_bld.main_fn,
-                            shader->param_streamout_config);
-
        /* Get bits [22:16], i.e. (so_param >> 16) & 127; */
        LLVMValueRef so_vtx_count =
-               LLVMBuildAnd(builder,
-                            LLVMBuildLShr(builder, so_param,
-                                          LLVMConstInt(i32, 16, 0), ""),
-                            LLVMConstInt(i32, 127, 0), "");
+               unpack_param(shader, shader->param_streamout_config, 16, 7);
 
        LLVMValueRef tid = build_intrinsic(builder, "llvm.SI.tid", i32,
                                           NULL, 0, LLVMReadNoneAttribute);
@@ -955,24 +1088,16 @@ static void si_llvm_emit_streamout(struct si_shader_context *shader,
                        if (!num_comps || num_comps > 4)
                                continue;
 
+                       if (reg >= noutput)
+                               continue;
+
                        /* Load the output as int. */
                        for (j = 0; j < num_comps; j++) {
-                               unsigned outidx = 0;
-
-                               while (outidx < noutput && outputs[outidx].index != reg)
-                                       outidx++;
-
-                               if (outidx < noutput)
-                                       out[j] = LLVMBuildBitCast(builder,
-                                                                 outputs[outidx].values[start+j],
-                                                                 i32, "");
-                               else
-                                       out[j] = NULL;
+                               out[j] = LLVMBuildBitCast(builder,
+                                                         outputs[reg].values[start+j],
+                                               i32, "");
                        }
 
-                       if (!out[0])
-                               continue;
-
                        /* Pack the output. */
                        LLVMValueRef vdata = NULL;
 
@@ -1008,14 +1133,14 @@ static void si_llvm_export_vs(struct lp_build_tgsi_context *bld_base,
                              unsigned noutput)
 {
        struct si_shader_context * si_shader_ctx = si_shader_context(bld_base);
-       struct si_shader * shader = &si_shader_ctx->shader->shader;
+       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;
        LLVMValueRef args[9];
        LLVMValueRef pos_args[4][9] = { { 0 } };
        LLVMValueRef psize_value = NULL, edgeflag_value = NULL, layer_value = NULL;
-       unsigned semantic_name, semantic_index, semantic_usage;
+       unsigned semantic_name, semantic_index;
        unsigned target;
        unsigned param_count = 0;
        unsigned pos_idx;
@@ -1028,24 +1153,17 @@ static void si_llvm_export_vs(struct lp_build_tgsi_context *bld_base,
        for (i = 0; i < noutput; i++) {
                semantic_name = outputs[i].name;
                semantic_index = outputs[i].sid;
-               semantic_usage = outputs[i].usage;
 
 handle_semantic:
                /* Select the correct target */
                switch(semantic_name) {
                case TGSI_SEMANTIC_PSIZE:
-                       shader->vs_out_misc_write = true;
-                       shader->vs_out_point_size = true;
                        psize_value = outputs[i].values[0];
                        continue;
                case TGSI_SEMANTIC_EDGEFLAG:
-                       shader->vs_out_misc_write = true;
-                       shader->vs_out_edgeflag = true;
                        edgeflag_value = outputs[i].values[0];
                        continue;
                case TGSI_SEMANTIC_LAYER:
-                       shader->vs_out_misc_write = true;
-                       shader->vs_out_layer = true;
                        layer_value = outputs[i].values[0];
                        continue;
                case TGSI_SEMANTIC_POSITION:
@@ -1054,15 +1172,10 @@ handle_semantic:
                case TGSI_SEMANTIC_COLOR:
                case TGSI_SEMANTIC_BCOLOR:
                        target = V_008DFC_SQ_EXP_PARAM + param_count;
-                       shader->output[i].param_offset = param_count;
+                       shader->vs_output_param_offset[i] = param_count;
                        param_count++;
                        break;
                case TGSI_SEMANTIC_CLIPDIST:
-                       if (!(si_shader_ctx->shader->key.vs.ucps_enabled &
-                             (1 << semantic_index)))
-                               continue;
-                       shader->clip_dist_write |=
-                               semantic_usage << (semantic_index << 2);
                        target = V_008DFC_SQ_EXP_POS + 2 + semantic_index;
                        break;
                case TGSI_SEMANTIC_CLIPVERTEX:
@@ -1072,7 +1185,7 @@ handle_semantic:
                case TGSI_SEMANTIC_FOG:
                case TGSI_SEMANTIC_GENERIC:
                        target = V_008DFC_SQ_EXP_PARAM + param_count;
-                       shader->output[i].param_offset = param_count;
+                       shader->vs_output_param_offset[i] = param_count;
                        param_count++;
                        break;
                default:
@@ -1115,11 +1228,13 @@ handle_semantic:
        }
 
        /* Write the misc vector (point size, edgeflag, layer, viewport). */
-       if (shader->vs_out_misc_write) {
+       if (shader->selector->info.writes_psize ||
+           shader->selector->info.writes_edgeflag ||
+           shader->selector->info.writes_layer) {
                pos_args[1][0] = lp_build_const_int32(base->gallivm, /* writemask */
-                                                     shader->vs_out_point_size |
-                                                     (shader->vs_out_edgeflag << 1) |
-                                                     (shader->vs_out_layer << 2));
+                                                     shader->selector->info.writes_psize |
+                                                     (shader->selector->info.writes_edgeflag << 1) |
+                                                     (shader->selector->info.writes_layer << 2));
                pos_args[1][1] = uint->zero; /* EXEC mask */
                pos_args[1][2] = uint->zero; /* last export? */
                pos_args[1][3] = lp_build_const_int32(base->gallivm, V_008DFC_SQ_EXP_POS + 1);
@@ -1129,10 +1244,10 @@ handle_semantic:
                pos_args[1][7] = base->zero; /* Z */
                pos_args[1][8] = base->zero; /* W */
 
-               if (shader->vs_out_point_size)
+               if (shader->selector->info.writes_psize)
                        pos_args[1][5] = psize_value;
 
-               if (shader->vs_out_edgeflag) {
+               if (shader->selector->info.writes_edgeflag) {
                        /* The output is a float, but the hw expects an integer
                         * with the first bit containing the edge flag. */
                        edgeflag_value = LLVMBuildFPToUI(base->gallivm->builder,
@@ -1148,7 +1263,7 @@ handle_semantic:
                                                          base->elem_type, "");
                }
 
-               if (shader->vs_out_layer)
+               if (shader->selector->info.writes_layer)
                        pos_args[1][7] = layer_value;
        }
 
@@ -1179,55 +1294,33 @@ 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 gallivm_state *gallivm = bld_base->base.gallivm;
-       struct si_shader *es = &si_shader_ctx->shader->shader;
-       struct si_shader *gs = si_shader_ctx->gs_for_vs;
-       struct tgsi_parse_context *parse = &si_shader_ctx->parse;
+       struct si_shader *es = si_shader_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_PARAM_ES2GS_OFFSET);
-       LLVMValueRef t_list_ptr;
-       LLVMValueRef t_list;
        unsigned chan;
        int i;
 
-       while (!tgsi_parse_end_of_tokens(parse)) {
-               struct tgsi_full_declaration *d =
-                                       &parse->FullToken.FullDeclaration;
-
-               tgsi_parse_token(parse);
-
-               if (parse->FullToken.Token.Type != TGSI_TOKEN_TYPE_DECLARATION)
-                       continue;
-
-               si_store_shader_io_attribs(es, d);
-       }
-
-       /* Load the ESGS ring resource descriptor */
-       t_list_ptr = LLVMGetParam(si_shader_ctx->radeon_bld.main_fn,
-                                 SI_PARAM_RW_BUFFERS);
-       t_list = build_indexed_load(si_shader_ctx, t_list_ptr,
-                                   lp_build_const_int32(gallivm, SI_RING_ESGS));
-
-       for (i = 0; i < es->noutput; i++) {
+       for (i = 0; i < info->num_outputs; i++) {
                LLVMValueRef *out_ptr =
-                       si_shader_ctx->radeon_bld.soa.outputs[es->output[i].index];
-               int j;
+                       si_shader_ctx->radeon_bld.soa.outputs[i];
+               int param_index = get_param_index(info->output_semantic_name[i],
+                                                 info->output_semantic_index[i],
+                                                 es->key.vs.gs_used_inputs);
 
-               for (j = 0; j < gs->ninput; j++) {
-                       if (gs->input[j].name == es->output[i].name &&
-                           gs->input[j].sid == es->output[i].sid)
-                               break;
-               }
-               if (j == gs->ninput)
+               if (param_index < 0)
                        continue;
 
                for (chan = 0; chan < 4; chan++) {
                        LLVMValueRef out_val = LLVMBuildLoad(gallivm->builder, out_ptr[chan], "");
                        out_val = LLVMBuildBitCast(gallivm->builder, out_val, i32, "");
 
-                       build_tbuffer_store(si_shader_ctx, t_list, out_val, 1,
+                       build_tbuffer_store(si_shader_ctx,
+                                           si_shader_ctx->esgs_ring,
+                                           out_val, 1,
                                            LLVMGetUndef(i32), soffset,
-                                           (4 * gs->input[j].param_offset + chan) * 4,
+                                           (4 * param_index + chan) * 4,
                                            V_008F0C_BUF_DATA_FORMAT_32,
                                            V_008F0C_BUF_NUM_FORMAT_UINT,
                                            0, 0, 1, 1, 0);
@@ -1252,181 +1345,163 @@ 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 gallivm_state *gallivm = bld_base->base.gallivm;
-       struct si_pipe_shader *shader = si_shader_ctx->shader;
-       struct tgsi_parse_context *parse = &si_shader_ctx->parse;
+       struct tgsi_shader_info *info = &si_shader_ctx->shader->selector->info;
        struct si_shader_output_values *outputs = NULL;
-       unsigned noutput = 0;
-       int i;
-
-       while (!tgsi_parse_end_of_tokens(parse)) {
-               struct tgsi_full_declaration *d =
-                                       &parse->FullToken.FullDeclaration;
-               unsigned index;
+       int i,j;
 
-               tgsi_parse_token(parse);
+       outputs = MALLOC(info->num_outputs * sizeof(outputs[0]));
 
-               if (parse->FullToken.Token.Type != TGSI_TOKEN_TYPE_DECLARATION)
-                       continue;
-
-               i = si_store_shader_io_attribs(&shader->shader, d);
-               if (i < 0)
-                       continue;
+       for (i = 0; i < info->num_outputs; i++) {
+               outputs[i].name = info->output_semantic_name[i];
+               outputs[i].sid = info->output_semantic_index[i];
 
-               outputs = REALLOC(outputs, noutput * sizeof(outputs[0]),
-                                 (noutput + 1) * sizeof(outputs[0]));
-               for (index = d->Range.First; index <= d->Range.Last; index++) {
-                       outputs[noutput].index = index;
-                       outputs[noutput].name = d->Semantic.Name;
-                       outputs[noutput].sid = d->Semantic.Index;
-                       outputs[noutput].usage = d->Declaration.UsageMask;
-
-                       for (i = 0; i < 4; i++)
-                               outputs[noutput].values[i] =
-                                       LLVMBuildLoad(gallivm->builder,
-                                                     si_shader_ctx->radeon_bld.soa.outputs[index][i],
-                                                     "");
-               }
-               noutput++;
+               for (j = 0; j < 4; j++)
+                       outputs[i].values[j] =
+                               LLVMBuildLoad(gallivm->builder,
+                                             si_shader_ctx->radeon_bld.soa.outputs[i][j],
+                                             "");
        }
 
-       si_llvm_export_vs(bld_base, outputs, noutput);
+       si_llvm_export_vs(bld_base, outputs, info->num_outputs);
        FREE(outputs);
 }
 
 static void si_llvm_emit_fs_epilogue(struct lp_build_tgsi_context * bld_base)
 {
        struct si_shader_context * si_shader_ctx = si_shader_context(bld_base);
-       struct si_shader * shader = &si_shader_ctx->shader->shader;
+       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 tgsi_parse_context *parse = &si_shader_ctx->parse;
+       struct lp_build_context * uint = &bld_base->uint_bld;
+       struct tgsi_shader_info *info = &shader->selector->info;
        LLVMValueRef args[9];
        LLVMValueRef last_args[9] = { 0 };
-       unsigned semantic_name;
-       int depth_index = -1, stencil_index = -1;
+       int depth_index = -1, stencil_index = -1, samplemask_index = -1;
        int i;
 
-       while (!tgsi_parse_end_of_tokens(parse)) {
-               struct tgsi_full_declaration *d =
-                                       &parse->FullToken.FullDeclaration;
+       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;
-               unsigned index;
+               LLVMValueRef alpha_ptr;
 
-               tgsi_parse_token(parse);
+               /* 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];
 
-               if (parse->FullToken.Token.Type == TGSI_TOKEN_TYPE_PROPERTY &&
-                   parse->FullToken.FullProperty.Property.PropertyName ==
-                   TGSI_PROPERTY_FS_COLOR0_WRITES_ALL_CBUFS)
-                       shader->fs_write_all = TRUE;
+                       if (si_shader_ctx->shader->key.ps.alpha_to_one)
+                               LLVMBuildStore(base->gallivm->builder,
+                                              base->one, alpha_ptr);
 
-               if (parse->FullToken.Token.Type != TGSI_TOKEN_TYPE_DECLARATION)
-                       continue;
+                       if (semantic_index == 0 &&
+                           si_shader_ctx->shader->key.ps.alpha_func != PIPE_FUNC_ALWAYS)
+                               si_alpha_test(bld_base, alpha_ptr);
 
-               i = si_store_shader_io_attribs(shader, d);
-               if (i < 0)
-                       continue;
+                       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);
+               }
 
-               semantic_name = d->Semantic.Name;
-               for (index = d->Range.First; index <= d->Range.Last; index++) {
-                       /* Select the correct target */
-                       switch(semantic_name) {
-                       case TGSI_SEMANTIC_POSITION:
-                               depth_index = index;
-                               continue;
-                       case TGSI_SEMANTIC_STENCIL:
-                               stencil_index = index;
-                               continue;
-                       case TGSI_SEMANTIC_COLOR:
-                               target = V_008DFC_SQ_EXP_MRT + d->Semantic.Index;
-                               if (si_shader_ctx->shader->key.ps.alpha_to_one)
-                                       LLVMBuildStore(bld_base->base.gallivm->builder,
-                                                      bld_base->base.one,
-                                                      si_shader_ctx->radeon_bld.soa.outputs[index][3]);
-
-                               if (d->Semantic.Index == 0 &&
-                                   si_shader_ctx->shader->key.ps.alpha_func != PIPE_FUNC_ALWAYS)
-                                       si_alpha_test(bld_base,
-                                                     si_shader_ctx->radeon_bld.soa.outputs[index]);
-                               break;
-                       default:
-                               target = 0;
-                               fprintf(stderr,
-                                       "Warning: SI unhandled fs output type:%d\n",
-                                       semantic_name);
+               si_llvm_init_export_args_load(bld_base,
+                                             si_shader_ctx->radeon_bld.soa.outputs[i],
+                                             target, args);
+
+               if (semantic_name == TGSI_SEMANTIC_COLOR) {
+                       /* If there is an export instruction waiting to be emitted, do so now. */
+                       if (last_args[0]) {
+                               lp_build_intrinsic(base->gallivm->builder,
+                                                  "llvm.SI.export",
+                                                  LLVMVoidTypeInContext(base->gallivm->context),
+                                                  last_args, 9);
                        }
 
-                       si_llvm_init_export_args_load(bld_base,
-                                                     si_shader_ctx->radeon_bld.soa.outputs[index],
-                                                     target, args);
+                       /* This instruction will be emitted at the end of the shader. */
+                       memcpy(last_args, args, sizeof(args));
 
-                       if (semantic_name == TGSI_SEMANTIC_COLOR) {
-                               /* If there is an export instruction waiting to be emitted, do so now. */
-                               if (last_args[0]) {
+                       /* 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),
-                                                          last_args, 9);
+                                                          args, 9);
                                }
-
-                               /* This instruction will be emitted at the end of the shader. */
-                               memcpy(last_args, args, sizeof(args));
-
-                               /* Handle FS_COLOR0_WRITES_ALL_CBUFS. */
-                               if (shader->fs_write_all && shader->output[i].sid == 0 &&
-                                   si_shader_ctx->shader->key.ps.nr_cbufs > 1) {
-                                       for (int c = 1; c < si_shader_ctx->shader->key.ps.nr_cbufs; c++) {
-                                               si_llvm_init_export_args_load(bld_base,
-                                                                             si_shader_ctx->radeon_bld.soa.outputs[index],
-                                                                             V_008DFC_SQ_EXP_MRT + c, args);
-                                               lp_build_intrinsic(base->gallivm->builder,
-                                                                  "llvm.SI.export",
-                                                                  LLVMVoidTypeInContext(base->gallivm->context),
-                                                                  args, 9);
-                                       }
-                               }
-                       } else {
-                               lp_build_intrinsic(base->gallivm->builder,
-                                                  "llvm.SI.export",
-                                                  LLVMVoidTypeInContext(base->gallivm->context),
-                                                  args, 9);
                        }
+               } else {
+                       lp_build_intrinsic(base->gallivm->builder,
+                                          "llvm.SI.export",
+                                          LLVMVoidTypeInContext(base->gallivm->context),
+                                          args, 9);
                }
        }
 
-       if (depth_index >= 0 || stencil_index >= 0) {
+       if (depth_index >= 0 || stencil_index >= 0 || samplemask_index >= 0) {
                LLVMValueRef out_ptr;
                unsigned mask = 0;
 
                /* 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;
-
-                       if (stencil_index < 0) {
-                               args[6] =
-                               args[7] =
-                               args[8] = args[5];
-                       }
+                       si_shader_ctx->shader->db_shader_control |= S_02880C_Z_EXPORT_ENABLE(1);
                }
 
                if (stencil_index >= 0) {
                        out_ptr = si_shader_ctx->radeon_bld.soa.outputs[stencil_index][1];
-                       args[7] =
-                       args[8] =
                        args[6] = LLVMBuildLoad(base->gallivm->builder, out_ptr, "");
-                       /* Only setting the stencil component bit (0x2) here
-                        * breaks some stencil piglit tests
-                        */
-                       mask |= 0x3;
+                       mask |= 0x2;
+                       si_shader_ctx->shader->db_shader_control |=
+                               S_02880C_STENCIL_TEST_VAL_EXPORT_ENABLE(1);
+               }
 
-                       if (depth_index < 0)
-                               args[5] = args[6];
+               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);
                }
 
+               /* 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;
+
+               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;
+
                /* Specify which components to enable */
                args[0] = lp_build_const_int32(base->gallivm, mask);
 
@@ -1458,10 +1533,6 @@ static void si_llvm_emit_fs_epilogue(struct lp_build_tgsi_context * bld_base)
                last_args[6]= uint->zero;
                last_args[7]= uint->zero;
                last_args[8]= uint->zero;
-
-               si_shader_ctx->shader->spi_shader_col_format |=
-                       V_028714_SPI_SHADER_32_ABGR;
-               si_shader_ctx->shader->cb_shader_mask |= S_02823C_OUTPUT0_ENABLE(0xf);
        }
 
        /* Specify whether the EXEC mask represents the valid mask */
@@ -1476,12 +1547,23 @@ static void si_llvm_emit_fs_epilogue(struct lp_build_tgsi_context * bld_base)
                           last_args, 9);
 }
 
-static const struct lp_build_tgsi_action txf_action;
-
 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)
+{
+       return target == TGSI_TEXTURE_SHADOW1D ||
+              target == TGSI_TEXTURE_SHADOW1D_ARRAY ||
+              target == TGSI_TEXTURE_SHADOW2D ||
+              target == TGSI_TEXTURE_SHADOW2D_ARRAY ||
+              target == TGSI_TEXTURE_SHADOWCUBE ||
+              target == TGSI_TEXTURE_SHADOWCUBE_ARRAY ||
+              target == TGSI_TEXTURE_SHADOWRECT;
+}
+
+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)
@@ -1491,7 +1573,7 @@ static void tex_fetch_args(
        const struct tgsi_full_instruction * inst = emit_data->inst;
        unsigned opcode = inst->Instruction.Opcode;
        unsigned target = inst->Texture.Texture;
-       LLVMValueRef coords[4];
+       LLVMValueRef coords[5];
        LLVMValueRef address[16];
        int ref_pos;
        unsigned num_coords = tgsi_util_get_texture_coord_dim(target, &ref_pos);
@@ -1499,6 +1581,7 @@ static void tex_fetch_args(
        unsigned chan;
        unsigned sampler_src = emit_data->inst->Instruction.NumSrcRegs - 1;
        unsigned sampler_index = emit_data->inst->Src[sampler_src].Register.Index;
+       bool has_offset = HAVE_LLVM >= 0x0305 ? inst->Texture.NumOffsets > 0 : false;
 
        if (target == TGSI_TEXTURE_BUFFER) {
                LLVMTypeRef i128 = LLVMIntTypeInContext(gallivm->context, 128);
@@ -1506,10 +1589,10 @@ static void tex_fetch_args(
                LLVMTypeRef i8 = LLVMInt8TypeInContext(gallivm->context);
                LLVMTypeRef v16i8 = LLVMVectorType(i8, 16);
 
-               /* Truncate v32i8 to v16i8. */
+               /* Bitcast and truncate v8i32 to v16i8. */
                LLVMValueRef res = si_shader_ctx->resources[sampler_index];
                res = LLVMBuildBitCast(gallivm->builder, res, v2i128, "");
-               res = LLVMBuildExtractElement(gallivm->builder, res, bld_base->uint_bld.zero, "");
+               res = LLVMBuildExtractElement(gallivm->builder, res, bld_base->uint_bld.one, "");
                res = LLVMBuildBitCast(gallivm->builder, res, v16i8, "");
 
                emit_data->dst_type = LLVMVectorType(bld_base->base.elem_type, 4);
@@ -1536,35 +1619,85 @@ static void tex_fetch_args(
        if (opcode == TGSI_OPCODE_TXP)
                coords[3] = bld_base->base.one;
 
+       /* Pack offsets. */
+       if (has_offset && opcode != TGSI_OPCODE_TXF) {
+               /* The offsets are six-bit signed integers packed like this:
+                *   X=[5:0], Y=[13:8], and Z=[21:16].
+                */
+               LLVMValueRef offset[3], pack;
+
+               assert(inst->Texture.NumOffsets == 1);
+
+               for (chan = 0; chan < 3; chan++) {
+                       offset[chan] = lp_build_emit_fetch_texoffset(bld_base,
+                                                                    emit_data->inst, 0, chan);
+                       offset[chan] = LLVMBuildAnd(gallivm->builder, offset[chan],
+                                                   lp_build_const_int32(gallivm, 0x3f), "");
+                       if (chan)
+                               offset[chan] = LLVMBuildShl(gallivm->builder, offset[chan],
+                                                           lp_build_const_int32(gallivm, chan*8), "");
+               }
+
+               pack = LLVMBuildOr(gallivm->builder, offset[0], offset[1], "");
+               pack = LLVMBuildOr(gallivm->builder, pack, offset[2], "");
+               address[count++] = pack;
+       }
+
        /* Pack LOD bias value */
        if (opcode == TGSI_OPCODE_TXB)
                address[count++] = coords[3];
-
-       if (target == TGSI_TEXTURE_CUBE || target == TGSI_TEXTURE_SHADOWCUBE)
-               radeon_llvm_emit_prepare_cube_coords(bld_base, emit_data, coords);
+       if (opcode == TGSI_OPCODE_TXB2)
+               address[count++] = lp_build_emit_fetch(bld_base, inst, 1, 0);
 
        /* Pack depth comparison value */
-       switch (target) {
-       case TGSI_TEXTURE_SHADOW1D:
-       case TGSI_TEXTURE_SHADOW1D_ARRAY:
-       case TGSI_TEXTURE_SHADOW2D:
-       case TGSI_TEXTURE_SHADOWRECT:
-       case TGSI_TEXTURE_SHADOWCUBE:
-       case TGSI_TEXTURE_SHADOW2D_ARRAY:
-               assert(ref_pos >= 0);
-               address[count++] = coords[ref_pos];
-               break;
-       case TGSI_TEXTURE_SHADOWCUBE_ARRAY:
-               address[count++] = lp_build_emit_fetch(bld_base, inst, 1, 0);
+       if (tgsi_is_shadow_sampler(target) && opcode != TGSI_OPCODE_LODQ) {
+               if (target == TGSI_TEXTURE_SHADOWCUBE_ARRAY) {
+                       address[count++] = lp_build_emit_fetch(bld_base, inst, 1, 0);
+               } else {
+                       assert(ref_pos >= 0);
+                       address[count++] = coords[ref_pos];
+               }
        }
 
+       if (target == TGSI_TEXTURE_CUBE ||
+           target == TGSI_TEXTURE_CUBE_ARRAY ||
+           target == TGSI_TEXTURE_SHADOWCUBE ||
+           target == TGSI_TEXTURE_SHADOWCUBE_ARRAY)
+               radeon_llvm_emit_prepare_cube_coords(bld_base, emit_data, coords);
+
        /* Pack user derivatives */
        if (opcode == TGSI_OPCODE_TXD) {
-               for (chan = 0; chan < 2; chan++) {
-                       address[count++] = lp_build_emit_fetch(bld_base, inst, 1, chan);
-                       if (num_coords > 1)
-                               address[count++] = lp_build_emit_fetch(bld_base, inst, 2, chan);
+               int num_deriv_channels, param;
+
+               switch (target) {
+               case TGSI_TEXTURE_3D:
+                       num_deriv_channels = 3;
+                       break;
+               case TGSI_TEXTURE_2D:
+               case TGSI_TEXTURE_SHADOW2D:
+               case TGSI_TEXTURE_RECT:
+               case TGSI_TEXTURE_SHADOWRECT:
+               case TGSI_TEXTURE_2D_ARRAY:
+               case TGSI_TEXTURE_SHADOW2D_ARRAY:
+               case TGSI_TEXTURE_CUBE:
+               case TGSI_TEXTURE_SHADOWCUBE:
+               case TGSI_TEXTURE_CUBE_ARRAY:
+               case TGSI_TEXTURE_SHADOWCUBE_ARRAY:
+                       num_deriv_channels = 2;
+                       break;
+               case TGSI_TEXTURE_1D:
+               case TGSI_TEXTURE_SHADOW1D:
+               case TGSI_TEXTURE_1D_ARRAY:
+               case TGSI_TEXTURE_SHADOW1D_ARRAY:
+                       num_deriv_channels = 1;
+                       break;
+               default:
+                       assert(0); /* no other targets are valid here */
                }
+
+               for (param = 1; param <= 2; param++)
+                       for (chan = 0; chan < num_deriv_channels; chan++)
+                               address[count++] = lp_build_emit_fetch(bld_base, inst, param, chan);
        }
 
        /* Pack texture coordinates */
@@ -1577,6 +1710,8 @@ static void tex_fetch_args(
        /* Pack LOD or sample index */
        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);
 
        if (count > 16) {
                assert(!"Cannot handle more than 16 texture address parameters");
@@ -1610,6 +1745,7 @@ static void tex_fetch_args(
                struct lp_build_emit_data txf_emit_data = *emit_data;
                LLVMValueRef txf_address[4];
                unsigned txf_count = count;
+               struct tgsi_full_instruction inst = {};
 
                memcpy(txf_address, address, sizeof(txf_address));
 
@@ -1623,16 +1759,18 @@ static void tex_fetch_args(
                        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;
+               txf_emit_data.inst = &inst;
                txf_emit_data.chan = 0;
                txf_emit_data.dst_type = LLVMVectorType(
-                       LLVMInt32TypeInContext(bld_base->base.gallivm->context), 4);
+                       LLVMInt32TypeInContext(gallivm->context), 4);
                txf_emit_data.args[0] = lp_build_gather_values(gallivm, txf_address, txf_count);
-               txf_emit_data.args[1] = si_shader_ctx->resources[FMASK_TEX_OFFSET + sampler_index];
-               txf_emit_data.args[2] = lp_build_const_int32(bld_base->base.gallivm,
-                       target == TGSI_TEXTURE_2D_MSAA ? TGSI_TEXTURE_2D : TGSI_TEXTURE_2D_ARRAY);
+               txf_emit_data.args[1] = si_shader_ctx->resources[SI_FMASK_TEX_OFFSET + sampler_index];
+               txf_emit_data.args[2] = lp_build_const_int32(gallivm, inst.Texture.Texture);
                txf_emit_data.arg_count = 3;
 
-               build_tex_intrinsic(&txf_action, bld_base, &txf_emit_data);
+               build_tex_intrinsic(&tex_action, bld_base, &txf_emit_data);
 
                /* Initialize some constants. */
                LLVMValueRef four = LLVMConstInt(uint_bld->elem_type, 4, 0);
@@ -1660,7 +1798,7 @@ static void tex_fetch_args(
                 */
                LLVMValueRef fmask_desc =
                        LLVMBuildBitCast(gallivm->builder,
-                                        si_shader_ctx->resources[FMASK_TEX_OFFSET + sampler_index],
+                                        si_shader_ctx->resources[SI_FMASK_TEX_OFFSET + sampler_index],
                                         LLVMVectorType(uint_bld->elem_type, 8), "");
 
                LLVMValueRef fmask_word1 =
@@ -1716,25 +1854,82 @@ static void tex_fetch_args(
                        }
                }
 
+               emit_data->args[2] = lp_build_const_int32(gallivm, target);
+               emit_data->arg_count = 3;
+
                emit_data->dst_type = LLVMVectorType(
-                       LLVMInt32TypeInContext(bld_base->base.gallivm->context),
+                       LLVMInt32TypeInContext(gallivm->context),
                        4);
+       } else if (opcode == TGSI_OPCODE_TG4 ||
+                  opcode == TGSI_OPCODE_LODQ ||
+                  has_offset) {
+               unsigned is_array = target == TGSI_TEXTURE_1D_ARRAY ||
+                                   target == TGSI_TEXTURE_SHADOW1D_ARRAY ||
+                                   target == TGSI_TEXTURE_2D_ARRAY ||
+                                   target == TGSI_TEXTURE_SHADOW2D_ARRAY ||
+                                   target == TGSI_TEXTURE_CUBE_ARRAY ||
+                                   target == TGSI_TEXTURE_SHADOWCUBE_ARRAY;
+               unsigned is_rect = target == TGSI_TEXTURE_RECT;
+               unsigned dmask = 0xf;
+
+               if (opcode == TGSI_OPCODE_TG4) {
+                       unsigned gather_comp = 0;
+
+                       /* DMASK was repurposed for GATHER4. 4 components are always
+                        * returned and DMASK works like a swizzle - it selects
+                        * the component to fetch. The only valid DMASK values are
+                        * 1=red, 2=green, 4=blue, 8=alpha. (e.g. 1 returns
+                        * (red,red,red,red) etc.) The ISA document doesn't mention
+                        * this.
+                        */
+
+                       /* Get the component index from src1.x for Gather4. */
+                       if (!tgsi_is_shadow_sampler(target)) {
+                               LLVMValueRef (*imms)[4] = lp_soa_context(bld_base)->immediates;
+                               LLVMValueRef comp_imm;
+                               struct tgsi_src_register src1 = inst->Src[1].Register;
+
+                               assert(src1.File == TGSI_FILE_IMMEDIATE);
+
+                               comp_imm = imms[src1.Index][src1.SwizzleX];
+                               gather_comp = LLVMConstIntGetZExtValue(comp_imm);
+                               gather_comp = CLAMP(gather_comp, 0, 3);
+                       }
+
+                       dmask = 1 << gather_comp;
+               }
 
-               emit_data->arg_count = 3;
-       } else {
-               /* Sampler */
                emit_data->args[2] = si_shader_ctx->samplers[sampler_index];
+               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(bld_base->base.gallivm->context),
+                       LLVMFloatTypeInContext(gallivm->context),
                        4);
-
+       } else {
+               emit_data->args[2] = si_shader_ctx->samplers[sampler_index];
+               emit_data->args[3] = lp_build_const_int32(gallivm, target);
                emit_data->arg_count = 4;
+
+               emit_data->dst_type = LLVMVectorType(
+                       LLVMFloatTypeInContext(gallivm->context),
+                       4);
        }
 
-       /* Dimensions */
-       emit_data->args[emit_data->arg_count - 1] =
-               lp_build_const_int32(bld_base->base.gallivm, target);
+       /* 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))
@@ -1748,9 +1943,13 @@ static void build_tex_intrinsic(const struct lp_build_tgsi_action * action,
                                struct lp_build_emit_data * emit_data)
 {
        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;
 
-       if (emit_data->inst->Texture.Texture == TGSI_TEXTURE_BUFFER) {
+       if (target == TGSI_TEXTURE_BUFFER) {
                emit_data->output[emit_data->chan] = build_intrinsic(
                        base->gallivm->builder,
                        "llvm.SI.vs.load.input", emit_data->dst_type,
@@ -1759,13 +1958,99 @@ static void build_tex_intrinsic(const struct lp_build_tgsi_action * action,
                return;
        }
 
-       sprintf(intr_name, "%sv%ui32", action->intr_name,
-               LLVMGetVectorSize(LLVMTypeOf(emit_data->args[0])));
+       if (opcode == TGSI_OPCODE_TG4 ||
+           opcode == TGSI_OPCODE_LODQ ||
+           (opcode != TGSI_OPCODE_TXF && has_offset)) {
+               bool is_shadow = tgsi_is_shadow_sampler(target);
+               const char *name = "llvm.SI.image.sample";
+               const char *infix = "";
+
+               switch (opcode) {
+               case TGSI_OPCODE_TEX:
+               case TGSI_OPCODE_TEX2:
+               case TGSI_OPCODE_TXP:
+                       break;
+               case TGSI_OPCODE_TXB:
+               case TGSI_OPCODE_TXB2:
+                       infix = ".b";
+                       break;
+               case TGSI_OPCODE_TXL:
+               case TGSI_OPCODE_TXL2:
+                       infix = ".l";
+                       break;
+               case TGSI_OPCODE_TXD:
+                       infix = ".d";
+                       break;
+               case TGSI_OPCODE_TG4:
+                       name = "llvm.SI.gather4";
+                       break;
+               case TGSI_OPCODE_LODQ:
+                       name = "llvm.SI.getlod";
+                       is_shadow = false;
+                       has_offset = false;
+                       break;
+               default:
+                       assert(0);
+                       return;
+               }
+
+               /* Add the type and suffixes .c, .o if needed. */
+               sprintf(intr_name, "%s%s%s%s.v%ui32", name,
+                       is_shadow ? ".c" : "", infix, has_offset ? ".o" : "",
+                       LLVMGetVectorSize(LLVMTypeOf(emit_data->args[0])));
 
-       emit_data->output[emit_data->chan] = build_intrinsic(
-               base->gallivm->builder, intr_name, emit_data->dst_type,
-               emit_data->args, emit_data->arg_count,
-               LLVMReadNoneAttribute | LLVMNoUnwindAttribute);
+               emit_data->output[emit_data->chan] = build_intrinsic(
+                       base->gallivm->builder, intr_name, emit_data->dst_type,
+                       emit_data->args, emit_data->arg_count,
+                       LLVMReadNoneAttribute | LLVMNoUnwindAttribute);
+       } else {
+               LLVMTypeRef i8, v16i8, v32i8;
+               const char *name;
+
+               switch (opcode) {
+               case TGSI_OPCODE_TEX:
+               case TGSI_OPCODE_TEX2:
+               case TGSI_OPCODE_TXP:
+                       name = "llvm.SI.sample";
+                       break;
+               case TGSI_OPCODE_TXB:
+               case TGSI_OPCODE_TXB2:
+                       name = "llvm.SI.sampleb";
+                       break;
+               case TGSI_OPCODE_TXD:
+                       name = "llvm.SI.sampled";
+                       break;
+               case TGSI_OPCODE_TXF:
+                       name = "llvm.SI.imageload";
+                       break;
+               case TGSI_OPCODE_TXL:
+               case TGSI_OPCODE_TXL2:
+                       name = "llvm.SI.samplel";
+                       break;
+               default:
+                       assert(0);
+                       return;
+               }
+
+               i8 = LLVMInt8TypeInContext(base->gallivm->context);
+               v16i8 = LLVMVectorType(i8, 16);
+               v32i8 = LLVMVectorType(i8, 32);
+
+               emit_data->args[1] = LLVMBuildBitCast(base->gallivm->builder,
+                                               emit_data->args[1], v32i8, "");
+               if (opcode != TGSI_OPCODE_TXF) {
+                       emit_data->args[2] = LLVMBuildBitCast(base->gallivm->builder,
+                                               emit_data->args[2], v16i8, "");
+               }
+
+               sprintf(intr_name, "%s.v%ui32", name,
+                       LLVMGetVectorSize(LLVMTypeOf(emit_data->args[0])));
+
+               emit_data->output[emit_data->chan] = build_intrinsic(
+                       base->gallivm->builder, intr_name, emit_data->dst_type,
+                       emit_data->args, emit_data->arg_count,
+                       LLVMReadNoneAttribute | LLVMNoUnwindAttribute);
+       }
 }
 
 static void txq_fetch_args(
@@ -1775,8 +2060,9 @@ static void txq_fetch_args(
        struct si_shader_context *si_shader_ctx = si_shader_context(bld_base);
        const struct tgsi_full_instruction *inst = emit_data->inst;
        struct gallivm_state *gallivm = bld_base->base.gallivm;
+       unsigned target = inst->Texture.Texture;
 
-       if (inst->Texture.Texture == TGSI_TEXTURE_BUFFER) {
+       if (target == TGSI_TEXTURE_BUFFER) {
                LLVMTypeRef i32 = LLVMInt32TypeInContext(gallivm->context);
                LLVMTypeRef v8i32 = LLVMVectorType(i32, 8);
 
@@ -1784,7 +2070,7 @@ static void txq_fetch_args(
                LLVMValueRef size = si_shader_ctx->resources[inst->Src[1].Register.Index];
                size = LLVMBuildBitCast(gallivm->builder, size, v8i32, "");
                size = LLVMBuildExtractElement(gallivm->builder, size,
-                                             lp_build_const_int32(gallivm, 2), "");
+                                             lp_build_const_int32(gallivm, 6), "");
                emit_data->args[0] = size;
                return;
        }
@@ -1795,9 +2081,13 @@ static void txq_fetch_args(
        /* Resource */
        emit_data->args[1] = si_shader_ctx->resources[inst->Src[1].Register.Index];
 
-       /* Dimensions */
+       /* 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,
-                                                 inst->Texture.Texture);
+                                                 target);
 
        emit_data->arg_count = 3;
 
@@ -1810,16 +2100,31 @@ 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)
 {
-       if (emit_data->inst->Texture.Texture == TGSI_TEXTURE_BUFFER) {
+       unsigned target = emit_data->inst->Texture.Texture;
+
+       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);
-}
 
-#if HAVE_LLVM >= 0x0304
+       /* Divide the number of layers by 6 to get the number of cubes. */
+       if (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);
+
+               LLVMValueRef v4 = emit_data->output[emit_data->chan];
+               LLVMValueRef z = LLVMBuildExtractElement(builder, v4, two, "");
+               z = LLVMBuildSDiv(builder, z, six, "");
+
+               emit_data->output[emit_data->chan] =
+                       LLVMBuildInsertElement(builder, v4, z, two, "");
+       }
+}
 
 static void si_llvm_emit_ddxy(
        const struct lp_build_tgsi_action * action,
@@ -1889,8 +2194,6 @@ static void si_llvm_emit_ddxy(
        emit_data->output[0] = lp_build_gather_values(gallivm, result, 4);
 }
 
-#endif /* HAVE_LLVM >= 0x0304 */
-
 /* Emit one vertex from the geometry shader */
 static void si_llvm_emit_vertex(
        const struct lp_build_tgsi_action *action,
@@ -1899,57 +2202,53 @@ static void si_llvm_emit_vertex(
 {
        struct si_shader_context *si_shader_ctx = si_shader_context(bld_base);
        struct lp_build_context *uint = &bld_base->uint_bld;
-       struct si_shader *shader = &si_shader_ctx->shader->shader;
+       struct si_shader *shader = si_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,
                                            SI_PARAM_GS2VS_OFFSET);
        LLVMValueRef gs_next_vertex;
-       LLVMValueRef t_list_ptr;
-       LLVMValueRef t_list;
+       LLVMValueRef can_emit, kill;
        LLVMValueRef args[2];
        unsigned chan;
        int i;
 
-       /* Load the GSVS ring resource descriptor */
-       t_list_ptr = LLVMGetParam(si_shader_ctx->radeon_bld.main_fn,
-                                 SI_PARAM_RW_BUFFERS);
-       t_list = build_indexed_load(si_shader_ctx, t_list_ptr,
-                                   lp_build_const_int32(gallivm, SI_RING_GSVS));
-
-       if (shader->noutput == 0) {
-               struct tgsi_parse_context *parse = &si_shader_ctx->parse;
-
-               while (!tgsi_parse_end_of_tokens(parse)) {
-                       tgsi_parse_token(parse);
-
-                       if (parse->FullToken.Token.Type == TGSI_TOKEN_TYPE_DECLARATION) {
-                               struct tgsi_full_declaration *d = &parse->FullToken.FullDeclaration;
-
-                               if (d->Declaration.File == TGSI_FILE_OUTPUT)
-                                       si_store_shader_io_attribs(shader, d);
-                       }
-               }
-       }
-
        /* Write vertex attribute values to GSVS ring */
        gs_next_vertex = LLVMBuildLoad(gallivm->builder, si_shader_ctx->gs_next_vertex, "");
-       for (i = 0; i < shader->noutput; i++) {
+
+       /* If this thread has already emitted the declared maximum number of
+        * vertices, kill it: excessive vertex emissions are not supposed to
+        * have any effect, and GS threads have no externally observable
+        * effects other than emitting vertices.
+        */
+       can_emit = LLVMBuildICmp(gallivm->builder, LLVMIntULE, gs_next_vertex,
+                                lp_build_const_int32(gallivm,
+                                                     shader->selector->gs_max_out_vertices), "");
+       kill = lp_build_select(&bld_base->base, can_emit,
+                              lp_build_const_float(gallivm, 1.0f),
+                              lp_build_const_float(gallivm, -1.0f));
+       build_intrinsic(gallivm->builder, "llvm.AMDGPU.kill",
+                       LLVMVoidTypeInContext(gallivm->context), &kill, 1, 0);
+
+       for (i = 0; i < info->num_outputs; i++) {
                LLVMValueRef *out_ptr =
-                       si_shader_ctx->radeon_bld.soa.outputs[shader->output[i].index];
+                       si_shader_ctx->radeon_bld.soa.outputs[i];
 
                for (chan = 0; chan < 4; chan++) {
                        LLVMValueRef out_val = LLVMBuildLoad(gallivm->builder, out_ptr[chan], "");
                        LLVMValueRef voffset =
                                lp_build_const_int32(gallivm, (i * 4 + chan) *
-                                                    shader->gs_max_out_vertices);
+                                                    shader->selector->gs_max_out_vertices);
 
                        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, "");
 
-                       build_tbuffer_store(si_shader_ctx, t_list, out_val, 1,
+                       build_tbuffer_store(si_shader_ctx,
+                                           si_shader_ctx->gsvs_ring,
+                                           out_val, 1,
                                            voffset, soffset, 0,
                                            V_008F0C_BUF_DATA_FORMAT_32,
                                            V_008F0C_BUF_NUM_FORMAT_UINT,
@@ -1989,33 +2288,6 @@ static void si_llvm_emit_primitive(
 static const struct lp_build_tgsi_action tex_action = {
        .fetch_args = tex_fetch_args,
        .emit = build_tex_intrinsic,
-       .intr_name = "llvm.SI.sample."
-};
-
-static const struct lp_build_tgsi_action txb_action = {
-       .fetch_args = tex_fetch_args,
-       .emit = build_tex_intrinsic,
-       .intr_name = "llvm.SI.sampleb."
-};
-
-#if HAVE_LLVM >= 0x0304
-static const struct lp_build_tgsi_action txd_action = {
-       .fetch_args = tex_fetch_args,
-       .emit = build_tex_intrinsic,
-       .intr_name = "llvm.SI.sampled."
-};
-#endif
-
-static const struct lp_build_tgsi_action txf_action = {
-       .fetch_args = tex_fetch_args,
-       .emit = build_tex_intrinsic,
-       .intr_name = "llvm.SI.imageload."
-};
-
-static const struct lp_build_tgsi_action txl_action = {
-       .fetch_args = tex_fetch_args,
-       .emit = build_tex_intrinsic,
-       .intr_name = "llvm.SI.samplel."
 };
 
 static const struct lp_build_tgsi_action txq_action = {
@@ -2036,40 +2308,52 @@ static void create_meta_data(struct si_shader_context *si_shader_ctx)
        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);
+}
+
 static void create_function(struct si_shader_context *si_shader_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 si_pipe_shader *shader = si_shader_ctx->shader;
-       LLVMTypeRef params[SI_NUM_PARAMS], f32, i8, i32, v2i32, v3i32;
-       unsigned i, last_sgpr, num_params;
+       struct si_shader *shader = si_shader_ctx->shader;
+       LLVMTypeRef params[SI_NUM_PARAMS], f32, i8, i32, v2i32, v3i32, v16i8, v4i32, v8i32;
+       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_CONST] = LLVMPointerType(
-               LLVMArrayType(LLVMVectorType(i8, 16), NUM_CONST_BUFFERS), CONST_ADDR_SPACE);
-       params[SI_PARAM_RW_BUFFERS] = params[SI_PARAM_CONST];
-
-       /* We assume at most 16 textures per program at the moment.
-        * This need probably need to be changed to support bindless textures */
-       params[SI_PARAM_SAMPLER] = LLVMPointerType(
-               LLVMArrayType(LLVMVectorType(i8, 16), NUM_SAMPLER_VIEWS), CONST_ADDR_SPACE);
-       params[SI_PARAM_RESOURCE] = LLVMPointerType(
-               LLVMArrayType(LLVMVectorType(i8, 32), NUM_SAMPLER_STATES), CONST_ADDR_SPACE);
+       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) {
        case TGSI_PROCESSOR_VERTEX:
-               params[SI_PARAM_VERTEX_BUFFER] = params[SI_PARAM_CONST];
+               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;
                num_params = SI_PARAM_START_INSTANCE+1;
+
                if (shader->key.vs.as_es) {
                        params[SI_PARAM_ES2GS_OFFSET] = i32;
                        num_params++;
                } else {
+                       if (shader->is_gs_copy_shader) {
+                               last_array_pointer = SI_PARAM_CONST;
+                               num_params = SI_PARAM_CONST+1;
+                       }
+
                        /* The locations of the other parameters are assigned dynamically. */
 
                        /* Streamout SGPRs. */
@@ -2129,7 +2413,7 @@ static void create_function(struct si_shader_context *si_shader_ctx)
                params[SI_PARAM_POS_Z_FLOAT] = f32;
                params[SI_PARAM_POS_W_FLOAT] = f32;
                params[SI_PARAM_FRONT_FACE] = f32;
-               params[SI_PARAM_ANCILLARY] = f32;
+               params[SI_PARAM_ANCILLARY] = i32;
                params[SI_PARAM_SAMPLE_COVERAGE] = f32;
                params[SI_PARAM_POS_FIXED_PT] = f32;
                num_params = SI_PARAM_POS_FIXED_PT+1;
@@ -2144,25 +2428,21 @@ static void create_function(struct si_shader_context *si_shader_ctx)
        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");
+
        for (i = 0; i <= last_sgpr; ++i) {
                LLVMValueRef P = LLVMGetParam(si_shader_ctx->radeon_bld.main_fn, i);
-               switch (i) {
-               default:
-                       LLVMAddAttribute(P, LLVMInRegAttribute);
-                       break;
-#if HAVE_LLVM >= 0x0304
+
                /* We tell llvm that array inputs are passed by value to allow Sinking pass
                 * to move load. Inputs are constant so this is fine. */
-               case SI_PARAM_CONST:
-               case SI_PARAM_SAMPLER:
-               case SI_PARAM_RESOURCE:
+               if (i <= last_array_pointer)
                        LLVMAddAttribute(P, LLVMByValAttribute);
-                       break;
-#endif
-               }
+               else
+                       LLVMAddAttribute(P, LLVMInRegAttribute);
        }
 
-#if HAVE_LLVM >= 0x0304
        if (bld_base->info &&
            (bld_base->info->opcode_count[TGSI_OPCODE_DDX] > 0 ||
             bld_base->info->opcode_count[TGSI_OPCODE_DDY] > 0))
@@ -2171,7 +2451,6 @@ static void create_function(struct si_shader_context *si_shader_ctx)
                                                    LLVMArrayType(i32, 64),
                                                    "ddxy_lds",
                                                    LOCAL_ADDR_SPACE);
-#endif
 }
 
 static void preload_constants(struct si_shader_context *si_shader_ctx)
@@ -2182,7 +2461,7 @@ static void preload_constants(struct si_shader_context *si_shader_ctx)
        unsigned buf;
        LLVMValueRef ptr = LLVMGetParam(si_shader_ctx->radeon_bld.main_fn, SI_PARAM_CONST);
 
-       for (buf = 0; buf < NUM_CONST_BUFFERS; buf++) {
+       for (buf = 0; buf < SI_NUM_CONST_BUFFERS; buf++) {
                unsigned i, num_const = info->const_file_max[buf] + 1;
 
                if (num_const == 0)
@@ -2193,18 +2472,15 @@ static void preload_constants(struct si_shader_context *si_shader_ctx)
 
                /* Load the resource descriptor */
                si_shader_ctx->const_resource[buf] =
-                       build_indexed_load(si_shader_ctx, ptr, lp_build_const_int32(gallivm, buf));
+                       build_indexed_load_const(si_shader_ctx, ptr, lp_build_const_int32(gallivm, buf));
 
                /* Load the constants, we rely on the code sinking to do the rest */
                for (i = 0; i < num_const * 4; ++i) {
-                       LLVMValueRef args[2] = {
-                               si_shader_ctx->const_resource[buf],
-                               lp_build_const_int32(gallivm, i * 4)
-                       };
                        si_shader_ctx->constants[buf][i] =
-                                       build_intrinsic(gallivm->builder, "llvm.SI.load.const",
-                                                       bld_base->base.elem_type, args, 2,
-                                                       LLVMReadNoneAttribute | LLVMNoUnwindAttribute);
+                               buffer_load_const(gallivm->builder,
+                                       si_shader_ctx->const_resource[buf],
+                                       lp_build_const_int32(gallivm, i * 4),
+                                       bld_base->base.elem_type);
                }
        }
 }
@@ -2223,10 +2499,6 @@ static void preload_samplers(struct si_shader_context *si_shader_ctx)
        if (num_samplers == 0)
                return;
 
-       /* Allocate space for the values */
-       si_shader_ctx->resources = CALLOC(NUM_SAMPLER_VIEWS, sizeof(LLVMValueRef));
-       si_shader_ctx->samplers = CALLOC(num_samplers, sizeof(LLVMValueRef));
-
        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);
 
@@ -2234,17 +2506,17 @@ static void preload_samplers(struct si_shader_context *si_shader_ctx)
        for (i = 0; i < num_samplers; ++i) {
                /* Resource */
                offset = lp_build_const_int32(gallivm, i);
-               si_shader_ctx->resources[i] = build_indexed_load(si_shader_ctx, res_ptr, offset);
+               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(si_shader_ctx, samp_ptr, offset);
+               si_shader_ctx->samplers[i] = build_indexed_load_const(si_shader_ctx, samp_ptr, offset);
 
                /* FMASK resource */
                if (info->is_msaa_sampler[i]) {
-                       offset = lp_build_const_int32(gallivm, FMASK_TEX_OFFSET + i);
-                       si_shader_ctx->resources[FMASK_TEX_OFFSET + i] =
-                               build_indexed_load(si_shader_ctx, res_ptr, offset);
+                       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);
                }
        }
 }
@@ -2267,121 +2539,219 @@ static void preload_streamout_buffers(struct si_shader_context *si_shader_ctx)
        for (i = 0; i < 4; ++i) {
                if (si_shader_ctx->shader->selector->so.stride[i]) {
                        LLVMValueRef offset = lp_build_const_int32(gallivm,
-                                                                  SI_RW_SO + i);
+                                                                  SI_SO_BUF_OFFSET + i);
 
-                       si_shader_ctx->so_buffers[i] = build_indexed_load(si_shader_ctx, buf_ptr, offset);
+                       si_shader_ctx->so_buffers[i] = build_indexed_load_const(si_shader_ctx, buf_ptr, offset);
                }
        }
 }
 
-int si_compile_llvm(struct si_context *sctx, struct si_pipe_shader *shader,
-                                                       LLVMModuleRef mod)
+/**
+ * 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)
 {
-       unsigned i;
-       uint32_t *ptr;
-       struct radeon_llvm_binary binary;
-       bool dump = r600_can_dump_shader(&sctx->screen->b,
-                       shader->selector ? shader->selector->tokens : NULL);
-       memset(&binary, 0, sizeof(binary));
-       radeon_llvm_compile(mod, &binary,
-               r600_get_llvm_processor_name(sctx->screen->b.family), dump);
-       if (dump && ! binary.disassembled) {
-               fprintf(stderr, "SI CODE:\n");
-               for (i = 0; i < binary.code_size; i+=4 ) {
-                       fprintf(stderr, "%02x%02x%02x%02x\n", binary.code[i + 3],
-                               binary.code[i + 2], binary.code[i + 1],
-                               binary.code[i]);
-               }
+       struct gallivm_state *gallivm =
+               si_shader_ctx->radeon_bld.soa.bld_base.base.gallivm;
+
+       LLVMValueRef buf_ptr = LLVMGetParam(si_shader_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_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);
+       }
+
+       if (si_shader_ctx->type == TGSI_PROCESSOR_GEOMETRY ||
+           si_shader_ctx->shader->is_gs_copy_shader) {
+               LLVMValueRef offset = lp_build_const_int32(gallivm, SI_RING_GSVS);
+
+               si_shader_ctx->gsvs_ring =
+                       build_indexed_load_const(si_shader_ctx, buf_ptr, offset);
        }
+}
+
+void si_shader_binary_read_config(const struct si_screen *sscreen,
+                               struct si_shader *shader,
+                               unsigned symbol_offset)
+{
+       unsigned i;
+       const unsigned char *config =
+               radeon_shader_binary_config_start(&shader->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 < binary.config_size; i+= 8) {
-               unsigned reg = util_le32_to_cpu(*(uint32_t*)(binary.config + i));
-               unsigned value = util_le32_to_cpu(*(uint32_t*)(binary.config + i + 4));
+
+       for (i = 0; i < shader->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) {
                case R_00B028_SPI_SHADER_PGM_RSRC1_PS:
                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 = (G_00B028_SGPRS(value) + 1) * 8;
-                       shader->num_vgprs = (G_00B028_VGPRS(value) + 1) * 4;
+                       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);
                        break;
                case R_00B02C_SPI_SHADER_PGM_RSRC2_PS:
-                       shader->lds_size = G_00B02C_EXTRA_LDS_SIZE(value);
+                       shader->lds_size = MAX2(shader->lds_size, G_00B02C_EXTRA_LDS_SIZE(value));
                        break;
                case R_00B84C_COMPUTE_PGM_RSRC2:
-                       shader->lds_size = G_00B84C_LDS_SIZE(value);
+                       shader->lds_size = MAX2(shader->lds_size, G_00B84C_LDS_SIZE(value));
                        break;
                case R_0286CC_SPI_PS_INPUT_ENA:
                        shader->spi_ps_input_ena = value;
                        break;
+               case R_0286E8_SPI_TMPRING_SIZE:
+               case R_00B860_COMPUTE_TMPRING_SIZE:
+                       /* WAVESIZE is in units of 256 dwords. */
+                       shader->scratch_bytes_per_wave =
+                               G_00B860_WAVESIZE(value) * 256 * 4 * 1;
+                       break;
                default:
                        fprintf(stderr, "Warning: Compiler emitted unknown "
                                "config register: 0x%x\n", reg);
                        break;
                }
        }
+}
+
+void si_shader_apply_scratch_relocs(struct si_context *sctx,
+                       struct si_shader *shader,
+                       uint64_t scratch_va)
+{
+       unsigned i;
+       uint32_t scratch_rsrc_dword0 = scratch_va & 0xffffffff;
+       uint32_t scratch_rsrc_dword1 =
+               S_008F04_BASE_ADDRESS_HI(scratch_va >> 32)
+               |  S_008F04_STRIDE(shader->scratch_bytes_per_wave / 64);
+
+       for (i = 0 ; i < shader->binary.reloc_count; i++) {
+               const struct radeon_shader_reloc *reloc =
+                                       &shader->binary.relocs[i];
+               if (!strcmp(scratch_rsrc_dword0_symbol, reloc->name)) {
+                       util_memcpy_cpu_to_le32(shader->binary.code + reloc->offset,
+                       &scratch_rsrc_dword0, 4);
+               } else if (!strcmp(scratch_rsrc_dword1_symbol, reloc->name)) {
+                       util_memcpy_cpu_to_le32(shader->binary.code + reloc->offset,
+                       &scratch_rsrc_dword1, 4);
+               }
+       }
+}
+
+int si_shader_binary_read(struct si_screen *sscreen,
+                       struct si_shader *shader,
+                       const struct radeon_shader_binary *binary)
+{
+
+       unsigned i;
+       unsigned code_size;
+       unsigned char *ptr;
+       bool dump  = r600_can_dump_shader(&sscreen->b,
+               shader->selector ? shader->selector->tokens : NULL);
+
+       si_shader_binary_read_config(sscreen, shader, 0);
+
+       if (dump) {
+               if (!binary->disassembled) {
+                       fprintf(stderr, "SI CODE:\n");
+                       for (i = 0; i < binary->code_size; i+=4 ) {
+                               fprintf(stderr, "@0x%x: %02x%02x%02x%02x\n", i, binary->code[i + 3],
+                               binary->code[i + 2], binary->code[i + 1],
+                               binary->code[i]);
+                       }
+               }
+
+               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);
+       }
 
        /* copy new shader */
+       code_size = binary->code_size + binary->rodata_size;
        r600_resource_reference(&shader->bo, NULL);
-       shader->bo = si_resource_create_custom(sctx->b.b.screen, PIPE_USAGE_IMMUTABLE,
-                                              binary.code_size);
+       shader->bo = si_resource_create_custom(&sscreen->b.b, PIPE_USAGE_IMMUTABLE,
+                                              code_size);
        if (shader->bo == NULL) {
                return -ENOMEM;
        }
 
-       ptr = (uint32_t*)sctx->b.ws->buffer_map(shader->bo->cs_buf, sctx->b.rings.gfx.cs, PIPE_TRANSFER_WRITE);
-       if (0 /*SI_BIG_ENDIAN*/) {
-               for (i = 0; i < binary.code_size / 4; ++i) {
-                       ptr[i] = util_bswap32(*(uint32_t*)(binary.code + i*4));
-               }
-       } else {
-               memcpy(ptr, binary.code, binary.code_size);
+
+       ptr = sscreen->b.ws->buffer_map(shader->bo->cs_buf, NULL, PIPE_TRANSFER_READ_WRITE);
+       util_memcpy_cpu_to_le32(ptr, binary->code, binary->code_size);
+       if (binary->rodata_size > 0) {
+               ptr += binary->code_size;
+               util_memcpy_cpu_to_le32(ptr, binary->rodata, binary->rodata_size);
        }
-       sctx->b.ws->buffer_unmap(shader->bo->cs_buf);
 
-       free(binary.code);
-       free(binary.config);
+       sscreen->b.ws->buffer_unmap(shader->bo->cs_buf);
 
        return 0;
 }
 
+int si_compile_llvm(struct si_screen *sscreen, struct si_shader *shader,
+                   LLVMTargetMachineRef tm, LLVMModuleRef mod)
+{
+       int r = 0;
+       bool dump = r600_can_dump_shader(&sscreen->b,
+                       shader->selector ? shader->selector->tokens : NULL);
+       r = radeon_llvm_compile(mod, &shader->binary,
+               r600_get_llvm_processor_name(sscreen->b.family), dump, tm);
+
+       if (r) {
+               return r;
+       }
+       r = si_shader_binary_read(sscreen, shader, &shader->binary);
+
+       FREE(shader->binary.config);
+       FREE(shader->binary.rodata);
+       FREE(shader->binary.global_symbol_offsets);
+       if (shader->scratch_bytes_per_wave == 0) {
+               FREE(shader->binary.code);
+               FREE(shader->binary.relocs);
+               memset(&shader->binary, 0, sizeof(shader->binary));
+       }
+       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_context *sctx,
+static int si_generate_gs_copy_shader(struct si_screen *sscreen,
                                      struct si_shader_context *si_shader_ctx,
-                                     bool dump)
+                                     struct si_shader *gs, bool dump)
 {
        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 lp_build_context *uint = &bld_base->uint_bld;
-       struct si_shader *shader = &si_shader_ctx->shader->shader;
-       struct si_shader *gs = &si_shader_ctx->shader->selector->current->shader;
+       struct si_shader *shader = si_shader_ctx->shader;
        struct si_shader_output_values *outputs;
-       LLVMValueRef t_list_ptr, t_list;
+       struct tgsi_shader_info *gsinfo = &gs->selector->info;
        LLVMValueRef args[9];
        int i, r;
 
-       outputs = MALLOC(gs->noutput * sizeof(outputs[0]));
+       outputs = MALLOC(gsinfo->num_outputs * sizeof(outputs[0]));
 
        si_shader_ctx->type = TGSI_PROCESSOR_VERTEX;
-       si_shader_ctx->gs_for_vs = gs;
+       shader->is_gs_copy_shader = true;
 
        radeon_llvm_context_init(&si_shader_ctx->radeon_bld);
 
        create_meta_data(si_shader_ctx);
        create_function(si_shader_ctx);
        preload_streamout_buffers(si_shader_ctx);
+       preload_ring_buffers(si_shader_ctx);
 
-       /* Load the GSVS ring resource descriptor */
-       t_list_ptr = LLVMGetParam(si_shader_ctx->radeon_bld.main_fn,
-                                 SI_PARAM_RW_BUFFERS);
-       t_list = build_indexed_load(si_shader_ctx, t_list_ptr,
-                                   lp_build_const_int32(gallivm, SI_RING_GSVS));
-
-       args[0] = t_list;
+       args[0] = si_shader_ctx->gsvs_ring;
        args[1] = lp_build_mul_imm(uint,
                                   LLVMGetParam(si_shader_ctx->radeon_bld.main_fn,
                                                si_shader_ctx->param_vertex_id),
@@ -2394,21 +2764,16 @@ static int si_generate_gs_copy_shader(struct si_context *sctx,
        args[8] = uint->zero; /* TFE */
 
        /* Fetch vertex data from GSVS ring */
-       for (i = 0; i < gs->noutput; ++i) {
-               struct si_shader_output *out = gs->output + i;
+       for (i = 0; i < gsinfo->num_outputs; ++i) {
                unsigned chan;
 
-               shader->output[i] = *out;
-
-               outputs[i].name = out->name;
-               outputs[i].index = out->index;
-               outputs[i].sid = out->sid;
-               outputs[i].usage = out->usage;
+               outputs[i].name = gsinfo->output_semantic_name[i];
+               outputs[i].sid = gsinfo->output_semantic_index[i];
 
                for (chan = 0; chan < 4; chan++) {
                        args[2] = lp_build_const_int32(gallivm,
                                                       (i * 4 + chan) *
-                                                      gs->gs_max_out_vertices * 16 * 4);
+                                                      gs->selector->gs_max_out_vertices * 16 * 4);
 
                        outputs[i].values[chan] =
                                LLVMBuildBitCast(gallivm->builder,
@@ -2420,17 +2785,16 @@ static int si_generate_gs_copy_shader(struct si_context *sctx,
                                                 base->elem_type, "");
                }
        }
-       shader->noutput = gs->noutput;
 
-       si_llvm_export_vs(bld_base, outputs, gs->noutput);
+       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(sctx, si_shader_ctx->shader,
-                           bld_base->base.gallivm->module);
+       r = si_compile_llvm(sscreen, si_shader_ctx->shader,
+                           si_shader_ctx->tm, bld_base->base.gallivm->module);
 
        radeon_llvm_dispose(&si_shader_ctx->radeon_bld);
 
@@ -2438,100 +2802,146 @@ static int si_generate_gs_copy_shader(struct si_context *sctx,
        return r;
 }
 
-int si_pipe_shader_create(
-       struct pipe_context *ctx,
-       struct si_pipe_shader *shader)
+static void si_dump_key(unsigned shader, union si_shader_key *key)
 {
-       struct si_context *sctx = (struct si_context*)ctx;
-       struct si_pipe_shader_selector *sel = shader->selector;
+       int i;
+
+       fprintf(stderr, "SHADER KEY\n");
+
+       switch (shader) {
+       case PIPE_SHADER_VERTEX:
+               fprintf(stderr, "  instance_divisors = {");
+               for (i = 0; i < Elements(key->vs.instance_divisors); i++)
+                       fprintf(stderr, !i ? "%u" : ", %u",
+                               key->vs.instance_divisors[i]);
+               fprintf(stderr, "}\n");
+
+               if (key->vs.as_es)
+                       fprintf(stderr, "  gs_used_inputs = 0x%"PRIx64"\n",
+                               key->vs.gs_used_inputs);
+               fprintf(stderr, "  as_es = %u\n", key->vs.as_es);
+               break;
+
+       case PIPE_SHADER_GEOMETRY:
+               break;
+
+       case PIPE_SHADER_FRAGMENT:
+               fprintf(stderr, "  export_16bpc = 0x%X\n", key->ps.export_16bpc);
+               fprintf(stderr, "  last_cbuf = %u\n", key->ps.last_cbuf);
+               fprintf(stderr, "  color_two_side = %u\n", key->ps.color_two_side);
+               fprintf(stderr, "  alpha_func = %u\n", key->ps.alpha_func);
+               fprintf(stderr, "  alpha_to_one = %u\n", key->ps.alpha_to_one);
+               fprintf(stderr, "  poly_stipple = %u\n", key->ps.poly_stipple);
+               break;
+
+       default:
+               assert(0);
+       }
+}
+
+int si_shader_create(struct si_screen *sscreen, LLVMTargetMachineRef tm,
+                    struct si_shader *shader)
+{
+       struct si_shader_selector *sel = shader->selector;
+       struct tgsi_token *tokens = sel->tokens;
        struct si_shader_context si_shader_ctx;
-       struct tgsi_shader_info shader_info;
        struct lp_build_tgsi_context * bld_base;
+       struct tgsi_shader_info stipple_shader_info;
        LLVMModuleRef mod;
        int r = 0;
-       bool dump = r600_can_dump_shader(&sctx->screen->b, sel->tokens);
+       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) {
-               tgsi_dump(sel->tokens, 0);
+               si_dump_key(sel->type, &shader->key);
+               tgsi_dump(tokens, 0);
                si_dump_streamout(&sel->so);
        }
 
-       assert(shader->shader.noutput == 0);
-       assert(shader->shader.nparam == 0);
-       assert(shader->shader.ninput == 0);
+       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;
 
-       tgsi_scan_shader(sel->tokens, &shader_info);
+       if (sel->type != PIPE_SHADER_COMPUTE)
+               shader->dx10_clamp_mode = true;
 
-       shader->shader.uses_kill = shader_info.uses_kill;
-       shader->shader.uses_instanceid = shader_info.uses_instanceid;
-       bld_base->info = &shader_info;
+       if (sel->info.uses_kill)
+               shader->db_shader_control |= S_02880C_KILL_ENABLE(1);
+
+       shader->uses_instanceid = sel->info.uses_instanceid;
+       bld_base->info = poly_stipple ? &stipple_shader_info : &sel->info;
        bld_base->emit_fetch_funcs[TGSI_FILE_CONSTANT] = fetch_constant;
 
        bld_base->op_actions[TGSI_OPCODE_TEX] = tex_action;
-       bld_base->op_actions[TGSI_OPCODE_TXB] = txb_action;
-#if HAVE_LLVM >= 0x0304
-       bld_base->op_actions[TGSI_OPCODE_TXD] = txd_action;
-#endif
-       bld_base->op_actions[TGSI_OPCODE_TXF] = txf_action;
-       bld_base->op_actions[TGSI_OPCODE_TXL] = txl_action;
+       bld_base->op_actions[TGSI_OPCODE_TEX2] = tex_action;
+       bld_base->op_actions[TGSI_OPCODE_TXB] = tex_action;
+       bld_base->op_actions[TGSI_OPCODE_TXB2] = tex_action;
+       bld_base->op_actions[TGSI_OPCODE_TXD] = tex_action;
+       bld_base->op_actions[TGSI_OPCODE_TXF] = tex_action;
+       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_TG4] = tex_action;
+       bld_base->op_actions[TGSI_OPCODE_LODQ] = tex_action;
 
-#if HAVE_LLVM >= 0x0304
        bld_base->op_actions[TGSI_OPCODE_DDX].emit = si_llvm_emit_ddxy;
        bld_base->op_actions[TGSI_OPCODE_DDY].emit = si_llvm_emit_ddxy;
-#endif
 
        bld_base->op_actions[TGSI_OPCODE_EMIT].emit = si_llvm_emit_vertex;
        bld_base->op_actions[TGSI_OPCODE_ENDPRIM].emit = si_llvm_emit_primitive;
 
+       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";
+       }
+
        si_shader_ctx.radeon_bld.load_system_value = declare_system_value;
-       si_shader_ctx.tokens = sel->tokens;
-       tgsi_parse_init(&si_shader_ctx.parse, si_shader_ctx.tokens);
        si_shader_ctx.shader = shader;
-       si_shader_ctx.type = si_shader_ctx.parse.FullHeader.Processor.Processor;
+       si_shader_ctx.type = tgsi_get_processor_type(tokens);
+       si_shader_ctx.screen = sscreen;
+       si_shader_ctx.tm = tm;
 
        switch (si_shader_ctx.type) {
        case TGSI_PROCESSOR_VERTEX:
                si_shader_ctx.radeon_bld.load_input = declare_input_vs;
                if (shader->key.vs.as_es) {
-                       si_shader_ctx.gs_for_vs = &sctx->gs_shader->current->shader;
                        bld_base->emit_epilogue = si_llvm_emit_es_epilogue;
                } else {
                        bld_base->emit_epilogue = si_llvm_emit_vs_epilogue;
                }
                break;
-       case TGSI_PROCESSOR_GEOMETRY: {
-               int i;
-
-               si_shader_ctx.radeon_bld.load_input = declare_input_gs;
+       case TGSI_PROCESSOR_GEOMETRY:
                bld_base->emit_fetch_funcs[TGSI_FILE_INPUT] = fetch_input_gs;
                bld_base->emit_epilogue = si_llvm_emit_gs_epilogue;
-
-               for (i = 0; i < shader_info.num_properties; i++) {
-                       switch (shader_info.properties[i].name) {
-                       case TGSI_PROPERTY_GS_INPUT_PRIM:
-                               shader->shader.gs_input_prim = shader_info.properties[i].data[0];
-                               break;
-                       case TGSI_PROPERTY_GS_OUTPUT_PRIM:
-                               shader->shader.gs_output_prim = shader_info.properties[i].data[0];
-                               break;
-                       case TGSI_PROPERTY_GS_MAX_OUTPUT_VERTICES:
-                               shader->shader.gs_max_out_vertices = shader_info.properties[i].data[0];
-                               break;
-                       }
-               }
                break;
-       }
        case TGSI_PROCESSOR_FRAGMENT:
                si_shader_ctx.radeon_bld.load_input = declare_input_fs;
                bld_base->emit_epilogue = si_llvm_emit_fs_epilogue;
+
+               switch (sel->info.properties[TGSI_PROPERTY_FS_DEPTH_LAYOUT]) {
+               case TGSI_FS_DEPTH_LAYOUT_GREATER:
+                       shader->db_shader_control |=
+                               S_02880C_CONSERVATIVE_Z_EXPORT(V_02880C_EXPORT_GREATER_THAN_Z);
+                       break;
+               case TGSI_FS_DEPTH_LAYOUT_LESS:
+                       shader->db_shader_control |=
+                               S_02880C_CONSERVATIVE_Z_EXPORT(V_02880C_EXPORT_LESS_THAN_Z);
+                       break;
+               }
                break;
        default:
                assert(!"Unsupported shader type");
@@ -2543,6 +2953,7 @@ int si_pipe_shader_create(
        preload_constants(&si_shader_ctx);
        preload_samplers(&si_shader_ctx);
        preload_streamout_buffers(&si_shader_ctx);
+       preload_ring_buffers(&si_shader_ctx);
 
        if (si_shader_ctx.type == TGSI_PROCESSOR_GEOMETRY) {
                si_shader_ctx.gs_next_vertex =
@@ -2550,7 +2961,7 @@ int si_pipe_shader_create(
                                        bld_base->uint_bld.elem_type, "");
        }
 
-       if (!lp_build_tgsi_llvm(bld_base, sel->tokens)) {
+       if (!lp_build_tgsi_llvm(bld_base, tokens)) {
                fprintf(stderr, "Failed to translate shader from TGSI to LLVM\n");
                goto out;
        }
@@ -2558,7 +2969,7 @@ int si_pipe_shader_create(
        radeon_llvm_finalize_module(&si_shader_ctx.radeon_bld);
 
        mod = bld_base->base.gallivm->module;
-       r = si_compile_llvm(sctx, shader, mod);
+       r = si_compile_llvm(sscreen, shader, tm, mod);
        if (r) {
                fprintf(stderr, "LLVM failed to compile shader\n");
                goto out;
@@ -2567,29 +2978,36 @@ int si_pipe_shader_create(
        radeon_llvm_dispose(&si_shader_ctx.radeon_bld);
 
        if (si_shader_ctx.type == TGSI_PROCESSOR_GEOMETRY) {
-               shader->gs_copy_shader = CALLOC_STRUCT(si_pipe_shader);
+               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(sctx, &si_shader_ctx, dump))) {
+               if ((r = si_generate_gs_copy_shader(sscreen, &si_shader_ctx,
+                                                   shader, dump))) {
                        free(shader->gs_copy_shader);
                        shader->gs_copy_shader = NULL;
                        goto out;
                }
        }
 
-       tgsi_parse_free(&si_shader_ctx.parse);
-
 out:
-       for (int i = 0; i < NUM_CONST_BUFFERS; i++)
+       for (int i = 0; i < SI_NUM_CONST_BUFFERS; i++)
                FREE(si_shader_ctx.constants[i]);
-       FREE(si_shader_ctx.resources);
-       FREE(si_shader_ctx.samplers);
-
+       if (poly_stipple)
+               tgsi_free_tokens(tokens);
        return r;
 }
 
-void si_pipe_shader_destroy(struct pipe_context *ctx, struct si_pipe_shader *shader)
+void si_shader_destroy(struct pipe_context *ctx, struct si_shader *shader)
 {
+       if (shader->gs_copy_shader)
+               si_shader_destroy(ctx, 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);
 }