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

nir/lower_bit_size: Pass a nir_instr to the callback

Browse Source 
This way we can start supporting more than just ALU ops.

Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/7482>
This commit is contained in:
Jason Ekstrand
2020-11-05 22:53:52 -06:00
committed by Marge Bot
parent 15c6e05a72
commit 2c4b47184d
4 changed files with 14 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/amd/vulkan/radv_pipeline.c
View File

@@ -2948,11 +2948,15 @@ mem_vectorize_callback(unsigned align_mul, unsigned align_offset,
} }
static unsigned static unsigned
lower_bit_size_callback(const nir_alu_instr *alu, void *_) lower_bit_size_callback(const nir_instr *instr, void *_)
{ {
struct radv_device *device = _; struct radv_device *device = _;
enum chip_class chip = device->physical_device->rad_info.chip_class; enum chip_class chip = device->physical_device->rad_info.chip_class;
if (instr->type != nir_instr_type_alu)
return 0;
nir_alu_instr *alu = nir_instr_as_alu(instr);
if (alu->dest.dest.ssa.bit_size & (8 | 16)) { if (alu->dest.dest.ssa.bit_size & (8 | 16)) {
unsigned bit_size = alu->dest.dest.ssa.bit_size; unsigned bit_size = alu->dest.dest.ssa.bit_size;
switch (alu->op) { switch (alu->op) {

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

@@ -4948,7 +4948,7 @@ typedef enum {
bool nir_lower_gs_intrinsics(nir_shader *shader, nir_lower_gs_intrinsics_flags options); bool nir_lower_gs_intrinsics(nir_shader *shader, nir_lower_gs_intrinsics_flags options);
typedef unsigned (*nir_lower_bit_size_callback)(const nir_alu_instr *, void *); typedef unsigned (*nir_lower_bit_size_callback)(const nir_instr *, void *);
bool nir_lower_bit_size(nir_shader *shader, bool nir_lower_bit_size(nir_shader *shader,
nir_lower_bit_size_callback callback, nir_lower_bit_size_callback callback,

9
src/compiler/nir/nir_lower_bit_size.c
View File

@@ -46,7 +46,7 @@ static nir_ssa_def *convert_to_bit_size(nir_builder *bld, nir_ssa_def *src,
} }
static void static void
lower_instr(nir_builder *bld, nir_alu_instr *alu, unsigned bit_size) lower_alu_instr(nir_builder *bld, nir_alu_instr *alu, unsigned bit_size)
{ {
const nir_op op = alu->op; const nir_op op = alu->op;
unsigned dst_bit_size = alu->dest.dest.ssa.bit_size; unsigned dst_bit_size = alu->dest.dest.ssa.bit_size;
@@ -109,14 +109,11 @@ lower_impl(nir_function_impl *impl,
if (instr->type != nir_instr_type_alu) if (instr->type != nir_instr_type_alu)
continue; continue;
nir_alu_instr *alu = nir_instr_as_alu(instr); unsigned lower_bit_size = callback(instr, callback_data);
assert(alu->dest.dest.is_ssa);
unsigned lower_bit_size = callback(alu, callback_data);
if (lower_bit_size == 0) if (lower_bit_size == 0)
continue; continue;
lower_instr(&b, alu, lower_bit_size); lower_alu_instr(&b, nir_instr_as_alu(instr), lower_bit_size);
progress = true; progress = true;
} }
} }

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

@@ -633,8 +633,12 @@ brw_nir_optimize(nir_shader *nir, const struct brw_compiler *compiler,
} }
static unsigned static unsigned
lower_bit_size_callback(const nir_alu_instr *alu, UNUSED void *data) lower_bit_size_callback(const nir_instr *instr, UNUSED void *data)
{ {
if (instr->type != nir_instr_type_alu)
return 0;
nir_alu_instr *alu = nir_instr_as_alu(instr);
assert(alu->dest.dest.is_ssa); assert(alu->dest.dest.is_ssa);
if (alu->dest.dest.ssa.bit_size >= 32) if (alu->dest.dest.ssa.bit_size >= 32)
return 0; return 0;