From 511f2169a8f12a0892ed5350becf02f45ab3dc17 Mon Sep 17 00:00:00 2001
From: Amara Emerson <amara@apple.com>
Date: Mon, 5 Sep 2022 16:05:44 +0100
Subject: [PATCH] [GlobalISel] Update combine-build-vector.mir test checks
 before patch.

---
 .../AArch64/GlobalISel/combine-build-vector.mir    | 68 ++++++++++++----------
 1 file changed, 36 insertions(+), 32 deletions(-)

diff --git a/llvm/test/CodeGen/AArch64/GlobalISel/combine-build-vector.mir b/llvm/test/CodeGen/AArch64/GlobalISel/combine-build-vector.mir
index 04a164c..77b1bec 100644
--- a/llvm/test/CodeGen/AArch64/GlobalISel/combine-build-vector.mir
+++ b/llvm/test/CodeGen/AArch64/GlobalISel/combine-build-vector.mir
@@ -17,11 +17,12 @@ body:             |
 
     ; CHECK-LABEL: name: full_extracts_from_build_vector
     ; CHECK: liveins: $x0, $x1
-    ; CHECK: %arg1:_(s64) = COPY $x0
-    ; CHECK: %arg2:_(s64) = COPY $x1
-    ; CHECK: $x0 = COPY %arg1(s64)
-    ; CHECK: $x1 = COPY %arg2(s64)
-    ; CHECK: RET_ReallyLR implicit $x0
+    ; CHECK-NEXT: {{  $}}
+    ; CHECK-NEXT: %arg1:_(s64) = COPY $x0
+    ; CHECK-NEXT: %arg2:_(s64) = COPY $x1
+    ; CHECK-NEXT: $x0 = COPY %arg1(s64)
+    ; CHECK-NEXT: $x1 = COPY %arg2(s64)
+    ; CHECK-NEXT: RET_ReallyLR implicit $x0
     %arg1:_(s64) = COPY $x0
     %arg2:_(s64) = COPY $x1
     %zero:_(s32) = G_CONSTANT i32 0
@@ -51,17 +52,18 @@ body:             |
 
     ; CHECK-LABEL: name: full_extracts_from_build_vector_other_use
     ; CHECK: liveins: $x0, $x1
-    ; CHECK: %arg1:_(s64) = COPY $x0
-    ; CHECK: %arg2:_(s64) = COPY $x1
-    ; CHECK: %zero:_(s32) = G_CONSTANT i32 0
-    ; CHECK: %one:_(s32) = G_CONSTANT i32 1
-    ; CHECK: %bv:_(<2 x s64>) = G_BUILD_VECTOR %arg1(s64), %arg2(s64)
-    ; CHECK: %extract:_(s64) = G_EXTRACT_VECTOR_ELT %bv(<2 x s64>), %zero(s32)
-    ; CHECK: %extract2:_(s64) = G_EXTRACT_VECTOR_ELT %bv(<2 x s64>), %one(s32)
-    ; CHECK: $x0 = COPY %extract(s64)
-    ; CHECK: $x1 = COPY %extract2(s64)
-    ; CHECK: $q0 = COPY %bv(<2 x s64>)
-    ; CHECK: RET_ReallyLR implicit $x0
+    ; CHECK-NEXT: {{  $}}
+    ; CHECK-NEXT: %arg1:_(s64) = COPY $x0
+    ; CHECK-NEXT: %arg2:_(s64) = COPY $x1
+    ; CHECK-NEXT: %zero:_(s32) = G_CONSTANT i32 0
+    ; CHECK-NEXT: %one:_(s32) = G_CONSTANT i32 1
+    ; CHECK-NEXT: %bv:_(<2 x s64>) = G_BUILD_VECTOR %arg1(s64), %arg2(s64)
+    ; CHECK-NEXT: %extract:_(s64) = G_EXTRACT_VECTOR_ELT %bv(<2 x s64>), %zero(s32)
+    ; CHECK-NEXT: %extract2:_(s64) = G_EXTRACT_VECTOR_ELT %bv(<2 x s64>), %one(s32)
+    ; CHECK-NEXT: $x0 = COPY %extract(s64)
+    ; CHECK-NEXT: $x1 = COPY %extract2(s64)
+    ; CHECK-NEXT: $q0 = COPY %bv(<2 x s64>)
+    ; CHECK-NEXT: RET_ReallyLR implicit $x0
     %arg1:_(s64) = COPY $x0
     %arg2:_(s64) = COPY $x1
     %zero:_(s32) = G_CONSTANT i32 0
