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

nak: Handle token re-use in dep tracking

Browse source 
When we run out of tokens, instead of panicing, grab the oldest token
and re-use it, adding it to the wait list for the instruction.

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/24998>
This commit is contained in:
Faith Ekstrand 2023-04-10 17:23:27 -05:00 • committed by Marge Bot
parent 991fa18f6e
commit 3fd47a68a1
1 changed files with 28 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
src/nouveau/compiler/nak_calc_instr_deps.rs
View file

@ -116,6 +116,26 @@ impl BarAlloc {
None
}
pub fn alloc(&mut self) -> (BarDep, bool) {
if let Some(bd) = self.try_alloc() {
(bd, false)
} else {
/* Get the oldest by looking for the one with the smallest dep */
let mut old_bar = 0;
let mut old_dep = self.bar_dep[0];
for bar in 1..self.bars {
let dep = self.bar_dep[usize::from(bar)];
if dep < old_dep {
old_bar = bar;
old_dep = dep;
}
}
self.free_bar(old_bar);
let bd = self.alloc_dep(old_bar);
(bd, true)
}
}
pub fn free_bar(&mut self, bar: u8) {
let dep = self.get_dep(bar).unwrap();
self.bar_dep[usize::from(bar)] = usize::MAX;
@ -205,12 +225,18 @@ impl AllocBarriers {
}
if !instr.srcs().is_empty() {
let bd = self.bars.try_alloc().unwrap();
let (bd, stall) = self.bars.alloc();
if stall {
instr.deps.add_wt_bar(bd.bar);
}
instr.deps.set_rd_bar(bd.bar);
self.set_instr_read_dep(instr, bd.dep);
}
if !instr.dsts().is_empty() {
let bd = self.bars.try_alloc().unwrap();
let (bd, stall) = self.bars.alloc();
if stall {
instr.deps.add_wt_bar(bd.bar);
}
instr.deps.set_wr_bar(bd.bar);
self.set_instr_write_dep(instr, bd.dep);
}