radv: Combine vs and tes output keys parts.

That way the same deref is valid for both shader stages.

Reviewed-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>

diff --git a/src/amd/vulkan/radv_nir_to_llvm.c b/src/amd/vulkan/radv_nir_to_llvm.c
index 2bc61b18655f852b25fa9f1f2af33ab456eb45e4..7c0275be7cf35f9e9352471b1510e79375595e13 100644 (file)
--- a/src/amd/vulkan/radv_nir_to_llvm.c
+++ b/src/amd/vulkan/radv_nir_to_llvm.c
@@ -594,11 +594,11 @@ static bool needs_view_index_sgpr(struct radv_shader_context *ctx,
        switch (stage) {
        case MESA_SHADER_VERTEX:
                if (ctx->shader_info->info.needs_multiview_view_index ||
-                   (!ctx->options->key.vs.as_es && !ctx->options->key.vs.as_ls && ctx->options->key.has_multiview_view_index))
+                   (!ctx->options->key.vs.out.as_es && !ctx->options->key.vs.out.as_ls && ctx->options->key.has_multiview_view_index))
                        return true;
                break;
        case MESA_SHADER_TESS_EVAL:
-               if (ctx->shader_info->info.needs_multiview_view_index || (!ctx->options->key.tes.as_es && ctx->options->key.has_multiview_view_index))
+               if (ctx->shader_info->info.needs_multiview_view_index || (!ctx->options->key.tes.out.as_es && ctx->options->key.has_multiview_view_index))
                        return true;
                break;
        case MESA_SHADER_GEOMETRY:
@@ -820,7 +820,7 @@ declare_vs_input_vgprs(struct radv_shader_context *ctx, struct arg_info *args)
 {
        add_arg(args, ARG_VGPR, ctx->ac.i32, &ctx->abi.vertex_id);
        if (!ctx->is_gs_copy_shader) {
-               if (ctx->options->key.vs.as_ls) {
+               if (ctx->options->key.vs.out.as_ls) {
                        add_arg(args, ARG_VGPR, ctx->ac.i32, &ctx->rel_auto_id);
                        add_arg(args, ARG_VGPR, ctx->ac.i32, &ctx->abi.instance_id);
                } else {
@@ -1020,10 +1020,10 @@ static void create_function(struct radv_shader_context *ctx,
                if (needs_view_index)
                        add_arg(&args, ARG_SGPR, ctx->ac.i32,
                                &ctx->abi.view_index);
-               if (ctx->options->key.vs.as_es) {
+               if (ctx->options->key.vs.out.as_es) {
                        add_arg(&args, ARG_SGPR, ctx->ac.i32,
                                &ctx->es2gs_offset);
-               } else if (ctx->options->key.vs.as_ls) {
+               } else if (ctx->options->key.vs.out.as_ls) {
                        /* no extra parameters */
                } else {
                        declare_streamout_sgprs(ctx, stage, &args);
@@ -1086,7 +1086,7 @@ static void create_function(struct radv_shader_context *ctx,
                        add_arg(&args, ARG_SGPR, ctx->ac.i32,
                                &ctx->abi.view_index);
 
-               if (ctx->options->key.tes.as_es) {
+               if (ctx->options->key.tes.out.as_es) {
                        add_arg(&args, ARG_SGPR, ctx->ac.i32, &ctx->oc_lds);
                        add_arg(&args, ARG_SGPR, ctx->ac.i32, NULL);
                        add_arg(&args, ARG_SGPR, ctx->ac.i32,
@@ -1273,7 +1273,7 @@ static void create_function(struct radv_shader_context *ctx,
        }
 
        if (stage == MESA_SHADER_TESS_CTRL ||
-           (stage == MESA_SHADER_VERTEX && ctx->options->key.vs.as_ls) ||
+           (stage == MESA_SHADER_VERTEX && ctx->options->key.vs.out.as_ls) ||
            /* GFX9 has the ESGS ring buffer in LDS. */
            (stage == MESA_SHADER_GEOMETRY && has_previous_stage)) {
                ac_declare_lds_as_pointer(&ctx->ac);
@@ -3448,14 +3448,14 @@ handle_shader_outputs_post(struct ac_shader_abi *abi, unsigned max_outputs,
 
        switch (ctx->stage) {
        case MESA_SHADER_VERTEX:
-               if (ctx->options->key.vs.as_ls)
+               if (ctx->options->key.vs.out.as_ls)
                        handle_ls_outputs_post(ctx);
-               else if (ctx->options->key.vs.as_es)
+               else if (ctx->options->key.vs.out.as_es)
                        handle_es_outputs_post(ctx, &ctx->shader_info->vs.es_info);
                else
-                       handle_vs_outputs_post(ctx, ctx->options->key.vs.export_prim_id,
-                                              ctx->options->key.vs.export_layer_id,
-                                              ctx->options->key.vs.export_clip_dists,
+                       handle_vs_outputs_post(ctx, ctx->options->key.vs.out.export_prim_id,
+                                              ctx->options->key.vs.out.export_layer_id,
+                                              ctx->options->key.vs.out.export_clip_dists,
                                               &ctx->shader_info->vs.outinfo);
                break;
        case MESA_SHADER_FRAGMENT:
@@ -3468,12 +3468,12 @@ handle_shader_outputs_post(struct ac_shader_abi *abi, unsigned max_outputs,
                handle_tcs_outputs_post(ctx);
                break;
        case MESA_SHADER_TESS_EVAL:
-               if (ctx->options->key.tes.as_es)
+               if (ctx->options->key.tes.out.as_es)
                        handle_es_outputs_post(ctx, &ctx->shader_info->tes.es_info);
                else
-                       handle_vs_outputs_post(ctx, ctx->options->key.tes.export_prim_id,
-                                              ctx->options->key.tes.export_layer_id,
-                                              ctx->options->key.tes.export_clip_dists,
+                       handle_vs_outputs_post(ctx, ctx->options->key.tes.out.export_prim_id,
+                                              ctx->options->key.tes.out.export_layer_id,
+                                              ctx->options->key.tes.out.export_clip_dists,
                                               &ctx->shader_info->tes.outinfo);
                break;
        default:
@@ -3503,13 +3503,13 @@ ac_nir_eliminate_const_vs_outputs(struct radv_shader_context *ctx)
        case MESA_SHADER_GEOMETRY:
                return;
        case MESA_SHADER_VERTEX:
-               if (ctx->options->key.vs.as_ls ||
-                   ctx->options->key.vs.as_es)
+               if (ctx->options->key.vs.out.as_ls ||
+                   ctx->options->key.vs.out.as_es)
                        return;
                outinfo = &ctx->shader_info->vs.outinfo;
                break;
        case MESA_SHADER_TESS_EVAL:
-               if (ctx->options->key.vs.as_es)
+               if (ctx->options->key.vs.out.as_es)
                        return;
                outinfo = &ctx->shader_info->tes.outinfo;
                break;
@@ -3529,7 +3529,7 @@ ac_setup_rings(struct radv_shader_context *ctx)
 {
        if (ctx->options->chip_class <= GFX8 &&
            (ctx->stage == MESA_SHADER_GEOMETRY ||
-            ctx->options->key.vs.as_es || ctx->options->key.tes.as_es)) {
+            ctx->options->key.vs.out.as_es || ctx->options->key.tes.out.as_es)) {
                unsigned ring = ctx->stage == MESA_SHADER_GEOMETRY ? RING_ESGS_GS
                                                                   : RING_ESGS_VS;
                LLVMValueRef offset = LLVMConstInt(ctx->ac.i32, ring, false);
@@ -3945,16 +3945,16 @@ ac_fill_shader_info(struct radv_shader_variant_info *shader_info, struct nir_sha
                 shader_info->tes.spacing = nir->info.tess.spacing;
                 shader_info->tes.ccw = nir->info.tess.ccw;
                 shader_info->tes.point_mode = nir->info.tess.point_mode;
-                shader_info->tes.as_es = options->key.tes.as_es;
-                shader_info->tes.export_prim_id = options->key.tes.export_prim_id;
+                shader_info->tes.as_es = options->key.tes.out.as_es;
+                shader_info->tes.export_prim_id = options->key.tes.out.export_prim_id;
                 break;
         case MESA_SHADER_TESS_CTRL:
                 shader_info->tcs.tcs_vertices_out = nir->info.tess.tcs_vertices_out;
                 break;
         case MESA_SHADER_VERTEX:
-                shader_info->vs.as_es = options->key.vs.as_es;
-                shader_info->vs.as_ls = options->key.vs.as_ls;
-                shader_info->vs.export_prim_id = options->key.vs.export_prim_id;
+                shader_info->vs.as_es = options->key.vs.out.as_es;
+                shader_info->vs.as_ls = options->key.vs.out.as_ls;
+                shader_info->vs.export_prim_id = options->key.vs.out.export_prim_id;
                 break;
         default:
                 break;

diff --git a/src/amd/vulkan/radv_pipeline.c b/src/amd/vulkan/radv_pipeline.c
index 7c5c5842f35f63591ff77ab5c7cd0cbc5766a28d..ae08d57677fbfce5b7d5998cf49a3e9d8dfaa041 100644 (file)
--- a/src/amd/vulkan/radv_pipeline.c
+++ b/src/amd/vulkan/radv_pipeline.c
@@ -2016,7 +2016,7 @@ radv_fill_shader_keys(struct radv_shader_variant_key *keys,
        }
 
        if (nir[MESA_SHADER_TESS_CTRL]) {
-               keys[MESA_SHADER_VERTEX].vs.as_ls = true;
+               keys[MESA_SHADER_VERTEX].vs.out.as_ls = true;
                keys[MESA_SHADER_TESS_CTRL].tcs.num_inputs = 0;
                keys[MESA_SHADER_TESS_CTRL].tcs.input_vertices = key->tess_input_vertices;
                keys[MESA_SHADER_TESS_CTRL].tcs.primitive_mode = nir[MESA_SHADER_TESS_EVAL]->info.tess.primitive_mode;
@@ -2026,9 +2026,9 @@ radv_fill_shader_keys(struct radv_shader_variant_key *keys,
 
        if (nir[MESA_SHADER_GEOMETRY]) {
                if (nir[MESA_SHADER_TESS_CTRL])
-                       keys[MESA_SHADER_TESS_EVAL].tes.as_es = true;
+                       keys[MESA_SHADER_TESS_EVAL].tes.out.as_es = true;
                else
-                       keys[MESA_SHADER_VERTEX].vs.as_es = true;
+                       keys[MESA_SHADER_VERTEX].vs.out.as_es = true;
        }
 
        for(int i = 0; i < MESA_SHADER_STAGES; ++i)
@@ -2132,7 +2132,7 @@ void radv_create_shaders(struct radv_pipeline *pipeline,
        struct radv_shader_module *modules[MESA_SHADER_STAGES] = { 0, };
        nir_shader *nir[MESA_SHADER_STAGES] = {0};
        struct radv_shader_binary *binaries[MESA_SHADER_STAGES] = {NULL};
-       struct radv_shader_variant_key keys[MESA_SHADER_STAGES] = {{{{0}}}};
+       struct radv_shader_variant_key keys[MESA_SHADER_STAGES] = {{{{{0}}}}};
        unsigned char hash[20], gs_copy_hash[20];
 
        radv_start_feedback(pipeline_feedback);
@@ -2236,17 +2236,17 @@ void radv_create_shaders(struct radv_pipeline *pipeline,
                }
 
                /* TODO: These are no longer used as keys we should refactor this */
-               keys[MESA_SHADER_VERTEX].vs.export_prim_id =
+               keys[MESA_SHADER_VERTEX].vs.out.export_prim_id =
                        pipeline->shaders[MESA_SHADER_FRAGMENT]->info.info.ps.prim_id_input;
-               keys[MESA_SHADER_VERTEX].vs.export_layer_id =
+               keys[MESA_SHADER_VERTEX].vs.out.export_layer_id =
                        pipeline->shaders[MESA_SHADER_FRAGMENT]->info.info.ps.layer_input;
-               keys[MESA_SHADER_VERTEX].vs.export_clip_dists =
+               keys[MESA_SHADER_VERTEX].vs.out.export_clip_dists =
                        !!pipeline->shaders[MESA_SHADER_FRAGMENT]->info.info.ps.num_input_clips_culls;
-               keys[MESA_SHADER_TESS_EVAL].tes.export_prim_id =
+               keys[MESA_SHADER_TESS_EVAL].tes.out.export_prim_id =
                        pipeline->shaders[MESA_SHADER_FRAGMENT]->info.info.ps.prim_id_input;
-               keys[MESA_SHADER_TESS_EVAL].tes.export_layer_id =
+               keys[MESA_SHADER_TESS_EVAL].tes.out.export_layer_id =
                        pipeline->shaders[MESA_SHADER_FRAGMENT]->info.info.ps.layer_input;
-               keys[MESA_SHADER_TESS_EVAL].tes.export_clip_dists =
+               keys[MESA_SHADER_TESS_EVAL].tes.out.export_clip_dists =
                        !!pipeline->shaders[MESA_SHADER_FRAGMENT]->info.info.ps.num_input_clips_culls;
        }
 

diff --git a/src/amd/vulkan/radv_shader.h b/src/amd/vulkan/radv_shader.h
index c785a79ad17002d604bc46b29a0db196c4bdbb53..1ee7fea5890ad4d627c46a712375f31dfccb7afc 100644 (file)
--- a/src/amd/vulkan/radv_shader.h
+++ b/src/amd/vulkan/radv_shader.h
@@ -62,7 +62,17 @@ enum {
        RADV_ALPHA_ADJUST_SSCALED = 3,
 };
 
+struct radv_vs_out_key {
+       uint32_t as_es:1;
+       uint32_t as_ls:1;
+       uint32_t export_prim_id:1;
+       uint32_t export_layer_id:1;
+       uint32_t export_clip_dists:1;
+};
+
 struct radv_vs_variant_key {
+       struct radv_vs_out_key out;
+
        uint32_t instance_rate_inputs;
        uint32_t instance_rate_divisors[MAX_VERTEX_ATTRIBS];
        uint8_t vertex_attribute_formats[MAX_VERTEX_ATTRIBS];
@@ -76,19 +86,11 @@ struct radv_vs_variant_key {
 
        /* For some formats the channels have to be shuffled. */
        uint32_t post_shuffle;
-
-       uint32_t as_es:1;
-       uint32_t as_ls:1;
-       uint32_t export_prim_id:1;
-       uint32_t export_layer_id:1;
-       uint32_t export_clip_dists:1;
 };
 
 struct radv_tes_variant_key {
-       uint32_t as_es:1;
-       uint32_t export_prim_id:1;
-       uint32_t export_layer_id:1;
-       uint32_t export_clip_dists:1;
+       struct radv_vs_out_key out;
+
        uint8_t num_patches;
        uint8_t tcs_num_outputs;
 };

diff --git a/src/amd/vulkan/radv_shader_info.c b/src/amd/vulkan/radv_shader_info.c
index dcf8d395374616d49b030c6309f1055a0583bcd2..5d9f79a8b3b6b5e68c52648bf8855dc83ffaef69 100644 (file)
--- a/src/amd/vulkan/radv_shader_info.c
+++ b/src/amd/vulkan/radv_shader_info.c
@@ -500,7 +500,7 @@ gather_info_output_decl(const nir_shader *nir, const nir_variable *var,
                gather_info_output_decl_ps(nir, var, info);
                break;
        case MESA_SHADER_VERTEX:
-               if (options->key.vs.as_ls)
+               if (options->key.vs.out.as_ls)
                        gather_info_output_decl_ls(nir, var, info);
                break;
        case MESA_SHADER_GEOMETRY: