Update tests after rebase, remove todo

Author: lukel97

llvm/test/CodeGen/RISCV/rvv/mscatter-combine.ll

@@ -99,8 +99,6 @@ define void @strided_store_offset_start(i64 %n, ptr %p) {
   ret void
 }
 
-; TODO: We could emit vs1r instead of vse64.v if we combined the unit strided vp
-; load back to a regular load.
 define void @stride_one_store(i64 %n, ptr %p) {
 ; RV32-LABEL: stride_one_store:
 ; RV32:       # %bb.0:
@@ -118,7 +116,7 @@ define void @stride_one_store(i64 %n, ptr %p) {
 ; RV64:       # %bb.0:
 ; RV64-NEXT:    vsetvli a0, zero, e64, m1, ta, ma
 ; RV64-NEXT:    vmv.v.i v8, 0
-; RV64-NEXT:    vse64.v v8, (a1)
+; RV64-NEXT:    vs1r.v v8, (a1)
 ; RV64-NEXT:    ret
   %step = tail call <vscale x 1 x i64> @llvm.experimental.stepvector.nxv1i64()
   %gep = getelementptr inbounds i64, ptr %p, <vscale x 1 x i64> %step