MERGE: fix MEMBAR_SCOPE define
nv50/ir: add support for barriers

Original version by Francisco Jerez.