diff options
| author | Alyssa Rosenzweig <[email protected]> | 2020-05-21 12:16:48 -0400 |
|---|---|---|
| committer | Marge Bot <[email protected]> | 2020-05-21 17:49:14 +0000 |
| commit | df3d932bb4e0f0a2b6e1d08d142cfaeb034fefa4 (patch) | |
| tree | 2e81fb8e099497f7c07bc78c434e2fea96696426 /src/panfrost/midgard | |
| parent | 95dd478ed325fef8d947f771eae02513725f0f56 (diff) | |
pan/mdg: Use src_types to determine size in scheduling
Signed-off-by: Alyssa Rosenzweig <[email protected]>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/5151>
Diffstat (limited to 'src/panfrost/midgard')
| -rw-r--r-- | src/panfrost/midgard/midgard_schedule.c | 21 |
1 files changed, 6 insertions, 15 deletions
diff --git a/src/panfrost/midgard/midgard_schedule.c b/src/panfrost/midgard/midgard_schedule.c index 1277608e373..51f628f42d0 100644 --- a/src/panfrost/midgard/midgard_schedule.c +++ b/src/panfrost/midgard/midgard_schedule.c @@ -198,28 +198,19 @@ mir_is_scalar(midgard_instruction *ains) /* Otherwise, check mode hazards */ bool could_scalar = true; + unsigned sz0 = nir_alu_type_get_type_size(ains->src_types[0]); + unsigned sz1 = nir_alu_type_get_type_size(ains->src_types[1]); /* Only 16/32-bit can run on a scalar unit */ could_scalar &= ains->alu.reg_mode != midgard_reg_mode_8; could_scalar &= ains->alu.reg_mode != midgard_reg_mode_64; could_scalar &= ains->alu.dest_override == midgard_dest_override_none; - if (ains->alu.reg_mode == midgard_reg_mode_16) { - /* If we're running in 16-bit mode, we - * can't have any 8-bit sources on the - * scalar unit (since the scalar unit - * doesn't understand 8-bit) */ + if (ains->src[0] != ~0) + could_scalar &= (sz0 == 16) || (sz0 == 32); - midgard_vector_alu_src s1 = - vector_alu_from_unsigned(ains->alu.src1); - - could_scalar &= !s1.half; - - midgard_vector_alu_src s2 = - vector_alu_from_unsigned(ains->alu.src2); - - could_scalar &= !s2.half; - } + if (ains->src[1] != ~0) + could_scalar &= (sz1 == 16) || (sz1 == 32); return could_scalar; } |