fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-03 16:28:08 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

nak: Fix NAK_DEBUG=serial for warp barriers

Browse source 
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/29591>
This commit is contained in:
Faith Ekstrand 2024-05-29 19:26:53 -05:00 • committed by Marge Bot
parent 290cbf413c
commit 70b381e928
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -532,7 +532,11 @@ impl Shader {
for b in &mut f.blocks.iter_mut().rev() {
let mut wt = 0_u8;
for instr in &mut b.instrs {
if instr.is_barrier() {
if matches!(&instr.op, Op::Bar(_))
|| matches!(&instr.op, Op::BClear(_))
|| matches!(&instr.op, Op::BSSy(_))
|| matches!(&instr.op, Op::BSync(_))
{
instr.deps.set_yield(true);
} else if instr.is_branch() {
instr.deps.add_wt_bar_mask(0x3f);

4
src/nouveau/compiler/nak/ir.rs
View file

@ -5563,10 +5563,6 @@ impl Instr {
matches!(self.op, Op::Bra(_) | Op::Exit(_))
}
pub fn is_barrier(&self) -> bool {
matches!(self.op, Op::Bar(_))
}
pub fn uses_global_mem(&self) -> bool {
match &self.op {
Op::Atom(op) => op.mem_space != MemSpace::Local,