R600/SI: Refactor SOP2 definitions