nv50/ir/nir: rework CFG handling