diff options
| author | Eric Anholt <[email protected]> | 2018-03-14 15:04:32 -0700 |
|---|---|---|
| committer | Eric Anholt <[email protected]> | 2018-03-19 16:42:59 -0700 |
| commit | 4760040c0980a8921120d517d5e5809f7f0e488c (patch) | |
| tree | 9f175d28782284cb857c9082dd0baa2b1c08388f | |
| parent | 32791a05024d54736eab21379e849480fea78559 (diff) | |
broadcom/vc5: Extract v3d_qpu_writes_tmu() helper.
This will be reused in register spilling.
| -rw-r--r-- | src/broadcom/compiler/qpu_schedule.c | 7 | ||||
| -rw-r--r-- | src/broadcom/qpu/qpu_instr.c | 10 | ||||
| -rw-r--r-- | src/broadcom/qpu/qpu_instr.h | 1 |
3 files changed, 12 insertions, 6 deletions
diff --git a/src/broadcom/compiler/qpu_schedule.c b/src/broadcom/compiler/qpu_schedule.c index 3ced2a49499..b404390a799 100644 --- a/src/broadcom/compiler/qpu_schedule.c +++ b/src/broadcom/compiler/qpu_schedule.c @@ -588,13 +588,8 @@ get_instruction_priority(const struct v3d_qpu_instr *inst) next_score++; /* Schedule texture read setup early to hide their latency better. */ - if (inst->type == V3D_QPU_INSTR_TYPE_ALU && - ((inst->alu.add.magic_write && - v3d_qpu_magic_waddr_is_tmu(inst->alu.add.waddr)) || - (inst->alu.mul.magic_write && - v3d_qpu_magic_waddr_is_tmu(inst->alu.mul.waddr)))) { + if (v3d_qpu_writes_tmu(inst)) return next_score; - } next_score++; return baseline_score; diff --git a/src/broadcom/qpu/qpu_instr.c b/src/broadcom/qpu/qpu_instr.c index f31c81f8ca4..96033739431 100644 --- a/src/broadcom/qpu/qpu_instr.c +++ b/src/broadcom/qpu/qpu_instr.c @@ -557,6 +557,16 @@ v3d_qpu_add_op_uses_vpm(enum v3d_qpu_add_op op) } bool +v3d_qpu_writes_tmu(const struct v3d_qpu_instr *inst) +{ + return (inst->type == V3D_QPU_INSTR_TYPE_ALU && + ((inst->alu.add.magic_write && + v3d_qpu_magic_waddr_is_tmu(inst->alu.add.waddr)) || + (inst->alu.mul.magic_write && + v3d_qpu_magic_waddr_is_tmu(inst->alu.mul.waddr)))); +} + +bool v3d_qpu_uses_vpm(const struct v3d_qpu_instr *inst) { if (inst->type == V3D_QPU_INSTR_TYPE_ALU) { diff --git a/src/broadcom/qpu/qpu_instr.h b/src/broadcom/qpu/qpu_instr.h index 2289e182256..39232b0e61d 100644 --- a/src/broadcom/qpu/qpu_instr.h +++ b/src/broadcom/qpu/qpu_instr.h @@ -437,6 +437,7 @@ bool v3d_qpu_magic_waddr_is_tmu(enum v3d_qpu_waddr waddr) ATTRIBUTE_CONST; bool v3d_qpu_magic_waddr_is_tlb(enum v3d_qpu_waddr waddr) ATTRIBUTE_CONST; bool v3d_qpu_magic_waddr_is_vpm(enum v3d_qpu_waddr waddr) ATTRIBUTE_CONST; bool v3d_qpu_magic_waddr_is_tsy(enum v3d_qpu_waddr waddr) ATTRIBUTE_CONST; +bool v3d_qpu_writes_tmu(const struct v3d_qpu_instr *inst) ATTRIBUTE_CONST; bool v3d_qpu_writes_r3(const struct v3d_device_info *devinfo, const struct v3d_qpu_instr *instr) ATTRIBUTE_CONST; bool v3d_qpu_writes_r4(const struct v3d_device_info *devinfo, |