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

nak/legalize: Copy uniform vectors in non-uniform control-flow

Browse source 
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/29591>
This commit is contained in:
Faith Ekstrand 2024-06-11 15:30:30 -05:00 • committed by Marge Bot
parent e4df28ade8
commit 7efc113bfe
1 changed files with 16 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
src/nouveau/compiler/nak/legalize.rs
View file

@ -948,6 +948,7 @@ fn legalize_sm70_instr(
fn legalize_instr(
b: &mut impl SSABuilder,
bl: &impl BlockLiveness,
block_uniform: bool,
ip: usize,
instr: &mut Instr,
) {
@ -961,6 +962,19 @@ fn legalize_instr(
for (i, src) in instr.srcs_mut().iter_mut().enumerate() {
*src = src.fold_imm(src_types[i]);
copy_src_if_not_same_file(b, src);
if !block_uniform {
// In non-uniform control-flow, we can't collect uniform vectors so
// we need to insert copies to warp regs which we can collect.
match &mut src.src_ref {
SrcRef::SSA(vec) => {
if vec.is_uniform() && vec.comps() > 1 {
copy_ssa_ref(b, vec, vec.file().unwrap().to_warp());
}
}
_ => (),
}
}
}
if b.sm() >= 70 {
@ -1017,11 +1031,12 @@ impl Shader {
for (bi, b) in f.blocks.iter_mut().enumerate() {
let bl = live.block_live(bi);
let bu = b.uniform;
let mut instrs = Vec::new();
for (ip, mut instr) in b.instrs.drain(..).enumerate() {
let mut b = SSAInstrBuilder::new(sm, &mut f.ssa_alloc);
legalize_instr(&mut b, bl, ip, &mut instr);
legalize_instr(&mut b, bl, bu, ip, &mut instr);
b.push_instr(instr);
instrs.append(&mut b.as_vec());
}