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

nak: Add a delay of 2 cycles for barriers

Browse source 
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/26615>
This commit is contained in:
Faith Ekstrand 2023-12-14 16:24:07 -06:00 • committed by Marge Bot
parent 0739927080
commit 8006f271d4
1 changed files with 15 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/nouveau/compiler/nak/calc_instr_deps.rs
View file

@ -311,8 +311,16 @@ fn calc_delays(f: &mut Function) {
for b in f.blocks.iter_mut().rev() {
let mut cycle = 0_u32;
let mut ready = RegTracker::new(0_u32);
let mut bars_ready = [0_u32; 6];
for instr in b.instrs.iter_mut().rev() {
let mut min_start = cycle + 1; /* TODO: co-issue */
// Barriers take two cycles before we can wait on them
if let Some(bar) = instr.deps.rd_bar() {
min_start = max(min_start, bars_ready[usize::from(bar)] + 2);
}
if let Some(bar) = instr.deps.wr_bar() {
min_start = max(min_start, bars_ready[usize::from(bar)] + 2);
}
if instr.has_fixed_latency() {
for (idx, dst) in instr.dsts().iter().enumerate() {
if let Dst::Reg(reg) = dst {
@ -331,7 +339,14 @@ fn calc_delays(f: &mut Function) {
.unwrap();
instr.deps.set_delay(delay);
ready.for_each_instr_pred_mut(instr, |c| *c = min_start);
ready.for_each_instr_src_mut(instr, |c| *c = min_start);
for (bar, c) in bars_ready.iter_mut().enumerate() {
if instr.deps.wt_bar_mask & (1 << bar) != 0 {
*c = min_start;
}
}
cycle = min_start;
}
}