OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

radeonsi: remove always constant ballot_mask_bits from si_llvm_context_init

Browse Source 
Reviewed-by: Timothy Arceri <tarceri@itsqueeze.com>
This commit is contained in:
Marek Olšák
2020-01-10 20:25:28 -05:00
parent 37916a66b1
commit 9b60b3ce93
3 changed files with 6 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/gallium/drivers/radeonsi/si_shader.c
View File

@@ -4523,8 +4523,7 @@ si_generate_gs_copy_shader(struct si_screen *sscreen,
shader->is_gs_copy_shader = true; shader->is_gs_copy_shader = true;
si_llvm_context_init(&ctx, sscreen, compiler, si_llvm_context_init(&ctx, sscreen, compiler,
si_get_wave_size(sscreen, PIPE_SHADER_VERTEX, false, false), si_get_wave_size(sscreen, PIPE_SHADER_VERTEX, false, false));
64);
ctx.shader = shader; ctx.shader = shader;
ctx.type = PIPE_SHADER_VERTEX; ctx.type = PIPE_SHADER_VERTEX;
@@ -5742,7 +5741,7 @@ int si_compile_shader(struct si_screen *sscreen,
si_dump_streamout(&sel->so); 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); si_llvm_context_set_ir(&ctx, shader);
memset(shader->info.vs_output_param_offset, AC_EXP_PARAM_UNDEFINED, 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; struct si_shader_context ctx;
si_llvm_context_init(&ctx, sscreen, compiler, si_llvm_context_init(&ctx, sscreen, compiler,
si_get_wave_size(sscreen, type, shader.key.as_ngg, si_get_wave_size(sscreen, type, shader.key.as_ngg,
shader.key.as_es), shader.key.as_es));
64);
ctx.shader = &shader; ctx.shader = &shader;
ctx.type = type; ctx.type = type;

3
src/gallium/drivers/radeonsi/si_shader_internal.h
View File

@@ -211,8 +211,7 @@ LLVMValueRef si_llvm_bound_index(struct si_shader_context *ctx,
void si_llvm_context_init(struct si_shader_context *ctx, void si_llvm_context_init(struct si_shader_context *ctx,
struct si_screen *sscreen, struct si_screen *sscreen,
struct ac_llvm_compiler *compiler, struct ac_llvm_compiler *compiler,
unsigned wave_size, unsigned wave_size);
unsigned ballot_mask_bits);
void si_llvm_context_set_ir(struct si_shader_context *ctx, void si_llvm_context_set_ir(struct si_shader_context *ctx,
struct si_shader *shader); struct si_shader *shader);

5
src/gallium/drivers/radeonsi/si_shader_llvm.c
View File

@@ -114,8 +114,7 @@ void si_shader_binary_clean(struct si_shader_binary *binary)
void si_llvm_context_init(struct si_shader_context *ctx, void si_llvm_context_init(struct si_shader_context *ctx,
struct si_screen *sscreen, struct si_screen *sscreen,
struct ac_llvm_compiler *compiler, struct ac_llvm_compiler *compiler,
unsigned wave_size, unsigned wave_size)
unsigned ballot_mask_bits)
{ {
/* Initialize the gallivm object: /* Initialize the gallivm object:
* We are only using the module, context, and builder fields of this struct. * 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, ac_llvm_context_init(&ctx->ac, compiler, sscreen->info.chip_class,
sscreen->info.family, sscreen->info.family,
AC_FLOAT_MODE_NO_SIGNED_ZEROS_FP_MATH, AC_FLOAT_MODE_NO_SIGNED_ZEROS_FP_MATH,
wave_size, ballot_mask_bits); wave_size, 64);
ctx->voidt = LLVMVoidTypeInContext(ctx->ac.context); ctx->voidt = LLVMVoidTypeInContext(ctx->ac.context);
ctx->i1 = LLVMInt1TypeInContext(ctx->ac.context); ctx->i1 = LLVMInt1TypeInContext(ctx->ac.context);