@@ -92,12 +94,13 @@ body:             |
 
     ; CHECK-LABEL: name: partial_extracts_from_build_vector_multiple_per_elt
     ; CHECK: liveins: $x0, $x1
-    ; CHECK: %arg1:_(s64) = COPY $x0
-    ; CHECK: %arg2:_(s64) = COPY $x1
-    ; CHECK: $x0 = COPY %arg1(s64)
-    ; CHECK: $x1 = COPY %arg2(s64)
-    ; CHECK: $x2 = COPY %arg2(s64)
-    ; CHECK: RET_ReallyLR implicit $x0
+    ; CHECK-NEXT: {{  $}}
+    ; CHECK-NEXT: %arg1:_(s64) = COPY $x0
+    ; CHECK-NEXT: %arg2:_(s64) = COPY $x1
+    ; CHECK-NEXT: $x0 = COPY %arg1(s64)
+    ; CHECK-NEXT: $x1 = COPY %arg2(s64)
+    ; CHECK-NEXT: $x2 = COPY %arg2(s64)
+    ; CHECK-NEXT: RET_ReallyLR implicit $x0
     %arg1:_(s64) = COPY $x0
     %arg2:_(s64) = COPY $x1
     %zero:_(s32) = G_CONSTANT i32 0
@@ -129,16 +132,17 @@ body:             |
 
     ; CHECK-LABEL: name: full_extracts_from_build_vector_idx_out_of_range
     ; CHECK: liveins: $x0, $x1
-    ; CHECK: %arg1:_(s64) = COPY $x0
-    ; CHECK: %arg2:_(s64) = COPY $x1
-    ; CHECK: %zero:_(s32) = G_CONSTANT i32 0
-    ; CHECK: %two:_(s32) = G_CONSTANT i32 2
-    ; CHECK: %bv:_(<2 x s64>) = G_BUILD_VECTOR %arg1(s64), %arg2(s64)
-    ; CHECK: %extract:_(s64) = G_EXTRACT_VECTOR_ELT %bv(<2 x s64>), %zero(s32)
-    ; CHECK: %extract2:_(s64) = G_EXTRACT_VECTOR_ELT %bv(<2 x s64>), %two(s32)
-    ; CHECK: $x0 = COPY %extract(s64)
-    ; CHECK: $x1 = COPY %extract2(s64)
-    ; CHECK: RET_ReallyLR implicit $x0
+    ; CHECK-NEXT: {{  $}}
+    ; CHECK-NEXT: %arg1:_(s64) = COPY $x0
+    ; CHECK-NEXT: %arg2:_(s64) = COPY $x1
+    ; CHECK-NEXT: %zero:_(s32) = G_CONSTANT i32 0
+    ; CHECK-NEXT: %two:_(s32) = G_CONSTANT i32 2
+    ; CHECK-NEXT: %bv:_(<2 x s64>) = G_BUILD_VECTOR %arg1(s64), %arg2(s64)
+    ; CHECK-NEXT: %extract:_(s64) = G_EXTRACT_VECTOR_ELT %bv(<2 x s64>), %zero(s32)
+    ; CHECK-NEXT: %extract2:_(s64) = G_EXTRACT_VECTOR_ELT %bv(<2 x s64>), %two(s32)
+    ; CHECK-NEXT: $x0 = COPY %extract(s64)
+    ; CHECK-NEXT: $x1 = COPY %extract2(s64)
+    ; CHECK-NEXT: RET_ReallyLR implicit $x0
     %arg1:_(s64) = COPY $x0
     %arg2:_(s64) = COPY $x1
     %zero:_(s32) = G_CONSTANT i32 0
-- 
2.7.4