update

Author: lialan

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

@@ -1562,8 +1562,8 @@ def combine_shuffle_concat : GICombineRule<
 
 // Combines shuffles of vector into extract_subvector
 def combine_shuffle_vector : GICombineRule<
-  (defs root:$root, int64_matchinfo:$matchinfo),
-  (match (G_SHUFFLE_VECTOR $root, $src1, $src2, $mask):$root,
+  (defs root:$root),
+  (match (G_SHUFFLE_VECTOR $dst, $src1, $src2, $mask):$root,
     [{ return Helper.matchCombineShuffle(*${root}); }]),
   (apply [{ Helper.applyCombineShuffle(*${root}); }])>;
 

llvm/lib/CodeGen/GlobalISel/CombinerHelper.cpp

@@ -429,12 +429,11 @@ void CombinerHelper::applyCombineShuffle(MachineInstr &MI) const {
   auto SrcVec2 = Shuffle.getSrc2Reg();
   auto EltTy = MRI.getType(SrcVec1).getElementType();
   auto Width = MRI.getType(SrcVec1).getNumElements();
-  auto ExtractWidth = Shuffle.getMask().size();
 
   auto Unmerge1 = Builder.buildUnmerge(EltTy, SrcVec1);
   auto Unmerge2 = Builder.buildUnmerge(EltTy, SrcVec2);
 
-  llvm::SmallVector<Register> Extracts;
+  SmallVector<Register> Extracts;
   // Select only applicable elements from unmerged values.
   for (auto Val : Shuffle.getMask()) {
     if (Val == -1) {