diff --git a/src/nouveau/compiler/nak.rs b/src/nouveau/compiler/nak.rs
index 7f7fec66714..27ebfcea4f5 100644
--- a/src/nouveau/compiler/nak.rs
+++ b/src/nouveau/compiler/nak.rs
@@ -5,6 +5,7 @@
 
 mod nak_from_nir;
 mod nak_ir;
+mod nak_opt_copy_prop;
 mod nir;
 
 use nak_bindings::*;
@@ -35,5 +36,9 @@ pub extern "C" fn nak_compile_shader(
 
     println!("NAK IR:\n{}", &s);
 
+    s.opt_copy_prop();
+
+    println!("NAK IR:\n{}", &s);
+
     std::ptr::null_mut()
 }
diff --git a/src/nouveau/compiler/nak_opt_copy_prop.rs b/src/nouveau/compiler/nak_opt_copy_prop.rs
new file mode 100644
index 00000000000..5ef0972c6db
--- /dev/null
+++ b/src/nouveau/compiler/nak_opt_copy_prop.rs
@@ -0,0 +1,73 @@
+/*
+ * Copyright © 2022 Collabora, Ltd.
+ * SPDX-License-Identifier: MIT
+ */
+
+use crate::nak_ir::*;
+
+use std::collections::HashMap;
+
+struct CopyPropPass {
+    ssa_map: HashMap<SSAValue, Vec<Ref>>,
+}
+
+impl CopyPropPass {
+    pub fn new() -> CopyPropPass {
+        CopyPropPass {
+            ssa_map: HashMap::new(),
+        }
+    }
+
+    fn add_copy(&mut self, dst: &SSAValue, src_vec: Vec<Src>) {
+        self.ssa_map.insert(*dst, src_vec);
+    }
+
+    fn get_copy(&mut self, dst: &SSAValue) -> Option<&Vec<Src>> {
+        self.ssa_map.get(dst)
+    }
+
+    pub fn run(&mut self, f: &mut Function) {
+        for b in &mut f.blocks {
+            for instr in &mut b.instrs {
+                match instr.op {
+                    Opcode::VEC => {
+                        self.add_copy(
+                            instr.dst(0).as_ssa().unwrap(),
+                            instr.srcs().to_vec(),
+                        );
+                    }
+                    Opcode::SPLIT => {
+                        let src_ssa = instr.src(0).as_ssa().unwrap();
+                        if let Some(src_vec) = self.get_copy(src_ssa).cloned() {
+                            assert!(src_vec.len() == instr.num_dsts());
+                            for i in 0..instr.num_dsts() {
+                                if let Dst::SSA(ssa) = instr.dst(i) {
+                                    self.add_copy(ssa, vec![src_vec[i]]);
+                                }
+                            }
+                        }
+                    }
+                    _ => (),
+                }
+
+                for src in instr.srcs_mut() {
+                    if let Ref::SSA(src_ssa) = src {
+                        if src_ssa.comps() == 1 {
+                            if let Some(src_vec) = self.get_copy(src_ssa) {
+                                *src = src_vec[0];
+                            }
+                        }
+                    }
+                }
+            }
+        }
+    }
+}
+
+impl Shader {
+    pub fn opt_copy_prop(&mut self) {
+        for f in &mut self.functions {
+            CopyPropPass::new().run(f);
+        }
+    }
+}