aco: fix waitcnts for barriers at block ends