diff --git a/src/nouveau/compiler/nak/api.rs b/src/nouveau/compiler/nak/api.rs
index 7a75590e188..3c45c9fe396 100644
--- a/src/nouveau/compiler/nak/api.rs
+++ b/src/nouveau/compiler/nak/api.rs
@@ -268,6 +268,11 @@ pub extern "C" fn nak_compile_shader(
         eprintln!("NAK IR after opt_bar_prop:\n{}", &s);
     }
 
+    s.opt_uniform_instrs();
+    if DEBUG.print() {
+        eprintln!("NAK IR after lower_uniform_instrs:\n{}", &s);
+    }
+
     s.opt_copy_prop();
     if DEBUG.print() {
         eprintln!("NAK IR after opt_copy_prop:\n{}", &s);
diff --git a/src/nouveau/compiler/nak/lib.rs b/src/nouveau/compiler/nak/lib.rs
index b4d78599023..bd5f4ab9b03 100644
--- a/src/nouveau/compiler/nak/lib.rs
+++ b/src/nouveau/compiler/nak/lib.rs
@@ -23,6 +23,7 @@ mod opt_dce;
 mod opt_jump_thread;
 mod opt_lop;
 mod opt_out;
+mod opt_uniform_instrs;
 mod qmd;
 mod repair_ssa;
 mod sph;
diff --git a/src/nouveau/compiler/nak/opt_uniform_instrs.rs b/src/nouveau/compiler/nak/opt_uniform_instrs.rs
new file mode 100644
index 00000000000..ca2ee5fdbcd
--- /dev/null
+++ b/src/nouveau/compiler/nak/opt_uniform_instrs.rs
@@ -0,0 +1,105 @@
+// Copyright © 2024 Collabora, Ltd.
+// SPDX-License-Identifier: MIT
+
+use crate::ir::*;
+use std::collections::HashMap;
+
+fn should_lower_to_warp(
+    sm: u8,
+    instr: &Instr,
+    r2ur: &HashMap<SSAValue, SSAValue>,
+) -> bool {
+    if !instr.can_be_uniform(sm) {
+        return true;
+    }
+
+    let mut num_non_uniform_srcs = 0;
+    instr.for_each_ssa_use(|ssa| {
+        if !ssa.is_uniform() || r2ur.contains_key(ssa) {
+            num_non_uniform_srcs += 1;
+        }
+    });
+
+    if num_non_uniform_srcs >= 2 {
+        return true;
+    }
+
+    return false;
+}
+
+fn propagate_r2ur(
+    instr: &mut Instr,
+    r2ur: &HashMap<SSAValue, SSAValue>,
+) -> bool {
+    let mut progress = false;
+
+    // We don't want Instr::for_each_ssa_use_mut() because it would treat
+    // bindless cbuf sources as SSA sources.
+    for src in instr.srcs_mut() {
+        if let SrcRef::SSA(vec) = &mut src.src_ref {
+            for ssa in &mut vec[..] {
+                if let Some(r) = r2ur.get(ssa) {
+                    progress = true;
+                    *ssa = *r;
+                }
+            }
+        }
+    }
+
+    progress
+}
+
+impl Shader {
+    pub fn opt_uniform_instrs(&mut self) {
+        let sm = self.info.sm;
+        let mut r2ur = HashMap::new();
+        let mut propagated_r2ur = false;
+        self.map_instrs(|mut instr, alloc| {
+            if matches!(
+                &instr.op,
+                Op::PhiDsts(_) | Op::PhiSrcs(_) | Op::Vote(_)
+            ) {
+                MappedInstrs::One(instr)
+            } else if instr.is_uniform() {
+                let mut b = InstrBuilder::new(sm);
+                if should_lower_to_warp(sm, &instr, &r2ur) {
+                    propagated_r2ur |= propagate_r2ur(&mut instr, &r2ur);
+                    instr.for_each_ssa_def_mut(|ssa| {
+                        let w = alloc.alloc(ssa.file().to_warp());
+                        r2ur.insert(*ssa, w);
+                        b.push_op(OpR2UR {
+                            dst: (*ssa).into(),
+                            src: w.into(),
+                        });
+                        *ssa = w;
+                    });
+                    let mut v = b.as_vec();
+                    v.insert(0, instr);
+                    MappedInstrs::Many(v)
+                } else {
+                    // We may have non-uniform sources
+                    instr.for_each_ssa_use_mut(|ssa| {
+                        let file = ssa.file();
+                        if !file.is_uniform() {
+                            let u = alloc.alloc(file.to_uniform().unwrap());
+                            b.push_op(OpR2UR {
+                                dst: u.into(),
+                                src: (*ssa).into(),
+                            });
+                            *ssa = u;
+                        }
+                    });
+                    b.push_instr(instr);
+                    b.as_mapped_instrs()
+                }
+            } else {
+                propagated_r2ur |= propagate_r2ur(&mut instr, &r2ur);
+                MappedInstrs::One(instr)
+            }
+        });
+
+        if propagated_r2ur {
+            self.opt_dce();
+        }
+    }
+}