From c7150ad8e6a82bdf091bdbe2fdcca584a18b1ee7 Mon Sep 17 00:00:00 2001 From: Iago Toral Quiroga Date: Fri, 4 Nov 2022 09:51:33 +0100 Subject: [PATCH] broadcom/compiler: drop unused v3d_compile parameter for nir pass MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Reviewed-by: Alejandro Piñeiro Part-of: --- src/broadcom/compiler/v3d_compiler.h | 2 +- .../v3d_nir_lower_load_store_bitsize.c | 18 +++++++----------- src/broadcom/compiler/vir.c | 2 +- 3 files changed, 9 insertions(+), 13 deletions(-) diff --git a/src/broadcom/compiler/v3d_compiler.h b/src/broadcom/compiler/v3d_compiler.h index 3879f6116df..3ec9ec4e5c6 100644 --- a/src/broadcom/compiler/v3d_compiler.h +++ b/src/broadcom/compiler/v3d_compiler.h @@ -1176,7 +1176,7 @@ bool v3d_nir_lower_robust_image_access(nir_shader *s, struct v3d_compile *c); bool v3d_nir_lower_scratch(nir_shader *s); bool v3d_nir_lower_txf_ms(nir_shader *s, struct v3d_compile *c); bool v3d_nir_lower_image_load_store(nir_shader *s); -bool v3d_nir_lower_load_store_bitsize(nir_shader *s, struct v3d_compile *c); +bool v3d_nir_lower_load_store_bitsize(nir_shader *s); void v3d33_vir_vpm_read_setup(struct v3d_compile *c, int num_components); void v3d33_vir_vpm_write_setup(struct v3d_compile *c); diff --git a/src/broadcom/compiler/v3d_nir_lower_load_store_bitsize.c b/src/broadcom/compiler/v3d_nir_lower_load_store_bitsize.c index 3a629551bf8..6cf0f3784bc 100644 --- a/src/broadcom/compiler/v3d_nir_lower_load_store_bitsize.c +++ b/src/broadcom/compiler/v3d_nir_lower_load_store_bitsize.c @@ -113,8 +113,7 @@ init_scalar_intrinsic(nir_builder *b, } static bool -lower_load_bitsize(struct v3d_compile *c, - nir_builder *b, +lower_load_bitsize(nir_builder *b, nir_intrinsic_instr *intr) { uint32_t bit_size = nir_dest_bit_size(intr->dest); @@ -169,9 +168,8 @@ lower_load_bitsize(struct v3d_compile *c, } static bool -lower_store_bitsize(struct v3d_compile *c, - nir_builder *b, - nir_intrinsic_instr *intr) +lower_store_bitsize(nir_builder *b, + nir_intrinsic_instr *intr) { /* No need to split if it is already scalar */ int value_idx = value_src(intr->intrinsic); @@ -233,8 +231,6 @@ lower_store_bitsize(struct v3d_compile *c, static bool lower_load_store_bitsize(nir_builder *b, nir_instr *instr, void *data) { - struct v3d_compile *c = (struct v3d_compile *) data; - if (instr->type != nir_instr_type_intrinsic) return false; nir_intrinsic_instr *intr = nir_instr_as_intrinsic(instr); @@ -245,12 +241,12 @@ lower_load_store_bitsize(nir_builder *b, nir_instr *instr, void *data) case nir_intrinsic_load_uniform: case nir_intrinsic_load_scratch: case nir_intrinsic_load_global_2x32: - return lower_load_bitsize(c, b, intr); + return lower_load_bitsize(b, intr); case nir_intrinsic_store_ssbo: case nir_intrinsic_store_scratch: case nir_intrinsic_store_global_2x32: - return lower_store_bitsize(c, b, intr); + return lower_store_bitsize(b, intr); default: return false; @@ -258,11 +254,11 @@ lower_load_store_bitsize(nir_builder *b, nir_instr *instr, void *data) } bool -v3d_nir_lower_load_store_bitsize(nir_shader *s, struct v3d_compile *c) +v3d_nir_lower_load_store_bitsize(nir_shader *s) { return nir_shader_instructions_pass(s, lower_load_store_bitsize, nir_metadata_block_index | nir_metadata_dominance, - c); + NULL); } diff --git a/src/broadcom/compiler/vir.c b/src/broadcom/compiler/vir.c index 0f4b31a5fe1..8f199dd341f 100644 --- a/src/broadcom/compiler/vir.c +++ b/src/broadcom/compiler/vir.c @@ -1611,7 +1611,7 @@ v3d_attempt_compile(struct v3d_compile *c) NIR_PASS(_, c->s, nir_lower_wrmasks, should_split_wrmask, c->s); - NIR_PASS(_, c->s, v3d_nir_lower_load_store_bitsize, c); + NIR_PASS(_, c->s, v3d_nir_lower_load_store_bitsize); NIR_PASS(_, c->s, v3d_nir_lower_subgroup_intrinsics, c);