Mesa (master): radeonsi: remove always constant ballot_mask_bits from si_llvm_context_init

[GitLab Mirror]

Module: Mesa
Branch: master
Commit: 9b60b3ce93886e1d6b38d4f53b71ada4596c5e4f
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=9b60b3ce93886e1d6b38d4f53b71ada4596c5e4f

Author: Marek Olšák <marek.olsak at amd.com>
Date:   Fri Jan 10 20:25:28 2020 -0500

radeonsi: remove always constant ballot_mask_bits from si_llvm_context_init

Reviewed-by: Timothy Arceri <tarceri at itsqueeze.com>

---

 src/gallium/drivers/radeonsi/si_shader.c          | 8 +++-----
 src/gallium/drivers/radeonsi/si_shader_internal.h | 3 +--
 src/gallium/drivers/radeonsi/si_shader_llvm.c     | 5 ++---
 3 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/src/gallium/drivers/radeonsi/si_shader.c b/src/gallium/drivers/radeonsi/si_shader.c
index 2e4cf0884ca..e68bd038845 100644
--- a/src/gallium/drivers/radeonsi/si_shader.c
+++ b/src/gallium/drivers/radeonsi/si_shader.c
@@ -4523,8 +4523,7 @@ si_generate_gs_copy_shader(struct si_screen *sscreen,
 	shader->is_gs_copy_shader = true;
 
 	si_llvm_context_init(&ctx, sscreen, compiler,
-			     si_get_wave_size(sscreen, PIPE_SHADER_VERTEX, false, false),
-			     64);
+			     si_get_wave_size(sscreen, PIPE_SHADER_VERTEX, false, false));
 	ctx.shader = shader;
 	ctx.type = PIPE_SHADER_VERTEX;
 
@@ -5742,7 +5741,7 @@ int si_compile_shader(struct si_screen *sscreen,
 		si_dump_streamout(&sel->so);
 	}
 
-	si_llvm_context_init(&ctx, sscreen, compiler, si_get_shader_wave_size(shader), 64);
+	si_llvm_context_init(&ctx, sscreen, compiler, si_get_shader_wave_size(shader));
 	si_llvm_context_set_ir(&ctx, shader);
 
 	memset(shader->info.vs_output_param_offset, AC_EXP_PARAM_UNDEFINED,
@@ -6091,8 +6090,7 @@ si_get_shader_part(struct si_screen *sscreen,
 	struct si_shader_context ctx;
 	si_llvm_context_init(&ctx, sscreen, compiler,
 			     si_get_wave_size(sscreen, type, shader.key.as_ngg,
-					      shader.key.as_es),
-			     64);
+					      shader.key.as_es));
 	ctx.shader = &shader;
 	ctx.type = type;
 
diff --git a/src/gallium/drivers/radeonsi/si_shader_internal.h b/src/gallium/drivers/radeonsi/si_shader_internal.h
index 6f27e81a6b3..7b64ca30630 100644
--- a/src/gallium/drivers/radeonsi/si_shader_internal.h
+++ b/src/gallium/drivers/radeonsi/si_shader_internal.h
@@ -211,8 +211,7 @@ LLVMValueRef si_llvm_bound_index(struct si_shader_context *ctx,
 void si_llvm_context_init(struct si_shader_context *ctx,
 			  struct si_screen *sscreen,
 			  struct ac_llvm_compiler *compiler,
-			  unsigned wave_size,
-			  unsigned ballot_mask_bits);
+			  unsigned wave_size);
 void si_llvm_context_set_ir(struct si_shader_context *ctx,
 			    struct si_shader *shader);
 
diff --git a/src/gallium/drivers/radeonsi/si_shader_llvm.c b/src/gallium/drivers/radeonsi/si_shader_llvm.c
index f831c7e8c1b..11f5a14d121 100644
--- a/src/gallium/drivers/radeonsi/si_shader_llvm.c
+++ b/src/gallium/drivers/radeonsi/si_shader_llvm.c
@@ -114,8 +114,7 @@ void si_shader_binary_clean(struct si_shader_binary *binary)
 void si_llvm_context_init(struct si_shader_context *ctx,
 			  struct si_screen *sscreen,
 			  struct ac_llvm_compiler *compiler,
-			  unsigned wave_size,
-			  unsigned ballot_mask_bits)
+			  unsigned wave_size)
 {
 	/* Initialize the gallivm object:
 	 * We are only using the module, context, and builder fields of this struct.
@@ -129,7 +128,7 @@ void si_llvm_context_init(struct si_shader_context *ctx,
 	ac_llvm_context_init(&ctx->ac, compiler, sscreen->info.chip_class,
 			     sscreen->info.family,
 			     AC_FLOAT_MODE_NO_SIGNED_ZEROS_FP_MATH,
-			     wave_size, ballot_mask_bits);
+			     wave_size, 64);
 
 	ctx->voidt = LLVMVoidTypeInContext(ctx->ac.context);
 	ctx->i1 = LLVMInt1TypeInContext(ctx->ac.context);