R600/SI: Move patterns to match add / sub to scalar instructions