fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-22 22:10:10 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

pan/bi: Move bi_flip_ports out of port assignment

Browse source 
It's more of a packing fixup than anything scheduler-y, and port
assignment will soon be the domain of the scheduler.

Signed-off-by: Alyssa Rosenzweig <alyssa.rosenzweig@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/5260>
This commit is contained in:
Alyssa Rosenzweig 2020-05-05 14:34:58 -04:00 • committed by Marge Bot
parent 95e3776d3e
commit ac64bf9b20
1 changed files with 16 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -267,14 +267,6 @@ bi_assign_ports(bi_bundle *now, bi_bundle *prev)
now->regs.write_fma = true; now->regs.write_fma = true;
} }
/* Finally, ensure port 1 > port 0 for the 63-x trick to function */
if (now->regs.enabled[0] && now->regs.enabled[1] && now->regs.port[1] < now->regs.port[0]) {
unsigned temp = now->regs.port[0];
now->regs.port[0] = now->regs.port[1];
now->regs.port[1] = temp;
}
return now->regs; return now->regs;
} }
@ -1676,6 +1668,20 @@ struct bi_packed_bundle {
uint64_t hi; uint64_t hi;
}; };
/* We must ensure port 1 > port 0 for the 63-x trick to function, so we fix
* this up at pack time. (Scheduling doesn't care.) */
static void
bi_flip_ports(bi_registers *regs)
{
if (regs->enabled[0] && regs->enabled[1] && regs->port[1] < regs->port[0]) {
unsigned temp = regs->port[0];
regs->port[0] = regs->port[1];
regs->port[1] = temp;
}
}
static struct bi_packed_bundle static struct bi_packed_bundle
bi_pack_bundle(bi_clause *clause, bi_bundle bundle, bi_bundle prev, bool first_bundle, gl_shader_stage stage) bi_pack_bundle(bi_clause *clause, bi_bundle bundle, bi_bundle prev, bool first_bundle, gl_shader_stage stage)
{ {
@ -1683,6 +1689,8 @@ bi_pack_bundle(bi_clause *clause, bi_bundle bundle, bi_bundle prev, bool first_b
bi_assign_uniform_constant(clause, &bundle.regs, bundle); bi_assign_uniform_constant(clause, &bundle.regs, bundle);
bundle.regs.first_instruction = first_bundle; bundle.regs.first_instruction = first_bundle;
bi_flip_ports(&bundle.regs);
uint64_t reg = bi_pack_registers(bundle.regs); uint64_t reg = bi_pack_registers(bundle.regs);
uint64_t fma = bi_pack_fma(clause, bundle, &bundle.regs); uint64_t fma = bi_pack_fma(clause, bundle, &bundle.regs);
uint64_t add = bi_pack_add(clause, bundle, &bundle.regs, stage); uint64_t add = bi_pack_add(clause, bundle, &bundle.regs, stage);