radeonsi: move non-LLVM code out of si_shader_llvm.c
[mesa.git] / src / gallium / drivers / radeonsi / si_shader.c
index e68bd0388459cd9b1a40901f0a20e2e02ddc2293..9f8be2b72142be8248cdd497485631720bdc3c0e 100644 (file)
  * USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-#include <llvm/Config/llvm-config.h>
-
 #include "util/u_memory.h"
 #include "tgsi/tgsi_strings.h"
 #include "tgsi/tgsi_from_mesa.h"
 
 #include "ac_exp_param.h"
-#include "ac_shader_util.h"
 #include "ac_rtld.h"
-#include "ac_llvm_util.h"
 #include "si_shader_internal.h"
 #include "si_pipe.h"
 #include "sid.h"
@@ -45,34 +41,10 @@ static const char scratch_rsrc_dword0_symbol[] =
 static const char scratch_rsrc_dword1_symbol[] =
        "SCRATCH_RSRC_DWORD1";
 
-static void si_llvm_emit_barrier(struct si_shader_context *ctx);
-
 static void si_dump_shader_key(const struct si_shader *shader, FILE *f);
 
 static void si_build_vs_prolog_function(struct si_shader_context *ctx,
                                        union si_shader_part_key *key);
-static void si_build_tcs_epilog_function(struct si_shader_context *ctx,
-                                        union si_shader_part_key *key);
-static void si_build_ps_prolog_function(struct si_shader_context *ctx,
-                                       union si_shader_part_key *key);
-static void si_build_ps_epilog_function(struct si_shader_context *ctx,
-                                       union si_shader_part_key *key);
-static void si_fix_resource_usage(struct si_screen *sscreen,
-                                 struct si_shader *shader);
-
-/* Ideally pass the sample mask input to the PS epilog as v14, which
- * is its usual location, so that the shader doesn't have to add v_mov.
- */
-#define PS_EPILOG_SAMPLEMASK_MIN_LOC 14
-
-static bool llvm_type_is_64bit(struct si_shader_context *ctx,
-                              LLVMTypeRef type)
-{
-       if (type == ctx->ac.i64 || type == ctx->ac.f64)
-               return true;
-
-       return false;
-}
 
 /** Whether the shader runs as a combination of multiple API shaders */
 static bool is_multi_part_shader(struct si_shader_context *ctx)
@@ -87,7 +59,7 @@ static bool is_multi_part_shader(struct si_shader_context *ctx)
 }
 
 /** Whether the shader runs on a merged HW stage (LSHS or ESGS) */
-static bool is_merged_shader(struct si_shader_context *ctx)
+bool si_is_merged_shader(struct si_shader_context *ctx)
 {
        return ctx->shader->key.as_ngg || is_multi_part_shader(ctx);
 }
@@ -188,12 +160,12 @@ static LLVMValueRef unpack_llvm_param(struct si_shader_context *ctx,
 
        if (rshift)
                value = LLVMBuildLShr(ctx->ac.builder, value,
-                                     LLVMConstInt(ctx->i32, rshift, 0), "");
+                                     LLVMConstInt(ctx->ac.i32, rshift, 0), "");
 
        if (rshift + bitwidth < 32) {
                unsigned mask = (1 << bitwidth) - 1;
                value = LLVMBuildAnd(ctx->ac.builder, value,
-                                    LLVMConstInt(ctx->i32, mask, 0), "");
+                                    LLVMConstInt(ctx->ac.i32, mask, 0), "");
        }
 
        return value;
@@ -208,161 +180,6 @@ LLVMValueRef si_unpack_param(struct si_shader_context *ctx,
        return unpack_llvm_param(ctx, value, rshift, bitwidth);
 }
 
