GlobalISel: Fix inadequate verification of g_build_vector

Testing based on the total size of the elements failed to catch a few
invalid scenarios, so explicitly check the number of elements/operands
and types.

This failed to catch situations like
<4 x s16> = G_BUILD_VECTOR s32, s32 since the total size added
up. This also would fail to catch an implicit conversion between
pointers and scalars.

llvm-svn: 354139

1 files changed, 32 insertions, 18 deletions

diff --git a/llvm/test/MachineVerifier/test_g_build_vector.mir b/llvm/test/MachineVerifier/test_g_build_vector.mir
index ad2742c4dff..6b0836952f1 100644
--- a/llvm/test/MachineVerifier/test_g_build_vector.mir
+++ b/llvm/test/MachineVerifier/test_g_build_vector.mir
@@ -1,27 +1,41 @@
-#RUN: not llc -o - -global-isel -run-pass=none -verify-machineinstrs %s 2>&1 | FileCheck %s
+# RUN: not llc -o - -global-isel -run-pass=none -verify-machineinstrs %s 2>&1 | FileCheck %s
 # REQUIRES: aarch64-registered-target
---- |
-  target datalayout = "e-m:e-i8:8:32-i16:16:32-i64:64-i128:128-n32:64-S128"
-  target triple = "aarch64-unknown-unknown"
-
-  define i32 @g_build_vector() {
-    ret i32 0
-  }
-
-...
 ---
 name:            g_build_vector
-legalized:       true
-regBankSelected: false
-selected:        false
 tracksRegLiveness: true
-registers:
-  - { id: 0, class: _, preferred-register: '' }
 liveins:
 body:             |
   bb.0:
-    ; CHECK: Bad machine code: G_BUILD_VECTOR src operands total size don't match dest size
+    %0:_(s32) = IMPLICIT_DEF
+
+    ; CHECK: Bad machine code: G_BUILD_VECTOR must produce a vector from scalar operands
+    %1:_(s32) = G_BUILD_VECTOR %0
+
+    %2:_(<2 x s32>) = IMPLICIT_DEF
+
+    ; CHECK: Bad machine code: G_BUILD_VECTOR must produce a vector from scalar operands
+    %3:_(<2 x s32>) = G_BUILD_VECTOR %2
+
+    ; CHECK: Bad machine code: G_BUILD_VECTOR must have an operand for each elemement
+    %4:_(<2 x s32>) = G_BUILD_VECTOR %0, %0, %0, %0
+
+    ; CHECK: Bad machine code: G_BUILD_VECTOR result element type must match source type
+    ; CHECK: Bad machine code: G_BUILD_VECTOR must have an operand for each elemement
+    %5:_(<4 x s16>) = G_BUILD_VECTOR %0, %0
+
+    %6:_(s16) = IMPLICIT_DEF
+
+    ; CHECK: Bad machine code: G_BUILD_VECTOR result element type must match source type
+    ; CHECK: Bad machine code: G_BUILD_VECTOR must have an operand for each elemement
+    %7:_(<2 x s32>) = G_BUILD_VECTOR %6, %6, %6, %6
+
+    %8:_(p0) = IMPLICIT_DEF
+
+    ; CHECK: Bad machine code: G_BUILD_VECTOR result element type must match source type
+    %9:_(<2 x s64>) = G_BUILD_VECTOR %8, %8
+
+    %10:_(s64) = IMPLICIT_DEF
 
-    %0(s32) = IMPLICIT_DEF
-    %1:_(<2 x s32>) = G_BUILD_VECTOR %0, %0, %0, %0
+    ; CHECK: Bad machine code: G_BUILD_VECTOR result element type must match source type
+    %11:_(<2 x p0>) = G_BUILD_VECTOR %10, %10
 ...