diff options
| author | Alyssa Rosenzweig <[email protected]> | 2019-08-02 11:22:56 -0700 |
|---|---|---|
| committer | Alyssa Rosenzweig <[email protected]> | 2019-08-02 14:20:03 -0700 |
| commit | 5d9b7a8ddb5f3416b9774393c9667cedcaf132bf (patch) | |
| tree | 627272636a725f9d3a13f44972412b8bb55ef081 /src/panfrost/midgard/mir.c | |
| parent | 9aeb726045d4df13e3c832fb62f449961faeddee (diff) | |
pan/midgard: Handle get/set_swizzle for load/store arguments
Load/store's main "argument 0" already has its swizzle handled
correctly (for stores, that is). But the tinier arguments, the compact
ones with a component select but not a full swizzle, those are not yet
handled. Let's do something about that!
Diffstat (limited to 'src/panfrost/midgard/mir.c')
| -rw-r--r-- | src/panfrost/midgard/mir.c | 49 |
1 files changed, 46 insertions, 3 deletions
diff --git a/src/panfrost/midgard/mir.c b/src/panfrost/midgard/mir.c index 045948a74b5..0198430953b 100644 --- a/src/panfrost/midgard/mir.c +++ b/src/panfrost/midgard/mir.c @@ -44,8 +44,23 @@ mir_get_swizzle(midgard_instruction *ins, unsigned idx) return s.swizzle; } else if (ins->type == TAG_LOAD_STORE_4) { - assert(idx == 0); - return ins->load_store.swizzle; + /* Main swizzle of a load is on the destination */ + if (!OP_IS_STORE(ins->load_store.op)) + idx++; + + switch (idx) { + case 0: + return ins->load_store.swizzle; + case 1: + case 2: { + uint8_t raw = + (idx == 2) ? ins->load_store.arg_2 : ins->load_store.arg_1; + + return component_to_swizzle(midgard_ldst_select(raw).component); + } + default: + unreachable("Unknown load/store source"); + } } else if (ins->type == TAG_TEXTURE_4) { switch (idx) { case 0: @@ -78,7 +93,35 @@ mir_set_swizzle(midgard_instruction *ins, unsigned idx, unsigned new) else ins->alu.src2 = pack; } else if (ins->type == TAG_LOAD_STORE_4) { - ins->load_store.swizzle = new; + /* Main swizzle of a load is on the destination */ + if (!OP_IS_STORE(ins->load_store.op)) + idx++; + + switch (idx) { + case 0: + ins->load_store.swizzle = new; + break; + case 1: + case 2: { + uint8_t raw = + (idx == 2) ? ins->load_store.arg_2 : ins->load_store.arg_1; + + midgard_ldst_register_select sel + = midgard_ldst_select(raw); + sel.component = swizzle_to_component(new); + uint8_t packed = midgard_ldst_pack(sel); + + if (idx == 2) + ins->load_store.arg_2 = packed; + else + ins->load_store.arg_1 = packed; + + break; + } + default: + assert(new == 0); + break; + } } else if (ins->type == TAG_TEXTURE_4) { switch (idx) { case 0: |