diff --git a/src/panfrost/compiler/kraid/nir.rs b/src/panfrost/compiler/kraid/nir.rs
index 858d56ec55b..5d54bdde23e 100644
--- a/src/panfrost/compiler/kraid/nir.rs
+++ b/src/panfrost/compiler/kraid/nir.rs
@@ -13,7 +13,22 @@ use rustc_hash::FxHashMap;
 use std::cmp::max;
 
 #[derive(Default)]
-struct PhiAllocMap {}
+struct BlockLabelMap {
+    map: FxHashMap<u32, Label>,
+}
+
+impl BlockLabelMap {
+    fn add(&mut self, block: &nir_block, label: Label) {
+        self.map
+            .entry(block.index)
+            .and_modify(|_| panic!("Cannot set an block label twice"))
+            .or_insert(label);
+    }
+
+    fn get(&self, block: &nir_block) -> Label {
+        *self.map.get(&block.index).expect("Unknown block")
+    }
+}
 
 struct ShaderFromNir<'a> {
     model: &'a dyn Model,
@@ -67,14 +82,70 @@ impl<'a> ShaderFromNir<'a> {
         self.get_src_ssa(src).into()
     }
 
-    fn parse_shader(self) -> Shader<'a> {
-        let _nfi = self.nir.get_entrypoint().unwrap();
-        let ssa_alloc = Default::default();
+    fn parse_block(
+        &mut self,
+        ssa_alloc: &mut SSAValueAllocator,
+        block_map: &BlockLabelMap,
+        nb: &nir_block,
+    ) -> BasicBlock {
+        let mut b = SSAInstrBuilder::new(self.model.arch(), ssa_alloc);
+
+        for ni in nb.iter_instr_list() {
+            match ni.type_ {
+                _ => panic!("Unsupported instruction type"),
+            }
+        }
+
+        let succ = nb.successors();
+        if nb.cf_tree_next().is_none() {
+            b.push_op(OpEnd {});
+        } else if let Some(nif) = nb.following_if() {
+            let succ = [succ[0].unwrap(), succ[1].unwrap()];
+
+            b.push_op(OpBranch {
+                not: true,
+                cond: self.get_src(&nif.condition),
+                combine_op: BranchCombineOp::None,
+                label: block_map.get(succ[1]),
+            });
+        } else {
+            assert!(succ[1].is_none());
+            if let Some(succ) = succ[0] {
+                b.push_op(OpBranch {
+                    not: true,
+                    cond: 0.into(),
+                    combine_op: BranchCombineOp::None,
+                    label: block_map.get(succ),
+                });
+            }
+        }
+
+        BasicBlock {
+            label: block_map.get(nb),
+            instrs: b.into_vec(),
+        }
+    }
+
+    fn parse_shader(mut self) -> Shader<'a> {
+        let nfi = self.nir.get_entrypoint().unwrap();
+        let mut ssa_alloc = Default::default();
+
+        // Pre-populate the block table so we have the same numbering as NIR
+        let mut label_alloc: LabelAllocator = Default::default();
+        let mut block_map: BlockLabelMap = Default::default();
+        for nb in nfi.iter_blocks() {
+            block_map.add(nb, label_alloc.alloc());
+        }
+
+        let blocks = nfi
+            .iter_blocks()
+            .map(|nb| self.parse_block(&mut ssa_alloc, &block_map, nb))
+            .collect();
 
         Shader {
             model: self.model,
             ssa_alloc,
-            blocks: Default::default(),
+            blocks,
         }
     }
 }
diff --git a/src/panfrost/compiler/kraid/ops.rs b/src/panfrost/compiler/kraid/ops.rs
index 9b2e65d55be..9ac23206750 100644
--- a/src/panfrost/compiler/kraid/ops.rs
+++ b/src/panfrost/compiler/kraid/ops.rs
@@ -5,6 +5,67 @@ use crate::ir::*;
 use kraid_proc::{variants, FromVariants, Opcode};
 use std::fmt;
 
+macro_rules! bool_as_mod_str {
+    ($s: expr, $mod: ident) => {
+        if $s.$mod { stringify!(.$mod) } else { "" }
+    }
+}
+
+#[derive(Clone, Copy, Default, Eq, Hash, PartialEq)]
+pub enum BranchCombineOp {
+    #[default]
+    None,
+    H0,
+    H1,
+    And,
+    LowBits,
+}
+
+impl fmt::Display for BranchCombineOp {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        match self {
+            BranchCombineOp::None => Ok(()),
+            BranchCombineOp::H0 => write!(f, ".h0"),
+            BranchCombineOp::H1 => write!(f, ".h1"),
+            BranchCombineOp::And => write!(f, ".and"),
+            BranchCombineOp::LowBits => write!(f, ".lowbits"),
+        }
+    }
+}
+
+#[repr(C)]
+#[derive(Clone, Opcode)]
+pub struct OpBranch {
+    pub not: bool,
+    #[src_type(I32)]
+    pub cond: Src,
+    pub combine_op: BranchCombineOp,
+    pub label: Label,
+}
+
+impl fmt::Display for OpBranch {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        write!(
+            f,
+            "BRANCH{} {}{} {}",
+            bool_as_mod_str!(self, not),
+            &self.cond,
+            self.combine_op,
+            self.label,
+        )
+    }
+}
+
+#[repr(C)]
+#[derive(Clone, Opcode)]
+pub struct OpEnd {}
+
+impl fmt::Display for OpEnd {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        write!(f, "END")
+    }
+}
+
 #[repr(C)]
 #[derive(Clone, Opcode)]
 #[variants(dst_type in [I16, I32])]
@@ -22,5 +83,7 @@ impl fmt::Display for OpMov {
 
 #[derive(Clone, FromVariants, Opcode)]
 pub enum Op {
+    Branch(OpBranch),
+    End(OpEnd),
     Mov(OpMov),
 }