-static LLVMValueRef get_rel_patch_id(struct si_shader_context *ctx)
-{
-       switch (ctx->type) {
-       case PIPE_SHADER_TESS_CTRL:
-               return si_unpack_param(ctx, ctx->args.tcs_rel_ids, 0, 8);
-
-       case PIPE_SHADER_TESS_EVAL:
-               return ac_get_arg(&ctx->ac, ctx->tes_rel_patch_id);
-
-       default:
-               assert(0);
-               return NULL;
-       }
-}
-
-/* Tessellation shaders pass outputs to the next shader using LDS.
- *
- * LS outputs = TCS inputs
- * TCS outputs = TES inputs
- *
- * The LDS layout is:
- * - TCS inputs for patch 0
- * - TCS inputs for patch 1
- * - TCS inputs for patch 2            = get_tcs_in_current_patch_offset (if RelPatchID==2)
- * - ...
- * - TCS outputs for patch 0            = get_tcs_out_patch0_offset
- * - Per-patch TCS outputs for patch 0  = get_tcs_out_patch0_patch_data_offset
- * - TCS outputs for patch 1
- * - Per-patch TCS outputs for patch 1
- * - TCS outputs for patch 2            = get_tcs_out_current_patch_offset (if RelPatchID==2)
- * - Per-patch TCS outputs for patch 2  = get_tcs_out_current_patch_data_offset (if RelPatchID==2)
- * - ...
- *
- * All three shaders VS(LS), TCS, TES share the same LDS space.
- */
-
-static LLVMValueRef
-get_tcs_in_patch_stride(struct si_shader_context *ctx)
-{
-       return si_unpack_param(ctx, ctx->vs_state_bits, 8, 13);
-}
-
-static unsigned get_tcs_out_vertex_dw_stride_constant(struct si_shader_context *ctx)
-{
-       assert(ctx->type == PIPE_SHADER_TESS_CTRL);
-
-       if (ctx->shader->key.mono.u.ff_tcs_inputs_to_copy)
-               return util_last_bit64(ctx->shader->key.mono.u.ff_tcs_inputs_to_copy) * 4;
-
-       return util_last_bit64(ctx->shader->selector->outputs_written) * 4;
-}
-
-static LLVMValueRef get_tcs_out_vertex_dw_stride(struct si_shader_context *ctx)
-{
-       unsigned stride = get_tcs_out_vertex_dw_stride_constant(ctx);
-
-       return LLVMConstInt(ctx->i32, stride, 0);
-}
-
-static LLVMValueRef get_tcs_out_patch_stride(struct si_shader_context *ctx)
-{
-       if (ctx->shader->key.mono.u.ff_tcs_inputs_to_copy)
-               return si_unpack_param(ctx, ctx->tcs_out_lds_layout, 0, 13);
-
-       const struct si_shader_info *info = &ctx->shader->selector->info;
-       unsigned tcs_out_vertices = info->properties[TGSI_PROPERTY_TCS_VERTICES_OUT];
-       unsigned vertex_dw_stride = get_tcs_out_vertex_dw_stride_constant(ctx);
-       unsigned num_patch_outputs = util_last_bit64(ctx->shader->selector->patch_outputs_written);
-       unsigned patch_dw_stride = tcs_out_vertices * vertex_dw_stride +
-                                  num_patch_outputs * 4;
-       return LLVMConstInt(ctx->i32, patch_dw_stride, 0);
-}
-
-static LLVMValueRef
-get_tcs_out_patch0_offset(struct si_shader_context *ctx)
-{
-       return LLVMBuildMul(ctx->ac.builder,
-                           si_unpack_param(ctx, ctx->tcs_out_lds_offsets, 0, 16),
-                           LLVMConstInt(ctx->i32, 4, 0), "");
-}
-
-static LLVMValueRef
-get_tcs_out_patch0_patch_data_offset(struct si_shader_context *ctx)
-{
-       return LLVMBuildMul(ctx->ac.builder,
-                           si_unpack_param(ctx, ctx->tcs_out_lds_offsets, 16, 16),
-                           LLVMConstInt(ctx->i32, 4, 0), "");
-}
-
-static LLVMValueRef
-get_tcs_in_current_patch_offset(struct si_shader_context *ctx)
-{
-       LLVMValueRef patch_stride = get_tcs_in_patch_stride(ctx);
-       LLVMValueRef rel_patch_id = get_rel_patch_id(ctx);
-
-       return LLVMBuildMul(ctx->ac.builder, patch_stride, rel_patch_id, "");
-}
-
-static LLVMValueRef
-get_tcs_out_current_patch_offset(struct si_shader_context *ctx)
-{
-       LLVMValueRef patch0_offset = get_tcs_out_patch0_offset(ctx);
-       LLVMValueRef patch_stride = get_tcs_out_patch_stride(ctx);
-       LLVMValueRef rel_patch_id = get_rel_patch_id(ctx);
-
-       return ac_build_imad(&ctx->ac, patch_stride, rel_patch_id, patch0_offset);
-}
-
-static LLVMValueRef
-get_tcs_out_current_patch_data_offset(struct si_shader_context *ctx)
-{
-       LLVMValueRef patch0_patch_data_offset =
-               get_tcs_out_patch0_patch_data_offset(ctx);
-       LLVMValueRef patch_stride = get_tcs_out_patch_stride(ctx);
-       LLVMValueRef rel_patch_id = get_rel_patch_id(ctx);
-
-       return ac_build_imad(&ctx->ac, patch_stride, rel_patch_id, patch0_patch_data_offset);
-}
-
-static LLVMValueRef get_num_tcs_out_vertices(struct si_shader_context *ctx)
-{
-       unsigned tcs_out_vertices =
-               ctx->shader->selector ?
-               ctx->shader->selector->info.properties[TGSI_PROPERTY_TCS_VERTICES_OUT] : 0;
-
-       /* If !tcs_out_vertices, it's either the fixed-func TCS or the TCS epilog. */
-       if (ctx->type == PIPE_SHADER_TESS_CTRL && tcs_out_vertices)
-               return LLVMConstInt(ctx->i32, tcs_out_vertices, 0);
-
-       return si_unpack_param(ctx, ctx->tcs_offchip_layout, 6, 6);
-}
-
-static LLVMValueRef get_tcs_in_vertex_dw_stride(struct si_shader_context *ctx)
-{
-       unsigned stride;
-
-       switch (ctx->type) {
-       case PIPE_SHADER_VERTEX:
-               stride = ctx->shader->selector->lshs_vertex_stride / 4;
-               return LLVMConstInt(ctx->i32, stride, 0);
-
-       case PIPE_SHADER_TESS_CTRL:
-               if (ctx->screen->info.chip_class >= GFX9 &&
-                   ctx->shader->is_monolithic) {
-                       stride = ctx->shader->key.part.tcs.ls->lshs_vertex_stride / 4;
-                       return LLVMConstInt(ctx->i32, stride, 0);
-               }
-               return si_unpack_param(ctx, ctx->vs_state_bits, 24, 8);
-
-       default:
-               assert(0);
-               return NULL;
-       }
-}
-
 static LLVMValueRef unpack_sint16(struct si_shader_context *ctx,
                                 LLVMValueRef i32, unsigned index)
 {
@@ -370,12 +187,12 @@ static LLVMValueRef unpack_sint16(struct si_shader_context *ctx,
 
        if (index == 1)
                return LLVMBuildAShr(ctx->ac.builder, i32,
-                                    LLVMConstInt(ctx->i32, 16, 0), "");
+                                    LLVMConstInt(ctx->ac.i32, 16, 0), "");
 
        return LLVMBuildSExt(ctx->ac.builder,
                             LLVMBuildTrunc(ctx->ac.builder, i32,
                                            ctx->ac.i16, ""),
-                            ctx->i32, "");
+                            ctx->ac.i32, "");
 }
 
 void si_llvm_load_input_vs(
@@ -390,13 +207,13 @@ void si_llvm_load_input_vs(
                LLVMValueRef vertex_id = ctx->abi.vertex_id;
                LLVMValueRef sel_x1 = LLVMBuildICmp(ctx->ac.builder,
                                                    LLVMIntULE, vertex_id,
-                                                   ctx->i32_1, "");
+                                                   ctx->ac.i32_1, "");
                /* Use LLVMIntNE, because we have 3 vertices and only
                 * the middle one should use y2.
                 */
                LLVMValueRef sel_y1 = LLVMBuildICmp(ctx->ac.builder,
                                                    LLVMIntNE, vertex_id,
-                                                   ctx->i32_1, "");
+                                                   ctx->ac.i32_1, "");
 
                unsigned param_vs_blit_inputs = ctx->vs_blit_inputs.arg_index;
                if (input_index == 0) {
@@ -416,8 +233,8 @@ void si_llvm_load_input_vs(
                        LLVMValueRef y = LLVMBuildSelect(ctx->ac.builder, sel_y1,
                                                         y1, y2, "");
 
-                       out[0] = LLVMBuildSIToFP(ctx->ac.builder, x, ctx->f32, "");
-                       out[1] = LLVMBuildSIToFP(ctx->ac.builder, y, ctx->f32, "");
+                       out[0] = LLVMBuildSIToFP(ctx->ac.builder, x, ctx->ac.f32, "");
+                       out[1] = LLVMBuildSIToFP(ctx->ac.builder, y, ctx->ac.f32, "");
                        out[2] = LLVMGetParam(ctx->main_fn,
                                              param_vs_blit_inputs + 2);
                        out[3] = ctx->ac.f32_1;
@@ -467,7 +284,7 @@ void si_llvm_load_input_vs(
                unsigned index= input_index - num_vbos_in_user_sgprs;
                vb_desc = ac_build_load_to_sgpr(&ctx->ac,
                                                ac_get_arg(&ctx->ac, ctx->vertex_buffers),
-                                               LLVMConstInt(ctx->i32, index, 0));
+                                               LLVMConstInt(ctx->ac.i32, index, 0));
        }
 
        vertex_index = LLVMGetParam(ctx->main_fn,
@@ -491,7 +308,7 @@ void si_llvm_load_input_vs(
                                fix_fetch.u.format, fix_fetch.u.reverse, !opencode,
                                vb_desc, vertex_index, ctx->ac.i32_0, ctx->ac.i32_0, 0, true);
                for (unsigned i = 0; i < 4; ++i)
-                       out[i] = LLVMBuildExtractElement(ctx->ac.builder, tmp, LLVMConstInt(ctx->i32, i, false), "");
+                       out[i] = LLVMBuildExtractElement(ctx->ac.builder, tmp, LLVMConstInt(ctx->ac.i32, i, false), "");
                return;
        }
 
@@ -513,7 +330,7 @@ void si_llvm_load_input_vs(
        }
 
        for (unsigned i = 0; i < num_fetches; ++i) {
-               LLVMValueRef voffset = LLVMConstInt(ctx->i32, fetch_stride * i, 0);
+               LLVMValueRef voffset = LLVMConstInt(ctx->ac.i32, fetch_stride * i, 0);
                fetches[i] = ac_build_buffer_load_format(&ctx->ac, vb_desc, vertex_index, voffset,
                                                         channels_per_fetch, 0, true);
        }
@@ -521,7 +338,7 @@ void si_llvm_load_input_vs(
        if (num_fetches == 1 && channels_per_fetch > 1) {
                LLVMValueRef fetch = fetches[0];
                for (unsigned i = 0; i < channels_per_fetch; ++i) {
-                       tmp = LLVMConstInt(ctx->i32, i, false);
+                       tmp = LLVMConstInt(ctx->ac.i32, i, false);
                        fetches[i] = LLVMBuildExtractElement(
                                ctx->ac.builder, fetch, tmp, "");
                }
@@ -530,7 +347,7 @@ void si_llvm_load_input_vs(
        }
 
        for (unsigned i = num_fetches; i < 4; ++i)
-               fetches[i] = LLVMGetUndef(ctx->f32);
+               fetches[i] = LLVMGetUndef(ctx->ac.f32);
 
        if (fix_fetch.u.log_size <= 1 && fix_fetch.u.num_channels_m1 == 2 &&
            required_channels == 4) {
@@ -547,11 +364,11 @@ void si_llvm_load_input_vs(
                 * convert it to a signed one.
                 */
                LLVMValueRef tmp = fetches[3];
-               LLVMValueRef c30 = LLVMConstInt(ctx->i32, 30, 0);
+               LLVMValueRef c30 = LLVMConstInt(ctx->ac.i32, 30, 0);
 
                /* First, recover the sign-extended signed integer value. */
                if (fix_fetch.u.format == AC_FETCH_FORMAT_SSCALED)
-                       tmp = LLVMBuildFPToUI(ctx->ac.builder, tmp, ctx->i32, "");
+                       tmp = LLVMBuildFPToUI(ctx->ac.builder, tmp, ctx->ac.i32, "");
                else
                        tmp = ac_to_integer(&ctx->ac, tmp);
 
@@ -563,18 +380,18 @@ void si_llvm_load_input_vs(
                 */
                tmp = LLVMBuildShl(ctx->ac.builder, tmp,
                                   fix_fetch.u.format == AC_FETCH_FORMAT_SNORM ?
-                                  LLVMConstInt(ctx->i32, 7, 0) : c30, "");
+                                  LLVMConstInt(ctx->ac.i32, 7, 0) : c30, "");
                tmp = LLVMBuildAShr(ctx->ac.builder, tmp, c30, "");
 
                /* Convert back to the right type. */
                if (fix_fetch.u.format == AC_FETCH_FORMAT_SNORM) {
                        LLVMValueRef clamp;
-                       LLVMValueRef neg_one = LLVMConstReal(ctx->f32, -1.0);
-                       tmp = LLVMBuildSIToFP(ctx->ac.builder, tmp, ctx->f32, "");
+                       LLVMValueRef neg_one = LLVMConstReal(ctx->ac.f32, -1.0);
+                       tmp = LLVMBuildSIToFP(ctx->ac.builder, tmp, ctx->ac.f32, "");
                        clamp = LLVMBuildFCmp(ctx->ac.builder, LLVMRealULT, tmp, neg_one, "");
                        tmp = LLVMBuildSelect(ctx->ac.builder, clamp, neg_one, tmp, "");
                } else if (fix_fetch.u.format == AC_FETCH_FORMAT_SSCALED) {
-                       tmp = LLVMBuildSIToFP(ctx->ac.builder, tmp, ctx->f32, "");
+                       tmp = LLVMBuildSIToFP(ctx->ac.builder, tmp, ctx->ac.f32, "");
                }
 
                fetches[3] = tmp;
@@ -588,7 +405,7 @@ LLVMValueRef si_get_primitive_id(struct si_shader_context *ctx,
                                 unsigned swizzle)
 {
        if (swizzle > 0)
-               return ctx->i32_0;
+               return ctx->ac.i32_0;
 
        switch (ctx->type) {
        case PIPE_SHADER_VERTEX:
@@ -601,2628 +418,643 @@ LLVMValueRef si_get_primitive_id(struct si_shader_context *ctx,
                return ac_get_arg(&ctx->ac, ctx->args.gs_prim_id);
        default:
                assert(0);
-               return ctx->i32_0;
+               return ctx->ac.i32_0;
        }
 }
 
-static LLVMValueRef get_dw_address_from_generic_indices(struct si_shader_context *ctx,
-                                                       LLVMValueRef vertex_dw_stride,
-                                                       LLVMValueRef base_addr,
-                                                       LLVMValueRef vertex_index,
-                                                       LLVMValueRef param_index,
-                                                       ubyte name, ubyte index)
+static LLVMValueRef get_base_vertex(struct ac_shader_abi *abi)
 {
-       if (vertex_dw_stride) {
-               base_addr = ac_build_imad(&ctx->ac, vertex_index,
-                                         vertex_dw_stride, base_addr);
-       }
+       struct si_shader_context *ctx = si_shader_context_from_abi(abi);
 
-       if (param_index) {
-               base_addr = ac_build_imad(&ctx->ac, param_index,
-                                         LLVMConstInt(ctx->i32, 4, 0), base_addr);
-       }
+       /* For non-indexed draws, the base vertex set by the driver
+        * (for direct draws) or the CP (for indirect draws) is the
+        * first vertex ID, but GLSL expects 0 to be returned.
+        */
+       LLVMValueRef vs_state = ac_get_arg(&ctx->ac,
+                                          ctx->vs_state_bits);
+       LLVMValueRef indexed;
 
-       int param = name == TGSI_SEMANTIC_PATCH ||
-                   name == TGSI_SEMANTIC_TESSINNER ||
-                   name == TGSI_SEMANTIC_TESSOUTER ?
-               si_shader_io_get_unique_index_patch(name, index) :
-               si_shader_io_get_unique_index(name, index, false);
+       indexed = LLVMBuildLShr(ctx->ac.builder, vs_state, ctx->ac.i32_1, "");
+       indexed = LLVMBuildTrunc(ctx->ac.builder, indexed, ctx->ac.i1, "");
 
-       /* Add the base address of the element. */
-       return LLVMBuildAdd(ctx->ac.builder, base_addr,
-                           LLVMConstInt(ctx->i32, param * 4, 0), "");
+       return LLVMBuildSelect(ctx->ac.builder, indexed,
+                              ac_get_arg(&ctx->ac, ctx->args.base_vertex),
+                              ctx->ac.i32_0, "");
 }
 
-/* The offchip buffer layout for TCS->TES is
- *
- * - attribute 0 of patch 0 vertex 0
- * - attribute 0 of patch 0 vertex 1
- * - attribute 0 of patch 0 vertex 2
- *   ...
- * - attribute 0 of patch 1 vertex 0
- * - attribute 0 of patch 1 vertex 1
- *   ...
- * - attribute 1 of patch 0 vertex 0
- * - attribute 1 of patch 0 vertex 1
- *   ...
- * - per patch attribute 0 of patch 0
- * - per patch attribute 0 of patch 1
- *   ...
- *
- * Note that every attribute has 4 components.
- */
-static LLVMValueRef get_tcs_tes_buffer_address(struct si_shader_context *ctx,
-                                              LLVMValueRef rel_patch_id,
-                                               LLVMValueRef vertex_index,
-                                               LLVMValueRef param_index)
+static LLVMValueRef get_block_size(struct ac_shader_abi *abi)
 {
-       LLVMValueRef base_addr, vertices_per_patch, num_patches, total_vertices;
-       LLVMValueRef param_stride, constant16;
-
-       vertices_per_patch = get_num_tcs_out_vertices(ctx);
-       num_patches = si_unpack_param(ctx, ctx->tcs_offchip_layout, 0, 6);
-       total_vertices = LLVMBuildMul(ctx->ac.builder, vertices_per_patch,
-                                     num_patches, "");
-
-       constant16 = LLVMConstInt(ctx->i32, 16, 0);
-       if (vertex_index) {
-               base_addr = ac_build_imad(&ctx->ac, rel_patch_id,
-                                         vertices_per_patch, vertex_index);
-               param_stride = total_vertices;
-       } else {
-               base_addr = rel_patch_id;
-               param_stride = num_patches;
-       }
+       struct si_shader_context *ctx = si_shader_context_from_abi(abi);
 
-       base_addr = ac_build_imad(&ctx->ac, param_index, param_stride, base_addr);
-       base_addr = LLVMBuildMul(ctx->ac.builder, base_addr, constant16, "");
+       LLVMValueRef values[3];
+       LLVMValueRef result;
+       unsigned i;
+       unsigned *properties = ctx->shader->selector->info.properties;
 
-       if (!vertex_index) {
-               LLVMValueRef patch_data_offset =
-                          si_unpack_param(ctx, ctx->tcs_offchip_layout, 12, 20);
+       if (properties[TGSI_PROPERTY_CS_FIXED_BLOCK_WIDTH] != 0) {
+               unsigned sizes[3] = {
+                       properties[TGSI_PROPERTY_CS_FIXED_BLOCK_WIDTH],
+                       properties[TGSI_PROPERTY_CS_FIXED_BLOCK_HEIGHT],
+                       properties[TGSI_PROPERTY_CS_FIXED_BLOCK_DEPTH]
+               };
 
-               base_addr = LLVMBuildAdd(ctx->ac.builder, base_addr,
-                                        patch_data_offset, "");
-       }
-       return base_addr;
-}
+               for (i = 0; i < 3; ++i)
+                       values[i] = LLVMConstInt(ctx->ac.i32, sizes[i], 0);
 
-static LLVMValueRef get_tcs_tes_buffer_address_from_generic_indices(
-                                       struct si_shader_context *ctx,
-                                       LLVMValueRef vertex_index,
-                                       LLVMValueRef param_index,
-                                       ubyte name, ubyte index)
-{
-       unsigned param_index_base;
-
-       param_index_base = name == TGSI_SEMANTIC_PATCH ||
-                          name == TGSI_SEMANTIC_TESSINNER ||
-                          name == TGSI_SEMANTIC_TESSOUTER ?
-               si_shader_io_get_unique_index_patch(name, index) :
-               si_shader_io_get_unique_index(name, index, false);
-
-       if (param_index) {
-               param_index = LLVMBuildAdd(ctx->ac.builder, param_index,
-                                          LLVMConstInt(ctx->i32, param_index_base, 0),
-                                          "");
+               result = ac_build_gather_values(&ctx->ac, values, 3);
        } else {
-               param_index = LLVMConstInt(ctx->i32, param_index_base, 0);
+               result = ac_get_arg(&ctx->ac, ctx->block_size);
        }
 
-       return get_tcs_tes_buffer_address(ctx, get_rel_patch_id(ctx),
-                                         vertex_index, param_index);
-}
-
-static LLVMValueRef si_build_gather_64bit(struct si_shader_context *ctx,
-                                         LLVMTypeRef type,
-                                         LLVMValueRef val1,
-                                         LLVMValueRef val2)
-{
-       LLVMValueRef values[2] = {
-               ac_to_integer(&ctx->ac, val1),
-               ac_to_integer(&ctx->ac, val2),
-       };
-       LLVMValueRef result = ac_build_gather_values(&ctx->ac, values, 2);
-       return LLVMBuildBitCast(ctx->ac.builder, result, type, "");
+       return result;
 }
 
-static LLVMValueRef buffer_load(struct si_shader_context *ctx,
-                                LLVMTypeRef type, unsigned swizzle,
-                                LLVMValueRef buffer, LLVMValueRef offset,
-                                LLVMValueRef base, bool can_speculate)
+void si_declare_compute_memory(struct si_shader_context *ctx)
 {
-       LLVMValueRef value, value2;
-       LLVMTypeRef vec_type = LLVMVectorType(type, 4);
-
-       if (swizzle == ~0) {
-               value = ac_build_buffer_load(&ctx->ac, buffer, 4, NULL, base, offset,
-                                            0, ac_glc, can_speculate, false);
+       struct si_shader_selector *sel = ctx->shader->selector;
+       unsigned lds_size = sel->info.properties[TGSI_PROPERTY_CS_LOCAL_SIZE];
 
-               return LLVMBuildBitCast(ctx->ac.builder, value, vec_type, "");
-       }
+       LLVMTypeRef i8p = LLVMPointerType(ctx->ac.i8, AC_ADDR_SPACE_LDS);
+       LLVMValueRef var;
 
-       if (!llvm_type_is_64bit(ctx, type)) {
-               value = ac_build_buffer_load(&ctx->ac, buffer, 4, NULL, base, offset,
-                                            0, ac_glc, can_speculate, false);
+       assert(!ctx->ac.lds);
 
-               value = LLVMBuildBitCast(ctx->ac.builder, value, vec_type, "");
-               return LLVMBuildExtractElement(ctx->ac.builder, value,
-                                   LLVMConstInt(ctx->i32, swizzle, 0), "");
-       }
+       var = LLVMAddGlobalInAddressSpace(ctx->ac.module,
+                                         LLVMArrayType(ctx->ac.i8, lds_size),
+                                         "compute_lds",
+                                         AC_ADDR_SPACE_LDS);
+       LLVMSetAlignment(var, 64 * 1024);
 
-       value = ac_build_buffer_load(&ctx->ac, buffer, 1, NULL, base, offset,
-                                 swizzle * 4, ac_glc, can_speculate, false);
+       ctx->ac.lds = LLVMBuildBitCast(ctx->ac.builder, var, i8p, "");
+}
 
-       value2 = ac_build_buffer_load(&ctx->ac, buffer, 1, NULL, base, offset,
-                                  swizzle * 4 + 4, ac_glc, can_speculate, false);
+/* Initialize arguments for the shader export intrinsic */
+static void si_llvm_init_vs_export_args(struct si_shader_context *ctx,
+                                       LLVMValueRef *values,
+                                       unsigned target,
+                                       struct ac_export_args *args)
+{
+       args->enabled_channels = 0xf; /* writemask - default is 0xf */
+       args->valid_mask = 0; /* Specify whether the EXEC mask represents the valid mask */
+       args->done = 0; /* Specify whether this is the last export */
+       args->target = target; /* Specify the target we are exporting */
+       args->compr = false;
 
-       return si_build_gather_64bit(ctx, type, value, value2);
+       memcpy(&args->out[0], values, sizeof(values[0]) * 4);
 }
 
-/**
- * Load from LSHS LDS storage.
- *
- * \param type         output value type
- * \param swizzle      offset (typically 0..3); it can be ~0, which loads a vec4
- * \param dw_addr      address in dwords
- */
-static LLVMValueRef lshs_lds_load(struct si_shader_context *ctx,
-                                 LLVMTypeRef type, unsigned swizzle,
-                                 LLVMValueRef dw_addr)
+static void si_llvm_emit_clipvertex(struct si_shader_context *ctx,
+                                   struct ac_export_args *pos, LLVMValueRef *out_elts)
 {
-       LLVMValueRef value;
-
-       if (swizzle == ~0) {
-               LLVMValueRef values[4];
+       unsigned reg_index;
+       unsigned chan;
+       unsigned const_chan;
+       LLVMValueRef base_elt;
+       LLVMValueRef ptr = ac_get_arg(&ctx->ac, ctx->rw_buffers);
+       LLVMValueRef constbuf_index = LLVMConstInt(ctx->ac.i32,
+                                                  SI_VS_CONST_CLIP_PLANES, 0);
+       LLVMValueRef const_resource = ac_build_load_to_sgpr(&ctx->ac, ptr, constbuf_index);
 
-               for (unsigned chan = 0; chan < 4; chan++)
-                       values[chan] = lshs_lds_load(ctx, type, chan, dw_addr);
+       for (reg_index = 0; reg_index < 2; reg_index ++) {
+               struct ac_export_args *args = &pos[2 + reg_index];
 
-               return ac_build_gather_values(&ctx->ac, values, 4);
-       }
+               args->out[0] =
+               args->out[1] =
+               args->out[2] =
+               args->out[3] = LLVMConstReal(ctx->ac.f32, 0.0f);
 
-       /* Split 64-bit loads. */
-       if (llvm_type_is_64bit(ctx, type)) {
-               LLVMValueRef lo, hi;
+               /* Compute dot products of position and user clip plane vectors */
+               for (chan = 0; chan < 4; chan++) {
+                       for (const_chan = 0; const_chan < 4; const_chan++) {
+                               LLVMValueRef addr =
+                                       LLVMConstInt(ctx->ac.i32, ((reg_index * 4 + chan) * 4 +
+                                                               const_chan) * 4, 0);
+                               base_elt = si_buffer_load_const(ctx, const_resource,
+                                                               addr);
+                               args->out[chan] = ac_build_fmad(&ctx->ac, base_elt,
+                                                               out_elts[const_chan], args->out[chan]);
+                       }
+               }
 
-               lo = lshs_lds_load(ctx, ctx->i32, swizzle, dw_addr);
-               hi = lshs_lds_load(ctx, ctx->i32, swizzle + 1, dw_addr);
-               return si_build_gather_64bit(ctx, type, lo, hi);
+               args->enabled_channels = 0xf;
+               args->valid_mask = 0;
+               args->done = 0;
+               args->target = V_008DFC_SQ_EXP_POS + 2 + reg_index;
+               args->compr = 0;
        }
-
-       dw_addr = LLVMBuildAdd(ctx->ac.builder, dw_addr,
-                              LLVMConstInt(ctx->i32, swizzle, 0), "");
-
-       value = ac_lds_load(&ctx->ac, dw_addr);
-
-       return LLVMBuildBitCast(ctx->ac.builder, value, type, "");
 }
 
-/**
- * Store to LSHS LDS storage.
- *
- * \param swizzle      offset (typically 0..3)
- * \param dw_addr      address in dwords
- * \param value                value to store
- */
-static void lshs_lds_store(struct si_shader_context *ctx,
-                     unsigned dw_offset_imm, LLVMValueRef dw_addr,
-                     LLVMValueRef value)
+static void si_dump_streamout(struct pipe_stream_output_info *so)
 {
-       dw_addr = LLVMBuildAdd(ctx->ac.builder, dw_addr,
-                              LLVMConstInt(ctx->i32, dw_offset_imm, 0), "");
-
-       ac_lds_store(&ctx->ac, dw_addr, value);
-}
-
-enum si_tess_ring {
-       TCS_FACTOR_RING,
-       TESS_OFFCHIP_RING_TCS,
-       TESS_OFFCHIP_RING_TES,
-};
+       unsigned i;
 
-static LLVMValueRef get_tess_ring_descriptor(struct si_shader_context *ctx,
-                                            enum si_tess_ring ring)
-{
-       LLVMBuilderRef builder = ctx->ac.builder;
-       LLVMValueRef addr = ac_get_arg(&ctx->ac,
-                                      ring == TESS_OFFCHIP_RING_TES ?
-                                      ctx->tes_offchip_addr :
-                                      ctx->tcs_out_lds_layout);
-
-       /* TCS only receives high 13 bits of the address. */
-       if (ring == TESS_OFFCHIP_RING_TCS || ring == TCS_FACTOR_RING) {
-               addr = LLVMBuildAnd(builder, addr,
-                                   LLVMConstInt(ctx->i32, 0xfff80000, 0), "");
-       }
+       if (so->num_outputs)
+               fprintf(stderr, "STREAMOUT\n");
 
-       if (ring == TCS_FACTOR_RING) {
-               unsigned tf_offset = ctx->screen->tess_offchip_ring_size;
-               addr = LLVMBuildAdd(builder, addr,
-                                   LLVMConstInt(ctx->i32, tf_offset, 0), "");
+       for (i = 0; i < so->num_outputs; i++) {
+               unsigned mask = ((1 << so->output[i].num_components) - 1) <<
+                               so->output[i].start_component;
+               fprintf(stderr, "  %i: BUF%i[%i..%i] <- OUT[%i].%s%s%s%s\n",
+                       i, so->output[i].output_buffer,
+                       so->output[i].dst_offset, so->output[i].dst_offset + so->output[i].num_components - 1,
+                       so->output[i].register_index,
+                       mask & 1 ? "x" : "",
+                       mask & 2 ? "y" : "",
+                       mask & 4 ? "z" : "",
+                       mask & 8 ? "w" : "");
        }
-
-       uint32_t rsrc3 = S_008F0C_DST_SEL_X(V_008F0C_SQ_SEL_X) |
-                        S_008F0C_DST_SEL_Y(V_008F0C_SQ_SEL_Y) |
-                        S_008F0C_DST_SEL_Z(V_008F0C_SQ_SEL_Z) |
-                        S_008F0C_DST_SEL_W(V_008F0C_SQ_SEL_W);
-
-       if (ctx->screen->info.chip_class >= GFX10)
-               rsrc3 |= S_008F0C_FORMAT(V_008F0C_IMG_FORMAT_32_FLOAT) |
-                        S_008F0C_OOB_SELECT(V_008F0C_OOB_SELECT_RAW) |
-                        S_008F0C_RESOURCE_LEVEL(1);
-       else
-               rsrc3 |= S_008F0C_NUM_FORMAT(V_008F0C_BUF_NUM_FORMAT_FLOAT) |
-                        S_008F0C_DATA_FORMAT(V_008F0C_BUF_DATA_FORMAT_32);
-
-       LLVMValueRef desc[4];
-       desc[0] = addr;
-       desc[1] = LLVMConstInt(ctx->i32,
-                              S_008F04_BASE_ADDRESS_HI(ctx->screen->info.address32_hi), 0);
-       desc[2] = LLVMConstInt(ctx->i32, 0xffffffff, 0);
-       desc[3] = LLVMConstInt(ctx->i32, rsrc3, false);
-
-       return ac_build_gather_values(&ctx->ac, desc, 4);
 }
 
-static LLVMValueRef si_nir_load_tcs_varyings(struct ac_shader_abi *abi,
-                                            LLVMTypeRef type,
-                                            LLVMValueRef vertex_index,
-                                            LLVMValueRef param_index,
-                                            unsigned const_index,
-                                            unsigned location,
-                                            unsigned driver_location,
-                                            unsigned component,
-                                            unsigned num_components,
-                                            bool is_patch,
-                                            bool is_compact,
-                                            bool load_input)
+void si_emit_streamout_output(struct si_shader_context *ctx,
+                             LLVMValueRef const *so_buffers,
+                             LLVMValueRef const *so_write_offsets,
+                             struct pipe_stream_output *stream_out,
+                             struct si_shader_output_values *shader_out)
 {
-       struct si_shader_context *ctx = si_shader_context_from_abi(abi);
-       struct si_shader_info *info = &ctx->shader->selector->info;
-       LLVMValueRef dw_addr, stride;
-       ubyte name, index;
-
-       driver_location = driver_location / 4;
-
-       if (load_input) {
-               name = info->input_semantic_name[driver_location];
-               index = info->input_semantic_index[driver_location];
-       } else {
-               name = info->output_semantic_name[driver_location];
-               index = info->output_semantic_index[driver_location];
-       }
+       unsigned buf_idx = stream_out->output_buffer;
+       unsigned start = stream_out->start_component;
+       unsigned num_comps = stream_out->num_components;
+       LLVMValueRef out[4];
 
-       assert((name == TGSI_SEMANTIC_PATCH ||
-               name == TGSI_SEMANTIC_TESSINNER ||
-               name == TGSI_SEMANTIC_TESSOUTER) == is_patch);
+       assert(num_comps && num_comps <= 4);
+       if (!num_comps || num_comps > 4)
+               return;
 
-       if (load_input) {
-               stride = get_tcs_in_vertex_dw_stride(ctx);
-               dw_addr = get_tcs_in_current_patch_offset(ctx);
-       } else {
-               if (is_patch) {
-                       stride = NULL;
-                       dw_addr = get_tcs_out_current_patch_data_offset(ctx);
-               } else {
-                       stride = get_tcs_out_vertex_dw_stride(ctx);
-                       dw_addr = get_tcs_out_current_patch_offset(ctx);
-               }
-       }
+       /* Load the output as int. */
+       for (int j = 0; j < num_comps; j++) {
+               assert(stream_out->stream == shader_out->vertex_stream[start + j]);
 
-       if (!param_index) {
-               param_index = LLVMConstInt(ctx->i32, const_index, 0);
+               out[j] = ac_to_integer(&ctx->ac, shader_out->values[start + j]);
        }
 
-       dw_addr = get_dw_address_from_generic_indices(ctx, stride, dw_addr,
-                                                     vertex_index, param_index,
-                                                     name, index);
-
-       LLVMValueRef value[4];
-       for (unsigned i = 0; i < num_components; i++) {
-               unsigned offset = i;
-               if (llvm_type_is_64bit(ctx, type))
-                       offset *= 2;
+       /* Pack the output. */
+       LLVMValueRef vdata = NULL;
 
-               offset += component;
-               value[i + component] = lshs_lds_load(ctx, type, offset, dw_addr);
+       switch (num_comps) {
+       case 1: /* as i32 */
+               vdata = out[0];
+               break;
+       case 2: /* as v2i32 */
+       case 3: /* as v3i32 */
+               if (ac_has_vec3_support(ctx->screen->info.chip_class, false)) {
+                       vdata = ac_build_gather_values(&ctx->ac, out, num_comps);
+                       break;
+               }
+               /* as v4i32 (aligned to 4) */
+               out[3] = LLVMGetUndef(ctx->ac.i32);
+               /* fall through */
+       case 4: /* as v4i32 */
+               vdata = ac_build_gather_values(&ctx->ac, out, util_next_power_of_two(num_comps));
+               break;
        }
 
-       return ac_build_varying_gather_values(&ctx->ac, value, num_components, component);
+       ac_build_buffer_store_dword(&ctx->ac, so_buffers[buf_idx],
+                                   vdata, num_comps,
+                                   so_write_offsets[buf_idx],
+                                   ctx->ac.i32_0,
+                                   stream_out->dst_offset * 4, ac_glc | ac_slc);
 }
 
-LLVMValueRef si_nir_load_input_tes(struct ac_shader_abi *abi,
-                                  LLVMTypeRef type,
-                                  LLVMValueRef vertex_index,
-                                  LLVMValueRef param_index,
-                                  unsigned const_index,
-                                  unsigned location,
-                                  unsigned driver_location,
-                                  unsigned component,
-                                  unsigned num_components,
-                                  bool is_patch,
-                                  bool is_compact,
-                                  bool load_input)
-{
-       struct si_shader_context *ctx = si_shader_context_from_abi(abi);
-       struct si_shader_info *info = &ctx->shader->selector->info;
-       LLVMValueRef base, addr;
-
-       driver_location = driver_location / 4;
-       ubyte name = info->input_semantic_name[driver_location];
-       ubyte index = info->input_semantic_index[driver_location];
-
-       assert((name == TGSI_SEMANTIC_PATCH ||
-               name == TGSI_SEMANTIC_TESSINNER ||
-               name == TGSI_SEMANTIC_TESSOUTER) == is_patch);
+/**
+ * Write streamout data to buffers for vertex stream @p stream (different
+ * vertex streams can occur for GS copy shaders).
+ */
+void si_llvm_emit_streamout(struct si_shader_context *ctx,
+                           struct si_shader_output_values *outputs,
+                           unsigned noutput, unsigned stream)
+{
+       struct si_shader_selector *sel = ctx->shader->selector;
+       struct pipe_stream_output_info *so = &sel->so;
+       LLVMBuilderRef builder = ctx->ac.builder;
+       int i;
 
-       base = ac_get_arg(&ctx->ac, ctx->tcs_offchip_offset);
+       /* Get bits [22:16], i.e. (so_param >> 16) & 127; */
+       LLVMValueRef so_vtx_count =
+               si_unpack_param(ctx, ctx->streamout_config, 16, 7);
 
-       if (!param_index) {
-               param_index = LLVMConstInt(ctx->i32, const_index, 0);
-       }
+       LLVMValueRef tid = ac_get_thread_id(&ctx->ac);
 
-       addr = get_tcs_tes_buffer_address_from_generic_indices(ctx, vertex_index,
-                                                              param_index,
-                                                              name, index);
+       /* can_emit = tid < so_vtx_count; */
+       LLVMValueRef can_emit =
+               LLVMBuildICmp(builder, LLVMIntULT, tid, so_vtx_count, "");
 
-       /* TODO: This will generate rather ordinary llvm code, although it
-        * should be easy for the optimiser to fix up. In future we might want
-        * to refactor buffer_load().
-        */
-       LLVMValueRef value[4];
-       for (unsigned i = 0; i < num_components; i++) {
-               unsigned offset = i;
-               if (llvm_type_is_64bit(ctx, type)) {
-                       offset *= 2;
-                       if (offset == 4) {
-                               ubyte name = info->input_semantic_name[driver_location + 1];
-                               ubyte index = info->input_semantic_index[driver_location + 1];
-                                addr = get_tcs_tes_buffer_address_from_generic_indices(ctx,
-                                                                                       vertex_index,
-                                                                                       param_index,
-                                                                                      name, index);
-                       }
+       /* Emit the streamout code conditionally. This actually avoids
+        * out-of-bounds buffer access. The hw tells us via the SGPR
+        * (so_vtx_count) which threads are allowed to emit streamout data. */
+       ac_build_ifcc(&ctx->ac, can_emit, 6501);
+       {
+               /* The buffer offset is computed as follows:
+                *   ByteOffset = streamout_offset[buffer_id]*4 +
+                *                (streamout_write_index + thread_id)*stride[buffer_id] +
+                *                attrib_offset
+                 */
 
-                        offset = offset % 4;
-               }
+               LLVMValueRef so_write_index =
+                       ac_get_arg(&ctx->ac,
+                                  ctx->streamout_write_index);
 
-               offset += component;
-               value[i + component] = buffer_load(ctx, type, offset,
-                                                  ctx->tess_offchip_ring, base, addr, true);
-       }
+               /* Compute (streamout_write_index + thread_id). */
+               so_write_index = LLVMBuildAdd(builder, so_write_index, tid, "");
 
-       return ac_build_varying_gather_values(&ctx->ac, value, num_components, component);
-}
+               /* Load the descriptor and compute the write offset for each
+                * enabled buffer. */
+               LLVMValueRef so_write_offset[4] = {};
+               LLVMValueRef so_buffers[4];
+               LLVMValueRef buf_ptr = ac_get_arg(&ctx->ac,
+                                                 ctx->rw_buffers);
 
-static void si_nir_store_output_tcs(struct ac_shader_abi *abi,
-                                   const struct nir_variable *var,
-                                   LLVMValueRef vertex_index,
-                                   LLVMValueRef param_index,
-                                   unsigned const_index,
-                                   LLVMValueRef src,
-                                   unsigned writemask)
-{
-       struct si_shader_context *ctx = si_shader_context_from_abi(abi);
-       struct si_shader_info *info = &ctx->shader->selector->info;
-       const unsigned component = var->data.location_frac;
-       unsigned driver_location = var->data.driver_location;
-       LLVMValueRef dw_addr, stride;
-       LLVMValueRef buffer, base, addr;
-       LLVMValueRef values[8];
-       bool skip_lds_store;
-       bool is_tess_factor = false, is_tess_inner = false;
-
-       driver_location = driver_location / 4;
-       ubyte name = info->output_semantic_name[driver_location];
-       ubyte index = info->output_semantic_index[driver_location];
-
-       bool is_const = !param_index;
-       if (!param_index)
-               param_index = LLVMConstInt(ctx->i32, const_index, 0);
-
-       const bool is_patch = var->data.patch ||
-                             var->data.location == VARYING_SLOT_TESS_LEVEL_INNER ||
-                             var->data.location == VARYING_SLOT_TESS_LEVEL_OUTER;
-
-       assert((name == TGSI_SEMANTIC_PATCH ||
-               name == TGSI_SEMANTIC_TESSINNER ||
-               name == TGSI_SEMANTIC_TESSOUTER) == is_patch);
-
-       if (!is_patch) {
-               stride = get_tcs_out_vertex_dw_stride(ctx);
-               dw_addr = get_tcs_out_current_patch_offset(ctx);
-               dw_addr = get_dw_address_from_generic_indices(ctx, stride, dw_addr,
-                                                             vertex_index, param_index,
-                                                             name, index);
-
-               skip_lds_store = !info->reads_pervertex_outputs;
-       } else {
-               dw_addr = get_tcs_out_current_patch_data_offset(ctx);
-               dw_addr = get_dw_address_from_generic_indices(ctx, NULL, dw_addr,
-                                                             vertex_index, param_index,
-                                                             name, index);
-
-               skip_lds_store = !info->reads_perpatch_outputs;
-
-               if (is_const && const_index == 0) {
-                       int name = info->output_semantic_name[driver_location];
-
-                       /* Always write tess factors into LDS for the TCS epilog. */
-                       if (name == TGSI_SEMANTIC_TESSINNER ||
-                           name == TGSI_SEMANTIC_TESSOUTER) {
-                               /* The epilog doesn't read LDS if invocation 0 defines tess factors. */
-                               skip_lds_store = !info->reads_tessfactor_outputs &&
-                                                ctx->shader->selector->info.tessfactors_are_def_in_all_invocs;
-                               is_tess_factor = true;
-                               is_tess_inner = name == TGSI_SEMANTIC_TESSINNER;
-                       }
-               }
-       }
+               for (i = 0; i < 4; i++) {
+                       if (!so->stride[i])
+                               continue;
 
-       buffer = get_tess_ring_descriptor(ctx, TESS_OFFCHIP_RING_TCS);
+                       LLVMValueRef offset = LLVMConstInt(ctx->ac.i32,
+                                                          SI_VS_STREAMOUT_BUF0 + i, 0);
 
-       base = ac_get_arg(&ctx->ac, ctx->tcs_offchip_offset);
+                       so_buffers[i] = ac_build_load_to_sgpr(&ctx->ac, buf_ptr, offset);
 
-       addr = get_tcs_tes_buffer_address_from_generic_indices(ctx, vertex_index,
-                                                              param_index, name, index);
+                       LLVMValueRef so_offset = ac_get_arg(&ctx->ac,
+                                                           ctx->streamout_offset[i]);
+                       so_offset = LLVMBuildMul(builder, so_offset, LLVMConstInt(ctx->ac.i32, 4, 0), "");
 
-       for (unsigned chan = component; chan < 8; chan++) {
-               if (!(writemask & (1 << chan)))
-                       continue;
-               LLVMValueRef value = ac_llvm_extract_elem(&ctx->ac, src, chan - component);
-
-               unsigned buffer_store_offset = chan % 4;
-               if (chan == 4) {
-                       ubyte name = info->output_semantic_name[driver_location + 1];
-                       ubyte index = info->output_semantic_index[driver_location + 1];
-                        addr = get_tcs_tes_buffer_address_from_generic_indices(ctx,
-                                                                               vertex_index,
-                                                                               param_index,
-                                                                              name, index);
+                       so_write_offset[i] = ac_build_imad(&ctx->ac, so_write_index,
+                                                          LLVMConstInt(ctx->ac.i32, so->stride[i]*4, 0),
+                                                          so_offset);
                }
 
-               /* Skip LDS stores if there is no LDS read of this output. */
-               if (!skip_lds_store)
-                       lshs_lds_store(ctx, chan, dw_addr, value);
+               /* Write streamout data. */
+               for (i = 0; i < so->num_outputs; i++) {
+                       unsigned reg = so->output[i].register_index;
 
-               value = ac_to_integer(&ctx->ac, value);
-               values[chan] = value;
+                       if (reg >= noutput)
+                               continue;
 
-               if (writemask != 0xF && !is_tess_factor) {
-                       ac_build_buffer_store_dword(&ctx->ac, buffer, value, 1,
-                                                   addr, base,
-                                                   4 * buffer_store_offset,
-                                                    ac_glc);
-               }
+                       if (stream != so->output[i].stream)
+                               continue;
 
-               /* Write tess factors into VGPRs for the epilog. */
-               if (is_tess_factor &&
-                   ctx->shader->selector->info.tessfactors_are_def_in_all_invocs) {
-                       if (!is_tess_inner) {
-                               LLVMBuildStore(ctx->ac.builder, value, /* outer */
-                                              ctx->invoc0_tess_factors[chan]);
-                       } else if (chan < 2) {
-                               LLVMBuildStore(ctx->ac.builder, value, /* inner */
-                                              ctx->invoc0_tess_factors[4 + chan]);
-                       }
+                       si_emit_streamout_output(ctx, so_buffers, so_write_offset,
+                                                &so->output[i], &outputs[reg]);
                }
        }
+       ac_build_endif(&ctx->ac, 6501);
+}
 
-       if (writemask == 0xF && !is_tess_factor) {
-               LLVMValueRef value = ac_build_gather_values(&ctx->ac,
-                                                           values, 4);
-               ac_build_buffer_store_dword(&ctx->ac, buffer, value, 4, addr,
-                                           base, 0, ac_glc);
-       }
+static void si_export_param(struct si_shader_context *ctx, unsigned index,
+                           LLVMValueRef *values)
+{
+       struct ac_export_args args;
+
+       si_llvm_init_vs_export_args(ctx, values,
+                                   V_008DFC_SQ_EXP_PARAM + index, &args);
+       ac_build_export(&ctx->ac, &args);
 }
 
-static LLVMValueRef si_llvm_load_input_gs(struct ac_shader_abi *abi,
-                                         unsigned input_index,
-                                         unsigned vtx_offset_param,
-                                         LLVMTypeRef type,
-                                         unsigned swizzle)
+static void si_build_param_exports(struct si_shader_context *ctx,
+                                  struct si_shader_output_values *outputs,
+                                  unsigned noutput)
 {
-       struct si_shader_context *ctx = si_shader_context_from_abi(abi);
        struct si_shader *shader = ctx->shader;
-       LLVMValueRef vtx_offset, soffset;
-       struct si_shader_info *info = &shader->selector->info;
-       unsigned semantic_name = info->input_semantic_name[input_index];
-       unsigned semantic_index = info->input_semantic_index[input_index];
-       unsigned param;
-       LLVMValueRef value;
+       unsigned param_count = 0;
 
-       param = si_shader_io_get_unique_index(semantic_name, semantic_index, false);
+       for (unsigned i = 0; i < noutput; i++) {
+               unsigned semantic_name = outputs[i].semantic_name;
+               unsigned semantic_index = outputs[i].semantic_index;
 
-       /* GFX9 has the ESGS ring in LDS. */
-       if (ctx->screen->info.chip_class >= GFX9) {
-               unsigned index = vtx_offset_param;
+               if (outputs[i].vertex_stream[0] != 0 &&
+                   outputs[i].vertex_stream[1] != 0 &&
+                   outputs[i].vertex_stream[2] != 0 &&
+                   outputs[i].vertex_stream[3] != 0)
+                       continue;
 
-               switch (index / 2) {
-               case 0:
-                       vtx_offset = si_unpack_param(ctx, ctx->gs_vtx01_offset,
-                                                    index % 2 ? 16 : 0, 16);
-                       break;
-               case 1:
-                       vtx_offset = si_unpack_param(ctx, ctx->gs_vtx23_offset,
-                                                    index % 2 ? 16 : 0, 16);
-                       break;
-               case 2:
-                       vtx_offset = si_unpack_param(ctx, ctx->gs_vtx45_offset,
-                                                    index % 2 ? 16 : 0, 16);
+               switch (semantic_name) {
+               case TGSI_SEMANTIC_LAYER:
+               case TGSI_SEMANTIC_VIEWPORT_INDEX:
+               case TGSI_SEMANTIC_CLIPDIST:
+               case TGSI_SEMANTIC_COLOR:
+               case TGSI_SEMANTIC_BCOLOR:
+               case TGSI_SEMANTIC_PRIMID:
+               case TGSI_SEMANTIC_FOG:
+               case TGSI_SEMANTIC_TEXCOORD:
+               case TGSI_SEMANTIC_GENERIC:
                        break;
                default:
-                       assert(0);
-                       return NULL;
-               }
-
-               unsigned offset = param * 4 + swizzle;
-               vtx_offset = LLVMBuildAdd(ctx->ac.builder, vtx_offset,
-                                         LLVMConstInt(ctx->i32, offset, false), "");
-
-               LLVMValueRef ptr = ac_build_gep0(&ctx->ac, ctx->esgs_ring, vtx_offset);
-               LLVMValueRef value = LLVMBuildLoad(ctx->ac.builder, ptr, "");
-               if (llvm_type_is_64bit(ctx, type)) {
-                       ptr = LLVMBuildGEP(ctx->ac.builder, ptr,
-                                          &ctx->ac.i32_1, 1, "");
-                       LLVMValueRef values[2] = {
-                               value,
-                               LLVMBuildLoad(ctx->ac.builder, ptr, "")
-                       };
-                       value = ac_build_gather_values(&ctx->ac, values, 2);
-               }
-               return LLVMBuildBitCast(ctx->ac.builder, value, type, "");
-       }
-
-       /* GFX6: input load from the ESGS ring in memory. */
-       if (swizzle == ~0) {
-               LLVMValueRef values[4];
-               unsigned chan;
-               for (chan = 0; chan < 4; chan++) {
-                       values[chan] = si_llvm_load_input_gs(abi, input_index, vtx_offset_param,
-                                                            type, chan);
+                       continue;
                }
-               return ac_build_gather_values(&ctx->ac, values, 4);
-       }
-
-       /* Get the vertex offset parameter on GFX6. */
-       LLVMValueRef gs_vtx_offset = ac_get_arg(&ctx->ac,
-                                               ctx->gs_vtx_offset[vtx_offset_param]);
 
-       vtx_offset = LLVMBuildMul(ctx->ac.builder, gs_vtx_offset,
-                                 LLVMConstInt(ctx->i32, 4, 0), "");
-
-       soffset = LLVMConstInt(ctx->i32, (param * 4 + swizzle) * 256, 0);
-
-       value = ac_build_buffer_load(&ctx->ac, ctx->esgs_ring, 1, ctx->i32_0,
-                                    vtx_offset, soffset, 0, ac_glc, true, false);
-       if (llvm_type_is_64bit(ctx, type)) {
-               LLVMValueRef value2;
-               soffset = LLVMConstInt(ctx->i32, (param * 4 + swizzle + 1) * 256, 0);
-
-               value2 = ac_build_buffer_load(&ctx->ac, ctx->esgs_ring, 1,
-                                             ctx->i32_0, vtx_offset, soffset,
-                                             0, ac_glc, true, false);
-               return si_build_gather_64bit(ctx, type, value, value2);
-       }
-       return LLVMBuildBitCast(ctx->ac.builder, value, type, "");
-}
-
-static LLVMValueRef si_nir_load_input_gs(struct ac_shader_abi *abi,
-                                        unsigned location,
-                                        unsigned driver_location,
-                                        unsigned component,
-                                        unsigned num_components,
-                                        unsigned vertex_index,
-                                        unsigned const_index,
-                                        LLVMTypeRef type)
-{
-       struct si_shader_context *ctx = si_shader_context_from_abi(abi);
+               if ((semantic_name != TGSI_SEMANTIC_GENERIC ||
+                    semantic_index < SI_MAX_IO_GENERIC) &&
+                   shader->key.opt.kill_outputs &
+                   (1ull << si_shader_io_get_unique_index(semantic_name,
+                                                          semantic_index, true)))
+                       continue;
 
-       LLVMValueRef value[4];
-       for (unsigned i = 0; i < num_components; i++) {
-               unsigned offset = i;
-               if (llvm_type_is_64bit(ctx, type))
-                       offset *= 2;
+               si_export_param(ctx, param_count, outputs[i].values);
 
-               offset += component;
-               value[i + component] = si_llvm_load_input_gs(&ctx->abi, driver_location  / 4 + const_index,
-                                                            vertex_index, type, offset);
+               assert(i < ARRAY_SIZE(shader->info.vs_output_param_offset));
+               shader->info.vs_output_param_offset[i] = param_count++;
        }
 
-       return ac_build_varying_gather_values(&ctx->ac, value, num_components, component);
-}
-
-static LLVMValueRef si_build_fs_interp(struct si_shader_context *ctx,
-                                      unsigned attr_index, unsigned chan,
-                                      LLVMValueRef prim_mask,
-                                      LLVMValueRef i, LLVMValueRef j)
-{
-       if (i || j) {
-               return ac_build_fs_interp(&ctx->ac,
-                                         LLVMConstInt(ctx->i32, chan, 0),
-                                         LLVMConstInt(ctx->i32, attr_index, 0),
-                                         prim_mask, i, j);
-       }
-       return ac_build_fs_interp_mov(&ctx->ac,
-                                     LLVMConstInt(ctx->i32, 2, 0), /* P0 */
-                                     LLVMConstInt(ctx->i32, chan, 0),
-                                     LLVMConstInt(ctx->i32, attr_index, 0),
-                                     prim_mask);
+       shader->info.nr_param_exports = param_count;
 }
 
 /**
- * Interpolate a fragment shader input.
+ * Vertex color clamping.
  *
- * @param ctx          context
- * @param input_index          index of the input in hardware
- * @param semantic_name                TGSI_SEMANTIC_*
- * @param semantic_index       semantic index
- * @param num_interp_inputs    number of all interpolated inputs (= BCOLOR offset)
- * @param colors_read_mask     color components read (4 bits for each color, 8 bits in total)
- * @param interp_param         interpolation weights (i,j)
- * @param prim_mask            SI_PARAM_PRIM_MASK
- * @param face                 SI_PARAM_FRONT_FACE
- * @param result               the return value (4 components)
+ * This uses a state constant loaded in a user data SGPR and
+ * an IF statement is added that clamps all colors if the constant
+ * is true.
  */
-static void interp_fs_color(struct si_shader_context *ctx,
-                           unsigned input_index,
-                           unsigned semantic_index,
-                           unsigned num_interp_inputs,
-                           unsigned colors_read_mask,
-                           LLVMValueRef interp_param,
-                           LLVMValueRef prim_mask,
-                           LLVMValueRef face,
-                           LLVMValueRef result[4])
+static void si_vertex_color_clamping(struct si_shader_context *ctx,
+                                    struct si_shader_output_values *outputs,
+                                    unsigned noutput)
 {
-       LLVMValueRef i = NULL, j = NULL;
-       unsigned chan;
-
-       /* 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.
-        *
-        * When interp is false we will use fs.constant or for newer llvm,
-         * amdgcn.interp.mov.
-        */
-       bool interp = interp_param != NULL;
-
-       if (interp) {
-               interp_param = LLVMBuildBitCast(ctx->ac.builder, interp_param,
-                                               LLVMVectorType(ctx->f32, 2), "");
-
-               i = LLVMBuildExtractElement(ctx->ac.builder, interp_param,
-                                               ctx->i32_0, "");
-               j = LLVMBuildExtractElement(ctx->ac.builder, interp_param,
-                                               ctx->i32_1, "");
-       }
-
-       if (ctx->shader->key.part.ps.prolog.color_two_side) {
-               LLVMValueRef is_face_positive;
-
-               /* 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;
+       LLVMValueRef addr[SI_MAX_VS_OUTPUTS][4];
+       bool has_colors = false;
 
-               is_face_positive = LLVMBuildICmp(ctx->ac.builder, LLVMIntNE,
-                                                face, ctx->i32_0, "");
+       /* Store original colors to alloca variables. */
+       for (unsigned i = 0; i < noutput; i++) {
+               if (outputs[i].semantic_name != TGSI_SEMANTIC_COLOR &&
+                   outputs[i].semantic_name != TGSI_SEMANTIC_BCOLOR)
+                       continue;
 
-               for (chan = 0; chan < 4; chan++) {
-                       LLVMValueRef front, back;
-
-                       front = si_build_fs_interp(ctx,
-                                                  input_index, chan,
-                                                  prim_mask, i, j);
-                       back = si_build_fs_interp(ctx,
-                                                 back_attr_offset, chan,
-                                                 prim_mask, i, j);
-
-                       result[chan] = LLVMBuildSelect(ctx->ac.builder,
-                                               is_face_positive,
-                                               front,
-                                               back,
-                                               "");
-               }
-       } else {
-               for (chan = 0; chan < 4; chan++) {
-                       result[chan] = si_build_fs_interp(ctx,
-                                                         input_index, chan,
-                                                         prim_mask, i, j);
+               for (unsigned j = 0; j < 4; j++) {
+                       addr[i][j] = ac_build_alloca_undef(&ctx->ac, ctx->ac.f32, "");
+                       LLVMBuildStore(ctx->ac.builder, outputs[i].values[j], addr[i][j]);
                }
+               has_colors = true;
        }
-}
-
-LLVMValueRef si_get_sample_id(struct si_shader_context *ctx)
-{
-       return si_unpack_param(ctx, ctx->args.ancillary, 8, 4);
-}
-
-static LLVMValueRef get_base_vertex(struct ac_shader_abi *abi)
-{
-       struct si_shader_context *ctx = si_shader_context_from_abi(abi);
-
-       /* For non-indexed draws, the base vertex set by the driver
-        * (for direct draws) or the CP (for indirect draws) is the
-        * first vertex ID, but GLSL expects 0 to be returned.
-        */
-       LLVMValueRef vs_state = ac_get_arg(&ctx->ac,
-                                          ctx->vs_state_bits);
-       LLVMValueRef indexed;
 
-       indexed = LLVMBuildLShr(ctx->ac.builder, vs_state, ctx->i32_1, "");
-       indexed = LLVMBuildTrunc(ctx->ac.builder, indexed, ctx->i1, "");
+       if (!has_colors)
+               return;
 
-       return LLVMBuildSelect(ctx->ac.builder, indexed,
-                              ac_get_arg(&ctx->ac, ctx->args.base_vertex),
-                              ctx->i32_0, "");
-}
+       /* The state is in the first bit of the user SGPR. */
+       LLVMValueRef cond = ac_get_arg(&ctx->ac, ctx->vs_state_bits);
+       cond = LLVMBuildTrunc(ctx->ac.builder, cond, ctx->ac.i1, "");
 
-static LLVMValueRef get_block_size(struct ac_shader_abi *abi)
-{
-       struct si_shader_context *ctx = si_shader_context_from_abi(abi);
+       ac_build_ifcc(&ctx->ac, cond, 6502);
 
-       LLVMValueRef values[3];
-       LLVMValueRef result;
-       unsigned i;
-       unsigned *properties = ctx->shader->selector->info.properties;
+       /* Store clamped colors to alloca variables within the conditional block. */
+       for (unsigned i = 0; i < noutput; i++) {
+               if (outputs[i].semantic_name != TGSI_SEMANTIC_COLOR &&
+                   outputs[i].semantic_name != TGSI_SEMANTIC_BCOLOR)
+                       continue;
 
-       if (properties[TGSI_PROPERTY_CS_FIXED_BLOCK_WIDTH] != 0) {
-               unsigned sizes[3] = {
-                       properties[TGSI_PROPERTY_CS_FIXED_BLOCK_WIDTH],
-                       properties[TGSI_PROPERTY_CS_FIXED_BLOCK_HEIGHT],
-                       properties[TGSI_PROPERTY_CS_FIXED_BLOCK_DEPTH]
-               };
+               for (unsigned j = 0; j < 4; j++) {
+                       LLVMBuildStore(ctx->ac.builder,
+                                      ac_build_clamp(&ctx->ac, outputs[i].values[j]),
+                                      addr[i][j]);
+               }
+       }
+       ac_build_endif(&ctx->ac, 6502);
 
-               for (i = 0; i < 3; ++i)
-                       values[i] = LLVMConstInt(ctx->i32, sizes[i], 0);
+       /* Load clamped colors */
+       for (unsigned i = 0; i < noutput; i++) {
+               if (outputs[i].semantic_name != TGSI_SEMANTIC_COLOR &&
+                   outputs[i].semantic_name != TGSI_SEMANTIC_BCOLOR)
+                       continue;
 
-               result = ac_build_gather_values(&ctx->ac, values, 3);
-       } else {
-               result = ac_get_arg(&ctx->ac, ctx->block_size);
+               for (unsigned j = 0; j < 4; j++) {
+                       outputs[i].values[j] =
+                               LLVMBuildLoad(ctx->ac.builder, addr[i][j], "");
+               }
        }
-
-       return result;
 }
 
-/**
- * Load a dword from a constant buffer.
+/* Generate export instructions for hardware VS shader stage or NGG GS stage
+ * (position and parameter data only).
  */
-static LLVMValueRef buffer_load_const(struct si_shader_context *ctx,
-                                     LLVMValueRef resource,
-                                     LLVMValueRef offset)
-{
-       return ac_build_buffer_load(&ctx->ac, resource, 1, NULL, offset, NULL,
-                                   0, 0, true, true);
-}
-
-static LLVMValueRef load_sample_position(struct ac_shader_abi *abi, LLVMValueRef sample_id)
+void si_llvm_export_vs(struct si_shader_context *ctx,
+                      struct si_shader_output_values *outputs,
+                      unsigned noutput)
 {
-       struct si_shader_context *ctx = si_shader_context_from_abi(abi);
-       LLVMValueRef desc = ac_get_arg(&ctx->ac, ctx->rw_buffers);
-       LLVMValueRef buf_index = LLVMConstInt(ctx->i32, SI_PS_CONST_SAMPLE_POSITIONS, 0);
-       LLVMValueRef resource = ac_build_load_to_sgpr(&ctx->ac, desc, buf_index);
-
-       /* offset = sample_id * 8  (8 = 2 floats containing samplepos.xy) */
-       LLVMValueRef offset0 = LLVMBuildMul(ctx->ac.builder, sample_id, LLVMConstInt(ctx->i32, 8, 0), "");
-       LLVMValueRef offset1 = LLVMBuildAdd(ctx->ac.builder, offset0, LLVMConstInt(ctx->i32, 4, 0), "");
-
-       LLVMValueRef pos[4] = {
-               buffer_load_const(ctx, resource, offset0),
-               buffer_load_const(ctx, resource, offset1),
-               LLVMConstReal(ctx->f32, 0),
-               LLVMConstReal(ctx->f32, 0)
-       };
+       struct si_shader *shader = ctx->shader;
+       struct ac_export_args pos_args[4] = {};
+       LLVMValueRef psize_value = NULL, edgeflag_value = NULL, layer_value = NULL, viewport_index_value = NULL;
+       unsigned pos_idx;
+       int i;
 
-       return ac_build_gather_values(&ctx->ac, pos, 4);
-}
+       si_vertex_color_clamping(ctx, outputs, noutput);
 
-static LLVMValueRef load_sample_mask_in(struct ac_shader_abi *abi)
-{
-       struct si_shader_context *ctx = si_shader_context_from_abi(abi);
-       return ac_to_integer(&ctx->ac, ac_get_arg(&ctx->ac, ctx->args.sample_coverage));
-}
-
-static LLVMValueRef si_load_tess_coord(struct ac_shader_abi *abi)
-{
-       struct si_shader_context *ctx = si_shader_context_from_abi(abi);
-       LLVMValueRef coord[4] = {
-               ac_get_arg(&ctx->ac, ctx->tes_u),
-               ac_get_arg(&ctx->ac, ctx->tes_v),
-               ctx->ac.f32_0,
-               ctx->ac.f32_0
-       };
-
-       /* For triangles, the vector should be (u, v, 1-u-v). */
-       if (ctx->shader->selector->info.properties[TGSI_PROPERTY_TES_PRIM_MODE] ==
-           PIPE_PRIM_TRIANGLES) {
-               coord[2] = LLVMBuildFSub(ctx->ac.builder, ctx->ac.f32_1,
-                                        LLVMBuildFAdd(ctx->ac.builder,
-                                                      coord[0], coord[1], ""), "");
-       }
-       return ac_build_gather_values(&ctx->ac, coord, 4);
-}
-
-static LLVMValueRef load_tess_level(struct si_shader_context *ctx,
-                                   unsigned semantic_name)
-{
-       LLVMValueRef base, addr;
-
-       int param = si_shader_io_get_unique_index_patch(semantic_name, 0);
-
-       base = ac_get_arg(&ctx->ac, ctx->tcs_offchip_offset);
-       addr = get_tcs_tes_buffer_address(ctx, get_rel_patch_id(ctx), NULL,
-                                         LLVMConstInt(ctx->i32, param, 0));
-
-       return buffer_load(ctx, ctx->f32,
-                          ~0, ctx->tess_offchip_ring, base, addr, true);
-
-}
-
-static LLVMValueRef load_tess_level_default(struct si_shader_context *ctx,
-                                           unsigned semantic_name)
-{
-       LLVMValueRef buf, slot, val[4];
-       int i, offset;
-
-       slot = LLVMConstInt(ctx->i32, SI_HS_CONST_DEFAULT_TESS_LEVELS, 0);
-       buf = ac_get_arg(&ctx->ac, ctx->rw_buffers);
-       buf = ac_build_load_to_sgpr(&ctx->ac, buf, slot);
-       offset = semantic_name == TGSI_SEMANTIC_TESS_DEFAULT_INNER_LEVEL ? 4 : 0;
-
-       for (i = 0; i < 4; i++)
-               val[i] = buffer_load_const(ctx, buf,
-                                          LLVMConstInt(ctx->i32, (offset + i) * 4, 0));
-       return ac_build_gather_values(&ctx->ac, val, 4);
-}
-
-static LLVMValueRef si_load_tess_level(struct ac_shader_abi *abi,
-                                      unsigned varying_id,
-                                      bool load_default_state)
-{
-       struct si_shader_context *ctx = si_shader_context_from_abi(abi);
-       unsigned semantic_name;
-
-       if (load_default_state) {
-               switch (varying_id) {
-               case VARYING_SLOT_TESS_LEVEL_INNER:
-                       semantic_name = TGSI_SEMANTIC_TESS_DEFAULT_INNER_LEVEL;
+       /* Build position exports. */
+       for (i = 0; i < noutput; i++) {
+               switch (outputs[i].semantic_name) {
+               case TGSI_SEMANTIC_POSITION:
+                       si_llvm_init_vs_export_args(ctx, outputs[i].values,
+                                                   V_008DFC_SQ_EXP_POS, &pos_args[0]);
+                       break;
+               case TGSI_SEMANTIC_PSIZE:
+                       psize_value = outputs[i].values[0];
+                       break;
+               case TGSI_SEMANTIC_LAYER:
+                       layer_value = outputs[i].values[0];
                        break;
-               case VARYING_SLOT_TESS_LEVEL_OUTER:
-                       semantic_name = TGSI_SEMANTIC_TESS_DEFAULT_OUTER_LEVEL;
+               case TGSI_SEMANTIC_VIEWPORT_INDEX:
+                       viewport_index_value = outputs[i].values[0];
+                       break;
+               case TGSI_SEMANTIC_EDGEFLAG:
+                       edgeflag_value = outputs[i].values[0];
+                       break;
+               case TGSI_SEMANTIC_CLIPDIST:
+                       if (!shader->key.opt.clip_disable) {
+                               unsigned index = 2 + outputs[i].semantic_index;
+                               si_llvm_init_vs_export_args(ctx, outputs[i].values,
+                                                           V_008DFC_SQ_EXP_POS + index,
+                                                           &pos_args[index]);
+                       }
+                       break;
+               case TGSI_SEMANTIC_CLIPVERTEX:
+                       if (!shader->key.opt.clip_disable) {
+                               si_llvm_emit_clipvertex(ctx, pos_args,
+                                                       outputs[i].values);
+                       }
                        break;
-               default:
-                       unreachable("unknown tess level");
                }
-               return load_tess_level_default(ctx, semantic_name);
-       }
-
-       switch (varying_id) {
-       case VARYING_SLOT_TESS_LEVEL_INNER:
-               semantic_name = TGSI_SEMANTIC_TESSINNER;
-               break;
-       case VARYING_SLOT_TESS_LEVEL_OUTER:
-               semantic_name = TGSI_SEMANTIC_TESSOUTER;
-               break;
-       default:
-               unreachable("unknown tess level");
-       }
-
-       return load_tess_level(ctx, semantic_name);
-
-}
-
-static LLVMValueRef si_load_patch_vertices_in(struct ac_shader_abi *abi)
-{
-       struct si_shader_context *ctx = si_shader_context_from_abi(abi);
-       if (ctx->type == PIPE_SHADER_TESS_CTRL)
-               return si_unpack_param(ctx, ctx->tcs_out_lds_layout, 13, 6);
-       else if (ctx->type == PIPE_SHADER_TESS_EVAL)
-               return get_num_tcs_out_vertices(ctx);
-       else
-               unreachable("invalid shader stage for TGSI_SEMANTIC_VERTICESIN");
-}
-
-void si_declare_compute_memory(struct si_shader_context *ctx)
-{
-       struct si_shader_selector *sel = ctx->shader->selector;
-       unsigned lds_size = sel->info.properties[TGSI_PROPERTY_CS_LOCAL_SIZE];
-
-       LLVMTypeRef i8p = LLVMPointerType(ctx->i8, AC_ADDR_SPACE_LDS);
-       LLVMValueRef var;
-
-       assert(!ctx->ac.lds);
-
-       var = LLVMAddGlobalInAddressSpace(ctx->ac.module,
-                                         LLVMArrayType(ctx->i8, lds_size),
-                                         "compute_lds",
-                                         AC_ADDR_SPACE_LDS);
-       LLVMSetAlignment(var, 64 * 1024);
-
-       ctx->ac.lds = LLVMBuildBitCast(ctx->ac.builder, var, i8p, "");
-}
-
-static LLVMValueRef load_const_buffer_desc_fast_path(struct si_shader_context *ctx)
-{
-       LLVMValueRef ptr =
-               ac_get_arg(&ctx->ac, ctx->const_and_shader_buffers);
-       struct si_shader_selector *sel = ctx->shader->selector;
-
-       /* Do the bounds checking with a descriptor, because
-        * doing computation and manual bounds checking of 64-bit
-        * addresses generates horrible VALU code with very high
-        * VGPR usage and very low SIMD occupancy.
-        */
-       ptr = LLVMBuildPtrToInt(ctx->ac.builder, ptr, ctx->ac.intptr, "");
-
-       LLVMValueRef desc0, desc1;
-       desc0 = ptr;
-       desc1 = LLVMConstInt(ctx->i32,
-                            S_008F04_BASE_ADDRESS_HI(ctx->screen->info.address32_hi), 0);
-
-       uint32_t rsrc3 = S_008F0C_DST_SEL_X(V_008F0C_SQ_SEL_X) |
-                        S_008F0C_DST_SEL_Y(V_008F0C_SQ_SEL_Y) |
-                        S_008F0C_DST_SEL_Z(V_008F0C_SQ_SEL_Z) |
-                        S_008F0C_DST_SEL_W(V_008F0C_SQ_SEL_W);
-
-       if (ctx->screen->info.chip_class >= GFX10)
-               rsrc3 |= S_008F0C_FORMAT(V_008F0C_IMG_FORMAT_32_FLOAT) |
-                        S_008F0C_OOB_SELECT(V_008F0C_OOB_SELECT_RAW) |
-                        S_008F0C_RESOURCE_LEVEL(1);
-       else
-               rsrc3 |= S_008F0C_NUM_FORMAT(V_008F0C_BUF_NUM_FORMAT_FLOAT) |
-                        S_008F0C_DATA_FORMAT(V_008F0C_BUF_DATA_FORMAT_32);
-
-       LLVMValueRef desc_elems[] = {
-               desc0,
-               desc1,
-               LLVMConstInt(ctx->i32, sel->info.constbuf0_num_slots * 16, 0),
-               LLVMConstInt(ctx->i32, rsrc3, false)
-       };
-
-       return ac_build_gather_values(&ctx->ac, desc_elems, 4);
-}
-
-static LLVMValueRef load_ubo(struct ac_shader_abi *abi, LLVMValueRef index)
-{
-       struct si_shader_context *ctx = si_shader_context_from_abi(abi);
-       struct si_shader_selector *sel = ctx->shader->selector;
-
-       LLVMValueRef ptr = ac_get_arg(&ctx->ac, ctx->const_and_shader_buffers);
-
-       if (sel->info.const_buffers_declared == 1 &&
-           sel->info.shader_buffers_declared == 0) {
-               return load_const_buffer_desc_fast_path(ctx);
        }
 
-       index = si_llvm_bound_index(ctx, index, ctx->num_const_buffers);
-       index = LLVMBuildAdd(ctx->ac.builder, index,
-                            LLVMConstInt(ctx->i32, SI_NUM_SHADER_BUFFERS, 0), "");
-
-       return ac_build_load_to_sgpr(&ctx->ac, ptr, index);
-}
-
-static LLVMValueRef
-load_ssbo(struct ac_shader_abi *abi, LLVMValueRef index, bool write)
-{
-       struct si_shader_context *ctx = si_shader_context_from_abi(abi);
-       LLVMValueRef rsrc_ptr = ac_get_arg(&ctx->ac,
-                                          ctx->const_and_shader_buffers);
-
-       index = si_llvm_bound_index(ctx, index, ctx->num_shader_buffers);
-       index = LLVMBuildSub(ctx->ac.builder,
-                            LLVMConstInt(ctx->i32, SI_NUM_SHADER_BUFFERS - 1, 0),
-                            index, "");
-
-       return ac_build_load_to_sgpr(&ctx->ac, rsrc_ptr, index);
-}
-
-/* Initialize arguments for the shader export intrinsic */
-static void si_llvm_init_export_args(struct si_shader_context *ctx,
-                                    LLVMValueRef *values,
-                                    unsigned target,
-                                    struct ac_export_args *args)
-{
-       LLVMValueRef f32undef = LLVMGetUndef(ctx->ac.f32);
-       unsigned spi_shader_col_format = V_028714_SPI_SHADER_32_ABGR;
-       unsigned chan;
-       bool is_int8, is_int10;
-
-       /* Default is 0xf. Adjusted below depending on the format. */
-       args->enabled_channels = 0xf; /* writemask */
-
-       /* Specify whether the EXEC mask represents the valid mask */
-       args->valid_mask = 0;
-
-       /* Specify whether this is the last export */
-       args->done = 0;
-
-       /* Specify the target we are exporting */
-       args->target = target;
-
-       if (ctx->type == PIPE_SHADER_FRAGMENT) {
-               const struct si_shader_key *key = &ctx->shader->key;
-               unsigned col_formats = key->part.ps.epilog.spi_shader_col_format;
-               int cbuf = target - V_008DFC_SQ_EXP_MRT;
-
-               assert(cbuf >= 0 && cbuf < 8);
-               spi_shader_col_format = (col_formats >> (cbuf * 4)) & 0xf;
-               is_int8 = (key->part.ps.epilog.color_is_int8 >> cbuf) & 0x1;
-               is_int10 = (key->part.ps.epilog.color_is_int10 >> cbuf) & 0x1;
+       /* We need to add the position output manually if it's missing. */
+       if (!pos_args[0].out[0]) {
+               pos_args[0].enabled_channels = 0xf; /* writemask */
+               pos_args[0].valid_mask = 0; /* EXEC mask */
+               pos_args[0].done = 0; /* last export? */
+               pos_args[0].target = V_008DFC_SQ_EXP_POS;
+               pos_args[0].compr = 0; /* COMPR flag */
+               pos_args[0].out[0] = ctx->ac.f32_0; /* X */
+               pos_args[0].out[1] = ctx->ac.f32_0; /* Y */
+               pos_args[0].out[2] = ctx->ac.f32_0; /* Z */
+               pos_args[0].out[3] = ctx->ac.f32_1;  /* W */
        }
 
-       args->compr = false;
-       args->out[0] = f32undef;
-       args->out[1] = f32undef;
-       args->out[2] = f32undef;
-       args->out[3] = f32undef;
-
-       LLVMValueRef (*packf)(struct ac_llvm_context *ctx, LLVMValueRef args[2]) = NULL;
-       LLVMValueRef (*packi)(struct ac_llvm_context *ctx, LLVMValueRef args[2],
-                             unsigned bits, bool hi) = NULL;
-
-       switch (spi_shader_col_format) {
-       case V_028714_SPI_SHADER_ZERO:
-               args->enabled_channels = 0; /* writemask */
-               args->target = V_008DFC_SQ_EXP_NULL;
-               break;
-
-       case V_028714_SPI_SHADER_32_R:
-               args->enabled_channels = 1; /* writemask */
-               args->out[0] = values[0];
-               break;
-
-       case V_028714_SPI_SHADER_32_GR:
-               args->enabled_channels = 0x3; /* writemask */
-               args->out[0] = values[0];
-               args->out[1] = values[1];
-               break;
-
-       case V_028714_SPI_SHADER_32_AR:
-               if (ctx->screen->info.chip_class >= GFX10) {
-                       args->enabled_channels = 0x3; /* writemask */
-                       args->out[0] = values[0];
-                       args->out[1] = values[3];
-               } else {
-                       args->enabled_channels = 0x9; /* writemask */
-                       args->out[0] = values[0];
-                       args->out[3] = values[3];
-               }
-               break;
-
-       case V_028714_SPI_SHADER_FP16_ABGR:
-               packf = ac_build_cvt_pkrtz_f16;
-               break;
-
-       case V_028714_SPI_SHADER_UNORM16_ABGR:
-               packf = ac_build_cvt_pknorm_u16;
-               break;
-
-       case V_028714_SPI_SHADER_SNORM16_ABGR:
-               packf = ac_build_cvt_pknorm_i16;
-               break;
-
-       case V_028714_SPI_SHADER_UINT16_ABGR:
-               packi = ac_build_cvt_pk_u16;
-               break;
+       bool pos_writes_edgeflag = shader->selector->info.writes_edgeflag &&
+                                  !shader->key.as_ngg;
 
-       case V_028714_SPI_SHADER_SINT16_ABGR:
-               packi = ac_build_cvt_pk_i16;
-               break;
+       /* Write the misc vector (point size, edgeflag, layer, viewport). */
+       if (shader->selector->info.writes_psize ||
+           pos_writes_edgeflag ||
+           shader->selector->info.writes_viewport_index ||
+           shader->selector->info.writes_layer) {
+               pos_args[1].enabled_channels = shader->selector->info.writes_psize |
+                                              (pos_writes_edgeflag << 1) |
+                                              (shader->selector->info.writes_layer << 2);
 
-       case V_028714_SPI_SHADER_32_ABGR:
-               memcpy(&args->out[0], values, sizeof(values[0]) * 4);
-               break;
-       }
+               pos_args[1].valid_mask = 0; /* EXEC mask */
+               pos_args[1].done = 0; /* last export? */
+               pos_args[1].target = V_008DFC_SQ_EXP_POS + 1;
+               pos_args[1].compr = 0; /* COMPR flag */
+               pos_args[1].out[0] = ctx->ac.f32_0; /* X */
+               pos_args[1].out[1] = ctx->ac.f32_0; /* Y */
+               pos_args[1].out[2] = ctx->ac.f32_0; /* Z */
+               pos_args[1].out[3] = ctx->ac.f32_0; /* W */
 
-       /* Pack f16 or norm_i16/u16. */
-       if (packf) {
-               for (chan = 0; chan < 2; chan++) {
-                       LLVMValueRef pack_args[2] = {
-                               values[2 * chan],
-                               values[2 * chan + 1]
-                       };
-                       LLVMValueRef packed;
+               if (shader->selector->info.writes_psize)
+                       pos_args[1].out[0] = psize_value;
 
-                       packed = packf(&ctx->ac, pack_args);
-                       args->out[chan] = ac_to_float(&ctx->ac, packed);
-               }
-               args->compr = 1; /* COMPR flag */
-       }
-       /* Pack i16/u16. */
-       if (packi) {
-               for (chan = 0; chan < 2; chan++) {
-                       LLVMValueRef pack_args[2] = {
-                               ac_to_integer(&ctx->ac, values[2 * chan]),
-                               ac_to_integer(&ctx->ac, values[2 * chan + 1])
-                       };
-                       LLVMValueRef packed;
+               if (pos_writes_edgeflag) {
+                       /* The output is a float, but the hw expects an integer
+                        * with the first bit containing the edge flag. */
+                       edgeflag_value = LLVMBuildFPToUI(ctx->ac.builder,
+                                                        edgeflag_value,
+                                                        ctx->ac.i32, "");
+                       edgeflag_value = ac_build_umin(&ctx->ac,
+                                                     edgeflag_value,
+                                                     ctx->ac.i32_1);
 
-                       packed = packi(&ctx->ac, pack_args,
-                                      is_int8 ? 8 : is_int10 ? 10 : 16,
-                                      chan == 1);
-                       args->out[chan] = ac_to_float(&ctx->ac, packed);
+                       /* The LLVM intrinsic expects a float. */
+                       pos_args[1].out[1] = ac_to_float(&ctx->ac, edgeflag_value);
                }
-               args->compr = 1; /* COMPR flag */
-       }
-}
-
-static void si_alpha_test(struct si_shader_context *ctx, LLVMValueRef alpha)
-{
-       if (ctx->shader->key.part.ps.epilog.alpha_func != PIPE_FUNC_NEVER) {
-               static LLVMRealPredicate cond_map[PIPE_FUNC_ALWAYS + 1] = {
-                       [PIPE_FUNC_LESS] = LLVMRealOLT,
-                       [PIPE_FUNC_EQUAL] = LLVMRealOEQ,
-                       [PIPE_FUNC_LEQUAL] = LLVMRealOLE,
-                       [PIPE_FUNC_GREATER] = LLVMRealOGT,
-                       [PIPE_FUNC_NOTEQUAL] = LLVMRealONE,
-                       [PIPE_FUNC_GEQUAL] = LLVMRealOGE,
-               };
-               LLVMRealPredicate cond = cond_map[ctx->shader->key.part.ps.epilog.alpha_func];
-               assert(cond);
-
-               LLVMValueRef alpha_ref = LLVMGetParam(ctx->main_fn,
-                               SI_PARAM_ALPHA_REF);
-               LLVMValueRef alpha_pass =
-                       LLVMBuildFCmp(ctx->ac.builder, cond, alpha, alpha_ref, "");
-               ac_build_kill_if_false(&ctx->ac, alpha_pass);
-       } else {
-               ac_build_kill_if_false(&ctx->ac, ctx->i1false);
-       }
-}
-
-static LLVMValueRef si_scale_alpha_by_sample_mask(struct si_shader_context *ctx,
-                                                 LLVMValueRef alpha,
-                                                 unsigned samplemask_param)
-{
-       LLVMValueRef coverage;
-
-       /* alpha = alpha * popcount(coverage) / SI_NUM_SMOOTH_AA_SAMPLES */
-       coverage = LLVMGetParam(ctx->main_fn,
-                               samplemask_param);
-       coverage = ac_to_integer(&ctx->ac, coverage);
-
-       coverage = ac_build_intrinsic(&ctx->ac, "llvm.ctpop.i32",
-                                  ctx->i32,
-                                  &coverage, 1, AC_FUNC_ATTR_READNONE);
-
-       coverage = LLVMBuildUIToFP(ctx->ac.builder, coverage,
-                                  ctx->f32, "");
-
-       coverage = LLVMBuildFMul(ctx->ac.builder, coverage,
-                                LLVMConstReal(ctx->f32,
-                                       1.0 / SI_NUM_SMOOTH_AA_SAMPLES), "");
-
-       return LLVMBuildFMul(ctx->ac.builder, alpha, coverage, "");
-}
-
-static void si_llvm_emit_clipvertex(struct si_shader_context *ctx,
-                                   struct ac_export_args *pos, LLVMValueRef *out_elts)
-{
-       unsigned reg_index;
-       unsigned chan;
-       unsigned const_chan;
-       LLVMValueRef base_elt;
-       LLVMValueRef ptr = ac_get_arg(&ctx->ac, ctx->rw_buffers);
-       LLVMValueRef constbuf_index = LLVMConstInt(ctx->i32,
-                                                  SI_VS_CONST_CLIP_PLANES, 0);
-       LLVMValueRef const_resource = ac_build_load_to_sgpr(&ctx->ac, ptr, constbuf_index);
 
-       for (reg_index = 0; reg_index < 2; reg_index ++) {
-               struct ac_export_args *args = &pos[2 + reg_index];
+               if (ctx->screen->info.chip_class >= GFX9) {
+                       /* GFX9 has the layer in out.z[10:0] and the viewport
+                        * index in out.z[19:16].
+                        */
+                       if (shader->selector->info.writes_layer)
+                               pos_args[1].out[2] = layer_value;
 
-               args->out[0] =
-               args->out[1] =
-               args->out[2] =
-               args->out[3] = LLVMConstReal(ctx->f32, 0.0f);
+                       if (shader->selector->info.writes_viewport_index) {
+                               LLVMValueRef v = viewport_index_value;
 
-               /* Compute dot products of position and user clip plane vectors */
-               for (chan = 0; chan < 4; chan++) {
-                       for (const_chan = 0; const_chan < 4; const_chan++) {
-                               LLVMValueRef addr =
-                                       LLVMConstInt(ctx->i32, ((reg_index * 4 + chan) * 4 +
-                                                               const_chan) * 4, 0);
-                               base_elt = buffer_load_const(ctx, const_resource,
-                                                            addr);
-                               args->out[chan] = ac_build_fmad(&ctx->ac, base_elt,
-                                                               out_elts[const_chan], args->out[chan]);
+                               v = ac_to_integer(&ctx->ac, v);
+                               v = LLVMBuildShl(ctx->ac.builder, v,
+                                                LLVMConstInt(ctx->ac.i32, 16, 0), "");
+                               v = LLVMBuildOr(ctx->ac.builder, v,
+                                               ac_to_integer(&ctx->ac,  pos_args[1].out[2]), "");
+                               pos_args[1].out[2] = ac_to_float(&ctx->ac, v);
+                               pos_args[1].enabled_channels |= 1 << 2;
                        }
-               }
-
-               args->enabled_channels = 0xf;
-               args->valid_mask = 0;
-               args->done = 0;
-               args->target = V_008DFC_SQ_EXP_POS + 2 + reg_index;
-               args->compr = 0;
-       }
-}
-
-static void si_dump_streamout(struct pipe_stream_output_info *so)
-{
-       unsigned i;
+               } else {
+                       if (shader->selector->info.writes_layer)
+                               pos_args[1].out[2] = layer_value;
 
-       if (so->num_outputs)
-               fprintf(stderr, "STREAMOUT\n");
-
-       for (i = 0; i < so->num_outputs; i++) {
-               unsigned mask = ((1 << so->output[i].num_components) - 1) <<
-                               so->output[i].start_component;
-               fprintf(stderr, "  %i: BUF%i[%i..%i] <- OUT[%i].%s%s%s%s\n",
-                       i, so->output[i].output_buffer,
-                       so->output[i].dst_offset, so->output[i].dst_offset + so->output[i].num_components - 1,
-                       so->output[i].register_index,
-                       mask & 1 ? "x" : "",
-                       mask & 2 ? "y" : "",
-                       mask & 4 ? "z" : "",
-                       mask & 8 ? "w" : "");
-       }
-}
-
-void si_emit_streamout_output(struct si_shader_context *ctx,
-                             LLVMValueRef const *so_buffers,
-                             LLVMValueRef const *so_write_offsets,
-                             struct pipe_stream_output *stream_out,
-                             struct si_shader_output_values *shader_out)
-{
-       unsigned buf_idx = stream_out->output_buffer;
-       unsigned start = stream_out->start_component;
-       unsigned num_comps = stream_out->num_components;
-       LLVMValueRef out[4];
-
-       assert(num_comps && num_comps <= 4);
-       if (!num_comps || num_comps > 4)
-               return;
-
-       /* Load the output as int. */
-       for (int j = 0; j < num_comps; j++) {
-               assert(stream_out->stream == shader_out->vertex_stream[start + j]);
-
-               out[j] = ac_to_integer(&ctx->ac, shader_out->values[start + j]);
-       }
-
-       /* Pack the output. */
-       LLVMValueRef vdata = NULL;
-
-       switch (num_comps) {
-       case 1: /* as i32 */
-               vdata = out[0];
-               break;
-       case 2: /* as v2i32 */
-       case 3: /* as v3i32 */
-               if (ac_has_vec3_support(ctx->screen->info.chip_class, false)) {
-                       vdata = ac_build_gather_values(&ctx->ac, out, num_comps);
-                       break;
-               }
-               /* as v4i32 (aligned to 4) */
-               out[3] = LLVMGetUndef(ctx->i32);
-               /* fall through */
-       case 4: /* as v4i32 */
-               vdata = ac_build_gather_values(&ctx->ac, out, util_next_power_of_two(num_comps));
-               break;
-       }
-
-       ac_build_buffer_store_dword(&ctx->ac, so_buffers[buf_idx],
-                                   vdata, num_comps,
-                                   so_write_offsets[buf_idx],
-                                   ctx->i32_0,
-                                   stream_out->dst_offset * 4, ac_glc | ac_slc);
-}
-
-/**
- * Write streamout data to buffers for vertex stream @p stream (different
- * vertex streams can occur for GS copy shaders).
- */
-static void si_llvm_emit_streamout(struct si_shader_context *ctx,
-                                  struct si_shader_output_values *outputs,
-                                  unsigned noutput, unsigned stream)
-{
-       struct si_shader_selector *sel = ctx->shader->selector;
-       struct pipe_stream_output_info *so = &sel->so;
-       LLVMBuilderRef builder = ctx->ac.builder;
-       int i;
-
-       /* Get bits [22:16], i.e. (so_param >> 16) & 127; */
-       LLVMValueRef so_vtx_count =
-               si_unpack_param(ctx, ctx->streamout_config, 16, 7);
-
-       LLVMValueRef tid = ac_get_thread_id(&ctx->ac);
-
-       /* can_emit = tid < so_vtx_count; */
-       LLVMValueRef can_emit =
-               LLVMBuildICmp(builder, LLVMIntULT, tid, so_vtx_count, "");
-
-       /* Emit the streamout code conditionally. This actually avoids
-        * out-of-bounds buffer access. The hw tells us via the SGPR
-        * (so_vtx_count) which threads are allowed to emit streamout data. */
-       ac_build_ifcc(&ctx->ac, can_emit, 6501);
-       {
-               /* The buffer offset is computed as follows:
-                *   ByteOffset = streamout_offset[buffer_id]*4 +
-                *                (streamout_write_index + thread_id)*stride[buffer_id] +
-                *                attrib_offset
-                 */
-
-               LLVMValueRef so_write_index =
-                       ac_get_arg(&ctx->ac,
-                                  ctx->streamout_write_index);
-
-               /* Compute (streamout_write_index + thread_id). */
-               so_write_index = LLVMBuildAdd(builder, so_write_index, tid, "");
-
-               /* Load the descriptor and compute the write offset for each
-                * enabled buffer. */
-               LLVMValueRef so_write_offset[4] = {};
-               LLVMValueRef so_buffers[4];
-               LLVMValueRef buf_ptr = ac_get_arg(&ctx->ac,
-                                                 ctx->rw_buffers);
-
-               for (i = 0; i < 4; i++) {
-                       if (!so->stride[i])
-                               continue;
-
-                       LLVMValueRef offset = LLVMConstInt(ctx->i32,
-                                                          SI_VS_STREAMOUT_BUF0 + i, 0);
-
-                       so_buffers[i] = ac_build_load_to_sgpr(&ctx->ac, buf_ptr, offset);
-
-                       LLVMValueRef so_offset = ac_get_arg(&ctx->ac,
-                                                           ctx->streamout_offset[i]);
-                       so_offset = LLVMBuildMul(builder, so_offset, LLVMConstInt(ctx->i32, 4, 0), "");
-
-                       so_write_offset[i] = ac_build_imad(&ctx->ac, so_write_index,
-                                                          LLVMConstInt(ctx->i32, so->stride[i]*4, 0),
-                                                          so_offset);
-               }
-
-               /* Write streamout data. */
-               for (i = 0; i < so->num_outputs; i++) {
-                       unsigned reg = so->output[i].register_index;
-
-                       if (reg >= noutput)
-                               continue;
-
-                       if (stream != so->output[i].stream)
-                               continue;
-
-                       si_emit_streamout_output(ctx, so_buffers, so_write_offset,
-                                                &so->output[i], &outputs[reg]);
-               }
-       }
-       ac_build_endif(&ctx->ac, 6501);
-}
-
-static void si_export_param(struct si_shader_context *ctx, unsigned index,
-                           LLVMValueRef *values)
-{
-       struct ac_export_args args;
-
-       si_llvm_init_export_args(ctx, values,
-                                V_008DFC_SQ_EXP_PARAM + index, &args);
-       ac_build_export(&ctx->ac, &args);
-}
-
-static void si_build_param_exports(struct si_shader_context *ctx,
-                                  struct si_shader_output_values *outputs,
-                                  unsigned noutput)
-{
-       struct si_shader *shader = ctx->shader;
-       unsigned param_count = 0;
-
-       for (unsigned i = 0; i < noutput; i++) {
-               unsigned semantic_name = outputs[i].semantic_name;
-               unsigned semantic_index = outputs[i].semantic_index;
-
-               if (outputs[i].vertex_stream[0] != 0 &&
-                   outputs[i].vertex_stream[1] != 0 &&
-                   outputs[i].vertex_stream[2] != 0 &&
-                   outputs[i].vertex_stream[3] != 0)
-                       continue;
-
-               switch (semantic_name) {
-               case TGSI_SEMANTIC_LAYER:
-               case TGSI_SEMANTIC_VIEWPORT_INDEX:
-               case TGSI_SEMANTIC_CLIPDIST:
-               case TGSI_SEMANTIC_COLOR:
-               case TGSI_SEMANTIC_BCOLOR:
-               case TGSI_SEMANTIC_PRIMID:
-               case TGSI_SEMANTIC_FOG:
-               case TGSI_SEMANTIC_TEXCOORD:
-               case TGSI_SEMANTIC_GENERIC:
-                       break;
-               default:
-                       continue;
-               }
-
-               if ((semantic_name != TGSI_SEMANTIC_GENERIC ||
-                    semantic_index < SI_MAX_IO_GENERIC) &&
-                   shader->key.opt.kill_outputs &
-                   (1ull << si_shader_io_get_unique_index(semantic_name,
-                                                          semantic_index, true)))
-                       continue;
-
-               si_export_param(ctx, param_count, outputs[i].values);
-
-               assert(i < ARRAY_SIZE(shader->info.vs_output_param_offset));
-               shader->info.vs_output_param_offset[i] = param_count++;
-       }
-
-       shader->info.nr_param_exports = param_count;
-}
-
-/**
- * Vertex color clamping.
- *
- * This uses a state constant loaded in a user data SGPR and
- * an IF statement is added that clamps all colors if the constant
- * is true.
- */
-static void si_vertex_color_clamping(struct si_shader_context *ctx,
-                                    struct si_shader_output_values *outputs,
-                                    unsigned noutput)
-{
-       LLVMValueRef addr[SI_MAX_VS_OUTPUTS][4];
-       bool has_colors = false;
-
-       /* Store original colors to alloca variables. */
-       for (unsigned i = 0; i < noutput; i++) {
-               if (outputs[i].semantic_name != TGSI_SEMANTIC_COLOR &&
-                   outputs[i].semantic_name != TGSI_SEMANTIC_BCOLOR)
-                       continue;
-
-               for (unsigned j = 0; j < 4; j++) {
-                       addr[i][j] = ac_build_alloca_undef(&ctx->ac, ctx->f32, "");
-                       LLVMBuildStore(ctx->ac.builder, outputs[i].values[j], addr[i][j]);
-               }
-               has_colors = true;
-       }
-
-       if (!has_colors)
-               return;
-
-       /* The state is in the first bit of the user SGPR. */
-       LLVMValueRef cond = ac_get_arg(&ctx->ac, ctx->vs_state_bits);
-       cond = LLVMBuildTrunc(ctx->ac.builder, cond, ctx->i1, "");
-
-       ac_build_ifcc(&ctx->ac, cond, 6502);
-
-       /* Store clamped colors to alloca variables within the conditional block. */
-       for (unsigned i = 0; i < noutput; i++) {
-               if (outputs[i].semantic_name != TGSI_SEMANTIC_COLOR &&
-                   outputs[i].semantic_name != TGSI_SEMANTIC_BCOLOR)
-                       continue;
-
-               for (unsigned j = 0; j < 4; j++) {
-                       LLVMBuildStore(ctx->ac.builder,
-                                      ac_build_clamp(&ctx->ac, outputs[i].values[j]),
-                                      addr[i][j]);
-               }
-       }
-       ac_build_endif(&ctx->ac, 6502);
-
-       /* Load clamped colors */
-       for (unsigned i = 0; i < noutput; i++) {
-               if (outputs[i].semantic_name != TGSI_SEMANTIC_COLOR &&
-                   outputs[i].semantic_name != TGSI_SEMANTIC_BCOLOR)
-                       continue;
-
-               for (unsigned j = 0; j < 4; j++) {
-                       outputs[i].values[j] =
-                               LLVMBuildLoad(ctx->ac.builder, addr[i][j], "");
-               }
-       }
-}
-
-/* Generate export instructions for hardware VS shader stage or NGG GS stage
- * (position and parameter data only).
- */
-void si_llvm_export_vs(struct si_shader_context *ctx,
-                      struct si_shader_output_values *outputs,
-                      unsigned noutput)
-{
-       struct si_shader *shader = ctx->shader;
-       struct ac_export_args pos_args[4] = {};
-       LLVMValueRef psize_value = NULL, edgeflag_value = NULL, layer_value = NULL, viewport_index_value = NULL;
-       unsigned pos_idx;
-       int i;
-
-       si_vertex_color_clamping(ctx, outputs, noutput);
-
-       /* Build position exports. */
-       for (i = 0; i < noutput; i++) {
-               switch (outputs[i].semantic_name) {
-               case TGSI_SEMANTIC_POSITION:
-                       si_llvm_init_export_args(ctx, outputs[i].values,
-                                                V_008DFC_SQ_EXP_POS, &pos_args[0]);
-                       break;
-               case TGSI_SEMANTIC_PSIZE:
-                       psize_value = outputs[i].values[0];
-                       break;
-               case TGSI_SEMANTIC_LAYER:
-                       layer_value = outputs[i].values[0];
-                       break;
-               case TGSI_SEMANTIC_VIEWPORT_INDEX:
-                       viewport_index_value = outputs[i].values[0];
-                       break;
-               case TGSI_SEMANTIC_EDGEFLAG:
-                       edgeflag_value = outputs[i].values[0];
-                       break;
-               case TGSI_SEMANTIC_CLIPDIST:
-                       if (!shader->key.opt.clip_disable) {
-                               unsigned index = 2 + outputs[i].semantic_index;
-                               si_llvm_init_export_args(ctx, outputs[i].values,
-                                                        V_008DFC_SQ_EXP_POS + index,
-                                                        &pos_args[index]);
-                       }
-                       break;
-               case TGSI_SEMANTIC_CLIPVERTEX:
-                       if (!shader->key.opt.clip_disable) {
-                               si_llvm_emit_clipvertex(ctx, pos_args,
-                                                       outputs[i].values);
-                       }
-                       break;
-               }
-       }
-
-       /* We need to add the position output manually if it's missing. */
-       if (!pos_args[0].out[0]) {
-               pos_args[0].enabled_channels = 0xf; /* writemask */
-               pos_args[0].valid_mask = 0; /* EXEC mask */
-               pos_args[0].done = 0; /* last export? */
-               pos_args[0].target = V_008DFC_SQ_EXP_POS;
-               pos_args[0].compr = 0; /* COMPR flag */
-               pos_args[0].out[0] = ctx->ac.f32_0; /* X */
-               pos_args[0].out[1] = ctx->ac.f32_0; /* Y */
-               pos_args[0].out[2] = ctx->ac.f32_0; /* Z */
-               pos_args[0].out[3] = ctx->ac.f32_1;  /* W */
-       }
-
-       bool pos_writes_edgeflag = shader->selector->info.writes_edgeflag &&
-                                  !shader->key.as_ngg;
-
-       /* Write the misc vector (point size, edgeflag, layer, viewport). */
-       if (shader->selector->info.writes_psize ||
-           pos_writes_edgeflag ||
-           shader->selector->info.writes_viewport_index ||
-           shader->selector->info.writes_layer) {
-               pos_args[1].enabled_channels = shader->selector->info.writes_psize |
-                                              (pos_writes_edgeflag << 1) |
-                                              (shader->selector->info.writes_layer << 2);
-
-               pos_args[1].valid_mask = 0; /* EXEC mask */
-               pos_args[1].done = 0; /* last export? */
-               pos_args[1].target = V_008DFC_SQ_EXP_POS + 1;
-               pos_args[1].compr = 0; /* COMPR flag */
-               pos_args[1].out[0] = ctx->ac.f32_0; /* X */
-               pos_args[1].out[1] = ctx->ac.f32_0; /* Y */
-               pos_args[1].out[2] = ctx->ac.f32_0; /* Z */
-               pos_args[1].out[3] = ctx->ac.f32_0; /* W */
-
-               if (shader->selector->info.writes_psize)
-                       pos_args[1].out[0] = psize_value;
-
-               if (pos_writes_edgeflag) {
-                       /* The output is a float, but the hw expects an integer
-                        * with the first bit containing the edge flag. */
-                       edgeflag_value = LLVMBuildFPToUI(ctx->ac.builder,
-                                                        edgeflag_value,
-                                                        ctx->i32, "");
-                       edgeflag_value = ac_build_umin(&ctx->ac,
-                                                     edgeflag_value,
-                                                     ctx->i32_1);
-
-                       /* The LLVM intrinsic expects a float. */
-                       pos_args[1].out[1] = ac_to_float(&ctx->ac, edgeflag_value);
-               }
-
-               if (ctx->screen->info.chip_class >= GFX9) {
-                       /* GFX9 has the layer in out.z[10:0] and the viewport
-                        * index in out.z[19:16].
-                        */
-                       if (shader->selector->info.writes_layer)
-                               pos_args[1].out[2] = layer_value;
-
-                       if (shader->selector->info.writes_viewport_index) {
-                               LLVMValueRef v = viewport_index_value;
-
-                               v = ac_to_integer(&ctx->ac, v);
-                               v = LLVMBuildShl(ctx->ac.builder, v,
-                                                LLVMConstInt(ctx->i32, 16, 0), "");
-                               v = LLVMBuildOr(ctx->ac.builder, v,
-                                               ac_to_integer(&ctx->ac,  pos_args[1].out[2]), "");
-                               pos_args[1].out[2] = ac_to_float(&ctx->ac, v);
-                               pos_args[1].enabled_channels |= 1 << 2;
-                       }
-               } else {
-                       if (shader->selector->info.writes_layer)
-                               pos_args[1].out[2] = layer_value;
-
-                       if (shader->selector->info.writes_viewport_index) {
-                               pos_args[1].out[3] = viewport_index_value;
-                               pos_args[1].enabled_channels |= 1 << 3;
-                       }
-               }
-       }
-
-       for (i = 0; i < 4; i++)
-               if (pos_args[i].out[0])
-                       shader->info.nr_pos_exports++;
-
-       /* Navi10-14 skip POS0 exports if EXEC=0 and DONE=0, causing a hang.
-        * Setting valid_mask=1 prevents it and has no other effect.
-        */
-       if (ctx->screen->info.family == CHIP_NAVI10 ||
-           ctx->screen->info.family == CHIP_NAVI12 ||
-           ctx->screen->info.family == CHIP_NAVI14)
-               pos_args[0].valid_mask = 1;
-
-       pos_idx = 0;
-       for (i = 0; i < 4; i++) {
-               if (!pos_args[i].out[0])
-                       continue;
-
-               /* Specify the target we are exporting */
-               pos_args[i].target = V_008DFC_SQ_EXP_POS + pos_idx++;
-
-               if (pos_idx == shader->info.nr_pos_exports)
-                       /* Specify that this is the last export */
-                       pos_args[i].done = 1;
-
-               ac_build_export(&ctx->ac, &pos_args[i]);
-       }
-
-       /* Build parameter exports. */
-       si_build_param_exports(ctx, outputs, noutput);
-}
-
-/**
- * Forward all outputs from the vertex shader to the TES. This is only used
- * for the fixed function TCS.
- */
-static void si_copy_tcs_inputs(struct si_shader_context *ctx)
-{
-       LLVMValueRef invocation_id, buffer, buffer_offset;
-       LLVMValueRef lds_vertex_stride, lds_base;
-       uint64_t inputs;
-
-       invocation_id = si_unpack_param(ctx, ctx->args.tcs_rel_ids, 8, 5);
-       buffer = get_tess_ring_descriptor(ctx, TESS_OFFCHIP_RING_TCS);
-       buffer_offset = ac_get_arg(&ctx->ac, ctx->tcs_offchip_offset);
-
-       lds_vertex_stride = get_tcs_in_vertex_dw_stride(ctx);
-       lds_base = get_tcs_in_current_patch_offset(ctx);
-       lds_base = ac_build_imad(&ctx->ac, invocation_id, lds_vertex_stride,
-                                lds_base);
-
-       inputs = ctx->shader->key.mono.u.ff_tcs_inputs_to_copy;
-       while (inputs) {
-               unsigned i = u_bit_scan64(&inputs);
-
-               LLVMValueRef lds_ptr = LLVMBuildAdd(ctx->ac.builder, lds_base,
-                                           LLVMConstInt(ctx->i32, 4 * i, 0),
-                                            "");
-
-               LLVMValueRef buffer_addr = get_tcs_tes_buffer_address(ctx,
-                                             get_rel_patch_id(ctx),
-                                             invocation_id,
-                                             LLVMConstInt(ctx->i32, i, 0));
-
-               LLVMValueRef value = lshs_lds_load(ctx, ctx->ac.i32, ~0, lds_ptr);
-
-               ac_build_buffer_store_dword(&ctx->ac, buffer, value, 4, buffer_addr,
-                                           buffer_offset, 0, ac_glc);
-       }
-}
-
-static void si_write_tess_factors(struct si_shader_context *ctx,
-                                 LLVMValueRef rel_patch_id,
-                                 LLVMValueRef invocation_id,
-                                 LLVMValueRef tcs_out_current_patch_data_offset,
-                                 LLVMValueRef invoc0_tf_outer[4],
-                                 LLVMValueRef invoc0_tf_inner[2])
-{
-       struct si_shader *shader = ctx->shader;
-       unsigned tess_inner_index, tess_outer_index;
-       LLVMValueRef lds_base, lds_inner, lds_outer, byteoffset, buffer;
-       LLVMValueRef out[6], vec0, vec1, tf_base, inner[4], outer[4];
-       unsigned stride, outer_comps, inner_comps, i, offset;
-
-       /* Add a barrier before loading tess factors from LDS. */
-       if (!shader->key.part.tcs.epilog.invoc0_tess_factors_are_def)
-               si_llvm_emit_barrier(ctx);
-
-       /* Do this only for invocation 0, because the tess levels are per-patch,
-        * not per-vertex.
-        *
-        * This can't jump, because invocation 0 executes this. It should
-        * at least mask out the loads and stores for other invocations.
-        */
-       ac_build_ifcc(&ctx->ac,
-                     LLVMBuildICmp(ctx->ac.builder, LLVMIntEQ,
-                                   invocation_id, ctx->i32_0, ""), 6503);
-
-       /* Determine the layout of one tess factor element in the buffer. */
-       switch (shader->key.part.tcs.epilog.prim_mode) {
-       case PIPE_PRIM_LINES:
-               stride = 2; /* 2 dwords, 1 vec2 store */
-               outer_comps = 2;
-               inner_comps = 0;
-               break;
-       case PIPE_PRIM_TRIANGLES:
-               stride = 4; /* 4 dwords, 1 vec4 store */
-               outer_comps = 3;
-               inner_comps = 1;
-               break;
-       case PIPE_PRIM_QUADS:
-               stride = 6; /* 6 dwords, 2 stores (vec4 + vec2) */
-               outer_comps = 4;
-               inner_comps = 2;
-               break;
-       default:
-               assert(0);
-               return;
-       }
-
-       for (i = 0; i < 4; i++) {
-               inner[i] = LLVMGetUndef(ctx->i32);
-               outer[i] = LLVMGetUndef(ctx->i32);
-       }
-
-       if (shader->key.part.tcs.epilog.invoc0_tess_factors_are_def) {
-               /* Tess factors are in VGPRs. */
-               for (i = 0; i < outer_comps; i++)
-                       outer[i] = out[i] = invoc0_tf_outer[i];
-               for (i = 0; i < inner_comps; i++)
-                       inner[i] = out[outer_comps+i] = invoc0_tf_inner[i];
-       } else {
-               /* Load tess_inner and tess_outer from LDS.
-                * Any invocation can write them, so we can't get them from a temporary.
-                */
-               tess_inner_index = si_shader_io_get_unique_index_patch(TGSI_SEMANTIC_TESSINNER, 0);
-               tess_outer_index = si_shader_io_get_unique_index_patch(TGSI_SEMANTIC_TESSOUTER, 0);
-
-               lds_base = tcs_out_current_patch_data_offset;
-               lds_inner = LLVMBuildAdd(ctx->ac.builder, lds_base,
-                                        LLVMConstInt(ctx->i32,
-                                                     tess_inner_index * 4, 0), "");
-               lds_outer = LLVMBuildAdd(ctx->ac.builder, lds_base,
-                                        LLVMConstInt(ctx->i32,
-                                                     tess_outer_index * 4, 0), "");
-
-               for (i = 0; i < outer_comps; i++) {
-                       outer[i] = out[i] =
-                               lshs_lds_load(ctx, ctx->ac.i32, i, lds_outer);
-               }
-               for (i = 0; i < inner_comps; i++) {
-                       inner[i] = out[outer_comps+i] =
-                               lshs_lds_load(ctx, ctx->ac.i32, i, lds_inner);
-               }
-       }
-
-       if (shader->key.part.tcs.epilog.prim_mode == PIPE_PRIM_LINES) {
-               /* For isolines, the hardware expects tess factors in the
-                * reverse order from what NIR specifies.
-                */
-               LLVMValueRef tmp = out[0];
-               out[0] = out[1];
-               out[1] = tmp;
-       }
-
-       /* Convert the outputs to vectors for stores. */
-       vec0 = ac_build_gather_values(&ctx->ac, out, MIN2(stride, 4));
-       vec1 = NULL;
-
-       if (stride > 4)
-               vec1 = ac_build_gather_values(&ctx->ac, out+4, stride - 4);
-
-       /* Get the buffer. */
-       buffer = get_tess_ring_descriptor(ctx, TCS_FACTOR_RING);
-
-       /* Get the offset. */
-       tf_base = ac_get_arg(&ctx->ac,
-                            ctx->tcs_factor_offset);
-       byteoffset = LLVMBuildMul(ctx->ac.builder, rel_patch_id,
-                                 LLVMConstInt(ctx->i32, 4 * stride, 0), "");
-
-       ac_build_ifcc(&ctx->ac,
-                     LLVMBuildICmp(ctx->ac.builder, LLVMIntEQ,
-                                   rel_patch_id, ctx->i32_0, ""), 6504);
-
-       /* Store the dynamic HS control word. */
-       offset = 0;
-       if (ctx->screen->info.chip_class <= GFX8) {
-               ac_build_buffer_store_dword(&ctx->ac, buffer,
-                                           LLVMConstInt(ctx->i32, 0x80000000, 0),
-                                           1, ctx->i32_0, tf_base,
-                                           offset, ac_glc);
-               offset += 4;
-       }
-
-       ac_build_endif(&ctx->ac, 6504);
-
-       /* Store the tessellation factors. */
-       ac_build_buffer_store_dword(&ctx->ac, buffer, vec0,
-                                   MIN2(stride, 4), byteoffset, tf_base,
-                                   offset, ac_glc);
-       offset += 16;
-       if (vec1)
-               ac_build_buffer_store_dword(&ctx->ac, buffer, vec1,
-                                           stride - 4, byteoffset, tf_base,
-                                           offset, ac_glc);
-
-       /* Store the tess factors into the offchip buffer if TES reads them. */
-       if (shader->key.part.tcs.epilog.tes_reads_tess_factors) {
-               LLVMValueRef buf, base, inner_vec, outer_vec, tf_outer_offset;
-               LLVMValueRef tf_inner_offset;
-               unsigned param_outer, param_inner;
-
-               buf = get_tess_ring_descriptor(ctx, TESS_OFFCHIP_RING_TCS);
-               base = ac_get_arg(&ctx->ac, ctx->tcs_offchip_offset);
-
-               param_outer = si_shader_io_get_unique_index_patch(
-                                     TGSI_SEMANTIC_TESSOUTER, 0);
-               tf_outer_offset = get_tcs_tes_buffer_address(ctx, rel_patch_id, NULL,
-                                       LLVMConstInt(ctx->i32, param_outer, 0));
-
-               unsigned outer_vec_size =
-                       ac_has_vec3_support(ctx->screen->info.chip_class, false) ?
-                               outer_comps : util_next_power_of_two(outer_comps);
-               outer_vec = ac_build_gather_values(&ctx->ac, outer, outer_vec_size);
-
-               ac_build_buffer_store_dword(&ctx->ac, buf, outer_vec,
-                                           outer_comps, tf_outer_offset,
-                                           base, 0, ac_glc);
-               if (inner_comps) {
-                       param_inner = si_shader_io_get_unique_index_patch(
-                                             TGSI_SEMANTIC_TESSINNER, 0);
-                       tf_inner_offset = get_tcs_tes_buffer_address(ctx, rel_patch_id, NULL,
-                                       LLVMConstInt(ctx->i32, param_inner, 0));
-
-                       inner_vec = inner_comps == 1 ? inner[0] :
-                                   ac_build_gather_values(&ctx->ac, inner, inner_comps);
-                       ac_build_buffer_store_dword(&ctx->ac, buf, inner_vec,
-                                                   inner_comps, tf_inner_offset,
-                                                   base, 0, ac_glc);
-               }
-       }
-
-       ac_build_endif(&ctx->ac, 6503);
-}
-
-static LLVMValueRef
-si_insert_input_ret(struct si_shader_context *ctx, LLVMValueRef ret,
-                   struct ac_arg param, unsigned return_index)
-{
-       return LLVMBuildInsertValue(ctx->ac.builder, ret,
-                                   ac_get_arg(&ctx->ac, param),
-                                   return_index, "");
-}
-
-static LLVMValueRef
-si_insert_input_ret_float(struct si_shader_context *ctx, LLVMValueRef ret,
-                         struct ac_arg param, unsigned return_index)
-{
-       LLVMBuilderRef builder = ctx->ac.builder;
-       LLVMValueRef p = ac_get_arg(&ctx->ac, param);
-
-       return LLVMBuildInsertValue(builder, ret,
-                                   ac_to_float(&ctx->ac, p),
-                                   return_index, "");
-}
-
-static LLVMValueRef
-si_insert_input_ptr(struct si_shader_context *ctx, LLVMValueRef ret,
-                   struct ac_arg param, unsigned return_index)
-{
-       LLVMBuilderRef builder = ctx->ac.builder;
-       LLVMValueRef ptr = ac_get_arg(&ctx->ac, param);
-       ptr = LLVMBuildPtrToInt(builder, ptr, ctx->i32, "");
-       return LLVMBuildInsertValue(builder, ret, ptr, return_index, "");
-}
-
-/* This only writes the tessellation factor levels. */
-static void si_llvm_emit_tcs_epilogue(struct ac_shader_abi *abi,
-                                     unsigned max_outputs,
-                                     LLVMValueRef *addrs)
-{
-       struct si_shader_context *ctx = si_shader_context_from_abi(abi);
-       LLVMBuilderRef builder = ctx->ac.builder;
-       LLVMValueRef rel_patch_id, invocation_id, tf_lds_offset;
-
-       si_copy_tcs_inputs(ctx);
-
-       rel_patch_id = get_rel_patch_id(ctx);
-       invocation_id = si_unpack_param(ctx, ctx->args.tcs_rel_ids, 8, 5);
-       tf_lds_offset = get_tcs_out_current_patch_data_offset(ctx);
-
-       if (ctx->screen->info.chip_class >= GFX9) {
-               LLVMBasicBlockRef blocks[2] = {
-                       LLVMGetInsertBlock(builder),
-                       ctx->merged_wrap_if_entry_block
-               };
-               LLVMValueRef values[2];
-
-               ac_build_endif(&ctx->ac, ctx->merged_wrap_if_label);
-
-               values[0] = rel_patch_id;
-               values[1] = LLVMGetUndef(ctx->i32);
-               rel_patch_id = ac_build_phi(&ctx->ac, ctx->i32, 2, values, blocks);
-
-               values[0] = tf_lds_offset;
-               values[1] = LLVMGetUndef(ctx->i32);
-               tf_lds_offset = ac_build_phi(&ctx->ac, ctx->i32, 2, values, blocks);
-
-               values[0] = invocation_id;
-               values[1] = ctx->i32_1; /* cause the epilog to skip threads */
-               invocation_id = ac_build_phi(&ctx->ac, ctx->i32, 2, values, blocks);
-       }
-
-       /* Return epilog parameters from this function. */
-       LLVMValueRef ret = ctx->return_value;
-       unsigned vgpr;
-
-       if (ctx->screen->info.chip_class >= GFX9) {
-               ret = si_insert_input_ret(ctx, ret, ctx->tcs_offchip_layout,
-                                         8 + GFX9_SGPR_TCS_OFFCHIP_LAYOUT);
-               ret = si_insert_input_ret(ctx, ret, ctx->tcs_out_lds_layout,
-                                         8 + GFX9_SGPR_TCS_OUT_LAYOUT);
-               /* Tess offchip and tess factor offsets are at the beginning. */
-               ret = si_insert_input_ret(ctx, ret, ctx->tcs_offchip_offset, 2);
-               ret = si_insert_input_ret(ctx, ret, ctx->tcs_factor_offset, 4);
-               vgpr = 8 + GFX9_SGPR_TCS_OUT_LAYOUT + 1;
-       } else {
-               ret = si_insert_input_ret(ctx, ret, ctx->tcs_offchip_layout,
-                                         GFX6_SGPR_TCS_OFFCHIP_LAYOUT);
-               ret = si_insert_input_ret(ctx, ret, ctx->tcs_out_lds_layout,
-                                         GFX6_SGPR_TCS_OUT_LAYOUT);
-               /* Tess offchip and tess factor offsets are after user SGPRs. */
-               ret = si_insert_input_ret(ctx, ret, ctx->tcs_offchip_offset,
-                                         GFX6_TCS_NUM_USER_SGPR);
-               ret = si_insert_input_ret(ctx, ret, ctx->tcs_factor_offset,
-                                         GFX6_TCS_NUM_USER_SGPR + 1);
-               vgpr = GFX6_TCS_NUM_USER_SGPR + 2;
-       }
-
-       /* VGPRs */
-       rel_patch_id = ac_to_float(&ctx->ac, rel_patch_id);
-       invocation_id = ac_to_float(&ctx->ac, invocation_id);
-       tf_lds_offset = ac_to_float(&ctx->ac, tf_lds_offset);
-
-       /* Leave a hole corresponding to the two input VGPRs. This ensures that
-        * the invocation_id output does not alias the tcs_rel_ids input,
-        * which saves a V_MOV on gfx9.
-        */
-       vgpr += 2;
-
-       ret = LLVMBuildInsertValue(builder, ret, rel_patch_id, vgpr++, "");
-       ret = LLVMBuildInsertValue(builder, ret, invocation_id, vgpr++, "");
-
-       if (ctx->shader->selector->info.tessfactors_are_def_in_all_invocs) {
-               vgpr++; /* skip the tess factor LDS offset */
-               for (unsigned i = 0; i < 6; i++) {
-                       LLVMValueRef value =
-                               LLVMBuildLoad(builder, ctx->invoc0_tess_factors[i], "");
-                       value = ac_to_float(&ctx->ac, value);
-                       ret = LLVMBuildInsertValue(builder, ret, value, vgpr++, "");
-               }
-       } else {
-               ret = LLVMBuildInsertValue(builder, ret, tf_lds_offset, vgpr++, "");
-       }
-       ctx->return_value = ret;
-}
-
-/* Pass TCS inputs from LS to TCS on GFX9. */
-static void si_set_ls_return_value_for_tcs(struct si_shader_context *ctx)
-{
-       LLVMValueRef ret = ctx->return_value;
-
-       ret = si_insert_input_ptr(ctx, ret, ctx->other_const_and_shader_buffers, 0);
-       ret = si_insert_input_ptr(ctx, ret, ctx->other_samplers_and_images, 1);
-       ret = si_insert_input_ret(ctx, ret, ctx->tcs_offchip_offset, 2);
-       ret = si_insert_input_ret(ctx, ret, ctx->merged_wave_info, 3);
-       ret = si_insert_input_ret(ctx, ret, ctx->tcs_factor_offset, 4);
-       ret = si_insert_input_ret(ctx, ret, ctx->merged_scratch_offset, 5);
-
-       ret = si_insert_input_ptr(ctx, ret, ctx->rw_buffers,
-                                 8 + SI_SGPR_RW_BUFFERS);
-       ret = si_insert_input_ptr(ctx, ret,
-                                 ctx->bindless_samplers_and_images,
-                                 8 + SI_SGPR_BINDLESS_SAMPLERS_AND_IMAGES);
-
-       ret = si_insert_input_ret(ctx, ret, ctx->vs_state_bits,
-                                 8 + SI_SGPR_VS_STATE_BITS);
-
-       ret = si_insert_input_ret(ctx, ret, ctx->tcs_offchip_layout,
-                                 8 + GFX9_SGPR_TCS_OFFCHIP_LAYOUT);
-       ret = si_insert_input_ret(ctx, ret, ctx->tcs_out_lds_offsets,
-                                 8 + GFX9_SGPR_TCS_OUT_OFFSETS);
-       ret = si_insert_input_ret(ctx, ret, ctx->tcs_out_lds_layout,
-                                 8 + GFX9_SGPR_TCS_OUT_LAYOUT);
-
-       unsigned vgpr = 8 + GFX9_TCS_NUM_USER_SGPR;
-       ret = LLVMBuildInsertValue(ctx->ac.builder, ret,
-                                  ac_to_float(&ctx->ac,
-                                              ac_get_arg(&ctx->ac, ctx->args.tcs_patch_id)),
-                                  vgpr++, "");
-       ret = LLVMBuildInsertValue(ctx->ac.builder, ret,
-                                  ac_to_float(&ctx->ac,
-                                              ac_get_arg(&ctx->ac, ctx->args.tcs_rel_ids)),
-                                  vgpr++, "");
-       ctx->return_value = ret;
-}
-
-/* Pass GS inputs from ES to GS on GFX9. */
-static void si_set_es_return_value_for_gs(struct si_shader_context *ctx)
-{
-       LLVMValueRef ret = ctx->return_value;
-
-       ret = si_insert_input_ptr(ctx, ret, ctx->other_const_and_shader_buffers, 0);
-       ret = si_insert_input_ptr(ctx, ret, ctx->other_samplers_and_images, 1);
-       if (ctx->shader->key.as_ngg)
-               ret = si_insert_input_ptr(ctx, ret, ctx->gs_tg_info, 2);
-       else
-               ret = si_insert_input_ret(ctx, ret, ctx->gs2vs_offset, 2);
-       ret = si_insert_input_ret(ctx, ret, ctx->merged_wave_info, 3);
-       ret = si_insert_input_ret(ctx, ret, ctx->merged_scratch_offset, 5);
-
-       ret = si_insert_input_ptr(ctx, ret, ctx->rw_buffers,
-                                 8 + SI_SGPR_RW_BUFFERS);
-       ret = si_insert_input_ptr(ctx, ret,
-                                 ctx->bindless_samplers_and_images,
-                                 8 + SI_SGPR_BINDLESS_SAMPLERS_AND_IMAGES);
-       if (ctx->screen->use_ngg) {
-               ret = si_insert_input_ptr(ctx, ret, ctx->vs_state_bits,
-                                         8 + SI_SGPR_VS_STATE_BITS);
-       }
-
-       unsigned vgpr;
-       if (ctx->type == PIPE_SHADER_VERTEX)
-               vgpr = 8 + GFX9_VSGS_NUM_USER_SGPR;
-       else
-               vgpr = 8 + GFX9_TESGS_NUM_USER_SGPR;
-
-       ret = si_insert_input_ret_float(ctx, ret, ctx->gs_vtx01_offset, vgpr++);
-       ret = si_insert_input_ret_float(ctx, ret, ctx->gs_vtx23_offset, vgpr++);
-       ret = si_insert_input_ret_float(ctx, ret, ctx->args.gs_prim_id, vgpr++);
-       ret = si_insert_input_ret_float(ctx, ret, ctx->args.gs_invocation_id, vgpr++);
-       ret = si_insert_input_ret_float(ctx, ret, ctx->gs_vtx45_offset, vgpr++);
-       ctx->return_value = ret;
-}
-
-static void si_llvm_emit_ls_epilogue(struct ac_shader_abi *abi,
-                                    unsigned max_outputs,
-                                    LLVMValueRef *addrs)
-{
-       struct si_shader_context *ctx = si_shader_context_from_abi(abi);
-       struct si_shader *shader = ctx->shader;
-       struct si_shader_info *info = &shader->selector->info;
-       unsigned i, chan;
-       LLVMValueRef vertex_id = ac_get_arg(&ctx->ac, ctx->rel_auto_id);
-       LLVMValueRef vertex_dw_stride = get_tcs_in_vertex_dw_stride(ctx);
-       LLVMValueRef base_dw_addr = LLVMBuildMul(ctx->ac.builder, vertex_id,
-                                                vertex_dw_stride, "");
-
-       /* Write outputs to LDS. The next shader (TCS aka HS) will read
-        * its inputs from it. */
-       for (i = 0; i < info->num_outputs; i++) {
-               unsigned name = info->output_semantic_name[i];
-               unsigned index = info->output_semantic_index[i];
-
-               /* The ARB_shader_viewport_layer_array spec contains the
-                * following issue:
-                *
-                *    2) What happens if gl_ViewportIndex or gl_Layer is
-                *    written in the vertex shader and a geometry shader is
-                *    present?
-                *
-                *    RESOLVED: The value written by the last vertex processing
-                *    stage is used. If the last vertex processing stage
-                *    (vertex, tessellation evaluation or geometry) does not
-                *    statically assign to gl_ViewportIndex or gl_Layer, index
-                *    or layer zero is assumed.
-                *
-                * So writes to those outputs in VS-as-LS are simply ignored.
-                */
-               if (name == TGSI_SEMANTIC_LAYER ||
-                   name == TGSI_SEMANTIC_VIEWPORT_INDEX)
-                       continue;
-
-               int param = si_shader_io_get_unique_index(name, index, false);
-               LLVMValueRef dw_addr = LLVMBuildAdd(ctx->ac.builder, base_dw_addr,
-                                       LLVMConstInt(ctx->i32, param * 4, 0), "");
-
-               for (chan = 0; chan < 4; chan++) {
-                       if (!(info->output_usagemask[i] & (1 << chan)))
-                               continue;
-
-                       lshs_lds_store(ctx, chan, dw_addr,
-                                 LLVMBuildLoad(ctx->ac.builder, addrs[4 * i + chan], ""));
-               }
-       }
-
-       if (ctx->screen->info.chip_class >= GFX9)
-               si_set_ls_return_value_for_tcs(ctx);
-}
-
-static void si_llvm_emit_es_epilogue(struct ac_shader_abi *abi,
-                                    unsigned max_outputs,
-                                    LLVMValueRef *addrs)
-{
-       struct si_shader_context *ctx = si_shader_context_from_abi(abi);
-       struct si_shader *es = ctx->shader;
-       struct si_shader_info *info = &es->selector->info;
-       LLVMValueRef lds_base = NULL;
-       unsigned chan;
-       int i;
-
-       if (ctx->screen->info.chip_class >= GFX9 && info->num_outputs) {
-               unsigned itemsize_dw = es->selector->esgs_itemsize / 4;
-               LLVMValueRef vertex_idx = ac_get_thread_id(&ctx->ac);
-               LLVMValueRef wave_idx = si_unpack_param(ctx, ctx->merged_wave_info, 24, 4);
-               vertex_idx = LLVMBuildOr(ctx->ac.builder, vertex_idx,
-                                        LLVMBuildMul(ctx->ac.builder, wave_idx,
-                                                     LLVMConstInt(ctx->i32, ctx->ac.wave_size, false), ""), "");
-               lds_base = LLVMBuildMul(ctx->ac.builder, vertex_idx,
-                                       LLVMConstInt(ctx->i32, itemsize_dw, 0), "");
-       }
-
-       for (i = 0; i < info->num_outputs; i++) {
-               int param;
-
-               if (info->output_semantic_name[i] == TGSI_SEMANTIC_VIEWPORT_INDEX ||
-                   info->output_semantic_name[i] == TGSI_SEMANTIC_LAYER)
-                       continue;
-
-               param = si_shader_io_get_unique_index(info->output_semantic_name[i],
-                                                     info->output_semantic_index[i], false);
-
-               for (chan = 0; chan < 4; chan++) {
-                       if (!(info->output_usagemask[i] & (1 << chan)))
-                               continue;
-
-                       LLVMValueRef out_val = LLVMBuildLoad(ctx->ac.builder, addrs[4 * i + chan], "");
-                       out_val = ac_to_integer(&ctx->ac, out_val);
-
-                       /* GFX9 has the ESGS ring in LDS. */
-                       if (ctx->screen->info.chip_class >= GFX9) {
-                               LLVMValueRef idx = LLVMConstInt(ctx->i32, param * 4 + chan, false);
-                               idx = LLVMBuildAdd(ctx->ac.builder, lds_base, idx, "");
-                               ac_build_indexed_store(&ctx->ac, ctx->esgs_ring, idx, out_val);
-                               continue;
-                       }
-
-                       ac_build_buffer_store_dword(&ctx->ac,
-                                                   ctx->esgs_ring,
-                                                   out_val, 1, NULL,
-                                                   ac_get_arg(&ctx->ac, ctx->es2gs_offset),
-                                                   (4 * param + chan) * 4,
-                                                   ac_glc | ac_slc | ac_swizzled);
-               }
-       }
-
-       if (ctx->screen->info.chip_class >= GFX9)
-               si_set_es_return_value_for_gs(ctx);
-}
-
-static LLVMValueRef si_get_gs_wave_id(struct si_shader_context *ctx)
-{
-       if (ctx->screen->info.chip_class >= GFX9)
-               return si_unpack_param(ctx, ctx->merged_wave_info, 16, 8);
-       else
-               return ac_get_arg(&ctx->ac, ctx->gs_wave_id);
-}
-
-static void emit_gs_epilogue(struct si_shader_context *ctx)
-{
-       if (ctx->shader->key.as_ngg) {
-               gfx10_ngg_gs_emit_epilogue(ctx);
-               return;
-       }
-
-       if (ctx->screen->info.chip_class >= GFX10)
-               LLVMBuildFence(ctx->ac.builder, LLVMAtomicOrderingRelease, false, "");
-
-       ac_build_sendmsg(&ctx->ac, AC_SENDMSG_GS_OP_NOP | AC_SENDMSG_GS_DONE,
-                        si_get_gs_wave_id(ctx));
-
-       if (ctx->screen->info.chip_class >= GFX9)
-               ac_build_endif(&ctx->ac, ctx->merged_wrap_if_label);
-}
-
-static void si_llvm_emit_gs_epilogue(struct ac_shader_abi *abi,
-                                    unsigned max_outputs,
-                                    LLVMValueRef *addrs)
-{
-       struct si_shader_context *ctx = si_shader_context_from_abi(abi);
-       struct si_shader_info UNUSED *info = &ctx->shader->selector->info;
-
-       assert(info->num_outputs <= max_outputs);
-
-       emit_gs_epilogue(ctx);
-}
-
-static void si_llvm_emit_vs_epilogue(struct ac_shader_abi *abi,
-                                    unsigned max_outputs,
-                                    LLVMValueRef *addrs)
-{
-       struct si_shader_context *ctx = si_shader_context_from_abi(abi);
-       struct si_shader_info *info = &ctx->shader->selector->info;
-       struct si_shader_output_values *outputs = NULL;
-       int i,j;
-
-       assert(!ctx->shader->is_gs_copy_shader);
-       assert(info->num_outputs <= max_outputs);
-
-       outputs = MALLOC((info->num_outputs + 1) * sizeof(outputs[0]));
-
-       for (i = 0; i < info->num_outputs; i++) {
-               outputs[i].semantic_name = info->output_semantic_name[i];
-               outputs[i].semantic_index = info->output_semantic_index[i];
-
-               for (j = 0; j < 4; j++) {
-                       outputs[i].values[j] =
-                               LLVMBuildLoad(ctx->ac.builder,
-                                             addrs[4 * i + j],
-                                             "");
-                       outputs[i].vertex_stream[j] =
-                               (info->output_streams[i] >> (2 * j)) & 3;
-               }
-       }
-
-       if (!ctx->screen->use_ngg_streamout &&
-           ctx->shader->selector->so.num_outputs)
-               si_llvm_emit_streamout(ctx, outputs, i, 0);
-
-       /* Export PrimitiveID. */
-       if (ctx->shader->key.mono.u.vs_export_prim_id) {
-               outputs[i].semantic_name = TGSI_SEMANTIC_PRIMID;
-               outputs[i].semantic_index = 0;
-               outputs[i].values[0] = ac_to_float(&ctx->ac, si_get_primitive_id(ctx, 0));
-               for (j = 1; j < 4; j++)
-                       outputs[i].values[j] = LLVMConstReal(ctx->f32, 0);
-
-               memset(outputs[i].vertex_stream, 0,
-                      sizeof(outputs[i].vertex_stream));
-               i++;
-       }
-
-       si_llvm_export_vs(ctx, outputs, i);
-       FREE(outputs);
-}
-
-static void si_llvm_emit_prim_discard_cs_epilogue(struct ac_shader_abi *abi,
-                                                 unsigned max_outputs,
-                                                 LLVMValueRef *addrs)
-{
-       struct si_shader_context *ctx = si_shader_context_from_abi(abi);
-       struct si_shader_info *info = &ctx->shader->selector->info;
-       LLVMValueRef pos[4] = {};
-
-       assert(info->num_outputs <= max_outputs);
-
-       for (unsigned i = 0; i < info->num_outputs; i++) {
-               if (info->output_semantic_name[i] != TGSI_SEMANTIC_POSITION)
-                       continue;
-
-               for (unsigned chan = 0; chan < 4; chan++)
-                       pos[chan] = LLVMBuildLoad(ctx->ac.builder, addrs[4 * i + chan], "");
-               break;
-       }
-       assert(pos[0] != NULL);
-
-       /* Return the position output. */
-       LLVMValueRef ret = ctx->return_value;
-       for (unsigned chan = 0; chan < 4; chan++)
-               ret = LLVMBuildInsertValue(ctx->ac.builder, ret, pos[chan], chan, "");
-       ctx->return_value = ret;
-}
-
-struct si_ps_exports {
-       unsigned num;
-       struct ac_export_args args[10];
-};
-
-static void si_export_mrt_z(struct si_shader_context *ctx,
-                           LLVMValueRef depth, LLVMValueRef stencil,
-                           LLVMValueRef samplemask, struct si_ps_exports *exp)
-{
-       struct ac_export_args args;
-
-       ac_export_mrt_z(&ctx->ac, depth, stencil, samplemask, &args);
-
-       memcpy(&exp->args[exp->num++], &args, sizeof(args));
-}
-
-static void si_export_mrt_color(struct si_shader_context *ctx,
-                               LLVMValueRef *color, unsigned index,
-                               unsigned samplemask_param,
-                               bool is_last, struct si_ps_exports *exp)
-{
-       int i;
-
-       /* Clamp color */
-       if (ctx->shader->key.part.ps.epilog.clamp_color)
-               for (i = 0; i < 4; i++)
-                       color[i] = ac_build_clamp(&ctx->ac, color[i]);
-
-       /* Alpha to one */
-       if (ctx->shader->key.part.ps.epilog.alpha_to_one)
-               color[3] = ctx->ac.f32_1;
-
-       /* Alpha test */
-       if (index == 0 &&
-           ctx->shader->key.part.ps.epilog.alpha_func != PIPE_FUNC_ALWAYS)
-               si_alpha_test(ctx, color[3]);
-
-       /* Line & polygon smoothing */
-       if (ctx->shader->key.part.ps.epilog.poly_line_smoothing)
-               color[3] = si_scale_alpha_by_sample_mask(ctx, color[3],
-                                                        samplemask_param);
-
-       /* If last_cbuf > 0, FS_COLOR0_WRITES_ALL_CBUFS is true. */
-       if (ctx->shader->key.part.ps.epilog.last_cbuf > 0) {
-               struct ac_export_args args[8];
-               int c, last = -1;
-
-               /* Get the export arguments, also find out what the last one is. */
-               for (c = 0; c <= ctx->shader->key.part.ps.epilog.last_cbuf; c++) {
-                       si_llvm_init_export_args(ctx, color,
-                                                V_008DFC_SQ_EXP_MRT + c, &args[c]);
-                       if (args[c].enabled_channels)
-                               last = c;
-               }
-
-               /* Emit all exports. */
-               for (c = 0; c <= ctx->shader->key.part.ps.epilog.last_cbuf; c++) {
-                       if (is_last && last == c) {
-                               args[c].valid_mask = 1; /* whether the EXEC mask is valid */
-                               args[c].done = 1; /* DONE bit */
-                       } else if (!args[c].enabled_channels)
-                               continue; /* unnecessary NULL export */
-
-                       memcpy(&exp->args[exp->num++], &args[c], sizeof(args[c]));
-               }
-       } else {
-               struct ac_export_args args;
-
-               /* Export */
-               si_llvm_init_export_args(ctx, color, V_008DFC_SQ_EXP_MRT + index,
-                                        &args);
-               if (is_last) {
-                       args.valid_mask = 1; /* whether the EXEC mask is valid */
-                       args.done = 1; /* DONE bit */
-               } else if (!args.enabled_channels)
-                       return; /* unnecessary NULL export */
-
-               memcpy(&exp->args[exp->num++], &args, sizeof(args));
-       }
-}
-
-static void si_emit_ps_exports(struct si_shader_context *ctx,
-                              struct si_ps_exports *exp)
-{
-       for (unsigned i = 0; i < exp->num; i++)
-               ac_build_export(&ctx->ac, &exp->args[i]);
-}
-
-/**
- * Return PS outputs in this order:
- *
- * v[0:3] = color0.xyzw
- * v[4:7] = color1.xyzw
- * ...
- * vN+0 = Depth
- * vN+1 = Stencil
- * vN+2 = SampleMask
- * vN+3 = SampleMaskIn (used for OpenGL smoothing)
- *
- * The alpha-ref SGPR is returned via its original location.
- */
-static void si_llvm_return_fs_outputs(struct ac_shader_abi *abi,
-                                     unsigned max_outputs,
-                                     LLVMValueRef *addrs)
-{
-       struct si_shader_context *ctx = si_shader_context_from_abi(abi);
-       struct si_shader *shader = ctx->shader;
-       struct si_shader_info *info = &shader->selector->info;
-       LLVMBuilderRef builder = ctx->ac.builder;
-       unsigned i, j, first_vgpr, vgpr;
-
-       LLVMValueRef color[8][4] = {};
-       LLVMValueRef depth = NULL, stencil = NULL, samplemask = NULL;
-       LLVMValueRef ret;
-
-       if (ctx->postponed_kill)
-               ac_build_kill_if_false(&ctx->ac, LLVMBuildLoad(builder, ctx->postponed_kill, ""));
-
-       /* Read the output values. */
-       for (i = 0; i < info->num_outputs; i++) {
-               unsigned semantic_name = info->output_semantic_name[i];
-               unsigned semantic_index = info->output_semantic_index[i];
-
-               switch (semantic_name) {
-               case TGSI_SEMANTIC_COLOR:
-                       assert(semantic_index < 8);
-                       for (j = 0; j < 4; j++) {
-                               LLVMValueRef ptr = addrs[4 * i + j];
-                               LLVMValueRef result = LLVMBuildLoad(builder, ptr, "");
-                               color[semantic_index][j] = result;
+                       if (shader->selector->info.writes_viewport_index) {
+                               pos_args[1].out[3] = viewport_index_value;
+                               pos_args[1].enabled_channels |= 1 << 3;
                        }
-                       break;
-               case TGSI_SEMANTIC_POSITION:
-                       depth = LLVMBuildLoad(builder,
-                                             addrs[4 * i + 0], "");
-                       break;
-               case TGSI_SEMANTIC_STENCIL:
-                       stencil = LLVMBuildLoad(builder,
-                                               addrs[4 * i + 0], "");
-                       break;
-               case TGSI_SEMANTIC_SAMPLEMASK:
-                       samplemask = LLVMBuildLoad(builder,
-                                                  addrs[4 * i + 0], "");
-                       break;
-               default:
-                       fprintf(stderr, "Warning: GFX6 unhandled fs output type:%d\n",
-                               semantic_name);
                }
        }
 
-       /* Fill the return structure. */
-       ret = ctx->return_value;
+       for (i = 0; i < 4; i++)
+               if (pos_args[i].out[0])
+                       shader->info.nr_pos_exports++;
+
+       /* Navi10-14 skip POS0 exports if EXEC=0 and DONE=0, causing a hang.
+        * Setting valid_mask=1 prevents it and has no other effect.
+        */
+       if (ctx->screen->info.family == CHIP_NAVI10 ||
+           ctx->screen->info.family == CHIP_NAVI12 ||
+           ctx->screen->info.family == CHIP_NAVI14)
+               pos_args[0].valid_mask = 1;
 
-       /* Set SGPRs. */
-       ret = LLVMBuildInsertValue(builder, ret,
-                                  ac_to_integer(&ctx->ac,
-                                                 LLVMGetParam(ctx->main_fn,
-                                                              SI_PARAM_ALPHA_REF)),
-                                  SI_SGPR_ALPHA_REF, "");
-
-       /* Set VGPRs */
-       first_vgpr = vgpr = SI_SGPR_ALPHA_REF + 1;
-       for (i = 0; i < ARRAY_SIZE(color); i++) {
-               if (!color[i][0])
+       pos_idx = 0;
+       for (i = 0; i < 4; i++) {
+               if (!pos_args[i].out[0])
                        continue;
 
-               for (j = 0; j < 4; j++)
-                       ret = LLVMBuildInsertValue(builder, ret, color[i][j], vgpr++, "");
+               /* Specify the target we are exporting */
+               pos_args[i].target = V_008DFC_SQ_EXP_POS + pos_idx++;
+
+               if (pos_idx == shader->info.nr_pos_exports)
+                       /* Specify that this is the last export */
+                       pos_args[i].done = 1;
+
+               ac_build_export(&ctx->ac, &pos_args[i]);
        }
-       if (depth)
-               ret = LLVMBuildInsertValue(builder, ret, depth, vgpr++, "");
-       if (stencil)
-               ret = LLVMBuildInsertValue(builder, ret, stencil, vgpr++, "");
-       if (samplemask)
-               ret = LLVMBuildInsertValue(builder, ret, samplemask, vgpr++, "");
-
-       /* Add the input sample mask for smoothing at the end. */
-       if (vgpr < first_vgpr + PS_EPILOG_SAMPLEMASK_MIN_LOC)
-               vgpr = first_vgpr + PS_EPILOG_SAMPLEMASK_MIN_LOC;
-       ret = LLVMBuildInsertValue(builder, ret,
-                                  LLVMGetParam(ctx->main_fn,
-                                               SI_PARAM_SAMPLE_COVERAGE), vgpr++, "");
 
-       ctx->return_value = ret;
+       /* Build parameter exports. */
+       si_build_param_exports(ctx, outputs, noutput);
 }
 
-/* Emit one vertex from the geometry shader */
-static void si_llvm_emit_vertex(struct ac_shader_abi *abi,
-                               unsigned stream,
-                               LLVMValueRef *addrs)
+static void si_llvm_emit_vs_epilogue(struct ac_shader_abi *abi,
+                                    unsigned max_outputs,
+                                    LLVMValueRef *addrs)
 {
        struct si_shader_context *ctx = si_shader_context_from_abi(abi);
-
-       if (ctx->shader->key.as_ngg) {
-               gfx10_ngg_gs_emit_vertex(ctx, stream, addrs);
-               return;
-       }
-
        struct si_shader_info *info = &ctx->shader->selector->info;
-       struct si_shader *shader = ctx->shader;
-       LLVMValueRef soffset = ac_get_arg(&ctx->ac, ctx->gs2vs_offset);
-       LLVMValueRef gs_next_vertex;
-       LLVMValueRef can_emit;
-       unsigned chan, offset;
-       int i;
-
-       /* Write vertex attribute values to GSVS ring */
-       gs_next_vertex = LLVMBuildLoad(ctx->ac.builder,
-                                      ctx->gs_next_vertex[stream],
-                                      "");
+       struct si_shader_output_values *outputs = NULL;
+       int i,j;
 
-       /* If this thread has already emitted the declared maximum number of
-        * vertices, skip the write: excessive vertex emissions are not
-        * supposed to have any effect.
-        *
-        * If the shader has no writes to memory, kill it instead. This skips
-        * further memory loads and may allow LLVM to skip to the end
-        * altogether.
-        */
-       can_emit = LLVMBuildICmp(ctx->ac.builder, LLVMIntULT, gs_next_vertex,
-                                LLVMConstInt(ctx->i32,
-                                             shader->selector->gs_max_out_vertices, 0), "");
+       assert(!ctx->shader->is_gs_copy_shader);
+       assert(info->num_outputs <= max_outputs);
 
-       bool use_kill = !info->writes_memory;
-       if (use_kill) {
-               ac_build_kill_if_false(&ctx->ac, can_emit);
-       } else {
-               ac_build_ifcc(&ctx->ac, can_emit, 6505);
-       }
+       outputs = MALLOC((info->num_outputs + 1) * sizeof(outputs[0]));
 
-       offset = 0;
        for (i = 0; i < info->num_outputs; i++) {
-               for (chan = 0; chan < 4; chan++) {
-                       if (!(info->output_usagemask[i] & (1 << chan)) ||
-                           ((info->output_streams[i] >> (2 * chan)) & 3) != stream)
-                               continue;
-
-                       LLVMValueRef out_val = LLVMBuildLoad(ctx->ac.builder, addrs[4 * i + chan], "");
-                       LLVMValueRef voffset =
-                               LLVMConstInt(ctx->i32, offset *
-                                            shader->selector->gs_max_out_vertices, 0);
-                       offset++;
-
-                       voffset = LLVMBuildAdd(ctx->ac.builder, voffset, gs_next_vertex, "");
-                       voffset = LLVMBuildMul(ctx->ac.builder, voffset,
-                                              LLVMConstInt(ctx->i32, 4, 0), "");
-
-                       out_val = ac_to_integer(&ctx->ac, out_val);
+               outputs[i].semantic_name = info->output_semantic_name[i];
+               outputs[i].semantic_index = info->output_semantic_index[i];
 
-                       ac_build_buffer_store_dword(&ctx->ac,
-                                                   ctx->gsvs_ring[stream],
-                                                   out_val, 1,
-                                                   voffset, soffset, 0,
-                                                   ac_glc | ac_slc | ac_swizzled);
+               for (j = 0; j < 4; j++) {
+                       outputs[i].values[j] =
+                               LLVMBuildLoad(ctx->ac.builder,
+                                             addrs[4 * i + j],
+                                             "");
+                       outputs[i].vertex_stream[j] =
+                               (info->output_streams[i] >> (2 * j)) & 3;
                }
        }
 
-       gs_next_vertex = LLVMBuildAdd(ctx->ac.builder, gs_next_vertex, ctx->i32_1, "");
-       LLVMBuildStore(ctx->ac.builder, gs_next_vertex, ctx->gs_next_vertex[stream]);
+       if (!ctx->screen->use_ngg_streamout &&
+           ctx->shader->selector->so.num_outputs)
+               si_llvm_emit_streamout(ctx, outputs, i, 0);
+
+       /* Export PrimitiveID. */
+       if (ctx->shader->key.mono.u.vs_export_prim_id) {
+               outputs[i].semantic_name = TGSI_SEMANTIC_PRIMID;
+               outputs[i].semantic_index = 0;
+               outputs[i].values[0] = ac_to_float(&ctx->ac, si_get_primitive_id(ctx, 0));
+               for (j = 1; j < 4; j++)
+                       outputs[i].values[j] = LLVMConstReal(ctx->ac.f32, 0);
 
-       /* Signal vertex emission if vertex data was written. */
-       if (offset) {
-               ac_build_sendmsg(&ctx->ac, AC_SENDMSG_GS_OP_EMIT | AC_SENDMSG_GS | (stream << 8),
-                                si_get_gs_wave_id(ctx));
+               memset(outputs[i].vertex_stream, 0,
+                      sizeof(outputs[i].vertex_stream));
+               i++;
        }
 
-       if (!use_kill)
-               ac_build_endif(&ctx->ac, 6505);
+       si_llvm_export_vs(ctx, outputs, i);
+       FREE(outputs);
 }
 
-/* Cut one primitive from the geometry shader */
-static void si_llvm_emit_primitive(struct ac_shader_abi *abi,
-                                  unsigned stream)
+static void si_llvm_emit_prim_discard_cs_epilogue(struct ac_shader_abi *abi,
+                                                 unsigned max_outputs,
+                                                 LLVMValueRef *addrs)
 {
        struct si_shader_context *ctx = si_shader_context_from_abi(abi);
+       struct si_shader_info *info = &ctx->shader->selector->info;
+       LLVMValueRef pos[4] = {};
 
-       if (ctx->shader->key.as_ngg) {
-               LLVMBuildStore(ctx->ac.builder, ctx->ac.i32_0, ctx->gs_curprim_verts[stream]);
-               return;
-       }
+       assert(info->num_outputs <= max_outputs);
 
-       /* Signal primitive cut */
-       ac_build_sendmsg(&ctx->ac, AC_SENDMSG_GS_OP_CUT | AC_SENDMSG_GS | (stream << 8),
-                        si_get_gs_wave_id(ctx));
-}
+       for (unsigned i = 0; i < info->num_outputs; i++) {
+               if (info->output_semantic_name[i] != TGSI_SEMANTIC_POSITION)
+                       continue;
 
-static void si_llvm_emit_barrier(struct si_shader_context *ctx)
-{
-       /* GFX6 only (thanks to a hw bug workaround):
-        * The real barrier instruction isn’t needed, because an entire patch
-        * always fits into a single wave.
-        */
-       if (ctx->screen->info.chip_class == GFX6 &&
-           ctx->type == PIPE_SHADER_TESS_CTRL) {
-               ac_build_waitcnt(&ctx->ac, AC_WAIT_LGKM | AC_WAIT_VLOAD | AC_WAIT_VSTORE);
-               return;
+               for (unsigned chan = 0; chan < 4; chan++)
+                       pos[chan] = LLVMBuildLoad(ctx->ac.builder, addrs[4 * i + chan], "");
+               break;
        }
+       assert(pos[0] != NULL);
 
-       ac_build_s_barrier(&ctx->ac);
+       /* Return the position output. */
+       LLVMValueRef ret = ctx->return_value;
+       for (unsigned chan = 0; chan < 4; chan++)
+               ret = LLVMBuildInsertValue(ctx->ac.builder, ret, pos[chan], chan, "");
+       ctx->return_value = ret;
 }
 
 static void declare_streamout_params(struct si_shader_context *ctx,
@@ -3345,7 +1177,7 @@ static void declare_vb_descriptor_input_sgprs(struct si_shader_context *ctx)
        if (num_vbos_in_user_sgprs) {
                unsigned user_sgprs = ctx->args.num_sgprs_used;
 
-               if (is_merged_shader(ctx))
+               if (si_is_merged_shader(ctx))
                        user_sgprs -= 8;
                assert(user_sgprs <= SI_SGPR_VS_VB_DESCRIPTOR_FIRST);
 
@@ -3360,7 +1192,8 @@ static void declare_vb_descriptor_input_sgprs(struct si_shader_context *ctx)
 }
 
 static void declare_vs_input_vgprs(struct si_shader_context *ctx,
-                                  unsigned *num_prolog_vgprs)
+                                  unsigned *num_prolog_vgprs,
+                                  bool ngg_cull_shader)
 {
        struct si_shader *shader = ctx->shader;
 
@@ -3386,6 +1219,11 @@ static void declare_vs_input_vgprs(struct si_shader_context *ctx,
        }
 
        if (!shader->is_gs_copy_shader) {
+               if (shader->key.opt.ngg_culling && !ngg_cull_shader) {
+                       ac_add_arg(&ctx->args, AC_ARG_VGPR, 1, AC_ARG_INT,
+                                  &ctx->ngg_old_thread_id);
+               }
+
                /* Vertex load indices. */
                if (shader->selector->info.num_inputs) {
                        ac_add_arg(&ctx->args, AC_ARG_VGPR, 1, AC_ARG_INT,
@@ -3420,12 +1258,17 @@ static void declare_vs_blit_inputs(struct si_shader_context *ctx,
        }
 }
 
-static void declare_tes_input_vgprs(struct si_shader_context *ctx)
+static void declare_tes_input_vgprs(struct si_shader_context *ctx, bool ngg_cull_shader)
 {
        ac_add_arg(&ctx->args, AC_ARG_VGPR, 1, AC_ARG_FLOAT, &ctx->tes_u);
        ac_add_arg(&ctx->args, AC_ARG_VGPR, 1, AC_ARG_FLOAT, &ctx->tes_v);
        ac_add_arg(&ctx->args, AC_ARG_VGPR, 1, AC_ARG_INT, &ctx->tes_rel_patch_id);
        ac_add_arg(&ctx->args, AC_ARG_VGPR, 1, AC_ARG_INT, &ctx->args.tes_patch_id);
+
+       if (ctx->shader->key.opt.ngg_culling && !ngg_cull_shader) {
+               ac_add_arg(&ctx->args, AC_ARG_VGPR, 1, AC_ARG_INT,
+                          &ctx->ngg_old_thread_id);
+       }
 }
 
 enum {
@@ -3434,17 +1277,17 @@ enum {
        SI_SHADER_MERGED_VERTEX_OR_TESSEVAL_GEOMETRY,
 };
 
-static void add_arg_checked(struct ac_shader_args *args,
-                           enum ac_arg_regfile file,
-                           unsigned registers, enum ac_arg_type type,
-                           struct ac_arg *arg,
-                           unsigned idx)
+void si_add_arg_checked(struct ac_shader_args *args,
+                       enum ac_arg_regfile file,
+                       unsigned registers, enum ac_arg_type type,
+                       struct ac_arg *arg,
+                       unsigned idx)
 {
        assert(args->arg_count == idx);
        ac_add_arg(args, file, registers, type, arg);
 }
 
-static void create_function(struct si_shader_context *ctx)
+void si_create_function(struct si_shader_context *ctx, bool ngg_cull_shader)
 {
        struct si_shader *shader = ctx->shader;
        LLVMTypeRef returns[AC_MAX_ARGS];
@@ -3473,7 +1316,7 @@ static void create_function(struct si_shader_context *ctx)
                        declare_vs_blit_inputs(ctx, vs_blit_property);
 
                        /* VGPRs */
-                       declare_vs_input_vgprs(ctx, &num_prolog_vgprs);
+                       declare_vs_input_vgprs(ctx, &num_prolog_vgprs, ngg_cull_shader);
                        break;
                }
 
@@ -3493,12 +1336,12 @@ static void create_function(struct si_shader_context *ctx)
                }
 
                /* VGPRs */
-               declare_vs_input_vgprs(ctx, &num_prolog_vgprs);
+               declare_vs_input_vgprs(ctx, &num_prolog_vgprs, ngg_cull_shader);
 
                /* Return values */
                if (shader->key.opt.vs_as_prim_discard_cs) {
                        for (i = 0; i < 4; i++)
-                               returns[num_returns++] = ctx->f32; /* VGPRs */
+                               returns[num_returns++] = ctx->ac.f32; /* VGPRs */
                }
                break;
 
@@ -3520,9 +1363,9 @@ static void create_function(struct si_shader_context *ctx)
                 * placed after the user SGPRs.
                 */
                for (i = 0; i < GFX6_TCS_NUM_USER_SGPR + 2; i++)
-                       returns[num_returns++] = ctx->i32; /* SGPRs */
+                       returns[num_returns++] = ctx->ac.i32; /* SGPRs */
                for (i = 0; i < 11; i++)
-                       returns[num_returns++] = ctx->f32; /* VGPRs */
+                       returns[num_returns++] = ctx->ac.f32; /* VGPRs */
                break;
 
        case SI_SHADER_MERGED_VERTEX_TESSCTRL:
@@ -3552,13 +1395,13 @@ static void create_function(struct si_shader_context *ctx)
                ac_add_arg(&ctx->args, AC_ARG_VGPR, 1, AC_ARG_INT, &ctx->args.tcs_rel_ids);
 
                if (ctx->type == PIPE_SHADER_VERTEX) {
-                       declare_vs_input_vgprs(ctx, &num_prolog_vgprs);
+                       declare_vs_input_vgprs(ctx, &num_prolog_vgprs, ngg_cull_shader);
 
                        /* LS return values are inputs to the TCS main shader part. */
                        for (i = 0; i < 8 + GFX9_TCS_NUM_USER_SGPR; i++)
-                               returns[num_returns++] = ctx->i32; /* SGPRs */
+                               returns[num_returns++] = ctx->ac.i32; /* SGPRs */
                        for (i = 0; i < 2; i++)
-                               returns[num_returns++] = ctx->f32; /* VGPRs */
+                               returns[num_returns++] = ctx->ac.f32; /* VGPRs */
                } else {
                        /* TCS return values are inputs to the TCS epilog.
                         *
@@ -3567,9 +1410,9 @@ static void create_function(struct si_shader_context *ctx)
                         * should be passed to the epilog.
                         */
                        for (i = 0; i <= 8 + GFX9_SGPR_TCS_OUT_LAYOUT; i++)
-                               returns[num_returns++] = ctx->i32; /* SGPRs */
+                               returns[num_returns++] = ctx->ac.i32; /* SGPRs */
                        for (i = 0; i < 11; i++)
-                               returns[num_returns++] = ctx->f32; /* VGPRs */
+                               returns[num_returns++] = ctx->ac.f32; /* VGPRs */
                }
                break;
 
@@ -3587,7 +1430,8 @@ static void create_function(struct si_shader_context *ctx)
                ac_add_arg(&ctx->args, AC_ARG_SGPR, 1, AC_ARG_INT, &ctx->merged_wave_info);
                ac_add_arg(&ctx->args, AC_ARG_SGPR, 1, AC_ARG_INT, &ctx->tcs_offchip_offset);
                ac_add_arg(&ctx->args, AC_ARG_SGPR, 1, AC_ARG_INT, &ctx->merged_scratch_offset);
-               ac_add_arg(&ctx->args, AC_ARG_SGPR, 1, AC_ARG_INT, NULL); /* unused (SPI_SHADER_PGM_LO/HI_GS << 8) */
+               ac_add_arg(&ctx->args, AC_ARG_SGPR, 1, AC_ARG_CONST_DESC_PTR,
+                          &ctx->small_prim_cull_info); /* SPI_SHADER_PGM_LO_GS << 8 */
                ac_add_arg(&ctx->args, AC_ARG_SGPR, 1, AC_ARG_INT, NULL); /* unused (SPI_SHADER_PGM_LO/HI_GS >> 24) */
 
                declare_global_desc_pointers(ctx);
@@ -3620,26 +1464,43 @@ static void create_function(struct si_shader_context *ctx)
                ac_add_arg(&ctx->args, AC_ARG_VGPR, 1, AC_ARG_INT, &ctx->gs_vtx45_offset);
 
                if (ctx->type == PIPE_SHADER_VERTEX) {
-                       declare_vs_input_vgprs(ctx, &num_prolog_vgprs);
+                       declare_vs_input_vgprs(ctx, &num_prolog_vgprs, ngg_cull_shader);
                } else if (ctx->type == PIPE_SHADER_TESS_EVAL) {
-                       declare_tes_input_vgprs(ctx);
+                       declare_tes_input_vgprs(ctx, ngg_cull_shader);
                }
 
-               if (ctx->shader->key.as_es &&
+               if ((ctx->shader->key.as_es || ngg_cull_shader) &&
                    (ctx->type == PIPE_SHADER_VERTEX ||
                     ctx->type == PIPE_SHADER_TESS_EVAL)) {
-                       unsigned num_user_sgprs;
+                       unsigned num_user_sgprs, num_vgprs;
 
-                       if (ctx->type == PIPE_SHADER_VERTEX)
-                               num_user_sgprs = GFX9_VSGS_NUM_USER_SGPR;
-                       else
+                       if (ctx->type == PIPE_SHADER_VERTEX) {
+                               /* For the NGG cull shader, add 1 SGPR to hold
+                                * the vertex buffer pointer.
+                                */
+                               num_user_sgprs = GFX9_VSGS_NUM_USER_SGPR + ngg_cull_shader;
+
+                               if (ngg_cull_shader && shader->selector->num_vbos_in_user_sgprs) {
+                                       assert(num_user_sgprs <= 8 + SI_SGPR_VS_VB_DESCRIPTOR_FIRST);
+                                       num_user_sgprs = SI_SGPR_VS_VB_DESCRIPTOR_FIRST +
+                                                        shader->selector->num_vbos_in_user_sgprs * 4;
+                               }
+                       } else {
                                num_user_sgprs = GFX9_TESGS_NUM_USER_SGPR;
+                       }
+
+                       /* The NGG cull shader has to return all 9 VGPRs + the old thread ID.
+                        *
+                        * The normal merged ESGS shader only has to return the 5 VGPRs
+                        * for the GS stage.
+                        */
+                       num_vgprs = ngg_cull_shader ? 10 : 5;
 
                        /* ES return values are inputs to GS. */
                        for (i = 0; i < 8 + num_user_sgprs; i++)
-                               returns[num_returns++] = ctx->i32; /* SGPRs */
-                       for (i = 0; i < 5; i++)
-                               returns[num_returns++] = ctx->f32; /* VGPRs */
+                               returns[num_returns++] = ctx->ac.i32; /* SGPRs */
+                       for (i = 0; i < num_vgprs; i++)
+                               returns[num_returns++] = ctx->ac.f32; /* VGPRs */
                }
                break;
 
@@ -3660,7 +1521,7 @@ static void create_function(struct si_shader_context *ctx)
                }
 
                /* VGPRs */
-               declare_tes_input_vgprs(ctx);
+               declare_tes_input_vgprs(ctx, ngg_cull_shader);
                break;
 
        case PIPE_SHADER_GEOMETRY:
@@ -3683,44 +1544,44 @@ static void create_function(struct si_shader_context *ctx)
        case PIPE_SHADER_FRAGMENT:
                declare_global_desc_pointers(ctx);
                declare_per_stage_desc_pointers(ctx, true);
-               add_arg_checked(&ctx->args, AC_ARG_SGPR, 1, AC_ARG_INT, NULL,
+               si_add_arg_checked(&ctx->args, AC_ARG_SGPR, 1, AC_ARG_INT, NULL,
                                SI_PARAM_ALPHA_REF);
-               add_arg_checked(&ctx->args, AC_ARG_SGPR, 1, AC_ARG_INT,
+               si_add_arg_checked(&ctx->args, AC_ARG_SGPR, 1, AC_ARG_INT,
                                &ctx->args.prim_mask, SI_PARAM_PRIM_MASK);
 
-               add_arg_checked(&ctx->args, AC_ARG_VGPR, 2, AC_ARG_INT, &ctx->args.persp_sample,
+               si_add_arg_checked(&ctx->args, AC_ARG_VGPR, 2, AC_ARG_INT, &ctx->args.persp_sample,
                                SI_PARAM_PERSP_SAMPLE);
-               add_arg_checked(&ctx->args, AC_ARG_VGPR, 2, AC_ARG_INT,
+               si_add_arg_checked(&ctx->args, AC_ARG_VGPR, 2, AC_ARG_INT,
                                &ctx->args.persp_center, SI_PARAM_PERSP_CENTER);
-               add_arg_checked(&ctx->args, AC_ARG_VGPR, 2, AC_ARG_INT,
+               si_add_arg_checked(&ctx->args, AC_ARG_VGPR, 2, AC_ARG_INT,
                                &ctx->args.persp_centroid, SI_PARAM_PERSP_CENTROID);
-               add_arg_checked(&ctx->args, AC_ARG_VGPR, 3, AC_ARG_INT,
+               si_add_arg_checked(&ctx->args, AC_ARG_VGPR, 3, AC_ARG_INT,
                                NULL, SI_PARAM_PERSP_PULL_MODEL);
-               add_arg_checked(&ctx->args, AC_ARG_VGPR, 2, AC_ARG_INT, 
+               si_add_arg_checked(&ctx->args, AC_ARG_VGPR, 2, AC_ARG_INT,
                                &ctx->args.linear_sample, SI_PARAM_LINEAR_SAMPLE);
-               add_arg_checked(&ctx->args, AC_ARG_VGPR, 2, AC_ARG_INT,
+               si_add_arg_checked(&ctx->args, AC_ARG_VGPR, 2, AC_ARG_INT,
                                &ctx->args.linear_center, SI_PARAM_LINEAR_CENTER);
-               add_arg_checked(&ctx->args, AC_ARG_VGPR, 2, AC_ARG_INT,
+               si_add_arg_checked(&ctx->args, AC_ARG_VGPR, 2, AC_ARG_INT,
                                &ctx->args.linear_centroid, SI_PARAM_LINEAR_CENTROID);
-               add_arg_checked(&ctx->args, AC_ARG_VGPR, 3, AC_ARG_FLOAT,
+               si_add_arg_checked(&ctx->args, AC_ARG_VGPR, 3, AC_ARG_FLOAT,
                                NULL, SI_PARAM_LINE_STIPPLE_TEX);
-               add_arg_checked(&ctx->args, AC_ARG_VGPR, 1, AC_ARG_FLOAT,
+               si_add_arg_checked(&ctx->args, AC_ARG_VGPR, 1, AC_ARG_FLOAT,
                                &ctx->args.frag_pos[0], SI_PARAM_POS_X_FLOAT);
-               add_arg_checked(&ctx->args, AC_ARG_VGPR, 1, AC_ARG_FLOAT,
+               si_add_arg_checked(&ctx->args, AC_ARG_VGPR, 1, AC_ARG_FLOAT,
                                &ctx->args.frag_pos[1], SI_PARAM_POS_Y_FLOAT);
-               add_arg_checked(&ctx->args, AC_ARG_VGPR, 1, AC_ARG_FLOAT,
+               si_add_arg_checked(&ctx->args, AC_ARG_VGPR, 1, AC_ARG_FLOAT,
                                &ctx->args.frag_pos[2], SI_PARAM_POS_Z_FLOAT);
-               add_arg_checked(&ctx->args, AC_ARG_VGPR, 1, AC_ARG_FLOAT,
+               si_add_arg_checked(&ctx->args, AC_ARG_VGPR, 1, AC_ARG_FLOAT,
                                &ctx->args.frag_pos[3], SI_PARAM_POS_W_FLOAT);
                shader->info.face_vgpr_index = ctx->args.num_vgprs_used;
-               add_arg_checked(&ctx->args, AC_ARG_VGPR, 1, AC_ARG_INT,
+               si_add_arg_checked(&ctx->args, AC_ARG_VGPR, 1, AC_ARG_INT,
                                &ctx->args.front_face, SI_PARAM_FRONT_FACE);
                shader->info.ancillary_vgpr_index = ctx->args.num_vgprs_used;
-               add_arg_checked(&ctx->args, AC_ARG_VGPR, 1, AC_ARG_INT,
+               si_add_arg_checked(&ctx->args, AC_ARG_VGPR, 1, AC_ARG_INT,
                                &ctx->args.ancillary, SI_PARAM_ANCILLARY);
-               add_arg_checked(&ctx->args, AC_ARG_VGPR, 1, AC_ARG_FLOAT,
+               si_add_arg_checked(&ctx->args, AC_ARG_VGPR, 1, AC_ARG_FLOAT,
                                &ctx->args.sample_coverage, SI_PARAM_SAMPLE_COVERAGE);
-               add_arg_checked(&ctx->args, AC_ARG_VGPR, 1, AC_ARG_INT,
+               si_add_arg_checked(&ctx->args, AC_ARG_VGPR, 1, AC_ARG_INT,
                                &ctx->pos_fixed_pt, SI_PARAM_POS_FIXED_PT);
 
                /* Color inputs from the prolog. */
@@ -3749,9 +1610,9 @@ static void create_function(struct si_shader_context *ctx)
                                   PS_EPILOG_SAMPLEMASK_MIN_LOC + 1);
 
                for (i = 0; i < num_return_sgprs; i++)
-                       returns[i] = ctx->i32;
+                       returns[i] = ctx->ac.i32;
                for (; i < num_returns; i++)
-                       returns[i] = ctx->f32;
+                       returns[i] = ctx->ac.f32;
                break;
 
        case PIPE_SHADER_COMPUTE:
@@ -3790,8 +1651,8 @@ static void create_function(struct si_shader_context *ctx)
                return;
        }
 
-       si_llvm_create_func(ctx, "main", returns, num_returns,
-                           si_get_max_workgroup_size(shader));
+       si_llvm_create_func(ctx, ngg_cull_shader ? "ngg_cull_main" : "main",
+                           returns, num_returns, si_get_max_workgroup_size(shader));
 
        /* Reserve register locations for VGPR inputs the PS prolog may need. */
        if (ctx->type == PIPE_SHADER_FRAGMENT && !ctx->shader->is_monolithic) {
@@ -3822,7 +1683,7 @@ static void create_function(struct si_shader_context *ctx)
                         * own LDS-based lowering).
                         */
                        ctx->ac.lds = LLVMAddGlobalInAddressSpace(
-                               ctx->ac.module, LLVMArrayType(ctx->i32, 0),
+                               ctx->ac.module, LLVMArrayType(ctx->ac.i32, 0),
                                "__lds_end", AC_ADDR_SPACE_LDS);
                        LLVMSetAlignment(ctx->ac.lds, 256);
                } else {
@@ -3842,172 +1703,6 @@ static void create_function(struct si_shader_context *ctx)
        }
 }
 
-/* Ensure that the esgs ring is declared.
- *
- * We declare it with 64KB alignment as a hint that the
- * pointer value will always be 0.
- */
-static void declare_esgs_ring(struct si_shader_context *ctx)
-{
-       if (ctx->esgs_ring)
-               return;
-
-       assert(!LLVMGetNamedGlobal(ctx->ac.module, "esgs_ring"));
-
-       ctx->esgs_ring = LLVMAddGlobalInAddressSpace(
-               ctx->ac.module, LLVMArrayType(ctx->i32, 0),
-               "esgs_ring",
-               AC_ADDR_SPACE_LDS);
-       LLVMSetLinkage(ctx->esgs_ring, LLVMExternalLinkage);
-       LLVMSetAlignment(ctx->esgs_ring, 64 * 1024);
-}
-
-/**
- * Load ESGS and GSVS ring buffer resource descriptors and save the variables
- * for later use.
- */
-static void preload_ring_buffers(struct si_shader_context *ctx)
-{
-       LLVMBuilderRef builder = ctx->ac.builder;
-
-       LLVMValueRef buf_ptr = ac_get_arg(&ctx->ac, ctx->rw_buffers);
-
-       if (ctx->shader->key.as_es || ctx->type == PIPE_SHADER_GEOMETRY) {
-               if (ctx->screen->info.chip_class <= GFX8) {
-                       unsigned ring =
-                               ctx->type == PIPE_SHADER_GEOMETRY ? SI_GS_RING_ESGS
-                                                                 : SI_ES_RING_ESGS;
-                       LLVMValueRef offset = LLVMConstInt(ctx->i32, ring, 0);
-
-                       ctx->esgs_ring =
-                               ac_build_load_to_sgpr(&ctx->ac, buf_ptr, offset);
-               } else {
-                       if (USE_LDS_SYMBOLS && LLVM_VERSION_MAJOR >= 9) {
-                               /* Declare the ESGS ring as an explicit LDS symbol. */
-                               declare_esgs_ring(ctx);
-                       } else {
-                               ac_declare_lds_as_pointer(&ctx->ac);
-                               ctx->esgs_ring = ctx->ac.lds;
-                       }
-               }
-       }
-
-       if (ctx->shader->is_gs_copy_shader) {
-               LLVMValueRef offset = LLVMConstInt(ctx->i32, SI_RING_GSVS, 0);
-
-               ctx->gsvs_ring[0] =
-                       ac_build_load_to_sgpr(&ctx->ac, buf_ptr, offset);
-       } else if (ctx->type == PIPE_SHADER_GEOMETRY) {
-               const struct si_shader_selector *sel = ctx->shader->selector;
-               LLVMValueRef offset = LLVMConstInt(ctx->i32, SI_RING_GSVS, 0);
-               LLVMValueRef base_ring;
-
-               base_ring = ac_build_load_to_sgpr(&ctx->ac, buf_ptr, offset);
-
-               /* The conceptual layout of the GSVS ring is
-                *   v0c0 .. vLv0 v0c1 .. vLc1 ..
-                * but the real memory layout is swizzled across
-                * threads:
-                *   t0v0c0 .. t15v0c0 t0v1c0 .. t15v1c0 ... t15vLcL
-                *   t16v0c0 ..
-                * Override the buffer descriptor accordingly.
-                */
-               LLVMTypeRef v2i64 = LLVMVectorType(ctx->i64, 2);
-               uint64_t stream_offset = 0;
-
-               for (unsigned stream = 0; stream < 4; ++stream) {
-                       unsigned num_components;
-                       unsigned stride;
-                       unsigned num_records;
-                       LLVMValueRef ring, tmp;
-
-                       num_components = sel->info.num_stream_output_components[stream];
-                       if (!num_components)
-                               continue;
-
-                       stride = 4 * num_components * sel->gs_max_out_vertices;
-
-                       /* Limit on the stride field for <= GFX7. */
-                       assert(stride < (1 << 14));
-
-                       num_records = ctx->ac.wave_size;
-
-                       ring = LLVMBuildBitCast(builder, base_ring, v2i64, "");
-                       tmp = LLVMBuildExtractElement(builder, ring, ctx->i32_0, "");
-                       tmp = LLVMBuildAdd(builder, tmp,
-                                          LLVMConstInt(ctx->i64,
-                                                       stream_offset, 0), "");
-                       stream_offset += stride * ctx->ac.wave_size;
-
-                       ring = LLVMBuildInsertElement(builder, ring, tmp, ctx->i32_0, "");
-                       ring = LLVMBuildBitCast(builder, ring, ctx->v4i32, "");
-                       tmp = LLVMBuildExtractElement(builder, ring, ctx->i32_1, "");
-                       tmp = LLVMBuildOr(builder, tmp,
-                               LLVMConstInt(ctx->i32,
-                                            S_008F04_STRIDE(stride) |
-                                            S_008F04_SWIZZLE_ENABLE(1), 0), "");
-                       ring = LLVMBuildInsertElement(builder, ring, tmp, ctx->i32_1, "");
-                       ring = LLVMBuildInsertElement(builder, ring,
-                                       LLVMConstInt(ctx->i32, num_records, 0),
-                                       LLVMConstInt(ctx->i32, 2, 0), "");
-
-                       uint32_t rsrc3 =
-                                       S_008F0C_DST_SEL_X(V_008F0C_SQ_SEL_X) |
-                                       S_008F0C_DST_SEL_Y(V_008F0C_SQ_SEL_Y) |
-                                       S_008F0C_DST_SEL_Z(V_008F0C_SQ_SEL_Z) |
-                                       S_008F0C_DST_SEL_W(V_008F0C_SQ_SEL_W) |
-                                       S_008F0C_INDEX_STRIDE(1) | /* index_stride = 16 (elements) */
-                                       S_008F0C_ADD_TID_ENABLE(1);
-
-                       if (ctx->ac.chip_class >= GFX10) {
-                               rsrc3 |= S_008F0C_FORMAT(V_008F0C_IMG_FORMAT_32_FLOAT) |
-                                        S_008F0C_OOB_SELECT(V_008F0C_OOB_SELECT_DISABLED) |
-                                        S_008F0C_RESOURCE_LEVEL(1);
-                       } else {
-                               rsrc3 |= S_008F0C_NUM_FORMAT(V_008F0C_BUF_NUM_FORMAT_FLOAT) |
-                                        S_008F0C_DATA_FORMAT(V_008F0C_BUF_DATA_FORMAT_32) |
-                                        S_008F0C_ELEMENT_SIZE(1); /* element_size = 4 (bytes) */
-                       }
-
-                       ring = LLVMBuildInsertElement(builder, ring,
-                               LLVMConstInt(ctx->i32, rsrc3, false),
-                               LLVMConstInt(ctx->i32, 3, 0), "");
-
-                       ctx->gsvs_ring[stream] = ring;
-               }
-       } else if (ctx->type == PIPE_SHADER_TESS_EVAL) {
-               ctx->tess_offchip_ring = get_tess_ring_descriptor(ctx, TESS_OFFCHIP_RING_TES);
-       }
-}
-
-static void si_llvm_emit_polygon_stipple(struct si_shader_context *ctx,
-                                        LLVMValueRef param_rw_buffers,
-                                        struct ac_arg param_pos_fixed_pt)
-{
-       LLVMBuilderRef builder = ctx->ac.builder;
-       LLVMValueRef slot, desc, offset, row, bit, address[2];
-
-       /* Use the fixed-point gl_FragCoord input.
-        * Since the stipple pattern is 32x32 and it repeats, just get 5 bits
-        * per coordinate to get the repeating effect.
-        */
-       address[0] = si_unpack_param(ctx, param_pos_fixed_pt, 0, 5);
-       address[1] = si_unpack_param(ctx, param_pos_fixed_pt, 16, 5);
-
-       /* Load the buffer descriptor. */
-       slot = LLVMConstInt(ctx->i32, SI_PS_CONST_POLY_STIPPLE, 0);
-       desc = ac_build_load_to_sgpr(&ctx->ac, param_rw_buffers, slot);
-
-       /* The stipple pattern is 32x32, each row has 32 bits. */
-       offset = LLVMBuildMul(builder, address[1],
-                             LLVMConstInt(ctx->i32, 4, 0), "");
-       row = buffer_load_const(ctx, desc, offset);
-       row = ac_to_integer(&ctx->ac, row);
-       bit = LLVMBuildLShr(builder, row, address[0], "");
-       bit = LLVMBuildTrunc(builder, bit, ctx->i1, "");
-       ac_build_kill_if_false(&ctx->ac, bit);
-}
-
 /* For the UMR disassembler. */
 #define DEBUGGER_END_OF_CODE_MARKER    0xbf9f0000 /* invalid instruction */
 #define DEBUGGER_NUM_MARKERS           5
@@ -4387,262 +2082,37 @@ void si_shader_dump(struct si_screen *sscreen, struct si_shader *shader,
                }
 
                fprintf(file, "\n%s - main shader part - LLVM IR:\n\n",
-                       si_get_shader_name(shader));
-               fprintf(file, "%s\n", shader->binary.llvm_ir_string);
-       }
-
-       if (!check_debug_option ||
-           (si_can_dump_shader(sscreen, shader_type) &&
-            !(sscreen->debug_flags & DBG(NO_ASM)))) {
-               unsigned wave_size = si_get_shader_wave_size(shader);
-
-               fprintf(file, "\n%s:\n", si_get_shader_name(shader));
-
-               if (shader->prolog)
-                       si_shader_dump_disassembly(sscreen, &shader->prolog->binary,
-                                                  shader_type, wave_size, debug, "prolog", file);
-               if (shader->previous_stage)
-                       si_shader_dump_disassembly(sscreen, &shader->previous_stage->binary,
-                                                  shader_type, wave_size, debug, "previous stage", file);
-               if (shader->prolog2)
-                       si_shader_dump_disassembly(sscreen, &shader->prolog2->binary,
-                                                  shader_type, wave_size, debug, "prolog2", file);
-
-               si_shader_dump_disassembly(sscreen, &shader->binary, shader_type,
-                                          wave_size, debug, "main", file);
-
-               if (shader->epilog)
-                       si_shader_dump_disassembly(sscreen, &shader->epilog->binary,
-                                                  shader_type, wave_size, debug, "epilog", file);
-               fprintf(file, "\n");
-       }
-
-       si_shader_dump_stats(sscreen, shader, file, check_debug_option);
-}
-
-static int si_compile_llvm(struct si_screen *sscreen,
-                          struct si_shader_binary *binary,
-                          struct ac_shader_config *conf,
-                          struct ac_llvm_compiler *compiler,
-                          LLVMModuleRef mod,
-                          struct pipe_debug_callback *debug,
-                          enum pipe_shader_type shader_type,
-                          unsigned wave_size,
-                          const char *name,
-                          bool less_optimized)
-{
-       unsigned count = p_atomic_inc_return(&sscreen->num_compilations);
-
-       if (si_can_dump_shader(sscreen, shader_type)) {
-               fprintf(stderr, "radeonsi: Compiling shader %d\n", count);
-
-               if (!(sscreen->debug_flags & (DBG(NO_IR) | DBG(PREOPT_IR)))) {
-                       fprintf(stderr, "%s LLVM IR:\n\n", name);
-                       ac_dump_module(mod);
-                       fprintf(stderr, "\n");
-               }
-       }
-
-       if (sscreen->record_llvm_ir) {
-               char *ir = LLVMPrintModuleToString(mod);
-               binary->llvm_ir_string = strdup(ir);
-               LLVMDisposeMessage(ir);
-       }
-
-       if (!si_replace_shader(count, binary)) {
-               unsigned r = si_llvm_compile(mod, binary, compiler, debug,
-                                            less_optimized, wave_size);
-               if (r)
-                       return r;
-       }
-
-       struct ac_rtld_binary rtld;
-       if (!ac_rtld_open(&rtld, (struct ac_rtld_open_info){
-                       .info = &sscreen->info,
-                       .shader_type = tgsi_processor_to_shader_stage(shader_type),
-                       .wave_size = wave_size,
-                       .num_parts = 1,
-                       .elf_ptrs = &binary->elf_buffer,
-                       .elf_sizes = &binary->elf_size }))
-               return -1;
-
-       bool ok = ac_rtld_read_config(&rtld, conf);
-       ac_rtld_close(&rtld);
-       if (!ok)
-               return -1;
-
-       /* 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.
-        * - GFX6 & GFX7 would be very slow.
-        */
-       conf->float_mode |= V_00B028_FP_64_DENORMS;
-
-       return 0;
-}
-
-static void si_llvm_build_ret(struct si_shader_context *ctx, LLVMValueRef ret)
-{
-       if (LLVMGetTypeKind(LLVMTypeOf(ret)) == LLVMVoidTypeKind)
-               LLVMBuildRetVoid(ctx->ac.builder);
-       else
-               LLVMBuildRet(ctx->ac.builder, ret);
-}
-
-/* Generate code for the hardware VS shader stage to go with a geometry shader */
-struct si_shader *
-si_generate_gs_copy_shader(struct si_screen *sscreen,
-                          struct ac_llvm_compiler *compiler,
-                          struct si_shader_selector *gs_selector,
-                          struct pipe_debug_callback *debug)
-{
-       struct si_shader_context ctx;
-       struct si_shader *shader;
-       LLVMBuilderRef builder;
-       struct si_shader_output_values outputs[SI_MAX_VS_OUTPUTS];
-       struct si_shader_info *gsinfo = &gs_selector->info;
-       int i;
-
-
-       shader = CALLOC_STRUCT(si_shader);
-       if (!shader)
-               return NULL;
-
-       /* We can leave the fence as permanently signaled because the GS copy
-        * shader only becomes visible globally after it has been compiled. */
-       util_queue_fence_init(&shader->ready);
-
-       shader->selector = gs_selector;
-       shader->is_gs_copy_shader = true;
-
-       si_llvm_context_init(&ctx, sscreen, compiler,
-                            si_get_wave_size(sscreen, PIPE_SHADER_VERTEX, false, false));
-       ctx.shader = shader;
-       ctx.type = PIPE_SHADER_VERTEX;
-
-       builder = ctx.ac.builder;
-
-       create_function(&ctx);
-       preload_ring_buffers(&ctx);
-
-       LLVMValueRef voffset =
-               LLVMBuildMul(ctx.ac.builder, ctx.abi.vertex_id,
-                            LLVMConstInt(ctx.i32, 4, 0), "");
-
-       /* Fetch the vertex stream ID.*/
-       LLVMValueRef stream_id;
-
-       if (!sscreen->use_ngg_streamout && gs_selector->so.num_outputs)
-               stream_id = si_unpack_param(&ctx, ctx.streamout_config, 24, 2);
-       else
-               stream_id = ctx.i32_0;
-
-       /* Fill in output information. */
-       for (i = 0; i < gsinfo->num_outputs; ++i) {
-               outputs[i].semantic_name = gsinfo->output_semantic_name[i];
-               outputs[i].semantic_index = gsinfo->output_semantic_index[i];
-
-               for (int chan = 0; chan < 4; chan++) {
-                       outputs[i].vertex_stream[chan] =
-                               (gsinfo->output_streams[i] >> (2 * chan)) & 3;
-               }
-       }
-
-       LLVMBasicBlockRef end_bb;
-       LLVMValueRef switch_inst;
-
-       end_bb = LLVMAppendBasicBlockInContext(ctx.ac.context, ctx.main_fn, "end");
-       switch_inst = LLVMBuildSwitch(builder, stream_id, end_bb, 4);
-
-       for (int stream = 0; stream < 4; stream++) {
-               LLVMBasicBlockRef bb;
-               unsigned offset;
-
-               if (!gsinfo->num_stream_output_components[stream])
-                       continue;
-
-               if (stream > 0 && !gs_selector->so.num_outputs)
-                       continue;
-
-               bb = LLVMInsertBasicBlockInContext(ctx.ac.context, end_bb, "out");
-               LLVMAddCase(switch_inst, LLVMConstInt(ctx.i32, stream, 0), bb);
-               LLVMPositionBuilderAtEnd(builder, bb);
-
-               /* Fetch vertex data from GSVS ring */
-               offset = 0;
-               for (i = 0; i < gsinfo->num_outputs; ++i) {
-                       for (unsigned chan = 0; chan < 4; chan++) {
-                               if (!(gsinfo->output_usagemask[i] & (1 << chan)) ||
-                                   outputs[i].vertex_stream[chan] != stream) {
-                                       outputs[i].values[chan] = LLVMGetUndef(ctx.f32);
-                                       continue;
-                               }
-
-                               LLVMValueRef soffset = LLVMConstInt(ctx.i32,
-                                       offset * gs_selector->gs_max_out_vertices * 16 * 4, 0);
-                               offset++;
-
-                               outputs[i].values[chan] =
-                                       ac_build_buffer_load(&ctx.ac,
-                                                            ctx.gsvs_ring[0], 1,
-                                                            ctx.i32_0, voffset,
-                                                            soffset, 0, ac_glc | ac_slc,
-                                                            true, false);
-                       }
-               }
-
-               /* Streamout and exports. */
-               if (!sscreen->use_ngg_streamout && gs_selector->so.num_outputs) {
-                       si_llvm_emit_streamout(&ctx, outputs,
-                                              gsinfo->num_outputs,
-                                              stream);
-               }
-
-               if (stream == 0)
-                       si_llvm_export_vs(&ctx, outputs, gsinfo->num_outputs);
-
-               LLVMBuildBr(builder, end_bb);
+                       si_get_shader_name(shader));
+               fprintf(file, "%s\n", shader->binary.llvm_ir_string);
        }
 
-       LLVMPositionBuilderAtEnd(builder, end_bb);
-
-       LLVMBuildRetVoid(ctx.ac.builder);
+       if (!check_debug_option ||
+           (si_can_dump_shader(sscreen, shader_type) &&
+            !(sscreen->debug_flags & DBG(NO_ASM)))) {
+               unsigned wave_size = si_get_shader_wave_size(shader);
 
-       ctx.type = PIPE_SHADER_GEOMETRY; /* override for shader dumping */
-       si_llvm_optimize_module(&ctx);
+               fprintf(file, "\n%s:\n", si_get_shader_name(shader));
 
-       bool ok = false;
-       if (si_compile_llvm(sscreen, &ctx.shader->binary,
-                           &ctx.shader->config, ctx.compiler,
-                           ctx.ac.module,
-                           debug, PIPE_SHADER_GEOMETRY, ctx.ac.wave_size,
-                           "GS Copy Shader", false) == 0) {
-               if (si_can_dump_shader(sscreen, PIPE_SHADER_GEOMETRY))
-                       fprintf(stderr, "GS Copy Shader:\n");
-               si_shader_dump(sscreen, ctx.shader, debug, stderr, true);
-
-               if (!ctx.shader->config.scratch_bytes_per_wave)
-                       ok = si_shader_binary_upload(sscreen, ctx.shader, 0);
-               else
-                       ok = true;
-       }
+               if (shader->prolog)
+                       si_shader_dump_disassembly(sscreen, &shader->prolog->binary,
+                                                  shader_type, wave_size, debug, "prolog", file);
+               if (shader->previous_stage)
+                       si_shader_dump_disassembly(sscreen, &shader->previous_stage->binary,
+                                                  shader_type, wave_size, debug, "previous stage", file);
+               if (shader->prolog2)
+                       si_shader_dump_disassembly(sscreen, &shader->prolog2->binary,
+                                                  shader_type, wave_size, debug, "prolog2", file);
 
-       si_llvm_dispose(&ctx);
+               si_shader_dump_disassembly(sscreen, &shader->binary, shader_type,
+                                          wave_size, debug, "main", file);
 
-       if (!ok) {
-               FREE(shader);
-               shader = NULL;
-       } else {
-               si_fix_resource_usage(sscreen, shader);
+               if (shader->epilog)
+                       si_shader_dump_disassembly(sscreen, &shader->epilog->binary,
+                                                  shader_type, wave_size, debug, "epilog", file);
+               fprintf(file, "\n");
        }
-       return shader;
+
+       si_shader_dump_stats(sscreen, shader, file, check_debug_option);
 }
 
 static void si_dump_shader_key_vs(const struct si_shader_key *key,
@@ -4781,6 +2251,8 @@ static void si_dump_shader_key(const struct si_shader *shader, FILE *f)
            !key->as_es && !key->as_ls) {
                fprintf(f, "  opt.kill_outputs = 0x%"PRIx64"\n", key->opt.kill_outputs);
                fprintf(f, "  opt.clip_disable = %u\n", key->opt.clip_disable);
+               if (shader_type != PIPE_SHADER_GEOMETRY)
+                       fprintf(f, "  opt.ngg_culling = 0x%x\n", key->opt.ngg_culling);
        }
 }
 
@@ -4807,65 +2279,35 @@ static void si_init_exec_from_input(struct si_shader_context *ctx,
 {
        LLVMValueRef args[] = {
                ac_get_arg(&ctx->ac, param),
-               LLVMConstInt(ctx->i32, bitoffset, 0),
+               LLVMConstInt(ctx->ac.i32, bitoffset, 0),
        };
        ac_build_intrinsic(&ctx->ac,
                           "llvm.amdgcn.init.exec.from.input",
-                          ctx->voidt, args, 2, AC_FUNC_ATTR_CONVERGENT);
+                          ctx->ac.voidt, args, 2, AC_FUNC_ATTR_CONVERGENT);
 }
 
 static bool si_vs_needs_prolog(const struct si_shader_selector *sel,
-                              const struct si_vs_prolog_bits *key)
+                              const struct si_vs_prolog_bits *prolog_key,
+                              const struct si_shader_key *key,
+                              bool ngg_cull_shader)
 {
        /* VGPR initialization fixup for Vega10 and Raven is always done in the
         * VS prolog. */
        return sel->vs_needs_prolog ||
-              key->ls_vgpr_fix ||
-              key->unpack_instance_id_from_vertex_id;
-}
-
-LLVMValueRef si_is_es_thread(struct si_shader_context *ctx)
-{
-       /* Return true if the current thread should execute an ES thread. */
-       return LLVMBuildICmp(ctx->ac.builder, LLVMIntULT,
-                            ac_get_thread_id(&ctx->ac),
-                            si_unpack_param(ctx, ctx->merged_wave_info, 0, 8), "");
-}
-
-LLVMValueRef si_is_gs_thread(struct si_shader_context *ctx)
-{
-       /* Return true if the current thread should execute a GS thread. */
-       return LLVMBuildICmp(ctx->ac.builder, LLVMIntULT,
-                            ac_get_thread_id(&ctx->ac),
-                            si_unpack_param(ctx, ctx->merged_wave_info, 8, 8), "");
-}
-
-static void si_llvm_emit_kill(struct ac_shader_abi *abi, LLVMValueRef visible)
-{
-       struct si_shader_context *ctx = si_shader_context_from_abi(abi);
-       LLVMBuilderRef builder = ctx->ac.builder;
-
-       if (ctx->shader->selector->force_correct_derivs_after_kill) {
-               /* Kill immediately while maintaining WQM. */
-               ac_build_kill_if_false(&ctx->ac,
-                                      ac_build_wqm_vote(&ctx->ac, visible));
-
-               LLVMValueRef mask = LLVMBuildLoad(builder, ctx->postponed_kill, "");
-               mask = LLVMBuildAnd(builder, mask, visible, "");
-               LLVMBuildStore(builder, mask, ctx->postponed_kill);
-               return;
-       }
-
-       ac_build_kill_if_false(&ctx->ac, visible);
+              prolog_key->ls_vgpr_fix ||
+              prolog_key->unpack_instance_id_from_vertex_id ||
+              (ngg_cull_shader && key->opt.ngg_culling & SI_NGG_CULL_GS_FAST_LAUNCH_ALL);
 }
 
 static bool si_build_main_function(struct si_shader_context *ctx,
-                                  struct nir_shader *nir, bool free_nir)
+                                  struct nir_shader *nir, bool free_nir,
+                                  bool ngg_cull_shader)
 {
        struct si_shader *shader = ctx->shader;
        struct si_shader_selector *sel = shader->selector;
 
-       // TODO clean all this up!
+       si_llvm_init_resource_callbacks(ctx);
+
        switch (ctx->type) {
        case PIPE_SHADER_VERTEX:
                if (shader->key.as_ls)
@@ -4874,6 +2316,8 @@ static bool si_build_main_function(struct si_shader_context *ctx,
                        ctx->abi.emit_outputs = si_llvm_emit_es_epilogue;
                else if (shader->key.opt.vs_as_prim_discard_cs)
                        ctx->abi.emit_outputs = si_llvm_emit_prim_discard_cs_epilogue;
+               else if (ngg_cull_shader)
+                       ctx->abi.emit_outputs = gfx10_emit_ngg_culling_epilogue_4x_wave32;
                else if (shader->key.as_ngg)
                        ctx->abi.emit_outputs = gfx10_emit_ngg_epilogue;
                else
@@ -4881,36 +2325,25 @@ static bool si_build_main_function(struct si_shader_context *ctx,
                ctx->abi.load_base_vertex = get_base_vertex;
                break;
        case PIPE_SHADER_TESS_CTRL:
-               ctx->abi.load_tess_varyings = si_nir_load_tcs_varyings;
-               ctx->abi.load_tess_level = si_load_tess_level;
-               ctx->abi.store_tcs_outputs = si_nir_store_output_tcs;
-               ctx->abi.emit_outputs = si_llvm_emit_tcs_epilogue;
-               ctx->abi.load_patch_vertices_in = si_load_patch_vertices_in;
+               si_llvm_init_tcs_callbacks(ctx);
                break;
        case PIPE_SHADER_TESS_EVAL:
-               ctx->abi.load_tess_varyings = si_nir_load_input_tes;
-               ctx->abi.load_tess_coord = si_load_tess_coord;
-               ctx->abi.load_tess_level = si_load_tess_level;
-               ctx->abi.load_patch_vertices_in = si_load_patch_vertices_in;
+               si_llvm_init_tes_callbacks(ctx);
+
                if (shader->key.as_es)
                        ctx->abi.emit_outputs = si_llvm_emit_es_epilogue;
+               else if (ngg_cull_shader)
+                       ctx->abi.emit_outputs = gfx10_emit_ngg_culling_epilogue_4x_wave32;
                else if (shader->key.as_ngg)
                        ctx->abi.emit_outputs = gfx10_emit_ngg_epilogue;
                else
                        ctx->abi.emit_outputs = si_llvm_emit_vs_epilogue;
                break;
        case PIPE_SHADER_GEOMETRY:
-               ctx->abi.load_inputs = si_nir_load_input_gs;
-               ctx->abi.emit_vertex = si_llvm_emit_vertex;
-               ctx->abi.emit_primitive = si_llvm_emit_primitive;
-               ctx->abi.emit_outputs = si_llvm_emit_gs_epilogue;
+               si_llvm_init_gs_callbacks(ctx);
                break;
        case PIPE_SHADER_FRAGMENT:
-               ctx->abi.emit_outputs = si_llvm_return_fs_outputs;
-               ctx->abi.load_sample_position = load_sample_position;
-               ctx->abi.load_sample_mask_in = load_sample_mask_in;
-               ctx->abi.emit_fbfetch = si_nir_emit_fbfetch;
-               ctx->abi.emit_kill = si_llvm_emit_kill;
+               si_llvm_init_ps_callbacks(ctx);
                break;
        case PIPE_SHADER_COMPUTE:
                ctx->abi.load_local_group_size = get_block_size;
@@ -4920,24 +2353,28 @@ static bool si_build_main_function(struct si_shader_context *ctx,
                return false;
        }
 
-       ctx->abi.load_ubo = load_ubo;
-       ctx->abi.load_ssbo = load_ssbo;
+       si_create_function(ctx, ngg_cull_shader);
 
-       create_function(ctx);
-       preload_ring_buffers(ctx);
+       if (ctx->shader->key.as_es || ctx->type == PIPE_SHADER_GEOMETRY)
+               si_preload_esgs_ring(ctx);
+
+       if (ctx->type == PIPE_SHADER_GEOMETRY)
+               si_preload_gs_rings(ctx);
+       else if (ctx->type == PIPE_SHADER_TESS_EVAL)
+               si_llvm_preload_tes_rings(ctx);
 
        if (ctx->type == PIPE_SHADER_TESS_CTRL &&
            sel->info.tessfactors_are_def_in_all_invocs) {
                for (unsigned i = 0; i < 6; i++) {
                        ctx->invoc0_tess_factors[i] =
-                               ac_build_alloca_undef(&ctx->ac, ctx->i32, "");
+                               ac_build_alloca_undef(&ctx->ac, ctx->ac.i32, "");
                }
        }
 
        if (ctx->type == PIPE_SHADER_GEOMETRY) {
                for (unsigned i = 0; i < 4; i++) {
                        ctx->gs_next_vertex[i] =
-                               ac_build_alloca(&ctx->ac, ctx->i32, "");
+                               ac_build_alloca(&ctx->ac, ctx->ac.i32, "");
                }
                if (shader->key.as_ngg) {
                        for (unsigned i = 0; i < 4; ++i) {
@@ -4951,14 +2388,15 @@ static bool si_build_main_function(struct si_shader_context *ctx,
                        if (sel->so.num_outputs)
                                scratch_size = 44;
 
-                       LLVMTypeRef ai32 = LLVMArrayType(ctx->i32, scratch_size);
+                       assert(!ctx->gs_ngg_scratch);
+                       LLVMTypeRef ai32 = LLVMArrayType(ctx->ac.i32, scratch_size);
                        ctx->gs_ngg_scratch = LLVMAddGlobalInAddressSpace(ctx->ac.module,
                                ai32, "ngg_scratch", AC_ADDR_SPACE_LDS);
                        LLVMSetInitializer(ctx->gs_ngg_scratch, LLVMGetUndef(ai32));
                        LLVMSetAlignment(ctx->gs_ngg_scratch, 4);
 
                        ctx->gs_ngg_emit = LLVMAddGlobalInAddressSpace(ctx->ac.module,
-                               LLVMArrayType(ctx->i32, 0), "ngg_emit", AC_ADDR_SPACE_LDS);
+                               LLVMArrayType(ctx->ac.i32, 0), "ngg_emit", AC_ADDR_SPACE_LDS);
                        LLVMSetLinkage(ctx->gs_ngg_emit, LLVMExternalLinkage);
                        LLVMSetAlignment(ctx->gs_ngg_emit, 4);
                }
@@ -4974,13 +2412,14 @@ static bool si_build_main_function(struct si_shader_context *ctx,
                 * avoids bank conflicts for SoA accesses.
                 */
                if (!gfx10_is_ngg_passthrough(shader))
-                       declare_esgs_ring(ctx);
+                       si_llvm_declare_esgs_ring(ctx);
 
                /* This is really only needed when streamout and / or vertex
                 * compaction is enabled.
                 */
-               if (sel->so.num_outputs && !ctx->gs_ngg_scratch) {
-                       LLVMTypeRef asi32 = LLVMArrayType(ctx->i32, 8);
+               if (!ctx->gs_ngg_scratch &&
+                   (sel->so.num_outputs || shader->key.opt.ngg_culling)) {
+                       LLVMTypeRef asi32 = LLVMArrayType(ctx->ac.i32, 8);
                        ctx->gs_ngg_scratch = LLVMAddGlobalInAddressSpace(ctx->ac.module,
                                asi32, "ngg_scratch", AC_ADDR_SPACE_LDS);
                        LLVMSetInitializer(ctx->gs_ngg_scratch, LLVMGetUndef(asi32));
@@ -5009,7 +2448,8 @@ static bool si_build_main_function(struct si_shader_context *ctx,
                    (shader->key.as_es || shader->key.as_ls) &&
                    (ctx->type == PIPE_SHADER_TESS_EVAL ||
                     (ctx->type == PIPE_SHADER_VERTEX &&
-                     !si_vs_needs_prolog(sel, &shader->key.part.vs.prolog)))) {
+                     !si_vs_needs_prolog(sel, &shader->key.part.vs.prolog,
+                                         &shader->key, ngg_cull_shader)))) {
                        si_init_exec_from_input(ctx,
                                                ctx->merged_wave_info, 0);
                } else if (ctx->type == PIPE_SHADER_TESS_CTRL ||
@@ -5020,9 +2460,23 @@ static bool si_build_main_function(struct si_shader_context *ctx,
 
                        if (!shader->is_monolithic ||
                            (ctx->type == PIPE_SHADER_TESS_EVAL &&
-                            (shader->key.as_ngg && !shader->key.as_es)))
+                            shader->key.as_ngg && !shader->key.as_es &&
+                            !shader->key.opt.ngg_culling))
                                ac_init_exec_full_mask(&ctx->ac);
 
+                       if ((ctx->type == PIPE_SHADER_VERTEX ||
+                            ctx->type == PIPE_SHADER_TESS_EVAL) &&
+                           shader->key.as_ngg && !shader->key.as_es &&
+                           !shader->key.opt.ngg_culling) {
+                               gfx10_ngg_build_sendmsg_gs_alloc_req(ctx);
+
+                               /* Build the primitive export at the beginning
+                                * of the shader if possible.
+                                */
+                               if (gfx10_ngg_export_prim_early(shader))
+                                       gfx10_ngg_build_export_prim(ctx, NULL, NULL);
+                       }
+
                        if (ctx->type == PIPE_SHADER_TESS_CTRL ||
                            ctx->type == PIPE_SHADER_GEOMETRY) {
                                if (ctx->type == PIPE_SHADER_GEOMETRY && shader->key.as_ngg) {
@@ -5048,382 +2502,102 @@ static bool si_build_main_function(struct si_shader_context *ctx,
                                 *
                                 * Execute the barrier inside the conditional block,
                                 * so that empty waves can jump directly to s_endpgm,
-                                * which will also signal the barrier.
-                                *
-                                * This is possible in gfx9, because an empty wave
-                                * for the second shader does not participate in
-                                * the epilogue. With NGG, empty waves may still
-                                * be required to export data (e.g. GS output vertices),
-                                * so we cannot let them exit early.
-                                *
-                                * If the shader is TCS and the TCS epilog is present
-                                * and contains a barrier, it will wait there and then
-                                * reach s_endpgm.
-                                */
-                               si_llvm_emit_barrier(ctx);
-                       }
-               }
-       }
-
-       if (sel->force_correct_derivs_after_kill) {
-               ctx->postponed_kill = ac_build_alloca_undef(&ctx->ac, ctx->i1, "");
-               /* true = don't kill. */
-               LLVMBuildStore(ctx->ac.builder, ctx->i1true,
-                              ctx->postponed_kill);
-       }
-
-       bool success = si_nir_build_llvm(ctx, nir);
-       if (free_nir)
-               ralloc_free(nir);
-       if (!success) {
-               fprintf(stderr, "Failed to translate shader from NIR to LLVM\n");
-               return false;
-       }
-
-       si_llvm_build_ret(ctx, ctx->return_value);
-       return true;
-}
-
-/**
- * Compute the VS prolog key, which contains all the information needed to
- * build the VS prolog function, and set shader->info bits where needed.
- *
- * \param info             Shader info of the vertex shader.
- * \param num_input_sgprs  Number of input SGPRs for the vertex shader.
- * \param prolog_key       Key of the VS prolog
- * \param shader_out       The vertex shader, or the next shader if merging LS+HS or ES+GS.
- * \param key              Output shader part key.
- */
-static void si_get_vs_prolog_key(const struct si_shader_info *info,
-                                unsigned num_input_sgprs,
-                                const struct si_vs_prolog_bits *prolog_key,
-                                struct si_shader *shader_out,
-                                union si_shader_part_key *key)
-{
-       memset(key, 0, sizeof(*key));
-       key->vs_prolog.states = *prolog_key;
-       key->vs_prolog.num_input_sgprs = num_input_sgprs;
-       key->vs_prolog.num_inputs = info->num_inputs;
-       key->vs_prolog.as_ls = shader_out->key.as_ls;
-       key->vs_prolog.as_es = shader_out->key.as_es;
-       key->vs_prolog.as_ngg = shader_out->key.as_ngg;
-
-       if (shader_out->selector->type == PIPE_SHADER_TESS_CTRL) {
-               key->vs_prolog.as_ls = 1;
-               key->vs_prolog.num_merged_next_stage_vgprs = 2;
-       } else if (shader_out->selector->type == PIPE_SHADER_GEOMETRY) {
-               key->vs_prolog.as_es = 1;
-               key->vs_prolog.num_merged_next_stage_vgprs = 5;
-       } else if (shader_out->key.as_ngg) {
-               key->vs_prolog.num_merged_next_stage_vgprs = 5;
-       }
-
-       /* Enable loading the InstanceID VGPR. */
-       uint16_t input_mask = u_bit_consecutive(0, info->num_inputs);
-
-       if ((key->vs_prolog.states.instance_divisor_is_one |
-            key->vs_prolog.states.instance_divisor_is_fetched) & input_mask)
-               shader_out->info.uses_instanceid = true;
-}
-
-/**
- * Compute the PS prolog key, which contains all the information needed to
- * build the PS prolog function, and set related bits in shader->config.
- */
-static void si_get_ps_prolog_key(struct si_shader *shader,
-                                union si_shader_part_key *key,
-                                bool separate_prolog)
-{
-       struct si_shader_info *info = &shader->selector->info;
-
-       memset(key, 0, sizeof(*key));
-       key->ps_prolog.states = shader->key.part.ps.prolog;
-       key->ps_prolog.colors_read = info->colors_read;
-       key->ps_prolog.num_input_sgprs = shader->info.num_input_sgprs;
-       key->ps_prolog.num_input_vgprs = shader->info.num_input_vgprs;
-       key->ps_prolog.wqm = info->uses_derivatives &&
-               (key->ps_prolog.colors_read ||
-                key->ps_prolog.states.force_persp_sample_interp ||
-                key->ps_prolog.states.force_linear_sample_interp ||
-                key->ps_prolog.states.force_persp_center_interp ||
-                key->ps_prolog.states.force_linear_center_interp ||
-                key->ps_prolog.states.bc_optimize_for_persp ||
-                key->ps_prolog.states.bc_optimize_for_linear);
-       key->ps_prolog.ancillary_vgpr_index = shader->info.ancillary_vgpr_index;
-
-       if (info->colors_read) {
-               unsigned *color = shader->selector->color_attr_index;
-
-               if (shader->key.part.ps.prolog.color_two_side) {
-                       /* BCOLORs are stored after the last input. */
-                       key->ps_prolog.num_interp_inputs = info->num_inputs;
-                       key->ps_prolog.face_vgpr_index = shader->info.face_vgpr_index;
-                       if (separate_prolog)
-                               shader->config.spi_ps_input_ena |= S_0286CC_FRONT_FACE_ENA(1);
-               }
-
-               for (unsigned i = 0; i < 2; i++) {
-                       unsigned interp = info->input_interpolate[color[i]];
-                       unsigned location = info->input_interpolate_loc[color[i]];
-
-                       if (!(info->colors_read & (0xf << i*4)))
-                               continue;
-
-                       key->ps_prolog.color_attr_index[i] = color[i];
-
-                       if (shader->key.part.ps.prolog.flatshade_colors &&
-                           interp == TGSI_INTERPOLATE_COLOR)
-                               interp = TGSI_INTERPOLATE_CONSTANT;
-
-                       switch (interp) {
-                       case TGSI_INTERPOLATE_CONSTANT:
-                               key->ps_prolog.color_interp_vgpr_index[i] = -1;
-                               break;
-                       case TGSI_INTERPOLATE_PERSPECTIVE:
-                       case TGSI_INTERPOLATE_COLOR:
-                               /* Force the interpolation location for colors here. */
-                               if (shader->key.part.ps.prolog.force_persp_sample_interp)
-                                       location = TGSI_INTERPOLATE_LOC_SAMPLE;
-                               if (shader->key.part.ps.prolog.force_persp_center_interp)
-                                       location = TGSI_INTERPOLATE_LOC_CENTER;
-
-                               switch (location) {
-                               case TGSI_INTERPOLATE_LOC_SAMPLE:
-                                       key->ps_prolog.color_interp_vgpr_index[i] = 0;
-                                       if (separate_prolog) {
-                                               shader->config.spi_ps_input_ena |=
-                                                       S_0286CC_PERSP_SAMPLE_ENA(1);
-                                       }
-                                       break;
-                               case TGSI_INTERPOLATE_LOC_CENTER:
-                                       key->ps_prolog.color_interp_vgpr_index[i] = 2;
-                                       if (separate_prolog) {
-                                               shader->config.spi_ps_input_ena |=
-                                                       S_0286CC_PERSP_CENTER_ENA(1);
-                                       }
-                                       break;
-                               case TGSI_INTERPOLATE_LOC_CENTROID:
-                                       key->ps_prolog.color_interp_vgpr_index[i] = 4;
-                                       if (separate_prolog) {
-                                               shader->config.spi_ps_input_ena |=
-                                                       S_0286CC_PERSP_CENTROID_ENA(1);
-                                       }
-                                       break;
-                               default:
-                                       assert(0);
-                               }
-                               break;
-                       case TGSI_INTERPOLATE_LINEAR:
-                               /* Force the interpolation location for colors here. */
-                               if (shader->key.part.ps.prolog.force_linear_sample_interp)
-                                       location = TGSI_INTERPOLATE_LOC_SAMPLE;
-                               if (shader->key.part.ps.prolog.force_linear_center_interp)
-                                       location = TGSI_INTERPOLATE_LOC_CENTER;
-
-                               /* The VGPR assignment for non-monolithic shaders
-                                * works because InitialPSInputAddr is set on the
-                                * main shader and PERSP_PULL_MODEL is never used.
-                                */
-                               switch (location) {
-                               case TGSI_INTERPOLATE_LOC_SAMPLE:
-                                       key->ps_prolog.color_interp_vgpr_index[i] =
-                                               separate_prolog ? 6 : 9;
-                                       if (separate_prolog) {
-                                               shader->config.spi_ps_input_ena |=
-                                                       S_0286CC_LINEAR_SAMPLE_ENA(1);
-                                       }
-                                       break;
-                               case TGSI_INTERPOLATE_LOC_CENTER:
-                                       key->ps_prolog.color_interp_vgpr_index[i] =
-                                               separate_prolog ? 8 : 11;
-                                       if (separate_prolog) {
-                                               shader->config.spi_ps_input_ena |=
-                                                       S_0286CC_LINEAR_CENTER_ENA(1);
-                                       }
-                                       break;
-                               case TGSI_INTERPOLATE_LOC_CENTROID:
-                                       key->ps_prolog.color_interp_vgpr_index[i] =
-                                               separate_prolog ? 10 : 13;
-                                       if (separate_prolog) {
-                                               shader->config.spi_ps_input_ena |=
-                                                       S_0286CC_LINEAR_CENTROID_ENA(1);
-                                       }
-                                       break;
-                               default:
-                                       assert(0);
-                               }
-                               break;
-                       default:
-                               assert(0);
+                                * which will also signal the barrier.
+                                *
+                                * This is possible in gfx9, because an empty wave
+                                * for the second shader does not participate in
+                                * the epilogue. With NGG, empty waves may still
+                                * be required to export data (e.g. GS output vertices),
+                                * so we cannot let them exit early.
+                                *
+                                * If the shader is TCS and the TCS epilog is present
+                                * and contains a barrier, it will wait there and then
+                                * reach s_endpgm.
+                                */
+                               si_llvm_emit_barrier(ctx);
                        }
                }
        }
-}
 
-/**
- * Check whether a PS prolog is required based on the key.
- */
-static bool si_need_ps_prolog(const union si_shader_part_key *key)
-{
-       return key->ps_prolog.colors_read ||
-              key->ps_prolog.states.force_persp_sample_interp ||
-              key->ps_prolog.states.force_linear_sample_interp ||
-              key->ps_prolog.states.force_persp_center_interp ||
-              key->ps_prolog.states.force_linear_center_interp ||
-              key->ps_prolog.states.bc_optimize_for_persp ||
-              key->ps_prolog.states.bc_optimize_for_linear ||
-              key->ps_prolog.states.poly_stipple ||
-              key->ps_prolog.states.samplemask_log_ps_iter;
+       if (sel->force_correct_derivs_after_kill) {
+               ctx->postponed_kill = ac_build_alloca_undef(&ctx->ac, ctx->ac.i1, "");
+               /* true = don't kill. */
+               LLVMBuildStore(ctx->ac.builder, ctx->ac.i1true,
+                              ctx->postponed_kill);
+       }
+
+       bool success = si_nir_build_llvm(ctx, nir);
+       if (free_nir)
+               ralloc_free(nir);
+       if (!success) {
+               fprintf(stderr, "Failed to translate shader from NIR to LLVM\n");
+               return false;
+       }
+
+       si_llvm_build_ret(ctx, ctx->return_value);
+       return true;
 }
 
 /**
- * Compute the PS epilog key, which contains all the information needed to
- * build the PS epilog function.
+ * Compute the VS prolog key, which contains all the information needed to
+ * build the VS prolog function, and set shader->info bits where needed.
+ *
+ * \param info             Shader info of the vertex shader.
+ * \param num_input_sgprs  Number of input SGPRs for the vertex shader.
+ * \param has_old_  Whether the preceding shader part is the NGG cull shader.
+ * \param prolog_key       Key of the VS prolog
+ * \param shader_out       The vertex shader, or the next shader if merging LS+HS or ES+GS.
+ * \param key              Output shader part key.
  */
-static void si_get_ps_epilog_key(struct si_shader *shader,
+static void si_get_vs_prolog_key(const struct si_shader_info *info,
+                                unsigned num_input_sgprs,
+                                bool ngg_cull_shader,
+                                const struct si_vs_prolog_bits *prolog_key,
+                                struct si_shader *shader_out,
                                 union si_shader_part_key *key)
 {
-       struct si_shader_info *info = &shader->selector->info;
        memset(key, 0, sizeof(*key));
-       key->ps_epilog.colors_written = info->colors_written;
-       key->ps_epilog.writes_z = info->writes_z;
-       key->ps_epilog.writes_stencil = info->writes_stencil;
-       key->ps_epilog.writes_samplemask = info->writes_samplemask;
-       key->ps_epilog.states = shader->key.part.ps.epilog;
-}
-
-/**
- * Build the GS prolog function. Rotate the input vertices for triangle strips
- * with adjacency.
- */
-static void si_build_gs_prolog_function(struct si_shader_context *ctx,
-                                       union si_shader_part_key *key)
-{
-       unsigned num_sgprs, num_vgprs;
-       LLVMBuilderRef builder = ctx->ac.builder;
-       LLVMTypeRef returns[AC_MAX_ARGS];
-       LLVMValueRef func, ret;
-
-       memset(&ctx->args, 0, sizeof(ctx->args));
+       key->vs_prolog.states = *prolog_key;
+       key->vs_prolog.num_input_sgprs = num_input_sgprs;
+       key->vs_prolog.num_inputs = info->num_inputs;
+       key->vs_prolog.as_ls = shader_out->key.as_ls;
+       key->vs_prolog.as_es = shader_out->key.as_es;
+       key->vs_prolog.as_ngg = shader_out->key.as_ngg;
 
-       if (ctx->screen->info.chip_class >= GFX9) {
-               if (key->gs_prolog.states.gfx9_prev_is_vs)
-                       num_sgprs = 8 + GFX9_VSGS_NUM_USER_SGPR;
-               else
-                       num_sgprs = 8 + GFX9_TESGS_NUM_USER_SGPR;
-               num_vgprs = 5; /* ES inputs are not needed by GS */
+       if (ngg_cull_shader) {
+               key->vs_prolog.gs_fast_launch_tri_list = !!(shader_out->key.opt.ngg_culling &
+                                                           SI_NGG_CULL_GS_FAST_LAUNCH_TRI_LIST);
+               key->vs_prolog.gs_fast_launch_tri_strip = !!(shader_out->key.opt.ngg_culling &
+                                                            SI_NGG_CULL_GS_FAST_LAUNCH_TRI_STRIP);
        } else {
-               num_sgprs = GFX6_GS_NUM_USER_SGPR + 2;
-               num_vgprs = 8;
-       }
-
-       for (unsigned i = 0; i < num_sgprs; ++i) {
-               ac_add_arg(&ctx->args, AC_ARG_SGPR, 1, AC_ARG_INT, NULL);
-               returns[i] = ctx->i32;
+               key->vs_prolog.has_ngg_cull_inputs = !!shader_out->key.opt.ngg_culling;
        }
 
-       for (unsigned i = 0; i < num_vgprs; ++i) {
-               ac_add_arg(&ctx->args, AC_ARG_VGPR, 1, AC_ARG_INT, NULL);
-               returns[num_sgprs + i] = ctx->f32;
-       }
-
-       /* Create the function. */
-       si_llvm_create_func(ctx, "gs_prolog", returns, num_sgprs + num_vgprs, 0);
-       func = ctx->main_fn;
-
-       /* Set the full EXEC mask for the prolog, because we are only fiddling
-        * with registers here. The main shader part will set the correct EXEC
-        * mask.
-        */
-       if (ctx->screen->info.chip_class >= GFX9 && !key->gs_prolog.is_monolithic)
-               ac_init_exec_full_mask(&ctx->ac);
-
-       /* Copy inputs to outputs. This should be no-op, as the registers match,
-        * but it will prevent the compiler from overwriting them unintentionally.
-        */
-       ret = ctx->return_value;
-       for (unsigned i = 0; i < num_sgprs; i++) {
-               LLVMValueRef p = LLVMGetParam(func, i);
-               ret = LLVMBuildInsertValue(builder, ret, p, i, "");
-       }
-       for (unsigned i = 0; i < num_vgprs; i++) {
-               LLVMValueRef p = LLVMGetParam(func, num_sgprs + i);
-               p = ac_to_float(&ctx->ac, p);
-               ret = LLVMBuildInsertValue(builder, ret, p, num_sgprs + i, "");
+       if (shader_out->selector->type == PIPE_SHADER_TESS_CTRL) {
+               key->vs_prolog.as_ls = 1;
+               key->vs_prolog.num_merged_next_stage_vgprs = 2;
+       } else if (shader_out->selector->type == PIPE_SHADER_GEOMETRY) {
+               key->vs_prolog.as_es = 1;
+               key->vs_prolog.num_merged_next_stage_vgprs = 5;
+       } else if (shader_out->key.as_ngg) {
+               key->vs_prolog.num_merged_next_stage_vgprs = 5;
        }
 
-       if (key->gs_prolog.states.tri_strip_adj_fix) {
-               /* Remap the input vertices for every other primitive. */
-               const struct ac_arg gfx6_vtx_params[6] = {
-                       { .used = true, .arg_index = num_sgprs },
-                       { .used = true, .arg_index = num_sgprs + 1 },
-                       { .used = true, .arg_index = num_sgprs + 3 },
-                       { .used = true, .arg_index = num_sgprs + 4 },
-                       { .used = true, .arg_index = num_sgprs + 5 },
-                       { .used = true, .arg_index = num_sgprs + 6 },
-               };
-               const struct ac_arg gfx9_vtx_params[3] = {
-                       { .used = true, .arg_index = num_sgprs },
-                       { .used = true, .arg_index = num_sgprs + 1 },
-                       { .used = true, .arg_index = num_sgprs + 4 },
-               };
-               LLVMValueRef vtx_in[6], vtx_out[6];
-               LLVMValueRef prim_id, rotate;
-
-               if (ctx->screen->info.chip_class >= GFX9) {
-                       for (unsigned i = 0; i < 3; i++) {
-                               vtx_in[i*2] = si_unpack_param(ctx, gfx9_vtx_params[i], 0, 16);
-                               vtx_in[i*2+1] = si_unpack_param(ctx, gfx9_vtx_params[i], 16, 16);
-                       }
-               } else {
-                       for (unsigned i = 0; i < 6; i++)
-                               vtx_in[i] = ac_get_arg(&ctx->ac, gfx6_vtx_params[i]);
-               }
-
-               prim_id = LLVMGetParam(func, num_sgprs + 2);
-               rotate = LLVMBuildTrunc(builder, prim_id, ctx->i1, "");
-
-               for (unsigned i = 0; i < 6; ++i) {
-                       LLVMValueRef base, rotated;
-                       base = vtx_in[i];
-                       rotated = vtx_in[(i + 4) % 6];
-                       vtx_out[i] = LLVMBuildSelect(builder, rotate, rotated, base, "");
-               }
-
-               if (ctx->screen->info.chip_class >= GFX9) {
-                       for (unsigned i = 0; i < 3; i++) {
-                               LLVMValueRef hi, out;
-
-                               hi = LLVMBuildShl(builder, vtx_out[i*2+1],
-                                                 LLVMConstInt(ctx->i32, 16, 0), "");
-                               out = LLVMBuildOr(builder, vtx_out[i*2], hi, "");
-                               out = ac_to_float(&ctx->ac, out);
-                               ret = LLVMBuildInsertValue(builder, ret, out,
-                                                          gfx9_vtx_params[i].arg_index, "");
-                       }
-               } else {
-                       for (unsigned i = 0; i < 6; i++) {
-                               LLVMValueRef out;
-
-                               out = ac_to_float(&ctx->ac, vtx_out[i]);
-                               ret = LLVMBuildInsertValue(builder, ret, out,
-                                                          gfx6_vtx_params[i].arg_index, "");
-                       }
-               }
-       }
+       /* Enable loading the InstanceID VGPR. */
+       uint16_t input_mask = u_bit_consecutive(0, info->num_inputs);
 
-       LLVMBuildRet(builder, ret);
+       if ((key->vs_prolog.states.instance_divisor_is_one |
+            key->vs_prolog.states.instance_divisor_is_fetched) & input_mask)
+               shader_out->info.uses_instanceid = true;
 }
 
 /**
  * Given a list of shader part functions, build a wrapper function that
  * runs them in sequence to form a monolithic shader.
  */
-static void si_build_wrapper_function(struct si_shader_context *ctx,
-                                     LLVMValueRef *parts,
-                                     unsigned num_parts,
-                                     unsigned main_part,
-                                     unsigned next_shader_first_part)
+void si_build_wrapper_function(struct si_shader_context *ctx, LLVMValueRef *parts,
+                              unsigned num_parts, unsigned main_part,
+                              unsigned next_shader_first_part)
 {
        LLVMBuilderRef builder = ctx->ac.builder;
        /* PS epilog has one arg per color component; gfx9 merged shader
@@ -5480,7 +2654,20 @@ static void si_build_wrapper_function(struct si_shader_context *ctx,
                 */
                enum ac_arg_type arg_type = AC_ARG_INT;
                if (LLVMGetTypeKind(type) == LLVMPointerTypeKind) {
-                       arg_type = AC_ARG_CONST_PTR;
+                       type = LLVMGetElementType(type);
+
+                       if (LLVMGetTypeKind(type) == LLVMVectorTypeKind) {
+                               if (LLVMGetVectorSize(type) == 4)
+                                       arg_type = AC_ARG_CONST_DESC_PTR;
+                               else if (LLVMGetVectorSize(type) == 8)
+                                       arg_type = AC_ARG_CONST_IMAGE_PTR;
+                               else
+                                       assert(0);
+                       } else if (type == ctx->ac.f32) {
+                               arg_type = AC_ARG_CONST_FLOAT_PTR;
+                       } else {
+                               assert(0);
+                       }
                }
 
                ac_add_arg(&ctx->args, gprs < num_sgprs ? AC_ARG_SGPR : AC_ARG_VGPR,
@@ -5515,7 +2702,7 @@ static void si_build_wrapper_function(struct si_shader_context *ctx,
        si_llvm_create_func(ctx, "wrapper", returns, num_returns,
                            si_get_max_workgroup_size(ctx->shader));
 
-       if (is_merged_shader(ctx))
+       if (si_is_merged_shader(ctx))
                ac_init_exec_full_mask(&ctx->ac);
 
        /* Record the arguments of the function as if they were an output of
@@ -5527,13 +2714,13 @@ static void si_build_wrapper_function(struct si_shader_context *ctx,
        for (unsigned i = 0; i < ctx->args.arg_count; ++i) {
                LLVMValueRef param = LLVMGetParam(ctx->main_fn, i);
                LLVMTypeRef param_type = LLVMTypeOf(param);
-               LLVMTypeRef out_type = ctx->args.args[i].file == AC_ARG_SGPR ? ctx->i32 : ctx->f32;
+               LLVMTypeRef out_type = ctx->args.args[i].file == AC_ARG_SGPR ? ctx->ac.i32 : ctx->ac.f32;
                unsigned size = ac_get_type_size(param_type) / 4;
 
                if (size == 1) {
                        if (LLVMGetTypeKind(param_type) == LLVMPointerTypeKind) {
-                               param = LLVMBuildPtrToInt(builder, param, ctx->i32, "");
-                               param_type = ctx->i32;
+                               param = LLVMBuildPtrToInt(builder, param, ctx->ac.i32, "");
+                               param_type = ctx->ac.i32;
                        }
 
                        if (param_type != out_type)
@@ -5543,8 +2730,8 @@ static void si_build_wrapper_function(struct si_shader_context *ctx,
                        LLVMTypeRef vector_type = LLVMVectorType(out_type, size);
 
                        if (LLVMGetTypeKind(param_type) == LLVMPointerTypeKind) {
-                               param = LLVMBuildPtrToInt(builder, param, ctx->i64, "");
-                               param_type = ctx->i64;
+                               param = LLVMBuildPtrToInt(builder, param, ctx->ac.i64, "");
+                               param_type = ctx->ac.i64;
                        }
 
                        if (param_type != vector_type)
@@ -5552,7 +2739,7 @@ static void si_build_wrapper_function(struct si_shader_context *ctx,
 
                        for (unsigned j = 0; j < size; ++j)
                                out[num_out++] = LLVMBuildExtractElement(
-                                       builder, param, LLVMConstInt(ctx->i32, j, 0), "");
+                                       builder, param, LLVMConstInt(ctx->ac.i32, j, 0), "");
                }
 
                if (ctx->args.args[i].file == AC_ARG_SGPR)
@@ -5577,7 +2764,7 @@ static void si_build_wrapper_function(struct si_shader_context *ctx,
                        LLVMValueRef ena, count = initial[3];
 
                        count = LLVMBuildAnd(builder, count,
-                                            LLVMConstInt(ctx->i32, 0x7f, 0), "");
+                                            LLVMConstInt(ctx->ac.i32, 0x7f, 0), "");
                        ena = LLVMBuildICmp(builder, LLVMIntULT,
                                            ac_get_thread_id(&ctx->ac), count, "");
                        ac_build_ifcc(&ctx->ac, ena, 6506);
@@ -5618,10 +2805,10 @@ static void si_build_wrapper_function(struct si_shader_context *ctx,
                                if (LLVMGetTypeKind(param_type) == LLVMPointerTypeKind) {
                                        if (LLVMGetPointerAddressSpace(param_type) ==
                                            AC_ADDR_SPACE_CONST_32BIT) {
-                                               arg = LLVMBuildBitCast(builder, arg, ctx->i32, "");
+                                               arg = LLVMBuildBitCast(builder, arg, ctx->ac.i32, "");
                                                arg = LLVMBuildIntToPtr(builder, arg, param_type, "");
                                        } else {
-                                               arg = LLVMBuildBitCast(builder, arg, ctx->i64, "");
+                                               arg = LLVMBuildBitCast(builder, arg, ctx->ac.i64, "");
                                                arg = LLVMBuildIntToPtr(builder, arg, param_type, "");
                                        }
                                } else {
@@ -5670,7 +2857,7 @@ static void si_build_wrapper_function(struct si_shader_context *ctx,
                                assert(num_out < ARRAY_SIZE(out));
                                out[num_out++] = val;
 
-                               if (LLVMTypeOf(val) == ctx->i32) {
+                               if (LLVMTypeOf(val) == ctx->ac.i32) {
                                        assert(num_out_sgpr + 1 == num_out);
                                        num_out_sgpr = num_out;
                                }
@@ -5722,6 +2909,24 @@ static struct nir_shader *get_nir_shader(struct si_shader_selector *sel,
        return NULL;
 }
 
+/* Set the context to a certain shader. Can be called repeatedly
+ * to change the shader. */
+static void si_shader_context_set_ir(struct si_shader_context *ctx,
+                                    struct si_shader *shader)
+{
+       struct si_shader_selector *sel = shader->selector;
+       const struct si_shader_info *info = &sel->info;
+
+       ctx->shader = shader;
+       ctx->type = sel->type;
+
+       ctx->num_const_buffers = util_last_bit(info->const_buffers_declared);
+       ctx->num_shader_buffers = util_last_bit(info->shader_buffers_declared);
+
+       ctx->num_samplers = util_last_bit(info->samplers_declared);
+       ctx->num_images = util_last_bit(info->images_declared);
+}
+
 int si_compile_shader(struct si_screen *sscreen,
                      struct ac_llvm_compiler *compiler,
                      struct si_shader *shader,
@@ -5742,46 +2947,88 @@ int si_compile_shader(struct si_screen *sscreen,
        }
 
        si_llvm_context_init(&ctx, sscreen, compiler, si_get_shader_wave_size(shader));
-       si_llvm_context_set_ir(&ctx, shader);
+       si_shader_context_set_ir(&ctx, shader);
 
        memset(shader->info.vs_output_param_offset, AC_EXP_PARAM_UNDEFINED,
               sizeof(shader->info.vs_output_param_offset));
 
        shader->info.uses_instanceid = sel->info.uses_instanceid;
 
-       if (!si_build_main_function(&ctx, nir, free_nir)) {
+       LLVMValueRef ngg_cull_main_fn = NULL;
+       if (ctx.shader->key.opt.ngg_culling) {
+               if (!si_build_main_function(&ctx, nir, false, true)) {
+                       si_llvm_dispose(&ctx);
+                       return -1;
+               }
+               ngg_cull_main_fn = ctx.main_fn;
+               ctx.main_fn = NULL;
+               /* Re-set the IR. */
+               si_shader_context_set_ir(&ctx, shader);
+       }
+
+       if (!si_build_main_function(&ctx, nir, free_nir, false)) {
                si_llvm_dispose(&ctx);
                return -1;
        }
 
        if (shader->is_monolithic && ctx.type == PIPE_SHADER_VERTEX) {
-               LLVMValueRef parts[2];
-               bool need_prolog = si_vs_needs_prolog(sel, &shader->key.part.vs.prolog);
-
-               parts[1] = ctx.main_fn;
+               LLVMValueRef parts[4];
+               unsigned num_parts = 0;
+               bool has_prolog = false;
+               LLVMValueRef main_fn = ctx.main_fn;
+
+               if (ngg_cull_main_fn) {
+                       if (si_vs_needs_prolog(sel, &shader->key.part.vs.prolog,
+                                              &shader->key, true)) {
+                               union si_shader_part_key prolog_key;
+                               si_get_vs_prolog_key(&sel->info,
+                                                    shader->info.num_input_sgprs,
+                                                    true,
+                                                    &shader->key.part.vs.prolog,
+                                                    shader, &prolog_key);
+                               prolog_key.vs_prolog.is_monolithic = true;
+                               si_build_vs_prolog_function(&ctx, &prolog_key);
+                               parts[num_parts++] = ctx.main_fn;
+                               has_prolog = true;
+                       }
+                       parts[num_parts++] = ngg_cull_main_fn;
+               }
 
-               if (need_prolog) {
+               if (si_vs_needs_prolog(sel, &shader->key.part.vs.prolog,
+                                      &shader->key, false)) {
                        union si_shader_part_key prolog_key;
                        si_get_vs_prolog_key(&sel->info,
                                             shader->info.num_input_sgprs,
+                                            false,
                                             &shader->key.part.vs.prolog,
                                             shader, &prolog_key);
                        prolog_key.vs_prolog.is_monolithic = true;
                        si_build_vs_prolog_function(&ctx, &prolog_key);
-                       parts[0] = ctx.main_fn;
+                       parts[num_parts++] = ctx.main_fn;
+                       has_prolog = true;
                }
+               parts[num_parts++] = main_fn;
 
-               si_build_wrapper_function(&ctx, parts + !need_prolog,
-                                         1 + need_prolog, need_prolog, 0);
+               si_build_wrapper_function(&ctx, parts, num_parts,
+                                         has_prolog ? 1 : 0, 0);
 
                if (ctx.shader->key.opt.vs_as_prim_discard_cs)
                        si_build_prim_discard_compute_shader(&ctx);
+       } else if (shader->is_monolithic && ctx.type == PIPE_SHADER_TESS_EVAL &&
+                  ngg_cull_main_fn) {
+               LLVMValueRef parts[2];
+
+               parts[0] = ngg_cull_main_fn;
+               parts[1] = ctx.main_fn;
+
+               si_build_wrapper_function(&ctx, parts, 2, 0, 0);
        } else if (shader->is_monolithic && ctx.type == PIPE_SHADER_TESS_CTRL) {
                if (sscreen->info.chip_class >= GFX9) {
                        struct si_shader_selector *ls = shader->key.part.tcs.ls;
                        LLVMValueRef parts[4];
                        bool vs_needs_prolog =
-                               si_vs_needs_prolog(ls, &shader->key.part.tcs.ls_prolog);
+                               si_vs_needs_prolog(ls, &shader->key.part.tcs.ls_prolog,
+                                                  &shader->key, false);
 
                        /* TCS main part */
                        parts[2] = ctx.main_fn;
@@ -5790,7 +3037,7 @@ int si_compile_shader(struct si_screen *sscreen,
                        union si_shader_part_key tcs_epilog_key;
                        memset(&tcs_epilog_key, 0, sizeof(tcs_epilog_key));
                        tcs_epilog_key.tcs_epilog.states = shader->key.part.tcs.epilog;
-                       si_build_tcs_epilog_function(&ctx, &tcs_epilog_key);
+                       si_llvm_build_tcs_epilog(&ctx, &tcs_epilog_key);
                        parts[3] = ctx.main_fn;
 
                        /* VS as LS main part */
@@ -5801,9 +3048,9 @@ int si_compile_shader(struct si_screen *sscreen,
                        shader_ls.key.mono = shader->key.mono;
                        shader_ls.key.opt = shader->key.opt;
                        shader_ls.is_monolithic = true;
-                       si_llvm_context_set_ir(&ctx, &shader_ls);
+                       si_shader_context_set_ir(&ctx, &shader_ls);
 
-                       if (!si_build_main_function(&ctx, nir, free_nir)) {
+                       if (!si_build_main_function(&ctx, nir, free_nir, false)) {
                                si_llvm_dispose(&ctx);
                                return -1;
                        }
@@ -5815,6 +3062,7 @@ int si_compile_shader(struct si_screen *sscreen,
                                union si_shader_part_key vs_prolog_key;
                                si_get_vs_prolog_key(&ls->info,
                                                     shader_ls.info.num_input_sgprs,
+                                                    false,
                                                     &shader->key.part.tcs.ls_prolog,
                                                     shader, &vs_prolog_key);
                                vs_prolog_key.vs_prolog.is_monolithic = true;
@@ -5838,7 +3086,7 @@ int si_compile_shader(struct si_screen *sscreen,
 
                        memset(&epilog_key, 0, sizeof(epilog_key));
                        epilog_key.tcs_epilog.states = shader->key.part.tcs.epilog;
-                       si_build_tcs_epilog_function(&ctx, &epilog_key);
+                       si_llvm_build_tcs_epilog(&ctx, &epilog_key);
                        parts[1] = ctx.main_fn;
 
                        si_build_wrapper_function(&ctx, parts, 2, 0, 0);
@@ -5857,7 +3105,7 @@ int si_compile_shader(struct si_screen *sscreen,
                        gs_prolog_key.gs_prolog.states = shader->key.part.gs.prolog;
                        gs_prolog_key.gs_prolog.is_monolithic = true;
                        gs_prolog_key.gs_prolog.as_ngg = shader->key.as_ngg;
-                       si_build_gs_prolog_function(&ctx, &gs_prolog_key);
+                       si_llvm_build_gs_prolog(&ctx, &gs_prolog_key);
                        gs_prolog = ctx.main_fn;
 
                        /* ES main part */
@@ -5869,9 +3117,9 @@ int si_compile_shader(struct si_screen *sscreen,
                        shader_es.key.mono = shader->key.mono;
                        shader_es.key.opt = shader->key.opt;
                        shader_es.is_monolithic = true;
-                       si_llvm_context_set_ir(&ctx, &shader_es);
+                       si_shader_context_set_ir(&ctx, &shader_es);
 
-                       if (!si_build_main_function(&ctx, nir, free_nir)) {
+                       if (!si_build_main_function(&ctx, nir, free_nir, false)) {
                                si_llvm_dispose(&ctx);
                                return -1;
                        }
@@ -5880,10 +3128,12 @@ int si_compile_shader(struct si_screen *sscreen,
 
                        /* ES prolog */
                        if (es->type == PIPE_SHADER_VERTEX &&
-                           si_vs_needs_prolog(es, &shader->key.part.gs.vs_prolog)) {
+                           si_vs_needs_prolog(es, &shader->key.part.gs.vs_prolog,
+                                              &shader->key, false)) {
                                union si_shader_part_key vs_prolog_key;
                                si_get_vs_prolog_key(&es->info,
                                                     shader_es.info.num_input_sgprs,
+                                                    false,
                                                     &shader->key.part.gs.vs_prolog,
                                                     shader, &vs_prolog_key);
                                vs_prolog_key.vs_prolog.is_monolithic = true;
@@ -5916,33 +3166,13 @@ int si_compile_shader(struct si_screen *sscreen,
 
                        memset(&prolog_key, 0, sizeof(prolog_key));
                        prolog_key.gs_prolog.states = shader->key.part.gs.prolog;
-                       si_build_gs_prolog_function(&ctx, &prolog_key);
+                       si_llvm_build_gs_prolog(&ctx, &prolog_key);
                        parts[0] = ctx.main_fn;
 
                        si_build_wrapper_function(&ctx, parts, 2, 1, 0);
                }
        } else if (shader->is_monolithic && ctx.type == PIPE_SHADER_FRAGMENT) {
-               LLVMValueRef parts[3];
-               union si_shader_part_key prolog_key;
-               union si_shader_part_key epilog_key;
-               bool need_prolog;
-
-               si_get_ps_prolog_key(shader, &prolog_key, false);
-               need_prolog = si_need_ps_prolog(&prolog_key);
-
-               parts[need_prolog ? 1 : 0] = ctx.main_fn;
-
-               if (need_prolog) {
-                       si_build_ps_prolog_function(&ctx, &prolog_key);
-                       parts[0] = ctx.main_fn;
-               }
-
-               si_get_ps_epilog_key(shader, &epilog_key);
-               si_build_ps_epilog_function(&ctx, &epilog_key);
-               parts[need_prolog ? 2 : 1] = ctx.main_fn;
-
-               si_build_wrapper_function(&ctx, parts, need_prolog ? 3 : 2,
-                                         need_prolog ? 1 : 0, 0);
+               si_llvm_build_monolithic_ps(&ctx, shader);
        }
 
        si_llvm_optimize_module(&ctx);
@@ -5962,8 +3192,7 @@ int si_compile_shader(struct si_screen *sscreen,
 
        /* Compile to bytecode. */
        r = si_compile_llvm(sscreen, &shader->binary, &shader->config, compiler,
-                           ctx.ac.module, debug, ctx.type, ctx.ac.wave_size,
-                           si_get_shader_name(shader),
+                           &ctx.ac, debug, ctx.type, si_get_shader_name(shader),
                            si_should_optimize_less(compiler, shader->selector));
        si_llvm_dispose(&ctx);
        if (r) {
@@ -6005,7 +3234,7 @@ int si_compile_shader(struct si_screen *sscreen,
        }
 
        /* Add the scratch offset to input SGPRs. */
-       if (shader->config.scratch_bytes_per_wave && !is_merged_shader(&ctx))
+       if (shader->config.scratch_bytes_per_wave && !si_is_merged_shader(&ctx))
                shader->info.num_input_sgprs += 1; /* scratch byte offset */
 
        /* Calculate the number of fragment input VGPRs. */
@@ -6100,8 +3329,7 @@ si_get_shader_part(struct si_screen *sscreen,
        si_llvm_optimize_module(&ctx);
 
        if (si_compile_llvm(sscreen, &result->binary, &result->config, compiler,
-                           ctx.ac.module, debug, ctx.type, ctx.ac.wave_size,
-                           name, false)) {
+                           &ctx.ac, debug, ctx.type, name, false)) {
                FREE(result);
                result = NULL;
                goto out;
@@ -6116,17 +3344,6 @@ out:
        return result;
 }
 
-static LLVMValueRef si_prolog_get_rw_buffers(struct si_shader_context *ctx)
-{
-       LLVMValueRef ptr[2], list;
-       bool merged_shader = is_merged_shader(ctx);
-
-       ptr[0] = LLVMGetParam(ctx->main_fn, (merged_shader ? 8 : 0) + SI_SGPR_RW_BUFFERS);
-       list = LLVMBuildIntToPtr(ctx->ac.builder, ptr[0],
-                                ac_array_in_const32_addr_space(ctx->v4i32), "");
-       return list;
-}
-
 /**
  * Build the vertex shader prolog function.
  *
@@ -6150,10 +3367,11 @@ static void si_build_vs_prolog_function(struct si_shader_context *ctx,
        LLVMValueRef ret, func;
        int num_returns, i;
        unsigned first_vs_vgpr = key->vs_prolog.num_merged_next_stage_vgprs;
-       unsigned num_input_vgprs = key->vs_prolog.num_merged_next_stage_vgprs + 4;
+       unsigned num_input_vgprs = key->vs_prolog.num_merged_next_stage_vgprs + 4 +
+                                  (key->vs_prolog.has_ngg_cull_inputs ? 1 : 0);
        struct ac_arg input_sgpr_param[key->vs_prolog.num_input_sgprs];
-       struct ac_arg input_vgpr_param[9];
-       LLVMValueRef input_vgprs[9];
+       struct ac_arg input_vgpr_param[13];
+       LLVMValueRef input_vgprs[13];
        unsigned num_all_input_regs = key->vs_prolog.num_input_sgprs +
                                      num_input_vgprs;
        unsigned user_sgpr_base = key->vs_prolog.num_merged_next_stage_vgprs ? 8 : 0;
@@ -6169,7 +3387,7 @@ static void si_build_vs_prolog_function(struct si_shader_context *ctx,
        for (i = 0; i < key->vs_prolog.num_input_sgprs; i++) {
                ac_add_arg(&ctx->args, AC_ARG_SGPR, 1, AC_ARG_INT,
                           &input_sgpr_param[i]);
-               returns[num_returns++] = ctx->i32;
+               returns[num_returns++] = ctx->ac.i32;
        }
 
        struct ac_arg merged_wave_info = input_sgpr_param[3];
@@ -6177,12 +3395,12 @@ static void si_build_vs_prolog_function(struct si_shader_context *ctx,
        /* Preloaded VGPRs (outputs must be floats) */
        for (i = 0; i < num_input_vgprs; i++) {
                ac_add_arg(&ctx->args, AC_ARG_VGPR, 1, AC_ARG_INT, &input_vgpr_param[i]);
-               returns[num_returns++] = ctx->f32;
+               returns[num_returns++] = ctx->ac.f32;
        }
 
        /* Vertex load indices. */
        for (i = 0; i < key->vs_prolog.num_inputs; i++)
-               returns[num_returns++] = ctx->f32;
+               returns[num_returns++] = ctx->ac.f32;
 
        /* Create the function. */
        si_llvm_create_func(ctx, "vs_prolog", returns, num_returns, 0);
@@ -6205,7 +3423,7 @@ static void si_build_vs_prolog_function(struct si_shader_context *ctx,
                        LLVMValueRef has_hs_threads =
                                LLVMBuildICmp(ctx->ac.builder, LLVMIntNE,
                                    si_unpack_param(ctx, input_sgpr_param[3], 8, 8),
-                                   ctx->i32_0, "");
+                                   ctx->ac.i32_0, "");
 
                        for (i = 4; i > 0; --i) {
                                input_vgprs[i + 1] =
@@ -6216,6 +3434,72 @@ static void si_build_vs_prolog_function(struct si_shader_context *ctx,
                }
        }
 
+       if (key->vs_prolog.gs_fast_launch_tri_list ||
+           key->vs_prolog.gs_fast_launch_tri_strip) {
+               LLVMValueRef wave_id, thread_id_in_tg;
+
+               wave_id = si_unpack_param(ctx, input_sgpr_param[3], 24, 4);
+               thread_id_in_tg = ac_build_imad(&ctx->ac, wave_id,
+                                               LLVMConstInt(ctx->ac.i32, ctx->ac.wave_size, false),
+                                               ac_get_thread_id(&ctx->ac));
+
+               /* The GS fast launch initializes all VGPRs to the value of
+                * the first thread, so we have to add the thread ID.
+                *
+                * Only these are initialized by the hw:
+                *   VGPR2: Base Primitive ID
+                *   VGPR5: Base Vertex ID
+                *   VGPR6: Instance ID
+                */
+
+               /* Put the vertex thread IDs into VGPRs as-is instead of packing them.
+                * The NGG cull shader will read them from there.
+                */
+               if (key->vs_prolog.gs_fast_launch_tri_list) {
+                       input_vgprs[0] = ac_build_imad(&ctx->ac, thread_id_in_tg, /* gs_vtx01_offset */
+                                                      LLVMConstInt(ctx->ac.i32, 3, 0), /* Vertex 0 */
+                                                      LLVMConstInt(ctx->ac.i32, 0, 0));
+                       input_vgprs[1] = ac_build_imad(&ctx->ac, thread_id_in_tg, /* gs_vtx23_offset */
+                                                      LLVMConstInt(ctx->ac.i32, 3, 0), /* Vertex 1 */
+                                                      LLVMConstInt(ctx->ac.i32, 1, 0));
+                       input_vgprs[4] = ac_build_imad(&ctx->ac, thread_id_in_tg, /* gs_vtx45_offset */
+                                                      LLVMConstInt(ctx->ac.i32, 3, 0), /* Vertex 2 */
+                                                      LLVMConstInt(ctx->ac.i32, 2, 0));
+               } else {
+                       assert(key->vs_prolog.gs_fast_launch_tri_strip);
+                       LLVMBuilderRef builder = ctx->ac.builder;
+                       /* Triangle indices: */
+                       LLVMValueRef index[3] = {
+                               thread_id_in_tg,
+                               LLVMBuildAdd(builder, thread_id_in_tg,
+                                            LLVMConstInt(ctx->ac.i32, 1, 0), ""),
+                               LLVMBuildAdd(builder, thread_id_in_tg,
+                                            LLVMConstInt(ctx->ac.i32, 2, 0), ""),
+                       };
+                       LLVMValueRef is_odd = LLVMBuildTrunc(ctx->ac.builder,
+                                                            thread_id_in_tg, ctx->ac.i1, "");
+                       LLVMValueRef flatshade_first =
+                               LLVMBuildICmp(builder, LLVMIntEQ,
+                                             si_unpack_param(ctx, ctx->vs_state_bits, 4, 2),
+                                             ctx->ac.i32_0, "");
+
+                       ac_build_triangle_strip_indices_to_triangle(&ctx->ac, is_odd,
+                                                                   flatshade_first, index);
+                       input_vgprs[0] = index[0];
+                       input_vgprs[1] = index[1];
+                       input_vgprs[4] = index[2];
+               }
+
+               /* Triangles always have all edge flags set initially. */
+               input_vgprs[3] = LLVMConstInt(ctx->ac.i32, 0x7 << 8, 0);
+
+               input_vgprs[2] = LLVMBuildAdd(ctx->ac.builder, input_vgprs[2],
+                                             thread_id_in_tg, ""); /* PrimID */
+               input_vgprs[5] = LLVMBuildAdd(ctx->ac.builder, input_vgprs[5],
+                                             thread_id_in_tg, ""); /* VertexID */
+               input_vgprs[8] = input_vgprs[6]; /* InstanceID */
+       }
+
        unsigned vertex_id_vgpr = first_vs_vgpr;
        unsigned instance_id_vgpr =
                ctx->screen->info.chip_class >= GFX10 ?
@@ -6230,9 +3514,9 @@ static void si_build_vs_prolog_function(struct si_shader_context *ctx,
         */
        if (key->vs_prolog.states.unpack_instance_id_from_vertex_id) {
                ctx->abi.instance_id = LLVMBuildLShr(ctx->ac.builder, ctx->abi.vertex_id,
-                                                    LLVMConstInt(ctx->i32, 16, 0), "");
+                                                    LLVMConstInt(ctx->ac.i32, 16, 0), "");
                ctx->abi.vertex_id = LLVMBuildAnd(ctx->ac.builder, ctx->abi.vertex_id,
-                                                 LLVMConstInt(ctx->i32, 0xffff, 0), "");
+                                                 LLVMConstInt(ctx->ac.i32, 0xffff, 0), "");
        }
 
        /* Copy inputs to outputs. This should be no-op, as the registers match,
@@ -6262,7 +3546,7 @@ static void si_build_vs_prolog_function(struct si_shader_context *ctx,
        if (key->vs_prolog.states.instance_divisor_is_fetched) {
                LLVMValueRef list = si_prolog_get_rw_buffers(ctx);
                LLVMValueRef buf_index =
-                       LLVMConstInt(ctx->i32, SI_VS_CONST_INSTANCE_DIVISORS, 0);
+                       LLVMConstInt(ctx->ac.i32, SI_VS_CONST_INSTANCE_DIVISORS, 0);
                instance_divisor_constbuf =
                        ac_build_load_to_sgpr(&ctx->ac, list, buf_index);
        }
@@ -6281,8 +3565,8 @@ static void si_build_vs_prolog_function(struct si_shader_context *ctx,
 
                        for (unsigned j = 0; j < 4; j++) {
                                udiv_factors[j] =
-                                       buffer_load_const(ctx, instance_divisor_constbuf,
-                                                         LLVMConstInt(ctx->i32, i*16 + j*4, 0));
+                                       si_buffer_load_const(ctx, instance_divisor_constbuf,
+                                                            LLVMConstInt(ctx->ac.i32, i*16 + j*4, 0));
                                udiv_factors[j] = ac_to_integer(&ctx->ac, udiv_factors[j]);
                        }
                        /* The faster NUW version doesn't work when InstanceID == UINT_MAX.
@@ -6306,131 +3590,49 @@ static void si_build_vs_prolog_function(struct si_shader_context *ctx,
                                                                SI_SGPR_BASE_VERTEX), "");
                }
 
-               index = ac_to_float(&ctx->ac, index);
-               ret = LLVMBuildInsertValue(ctx->ac.builder, ret, index,
-                                          ctx->args.arg_count + i, "");
-       }
-
-       si_llvm_build_ret(ctx, ret);
-}
-
-static bool si_get_vs_prolog(struct si_screen *sscreen,
-                            struct ac_llvm_compiler *compiler,
-                            struct si_shader *shader,
-                            struct pipe_debug_callback *debug,
-                            struct si_shader *main_part,
-                            const struct si_vs_prolog_bits *key)
-{
-       struct si_shader_selector *vs = main_part->selector;
-
-       if (!si_vs_needs_prolog(vs, key))
-               return true;
-
-       /* Get the prolog. */
-       union si_shader_part_key prolog_key;
-       si_get_vs_prolog_key(&vs->info, main_part->info.num_input_sgprs,
-                            key, shader, &prolog_key);
-
-       shader->prolog =
-               si_get_shader_part(sscreen, &sscreen->vs_prologs,
-                                  PIPE_SHADER_VERTEX, true, &prolog_key, compiler,
-                                  debug, si_build_vs_prolog_function,
-                                  "Vertex Shader Prolog");
-       return shader->prolog != NULL;
-}
-
-/**
- * Select and compile (or reuse) vertex shader parts (prolog & epilog).
- */
-static bool si_shader_select_vs_parts(struct si_screen *sscreen,
-                                     struct ac_llvm_compiler *compiler,
-                                     struct si_shader *shader,
-                                     struct pipe_debug_callback *debug)
-{
-       return si_get_vs_prolog(sscreen, compiler, shader, debug, shader,
-                               &shader->key.part.vs.prolog);
-}
-
-/**
- * Compile the TCS epilog function. This writes tesselation factors to memory
- * based on the output primitive type of the tesselator (determined by TES).
- */
-static void si_build_tcs_epilog_function(struct si_shader_context *ctx,
-                                        union si_shader_part_key *key)
-{
-       memset(&ctx->args, 0, sizeof(ctx->args));
-
-       if (ctx->screen->info.chip_class >= GFX9) {
-               ac_add_arg(&ctx->args, AC_ARG_SGPR, 1, AC_ARG_INT, NULL);
-               ac_add_arg(&ctx->args, AC_ARG_SGPR, 1, AC_ARG_INT, NULL);
-               ac_add_arg(&ctx->args, AC_ARG_SGPR, 1, AC_ARG_INT,
-                          &ctx->tcs_offchip_offset);
-               ac_add_arg(&ctx->args, AC_ARG_SGPR, 1, AC_ARG_INT, NULL); /* wave info */
-               ac_add_arg(&ctx->args, AC_ARG_SGPR, 1, AC_ARG_INT,
-                          &ctx->tcs_factor_offset);
-               ac_add_arg(&ctx->args, AC_ARG_SGPR, 1, AC_ARG_INT, NULL);
-               ac_add_arg(&ctx->args, AC_ARG_SGPR, 1, AC_ARG_INT, NULL);
-               ac_add_arg(&ctx->args, AC_ARG_SGPR, 1, AC_ARG_INT, NULL);
-               ac_add_arg(&ctx->args, AC_ARG_SGPR, 1, AC_ARG_INT, NULL);
-               ac_add_arg(&ctx->args, AC_ARG_SGPR, 1, AC_ARG_INT, NULL);
-               ac_add_arg(&ctx->args, AC_ARG_SGPR, 1, AC_ARG_INT, NULL);
-               ac_add_arg(&ctx->args, AC_ARG_SGPR, 1, AC_ARG_INT, NULL);
-               ac_add_arg(&ctx->args, AC_ARG_SGPR, 1, AC_ARG_INT, NULL);
-               ac_add_arg(&ctx->args, AC_ARG_SGPR, 1, AC_ARG_INT, NULL);
-               ac_add_arg(&ctx->args, AC_ARG_SGPR, 1, AC_ARG_INT, NULL);
-               ac_add_arg(&ctx->args, AC_ARG_SGPR, 1, AC_ARG_INT, NULL);
-               ac_add_arg(&ctx->args, AC_ARG_SGPR, 1, AC_ARG_INT,
-                          &ctx->tcs_offchip_layout);
-               ac_add_arg(&ctx->args, AC_ARG_SGPR, 1, AC_ARG_INT, NULL);
-               ac_add_arg(&ctx->args, AC_ARG_SGPR, 1, AC_ARG_INT,
-                          &ctx->tcs_out_lds_layout);
-       } else {
-               ac_add_arg(&ctx->args, AC_ARG_SGPR, 1, AC_ARG_INT, NULL);
-               ac_add_arg(&ctx->args, AC_ARG_SGPR, 1, AC_ARG_INT, NULL);
-               ac_add_arg(&ctx->args, AC_ARG_SGPR, 1, AC_ARG_INT, NULL);
-               ac_add_arg(&ctx->args, AC_ARG_SGPR, 1, AC_ARG_INT, NULL);
-               ac_add_arg(&ctx->args, AC_ARG_SGPR, 1, AC_ARG_INT,
-                          &ctx->tcs_offchip_layout);
-               ac_add_arg(&ctx->args, AC_ARG_SGPR, 1, AC_ARG_INT, NULL);
-               ac_add_arg(&ctx->args, AC_ARG_SGPR, 1, AC_ARG_INT,
-                          &ctx->tcs_out_lds_layout);
-               ac_add_arg(&ctx->args, AC_ARG_SGPR, 1, AC_ARG_INT, NULL);
-               ac_add_arg(&ctx->args, AC_ARG_SGPR, 1, AC_ARG_INT,
-                          &ctx->tcs_offchip_offset);
-               ac_add_arg(&ctx->args, AC_ARG_SGPR, 1, AC_ARG_INT,
-                          &ctx->tcs_factor_offset);
+               index = ac_to_float(&ctx->ac, index);
+               ret = LLVMBuildInsertValue(ctx->ac.builder, ret, index,
+                                          ctx->args.arg_count + i, "");
        }
 
-       ac_add_arg(&ctx->args, AC_ARG_VGPR, 1, AC_ARG_INT, NULL); /* VGPR gap */
-       ac_add_arg(&ctx->args, AC_ARG_VGPR, 1, AC_ARG_INT, NULL); /* VGPR gap */
-       struct ac_arg rel_patch_id; /* patch index within the wave (REL_PATCH_ID) */
-       ac_add_arg(&ctx->args, AC_ARG_VGPR, 1, AC_ARG_INT, &rel_patch_id);
-       struct ac_arg invocation_id; /* invocation ID within the patch */
-       ac_add_arg(&ctx->args, AC_ARG_VGPR, 1, AC_ARG_INT, &invocation_id);
-       struct ac_arg tcs_out_current_patch_data_offset; /* LDS offset where tess factors should be loaded from */
-       ac_add_arg(&ctx->args, AC_ARG_VGPR, 1, AC_ARG_INT,
-                  &tcs_out_current_patch_data_offset);
+       si_llvm_build_ret(ctx, ret);
+}
 
-       struct ac_arg tess_factors[6];
-       for (unsigned i = 0; i < 6; i++)
-               ac_add_arg(&ctx->args, AC_ARG_VGPR, 1, AC_ARG_INT, &tess_factors[i]);
+static bool si_get_vs_prolog(struct si_screen *sscreen,
+                            struct ac_llvm_compiler *compiler,
+                            struct si_shader *shader,
+                            struct pipe_debug_callback *debug,
+                            struct si_shader *main_part,
+                            const struct si_vs_prolog_bits *key)
+{
+       struct si_shader_selector *vs = main_part->selector;
 
-       /* Create the function. */
-       si_llvm_create_func(ctx, "tcs_epilog", NULL, 0,
-                           ctx->screen->info.chip_class >= GFX7 ? 128 : 0);
-       ac_declare_lds_as_pointer(&ctx->ac);
+       if (!si_vs_needs_prolog(vs, key, &shader->key, false))
+               return true;
 
-       LLVMValueRef invoc0_tess_factors[6];
-       for (unsigned i = 0; i < 6; i++)
-               invoc0_tess_factors[i] = ac_get_arg(&ctx->ac, tess_factors[i]);
+       /* Get the prolog. */
+       union si_shader_part_key prolog_key;
+       si_get_vs_prolog_key(&vs->info, main_part->info.num_input_sgprs, false,
+                            key, shader, &prolog_key);
 
-       si_write_tess_factors(ctx,
-                             ac_get_arg(&ctx->ac, rel_patch_id),
-                             ac_get_arg(&ctx->ac, invocation_id),
-                             ac_get_arg(&ctx->ac, tcs_out_current_patch_data_offset),
-                             invoc0_tess_factors, invoc0_tess_factors + 4);
+       shader->prolog =
+               si_get_shader_part(sscreen, &sscreen->vs_prologs,
+                                  PIPE_SHADER_VERTEX, true, &prolog_key, compiler,
+                                  debug, si_build_vs_prolog_function,
+                                  "Vertex Shader Prolog");
+       return shader->prolog != NULL;
+}
 
-       LLVMBuildRetVoid(ctx->ac.builder);
+/**
+ * Select and compile (or reuse) vertex shader parts (prolog & epilog).
+ */
+static bool si_shader_select_vs_parts(struct si_screen *sscreen,
+                                     struct ac_llvm_compiler *compiler,
+                                     struct si_shader *shader,
+                                     struct pipe_debug_callback *debug)
+{
+       return si_get_vs_prolog(sscreen, compiler, shader, debug, shader,
+                               &shader->key.part.vs.prolog);
 }
 
 /**
@@ -6460,7 +3662,7 @@ static bool si_shader_select_tcs_parts(struct si_screen *sscreen,
        shader->epilog = si_get_shader_part(sscreen, &sscreen->tcs_epilogs,
                                            PIPE_SHADER_TESS_CTRL, false,
                                            &epilog_key, compiler, debug,
-                                           si_build_tcs_epilog_function,
+                                           si_llvm_build_tcs_epilog,
                                            "Tessellation Control Shader Epilog");
        return shader->epilog != NULL;
 }
@@ -6501,402 +3703,175 @@ static bool si_shader_select_gs_parts(struct si_screen *sscreen,
        shader->prolog2 = si_get_shader_part(sscreen, &sscreen->gs_prologs,
                                            PIPE_SHADER_GEOMETRY, true,
                                            &prolog_key, compiler, debug,
-                                           si_build_gs_prolog_function,
+                                           si_llvm_build_gs_prolog,
                                            "Geometry Shader Prolog");
        return shader->prolog2 != NULL;
 }
 
 /**
- * Build the pixel shader prolog function. This handles:
- * - two-side color selection and interpolation
- * - overriding interpolation parameters for the API PS
- * - polygon stippling
- *
- * All preloaded SGPRs and VGPRs are passed through unmodified unless they are
- * overriden by other states. (e.g. per-sample interpolation)
- * Interpolated colors are stored after the preloaded VGPRs.
+ * Compute the PS prolog key, which contains all the information needed to
+ * build the PS prolog function, and set related bits in shader->config.
  */
-static void si_build_ps_prolog_function(struct si_shader_context *ctx,
-                                       union si_shader_part_key *key)
+void si_get_ps_prolog_key(struct si_shader *shader,
+                         union si_shader_part_key *key,
+                         bool separate_prolog)
 {
-       LLVMValueRef ret, func;
-       int num_returns, i, num_color_channels;
-
-       assert(si_need_ps_prolog(key));
-
-       memset(&ctx->args, 0, sizeof(ctx->args));
+       struct si_shader_info *info = &shader->selector->info;
 
-       /* Declare inputs. */
-       LLVMTypeRef return_types[AC_MAX_ARGS];
-       num_returns = 0;
-       num_color_channels = util_bitcount(key->ps_prolog.colors_read);
-       assert(key->ps_prolog.num_input_sgprs +
-              key->ps_prolog.num_input_vgprs +
-              num_color_channels <= AC_MAX_ARGS);
-       for (i = 0; i < key->ps_prolog.num_input_sgprs; i++) {
-               ac_add_arg(&ctx->args, AC_ARG_SGPR, 1, AC_ARG_INT, NULL);
-               return_types[num_returns++] = ctx->i32;
+       memset(key, 0, sizeof(*key));
+       key->ps_prolog.states = shader->key.part.ps.prolog;
+       key->ps_prolog.colors_read = info->colors_read;
+       key->ps_prolog.num_input_sgprs = shader->info.num_input_sgprs;
+       key->ps_prolog.num_input_vgprs = shader->info.num_input_vgprs;
+       key->ps_prolog.wqm = info->uses_derivatives &&
+               (key->ps_prolog.colors_read ||
+                key->ps_prolog.states.force_persp_sample_interp ||
+                key->ps_prolog.states.force_linear_sample_interp ||
+                key->ps_prolog.states.force_persp_center_interp ||
+                key->ps_prolog.states.force_linear_center_interp ||
+                key->ps_prolog.states.bc_optimize_for_persp ||
+                key->ps_prolog.states.bc_optimize_for_linear);
+       key->ps_prolog.ancillary_vgpr_index = shader->info.ancillary_vgpr_index;
 
-       }
+       if (info->colors_read) {
+               unsigned *color = shader->selector->color_attr_index;
 
-       struct ac_arg pos_fixed_pt;
-       struct ac_arg ancillary;
-       struct ac_arg param_sample_mask;
-       for (i = 0; i < key->ps_prolog.num_input_vgprs; i++) {
-               struct ac_arg *arg = NULL;
-               if (i == key->ps_prolog.ancillary_vgpr_index) {
-                       arg = &ancillary;
-               } else if (i == key->ps_prolog.ancillary_vgpr_index + 1) {
-                       arg = &param_sample_mask;
-               } else if (i == key->ps_prolog.num_input_vgprs - 1) {
-                       /* POS_FIXED_PT is always last. */
-                       arg = &pos_fixed_pt;
+               if (shader->key.part.ps.prolog.color_two_side) {
+                       /* BCOLORs are stored after the last input. */
+                       key->ps_prolog.num_interp_inputs = info->num_inputs;
+                       key->ps_prolog.face_vgpr_index = shader->info.face_vgpr_index;
+                       if (separate_prolog)
+                               shader->config.spi_ps_input_ena |= S_0286CC_FRONT_FACE_ENA(1);
                }
-               ac_add_arg(&ctx->args, AC_ARG_VGPR, 1, AC_ARG_FLOAT, arg);
-               return_types[num_returns++] = ctx->f32;
-       }
 
-       /* Declare outputs (same as inputs + add colors if needed) */
-       for (i = 0; i < num_color_channels; i++)
-               return_types[num_returns++] = ctx->f32;
+               for (unsigned i = 0; i < 2; i++) {
+                       unsigned interp = info->input_interpolate[color[i]];
+                       unsigned location = info->input_interpolate_loc[color[i]];
 
-       /* Create the function. */
-       si_llvm_create_func(ctx, "ps_prolog", return_types, num_returns, 0);
-       func = ctx->main_fn;
+                       if (!(info->colors_read & (0xf << i*4)))
+                               continue;
 
-       /* Copy inputs to outputs. This should be no-op, as the registers match,
-        * but it will prevent the compiler from overwriting them unintentionally.
-        */
-       ret = ctx->return_value;
-       for (i = 0; i < ctx->args.arg_count; i++) {
-               LLVMValueRef p = LLVMGetParam(func, i);
-               ret = LLVMBuildInsertValue(ctx->ac.builder, ret, p, i, "");
-       }
+                       key->ps_prolog.color_attr_index[i] = color[i];
 
-       /* Polygon stippling. */
-       if (key->ps_prolog.states.poly_stipple) {
-               LLVMValueRef list = si_prolog_get_rw_buffers(ctx);
+                       if (shader->key.part.ps.prolog.flatshade_colors &&
+                           interp == TGSI_INTERPOLATE_COLOR)
+                               interp = TGSI_INTERPOLATE_CONSTANT;
 
-               si_llvm_emit_polygon_stipple(ctx, list, pos_fixed_pt);
-       }
+                       switch (interp) {
+                       case TGSI_INTERPOLATE_CONSTANT:
+                               key->ps_prolog.color_interp_vgpr_index[i] = -1;
+                               break;
+                       case TGSI_INTERPOLATE_PERSPECTIVE:
+                       case TGSI_INTERPOLATE_COLOR:
+                               /* Force the interpolation location for colors here. */
+                               if (shader->key.part.ps.prolog.force_persp_sample_interp)
+                                       location = TGSI_INTERPOLATE_LOC_SAMPLE;
+                               if (shader->key.part.ps.prolog.force_persp_center_interp)
+                                       location = TGSI_INTERPOLATE_LOC_CENTER;
 
-       if (key->ps_prolog.states.bc_optimize_for_persp ||
-           key->ps_prolog.states.bc_optimize_for_linear) {
-               unsigned i, base = key->ps_prolog.num_input_sgprs;
-               LLVMValueRef center[2], centroid[2], tmp, bc_optimize;
+                               switch (location) {
+                               case TGSI_INTERPOLATE_LOC_SAMPLE:
+                                       key->ps_prolog.color_interp_vgpr_index[i] = 0;
+                                       if (separate_prolog) {
+                                               shader->config.spi_ps_input_ena |=
+                                                       S_0286CC_PERSP_SAMPLE_ENA(1);
+                                       }
+                                       break;
+                               case TGSI_INTERPOLATE_LOC_CENTER:
+                                       key->ps_prolog.color_interp_vgpr_index[i] = 2;
+                                       if (separate_prolog) {
+                                               shader->config.spi_ps_input_ena |=
+                                                       S_0286CC_PERSP_CENTER_ENA(1);
+                                       }
+                                       break;
+                               case TGSI_INTERPOLATE_LOC_CENTROID:
+                                       key->ps_prolog.color_interp_vgpr_index[i] = 4;
+                                       if (separate_prolog) {
+                                               shader->config.spi_ps_input_ena |=
+                                                       S_0286CC_PERSP_CENTROID_ENA(1);
+                                       }
+                                       break;
+                               default:
+                                       assert(0);
+                               }
+                               break;
+                       case TGSI_INTERPOLATE_LINEAR:
+                               /* Force the interpolation location for colors here. */
+                               if (shader->key.part.ps.prolog.force_linear_sample_interp)
+                                       location = TGSI_INTERPOLATE_LOC_SAMPLE;
+                               if (shader->key.part.ps.prolog.force_linear_center_interp)
+                                       location = TGSI_INTERPOLATE_LOC_CENTER;
 
-               /* The shader should do: if (PRIM_MASK[31]) CENTROID = CENTER;
-                * The hw doesn't compute CENTROID if the whole wave only
-                * contains fully-covered quads.
-                *
-                * PRIM_MASK is after user SGPRs.
-                */
-               bc_optimize = LLVMGetParam(func, SI_PS_NUM_USER_SGPR);
-               bc_optimize = LLVMBuildLShr(ctx->ac.builder, bc_optimize,
-                                           LLVMConstInt(ctx->i32, 31, 0), "");
-               bc_optimize = LLVMBuildTrunc(ctx->ac.builder, bc_optimize,
-                                            ctx->i1, "");
-
-               if (key->ps_prolog.states.bc_optimize_for_persp) {
-                       /* Read PERSP_CENTER. */
-                       for (i = 0; i < 2; i++)
-                               center[i] = LLVMGetParam(func, base + 2 + i);
-                       /* Read PERSP_CENTROID. */
-                       for (i = 0; i < 2; i++)
-                               centroid[i] = LLVMGetParam(func, base + 4 + i);
-                       /* Select PERSP_CENTROID. */
-                       for (i = 0; i < 2; i++) {
-                               tmp = LLVMBuildSelect(ctx->ac.builder, bc_optimize,
-                                                     center[i], centroid[i], "");
-                               ret = LLVMBuildInsertValue(ctx->ac.builder, ret,
-                                                          tmp, base + 4 + i, "");
-                       }
-               }
-               if (key->ps_prolog.states.bc_optimize_for_linear) {
-                       /* Read LINEAR_CENTER. */
-                       for (i = 0; i < 2; i++)
-                               center[i] = LLVMGetParam(func, base + 8 + i);
-                       /* Read LINEAR_CENTROID. */
-                       for (i = 0; i < 2; i++)
-                               centroid[i] = LLVMGetParam(func, base + 10 + i);
-                       /* Select LINEAR_CENTROID. */
-                       for (i = 0; i < 2; i++) {
-                               tmp = LLVMBuildSelect(ctx->ac.builder, bc_optimize,
-                                                     center[i], centroid[i], "");
-                               ret = LLVMBuildInsertValue(ctx->ac.builder, ret,
-                                                          tmp, base + 10 + i, "");
+                               /* The VGPR assignment for non-monolithic shaders
+                                * works because InitialPSInputAddr is set on the
+                                * main shader and PERSP_PULL_MODEL is never used.
+                                */
+                               switch (location) {
+                               case TGSI_INTERPOLATE_LOC_SAMPLE:
+                                       key->ps_prolog.color_interp_vgpr_index[i] =
+                                               separate_prolog ? 6 : 9;
+                                       if (separate_prolog) {
+                                               shader->config.spi_ps_input_ena |=
+                                                       S_0286CC_LINEAR_SAMPLE_ENA(1);
+                                       }
+                                       break;
+                               case TGSI_INTERPOLATE_LOC_CENTER:
+                                       key->ps_prolog.color_interp_vgpr_index[i] =
+                                               separate_prolog ? 8 : 11;
+                                       if (separate_prolog) {
+                                               shader->config.spi_ps_input_ena |=
+                                                       S_0286CC_LINEAR_CENTER_ENA(1);
+                                       }
+                                       break;
+                               case TGSI_INTERPOLATE_LOC_CENTROID:
+                                       key->ps_prolog.color_interp_vgpr_index[i] =
+                                               separate_prolog ? 10 : 13;
+                                       if (separate_prolog) {
+                                               shader->config.spi_ps_input_ena |=
+                                                       S_0286CC_LINEAR_CENTROID_ENA(1);
+                                       }
+                                       break;
+                               default:
+                                       assert(0);
+                               }
+                               break;
+                       default:
+                               assert(0);
                        }
                }
        }
-
-       /* Force per-sample interpolation. */
-       if (key->ps_prolog.states.force_persp_sample_interp) {
-               unsigned i, base = key->ps_prolog.num_input_sgprs;
-               LLVMValueRef persp_sample[2];
-
-               /* Read PERSP_SAMPLE. */
-               for (i = 0; i < 2; i++)
-                       persp_sample[i] = LLVMGetParam(func, base + i);
-               /* Overwrite PERSP_CENTER. */
-               for (i = 0; i < 2; i++)
-                       ret = LLVMBuildInsertValue(ctx->ac.builder, ret,
-                                                  persp_sample[i], base + 2 + i, "");
-               /* Overwrite PERSP_CENTROID. */
-               for (i = 0; i < 2; i++)
-                       ret = LLVMBuildInsertValue(ctx->ac.builder, ret,
-                                                  persp_sample[i], base + 4 + i, "");
-       }
-       if (key->ps_prolog.states.force_linear_sample_interp) {
-               unsigned i, base = key->ps_prolog.num_input_sgprs;
-               LLVMValueRef linear_sample[2];
-
-               /* Read LINEAR_SAMPLE. */
-               for (i = 0; i < 2; i++)
-                       linear_sample[i] = LLVMGetParam(func, base + 6 + i);
-               /* Overwrite LINEAR_CENTER. */
-               for (i = 0; i < 2; i++)
-                       ret = LLVMBuildInsertValue(ctx->ac.builder, ret,
-                                                  linear_sample[i], base + 8 + i, "");
-               /* Overwrite LINEAR_CENTROID. */
-               for (i = 0; i < 2; i++)
-                       ret = LLVMBuildInsertValue(ctx->ac.builder, ret,
-                                                  linear_sample[i], base + 10 + i, "");
-       }
-
-       /* Force center interpolation. */
-       if (key->ps_prolog.states.force_persp_center_interp) {
-               unsigned i, base = key->ps_prolog.num_input_sgprs;
-               LLVMValueRef persp_center[2];
-
-               /* Read PERSP_CENTER. */
-               for (i = 0; i < 2; i++)
-                       persp_center[i] = LLVMGetParam(func, base + 2 + i);
-               /* Overwrite PERSP_SAMPLE. */
-               for (i = 0; i < 2; i++)
-                       ret = LLVMBuildInsertValue(ctx->ac.builder, ret,
-                                                  persp_center[i], base + i, "");
-               /* Overwrite PERSP_CENTROID. */
-               for (i = 0; i < 2; i++)
-                       ret = LLVMBuildInsertValue(ctx->ac.builder, ret,
-                                                  persp_center[i], base + 4 + i, "");
-       }
-       if (key->ps_prolog.states.force_linear_center_interp) {
-               unsigned i, base = key->ps_prolog.num_input_sgprs;
-               LLVMValueRef linear_center[2];
-
-               /* Read LINEAR_CENTER. */
-               for (i = 0; i < 2; i++)
-                       linear_center[i] = LLVMGetParam(func, base + 8 + i);
-               /* Overwrite LINEAR_SAMPLE. */
-               for (i = 0; i < 2; i++)
-                       ret = LLVMBuildInsertValue(ctx->ac.builder, ret,
-                                                  linear_center[i], base + 6 + i, "");
-               /* Overwrite LINEAR_CENTROID. */
-               for (i = 0; i < 2; i++)
-                       ret = LLVMBuildInsertValue(ctx->ac.builder, ret,
-                                                  linear_center[i], base + 10 + i, "");
-       }
-
-       /* Interpolate colors. */
-       unsigned color_out_idx = 0;
-       for (i = 0; i < 2; i++) {
-               unsigned writemask = (key->ps_prolog.colors_read >> (i * 4)) & 0xf;
-               unsigned face_vgpr = key->ps_prolog.num_input_sgprs +
-                                    key->ps_prolog.face_vgpr_index;
-               LLVMValueRef interp[2], color[4];
-               LLVMValueRef interp_ij = NULL, prim_mask = NULL, face = NULL;
-
-               if (!writemask)
-                       continue;
-
-               /* If the interpolation qualifier is not CONSTANT (-1). */
-               if (key->ps_prolog.color_interp_vgpr_index[i] != -1) {
-                       unsigned interp_vgpr = key->ps_prolog.num_input_sgprs +
-                                              key->ps_prolog.color_interp_vgpr_index[i];
-
-                       /* Get the (i,j) updated by bc_optimize handling. */
-                       interp[0] = LLVMBuildExtractValue(ctx->ac.builder, ret,
-                                                         interp_vgpr, "");
-                       interp[1] = LLVMBuildExtractValue(ctx->ac.builder, ret,
-                                                         interp_vgpr + 1, "");
-                       interp_ij = ac_build_gather_values(&ctx->ac, interp, 2);
-               }
-
-               /* Use the absolute location of the input. */
-               prim_mask = LLVMGetParam(func, SI_PS_NUM_USER_SGPR);
-
-               if (key->ps_prolog.states.color_two_side) {
-                       face = LLVMGetParam(func, face_vgpr);
-                       face = ac_to_integer(&ctx->ac, face);
-               }
-
-               interp_fs_color(ctx,
-                               key->ps_prolog.color_attr_index[i], i,
-                               key->ps_prolog.num_interp_inputs,
-                               key->ps_prolog.colors_read, interp_ij,
-                               prim_mask, face, color);
-
-               while (writemask) {
-                       unsigned chan = u_bit_scan(&writemask);
-                       ret = LLVMBuildInsertValue(ctx->ac.builder, ret, color[chan],
-                                                  ctx->args.arg_count + color_out_idx++, "");
-               }
-       }
-
-       /* Section 15.2.2 (Shader Inputs) of the OpenGL 4.5 (Core Profile) spec
-        * says:
-        *
-        *    "When per-sample shading is active due to the use of a fragment
-        *     input qualified by sample or due to the use of the gl_SampleID
-        *     or gl_SamplePosition variables, only the bit for the current
-        *     sample is set in gl_SampleMaskIn. When state specifies multiple
-        *     fragment shader invocations for a given fragment, the sample
-        *     mask for any single fragment shader invocation may specify a
-        *     subset of the covered samples for the fragment. In this case,
-        *     the bit corresponding to each covered sample will be set in
-        *     exactly one fragment shader invocation."
-        *
-        * The samplemask loaded by hardware is always the coverage of the
-        * entire pixel/fragment, so mask bits out based on the sample ID.
-        */
-       if (key->ps_prolog.states.samplemask_log_ps_iter) {
-               /* The bit pattern matches that used by fixed function fragment
-                * processing. */
-               static const uint16_t ps_iter_masks[] = {
-                       0xffff, /* not used */
-                       0x5555,
-                       0x1111,
-                       0x0101,
-                       0x0001,
-               };
-               assert(key->ps_prolog.states.samplemask_log_ps_iter < ARRAY_SIZE(ps_iter_masks));
-
-               uint32_t ps_iter_mask = ps_iter_masks[key->ps_prolog.states.samplemask_log_ps_iter];
-               LLVMValueRef sampleid = si_unpack_param(ctx, ancillary, 8, 4);
-               LLVMValueRef samplemask = ac_get_arg(&ctx->ac, param_sample_mask);
-
-               samplemask = ac_to_integer(&ctx->ac, samplemask);
-               samplemask = LLVMBuildAnd(
-                       ctx->ac.builder,
-                       samplemask,
-                       LLVMBuildShl(ctx->ac.builder,
-                                    LLVMConstInt(ctx->i32, ps_iter_mask, false),
-                                    sampleid, ""),
-                       "");
-               samplemask = ac_to_float(&ctx->ac, samplemask);
-
-               ret = LLVMBuildInsertValue(ctx->ac.builder, ret, samplemask,
-                                          param_sample_mask.arg_index, "");
-       }
-
-       /* Tell LLVM to insert WQM instruction sequence when needed. */
-       if (key->ps_prolog.wqm) {
-               LLVMAddTargetDependentFunctionAttr(func,
-                                                  "amdgpu-ps-wqm-outputs", "");
-       }
-
-       si_llvm_build_ret(ctx, ret);
 }
 
 /**
- * Build the pixel shader epilog function. This handles everything that must be
- * emulated for pixel shader exports. (alpha-test, format conversions, etc)
+ * Check whether a PS prolog is required based on the key.
  */
-static void si_build_ps_epilog_function(struct si_shader_context *ctx,
-                                       union si_shader_part_key *key)
+bool si_need_ps_prolog(const union si_shader_part_key *key)
 {
-       LLVMValueRef depth = NULL, stencil = NULL, samplemask = NULL;
-       int i;
-       struct si_ps_exports exp = {};
-
-       memset(&ctx->args, 0, sizeof(ctx->args));
-
-       /* Declare input SGPRs. */
-       ac_add_arg(&ctx->args, AC_ARG_SGPR, 1, AC_ARG_INT, &ctx->rw_buffers);
-       ac_add_arg(&ctx->args, AC_ARG_SGPR, 1, AC_ARG_INT,
-                  &ctx->bindless_samplers_and_images);
-       ac_add_arg(&ctx->args, AC_ARG_SGPR, 1, AC_ARG_INT,
-                  &ctx->const_and_shader_buffers);
-       ac_add_arg(&ctx->args, AC_ARG_SGPR, 1, AC_ARG_INT,
-                  &ctx->samplers_and_images);
-       add_arg_checked(&ctx->args, AC_ARG_SGPR, 1, AC_ARG_FLOAT,
-                       NULL, SI_PARAM_ALPHA_REF);
-
-       /* Declare input VGPRs. */
-       unsigned required_num_params =
-                    ctx->args.num_sgprs_used +
-                    util_bitcount(key->ps_epilog.colors_written) * 4 +
-                    key->ps_epilog.writes_z +
-                    key->ps_epilog.writes_stencil +
-                    key->ps_epilog.writes_samplemask;
-
-       required_num_params = MAX2(required_num_params,
-                                  ctx->args.num_sgprs_used + PS_EPILOG_SAMPLEMASK_MIN_LOC + 1);
-
-       while (ctx->args.arg_count < required_num_params)
-               ac_add_arg(&ctx->args, AC_ARG_VGPR, 1, AC_ARG_FLOAT, NULL);
-
-       /* Create the function. */
-       si_llvm_create_func(ctx, "ps_epilog", NULL, 0, 0);
-       /* Disable elimination of unused inputs. */
-       ac_llvm_add_target_dep_function_attr(ctx->main_fn,
-                                            "InitialPSInputAddr", 0xffffff);
-
-       /* Process colors. */
-       unsigned vgpr = ctx->args.num_sgprs_used;
-       unsigned colors_written = key->ps_epilog.colors_written;
-       int last_color_export = -1;
-
-       /* Find the last color export. */
-       if (!key->ps_epilog.writes_z &&
-           !key->ps_epilog.writes_stencil &&
-           !key->ps_epilog.writes_samplemask) {
-               unsigned spi_format = key->ps_epilog.states.spi_shader_col_format;
-
-               /* If last_cbuf > 0, FS_COLOR0_WRITES_ALL_CBUFS is true. */
-               if (colors_written == 0x1 && key->ps_epilog.states.last_cbuf > 0) {
-                       /* Just set this if any of the colorbuffers are enabled. */
-                       if (spi_format &
-                           ((1ull << (4 * (key->ps_epilog.states.last_cbuf + 1))) - 1))
-                               last_color_export = 0;
-               } else {
-                       for (i = 0; i < 8; i++)
-                               if (colors_written & (1 << i) &&
-                                   (spi_format >> (i * 4)) & 0xf)
-                                       last_color_export = i;
-               }
-       }
-
-       while (colors_written) {
-               LLVMValueRef color[4];
-               int mrt = u_bit_scan(&colors_written);
-
-               for (i = 0; i < 4; i++)
-                       color[i] = LLVMGetParam(ctx->main_fn, vgpr++);
-
-               si_export_mrt_color(ctx, color, mrt,
-                                   ctx->args.arg_count - 1,
-                                   mrt == last_color_export, &exp);
-       }
-
-       /* Process depth, stencil, samplemask. */
-       if (key->ps_epilog.writes_z)
-               depth = LLVMGetParam(ctx->main_fn, vgpr++);
-       if (key->ps_epilog.writes_stencil)
-               stencil = LLVMGetParam(ctx->main_fn, vgpr++);
-       if (key->ps_epilog.writes_samplemask)
-               samplemask = LLVMGetParam(ctx->main_fn, vgpr++);
-
-       if (depth || stencil || samplemask)
-               si_export_mrt_z(ctx, depth, stencil, samplemask, &exp);
-       else if (last_color_export == -1)
-               ac_build_export_null(&ctx->ac);
-
-       if (exp.num)
-               si_emit_ps_exports(ctx, &exp);
+       return key->ps_prolog.colors_read ||
+              key->ps_prolog.states.force_persp_sample_interp ||
+              key->ps_prolog.states.force_linear_sample_interp ||
+              key->ps_prolog.states.force_persp_center_interp ||
+              key->ps_prolog.states.force_linear_center_interp ||
+              key->ps_prolog.states.bc_optimize_for_persp ||
+              key->ps_prolog.states.bc_optimize_for_linear ||
+              key->ps_prolog.states.poly_stipple ||
+              key->ps_prolog.states.samplemask_log_ps_iter;
+}
 
-       /* Compile. */
-       LLVMBuildRetVoid(ctx->ac.builder);
+/**
+ * Compute the PS epilog key, which contains all the information needed to
+ * build the PS epilog function.
+ */
+void si_get_ps_epilog_key(struct si_shader *shader,
+                         union si_shader_part_key *key)
+{
+       struct si_shader_info *info = &shader->selector->info;
+       memset(key, 0, sizeof(*key));
+       key->ps_epilog.colors_written = info->colors_written;
+       key->ps_epilog.writes_z = info->writes_z;
+       key->ps_epilog.writes_stencil = info->writes_stencil;
+       key->ps_epilog.writes_samplemask = info->writes_samplemask;
+       key->ps_epilog.states = shader->key.part.ps.epilog;
 }
 
 /**
@@ -6919,7 +3894,7 @@ static bool si_shader_select_ps_parts(struct si_screen *sscreen,
                        si_get_shader_part(sscreen, &sscreen->ps_prologs,
                                           PIPE_SHADER_FRAGMENT, true,
                                           &prolog_key, compiler, debug,
-                                          si_build_ps_prolog_function,
+                                          si_llvm_build_ps_prolog,
                                           "Fragment Shader Prolog");
                if (!shader->prolog)
                        return false;
@@ -6932,7 +3907,7 @@ static bool si_shader_select_ps_parts(struct si_screen *sscreen,
                si_get_shader_part(sscreen, &sscreen->ps_epilogs,
                                   PIPE_SHADER_FRAGMENT, false,
                                   &epilog_key, compiler, debug,
-                                  si_build_ps_epilog_function,
+                                  si_llvm_build_ps_epilog,
                                   "Fragment Shader Epilog");
        if (!shader->epilog)
                return false;
@@ -7019,8 +3994,7 @@ void si_multiwave_lds_size_workaround(struct si_screen *sscreen,
                *lds_size = MAX2(*lds_size, 8);
 }
 
-static void si_fix_resource_usage(struct si_screen *sscreen,
-                                 struct si_shader *shader)
+void si_fix_resource_usage(struct si_screen *sscreen, struct si_shader *shader)
 {
        unsigned min_sgprs = shader->info.num_input_sgprs + 2; /* VCC */
 
@@ -7182,6 +4156,15 @@ bool si_create_shader_variant(struct si_screen *sscreen,
        return true;
 }
 
+void si_shader_binary_clean(struct si_shader_binary *binary)
+{
+       free((void *)binary->elf_buffer);
+       binary->elf_buffer = NULL;
+
+       free(binary->llvm_ir_string);
+       binary->llvm_ir_string = NULL;
+}
+
 void si_shader_destroy(struct si_shader *shader)
 {
        if (shader->scratch_bo)