diff --git a/src/nouveau/compiler/nak.rs b/src/nouveau/compiler/nak.rs
index 6918448cb57..c62b9b360e2 100644
--- a/src/nouveau/compiler/nak.rs
+++ b/src/nouveau/compiler/nak.rs
@@ -11,6 +11,7 @@ mod nak_encode_sm75;
 mod nak_from_nir;
 mod nak_ir;
 mod nak_legalize;
+mod nak_liveness;
 mod nak_lower_par_copies;
 mod nak_opt_copy_prop;
 mod nak_opt_dce;
diff --git a/src/nouveau/compiler/nak_ir.rs b/src/nouveau/compiler/nak_ir.rs
index e0ae6b36314..993b6061934 100644
--- a/src/nouveau/compiler/nak_ir.rs
+++ b/src/nouveau/compiler/nak_ir.rs
@@ -173,6 +173,10 @@ impl SSAValueAllocator {
         }
     }
 
+    pub fn count(&self) -> u32 {
+        self.count
+    }
+
     pub fn alloc(&mut self, file: RegFile, comps: u8) -> SSAValue {
         let idx = self.count;
         self.count += 1;
@@ -2015,7 +2019,7 @@ impl Instr {
 
     pub fn is_branch(&self) -> bool {
         match self.op {
-            Op::Bra(_) => true,
+            Op::Bra(_) | Op::Exit(_) => true,
             _ => false,
         }
     }
@@ -2102,6 +2106,18 @@ impl BasicBlock {
         self.instrs = instrs;
     }
 
+    pub fn branch(&self) -> Option<&Instr> {
+        if let Some(i) = self.instrs.last() {
+            if i.is_branch() {
+                Some(i)
+            } else {
+                None
+            }
+        } else {
+            None
+        }
+    }
+
     pub fn branch_mut(&mut self) -> Option<&mut Instr> {
         if let Some(i) = self.instrs.last_mut() {
             if i.is_branch() {
@@ -2113,6 +2129,14 @@ impl BasicBlock {
             None
         }
     }
+
+    pub fn falls_through(&self) -> bool {
+        if let Some(i) = self.branch() {
+            !i.pred.is_none()
+        } else {
+            true
+        }
+    }
 }
 
 impl fmt::Display for BasicBlock {
diff --git a/src/nouveau/compiler/nak_liveness.rs b/src/nouveau/compiler/nak_liveness.rs
new file mode 100644
index 00000000000..f5d6fae54c6
--- /dev/null
+++ b/src/nouveau/compiler/nak_liveness.rs
@@ -0,0 +1,165 @@
+/*
+ * Copyright © 2022 Collabora, Ltd.
+ * SPDX-License-Identifier: MIT
+ */
+
+use crate::bitset::*;
+use crate::nak_ir::*;
+
+use std::collections::HashMap;
+
+pub struct BlockLiveness {
+    defs: BitSet,
+    uses: BitSet,
+    last_use: HashMap<u32, usize>,
+    live_in: BitSet,
+    live_out: BitSet,
+    pub predecessors: Vec<u32>,
+    pub successors: [Option<u32>; 2],
+}
+
+impl BlockLiveness {
+    fn new() -> Self {
+        Self {
+            defs: BitSet::new(),
+            uses: BitSet::new(),
+            last_use: HashMap::new(),
+            live_in: BitSet::new(),
+            live_out: BitSet::new(),
+            predecessors: Vec::new(),
+            successors: [None; 2],
+        }
+    }
+
+    fn add_def(&mut self, val: &SSAValue) {
+        self.defs.insert(val.idx().try_into().unwrap());
+    }
+
+    fn add_use(&mut self, val: &SSAValue, ip: usize) {
+        self.uses.insert(val.idx().try_into().unwrap());
+        self.last_use.insert(val.idx(), ip);
+    }
+
+    fn add_live_block(&mut self, block: &BasicBlock) {
+        for (ip, instr) in block.instrs.iter().enumerate() {
+            if let Pred::SSA(val) = &instr.pred {
+                self.add_use(val, ip);
+            }
+
+            for src in instr.srcs() {
+                if let Some(val) = src.get_ssa() {
+                    self.add_use(val, ip);
+                }
+            }
+
+            for dst in instr.dsts() {
+                if let Dst::SSA(val) = dst {
+                    self.add_def(val);
+                }
+            }
+        }
+    }
+
+    pub fn is_live_after(&self, val: &SSAValue, ip: usize) -> bool {
+        if self.live_out.get(val.idx().try_into().unwrap()) {
+            true
+        } else {
+            if let Some(last_use_ip) = self.last_use.get(&val.idx()) {
+                *last_use_ip > ip
+            } else {
+                false
+            }
+        }
+    }
+
+    pub fn is_live_in(&self, val: &SSAValue) -> bool {
+        self.live_in.get(val.idx().try_into().unwrap())
+    }
+
+    pub fn is_live_out(&self, val: &SSAValue) -> bool {
+        self.live_out.get(val.idx().try_into().unwrap())
+    }
+}
+
+pub struct Liveness {
+    blocks: HashMap<u32, BlockLiveness>,
+}
+
+impl Liveness {
+    pub fn block(&self, block: &BasicBlock) -> &BlockLiveness {
+        self.blocks.get(&block.id).unwrap()
+    }
+
+    fn link_blocks(&mut self, p_id: u32, s_id: u32) {
+        let s = self.blocks.get_mut(&s_id).unwrap();
+        s.predecessors.push(p_id);
+
+        let p = self.blocks.get_mut(&p_id).unwrap();
+        if p.successors[0].is_none() {
+            p.successors[0] = Some(s_id);
+        } else {
+            assert!(p.successors[1].is_none());
+            p.successors[1] = Some(s_id);
+        }
+    }
+
+    pub fn for_function(func: &Function) -> Liveness {
+        let mut l = Liveness {
+            blocks: HashMap::new(),
+        };
+        let mut live_in = HashMap::new();
+
+        for b in &func.blocks {
+            let mut bl = BlockLiveness::new();
+            bl.add_live_block(&b);
+            l.blocks.insert(b.id, bl);
+
+            live_in.insert(b.id, BitSet::new());
+        }
+
+        for (i, b) in func.blocks.iter().enumerate() {
+            if b.falls_through() {
+                l.link_blocks(b.id, func.blocks[i + 1].id);
+            }
+
+            if let Some(br) = b.branch() {
+                match &br.op {
+                    Op::Bra(bra) => {
+                        l.link_blocks(b.id, bra.target);
+                    }
+                    Op::Exit(_) => (),
+                    _ => panic!("Unhandled branch op"),
+                }
+            }
+        }
+
+        let mut to_do = true;
+        while to_do {
+            to_do = false;
+            for (i, b) in func.blocks.iter().enumerate() {
+                let bl = l.blocks.get_mut(&b.id).unwrap();
+
+                /* Compute live-out */
+                for s in bl.successors {
+                    if let Some(sb_id) = s {
+                        let s_live_in = live_in.get(&sb_id).unwrap();
+                        to_do |= bl.live_out.union_with(s_live_in);
+                    }
+                }
+
+                let b_live_in = live_in.get_mut(&b.id).unwrap();
+
+                let new_live_in =
+                    (bl.live_out.clone() | bl.uses.clone()) & !bl.defs.clone();
+                to_do |= b_live_in.union_with(&new_live_in);
+            }
+        }
+
+        for b in &func.blocks {
+            let bl = l.blocks.get_mut(&b.id).unwrap();
+            bl.live_in = live_in.remove(&b.id).unwrap();
+        }
+
+        l
+    }
+}