KonstantinSeurer
/
mesa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

pan/mdg: remove ins->alu 

This commit removes the `ins->alu` field from midgard_instruction,
simplifying the code by just recreating midgard_vector_alu later when we
have to emit it.

Signed-off-by: Italo Nicola <italonicola@collabora.com>
Reviewed-by: Alyssa Rosenzweig <alyssa.rosenzweig@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/5933>
This commit is contained in:
Italo Nicola 2020-07-23 14:02:55 +00:00 committed by Marge Bot
parent 5299239c2e
commit 0f0f9ee710
4 changed files with 17 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/panfrost/midgard/compiler.h
View File

@ -129,9 +129,6 @@ typedef struct midgard_instruction {
/* If the op supports it */
enum midgard_roundmode roundmode;
/* Special fields for an ALU instruction */
midgard_reg_info registers;
/* For textures: should helpers execute this instruction (instead of
* just helping with derivatives)? Should helpers terminate after? */
bool helper_terminate;
@ -186,7 +183,6 @@ typedef struct midgard_instruction {
union {
midgard_load_store_word load_store;
midgard_vector_alu alu;
midgard_texture_word texture;
midgard_branch_extended branch_extended;
uint16_t br_compact;

23
src/panfrost/midgard/midgard_emit.c
View File

@ -164,7 +164,7 @@ mir_pack_swizzle_64(unsigned *swizzle, unsigned max_component)
}
static void
mir_pack_mask_alu(midgard_instruction *ins)
mir_pack_mask_alu(midgard_instruction *ins, midgard_vector_alu *alu)
{
unsigned effective = ins->mask;
@ -177,19 +177,19 @@ mir_pack_mask_alu(midgard_instruction *ins)
if (upper_shift >= 0) {
effective >>= upper_shift;
ins->alu.dest_override = upper_shift ?
alu->dest_override = upper_shift ?
midgard_dest_override_upper :
midgard_dest_override_lower;
} else {
ins->alu.dest_override = midgard_dest_override_none;
alu->dest_override = midgard_dest_override_none;
}
if (inst_size == 32)
ins->alu.mask = expand_writemask(effective, 2);
alu->mask = expand_writemask(effective, 2);
else if (inst_size == 64)
ins->alu.mask = expand_writemask(effective, 1);
alu->mask = expand_writemask(effective, 1);
else
ins->alu.mask = effective;
alu->mask = effective;
}
static unsigned
@ -559,10 +559,11 @@ texture_word_from_instr(midgard_instruction *ins)
static midgard_vector_alu
vector_alu_from_instr(midgard_instruction *ins)
{
midgard_vector_alu alu = ins->alu;
alu.op = ins->op;
alu.outmod = ins->outmod;
alu.reg_mode = reg_mode_for_bitsize(max_bitsize_for_alu(ins));
midgard_vector_alu alu = {
.op = ins->op,
.outmod = ins->outmod,
.reg_mode = reg_mode_for_bitsize(max_bitsize_for_alu(ins))
};
if (ins->has_inline_constant) {
/* Encode inline 16-bit constant. See disassembler for
@ -631,8 +632,8 @@ emit_alu_bundle(compiler_context *ctx,
}
if (ins->unit & UNITS_ANY_VECTOR) {
mir_pack_mask_alu(ins);
source_alu = vector_alu_from_instr(ins);
mir_pack_mask_alu(ins, &source_alu);
mir_pack_vector_srcs(ins, &source_alu);
size = sizeof(midgard_vector_alu);
source = &source_alu;

12
src/panfrost/midgard/midgard_print.c
View File

@ -235,14 +235,12 @@ mir_print_constant_component(FILE *fp, const midgard_constants *consts, unsigned
static void
mir_print_embedded_constant(midgard_instruction *ins, unsigned src_idx)
{
midgard_vector_alu_src src;
assert(src_idx <= 1);
if (src_idx == 0)
src = vector_alu_from_unsigned(ins->alu.src1);
else
src = vector_alu_from_unsigned(ins->alu.src2);
unsigned base_size = max_bitsize_for_alu(ins);
unsigned sz = nir_alu_type_get_type_size(ins->src_types[src_idx]);
bool half = (sz == (base_size >> 1));
unsigned mod = mir_pack_mod(ins, src_idx, false);
unsigned *swizzle = ins->swizzle[src_idx];
midgard_reg_mode reg_mode = reg_mode_for_bitsize(max_bitsize_for_alu(ins));
unsigned comp_mask = effective_writemask(ins->op, ins->mask);
@ -266,7 +264,7 @@ mir_print_embedded_constant(midgard_instruction *ins, unsigned src_idx)
mir_print_constant_component(stdout, &ins->constants,
swizzle[comp], reg_mode,
src.half, src.mod, ins->op);
half, mod, ins->op);
}
if (num_comp > 1)

4
src/panfrost/midgard/mir.c
View File

@ -424,10 +424,6 @@ mir_flip(midgard_instruction *ins)
assert(ins->type == TAG_ALU_4);
temp = ins->alu.src1;
ins->alu.src1 = ins->alu.src2;
ins->alu.src2 = temp;
temp = ins->src_types[0];
ins->src_types[0] = ins->src_types[1];
ins->src_types[1] = temp;