fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-09 02:28:10 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

pan/bi: Support indirect jumps

Browse source 
We need that for blend shaders which are passed the return address
through r48.

Signed-off-by: Boris Brezillon <boris.brezillon@collabora.com>
Reviewed-by: Alyssa Rosenzweig <alyssa.rosenzweig@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/7151>
This commit is contained in:
Boris Brezillon 2020-10-13 12:22:02 +02:00
parent 1a1d9cce46
commit e6186c2042
2 changed files with 22 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
src/panfrost/bifrost/bi_pack.c
View file

@ -611,18 +611,25 @@ bi_pack_add_branch_cond(bi_instruction *ins, bi_registers *regs)
/* EQ swap to NE */
bool slot_swapped = false;
/* We assigned the constant slot to fetch the branch offset so we can
* just passthrough here. We put in the HI slot to match the blob since
* that's where the magic flags end up */
struct bifrost_branch pack = {
.src0 = bi_get_src(ins, regs, 0),
.src1 = (zero_ctrl << 1) | !slot_swapped,
.src2 = BIFROST_SRC_FAU_HI,
.cond = BR_COND_EQ,
.size = BR_SIZE_ZERO,
.op = BIFROST_ADD_OP_BRANCH
};
if (ins->branch_target) {
/* We assigned the constant slot to fetch the branch offset so
* we can just passthrough here. We put in the HI slot to match
* the blob since that's where the magic flags end up
*/
assert(!ins->src[2]);
pack.src2 = BIFROST_SRC_FAU_HI;
} else {
pack.src2 = bi_get_src(ins, regs, 2);
}
RETURN_PACKED(pack);
}
@ -634,15 +641,22 @@ bi_pack_add_branch_uncond(bi_instruction *ins, bi_registers *regs)
.src0 = BIFROST_SRC_FAU_LO,
.src1 = BIFROST_SRC_PASS_FMA,
/* Offset, see above */
.src2 = BIFROST_SRC_FAU_HI,
/* All ones in fact */
.cond = (BR_ALWAYS & 0x7),
.size = (BR_ALWAYS >> 3),
.op = BIFROST_ADD_OP_BRANCH
};
if (ins->branch_target) {
/* Offset is passed as a PC-relative offset through an
* embedded constant.
*/
assert(!ins->src[2]);
pack.src2 = BIFROST_SRC_FAU_HI;
} else {
pack.src2 = bi_get_src(ins, regs, 2);
}
RETURN_PACKED(pack);
}

3
src/panfrost/bifrost/bi_schedule.c
View file

@ -228,8 +228,7 @@ bi_schedule(bi_context *ctx)
u->constant_count = 1;
u->constants[0] = ins->constant.u64;
/* No indirect jumps yet */
if (ins->type == BI_BRANCH)
if (ins->type == BI_BRANCH && ins->branch_target)
u->branch_constant = true;
/* We always prefetch except unconditional branches */