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/ra: Drop the pointless AssignRegs struct

Browse source 
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/24998>
This commit is contained in:
Faith Ekstrand 2023-08-30 20:50:24 -05:00 • committed by Marge Bot
parent 57a7932bb5
commit 4d5bf265b0
1 changed files with 11 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

39
src/nouveau/compiler/nak_assign_regs.rs
View file

@ -1017,22 +1017,10 @@ impl AssignRegsBlock {
}
}
struct AssignRegs {
sm: u8,
blocks: Vec<AssignRegsBlock>,
}
impl AssignRegs {
pub fn new(sm: u8) -> Self {
Self {
sm: sm,
blocks: Vec::new(),
}
}
pub fn run(&mut self, s: &mut Shader) {
assert!(s.functions.len() == 1);
let f = &mut s.functions[0];
impl Shader {
pub fn assign_regs(&mut self) {
assert!(self.functions.len() == 1);
let f = &mut self.functions[0];
let live = SimpleLiveness::for_function(f);
let max_live = live.calc_max_live(f);
@ -1053,15 +1041,16 @@ impl AssignRegs {
}
});
s.num_gprs = num_regs[RegFile::GPR].try_into().unwrap();
self.num_gprs = num_regs[RegFile::GPR].try_into().unwrap();
let mut blocks: Vec<AssignRegsBlock> = Vec::new();
for b_idx in 0..f.blocks.len() {
let pred = f.blocks.pred_indices(b_idx);
let pred_ra = if pred.is_empty() {
None
} else {
/* Start with the previous block's. */
Some(&self.blocks[pred[0]].ra)
Some(&blocks[pred[0]].ra)
};
let bl = live.block_live(b_idx);
@ -1069,21 +1058,15 @@ impl AssignRegs {
let mut arb = AssignRegsBlock::new(&num_regs);
arb.first_pass(&mut f.blocks[b_idx], bl, pred_ra);
assert!(self.blocks.len() == b_idx);
self.blocks.push(arb);
assert!(blocks.len() == b_idx);
blocks.push(arb);
}
for b_idx in 0..f.blocks.len() {
let arb = &self.blocks[b_idx];
let arb = &blocks[b_idx];
for sb_idx in f.blocks.succ_indices(b_idx).to_vec() {
arb.second_pass(&self.blocks[sb_idx], &mut f.blocks[b_idx]);
arb.second_pass(&blocks[sb_idx], &mut f.blocks[b_idx]);
}
}
}
}
impl Shader {
pub fn assign_regs(&mut self) {
AssignRegs::new(self.sm).run(self);
}
}