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

nak: Assert instr_sched matches calc_instr_deps

Browse source 
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/32311>
This commit is contained in:
Mel Henning 2025-03-13 14:38:41 -04:00 • committed by Marge Bot
parent 562504f47c
commit c1d64053f2
1 changed files with 13 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -341,7 +341,8 @@ fn assign_barriers(f: &mut Function, sm: &dyn ShaderModel) {
} }
} }
fn calc_delays(f: &mut Function, sm: &dyn ShaderModel) { fn calc_delays(f: &mut Function, sm: &dyn ShaderModel) -> u32 {
let mut min_num_static_cycles = 0;
for b in f.blocks.iter_mut().rev() { for b in f.blocks.iter_mut().rev() {
let mut cycle = 0_u32; let mut cycle = 0_u32;
@ -446,6 +447,7 @@ fn calc_delays(f: &mut Function, sm: &dyn ShaderModel) {
cycle = min_start; cycle = min_start;
} }
min_num_static_cycles += cycle;
} }
// It's unclear exactly why but the blob inserts a Nop with a delay of 2 // It's unclear exactly why but the blob inserts a Nop with a delay of 2
@ -464,6 +466,8 @@ fn calc_delays(f: &mut Function, sm: &dyn ShaderModel) {
MappedInstrs::One(instr) MappedInstrs::One(instr)
} }
}); });
min_num_static_cycles
} }
impl Shader<'_> { impl Shader<'_> {
@ -502,10 +506,17 @@ impl Shader<'_> {
if DEBUG.serial() { if DEBUG.serial() {
self.assign_deps_serial(); self.assign_deps_serial();
} else { } else {
let mut min_num_static_cycles = 0;
for f in &mut self.functions { for f in &mut self.functions {
assign_barriers(f, self.sm); assign_barriers(f, self.sm);
calc_delays(f, self.sm); min_num_static_cycles += calc_delays(f, self.sm);
} }
// Check that this file's model matches up with the model in
// opt_instr_sched_postpass. postpass includes an estimate of
// variable latency delays in its count, so we expect it to be >=
// the estimate here
assert!(self.info.num_static_cycles >= min_num_static_cycles);
} }
} }
} }