[03/14] radv: drop ls_out_layout const.

Submitted by Dave Airlie on March 14, 2018, 4:41 a.m.

Details

Message ID 20180314044120.907-4-airlied@gmail.com
State New
Headers show
Series "Series without cover letter" ( rev: 1 ) in Mesa

Not browsing as part of any series.

Commit Message

Dave Airlie March 14, 2018, 4:41 a.m.
From: Dave Airlie <airlied@redhat.com>

We can precalculate input_vertex_size at compile time.

Signed-off-by: Dave Airlie <airlied@redhat.com>
---
 src/amd/vulkan/radv_nir_to_llvm.c | 30 ++++--------------------------
 src/amd/vulkan/radv_pipeline.c    | 10 ----------
 src/amd/vulkan/radv_shader.h      |  1 -
 3 files changed, 4 insertions(+), 37 deletions(-)

Patch hide | download patch | download mbox

diff --git a/src/amd/vulkan/radv_nir_to_llvm.c b/src/amd/vulkan/radv_nir_to_llvm.c
index 89ad1341a86..64b50cab0a1 100644
--- a/src/amd/vulkan/radv_nir_to_llvm.c
+++ b/src/amd/vulkan/radv_nir_to_llvm.c
@@ -60,7 +60,6 @@  struct radv_shader_context {
 	LLVMValueRef vertex_buffers;
 	LLVMValueRef rel_auto_id;
 	LLVMValueRef vs_prim_id;
-	LLVMValueRef ls_out_layout;
 	LLVMValueRef es2gs_offset;
 
 	LLVMValueRef tcs_offchip_layout;
@@ -162,14 +161,8 @@  static LLVMValueRef get_rel_patch_id(struct radv_shader_context *ctx)
 static LLVMValueRef
 get_tcs_in_patch_stride(struct radv_shader_context *ctx)
 {
-	if (ctx->stage == MESA_SHADER_VERTEX)
-		return ac_unpack_param(&ctx->ac, ctx->ls_out_layout, 0, 13);
-	else if (ctx->stage == MESA_SHADER_TESS_CTRL)
-		return ac_unpack_param(&ctx->ac, ctx->tcs_in_layout, 0, 13);
-	else {
-		assert(0);
-		return NULL;
-	}
+	assert (ctx->stage == MESA_SHADER_TESS_CTRL);
+	return ac_unpack_param(&ctx->ac, ctx->tcs_in_layout, 0, 13);
 }
 
 static LLVMValueRef
@@ -463,14 +456,11 @@  static void allocate_user_sgprs(struct radv_shader_context *ctx,
 	case MESA_SHADER_VERTEX:
 		if (!ctx->is_gs_copy_shader)
 			user_sgpr_info->sgpr_count += count_vs_user_sgprs(ctx);
-		if (ctx->options->key.vs.as_ls)
-			user_sgpr_info->sgpr_count++;
 		break;
 	case MESA_SHADER_TESS_CTRL:
 		if (has_previous_stage) {
 			if (previous_stage == MESA_SHADER_VERTEX)
 				user_sgpr_info->sgpr_count += count_vs_user_sgprs(ctx);
-			user_sgpr_info->sgpr_count++;
 		}
 		user_sgpr_info->sgpr_count += 4;
 		break;
@@ -743,9 +733,6 @@  static void create_function(struct radv_shader_context *ctx,
 		if (ctx->options->key.vs.as_es)
 			add_arg(&args, ARG_SGPR, ctx->ac.i32,
 				&ctx->es2gs_offset);
-		else if (ctx->options->key.vs.as_ls)
-			add_arg(&args, ARG_SGPR, ctx->ac.i32,
-				&ctx->ls_out_layout);
 
 		declare_vs_input_vgprs(ctx, &args);
 		break;
@@ -771,9 +758,6 @@  static void create_function(struct radv_shader_context *ctx,
 							has_previous_stage,
 							previous_stage, &args);
 
-			add_arg(&args, ARG_SGPR, ctx->ac.i32,
-				&ctx->ls_out_layout);
-
 			add_arg(&args, ARG_SGPR, ctx->ac.i32,
 				&ctx->tcs_offchip_layout);
 			add_arg(&args, ARG_SGPR, ctx->ac.i32,
@@ -1011,17 +995,10 @@  static void create_function(struct radv_shader_context *ctx,
 					   previous_stage, &user_sgpr_idx);
 		if (ctx->abi.view_index)
 			set_loc_shader(ctx, AC_UD_VIEW_INDEX, &user_sgpr_idx, 1);
-		if (ctx->options->key.vs.as_ls) {
-			set_loc_shader(ctx, AC_UD_VS_LS_TCS_IN_LAYOUT,
-				       &user_sgpr_idx, 1);
-		}
 		break;
 	case MESA_SHADER_TESS_CTRL:
 		set_vs_specific_input_locs(ctx, stage, has_previous_stage,
 					   previous_stage, &user_sgpr_idx);
-		if (has_previous_stage)
-			set_loc_shader(ctx, AC_UD_VS_LS_TCS_IN_LAYOUT,
-				       &user_sgpr_idx, 1);
 		set_loc_shader(ctx, AC_UD_TCS_OFFCHIP_LAYOUT, &user_sgpr_idx, 4);
 		if (ctx->abi.view_index)
 			set_loc_shader(ctx, AC_UD_VIEW_INDEX, &user_sgpr_idx, 1);
@@ -2411,7 +2388,8 @@  static void
 handle_ls_outputs_post(struct radv_shader_context *ctx)
 {
 	LLVMValueRef vertex_id = ctx->rel_auto_id;
-	LLVMValueRef vertex_dw_stride = ac_unpack_param(&ctx->ac, ctx->ls_out_layout, 13, 8);
+	uint32_t num_tcs_inputs = util_last_bit64(ctx->shader_info->info.vs.ls_outputs_written);
+	LLVMValueRef vertex_dw_stride = LLVMConstInt(ctx->ac.i32, num_tcs_inputs * 4, false);
 	LLVMValueRef base_dw_addr = LLVMBuildMul(ctx->ac.builder, vertex_id,
 						 vertex_dw_stride, "");
 
diff --git a/src/amd/vulkan/radv_pipeline.c b/src/amd/vulkan/radv_pipeline.c
index e02e06505e4..6d175169343 100644
--- a/src/amd/vulkan/radv_pipeline.c
+++ b/src/amd/vulkan/radv_pipeline.c
@@ -2632,16 +2632,6 @@  radv_pipeline_generate_tess_shaders(struct radeon_winsys_cs *cs,
 		radeon_set_sh_reg(cs, base_reg + loc->sgpr_idx * 4,
 				  tess->offchip_layout);
 	}
-
-	loc = radv_lookup_user_sgpr(pipeline, MESA_SHADER_VERTEX, AC_UD_VS_LS_TCS_IN_LAYOUT);
-	if (loc->sgpr_idx != -1) {
-		uint32_t base_reg = pipeline->user_data_0[MESA_SHADER_VERTEX];
-		assert(loc->num_sgprs == 1);
-		assert(!loc->indirect);
-
-		radeon_set_sh_reg(cs, base_reg + loc->sgpr_idx * 4,
-				  tess->tcs_in_layout);
-	}
 }
 
 static void
diff --git a/src/amd/vulkan/radv_shader.h b/src/amd/vulkan/radv_shader.h
index 23ca3b8858e..5419e2937b3 100644
--- a/src/amd/vulkan/radv_shader.h
+++ b/src/amd/vulkan/radv_shader.h
@@ -110,7 +110,6 @@  enum radv_ud_index {
 	AC_UD_SHADER_START = 4,
 	AC_UD_VS_VERTEX_BUFFERS = AC_UD_SHADER_START,
 	AC_UD_VS_BASE_VERTEX_START_INSTANCE,
-	AC_UD_VS_LS_TCS_IN_LAYOUT,
 	AC_UD_VS_MAX_UD,
 	AC_UD_PS_SAMPLE_POS_OFFSET = AC_UD_SHADER_START,
 	AC_UD_PS_MAX_UD,