diff options
| -rw-r--r-- | .pick_status.json | 2 | ||||
| -rw-r--r-- | src/panfrost/bifrost/bifrost_compile.c | 14 |
2 files changed, 12 insertions, 4 deletions
diff --git a/.pick_status.json b/.pick_status.json index b7cc1c9caf1..267c279a911 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -6196,7 +6196,7 @@ "description": "pan/bi: Handle vector moves", "nominated": true, "nomination_type": 1, - "resolution": 0, + "resolution": 1, "master_sha": null, "because_sha": "b2c6cf2b6db11eb2293f59b42dfeb3d7481477b0" }, diff --git a/src/panfrost/bifrost/bifrost_compile.c b/src/panfrost/bifrost/bifrost_compile.c index 9b35a901ea3..6c52c38340b 100644 --- a/src/panfrost/bifrost/bifrost_compile.c +++ b/src/panfrost/bifrost/bifrost_compile.c @@ -570,9 +570,8 @@ emit_alu(bi_context *ctx, nir_alu_instr *instr) assert((alu.type != BI_SPECIAL) || !(ctx->quirks & BIFROST_NO_FAST_OP)); unsigned comps = nir_dest_num_components(instr->dest.dest); - - if (alu.type != BI_COMBINE) - assert(comps <= MAX2(1, 32 / comps)); + bool vector = comps > MAX2(1, 32 / nir_dest_bit_size(instr->dest.dest)); + assert(!vector || alu.type == BI_COMBINE || alu.type == BI_MOV); if (!instr->dest.dest.is_ssa) { for (unsigned i = 0; i < comps; ++i) @@ -668,6 +667,15 @@ emit_alu(bi_context *ctx, nir_alu_instr *instr) break; } + if (alu.type == BI_MOV && vector) { + alu.type = BI_COMBINE; + + for (unsigned i = 0; i < comps; ++i) { + alu.src[i] = alu.src[0]; + alu.swizzle[i][0] = instr->src[0].swizzle[i]; + } + } + if (alu.type == BI_CSEL) { /* Default to csel3 */ alu.cond = BI_COND_NE; |