re,ove wip_match_opcode from GICombineRule

Author: jyli0116

llvm/include/llvm/Target/GlobalISel/Combine.td

@@ -397,10 +397,15 @@ def commute_shift : GICombineRule<
   (apply [{ Helper.applyBuildFn(*${d}, ${matchinfo}); }])>;
 
 // Fold (shift (trunc (shift x, C1)), C2) -> trunc (shift x, (C1 + C2))
+def shift_right_op : GICombinePatFrag<
+  (outs root:$dst), (ins),
+  !foreach(op,
+           [G_LSHR, G_ASHR],
+           (pattern (op $dst, $shifted, $amt)))>;
 def shift_of_trunc_of_shift_matchdata : GIDefMatchData<"ShiftOfTruncOfShift">;
 def shift_of_trunc_of_shift : GICombineRule<
-  (defs root:$root, shift_of_trunc_of_shift_matchdata:$matchinfo),
-  (match (wip_match_opcode G_LSHR, G_ASHR):$root,
+  (defs root:$dst, shift_of_trunc_of_shift_matchdata:$matchinfo),
+  (match (shift_right_op $dst):$root,
          [{ return Helper.matchShiftOfTruncOfShift(*${root}, ${matchinfo}); }]),
   (apply [{ Helper.applyShiftOfTruncOfShift(*${root}, ${matchinfo}); }])>;