radeonsi: don't emit unnecessary NULL exports for unbound targets (v3)
[mesa.git] / src / gallium / drivers / radeonsi / si_shader.c
index 1db3e4849157a95c9e58cbf6304ba0495bd74c06..34b84eb81d9d02eef8ade73abc3ef871ce4d3561 100644 (file)
@@ -68,6 +68,7 @@ struct si_shader_context
        struct si_shader *shader;
        struct si_screen *screen;
        unsigned type; /* TGSI_PROCESSOR_* specifies the type of shader. */
+       bool is_gs_copy_shader;
        int param_streamout_config;
        int param_streamout_write_index;
        int param_streamout_offset[4];
@@ -85,8 +86,9 @@ struct si_shader_context
        LLVMValueRef const_buffers[SI_NUM_CONST_BUFFERS];
        LLVMValueRef lds;
        LLVMValueRef *constants[SI_NUM_CONST_BUFFERS];
-       LLVMValueRef sampler_views[SI_NUM_SAMPLER_VIEWS];
-       LLVMValueRef sampler_states[SI_NUM_SAMPLER_STATES];
+       LLVMValueRef sampler_views[SI_NUM_SAMPLERS];
+       LLVMValueRef sampler_states[SI_NUM_SAMPLERS];
+       LLVMValueRef fmasks[SI_NUM_USER_SAMPLERS];
        LLVMValueRef so_buffers[4];
        LLVMValueRef esgs_ring;
        LLVMValueRef gsvs_ring[4];
@@ -832,14 +834,11 @@ static int lookup_interp_param_index(unsigned interpolate, unsigned location)
 }
 
 /* This shouldn't be used by explicit INTERP opcodes. */
-static LLVMValueRef get_interp_param(struct si_shader_context *si_shader_ctx,
-                                    unsigned param)
+static unsigned select_interp_param(struct si_shader_context *si_shader_ctx,
+                                   unsigned param)
 {
-       struct gallivm_state *gallivm = &si_shader_ctx->radeon_bld.gallivm;
-       unsigned sample_param = 0;
-       LLVMValueRef default_ij, sample_ij, force_sample;
-
-       default_ij = LLVMGetParam(si_shader_ctx->radeon_bld.main_fn, param);
+       if (!si_shader_ctx->shader->key.ps.force_persample_interp)
+               return param;
 
        /* If the shader doesn't use center/centroid, just return the parameter.
         *
@@ -849,109 +848,52 @@ static LLVMValueRef get_interp_param(struct si_shader_context *si_shader_ctx,
        switch (param) {
        case SI_PARAM_PERSP_CENTROID:
        case SI_PARAM_PERSP_CENTER:
-               if (!si_shader_ctx->shader->selector->forces_persample_interp_for_persp)
-                       return default_ij;
-
-               sample_param = SI_PARAM_PERSP_SAMPLE;
-               break;
+               return SI_PARAM_PERSP_SAMPLE;
 
        case SI_PARAM_LINEAR_CENTROID:
        case SI_PARAM_LINEAR_CENTER:
-               if (!si_shader_ctx->shader->selector->forces_persample_interp_for_linear)
-                       return default_ij;
-
-               sample_param = SI_PARAM_LINEAR_SAMPLE;
-               break;
+               return SI_PARAM_LINEAR_SAMPLE;
 
        default:
-               return default_ij;
+               return param;
        }
-
-       /* Otherwise, we have to select (i,j) based on a user data SGPR. */
-       sample_ij = LLVMGetParam(si_shader_ctx->radeon_bld.main_fn, sample_param);
-
-       /* TODO: this can be done more efficiently by switching between
-        * 2 prologs.
-        */
-       force_sample = LLVMGetParam(si_shader_ctx->radeon_bld.main_fn,
-                                   SI_PARAM_PS_STATE_BITS);
-       force_sample = LLVMBuildTrunc(gallivm->builder, force_sample,
-                                     LLVMInt1TypeInContext(gallivm->context), "");
-       return LLVMBuildSelect(gallivm->builder, force_sample,
-                              sample_ij, default_ij, "");
 }
 
