fixup! limit g_splat_vector to scalable types

Author: michaelmaitland

llvm/lib/CodeGen/MachineVerifier.cpp

@@ -1645,8 +1645,8 @@ void MachineVerifier::verifyPreISelGenericInstruction(const MachineInstr *MI) {
     LLT DstTy = MRI->getType(MI->getOperand(0).getReg());
     LLT SrcTy = MRI->getType(MI->getOperand(1).getReg());
 
-    if (!DstTy.isVector())
-      report("Destination type must be a vector", MI);
+    if (!DstTy.isScalableVector())
+      report("Destination type must be a scalable vector", MI);
 
     if (!SrcTy.isScalar())
       report("Source type must be a scalar", MI);

llvm/test/CodeGen/RISCV/GlobalISel/legalizer/rvv/legalize-extract.mir

@@ -6,28 +6,22 @@ tracksRegLiveness: true
 liveins:
 body:             |
   bb.0:
-    %0:_(<2 x s32>) = G_IMPLICIT_DEF
-    %1:_(s32) = G_CONSTANT i32 0
-    %2:_(s32) = G_CONSTANT i32 1
-    %3:_(<2 x s32>) = G_BUILD_VECTOR %1, %2
+    %0:_(s32) = G_CONSTANT i32 0
+    %1:_(<2 x s32>) = G_IMPLICIT_DEF
+    %2:_(<vscale x 2 x s32>) = G_IMPLICIT_DEF
 
-    ; CHECK: Destination type must be a vector
-    %4:_(s32) = G_SPLAT_VECTOR %1
+    ; CHECK: Destination type must be a scalable vector
+    %3:_(s32) = G_SPLAT_VECTOR %0
 
-    ; CHECK: Source type must be a scalar
-    %5:_(<2 x s32>) = G_SPLAT_VECTOR %3
-
-    ; CHECK: Element type of the destination must be the same type as the source type
-    %6:_(<2 x s64>) = G_SPLAT_VECTOR %5
+    ; CHECK: Destination type must be a scalable vector
+    %4:_(<2 x s32>) = G_SPLAT_VECTOR %0
 
-    %7:_(<vscale x 2 x s32>) = G_IMPLICIT_DEF
-
-    ; CHECK: Destination type must be a vector
-    %8:_(s32) = G_SPLAT_VECTOR %7
+    ; CHECK: Source type must be a scalar
+    %5:_(<vscale x 2 x s32>) = G_SPLAT_VECTOR %1
 
     ; CHECK: Source type must be a scalar
-    %9:_(<vscale x 2 x s32>) = G_SPLAT_VECTOR %7
+    %6:_(<vscale x 2 x s32>) = G_SPLAT_VECTOR %2
 
     ; CHECK: Element type of the destination must be the same type as the source type
-    %10:_(<vscale x 2 x s64>) = G_SPLAT_VECTOR %7
+    %7:_(<vscale x 2 x s64>) = G_SPLAT_VECTOR %0
 ...