vc4: Fix up the test for whether the unpack can be from r4.

We can do 16a/16b from float as well.  No difference on shader-db.
This commit is contained in:
Eric Anholt 2015-10-26 13:17:33 -07:00
parent 3d7a088608
commit 652a864b25
3 changed files with 27 additions and 8 deletions

View file

@ -189,6 +189,30 @@ qir_is_mul(struct qinst *inst)
}
}
bool
qir_is_float_input(struct qinst *inst)
{
switch (inst->op) {
case QOP_FMUL:
case QOP_FADD:
case QOP_FSUB:
case QOP_FMIN:
case QOP_FMAX:
case QOP_FMINABS:
case QOP_FMAXABS:
case QOP_FTOI:
case QOP_UNPACK_8A_F:
case QOP_UNPACK_8B_F:
case QOP_UNPACK_8C_F:
case QOP_UNPACK_8D_F:
case QOP_UNPACK_16A_F:
case QOP_UNPACK_16B_F:
return true;
default:
return false;
}
}
bool
qir_is_raw_mov(struct qinst *inst)
{

View file

@ -465,6 +465,7 @@ bool qir_is_multi_instruction(struct qinst *inst);
bool qir_is_mul(struct qinst *inst);
bool qir_is_raw_mov(struct qinst *inst);
bool qir_is_tex(struct qinst *inst);
bool qir_is_float_input(struct qinst *inst);
bool qir_depends_on_flags(struct qinst *inst);
bool qir_writes_r4(struct qinst *inst);
bool qir_src_needs_a_file(struct qinst *inst);

View file

@ -283,20 +283,14 @@ vc4_register_allocate(struct vc4_context *vc4, struct vc4_compile *c)
}
if (qir_src_needs_a_file(inst)) {
switch (inst->op) {
case QOP_UNPACK_8A_F:
case QOP_UNPACK_8B_F:
case QOP_UNPACK_8C_F:
case QOP_UNPACK_8D_F:
if (qir_is_float_input(inst)) {
/* Special case: these can be done as R4
* unpacks, as well.
*/
class_bits[inst->src[0].index] &= (CLASS_BIT_A |
CLASS_BIT_R4);
break;
default:
} else {
class_bits[inst->src[0].index] &= CLASS_BIT_A;
break;
}
}
ip++;