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

nir: Drop the high_offset argument to the load_store_vectorizer filter.

Browse Source 
Nothing uses it, and it's not clear to me what it provides over
alignment/num_components/bit_size.

Reviewed-by: Rob Clark <robdclark@chromium.org>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/6612>
This commit is contained in:
Eric Anholt
2020-09-08 11:12:56 -07:00
committed by Marge Bot
parent 5f757bb95c
commit 618556a8cb
5 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/amd/compiler/aco_instruction_selection_setup.cpp
View File

@@ -385,7 +385,7 @@ type_size(const struct glsl_type *type, bool bindless)
bool bool
mem_vectorize_callback(unsigned align_mul, unsigned align_offset, mem_vectorize_callback(unsigned align_mul, unsigned align_offset,
unsigned bit_size, unsigned bit_size,
unsigned num_components, unsigned high_offset, unsigned num_components,
nir_intrinsic_instr *low, nir_intrinsic_instr *high) nir_intrinsic_instr *low, nir_intrinsic_instr *high)
{ {
if (num_components > 4) if (num_components > 4)

2
src/compiler/nir/nir.h
View File

@@ -4854,7 +4854,7 @@ bool nir_opt_conditional_discard(nir_shader *shader);
typedef bool (*nir_should_vectorize_mem_func)(unsigned align_mul, typedef bool (*nir_should_vectorize_mem_func)(unsigned align_mul,
unsigned align_offset, unsigned align_offset,
unsigned bit_size, unsigned bit_size,
unsigned num_components, unsigned high_offset, unsigned num_components,
nir_intrinsic_instr *low, nir_intrinsic_instr *high); nir_intrinsic_instr *low, nir_intrinsic_instr *high);
bool nir_opt_load_store_vectorize(nir_shader *shader, nir_variable_mode modes, bool nir_opt_load_store_vectorize(nir_shader *shader, nir_variable_mode modes,

2
src/compiler/nir/nir_opt_load_store_vectorize.c
View File

@@ -670,7 +670,7 @@ new_bitsize_acceptable(struct vectorize_ctx *ctx, unsigned new_bit_size,
if (!ctx->callback(low->align_mul, if (!ctx->callback(low->align_mul,
low->align_offset, low->align_offset,
new_bit_size, new_num_components, new_bit_size, new_num_components,
high_offset, low->intrin, high->intrin)) low->intrin, high->intrin))
return false; return false;
if (low->is_store) { if (low->is_store) {

4
src/compiler/nir/tests/load_store_vectorizer_tests.cpp
View File

@@ -72,7 +72,7 @@ protected:
static bool mem_vectorize_callback(unsigned align_mul, unsigned align_offset, static bool mem_vectorize_callback(unsigned align_mul, unsigned align_offset,
unsigned bit_size, unsigned bit_size,
unsigned num_components, unsigned high_offset, unsigned num_components,
nir_intrinsic_instr *low, nir_intrinsic_instr *high); nir_intrinsic_instr *low, nir_intrinsic_instr *high);
static void shared_type_info(const struct glsl_type *type, unsigned *size, unsigned *align); static void shared_type_info(const struct glsl_type *type, unsigned *size, unsigned *align);
@@ -365,7 +365,7 @@ bool nir_load_store_vectorize_test::test_alu_def(
bool nir_load_store_vectorize_test::mem_vectorize_callback( bool nir_load_store_vectorize_test::mem_vectorize_callback(
unsigned align_mul, unsigned align_offset, unsigned bit_size, unsigned align_mul, unsigned align_offset, unsigned bit_size,
unsigned num_components, unsigned high_offset, unsigned num_components,
nir_intrinsic_instr *low, nir_intrinsic_instr *high) nir_intrinsic_instr *low, nir_intrinsic_instr *high)
{ {
return bit_size / 8; return bit_size / 8;

2
src/intel/compiler/brw_nir.c
View File

@@ -857,7 +857,7 @@ brw_nir_link_shaders(const struct brw_compiler *compiler,
static bool static bool
brw_nir_should_vectorize_mem(unsigned align_mul, unsigned align_offset, brw_nir_should_vectorize_mem(unsigned align_mul, unsigned align_offset,
unsigned bit_size, unsigned bit_size,
unsigned num_components, unsigned high_offset, unsigned num_components,
nir_intrinsic_instr *low, nir_intrinsic_instr *low,
nir_intrinsic_instr *high) nir_intrinsic_instr *high)
{ {