OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

nak: Handle delays > 15

Browse Source 
Delays greater than 15 needs to be encoded into a nop following the
instruction.  These delays will start to happen when we add accurate
latency handling and with certain instructions.

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/33573>
This commit is contained in:
Faith Ekstrand
2025-03-31 19:12:11 -05:00
committed by Marge Bot
parent 348f345238
commit 2b569ecdb6
2 changed files with 16 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/nouveau/compiler/nak/calc_instr_deps.rs
View File

@@ -420,10 +420,7 @@ fn calc_delays(f: &mut Function, sm: &dyn ShaderModel) -> u32 {
let instr = &mut b.instrs[ip];
let delay = min_start - cycle;
let delay = delay
.clamp(MIN_INSTR_DELAY.into(), MAX_INSTR_DELAY.into())
.try_into()
.unwrap();
let delay = delay.max(MIN_INSTR_DELAY.into()).try_into().unwrap();
instr.deps.set_delay(delay);
instr_cycle[ip] = min_start;
@@ -450,15 +447,25 @@ fn calc_delays(f: &mut Function, sm: &dyn ShaderModel) -> u32 {
min_num_static_cycles += cycle;
}
// It's unclear exactly why but the blob inserts a Nop with a delay of 2
// after every instruction which has an exec latency. Perhaps it has
// something to do with .yld? In any case, the extra 2 cycles aren't worth
// the chance of weird bugs.
f.map_instrs(|mut instr, _| {
if matches!(instr.op, Op::SrcBar(_)) {
if instr.deps.delay > MAX_INSTR_DELAY {
let mut delay = instr.deps.delay - MAX_INSTR_DELAY;
instr.deps.set_delay(MAX_INSTR_DELAY);
let instrs = vec![instr];
while delay > 0 {
let mut nop = Instr::new_boxed(OpNop { label: None });
nop.deps.set_delay(delay.min(MAX_INSTR_DELAY));
delay -= nop.deps.delay;
}
MappedInstrs::Many(instrs)
} else if matches!(instr.op, Op::SrcBar(_)) {
instr.op = Op::Nop(OpNop { label: None });
MappedInstrs::One(instr)
} else if sm.exec_latency(&instr.op) > 1 {
// It's unclear exactly why but the blob inserts a Nop with a delay
// of 2 after every instruction which has an exec latency. Perhaps
// it has something to do with .yld? In any case, the extra 2
// cycles aren't worth the chance of weird bugs.
let mut nop = Instr::new_boxed(OpNop { label: None });
nop.deps.set_delay(2);
MappedInstrs::Many(vec![instr, nop])

1
src/nouveau/compiler/nak/ir.rs
View File

@@ -6806,7 +6806,6 @@ impl InstrDeps {
}
pub fn set_delay(&mut self, delay: u8) {
assert!(delay <= MAX_INSTR_DELAY);
self.delay = delay;
}