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

panfrost/midgard: reg_mode_full -> reg_mode_32, etc 

In preparation for 8-bit and 64-bit operands, let's not reinforce the
32-bit-centric biases in the ISA.

Signed-off-by: Alyssa Rosenzweig <alyssa@rosenzweig.io>
This commit is contained in:
Alyssa Rosenzweig 2019-04-30 02:19:26 +00:00
parent 2da36dd0b6
commit 576a27fd55
3 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/gallium/drivers/panfrost/midgard/disassemble.c
View File

@ -229,8 +229,8 @@ print_vector_field(const char *name, uint16_t *words, uint16_t reg_word,
midgard_reg_info *reg_info = (midgard_reg_info *)&reg_word; midgard_reg_info *reg_info = (midgard_reg_info *)&reg_word;
midgard_vector_alu *alu_field = (midgard_vector_alu *) words; midgard_vector_alu *alu_field = (midgard_vector_alu *) words;
if (alu_field->reg_mode != midgard_reg_mode_half && if (alu_field->reg_mode != midgard_reg_mode_16 &&
alu_field->reg_mode != midgard_reg_mode_full) { alu_field->reg_mode != midgard_reg_mode_32) {
printf("unknown reg mode %u\n", alu_field->reg_mode); printf("unknown reg mode %u\n", alu_field->reg_mode);
} }
@ -245,7 +245,7 @@ print_vector_field(const char *name, uint16_t *words, uint16_t reg_word,
bool half, out_half, out_high = false; bool half, out_half, out_high = false;
unsigned mask; unsigned mask;
half = (alu_field->reg_mode == midgard_reg_mode_half); half = (alu_field->reg_mode == midgard_reg_mode_16);
if (half) { if (half) {
if (alu_field->mask & 0xF) { if (alu_field->mask & 0xF) {

8
src/gallium/drivers/panfrost/midgard/midgard.h
View File

@ -164,10 +164,10 @@ typedef enum {
} midgard_outmod; } midgard_outmod;
typedef enum { typedef enum {
midgard_reg_mode_quarter = 0, midgard_reg_mode_8 = 0,
midgard_reg_mode_half = 1, midgard_reg_mode_16 = 1,
midgard_reg_mode_full = 2, midgard_reg_mode_32 = 2,
midgard_reg_mode_double = 3 /* TODO: verify */ midgard_reg_mode_64 = 3 /* TODO: verify */
} midgard_reg_mode; } midgard_reg_mode;
typedef enum { typedef enum {

18
src/gallium/drivers/panfrost/midgard/midgard_compile.c
View File

@ -316,7 +316,7 @@ v_fmov(unsigned src, midgard_vector_alu_src mod, unsigned dest)
}, },
.alu = { .alu = {
.op = midgard_alu_op_fmov, .op = midgard_alu_op_fmov,
.reg_mode = midgard_reg_mode_full, .reg_mode = midgard_reg_mode_32,
.dest_override = midgard_dest_override_none, .dest_override = midgard_dest_override_none,
.mask = 0xFF, .mask = 0xFF,
.src1 = vector_alu_srco_unsigned(zero_alu_src), .src1 = vector_alu_srco_unsigned(zero_alu_src),
@ -1038,7 +1038,7 @@ emit_condition(compiler_context *ctx, nir_src *src, bool for_branch, unsigned co
}, },
.alu = { .alu = {
.op = midgard_alu_op_iand, .op = midgard_alu_op_iand,
.reg_mode = midgard_reg_mode_full, .reg_mode = midgard_reg_mode_32,
.dest_override = midgard_dest_override_none, .dest_override = midgard_dest_override_none,
.mask = (0x3 << 6), /* w */ .mask = (0x3 << 6), /* w */
.src1 = vector_alu_srco_unsigned(alu_src), .src1 = vector_alu_srco_unsigned(alu_src),
@ -1066,7 +1066,7 @@ emit_indirect_offset(compiler_context *ctx, nir_src *src)
}, },
.alu = { .alu = {
.op = midgard_alu_op_imov, .op = midgard_alu_op_imov,
.reg_mode = midgard_reg_mode_full, .reg_mode = midgard_reg_mode_32,
.dest_override = midgard_dest_override_none, .dest_override = midgard_dest_override_none,
.mask = (0x3 << 6), /* w */ .mask = (0x3 << 6), /* w */
.src1 = vector_alu_srco_unsigned(zero_alu_src), .src1 = vector_alu_srco_unsigned(zero_alu_src),
@ -1328,7 +1328,7 @@ emit_alu(compiler_context *ctx, nir_alu_instr *instr)
midgard_vector_alu alu = { midgard_vector_alu alu = {
.op = op, .op = op,
.reg_mode = midgard_reg_mode_full, .reg_mode = midgard_reg_mode_32,
.dest_override = midgard_dest_override_none, .dest_override = midgard_dest_override_none,
.outmod = outmod, .outmod = outmod,
@ -1576,7 +1576,7 @@ emit_intrinsic(compiler_context *ctx, nir_intrinsic_instr *instr)
}, },
.alu = { .alu = {
.op = midgard_alu_op_u2f, .op = midgard_alu_op_u2f,
.reg_mode = midgard_reg_mode_half, .reg_mode = midgard_reg_mode_16,
.dest_override = midgard_dest_override_none, .dest_override = midgard_dest_override_none,
.mask = 0xF, .mask = 0xF,
.src1 = vector_alu_srco_unsigned(alu_src), .src1 = vector_alu_srco_unsigned(alu_src),
@ -1601,7 +1601,7 @@ emit_intrinsic(compiler_context *ctx, nir_intrinsic_instr *instr)
}, },
.alu = { .alu = {
.op = midgard_alu_op_fmul, .op = midgard_alu_op_fmul,
.reg_mode = midgard_reg_mode_full, .reg_mode = midgard_reg_mode_32,
.dest_override = midgard_dest_override_none, .dest_override = midgard_dest_override_none,
.outmod = midgard_outmod_sat, .outmod = midgard_outmod_sat,
.mask = 0xFF, .mask = 0xFF,
@ -3433,7 +3433,7 @@ emit_blend_epilogue(compiler_context *ctx)
}, },
.alu = { .alu = {
.op = midgard_alu_op_fmul, .op = midgard_alu_op_fmul,
.reg_mode = midgard_reg_mode_full, .reg_mode = midgard_reg_mode_32,
.dest_override = midgard_dest_override_lower, .dest_override = midgard_dest_override_lower,
.mask = 0xFF, .mask = 0xFF,
.src1 = vector_alu_srco_unsigned(blank_alu_src), .src1 = vector_alu_srco_unsigned(blank_alu_src),
@ -3458,7 +3458,7 @@ emit_blend_epilogue(compiler_context *ctx)
}, },
.alu = { .alu = {
.op = midgard_alu_op_f2u8, .op = midgard_alu_op_f2u8,
.reg_mode = midgard_reg_mode_half, .reg_mode = midgard_reg_mode_16,
.dest_override = midgard_dest_override_lower, .dest_override = midgard_dest_override_lower,
.outmod = midgard_outmod_pos, .outmod = midgard_outmod_pos,
.mask = 0xF, .mask = 0xF,
@ -3480,7 +3480,7 @@ emit_blend_epilogue(compiler_context *ctx)
}, },
.alu = { .alu = {
.op = midgard_alu_op_imov, .op = midgard_alu_op_imov,
.reg_mode = midgard_reg_mode_quarter, .reg_mode = midgard_reg_mode_8,
.dest_override = midgard_dest_override_none, .dest_override = midgard_dest_override_none,
.mask = 0xFF, .mask = 0xFF,
.src1 = vector_alu_srco_unsigned(blank_alu_src), .src1 = vector_alu_srco_unsigned(blank_alu_src),