R600/SI: rework VOP2_* pattern v2