diff options
author | Alyssa Rosenzweig <[email protected]> | 2019-11-07 08:25:27 -0500 |
---|---|---|
committer | Tomeu Vizoso <[email protected]> | 2019-11-11 15:23:44 +0000 |
commit | 3295edaadf7515441980c5095acf056d0ae2d8dc (patch) | |
tree | b78e31eb84e57381383d58a91680008457ad1fd8 /src | |
parent | 843874c7c33681dadaf4ff77c4246a5a8570ad24 (diff) |
pan/midgard: Pack load/store masks
While most load/store operations on 32-bit/vec4 intriniscally, some are
not and have special type-size-dependent semantics for the mask. We need
to convert into this native format.
Signed-off-by: Alyssa Rosenzweig <[email protected]>
Reviewed-by: Tomeu Vizoso <[email protected]>
Diffstat (limited to 'src')
-rw-r--r-- | src/panfrost/midgard/midgard_emit.c | 32 |
1 files changed, 30 insertions, 2 deletions
diff --git a/src/panfrost/midgard/midgard_emit.c b/src/panfrost/midgard/midgard_emit.c index 8bc4bb0e0dd..0ba404d13e8 100644 --- a/src/panfrost/midgard/midgard_emit.c +++ b/src/panfrost/midgard/midgard_emit.c @@ -216,6 +216,35 @@ mir_pack_swizzle_tex(midgard_instruction *ins) /* TODO: bias component */ } +/* Load store masks are 4-bits. Load/store ops pack for that. vec4 is the + * natural mask width; vec8 is constrained to be in pairs, vec2 is duplicated. TODO: 8-bit? + */ + +static void +mir_pack_ldst_mask(midgard_instruction *ins) +{ + midgard_reg_mode mode = mir_typesize(ins); + unsigned packed = ins->mask; + + if (mode == midgard_reg_mode_64) { + packed = ((ins->mask & 0x2) ? (0x8 | 0x4) : 0) | + ((ins->mask & 0x1) ? (0x2 | 0x1) : 0); + } else if (mode == midgard_reg_mode_16) { + packed = 0; + + for (unsigned i = 0; i < 4; ++i) { + /* Make sure we're duplicated */ + bool u = (ins->mask & (1 << (2*i + 0))) != 0; + bool v = (ins->mask & (1 << (2*i + 1))) != 0; + assert(u == v); + + packed |= (u << i); + } + } + + ins->load_store.mask = packed; +} + static void emit_alu_bundle(compiler_context *ctx, midgard_bundle *bundle, @@ -312,8 +341,7 @@ emit_binary_bundle(compiler_context *ctx, /* Copy masks */ for (unsigned i = 0; i < bundle->instruction_count; ++i) { - bundle->instructions[i]->load_store.mask = - bundle->instructions[i]->mask; + mir_pack_ldst_mask(bundle->instructions[i]); mir_pack_swizzle_ldst(bundle->instructions[i]); } |