-static void declare_input_fs(
-       struct radeon_llvm_context *radeon_bld,
-       unsigned input_index,
-       const struct tgsi_full_declaration *decl)
+/**
+ * Interpolate a fragment shader input.
+ *
+ * @param si_shader_ctx                context
+ * @param input_index          index of the input in hardware
+ * @param semantic_name                TGSI_SEMANTIC_*
+ * @param semantic_index       semantic index
+ * @param num_interp_inputs    number of all interpolated inputs (= BCOLOR offset)
+ * @param colors_read_mask     color components read (4 bits for each color, 8 bits in total)
+ * @param interp_param         interpolation weights (i,j)
+ * @param prim_mask            SI_PARAM_PRIM_MASK
+ * @param face                 SI_PARAM_FRONT_FACE
+ * @param result               the return value (4 components)
+ */
+static void interp_fs_input(struct si_shader_context *si_shader_ctx,
+                           unsigned input_index,
+                           unsigned semantic_name,
+                           unsigned semantic_index,
+                           unsigned num_interp_inputs,
+                           unsigned colors_read_mask,
+                           LLVMValueRef interp_param,
+                           LLVMValueRef prim_mask,
+                           LLVMValueRef face,
+                           LLVMValueRef result[4])
 {
-       struct lp_build_context *base = &radeon_bld->soa.bld_base.base;
-       struct si_shader_context *si_shader_ctx =
-               si_shader_context(&radeon_bld->soa.bld_base);
-       struct si_shader *shader = si_shader_ctx->shader;
-       struct lp_build_context *uint = &radeon_bld->soa.bld_base.uint_bld;
+       struct lp_build_context *base = &si_shader_ctx->radeon_bld.soa.bld_base.base;
+       struct lp_build_context *uint = &si_shader_ctx->radeon_bld.soa.bld_base.uint_bld;
        struct gallivm_state *gallivm = base->gallivm;
        LLVMTypeRef input_type = LLVMFloatTypeInContext(gallivm->context);
-       LLVMValueRef main_fn = radeon_bld->main_fn;
-
-       LLVMValueRef interp_param = NULL;
-       int interp_param_idx;
        const char * intr_name;
-
-       /* This value is:
-        * [15:0] NewPrimMask (Bit mask for each quad.  It is set it the
-        *                     quad begins a new primitive.  Bit 0 always needs
-        *                     to be unset)
-        * [32:16] ParamOffset
-        *
-        */
-       LLVMValueRef params = LLVMGetParam(main_fn, SI_PARAM_PRIM_MASK);
        LLVMValueRef attr_number;
 
        unsigned chan;
 
-       if (decl->Semantic.Name == TGSI_SEMANTIC_POSITION) {
-               for (chan = 0; chan < TGSI_NUM_CHANNELS; chan++) {
-                       unsigned soa_index =
-                               radeon_llvm_reg_index_soa(input_index, chan);
-                       radeon_bld->inputs[soa_index] =
-                               LLVMGetParam(main_fn, SI_PARAM_POS_X_FLOAT + chan);
-
-                       if (chan == 3)
-                               /* RCP for fragcoord.w */
-                               radeon_bld->inputs[soa_index] =
-                                       LLVMBuildFDiv(gallivm->builder,
-                                                     lp_build_const_float(gallivm, 1.0f),
-                                                     radeon_bld->inputs[soa_index],
-                                                     "");
-               }
-               return;
-       }
-
-       if (decl->Semantic.Name == TGSI_SEMANTIC_FACE) {
-               radeon_bld->inputs[radeon_llvm_reg_index_soa(input_index, 0)] =
-                       LLVMGetParam(main_fn, SI_PARAM_FRONT_FACE);
-               radeon_bld->inputs[radeon_llvm_reg_index_soa(input_index, 1)] =
-               radeon_bld->inputs[radeon_llvm_reg_index_soa(input_index, 2)] =
-                       lp_build_const_float(gallivm, 0.0f);
-               radeon_bld->inputs[radeon_llvm_reg_index_soa(input_index, 3)] =
-                       lp_build_const_float(gallivm, 1.0f);
-
-               return;
-       }
-
-       shader->ps_input_param_offset[input_index] = shader->nparam++;
-       attr_number = lp_build_const_int32(gallivm,
-                                          shader->ps_input_param_offset[input_index]);
-
-       shader->ps_input_interpolate[input_index] = decl->Interp.Interpolate;
-       interp_param_idx = lookup_interp_param_index(decl->Interp.Interpolate,
-                                                    decl->Interp.Location);
-       if (interp_param_idx == -1)
-               return;
-       else if (interp_param_idx)
-               interp_param = get_interp_param(si_shader_ctx, interp_param_idx);
+       attr_number = lp_build_const_int32(gallivm, input_index);
 
        /* fs.constant returns the param from the middle vertex, so it's not
         * really useful for flat shading. It's meant to be used for custom
@@ -965,26 +907,28 @@ static void declare_input_fs(
         */
        intr_name = interp_param ? "llvm.SI.fs.interp" : "llvm.SI.fs.constant";
 
-       if (decl->Semantic.Name == TGSI_SEMANTIC_COLOR &&
+       if (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->ps_input_param_offset[input_index] + 1);
+               LLVMValueRef is_face_positive;
+               LLVMValueRef back_attr_number;
+
+               /* If BCOLOR0 is used, BCOLOR1 is at offset "num_inputs + 1",
+                * otherwise it's at offset "num_inputs".
+                */
+               unsigned back_attr_offset = num_interp_inputs;
+               if (semantic_index == 1 && colors_read_mask & 0xf)
+                       back_attr_offset += 1;
 
-               face = LLVMGetParam(main_fn, SI_PARAM_FRONT_FACE);
+               back_attr_number = lp_build_const_int32(gallivm, back_attr_offset);
 
-               is_face_positive = LLVMBuildFCmp(gallivm->builder,
-                                                LLVMRealOGT, face,
-                                                lp_build_const_float(gallivm, 0.0f),
-                                                "");
+               is_face_positive = LLVMBuildICmp(gallivm->builder, LLVMIntNE,
+                                                face, uint->zero, "");
 
-               args[2] = params;
+               args[2] = prim_mask;
                args[3] = interp_param;
                for (chan = 0; chan < TGSI_NUM_CHANNELS; chan++) {
                        LLVMValueRef llvm_chan = lp_build_const_int32(gallivm, chan);
-                       unsigned soa_index = radeon_llvm_reg_index_soa(input_index, chan);
                        LLVMValueRef front, back;
 
                        args[0] = llvm_chan;
@@ -998,48 +942,71 @@ static void declare_input_fs(
                                               input_type, args, args[3] ? 4 : 3,
                                               LLVMReadNoneAttribute | LLVMNoUnwindAttribute);
 
-                       radeon_bld->inputs[soa_index] =
-                               LLVMBuildSelect(gallivm->builder,
+                       result[chan] = LLVMBuildSelect(gallivm->builder,
                                                is_face_positive,
                                                front,
                                                back,
                                                "");
                }
-
-               shader->nparam++;
-       } else if (decl->Semantic.Name == TGSI_SEMANTIC_FOG) {
+       } else if (semantic_name == TGSI_SEMANTIC_FOG) {
                LLVMValueRef args[4];
 
                args[0] = uint->zero;
                args[1] = attr_number;
-               args[2] = params;
+               args[2] = prim_mask;
                args[3] = interp_param;
-               radeon_bld->inputs[radeon_llvm_reg_index_soa(input_index, 0)] =
-                       lp_build_intrinsic(gallivm->builder, intr_name,
+               result[0] = lp_build_intrinsic(gallivm->builder, intr_name,
                                        input_type, args, args[3] ? 4 : 3,
                                        LLVMReadNoneAttribute | LLVMNoUnwindAttribute);
-               radeon_bld->inputs[radeon_llvm_reg_index_soa(input_index, 1)] =
-               radeon_bld->inputs[radeon_llvm_reg_index_soa(input_index, 2)] =
-                       lp_build_const_float(gallivm, 0.0f);
-               radeon_bld->inputs[radeon_llvm_reg_index_soa(input_index, 3)] =
-                       lp_build_const_float(gallivm, 1.0f);
+               result[1] =
+               result[2] = lp_build_const_float(gallivm, 0.0f);
+               result[3] = lp_build_const_float(gallivm, 1.0f);
        } else {
                for (chan = 0; chan < TGSI_NUM_CHANNELS; chan++) {
                        LLVMValueRef args[4];
                        LLVMValueRef llvm_chan = lp_build_const_int32(gallivm, chan);
-                       unsigned soa_index = radeon_llvm_reg_index_soa(input_index, chan);
+
                        args[0] = llvm_chan;
                        args[1] = attr_number;
-                       args[2] = params;
+                       args[2] = prim_mask;
                        args[3] = interp_param;
-                       radeon_bld->inputs[soa_index] =
-                               lp_build_intrinsic(gallivm->builder, intr_name,
+                       result[chan] = lp_build_intrinsic(gallivm->builder, intr_name,
                                                input_type, args, args[3] ? 4 : 3,
                                                LLVMReadNoneAttribute | LLVMNoUnwindAttribute);
                }
        }
 }
 
+static void declare_input_fs(
+       struct radeon_llvm_context *radeon_bld,
+       unsigned input_index,
+       const struct tgsi_full_declaration *decl)
+{
+       struct si_shader_context *si_shader_ctx =
+               si_shader_context(&radeon_bld->soa.bld_base);
+       struct si_shader *shader = si_shader_ctx->shader;
+       LLVMValueRef main_fn = radeon_bld->main_fn;
+       LLVMValueRef interp_param = NULL;
+       int interp_param_idx;
+
+       interp_param_idx = lookup_interp_param_index(decl->Interp.Interpolate,
+                                                    decl->Interp.Location);
+       if (interp_param_idx == -1)
+               return;
+       else if (interp_param_idx) {
+               interp_param_idx = select_interp_param(si_shader_ctx,
+                                                      interp_param_idx);
+               interp_param = LLVMGetParam(main_fn, interp_param_idx);
+       }
+
+       interp_fs_input(si_shader_ctx, input_index, decl->Semantic.Name,
+                       decl->Semantic.Index, shader->selector->info.num_inputs,
+                       shader->selector->info.colors_read, interp_param,
+                       LLVMGetParam(main_fn, SI_PARAM_PRIM_MASK),
+                       LLVMGetParam(main_fn, SI_PARAM_FRONT_FACE),
+                       &radeon_bld->inputs[radeon_llvm_reg_index_soa(input_index, 0)]);
+}
+
 static LLVMValueRef get_sample_id(struct radeon_llvm_context *radeon_bld)
 {
        return unpack_param(si_shader_context(&radeon_bld->soa.bld_base),
@@ -1091,7 +1058,6 @@ static void declare_system_value(
        struct si_shader_context *si_shader_ctx =
                si_shader_context(&radeon_bld->soa.bld_base);
        struct lp_build_context *bld = &radeon_bld->soa.bld_base.base;
-       struct lp_build_context *uint_bld = &radeon_bld->soa.bld_base.uint_bld;
        struct gallivm_state *gallivm = &radeon_bld->gallivm;
        LLVMValueRef value = 0;
 
@@ -1129,21 +1095,48 @@ static void declare_system_value(
                        assert(!"INVOCATIONID not implemented");
                break;
 
+       case TGSI_SEMANTIC_POSITION:
+       {
+               LLVMValueRef pos[4] = {
+                       LLVMGetParam(radeon_bld->main_fn, SI_PARAM_POS_X_FLOAT),
+                       LLVMGetParam(radeon_bld->main_fn, SI_PARAM_POS_Y_FLOAT),
+                       LLVMGetParam(radeon_bld->main_fn, SI_PARAM_POS_Z_FLOAT),
+                       lp_build_emit_llvm_unary(&radeon_bld->soa.bld_base, TGSI_OPCODE_RCP,
+                                                LLVMGetParam(radeon_bld->main_fn,
+                                                             SI_PARAM_POS_W_FLOAT)),
+               };
+               value = lp_build_gather_values(gallivm, pos, 4);
+               break;
+       }
+
+       case TGSI_SEMANTIC_FACE:
+               value = LLVMGetParam(radeon_bld->main_fn, SI_PARAM_FRONT_FACE);
+               break;
+
        case TGSI_SEMANTIC_SAMPLEID:
                value = get_sample_id(radeon_bld);
                break;
 
-       case TGSI_SEMANTIC_SAMPLEPOS:
-               value = load_sample_position(radeon_bld, get_sample_id(radeon_bld));
+       case TGSI_SEMANTIC_SAMPLEPOS: {
+               LLVMValueRef pos[4] = {
+                       LLVMGetParam(radeon_bld->main_fn, SI_PARAM_POS_X_FLOAT),
+                       LLVMGetParam(radeon_bld->main_fn, SI_PARAM_POS_Y_FLOAT),
+                       lp_build_const_float(gallivm, 0),
+                       lp_build_const_float(gallivm, 0)
+               };
+               pos[0] = lp_build_emit_llvm_unary(&radeon_bld->soa.bld_base,
+                                                 TGSI_OPCODE_FRC, pos[0]);
+               pos[1] = lp_build_emit_llvm_unary(&radeon_bld->soa.bld_base,
+                                                 TGSI_OPCODE_FRC, pos[1]);
+               value = lp_build_gather_values(gallivm, pos, 4);
                break;
+       }
 
        case TGSI_SEMANTIC_SAMPLEMASK:
-               /* Smoothing isn't MSAA in GL, but it's MSAA in hardware.
-                * Therefore, force gl_SampleMaskIn to 1 for GL. */
-               if (si_shader_ctx->shader->key.ps.poly_line_smoothing)
-                       value = uint_bld->one;
-               else
-                       value = LLVMGetParam(radeon_bld->main_fn, SI_PARAM_SAMPLE_COVERAGE);
+               /* This can only occur with the OpenGL Core profile, which
+                * doesn't support smoothing.
+                */
+               value = LLVMGetParam(radeon_bld->main_fn, SI_PARAM_SAMPLE_COVERAGE);
                break;
 
        case TGSI_SEMANTIC_TESSCOORD:
@@ -1269,6 +1262,28 @@ static LLVMValueRef fetch_constant(
        return result;
 }
 
+/* Upper 16 bits must be zero. */
+static LLVMValueRef si_llvm_pack_two_int16(struct gallivm_state *gallivm,
+                                          LLVMValueRef val[2])
+{
+       return LLVMBuildOr(gallivm->builder, val[0],
+                          LLVMBuildShl(gallivm->builder, val[1],
+                                       lp_build_const_int32(gallivm, 16),
+                                       ""), "");
+}
+
+/* Upper 16 bits are ignored and will be dropped. */
+static LLVMValueRef si_llvm_pack_two_int32_as_int16(struct gallivm_state *gallivm,
+                                                   LLVMValueRef val[2])
+{
+       LLVMValueRef v[2] = {
+               LLVMBuildAnd(gallivm->builder, val[0],
+                            lp_build_const_int32(gallivm, 0xffff), ""),
+               val[1],
+       };
+       return si_llvm_pack_two_int16(gallivm, v);
+}
+
 /* Initialize arguments for the shader export intrinsic */
 static void si_llvm_init_export_args(struct lp_build_tgsi_context *bld_base,
                                     LLVMValueRef *values,
@@ -1279,16 +1294,15 @@ static void si_llvm_init_export_args(struct lp_build_tgsi_context *bld_base,
        struct lp_build_context *uint =
                                &si_shader_ctx->radeon_bld.soa.bld_base.uint_bld;
        struct lp_build_context *base = &bld_base->base;
-       unsigned compressed = 0;
+       struct gallivm_state *gallivm = base->gallivm;
+       LLVMBuilderRef builder = base->gallivm->builder;
+       LLVMValueRef val[4];
+       unsigned spi_shader_col_format = V_028714_SPI_SHADER_32_ABGR;
        unsigned chan;
+       bool is_int8;
 
-       /* XXX: This controls which components of the output
-        * registers actually get exported. (e.g bit 0 means export
-        * X component, bit 1 means export Y component, etc.)  I'm
-        * hard coding this to 0xf for now.  In the future, we might
-        * want to do something else.
-        */
-       args[0] = lp_build_const_int32(base->gallivm, 0xf);
+       /* Default is 0xf. Adjusted below depending on the format. */
+       args[0] = lp_build_const_int32(base->gallivm, 0xf); /* writemask */
 
        /* Specify whether the EXEC mask represents the valid mask */
        args[1] = uint->zero;
@@ -1300,17 +1314,47 @@ static void si_llvm_init_export_args(struct lp_build_tgsi_context *bld_base,
        args[3] = lp_build_const_int32(base->gallivm, target);
 
        if (si_shader_ctx->type == TGSI_PROCESSOR_FRAGMENT) {
+               const union si_shader_key *key = &si_shader_ctx->shader->key;
+               unsigned col_formats = key->ps.spi_shader_col_format;
                int cbuf = target - V_008DFC_SQ_EXP_MRT;
 
-               if (cbuf >= 0 && cbuf < 8)
-                       compressed = (si_shader_ctx->shader->key.ps.export_16bpc >> cbuf) & 0x1;
+               assert(cbuf >= 0 && cbuf < 8);
+               spi_shader_col_format = (col_formats >> (cbuf * 4)) & 0xf;
+               is_int8 = (key->ps.color_is_int8 >> cbuf) & 0x1;
        }
 
-       /* Set COMPR flag */
-       args[4] = compressed ? uint->one : uint->zero;
+       args[4] = uint->zero; /* COMPR flag */
+       args[5] = base->undef;
+       args[6] = base->undef;
+       args[7] = base->undef;
+       args[8] = base->undef;
+
+       switch (spi_shader_col_format) {
+       case V_028714_SPI_SHADER_ZERO:
+               args[0] = uint->zero; /* writemask */
+               args[3] = lp_build_const_int32(base->gallivm, V_008DFC_SQ_EXP_NULL);
+               break;
+
+       case V_028714_SPI_SHADER_32_R:
+               args[0] = uint->one; /* writemask */
+               args[5] = values[0];
+               break;
+
+       case V_028714_SPI_SHADER_32_GR:
+               args[0] = lp_build_const_int32(base->gallivm, 0x3); /* writemask */
+               args[5] = values[0];
+               args[6] = values[1];
+               break;
+
+       case V_028714_SPI_SHADER_32_AR:
+               args[0] = lp_build_const_int32(base->gallivm, 0x9); /* writemask */
+               args[5] = values[0];
+               args[8] = values[3];
+               break;
+
+       case V_028714_SPI_SHADER_FP16_ABGR:
+               args[4] = uint->one; /* COMPR flag */
 
-       if (compressed) {
-               /* Pixel shader needs to pack output values before export */
                for (chan = 0; chan < 2; chan++) {
                        LLVMValueRef pack_args[2] = {
                                values[2 * chan],
@@ -1320,18 +1364,107 @@ static void si_llvm_init_export_args(struct lp_build_tgsi_context *bld_base,
 
                        packed = lp_build_intrinsic(base->gallivm->builder,
                                                    "llvm.SI.packf16",
-                                                   LLVMInt32TypeInContext(base->gallivm->context),
-                                                   pack_args, 2,
+                                                   uint->elem_type, pack_args, 2,
                                                    LLVMReadNoneAttribute | LLVMNoUnwindAttribute);
                        args[chan + 5] =
                                LLVMBuildBitCast(base->gallivm->builder,
-                                                packed,
-                                                LLVMFloatTypeInContext(base->gallivm->context),
-                                                "");
-                       args[chan + 7] = base->undef;
+                                                packed, base->elem_type, "");
                }
-       } else
+               break;
+
+       case V_028714_SPI_SHADER_UNORM16_ABGR:
+               for (chan = 0; chan < 4; chan++) {
+                       val[chan] = radeon_llvm_saturate(bld_base, values[chan]);
+                       val[chan] = LLVMBuildFMul(builder, val[chan],
+                                                 lp_build_const_float(gallivm, 65535), "");
+                       val[chan] = LLVMBuildFAdd(builder, val[chan],
+                                                 lp_build_const_float(gallivm, 0.5), "");
+                       val[chan] = LLVMBuildFPToUI(builder, val[chan],
+                                                   uint->elem_type, "");
+               }
+
+               args[4] = uint->one; /* COMPR flag */
+               args[5] = bitcast(bld_base, TGSI_TYPE_FLOAT,
+                                 si_llvm_pack_two_int16(gallivm, val));
+               args[6] = bitcast(bld_base, TGSI_TYPE_FLOAT,
+                                 si_llvm_pack_two_int16(gallivm, val+2));
+               break;
+
+       case V_028714_SPI_SHADER_SNORM16_ABGR:
+               for (chan = 0; chan < 4; chan++) {
+                       /* Clamp between [-1, 1]. */
+                       val[chan] = lp_build_emit_llvm_binary(bld_base, TGSI_OPCODE_MIN,
+                                                             values[chan],
+                                                             lp_build_const_float(gallivm, 1));
+                       val[chan] = lp_build_emit_llvm_binary(bld_base, TGSI_OPCODE_MAX,
+                                                             val[chan],
+                                                             lp_build_const_float(gallivm, -1));
+                       /* Convert to a signed integer in [-32767, 32767]. */
+                       val[chan] = LLVMBuildFMul(builder, val[chan],
+                                                 lp_build_const_float(gallivm, 32767), "");
+                       /* If positive, add 0.5, else add -0.5. */
+                       val[chan] = LLVMBuildFAdd(builder, val[chan],
+                                       LLVMBuildSelect(builder,
+                                               LLVMBuildFCmp(builder, LLVMRealOGE,
+                                                             val[chan], base->zero, ""),
+                                               lp_build_const_float(gallivm, 0.5),
+                                               lp_build_const_float(gallivm, -0.5), ""), "");
+                       val[chan] = LLVMBuildFPToSI(builder, val[chan], uint->elem_type, "");
+               }
+
+               args[4] = uint->one; /* COMPR flag */
+               args[5] = bitcast(bld_base, TGSI_TYPE_FLOAT,
+                                 si_llvm_pack_two_int32_as_int16(gallivm, val));
+               args[6] = bitcast(bld_base, TGSI_TYPE_FLOAT,
+                                 si_llvm_pack_two_int32_as_int16(gallivm, val+2));
+               break;
+
+       case V_028714_SPI_SHADER_UINT16_ABGR: {
+               LLVMValueRef max = lp_build_const_int32(gallivm, is_int8 ?
+                                                       255 : 65535);
+               /* Clamp. */
+               for (chan = 0; chan < 4; chan++) {
+                       val[chan] = bitcast(bld_base, TGSI_TYPE_UNSIGNED, values[chan]);
+                       val[chan] = lp_build_emit_llvm_binary(bld_base, TGSI_OPCODE_UMIN,
+                                                             val[chan], max);
+               }
+
+               args[4] = uint->one; /* COMPR flag */
+               args[5] = bitcast(bld_base, TGSI_TYPE_FLOAT,
+                                 si_llvm_pack_two_int16(gallivm, val));
+               args[6] = bitcast(bld_base, TGSI_TYPE_FLOAT,
+                                 si_llvm_pack_two_int16(gallivm, val+2));
+               break;
+       }
+
+       case V_028714_SPI_SHADER_SINT16_ABGR: {
+               LLVMValueRef max = lp_build_const_int32(gallivm, is_int8 ?
+                                                       127 : 32767);
+               LLVMValueRef min = lp_build_const_int32(gallivm, is_int8 ?
+                                                       -128 : -32768);
+               /* Clamp. */
+               for (chan = 0; chan < 4; chan++) {
+                       val[chan] = bitcast(bld_base, TGSI_TYPE_UNSIGNED, values[chan]);
+                       val[chan] = lp_build_emit_llvm_binary(bld_base,
+                                                             TGSI_OPCODE_IMIN,
+                                                             val[chan], max);
+                       val[chan] = lp_build_emit_llvm_binary(bld_base,
+                                                             TGSI_OPCODE_IMAX,
+                                                             val[chan], min);
+               }
+
+               args[4] = uint->one; /* COMPR flag */
+               args[5] = bitcast(bld_base, TGSI_TYPE_FLOAT,
+                                 si_llvm_pack_two_int32_as_int16(gallivm, val));
+               args[6] = bitcast(bld_base, TGSI_TYPE_FLOAT,
+                                 si_llvm_pack_two_int32_as_int16(gallivm, val+2));
+               break;
+       }
+
+       case V_028714_SPI_SHADER_32_ABGR:
                memcpy(&args[5], values, sizeof(values[0]) * 4);
+               break;
+       }
 }
 
 static void si_alpha_test(struct lp_build_tgsi_context *bld_base,
@@ -1827,21 +1960,20 @@ handle_semantic:
        }
 }
 
-/* This only writes the tessellation factor levels. */
-static void si_llvm_emit_tcs_epilogue(struct lp_build_tgsi_context *bld_base)
+static void si_write_tess_factors(struct lp_build_tgsi_context *bld_base,
+                                 LLVMValueRef rel_patch_id,
+                                 LLVMValueRef invocation_id,
+                                 LLVMValueRef tcs_out_current_patch_data_offset)
 {
        struct si_shader_context *si_shader_ctx = si_shader_context(bld_base);
        struct gallivm_state *gallivm = bld_base->base.gallivm;
        struct si_shader *shader = si_shader_ctx->shader;
        unsigned tess_inner_index, tess_outer_index;
-       LLVMValueRef lds_base, lds_inner, lds_outer;
-       LLVMValueRef tf_base, rel_patch_id, byteoffset, buffer, rw_buffers;
-       LLVMValueRef out[6], vec0, vec1, invocation_id;
+       LLVMValueRef lds_base, lds_inner, lds_outer, byteoffset, buffer;
+       LLVMValueRef out[6], vec0, vec1, rw_buffers, tf_base;
        unsigned stride, outer_comps, inner_comps, i;
        struct lp_build_if_state if_ctx;
 
-       invocation_id = unpack_param(si_shader_ctx, SI_PARAM_REL_IDS, 8, 5);
-
        /* Do this only for invocation 0, because the tess levels are per-patch,
         * not per-vertex.
         *
@@ -1880,7 +2012,7 @@ static void si_llvm_emit_tcs_epilogue(struct lp_build_tgsi_context *bld_base)
        tess_inner_index = si_shader_io_get_unique_index(TGSI_SEMANTIC_TESSINNER, 0);
        tess_outer_index = si_shader_io_get_unique_index(TGSI_SEMANTIC_TESSOUTER, 0);
 
-       lds_base = get_tcs_out_current_patch_data_offset(si_shader_ctx);
+       lds_base = tcs_out_current_patch_data_offset;
        lds_inner = LLVMBuildAdd(gallivm->builder, lds_base,
                                 lp_build_const_int32(gallivm,
                                                      tess_inner_index * 4), "");
@@ -1909,7 +2041,6 @@ static void si_llvm_emit_tcs_epilogue(struct lp_build_tgsi_context *bld_base)
        /* Get the offset. */
        tf_base = LLVMGetParam(si_shader_ctx->radeon_bld.main_fn,
                               SI_PARAM_TESS_FACTOR_OFFSET);
-       rel_patch_id = get_rel_patch_id(si_shader_ctx);
        byteoffset = LLVMBuildMul(gallivm->builder, rel_patch_id,
                                  lp_build_const_int32(gallivm, 4 * stride), "");
 
@@ -1922,6 +2053,20 @@ static void si_llvm_emit_tcs_epilogue(struct lp_build_tgsi_context *bld_base)
        lp_build_endif(&if_ctx);
 }
 
+/* This only writes the tessellation factor levels. */
+static void si_llvm_emit_tcs_epilogue(struct lp_build_tgsi_context *bld_base)
+{
+       struct si_shader_context *si_shader_ctx = si_shader_context(bld_base);
+       LLVMValueRef invocation_id;
+
+       invocation_id = unpack_param(si_shader_ctx, SI_PARAM_REL_IDS, 8, 5);
+
+       si_write_tess_factors(bld_base,
+                             get_rel_patch_id(si_shader_ctx),
+                             invocation_id,
+                             get_tcs_out_current_patch_data_offset(si_shader_ctx));
+}
+
 static void si_llvm_emit_ls_epilogue(struct lp_build_tgsi_context * bld_base)
 {
        struct si_shader_context *si_shader_ctx = si_shader_context(bld_base);
@@ -2014,6 +2159,8 @@ static void si_llvm_emit_vs_epilogue(struct lp_build_tgsi_context * bld_base)
        struct si_shader_output_values *outputs = NULL;
        int i,j;
 
+       assert(!si_shader_ctx->is_gs_copy_shader);
+
        outputs = MALLOC((info->num_outputs + 1) * sizeof(outputs[0]));
 
        /* Vertex color clamping.
@@ -2022,8 +2169,7 @@ static void si_llvm_emit_vs_epilogue(struct lp_build_tgsi_context * bld_base)
         * an IF statement is added that clamps all colors if the constant
         * is true.
         */
-       if (si_shader_ctx->type == TGSI_PROCESSOR_VERTEX &&
-           !si_shader_ctx->shader->is_gs_copy_shader) {
+       if (si_shader_ctx->type == TGSI_PROCESSOR_VERTEX) {
                struct lp_build_if_state if_ctx;
                LLVMValueRef cond = NULL;
                LLVMValueRef addr, val;
@@ -2141,7 +2287,6 @@ static void si_export_mrt_color(struct lp_build_tgsi_context *bld_base,
 {
        struct si_shader_context *si_shader_ctx = si_shader_context(bld_base);
        struct lp_build_context *base = &bld_base->base;
-       LLVMValueRef args[9];
        int i;
 
        /* Clamp color */
@@ -2163,27 +2308,46 @@ static void si_export_mrt_color(struct lp_build_tgsi_context *bld_base,
                color[3] = si_scale_alpha_by_sample_mask(bld_base, color[3]);
 
        /* If last_cbuf > 0, FS_COLOR0_WRITES_ALL_CBUFS is true. */
-       if (index == 0 &&
-           si_shader_ctx->shader->key.ps.last_cbuf > 0) {
-               for (int c = 1; c <= si_shader_ctx->shader->key.ps.last_cbuf; c++) {
+       if (si_shader_ctx->shader->key.ps.last_cbuf > 0) {
+               LLVMValueRef args[8][9];
+               int c, last = -1;
+
+               /* Get the export arguments, also find out what the last one is. */
+               for (c = 0; c <= si_shader_ctx->shader->key.ps.last_cbuf; c++) {
                        si_llvm_init_export_args(bld_base, color,
-                                                V_008DFC_SQ_EXP_MRT + c, args);
+                                                V_008DFC_SQ_EXP_MRT + c, args[c]);
+                       if (args[c][0] != bld_base->uint_bld.zero)
+                               last = c;
+               }
+
+               /* Emit all exports. */
+               for (c = 0; c <= si_shader_ctx->shader->key.ps.last_cbuf; c++) {
+                       if (is_last && last == c) {
+                               args[c][1] = bld_base->uint_bld.one; /* whether the EXEC mask is valid */
+                               args[c][2] = bld_base->uint_bld.one; /* DONE bit */
+                       } else if (args[c][0] == bld_base->uint_bld.zero)
+                               continue; /* unnecessary NULL export */
+
                        lp_build_intrinsic(base->gallivm->builder, "llvm.SI.export",
                                           LLVMVoidTypeInContext(base->gallivm->context),
-                                          args, 9, 0);
+                                          args[c], 9, 0);
                }
+       } else {
+               LLVMValueRef args[9];
+
+               /* Export */
+               si_llvm_init_export_args(bld_base, color, V_008DFC_SQ_EXP_MRT + index,
+                                        args);
+               if (is_last) {
+                       args[1] = bld_base->uint_bld.one; /* whether the EXEC mask is valid */
+                       args[2] = bld_base->uint_bld.one; /* DONE bit */
+               } else if (args[0] == bld_base->uint_bld.zero)
+                       return; /* unnecessary NULL export */
+
+               lp_build_intrinsic(base->gallivm->builder, "llvm.SI.export",
+                                  LLVMVoidTypeInContext(base->gallivm->context),
+                                  args, 9, 0);
        }
-
-       /* Export */
-       si_llvm_init_export_args(bld_base, color, V_008DFC_SQ_EXP_MRT + index,
-                                args);
-       if (is_last) {
-               args[1] = bld_base->uint_bld.one; /* whether the EXEC mask is valid */
-               args[2] = bld_base->uint_bld.one; /* DONE bit */
-       }
-       lp_build_intrinsic(base->gallivm->builder, "llvm.SI.export",
-                          LLVMVoidTypeInContext(base->gallivm->context),
-                          args, 9, 0);
 }
 
 static void si_export_null(struct lp_build_tgsi_context *bld_base)
@@ -2218,19 +2382,43 @@ static void si_llvm_emit_fs_epilogue(struct lp_build_tgsi_context * bld_base)
        int last_color_export = -1;
        int i;
 
-       /* If there are no outputs, add a dummy export. */
-       if (!info->num_outputs) {
-               si_export_null(bld_base);
-               return;
-       }
-
        /* Determine the last export. If MRTZ is present, it's always last.
         * Otherwise, find the last color export.
         */
-       if (!info->writes_z && !info->writes_stencil && !info->writes_samplemask)
-               for (i = 0; i < info->num_outputs; i++)
-                       if (info->output_semantic_name[i] == TGSI_SEMANTIC_COLOR)
+       if (!info->writes_z && !info->writes_stencil && !info->writes_samplemask) {
+               unsigned spi_format = shader->key.ps.spi_shader_col_format;
+
+               /* Don't export NULL and return if alpha-test is enabled. */
+               if (shader->key.ps.alpha_func != PIPE_FUNC_ALWAYS &&
+                   shader->key.ps.alpha_func != PIPE_FUNC_NEVER &&
+                   (spi_format & 0xf) == 0)
+                       spi_format |= V_028714_SPI_SHADER_32_AR;
+
+               for (i = 0; i < info->num_outputs; i++) {
+                       unsigned index = info->output_semantic_index[i];
+
+                       if (info->output_semantic_name[i] != TGSI_SEMANTIC_COLOR)
+                               continue;
+
+                       /* If last_cbuf > 0, FS_COLOR0_WRITES_ALL_CBUFS is true. */
+                       if (shader->key.ps.last_cbuf > 0) {
+                               /* Just set this if any of the colorbuffers are enabled. */
+                               if (spi_format &
+                                   ((1llu << (4 * (shader->key.ps.last_cbuf + 1))) - 1))
+                                       last_color_export = i;
+                               continue;
+                       }
+
+                       if ((spi_format >> (index * 4)) & 0xf)
                                last_color_export = i;
+               }
+
+               /* If there are no outputs, export NULL. */
+               if (last_color_export == -1) {
+                       si_export_null(bld_base);
+                       return;
+               }
+       }
 
        for (i = 0; i < info->num_outputs; i++) {
                unsigned semantic_name = info->output_semantic_name[i];
@@ -2335,13 +2523,58 @@ static void set_tex_fetch_args(struct gallivm_state *gallivm,
 
 static const struct lp_build_tgsi_action tex_action;
 
+enum desc_type {
+       DESC_IMAGE,
+       DESC_FMASK,
+       DESC_SAMPLER
+};
+
+static LLVMTypeRef const_array(LLVMTypeRef elem_type, int num_elements)
+{
+       return LLVMPointerType(LLVMArrayType(elem_type, num_elements),
+                              CONST_ADDR_SPACE);
+}
+
+/**
+ * Load an image view, fmask view. or sampler state descriptor.
+ */
+static LLVMValueRef get_sampler_desc(struct si_shader_context *si_shader_ctx,
+                                    LLVMValueRef index, enum desc_type type)
+{
+       struct gallivm_state *gallivm = &si_shader_ctx->radeon_bld.gallivm;
+       LLVMTypeRef i32 = LLVMInt32TypeInContext(gallivm->context);
+       LLVMBuilderRef builder = gallivm->builder;
+       LLVMValueRef ptr = LLVMGetParam(si_shader_ctx->radeon_bld.main_fn,
+                                       SI_PARAM_SAMPLERS);
+
+       switch (type) {
+       case DESC_IMAGE:
+               /* The image is at [0:7]. */
+               index = LLVMBuildMul(builder, index, LLVMConstInt(i32, 2, 0), "");
+               break;
+       case DESC_FMASK:
+               /* The FMASK is at [8:15]. */
+               index = LLVMBuildMul(builder, index, LLVMConstInt(i32, 2, 0), "");
+               index = LLVMBuildAdd(builder, index, LLVMConstInt(i32, 1, 0), "");
+               break;
+       case DESC_SAMPLER:
+               /* The sampler state is at [12:15]. */
+               index = LLVMBuildMul(builder, index, LLVMConstInt(i32, 4, 0), "");
+               index = LLVMBuildAdd(builder, index, LLVMConstInt(i32, 3, 0), "");
+               ptr = LLVMBuildPointerCast(builder, ptr,
+                                          const_array(LLVMVectorType(i32, 4), 0), "");
+               break;
+       }
+
+       return build_indexed_load_const(si_shader_ctx, ptr, index);
+}
+
 static void tex_fetch_ptrs(
        struct lp_build_tgsi_context * bld_base,
        struct lp_build_emit_data * emit_data,
        LLVMValueRef *res_ptr, LLVMValueRef *samp_ptr, LLVMValueRef *fmask_ptr)
 {
        struct si_shader_context *si_shader_ctx = si_shader_context(bld_base);
-       struct gallivm_state *gallivm = bld_base->base.gallivm;
        const struct tgsi_full_instruction * inst = emit_data->inst;
        unsigned target = inst->Texture.Texture;
        unsigned sampler_src;
@@ -2356,24 +2589,20 @@ static void tex_fetch_ptrs(
 
                ind_index = get_indirect_index(si_shader_ctx, &reg->Indirect, reg->Register.Index);
 
-               *res_ptr = LLVMGetParam(si_shader_ctx->radeon_bld.main_fn, SI_PARAM_SAMPLER_VIEWS);
-               *res_ptr = build_indexed_load_const(si_shader_ctx, *res_ptr, ind_index);
-
-               *samp_ptr = LLVMGetParam(si_shader_ctx->radeon_bld.main_fn, SI_PARAM_SAMPLER_STATES);
-               *samp_ptr = build_indexed_load_const(si_shader_ctx, *samp_ptr, ind_index);
+               *res_ptr = get_sampler_desc(si_shader_ctx, ind_index, DESC_IMAGE);
 
                if (target == TGSI_TEXTURE_2D_MSAA ||
                    target == TGSI_TEXTURE_2D_ARRAY_MSAA) {
-                       ind_index = LLVMBuildAdd(gallivm->builder, ind_index,
-                                                lp_build_const_int32(gallivm,
-                                                                     SI_FMASK_TEX_OFFSET), "");
-                       *fmask_ptr = LLVMGetParam(si_shader_ctx->radeon_bld.main_fn, SI_PARAM_SAMPLER_VIEWS);
-                       *fmask_ptr = build_indexed_load_const(si_shader_ctx, *fmask_ptr, ind_index);
+                       *samp_ptr = NULL;
+                       *fmask_ptr = get_sampler_desc(si_shader_ctx, ind_index, DESC_FMASK);
+               } else {
+                       *samp_ptr = get_sampler_desc(si_shader_ctx, ind_index, DESC_SAMPLER);
+                       *fmask_ptr = NULL;
                }
        } else {
                *res_ptr = si_shader_ctx->sampler_views[sampler_index];
                *samp_ptr = si_shader_ctx->sampler_states[sampler_index];
-               *fmask_ptr = si_shader_ctx->sampler_views[SI_FMASK_TEX_OFFSET + sampler_index];
+               *fmask_ptr = si_shader_ctx->fmasks[sampler_index];
        }
 }
 
@@ -3114,17 +3343,17 @@ static void build_interp_intrinsic(const struct lp_build_tgsi_action *action,
        LLVMValueRef interp_param;
        const struct tgsi_full_instruction *inst = emit_data->inst;
        const char *intr_name;
-       int input_index;
+       int input_index = inst->Src[0].Register.Index;
        int chan;
        int i;
        LLVMValueRef attr_number;
        LLVMTypeRef input_type = LLVMFloatTypeInContext(gallivm->context);
        LLVMValueRef params = LLVMGetParam(si_shader_ctx->radeon_bld.main_fn, SI_PARAM_PRIM_MASK);
        int interp_param_idx;
+       unsigned interp = shader->selector->info.input_interpolate[input_index];
        unsigned location;
 
        assert(inst->Src[0].Register.File == TGSI_FILE_INPUT);
-       input_index = inst->Src[0].Register.Index;
 
        if (inst->Instruction.Opcode == TGSI_OPCODE_INTERP_OFFSET ||
            inst->Instruction.Opcode == TGSI_OPCODE_INTERP_SAMPLE)
@@ -3132,8 +3361,7 @@ static void build_interp_intrinsic(const struct lp_build_tgsi_action *action,
        else
                location = TGSI_INTERPOLATE_LOC_CENTROID;
 
-       interp_param_idx = lookup_interp_param_index(shader->ps_input_interpolate[input_index],
-                                                    location);
+       interp_param_idx = lookup_interp_param_index(interp, location);
        if (interp_param_idx == -1)
                return;
        else if (interp_param_idx)
@@ -3141,8 +3369,7 @@ static void build_interp_intrinsic(const struct lp_build_tgsi_action *action,
        else
                interp_param = NULL;
 
-       attr_number = lp_build_const_int32(gallivm,
-                                          shader->ps_input_param_offset[input_index]);
+       attr_number = lp_build_const_int32(gallivm, input_index);
 
        if (inst->Instruction.Opcode == TGSI_OPCODE_INTERP_OFFSET ||
            inst->Instruction.Opcode == TGSI_OPCODE_INTERP_SAMPLE) {
@@ -3326,7 +3553,9 @@ static void si_llvm_emit_barrier(const struct lp_build_tgsi_action *action,
 {
        struct gallivm_state *gallivm = bld_base->base.gallivm;
 
-       lp_build_intrinsic(gallivm->builder, "llvm.AMDGPU.barrier.local",
+       lp_build_intrinsic(gallivm->builder,
+                       HAVE_LLVM >= 0x0309 ? "llvm.amdgcn.s.barrier"
+                                           : "llvm.AMDGPU.barrier.local",
                        LLVMVoidTypeInContext(gallivm->context), NULL, 0,
                        LLVMNoUnwindAttribute);
 }
@@ -3353,12 +3582,6 @@ 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 declare_streamout_params(struct si_shader_context *si_shader_ctx,
                                     struct pipe_stream_output_info *so,
                                     LLVMTypeRef *params, LLVMTypeRef i32,
@@ -3385,7 +3608,7 @@ 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_shader *shader = si_shader_ctx->shader;
-       LLVMTypeRef params[SI_NUM_PARAMS], f32, i8, i32, v2i32, v3i32, v16i8, v4i32, v8i32;
+       LLVMTypeRef params[SI_NUM_PARAMS], f32, i8, i32, v2i32, v3i32, v16i8, v8i32;
        unsigned i, last_array_pointer, last_sgpr, num_params;
 
        i8 = LLVMInt8TypeInContext(gallivm->context);
@@ -3393,15 +3616,14 @@ static void create_function(struct si_shader_context *si_shader_ctx)
        f32 = LLVMFloatTypeInContext(gallivm->context);
        v2i32 = LLVMVectorType(i32, 2);
        v3i32 = LLVMVectorType(i32, 3);
-       v4i32 = LLVMVectorType(i32, 4);
        v8i32 = LLVMVectorType(i32, 8);
        v16i8 = LLVMVectorType(i8, 16);
 
        params[SI_PARAM_RW_BUFFERS] = const_array(v16i8, SI_NUM_RW_BUFFERS);
        params[SI_PARAM_CONST_BUFFERS] = const_array(v16i8, SI_NUM_CONST_BUFFERS);
-       params[SI_PARAM_SAMPLER_STATES] = const_array(v4i32, SI_NUM_SAMPLER_STATES);
-       params[SI_PARAM_SAMPLER_VIEWS] = const_array(v8i32, SI_NUM_SAMPLER_VIEWS);
-       last_array_pointer = SI_PARAM_SAMPLER_VIEWS;
+       params[SI_PARAM_SAMPLERS] = const_array(v8i32, SI_NUM_SAMPLERS);
+       params[SI_PARAM_UNUSED] = LLVMPointerType(i32, CONST_ADDR_SPACE);
+       last_array_pointer = SI_PARAM_UNUSED;
 
        switch (si_shader_ctx->type) {
        case TGSI_PROCESSOR_VERTEX:
@@ -3417,7 +3639,7 @@ static void create_function(struct si_shader_context *si_shader_ctx)
                        params[SI_PARAM_LS_OUT_LAYOUT] = i32;
                        num_params = SI_PARAM_LS_OUT_LAYOUT+1;
                } else {
-                       if (shader->is_gs_copy_shader) {
+                       if (si_shader_ctx->is_gs_copy_shader) {
                                last_array_pointer = SI_PARAM_CONST_BUFFERS;
                                num_params = SI_PARAM_CONST_BUFFERS+1;
                        } else {
@@ -3491,7 +3713,6 @@ static void create_function(struct si_shader_context *si_shader_ctx)
 
        case TGSI_PROCESSOR_FRAGMENT:
                params[SI_PARAM_ALPHA_REF] = f32;
-               params[SI_PARAM_PS_STATE_BITS] = i32;
                params[SI_PARAM_PRIM_MASK] = i32;
                last_sgpr = SI_PARAM_PRIM_MASK;
                params[SI_PARAM_PERSP_SAMPLE] = v2i32;
@@ -3506,7 +3727,7 @@ static void create_function(struct si_shader_context *si_shader_ctx)
                params[SI_PARAM_POS_Y_FLOAT] = f32;
                params[SI_PARAM_POS_Z_FLOAT] = f32;
                params[SI_PARAM_POS_W_FLOAT] = f32;
-               params[SI_PARAM_FRONT_FACE] = f32;
+               params[SI_PARAM_FRONT_FACE] = i32;
                params[SI_PARAM_ANCILLARY] = i32;
                params[SI_PARAM_SAMPLE_COVERAGE] = f32;
                params[SI_PARAM_POS_FIXED_PT] = f32;
@@ -3522,10 +3743,6 @@ 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);
 
@@ -3607,34 +3824,26 @@ static void preload_samplers(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;
        const struct tgsi_shader_info * info = bld_base->info;
-
        unsigned i, num_samplers = info->file_max[TGSI_FILE_SAMPLER] + 1;
-
-       LLVMValueRef res_ptr, samp_ptr;
        LLVMValueRef offset;
 
        if (num_samplers == 0)
                return;
 
-       res_ptr = LLVMGetParam(si_shader_ctx->radeon_bld.main_fn, SI_PARAM_SAMPLER_VIEWS);
-       samp_ptr = LLVMGetParam(si_shader_ctx->radeon_bld.main_fn, SI_PARAM_SAMPLER_STATES);
-
        /* Load the resources and samplers, we rely on the code sinking to do the rest */
        for (i = 0; i < num_samplers; ++i) {
                /* Resource */
                offset = lp_build_const_int32(gallivm, i);
-               si_shader_ctx->sampler_views[i] = build_indexed_load_const(si_shader_ctx, res_ptr, offset);
-
-               /* Sampler */
-               offset = lp_build_const_int32(gallivm, i);
-               si_shader_ctx->sampler_states[i] = build_indexed_load_const(si_shader_ctx, samp_ptr, offset);
+               si_shader_ctx->sampler_views[i] =
+                       get_sampler_desc(si_shader_ctx, offset, DESC_IMAGE);
 
                /* FMASK resource */
-               if (info->is_msaa_sampler[i]) {
-                       offset = lp_build_const_int32(gallivm, SI_FMASK_TEX_OFFSET + i);
-                       si_shader_ctx->sampler_views[SI_FMASK_TEX_OFFSET + i] =
-                               build_indexed_load_const(si_shader_ctx, res_ptr, offset);
-               }
+               if (info->is_msaa_sampler[i])
+                       si_shader_ctx->fmasks[i] =
+                               get_sampler_desc(si_shader_ctx, offset, DESC_FMASK);
+               else
+                       si_shader_ctx->sampler_states[i] =
+                               get_sampler_desc(si_shader_ctx, offset, DESC_SAMPLER);
        }
 }
 
@@ -3690,7 +3899,7 @@ static void preload_ring_buffers(struct si_shader_context *si_shader_ctx)
                        build_indexed_load_const(si_shader_ctx, buf_ptr, offset);
        }
 
-       if (si_shader_ctx->shader->is_gs_copy_shader) {
+       if (si_shader_ctx->is_gs_copy_shader) {
                LLVMValueRef offset = lp_build_const_int32(gallivm, SI_RING_GSVS);
 
                si_shader_ctx->gsvs_ring[0] =
@@ -3742,6 +3951,9 @@ void si_shader_binary_read_config(struct radeon_shader_binary *binary,
                case R_0286CC_SPI_PS_INPUT_ENA:
                        conf->spi_ps_input_ena = value;
                        break;
+               case R_0286D0_SPI_PS_INPUT_ADDR:
+                       conf->spi_ps_input_addr = value;
+                       break;
                case R_0286E8_SPI_TMPRING_SIZE:
                case R_00B860_COMPUTE_TMPRING_SIZE:
                        /* WAVESIZE is in units of 256 dwords. */
@@ -3749,10 +3961,20 @@ void si_shader_binary_read_config(struct radeon_shader_binary *binary,
                                G_00B860_WAVESIZE(value) * 256 * 4 * 1;
                        break;
                default:
-                       fprintf(stderr, "Warning: Compiler emitted unknown "
-                               "config register: 0x%x\n", reg);
+                       {
+                               static bool printed;
+
+                               if (!printed) {
+                                       fprintf(stderr, "Warning: LLVM emitted unknown "
+                                               "config register: 0x%x\n", reg);
+                                       printed = true;
+                               }
+                       }
                        break;
                }
+
+               if (!conf->spi_ps_input_addr)
+                       conf->spi_ps_input_addr = conf->spi_ps_input_ena;
        }
 }
 
@@ -3854,22 +4076,72 @@ static void si_shader_dump_disassembly(const struct radeon_shader_binary *binary
 
 static void si_shader_dump_stats(struct si_screen *sscreen,
                                 struct si_shader_config *conf,
+                                unsigned num_inputs,
                                 unsigned code_size,
                                 struct pipe_debug_callback *debug,
                                 unsigned processor)
 {
+       unsigned lds_increment = sscreen->b.chip_class >= CIK ? 512 : 256;
+       unsigned lds_per_wave = 0;
+       unsigned max_simd_waves = 10;
+
+       /* Compute LDS usage for PS. */
+       if (processor == TGSI_PROCESSOR_FRAGMENT) {
+               /* The minimum usage per wave is (num_inputs * 36). The maximum
+                * usage is (num_inputs * 36 * 16).
+                * We can get anything in between and it varies between waves.
+                *
+                * Other stages don't know the size at compile time or don't
+                * allocate LDS per wave, but instead they do it per thread group.
+                */
+               lds_per_wave = conf->lds_size * lds_increment +
+                              align(num_inputs * 36, lds_increment);
+       }
+
+       /* Compute the per-SIMD wave counts. */
+       if (conf->num_sgprs) {
+               if (sscreen->b.chip_class >= VI)
+                       max_simd_waves = MIN2(max_simd_waves, 800 / conf->num_sgprs);
+               else
+                       max_simd_waves = MIN2(max_simd_waves, 512 / conf->num_sgprs);
+       }
+
+       if (conf->num_vgprs)
+               max_simd_waves = MIN2(max_simd_waves, 256 / conf->num_vgprs);
+
+       /* LDS is 64KB per CU (4 SIMDs), divided into 16KB blocks per SIMD
+        * that PS can use.
+        */
+       if (lds_per_wave)
+               max_simd_waves = MIN2(max_simd_waves, 16384 / lds_per_wave);
+
        if (r600_can_dump_shader(&sscreen->b, processor)) {
+               if (processor == TGSI_PROCESSOR_FRAGMENT) {
+                       fprintf(stderr, "*** SHADER CONFIG ***\n"
+                               "SPI_PS_INPUT_ADDR = 0x%04x\n"
+                               "SPI_PS_INPUT_ENA  = 0x%04x\n",
+                               conf->spi_ps_input_addr, conf->spi_ps_input_ena);
+               }
+
                fprintf(stderr, "*** SHADER STATS ***\n"
-                       "SGPRS: %d\nVGPRS: %d\nCode Size: %d bytes\nLDS: %d blocks\n"
-                       "Scratch: %d bytes per wave\n********************\n",
+                       "SGPRS: %d\n"
+                       "VGPRS: %d\n"
+                       "Code Size: %d bytes\n"
+                       "LDS: %d blocks\n"
+                       "Scratch: %d bytes per wave\n"
+                       "Max Waves: %d\n"
+                       "********************\n",
                        conf->num_sgprs, conf->num_vgprs, code_size,
-                       conf->lds_size, conf->scratch_bytes_per_wave);
+                       conf->lds_size, conf->scratch_bytes_per_wave,
+                       max_simd_waves);
        }
 
        pipe_debug_message(debug, SHADER_INFO,
-                          "Shader Stats: SGPRS: %d VGPRS: %d Code Size: %d LDS: %d Scratch: %d",
+                          "Shader Stats: SGPRS: %d VGPRS: %d Code Size: %d "
+                          "LDS: %d Scratch: %d Max Waves: %d",
                           conf->num_sgprs, conf->num_vgprs, code_size,
-                          conf->lds_size, conf->scratch_bytes_per_wave);
+                          conf->lds_size, conf->scratch_bytes_per_wave,
+                          max_simd_waves);
 }
 
 void si_shader_dump(struct si_screen *sscreen, struct si_shader *shader,
@@ -3880,6 +4152,7 @@ void si_shader_dump(struct si_screen *sscreen, struct si_shader *shader,
                        si_shader_dump_disassembly(&shader->binary, debug);
 
        si_shader_dump_stats(sscreen, &shader->config,
+                            shader->selector ? shader->selector->info.num_inputs : 0,
                             shader->binary.code_size, debug, processor);
 }
 
@@ -3889,7 +4162,8 @@ int si_compile_llvm(struct si_screen *sscreen,
                    LLVMTargetMachineRef tm,
                    LLVMModuleRef mod,
                    struct pipe_debug_callback *debug,
-                   unsigned processor)
+                   unsigned processor,
+                   const char *name)
 {
        int r = 0;
        unsigned count = p_atomic_inc_return(&sscreen->b.num_compilations);
@@ -3897,8 +4171,11 @@ int si_compile_llvm(struct si_screen *sscreen,
        if (r600_can_dump_shader(&sscreen->b, processor)) {
                fprintf(stderr, "radeonsi: Compiling shader %d\n", count);
 
-               if (!(sscreen->b.debug_flags & DBG_NO_IR))
+               if (!(sscreen->b.debug_flags & (DBG_NO_IR | DBG_PREOPT_IR))) {
+                       fprintf(stderr, "%s LLVM IR:\n\n", name);
                        LLVMDumpModule(mod);
+                       fprintf(stderr, "\n");
+               }
        }
 
        if (!si_replace_shader(count, binary)) {
@@ -3911,6 +4188,20 @@ int si_compile_llvm(struct si_screen *sscreen,
 
        si_shader_binary_read_config(binary, conf, 0);
 
+       /* Enable 64-bit and 16-bit denormals, because there is no performance
+        * cost.
+        *
+        * If denormals are enabled, all floating-point output modifiers are
+        * ignored.
+        *
+        * Don't enable denormals for 32-bit floats, because:
+        * - Floating-point output modifiers would be ignored by the hw.
+        * - Some opcodes don't support denormals, such as v_mad_f32. We would
+        *   have to stop using those.
+        * - SI & CI would be very slow.
+        */
+       conf->float_mode |= V_00B028_FP_64_DENORMS;
+
        FREE(binary->config);
        FREE(binary->global_symbol_offsets);
        binary->config = NULL;
@@ -3921,14 +4212,13 @@ int si_compile_llvm(struct si_screen *sscreen,
 /* Generate code for the hardware VS shader stage to go with a geometry shader */
 static int si_generate_gs_copy_shader(struct si_screen *sscreen,
                                      struct si_shader_context *si_shader_ctx,
-                                     struct si_shader *gs, bool dump,
+                                     struct si_shader *gs,
                                      struct pipe_debug_callback *debug)
 {
        struct gallivm_state *gallivm = &si_shader_ctx->radeon_bld.gallivm;
        struct lp_build_tgsi_context *bld_base = &si_shader_ctx->radeon_bld.soa.bld_base;
        struct lp_build_context *base = &bld_base->base;
        struct lp_build_context *uint = &bld_base->uint_bld;
-       struct si_shader *shader = si_shader_ctx->shader;
        struct si_shader_output_values *outputs;
        struct tgsi_shader_info *gsinfo = &gs->selector->info;
        LLVMValueRef args[9];
@@ -3937,7 +4227,7 @@ static int si_generate_gs_copy_shader(struct si_screen *sscreen,
        outputs = MALLOC(gsinfo->num_outputs * sizeof(outputs[0]));
 
        si_shader_ctx->type = TGSI_PROCESSOR_VERTEX;
-       shader->is_gs_copy_shader = true;
+       si_shader_ctx->is_gs_copy_shader = true;
 
        radeon_llvm_context_init(&si_shader_ctx->radeon_bld);
 
@@ -3983,16 +4273,23 @@ static int si_generate_gs_copy_shader(struct si_screen *sscreen,
 
        si_llvm_export_vs(bld_base, outputs, gsinfo->num_outputs);
 
-       radeon_llvm_finalize_module(&si_shader_ctx->radeon_bld);
+       LLVMBuildRetVoid(bld_base->base.gallivm->builder);
+
+       /* Dump LLVM IR before any optimization passes */
+       if (sscreen->b.debug_flags & DBG_PREOPT_IR &&
+           r600_can_dump_shader(&sscreen->b, TGSI_PROCESSOR_GEOMETRY))
+               LLVMDumpModule(bld_base->base.gallivm->module);
 
-       if (dump)
-               fprintf(stderr, "Copy Vertex Shader for Geometry Shader:\n\n");
+       radeon_llvm_finalize_module(&si_shader_ctx->radeon_bld);
 
        r = si_compile_llvm(sscreen, &si_shader_ctx->shader->binary,
                            &si_shader_ctx->shader->config, si_shader_ctx->tm,
                            bld_base->base.gallivm->module,
-                           debug, TGSI_PROCESSOR_GEOMETRY);
+                           debug, TGSI_PROCESSOR_GEOMETRY,
+                           "GS Copy Shader");
        if (!r) {
+               if (r600_can_dump_shader(&sscreen->b, TGSI_PROCESSOR_GEOMETRY))
+                       fprintf(stderr, "GS Copy Shader:\n");
                si_shader_dump(sscreen, si_shader_ctx->shader, debug,
                               TGSI_PROCESSOR_GEOMETRY);
                r = si_shader_binary_upload(sscreen, si_shader_ctx->shader);
@@ -4035,7 +4332,7 @@ void si_dump_shader_key(unsigned shader, union si_shader_key *key, FILE *f)
                break;
 
        case PIPE_SHADER_FRAGMENT:
-               fprintf(f, "  export_16bpc = 0x%X\n", key->ps.export_16bpc);
+               fprintf(f, "  spi_shader_col_format = 0x%x\n", key->ps.spi_shader_col_format);
                fprintf(f, "  last_cbuf = %u\n", key->ps.last_cbuf);
                fprintf(f, "  color_two_side = %u\n", key->ps.color_two_side);
                fprintf(f, "  alpha_func = %u\n", key->ps.alpha_func);
@@ -4049,47 +4346,26 @@ void si_dump_shader_key(unsigned shader, union si_shader_key *key, FILE *f)
        }
 }
 
-int si_shader_create(struct si_screen *sscreen, LLVMTargetMachineRef tm,
-                    struct si_shader *shader,
-                    struct pipe_debug_callback *debug)
+static void si_init_shader_ctx(struct si_shader_context *ctx,
+                              struct si_screen *sscreen,
+                              struct si_shader *shader,
+                              LLVMTargetMachineRef tm,
+                              struct tgsi_shader_info *info)
 {
-       struct si_shader_selector *sel = shader->selector;
-       struct tgsi_token *tokens = sel->tokens;
-       struct si_shader_context si_shader_ctx;
-       struct lp_build_tgsi_context * bld_base;
-       struct tgsi_shader_info stipple_shader_info;
-       LLVMModuleRef mod;
-       int r = 0;
-       bool poly_stipple = sel->type == PIPE_SHADER_FRAGMENT &&
-                           shader->key.ps.poly_stipple;
-       bool dump = r600_can_dump_shader(&sscreen->b, sel->info.processor);
-
-       if (poly_stipple) {
-               tokens = util_pstipple_create_fragment_shader(tokens, NULL,
-                                               SI_POLY_STIPPLE_SAMPLER,
-                                               TGSI_FILE_INPUT);
-               tgsi_scan_shader(tokens, &stipple_shader_info);
-       }
-
-       /* Dump TGSI code before doing TGSI->LLVM conversion in case the
-        * conversion fails. */
-       if (dump && !(sscreen->b.debug_flags & DBG_NO_TGSI)) {
-               si_dump_shader_key(sel->type, &shader->key, stderr);
-               tgsi_dump(tokens, 0);
-               si_dump_streamout(&sel->so);
-       }
-
-       assert(shader->nparam == 0);
-
-       memset(&si_shader_ctx, 0, sizeof(si_shader_ctx));
-       radeon_llvm_context_init(&si_shader_ctx.radeon_bld);
-       bld_base = &si_shader_ctx.radeon_bld.soa.bld_base;
-
-       if (sel->type != PIPE_SHADER_COMPUTE)
-               shader->dx10_clamp_mode = true;
+       struct lp_build_tgsi_context *bld_base;
+
+       memset(ctx, 0, sizeof(*ctx));
+       radeon_llvm_context_init(&ctx->radeon_bld);
+       ctx->tm = tm;
+       ctx->screen = sscreen;
+       if (shader && shader->selector)
+               ctx->type = shader->selector->info.processor;
+       else
+               ctx->type = -1;
+       ctx->shader = shader;
 
-       shader->uses_instanceid = sel->info.uses_instanceid;
-       bld_base->info = poly_stipple ? &stipple_shader_info : &sel->info;
+       bld_base = &ctx->radeon_bld.soa.bld_base;
+       bld_base->info = info;
        bld_base->emit_fetch_funcs[TGSI_FILE_CONSTANT] = fetch_constant;
 
        bld_base->op_actions[TGSI_OPCODE_INTERP_CENTROID] = interp_action;
@@ -4125,12 +4401,45 @@ int si_shader_create(struct si_screen *sscreen, LLVMTargetMachineRef tm,
                bld_base->op_actions[TGSI_OPCODE_MIN].emit = build_tgsi_intrinsic_nomem;
                bld_base->op_actions[TGSI_OPCODE_MIN].intr_name = "llvm.minnum.f32";
        }
+}
 
+int si_shader_create(struct si_screen *sscreen, LLVMTargetMachineRef tm,
+                    struct si_shader *shader,
+                    struct pipe_debug_callback *debug)
+{
+       struct si_shader_selector *sel = shader->selector;
+       struct tgsi_token *tokens = sel->tokens;
+       struct si_shader_context si_shader_ctx;
+       struct lp_build_tgsi_context * bld_base;
+       struct tgsi_shader_info stipple_shader_info;
+       LLVMModuleRef mod;
+       int r = 0;
+       bool poly_stipple = sel->type == PIPE_SHADER_FRAGMENT &&
+                           shader->key.ps.poly_stipple;
+
+       if (poly_stipple) {
+               tokens = util_pstipple_create_fragment_shader(tokens, NULL,
+                                               SI_POLY_STIPPLE_SAMPLER,
+                                               TGSI_FILE_SYSTEM_VALUE);
+               tgsi_scan_shader(tokens, &stipple_shader_info);
+       }
+
+       /* Dump TGSI code before doing TGSI->LLVM conversion in case the
+        * conversion fails. */
+       if (r600_can_dump_shader(&sscreen->b, sel->info.processor) &&
+           !(sscreen->b.debug_flags & DBG_NO_TGSI)) {
+               si_dump_shader_key(sel->type, &shader->key, stderr);
+               tgsi_dump(tokens, 0);
+               si_dump_streamout(&sel->so);
+       }
+
+       si_init_shader_ctx(&si_shader_ctx, sscreen, shader, tm,
+                          poly_stipple ? &stipple_shader_info : &sel->info);
+
+       shader->uses_instanceid = sel->info.uses_instanceid;
+
+       bld_base = &si_shader_ctx.radeon_bld.soa.bld_base;
        si_shader_ctx.radeon_bld.load_system_value = declare_system_value;
-       si_shader_ctx.shader = shader;
-       si_shader_ctx.type = tgsi_get_processor_type(tokens);
-       si_shader_ctx.screen = sscreen;
-       si_shader_ctx.tm = tm;
 
        switch (si_shader_ctx.type) {
        case TGSI_PROCESSOR_VERTEX:
@@ -4189,11 +4498,18 @@ int si_shader_create(struct si_screen *sscreen, LLVMTargetMachineRef tm,
                goto out;
        }
 
+       LLVMBuildRetVoid(bld_base->base.gallivm->builder);
+       mod = bld_base->base.gallivm->module;
+
+       /* Dump LLVM IR before any optimization passes */
+       if (sscreen->b.debug_flags & DBG_PREOPT_IR &&
+           r600_can_dump_shader(&sscreen->b, si_shader_ctx.type))
+               LLVMDumpModule(mod);
+
        radeon_llvm_finalize_module(&si_shader_ctx.radeon_bld);
 
-       mod = bld_base->base.gallivm->module;
        r = si_compile_llvm(sscreen, &shader->binary, &shader->config, tm,
-                           mod, debug, si_shader_ctx.type);
+                           mod, debug, si_shader_ctx.type, "TGSI shader");
        if (r) {
                fprintf(stderr, "LLVM failed to compile shader\n");
                goto out;
@@ -4212,10 +4528,9 @@ int si_shader_create(struct si_screen *sscreen, LLVMTargetMachineRef tm,
        if (si_shader_ctx.type == TGSI_PROCESSOR_GEOMETRY) {
                shader->gs_copy_shader = CALLOC_STRUCT(si_shader);
                shader->gs_copy_shader->selector = shader->selector;
-               shader->gs_copy_shader->key = shader->key;
                si_shader_ctx.shader = shader->gs_copy_shader;
                if ((r = si_generate_gs_copy_shader(sscreen, &si_shader_ctx,
-                                                   shader, dump, debug))) {
+                                                   shader, debug))) {
                        free(shader->gs_copy_shader);
                        shader->gs_copy_shader = NULL;
                        goto out;
@@ -4230,14 +4545,6 @@ out:
        return r;
 }
 
-void si_shader_destroy_binary(struct radeon_shader_binary *binary)
-{
-       FREE(binary->code);
-       FREE(binary->rodata);
-       FREE(binary->relocs);
-       FREE(binary->disasm_string);
-}
-
 void si_shader_destroy(struct si_shader *shader)
 {
        if (shader->gs_copy_shader) {
@@ -4249,5 +4556,6 @@ void si_shader_destroy(struct si_shader *shader)
                r600_resource_reference(&shader->scratch_bo, NULL);
 
        r600_resource_reference(&shader->bo, NULL);
-       si_shader_destroy_binary(&shader->binary);
+
+       radeon_shader_binary_clean(&shader->binary);
 }