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

nak/legalize: Handle OpBreak and OpBSSy specially

Browse source 
This lets us stop passing liveness information into the per-op
legalization code.  Long-term, I want to add a more general core
concept of destinations which are also reads but I haven't gotten
around to that yet.

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/30141>
This commit is contained in:
Faith Ekstrand 2024-07-10 11:17:37 -05:00 • committed by Marge Bot
parent d9a9bb651c
commit 9d8d928a59
1 changed files with 23 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -337,12 +337,7 @@ pub trait LegalizeBuildHelpers: SSABuilder {
impl LegalizeBuildHelpers for LegalizeBuilder<'_> {}
fn legalize_sm50_instr(
b: &mut LegalizeBuilder,
_bl: &impl BlockLiveness,
_ip: usize,
instr: &mut Instr,
) {
fn legalize_sm50_instr(b: &mut LegalizeBuilder, instr: &mut Instr) {
debug_assert!(!instr.is_uniform());
use RegFile::GPR;
@ -596,12 +591,7 @@ fn legalize_sm50_instr(
}
}
fn legalize_sm70_instr(
b: &mut LegalizeBuilder,
bl: &impl BlockLiveness,
ip: usize,
instr: &mut Instr,
) {
fn legalize_sm70_instr(b: &mut LegalizeBuilder, instr: &mut Instr) {
let gpr = if instr.is_uniform() {
RegFile::UGPR
} else {
@ -907,22 +897,7 @@ fn legalize_sm70_instr(
b.copy_alu_src_if_not_reg(&mut op.handle, gpr, SrcType::GPR);
b.copy_alu_src_if_not_reg_or_imm(&mut op.stream, gpr, SrcType::ALU);
}
Op::Break(op) => {
let bar_in = op.bar_in.src_ref.as_ssa().unwrap();
if !op.bar_out.is_none() && bl.is_live_after_ip(&bar_in[0], ip) {
let gpr = b.bmov_to_gpr(op.bar_in);
let tmp = b.bmov_to_bar(gpr.into());
op.bar_in = tmp.into();
}
}
Op::BSSy(op) => {
let bar_in = op.bar_in.src_ref.as_ssa().unwrap();
if !op.bar_out.is_none() && bl.is_live_after_ip(&bar_in[0], ip) {
let gpr = b.bmov_to_gpr(op.bar_in);
let tmp = b.bmov_to_bar(gpr.into());
op.bar_in = tmp.into();
}
}
Op::Break(_) | Op::BSSy(_) => (), // Handled specially
Op::OutFinal(op) => {
b.copy_alu_src_if_not_reg(&mut op.handle, gpr, SrcType::GPR);
}
@ -1008,10 +983,28 @@ fn legalize_instr(
}
}
// OpBreak and OpBSsy impose additional RA constraints
match &mut instr.op {
Op::Break(OpBreak {
bar_in, bar_out, ..
})
| Op::BSSy(OpBSSy {
bar_in, bar_out, ..
}) => {
let bar_in_ssa = bar_in.src_ref.as_ssa().unwrap();
if !bar_out.is_none() && bl.is_live_after_ip(&bar_in_ssa[0], ip) {
let gpr = b.bmov_to_gpr(*bar_in);
let tmp = b.bmov_to_bar(gpr.into());
*bar_in = tmp.into();
}
}
_ => (),
}
if b.sm() >= 70 {
legalize_sm70_instr(b, bl, ip, instr);
legalize_sm70_instr(b, instr);
} else if b.sm() >= 50 {
legalize_sm50_instr(b, bl, ip, instr);
legalize_sm50_instr(b, instr);
} else {
panic!("Unknown shader model SM{}", b.sm());
}