[llvm] [AArch64][GlobalISel] Update some scalar types to integer in tests. NFC (PR #205190)

David Green via llvm-commits llvm-commits at lists.llvm.org
Mon Jun 22 13:48:16 PDT 2026


https://github.com/davemgreen created https://github.com/llvm/llvm-project/pull/205190

None

>From 968f7091896536d0bc768fb3570a404b0859156b Mon Sep 17 00:00:00 2001
From: David Green <david.green at arm.com>
Date: Mon, 22 Jun 2026 21:48:04 +0100
Subject: [PATCH] [AArch64][GlobalISel] Update some scalar types to integer in
 tests. NFC

---
 .../AArch64/GlobalISel/legalize-and.mir       |  64 ++--
 .../AArch64/GlobalISel/legalize-or.mir        | 321 +++++++++---------
 .../AArch64/GlobalISel/legalize-xor.mir       | 314 ++++++++---------
 3 files changed, 345 insertions(+), 354 deletions(-)

diff --git a/llvm/test/CodeGen/AArch64/GlobalISel/legalize-and.mir b/llvm/test/CodeGen/AArch64/GlobalISel/legalize-and.mir
index 252960568fe94..64dc779687dd5 100644
--- a/llvm/test/CodeGen/AArch64/GlobalISel/legalize-and.mir
+++ b/llvm/test/CodeGen/AArch64/GlobalISel/legalize-and.mir
@@ -79,17 +79,16 @@ tracksRegLiveness: true
 body:             |
   bb.0:
     liveins: $x0
-
     ; CHECK-LABEL: name: test_s318_and
     ; CHECK: liveins: $x0
     ; CHECK-NEXT: {{  $}}
-    ; CHECK-NEXT: [[DEF:%[0-9]+]]:_(s64) = G_IMPLICIT_DEF
+    ; CHECK-NEXT: [[DEF:%[0-9]+]]:_(i64) = G_IMPLICIT_DEF
     ; CHECK-NEXT: %ptr:_(p0) = COPY $x0
-    ; CHECK-NEXT: [[AND:%[0-9]+]]:_(s64) = G_AND [[DEF]], [[DEF]]
-    ; CHECK-NEXT: [[AND1:%[0-9]+]]:_(s64) = G_AND [[DEF]], [[DEF]]
-    ; CHECK-NEXT: [[AND2:%[0-9]+]]:_(s64) = G_AND [[DEF]], [[DEF]]
-    ; CHECK-NEXT: [[AND3:%[0-9]+]]:_(s64) = G_AND [[DEF]], [[DEF]]
-    ; CHECK-NEXT: [[AND4:%[0-9]+]]:_(s64) = G_AND [[DEF]], [[DEF]]
+    ; CHECK-NEXT: [[AND:%[0-9]+]]:_(i64) = G_AND [[DEF]], [[DEF]]
+    ; CHECK-NEXT: [[AND1:%[0-9]+]]:_(i64) = G_AND [[DEF]], [[DEF]]
+    ; CHECK-NEXT: [[AND2:%[0-9]+]]:_(i64) = G_AND [[DEF]], [[DEF]]
+    ; CHECK-NEXT: [[AND3:%[0-9]+]]:_(i64) = G_AND [[DEF]], [[DEF]]
+    ; CHECK-NEXT: [[AND4:%[0-9]+]]:_(i64) = G_AND [[DEF]], [[DEF]]
     ; CHECK-NEXT: [[C:%[0-9]+]]:_(i64) = G_CONSTANT i64 -1
     ; CHECK-NEXT: [[C1:%[0-9]+]]:_(i64) = G_CONSTANT i64 4611686018427387903
     ; CHECK-NEXT: [[AND5:%[0-9]+]]:_(i64) = G_AND [[AND]], [[C]]
@@ -111,11 +110,11 @@ body:             |
     ; CHECK-NEXT: [[PTR_ADD3:%[0-9]+]]:_(p0) = nuw inbounds G_PTR_ADD %ptr, [[C5]](i64)
     ; CHECK-NEXT: G_STORE [[AND9]](i64), [[PTR_ADD3]](p0) :: (store (i64) into unknown-address + 32, align 32)
     ; CHECK-NEXT: RET_ReallyLR implicit $x0
-    %a:_(s318) = G_IMPLICIT_DEF
-    %b:_(s318) = G_IMPLICIT_DEF
+    %a:_(i318) = G_IMPLICIT_DEF
+    %b:_(i318) = G_IMPLICIT_DEF
     %ptr:_(p0) = COPY $x0
-    %and:_(s318) = G_AND %a, %b
-    G_STORE %and(s318), %ptr(p0) :: (store (s318))
+    %and:_(i318) = G_AND %a, %b
+    G_STORE %and(i318), %ptr(p0) :: (store (i318))
     RET_ReallyLR implicit $x0
 ...
 ---
@@ -127,39 +126,32 @@ body:             |
     ; CHECK-LABEL: name: test_s158_and
     ; CHECK: liveins: $x0
     ; CHECK-NEXT: {{  $}}
-    ; CHECK-NEXT: [[DEF:%[0-9]+]]:_(s64) = G_IMPLICIT_DEF
+    ; CHECK-NEXT: [[DEF:%[0-9]+]]:_(i64) = G_IMPLICIT_DEF
     ; CHECK-NEXT: %ptr:_(p0) = COPY $x0
-    ; CHECK-NEXT: [[AND:%[0-9]+]]:_(s64) = G_AND [[DEF]], [[DEF]]
-    ; CHECK-NEXT: [[AND1:%[0-9]+]]:_(s64) = G_AND [[DEF]], [[DEF]]
-    ; CHECK-NEXT: [[AND2:%[0-9]+]]:_(s64) = G_AND [[DEF]], [[DEF]]
-    ; CHECK-NEXT: [[AND3:%[0-9]+]]:_(s64) = G_AND [[DEF]], [[DEF]]
-    ; CHECK-NEXT: [[AND4:%[0-9]+]]:_(s64) = G_AND [[DEF]], [[DEF]]
+    ; CHECK-NEXT: [[AND:%[0-9]+]]:_(i64) = G_AND [[DEF]], [[DEF]]
+    ; CHECK-NEXT: [[AND1:%[0-9]+]]:_(i64) = G_AND [[DEF]], [[DEF]]
+    ; CHECK-NEXT: [[AND2:%[0-9]+]]:_(i64) = G_AND [[DEF]], [[DEF]]
     ; CHECK-NEXT: [[C:%[0-9]+]]:_(i64) = G_CONSTANT i64 -1
-    ; CHECK-NEXT: [[C1:%[0-9]+]]:_(i64) = G_CONSTANT i64 4611686018427387903
-    ; CHECK-NEXT: [[AND5:%[0-9]+]]:_(i64) = G_AND [[AND]], [[C]]
-    ; CHECK-NEXT: [[AND6:%[0-9]+]]:_(i64) = G_AND [[AND1]], [[C]]
-    ; CHECK-NEXT: [[AND7:%[0-9]+]]:_(i64) = G_AND [[AND2]], [[C]]
-    ; CHECK-NEXT: [[AND8:%[0-9]+]]:_(i64) = G_AND [[AND3]], [[C]]
-    ; CHECK-NEXT: [[AND9:%[0-9]+]]:_(i64) = G_AND [[AND4]], [[C1]]
-    ; CHECK-NEXT: G_STORE [[AND5]](i64), %ptr(p0) :: (store (i64), align 64)
+    ; CHECK-NEXT: [[C1:%[0-9]+]]:_(i64) = G_CONSTANT i64 1073741823
+    ; CHECK-NEXT: [[AND3:%[0-9]+]]:_(i64) = G_AND [[AND]], [[C]]
+    ; CHECK-NEXT: [[AND4:%[0-9]+]]:_(i64) = G_AND [[AND1]], [[C]]
+    ; CHECK-NEXT: [[AND5:%[0-9]+]]:_(i64) = G_AND [[AND2]], [[C1]]
+    ; CHECK-NEXT: [[COPY:%[0-9]+]]:_(i64) = COPY [[AND3]](i64)
+    ; CHECK-NEXT: [[COPY1:%[0-9]+]]:_(i64) = COPY [[AND4]](i64)
+    ; CHECK-NEXT: [[EXTRACT:%[0-9]+]]:_(i32) = G_EXTRACT [[AND5]](i64), 0
+    ; CHECK-NEXT: G_STORE [[COPY]](i64), %ptr(p0) :: (store (i64), align 32)
     ; CHECK-NEXT: [[C2:%[0-9]+]]:_(i64) = G_CONSTANT i64 8
     ; CHECK-NEXT: [[PTR_ADD:%[0-9]+]]:_(p0) = nuw inbounds G_PTR_ADD %ptr, [[C2]](i64)
-    ; CHECK-NEXT: G_STORE [[AND6]](i64), [[PTR_ADD]](p0) :: (store (i64) into unknown-address + 8)
+    ; CHECK-NEXT: G_STORE [[COPY1]](i64), [[PTR_ADD]](p0) :: (store (i64) into unknown-address + 8)
     ; CHECK-NEXT: [[C3:%[0-9]+]]:_(i64) = G_CONSTANT i64 16
     ; CHECK-NEXT: [[PTR_ADD1:%[0-9]+]]:_(p0) = nuw inbounds G_PTR_ADD %ptr, [[C3]](i64)
-    ; CHECK-NEXT: G_STORE [[AND7]](i64), [[PTR_ADD1]](p0) :: (store (i64) into unknown-address + 16, align 16)
-    ; CHECK-NEXT: [[C4:%[0-9]+]]:_(i64) = G_CONSTANT i64 24
-    ; CHECK-NEXT: [[PTR_ADD2:%[0-9]+]]:_(p0) = nuw inbounds G_PTR_ADD %ptr, [[C4]](i64)
-    ; CHECK-NEXT: G_STORE [[AND8]](i64), [[PTR_ADD2]](p0) :: (store (i64) into unknown-address + 24)
-    ; CHECK-NEXT: [[C5:%[0-9]+]]:_(i64) = G_CONSTANT i64 32
-    ; CHECK-NEXT: [[PTR_ADD3:%[0-9]+]]:_(p0) = nuw inbounds G_PTR_ADD %ptr, [[C5]](i64)
-    ; CHECK-NEXT: G_STORE [[AND9]](i64), [[PTR_ADD3]](p0) :: (store (i64) into unknown-address + 32, align 32)
+    ; CHECK-NEXT: G_STORE [[EXTRACT]](i32), [[PTR_ADD1]](p0) :: (store (i32) into unknown-address + 16, align 16)
     ; CHECK-NEXT: RET_ReallyLR implicit $x0
-    %a:_(s318) = G_IMPLICIT_DEF
-    %b:_(s318) = G_IMPLICIT_DEF
+    %a:_(i158) = G_IMPLICIT_DEF
+    %b:_(i158) = G_IMPLICIT_DEF
     %ptr:_(p0) = COPY $x0
-    %and:_(s318) = G_AND %a, %b
-    G_STORE %and(s318), %ptr(p0) :: (store (s318))
+    %and:_(i158) = G_AND %a, %b
+    G_STORE %and(i158), %ptr(p0) :: (store (i158))
     RET_ReallyLR implicit $x0
 
 ...
diff --git a/llvm/test/CodeGen/AArch64/GlobalISel/legalize-or.mir b/llvm/test/CodeGen/AArch64/GlobalISel/legalize-or.mir
index c28f91bc266b4..111d3cba57b53 100644
--- a/llvm/test/CodeGen/AArch64/GlobalISel/legalize-or.mir
+++ b/llvm/test/CodeGen/AArch64/GlobalISel/legalize-or.mir
@@ -9,19 +9,19 @@ body: |
     ; CHECK-LABEL: name: test_scalar_or_small
     ; CHECK: liveins: $x0, $x1, $x2, $x3
     ; CHECK-NEXT: {{  $}}
-    ; CHECK-NEXT: [[COPY:%[0-9]+]]:_(s64) = COPY $x0
-    ; CHECK-NEXT: [[COPY1:%[0-9]+]]:_(s64) = COPY $x1
-    ; CHECK-NEXT: [[TRUNC:%[0-9]+]]:_(s32) = G_TRUNC [[COPY]](s64)
-    ; CHECK-NEXT: [[TRUNC1:%[0-9]+]]:_(s32) = G_TRUNC [[COPY1]](s64)
-    ; CHECK-NEXT: [[OR:%[0-9]+]]:_(s32) = G_OR [[TRUNC]], [[TRUNC1]]
-    ; CHECK-NEXT: [[ANYEXT:%[0-9]+]]:_(s64) = G_ANYEXT [[OR]](s32)
-    ; CHECK-NEXT: $x0 = COPY [[ANYEXT]](s64)
-    %0:_(s64) = COPY $x0
-    %1:_(s64) = COPY $x1
-    %2:_(s8) = G_TRUNC %0
-    %3:_(s8) = G_TRUNC %1
-    %4:_(s8) = G_OR %2, %3
-    %5:_(s64) = G_ANYEXT %4
+    ; CHECK-NEXT: [[COPY:%[0-9]+]]:_(i64) = COPY $x0
+    ; CHECK-NEXT: [[COPY1:%[0-9]+]]:_(i64) = COPY $x1
+    ; CHECK-NEXT: [[TRUNC:%[0-9]+]]:_(i32) = G_TRUNC [[COPY]](i64)
+    ; CHECK-NEXT: [[TRUNC1:%[0-9]+]]:_(i32) = G_TRUNC [[COPY1]](i64)
+    ; CHECK-NEXT: [[OR:%[0-9]+]]:_(i32) = G_OR [[TRUNC]], [[TRUNC1]]
+    ; CHECK-NEXT: [[ANYEXT:%[0-9]+]]:_(i64) = G_ANYEXT [[OR]](i32)
+    ; CHECK-NEXT: $x0 = COPY [[ANYEXT]](i64)
+    %0:_(i64) = COPY $x0
+    %1:_(i64) = COPY $x1
+    %2:_(i8) = G_TRUNC %0
+    %3:_(i8) = G_TRUNC %1
+    %4:_(i8) = G_OR %2, %3
+    %5:_(i64) = G_ANYEXT %4
     $x0 = COPY %5
 ...
 
@@ -37,44 +37,43 @@ body: |
     ; CHECK-LABEL: name: test_big_scalar_power_of_2
     ; CHECK: liveins: $x0, $x1, $x2, $x3
     ; CHECK-NEXT: {{  $}}
-    ; CHECK-NEXT: [[COPY:%[0-9]+]]:_(s64) = COPY $x0
-    ; CHECK-NEXT: [[COPY1:%[0-9]+]]:_(s64) = COPY $x1
-    ; CHECK-NEXT: [[COPY2:%[0-9]+]]:_(s64) = COPY $x2
-    ; CHECK-NEXT: [[COPY3:%[0-9]+]]:_(s64) = COPY $x3
-    ; CHECK-NEXT: [[OR:%[0-9]+]]:_(s64) = G_OR [[COPY]], [[COPY2]]
-    ; CHECK-NEXT: [[OR1:%[0-9]+]]:_(s64) = G_OR [[COPY1]], [[COPY3]]
-    ; CHECK-NEXT: $x0 = COPY [[OR]](s64)
-    ; CHECK-NEXT: $x1 = COPY [[OR1]](s64)
+    ; CHECK-NEXT: [[COPY:%[0-9]+]]:_(i64) = COPY $x0
+    ; CHECK-NEXT: [[COPY1:%[0-9]+]]:_(i64) = COPY $x1
+    ; CHECK-NEXT: [[COPY2:%[0-9]+]]:_(i64) = COPY $x2
+    ; CHECK-NEXT: [[COPY3:%[0-9]+]]:_(i64) = COPY $x3
+    ; CHECK-NEXT: [[OR:%[0-9]+]]:_(i64) = G_OR [[COPY]], [[COPY2]]
+    ; CHECK-NEXT: [[OR1:%[0-9]+]]:_(i64) = G_OR [[COPY1]], [[COPY3]]
+    ; CHECK-NEXT: $x0 = COPY [[OR]](i64)
+    ; CHECK-NEXT: $x1 = COPY [[OR1]](i64)
     ; CHECK-NEXT: RET_ReallyLR implicit $x0, implicit $x1
-    %0:_(s64) = COPY $x0
-    %1:_(s64) = COPY $x1
-    %2:_(s64) = COPY $x2
-    %3:_(s64) = COPY $x3
-    %4:_(s128) = G_MERGE_VALUES %0, %1
-    %5:_(s128) = G_MERGE_VALUES %2, %3
-    %6:_(s128) = G_OR %4, %5
-    %7:_(s64), %8:_(s64) = G_UNMERGE_VALUES %6
+    %0:_(i64) = COPY $x0
+    %1:_(i64) = COPY $x1
+    %2:_(i64) = COPY $x2
+    %3:_(i64) = COPY $x3
+    %4:_(i128) = G_MERGE_VALUES %0, %1
+    %5:_(i128) = G_MERGE_VALUES %2, %3
+    %6:_(i128) = G_OR %4, %5
+    %7:_(i64), %8:_(i64) = G_UNMERGE_VALUES %6
     $x0 = COPY %7
     $x1 = COPY %8
     RET_ReallyLR implicit $x0, implicit $x1
 ...
 ---
-name:            test_s318_or
+name:            test_i318_or
 tracksRegLiveness: true
 body:             |
   bb.0:
     liveins: $x0
-
-    ; CHECK-LABEL: name: test_s318_or
+    ; CHECK-LABEL: name: test_i318_or
     ; CHECK: liveins: $x0
     ; CHECK-NEXT: {{  $}}
-    ; CHECK-NEXT: [[DEF:%[0-9]+]]:_(s64) = G_IMPLICIT_DEF
+    ; CHECK-NEXT: [[DEF:%[0-9]+]]:_(i64) = G_IMPLICIT_DEF
     ; CHECK-NEXT: %ptr:_(p0) = COPY $x0
-    ; CHECK-NEXT: [[OR:%[0-9]+]]:_(s64) = G_OR [[DEF]], [[DEF]]
-    ; CHECK-NEXT: [[OR1:%[0-9]+]]:_(s64) = G_OR [[DEF]], [[DEF]]
-    ; CHECK-NEXT: [[OR2:%[0-9]+]]:_(s64) = G_OR [[DEF]], [[DEF]]
-    ; CHECK-NEXT: [[OR3:%[0-9]+]]:_(s64) = G_OR [[DEF]], [[DEF]]
-    ; CHECK-NEXT: [[OR4:%[0-9]+]]:_(s64) = G_OR [[DEF]], [[DEF]]
+    ; CHECK-NEXT: [[OR:%[0-9]+]]:_(i64) = G_OR [[DEF]], [[DEF]]
+    ; CHECK-NEXT: [[OR1:%[0-9]+]]:_(i64) = G_OR [[DEF]], [[DEF]]
+    ; CHECK-NEXT: [[OR2:%[0-9]+]]:_(i64) = G_OR [[DEF]], [[DEF]]
+    ; CHECK-NEXT: [[OR3:%[0-9]+]]:_(i64) = G_OR [[DEF]], [[DEF]]
+    ; CHECK-NEXT: [[OR4:%[0-9]+]]:_(i64) = G_OR [[DEF]], [[DEF]]
     ; CHECK-NEXT: [[C:%[0-9]+]]:_(i64) = G_CONSTANT i64 -1
     ; CHECK-NEXT: [[C1:%[0-9]+]]:_(i64) = G_CONSTANT i64 4611686018427387903
     ; CHECK-NEXT: [[AND:%[0-9]+]]:_(i64) = G_AND [[OR]], [[C]]
@@ -96,11 +95,11 @@ body:             |
     ; CHECK-NEXT: [[PTR_ADD3:%[0-9]+]]:_(p0) = nuw inbounds G_PTR_ADD %ptr, [[C5]](i64)
     ; CHECK-NEXT: G_STORE [[AND4]](i64), [[PTR_ADD3]](p0) :: (store (i64) into unknown-address + 32, align 32)
     ; CHECK-NEXT: RET_ReallyLR implicit $x0
-    %a:_(s318) = G_IMPLICIT_DEF
-    %b:_(s318) = G_IMPLICIT_DEF
+    %a:_(i318) = G_IMPLICIT_DEF
+    %b:_(i318) = G_IMPLICIT_DEF
     %ptr:_(p0) = COPY $x0
-    %or:_(s318) = G_OR %a, %b
-    G_STORE %or(s318), %ptr(p0) :: (store (s318))
+    %or:_(i318) = G_OR %a, %b
+    G_STORE %or(i318), %ptr(p0) :: (store (i318))
     RET_ReallyLR implicit $x0
 
 ...
@@ -109,19 +108,19 @@ name:            test_vector_or_v16s16
 body:             |
   bb.0.entry:
     ; CHECK-LABEL: name: test_vector_or_v16s16
-    ; CHECK: [[COPY:%[0-9]+]]:_(<8 x s16>) = COPY $q0
-    ; CHECK-NEXT: [[COPY1:%[0-9]+]]:_(<8 x s16>) = COPY $q1
-    ; CHECK-NEXT: [[OR:%[0-9]+]]:_(<8 x s16>) = G_OR [[COPY]], [[COPY]]
-    ; CHECK-NEXT: [[OR1:%[0-9]+]]:_(<8 x s16>) = G_OR [[COPY1]], [[COPY1]]
-    ; CHECK-NEXT: $q0 = COPY [[OR]](<8 x s16>)
-    ; CHECK-NEXT: $q1 = COPY [[OR1]](<8 x s16>)
-    %1:_(<8 x s16>) = COPY $q0
-    %2:_(<8 x s16>) = COPY $q1
-    %0:_(<16 x s16>) = G_CONCAT_VECTORS %1(<8 x s16>), %2(<8 x s16>)
-    %3:_(<16 x s16>) = G_OR %0, %0
-    %4:_(<8 x s16>), %5:_(<8 x s16>) = G_UNMERGE_VALUES %3(<16 x s16>)
-    $q0 = COPY %4(<8 x s16>)
-    $q1 = COPY %5(<8 x s16>)
+    ; CHECK: [[COPY:%[0-9]+]]:_(<8 x i16>) = COPY $q0
+    ; CHECK-NEXT: [[COPY1:%[0-9]+]]:_(<8 x i16>) = COPY $q1
+    ; CHECK-NEXT: [[OR:%[0-9]+]]:_(<8 x i16>) = G_OR [[COPY]], [[COPY]]
+    ; CHECK-NEXT: [[OR1:%[0-9]+]]:_(<8 x i16>) = G_OR [[COPY1]], [[COPY1]]
+    ; CHECK-NEXT: $q0 = COPY [[OR]](<8 x i16>)
+    ; CHECK-NEXT: $q1 = COPY [[OR1]](<8 x i16>)
+    %1:_(<8 x i16>) = COPY $q0
+    %2:_(<8 x i16>) = COPY $q1
+    %0:_(<16 x i16>) = G_CONCAT_VECTORS %1(<8 x i16>), %2(<8 x i16>)
+    %3:_(<16 x i16>) = G_OR %0, %0
+    %4:_(<8 x i16>), %5:_(<8 x i16>) = G_UNMERGE_VALUES %3(<16 x i16>)
+    $q0 = COPY %4(<8 x i16>)
+    $q1 = COPY %5(<8 x i16>)
 
 ...
 ---
@@ -129,19 +128,19 @@ name:            test_vector_or_v32s8
 body:             |
   bb.0.entry:
     ; CHECK-LABEL: name: test_vector_or_v32s8
-    ; CHECK: [[COPY:%[0-9]+]]:_(<16 x s8>) = COPY $q0
-    ; CHECK-NEXT: [[COPY1:%[0-9]+]]:_(<16 x s8>) = COPY $q1
-    ; CHECK-NEXT: [[OR:%[0-9]+]]:_(<16 x s8>) = G_OR [[COPY]], [[COPY]]
-    ; CHECK-NEXT: [[OR1:%[0-9]+]]:_(<16 x s8>) = G_OR [[COPY1]], [[COPY1]]
-    ; CHECK-NEXT: $q0 = COPY [[OR]](<16 x s8>)
-    ; CHECK-NEXT: $q1 = COPY [[OR1]](<16 x s8>)
-    %0:_(<16 x s8>) = COPY $q0
-    %1:_(<16 x s8>) = COPY $q1
-    %2:_(<32 x s8>) = G_CONCAT_VECTORS %0, %1
-    %3:_(<32 x s8>) = G_OR %2, %2
-    %7:_(<16 x s8>), %8:_(<16 x s8>) = G_UNMERGE_VALUES %3(<32 x s8>)
-    $q0 = COPY %7(<16 x s8>)
-    $q1 = COPY %8(<16 x s8>)
+    ; CHECK: [[COPY:%[0-9]+]]:_(<16 x i8>) = COPY $q0
+    ; CHECK-NEXT: [[COPY1:%[0-9]+]]:_(<16 x i8>) = COPY $q1
+    ; CHECK-NEXT: [[OR:%[0-9]+]]:_(<16 x i8>) = G_OR [[COPY]], [[COPY]]
+    ; CHECK-NEXT: [[OR1:%[0-9]+]]:_(<16 x i8>) = G_OR [[COPY1]], [[COPY1]]
+    ; CHECK-NEXT: $q0 = COPY [[OR]](<16 x i8>)
+    ; CHECK-NEXT: $q1 = COPY [[OR1]](<16 x i8>)
+    %0:_(<16 x i8>) = COPY $q0
+    %1:_(<16 x i8>) = COPY $q1
+    %2:_(<32 x i8>) = G_CONCAT_VECTORS %0, %1
+    %3:_(<32 x i8>) = G_OR %2, %2
+    %7:_(<16 x i8>), %8:_(<16 x i8>) = G_UNMERGE_VALUES %3(<32 x i8>)
+    $q0 = COPY %7(<16 x i8>)
+    $q1 = COPY %8(<16 x i8>)
 
 ...
 ---
@@ -154,24 +153,24 @@ body:             |
     ; CHECK-LABEL: name: or_v2s1
     ; CHECK: liveins: $d0, $d1, $d2, $d3
     ; CHECK-NEXT: {{  $}}
-    ; CHECK-NEXT: [[COPY:%[0-9]+]]:_(<2 x s32>) = COPY $d0
-    ; CHECK-NEXT: [[COPY1:%[0-9]+]]:_(<2 x s32>) = COPY $d1
-    ; CHECK-NEXT: [[COPY2:%[0-9]+]]:_(<2 x s32>) = COPY $d2
-    ; CHECK-NEXT: [[COPY3:%[0-9]+]]:_(<2 x s32>) = COPY $d3
-    ; CHECK-NEXT: [[ICMP:%[0-9]+]]:_(<2 x s32>) = G_ICMP intpred(eq), [[COPY]](<2 x s32>), [[COPY1]]
-    ; CHECK-NEXT: [[ICMP1:%[0-9]+]]:_(<2 x s32>) = G_ICMP intpred(eq), [[COPY2]](<2 x s32>), [[COPY3]]
-    ; CHECK-NEXT: [[OR:%[0-9]+]]:_(<2 x s32>) = G_OR [[ICMP]], [[ICMP1]]
-    ; CHECK-NEXT: $d0 = COPY [[OR]](<2 x s32>)
+    ; CHECK-NEXT: [[COPY:%[0-9]+]]:_(<2 x i32>) = COPY $d0
+    ; CHECK-NEXT: [[COPY1:%[0-9]+]]:_(<2 x i32>) = COPY $d1
+    ; CHECK-NEXT: [[COPY2:%[0-9]+]]:_(<2 x i32>) = COPY $d2
+    ; CHECK-NEXT: [[COPY3:%[0-9]+]]:_(<2 x i32>) = COPY $d3
+    ; CHECK-NEXT: [[ICMP:%[0-9]+]]:_(<2 x i32>) = G_ICMP intpred(eq), [[COPY]](<2 x i32>), [[COPY1]]
+    ; CHECK-NEXT: [[ICMP1:%[0-9]+]]:_(<2 x i32>) = G_ICMP intpred(eq), [[COPY2]](<2 x i32>), [[COPY3]]
+    ; CHECK-NEXT: [[OR:%[0-9]+]]:_(<2 x i32>) = G_OR [[ICMP]], [[ICMP1]]
+    ; CHECK-NEXT: $d0 = COPY [[OR]](<2 x i32>)
     ; CHECK-NEXT: RET_ReallyLR implicit $d0
-    %0:_(<2 x s32>) = COPY $d0
-    %1:_(<2 x s32>) = COPY $d1
-    %2:_(<2 x s32>) = COPY $d2
-    %3:_(<2 x s32>) = COPY $d3
-    %4:_(<2 x s1>) = G_ICMP intpred(eq), %0(<2 x s32>), %1
-    %5:_(<2 x s1>) = G_ICMP intpred(eq), %2(<2 x s32>), %3
-    %6:_(<2 x s1>) = G_OR %4, %5
-    %7:_(<2 x s32>) = G_ANYEXT %6
-    $d0 = COPY %7:_(<2 x s32>)
+    %0:_(<2 x i32>) = COPY $d0
+    %1:_(<2 x i32>) = COPY $d1
+    %2:_(<2 x i32>) = COPY $d2
+    %3:_(<2 x i32>) = COPY $d3
+    %4:_(<2 x i1>) = G_ICMP intpred(eq), %0(<2 x i32>), %1
+    %5:_(<2 x i1>) = G_ICMP intpred(eq), %2(<2 x i32>), %3
+    %6:_(<2 x i1>) = G_OR %4, %5
+    %7:_(<2 x i32>) = G_ANYEXT %6
+    $d0 = COPY %7:_(<2 x i32>)
     RET_ReallyLR implicit $d0
 ...
 ---
@@ -184,32 +183,32 @@ body:             |
     ; CHECK-LABEL: name: or_v3s1
     ; CHECK: liveins: $b0, $b1, $b2
     ; CHECK-NEXT: {{  $}}
-    ; CHECK-NEXT: [[COPY:%[0-9]+]]:_(s8) = COPY $b0
-    ; CHECK-NEXT: [[COPY1:%[0-9]+]]:_(s8) = COPY $b1
-    ; CHECK-NEXT: [[COPY2:%[0-9]+]]:_(s8) = COPY $b2
-    ; CHECK-NEXT: [[ANYEXT:%[0-9]+]]:_(s16) = G_ANYEXT [[COPY]](s8)
-    ; CHECK-NEXT: [[ANYEXT1:%[0-9]+]]:_(s16) = G_ANYEXT [[COPY1]](s8)
-    ; CHECK-NEXT: [[ANYEXT2:%[0-9]+]]:_(s16) = G_ANYEXT [[COPY2]](s8)
-    ; CHECK-NEXT: [[DEF:%[0-9]+]]:_(s16) = G_IMPLICIT_DEF
-    ; CHECK-NEXT: [[BUILD_VECTOR:%[0-9]+]]:_(<4 x s16>) = G_BUILD_VECTOR [[ANYEXT]](s16), [[ANYEXT1]](s16), [[ANYEXT2]](s16), [[DEF]](s16)
-    ; CHECK-NEXT: [[ANYEXT3:%[0-9]+]]:_(s16) = G_ANYEXT [[COPY]](s8)
-    ; CHECK-NEXT: [[ANYEXT4:%[0-9]+]]:_(s16) = G_ANYEXT [[COPY1]](s8)
-    ; CHECK-NEXT: [[ANYEXT5:%[0-9]+]]:_(s16) = G_ANYEXT [[COPY2]](s8)
-    ; CHECK-NEXT: [[BUILD_VECTOR1:%[0-9]+]]:_(<4 x s16>) = G_BUILD_VECTOR [[ANYEXT3]](s16), [[ANYEXT4]](s16), [[ANYEXT5]](s16), [[DEF]](s16)
-    ; CHECK-NEXT: [[OR:%[0-9]+]]:_(<4 x s16>) = G_OR [[BUILD_VECTOR]], [[BUILD_VECTOR1]]
-    ; CHECK-NEXT: [[UV:%[0-9]+]]:_(s16), [[UV1:%[0-9]+]]:_(s16), [[UV2:%[0-9]+]]:_(s16), [[UV3:%[0-9]+]]:_(s16) = G_UNMERGE_VALUES [[OR]](<4 x s16>)
-    ; CHECK-NEXT: [[TRUNC:%[0-9]+]]:_(s8) = G_TRUNC [[UV]](s16)
-    ; CHECK-NEXT: $b0 = COPY [[TRUNC]](s8)
+    ; CHECK-NEXT: [[COPY:%[0-9]+]]:_(i8) = COPY $b0
+    ; CHECK-NEXT: [[COPY1:%[0-9]+]]:_(i8) = COPY $b1
+    ; CHECK-NEXT: [[COPY2:%[0-9]+]]:_(i8) = COPY $b2
+    ; CHECK-NEXT: [[ANYEXT:%[0-9]+]]:_(i16) = G_ANYEXT [[COPY]](i8)
+    ; CHECK-NEXT: [[ANYEXT1:%[0-9]+]]:_(i16) = G_ANYEXT [[COPY1]](i8)
+    ; CHECK-NEXT: [[ANYEXT2:%[0-9]+]]:_(i16) = G_ANYEXT [[COPY2]](i8)
+    ; CHECK-NEXT: [[DEF:%[0-9]+]]:_(i16) = G_IMPLICIT_DEF
+    ; CHECK-NEXT: [[BUILD_VECTOR:%[0-9]+]]:_(<4 x i16>) = G_BUILD_VECTOR [[ANYEXT]](i16), [[ANYEXT1]](i16), [[ANYEXT2]](i16), [[DEF]](i16)
+    ; CHECK-NEXT: [[ANYEXT3:%[0-9]+]]:_(i16) = G_ANYEXT [[COPY]](i8)
+    ; CHECK-NEXT: [[ANYEXT4:%[0-9]+]]:_(i16) = G_ANYEXT [[COPY1]](i8)
+    ; CHECK-NEXT: [[ANYEXT5:%[0-9]+]]:_(i16) = G_ANYEXT [[COPY2]](i8)
+    ; CHECK-NEXT: [[BUILD_VECTOR1:%[0-9]+]]:_(<4 x i16>) = G_BUILD_VECTOR [[ANYEXT3]](i16), [[ANYEXT4]](i16), [[ANYEXT5]](i16), [[DEF]](i16)
+    ; CHECK-NEXT: [[OR:%[0-9]+]]:_(<4 x i16>) = G_OR [[BUILD_VECTOR]], [[BUILD_VECTOR1]]
+    ; CHECK-NEXT: [[UV:%[0-9]+]]:_(i16), [[UV1:%[0-9]+]]:_(i16), [[UV2:%[0-9]+]]:_(i16), [[UV3:%[0-9]+]]:_(i16) = G_UNMERGE_VALUES [[OR]](<4 x i16>)
+    ; CHECK-NEXT: [[TRUNC:%[0-9]+]]:_(i8) = G_TRUNC [[UV]](i16)
+    ; CHECK-NEXT: $b0 = COPY [[TRUNC]](i8)
     ; CHECK-NEXT: RET_ReallyLR implicit $b0
-    %1:_(s8) = COPY $b0
-    %2:_(s8) = COPY $b1
-    %3:_(s8) = COPY $b2
-    %4:_(<3 x s8>) = G_BUILD_VECTOR %1(s8), %2(s8), %3(s8)
-    %0:_(<3 x s1>) = G_TRUNC %4(<3 x s8>)
-    %5:_(<3 x s1>) = G_OR %0, %0
-    %7:_(<3 x s8>) = G_ANYEXT %5(<3 x s1>)
-    %8:_(s8), %9:_(s8), %10:_(s8) = G_UNMERGE_VALUES %7(<3 x s8>)
-    $b0 = COPY %8:_(s8)
+    %1:_(i8) = COPY $b0
+    %2:_(i8) = COPY $b1
+    %3:_(i8) = COPY $b2
+    %4:_(<3 x i8>) = G_BUILD_VECTOR %1(i8), %2(i8), %3(i8)
+    %0:_(<3 x i1>) = G_TRUNC %4(<3 x i8>)
+    %5:_(<3 x i1>) = G_OR %0, %0
+    %7:_(<3 x i8>) = G_ANYEXT %5(<3 x i1>)
+    %8:_(i8), %9:_(i8), %10:_(i8) = G_UNMERGE_VALUES %7(<3 x i8>)
+    $b0 = COPY %8:_(i8)
     RET_ReallyLR implicit $b0
 ...
 ---
@@ -222,24 +221,24 @@ body:             |
     ; CHECK-LABEL: name: or_v4s1
     ; CHECK: liveins: $d0, $d1, $d2, $d3
     ; CHECK-NEXT: {{  $}}
-    ; CHECK-NEXT: [[COPY:%[0-9]+]]:_(<4 x s16>) = COPY $d0
-    ; CHECK-NEXT: [[COPY1:%[0-9]+]]:_(<4 x s16>) = COPY $d1
-    ; CHECK-NEXT: [[COPY2:%[0-9]+]]:_(<4 x s16>) = COPY $d2
-    ; CHECK-NEXT: [[COPY3:%[0-9]+]]:_(<4 x s16>) = COPY $d3
-    ; CHECK-NEXT: [[ICMP:%[0-9]+]]:_(<4 x s16>) = G_ICMP intpred(eq), [[COPY]](<4 x s16>), [[COPY1]]
-    ; CHECK-NEXT: [[ICMP1:%[0-9]+]]:_(<4 x s16>) = G_ICMP intpred(eq), [[COPY2]](<4 x s16>), [[COPY3]]
-    ; CHECK-NEXT: [[OR:%[0-9]+]]:_(<4 x s16>) = G_OR [[ICMP]], [[ICMP1]]
-    ; CHECK-NEXT: $d0 = COPY [[OR]](<4 x s16>)
+    ; CHECK-NEXT: [[COPY:%[0-9]+]]:_(<4 x i16>) = COPY $d0
+    ; CHECK-NEXT: [[COPY1:%[0-9]+]]:_(<4 x i16>) = COPY $d1
+    ; CHECK-NEXT: [[COPY2:%[0-9]+]]:_(<4 x i16>) = COPY $d2
+    ; CHECK-NEXT: [[COPY3:%[0-9]+]]:_(<4 x i16>) = COPY $d3
+    ; CHECK-NEXT: [[ICMP:%[0-9]+]]:_(<4 x i16>) = G_ICMP intpred(eq), [[COPY]](<4 x i16>), [[COPY1]]
+    ; CHECK-NEXT: [[ICMP1:%[0-9]+]]:_(<4 x i16>) = G_ICMP intpred(eq), [[COPY2]](<4 x i16>), [[COPY3]]
+    ; CHECK-NEXT: [[OR:%[0-9]+]]:_(<4 x i16>) = G_OR [[ICMP]], [[ICMP1]]
+    ; CHECK-NEXT: $d0 = COPY [[OR]](<4 x i16>)
     ; CHECK-NEXT: RET_ReallyLR implicit $d0
-    %0:_(<4 x s16>) = COPY $d0
-    %1:_(<4 x s16>) = COPY $d1
-    %2:_(<4 x s16>) = COPY $d2
-    %3:_(<4 x s16>) = COPY $d3
-    %4:_(<4 x s1>) = G_ICMP intpred(eq), %0(<4 x s16>), %1
-    %5:_(<4 x s1>) = G_ICMP intpred(eq), %2(<4 x s16>), %3
-    %6:_(<4 x s1>) = G_OR %4, %5
-    %7:_(<4 x s16>) = G_ANYEXT %6
-    $d0 = COPY %7:_(<4 x s16>)
+    %0:_(<4 x i16>) = COPY $d0
+    %1:_(<4 x i16>) = COPY $d1
+    %2:_(<4 x i16>) = COPY $d2
+    %3:_(<4 x i16>) = COPY $d3
+    %4:_(<4 x i1>) = G_ICMP intpred(eq), %0(<4 x i16>), %1
+    %5:_(<4 x i1>) = G_ICMP intpred(eq), %2(<4 x i16>), %3
+    %6:_(<4 x i1>) = G_OR %4, %5
+    %7:_(<4 x i16>) = G_ANYEXT %6
+    $d0 = COPY %7:_(<4 x i16>)
     RET_ReallyLR implicit $d0
 ...
 ---
@@ -252,24 +251,24 @@ body:             |
     ; CHECK-LABEL: name: or_v8s1
     ; CHECK: liveins: $d0, $d1, $d2, $d3
     ; CHECK-NEXT: {{  $}}
-    ; CHECK-NEXT: [[COPY:%[0-9]+]]:_(<8 x s8>) = COPY $d0
-    ; CHECK-NEXT: [[COPY1:%[0-9]+]]:_(<8 x s8>) = COPY $d1
-    ; CHECK-NEXT: [[COPY2:%[0-9]+]]:_(<8 x s8>) = COPY $d2
-    ; CHECK-NEXT: [[COPY3:%[0-9]+]]:_(<8 x s8>) = COPY $d3
-    ; CHECK-NEXT: [[ICMP:%[0-9]+]]:_(<8 x s8>) = G_ICMP intpred(eq), [[COPY]](<8 x s8>), [[COPY1]]
-    ; CHECK-NEXT: [[ICMP1:%[0-9]+]]:_(<8 x s8>) = G_ICMP intpred(eq), [[COPY2]](<8 x s8>), [[COPY3]]
-    ; CHECK-NEXT: [[OR:%[0-9]+]]:_(<8 x s8>) = G_OR [[ICMP]], [[ICMP1]]
-    ; CHECK-NEXT: $d0 = COPY [[OR]](<8 x s8>)
+    ; CHECK-NEXT: [[COPY:%[0-9]+]]:_(<8 x i8>) = COPY $d0
+    ; CHECK-NEXT: [[COPY1:%[0-9]+]]:_(<8 x i8>) = COPY $d1
+    ; CHECK-NEXT: [[COPY2:%[0-9]+]]:_(<8 x i8>) = COPY $d2
+    ; CHECK-NEXT: [[COPY3:%[0-9]+]]:_(<8 x i8>) = COPY $d3
+    ; CHECK-NEXT: [[ICMP:%[0-9]+]]:_(<8 x i8>) = G_ICMP intpred(eq), [[COPY]](<8 x i8>), [[COPY1]]
+    ; CHECK-NEXT: [[ICMP1:%[0-9]+]]:_(<8 x i8>) = G_ICMP intpred(eq), [[COPY2]](<8 x i8>), [[COPY3]]
+    ; CHECK-NEXT: [[OR:%[0-9]+]]:_(<8 x i8>) = G_OR [[ICMP]], [[ICMP1]]
+    ; CHECK-NEXT: $d0 = COPY [[OR]](<8 x i8>)
     ; CHECK-NEXT: RET_ReallyLR implicit $d0
-    %0:_(<8 x s8>) = COPY $d0
-    %1:_(<8 x s8>) = COPY $d1
-    %2:_(<8 x s8>) = COPY $d2
-    %3:_(<8 x s8>) = COPY $d3
-    %4:_(<8 x s1>) = G_ICMP intpred(eq), %0(<8 x s8>), %1
-    %5:_(<8 x s1>) = G_ICMP intpred(eq), %2(<8 x s8>), %3
-    %6:_(<8 x s1>) = G_OR %4, %5
-    %7:_(<8 x s8>) = G_ANYEXT %6
-    $d0 = COPY %7:_(<8 x s8>)
+    %0:_(<8 x i8>) = COPY $d0
+    %1:_(<8 x i8>) = COPY $d1
+    %2:_(<8 x i8>) = COPY $d2
+    %3:_(<8 x i8>) = COPY $d3
+    %4:_(<8 x i1>) = G_ICMP intpred(eq), %0(<8 x i8>), %1
+    %5:_(<8 x i1>) = G_ICMP intpred(eq), %2(<8 x i8>), %3
+    %6:_(<8 x i1>) = G_OR %4, %5
+    %7:_(<8 x i8>) = G_ANYEXT %6
+    $d0 = COPY %7:_(<8 x i8>)
     RET_ReallyLR implicit $d0
 ...
 ---
@@ -282,23 +281,23 @@ body:             |
     ; CHECK-LABEL: name: or_v16s1
     ; CHECK: liveins: $q0, $q1, $q2, $q3
     ; CHECK-NEXT: {{  $}}
-    ; CHECK-NEXT: [[COPY:%[0-9]+]]:_(<16 x s8>) = COPY $q0
-    ; CHECK-NEXT: [[COPY1:%[0-9]+]]:_(<16 x s8>) = COPY $q1
-    ; CHECK-NEXT: [[COPY2:%[0-9]+]]:_(<16 x s8>) = COPY $q2
-    ; CHECK-NEXT: [[COPY3:%[0-9]+]]:_(<16 x s8>) = COPY $q3
-    ; CHECK-NEXT: [[ICMP:%[0-9]+]]:_(<16 x s8>) = G_ICMP intpred(eq), [[COPY]](<16 x s8>), [[COPY1]]
-    ; CHECK-NEXT: [[ICMP1:%[0-9]+]]:_(<16 x s8>) = G_ICMP intpred(eq), [[COPY2]](<16 x s8>), [[COPY3]]
-    ; CHECK-NEXT: [[OR:%[0-9]+]]:_(<16 x s8>) = G_OR [[ICMP]], [[ICMP1]]
-    ; CHECK-NEXT: $q0 = COPY [[OR]](<16 x s8>)
+    ; CHECK-NEXT: [[COPY:%[0-9]+]]:_(<16 x i8>) = COPY $q0
+    ; CHECK-NEXT: [[COPY1:%[0-9]+]]:_(<16 x i8>) = COPY $q1
+    ; CHECK-NEXT: [[COPY2:%[0-9]+]]:_(<16 x i8>) = COPY $q2
+    ; CHECK-NEXT: [[COPY3:%[0-9]+]]:_(<16 x i8>) = COPY $q3
+    ; CHECK-NEXT: [[ICMP:%[0-9]+]]:_(<16 x i8>) = G_ICMP intpred(eq), [[COPY]](<16 x i8>), [[COPY1]]
+    ; CHECK-NEXT: [[ICMP1:%[0-9]+]]:_(<16 x i8>) = G_ICMP intpred(eq), [[COPY2]](<16 x i8>), [[COPY3]]
+    ; CHECK-NEXT: [[OR:%[0-9]+]]:_(<16 x i8>) = G_OR [[ICMP]], [[ICMP1]]
+    ; CHECK-NEXT: $q0 = COPY [[OR]](<16 x i8>)
     ; CHECK-NEXT: RET_ReallyLR implicit $q0
-    %0:_(<16 x s8>) = COPY $q0
-    %1:_(<16 x s8>) = COPY $q1
-    %2:_(<16 x s8>) = COPY $q2
-    %3:_(<16 x s8>) = COPY $q3
-    %4:_(<16 x s1>) = G_ICMP intpred(eq), %0(<16 x s8>), %1
-    %5:_(<16 x s1>) = G_ICMP intpred(eq), %2(<16 x s8>), %3
-    %6:_(<16 x s1>) = G_OR %4, %5
-    %7:_(<16 x s8>) = G_ANYEXT %6
-    $q0 = COPY %7:_(<16 x s8>)
+    %0:_(<16 x i8>) = COPY $q0
+    %1:_(<16 x i8>) = COPY $q1
+    %2:_(<16 x i8>) = COPY $q2
+    %3:_(<16 x i8>) = COPY $q3
+    %4:_(<16 x i1>) = G_ICMP intpred(eq), %0(<16 x i8>), %1
+    %5:_(<16 x i1>) = G_ICMP intpred(eq), %2(<16 x i8>), %3
+    %6:_(<16 x i1>) = G_OR %4, %5
+    %7:_(<16 x i8>) = G_ANYEXT %6
+    $q0 = COPY %7:_(<16 x i8>)
     RET_ReallyLR implicit $q0
 ...
diff --git a/llvm/test/CodeGen/AArch64/GlobalISel/legalize-xor.mir b/llvm/test/CodeGen/AArch64/GlobalISel/legalize-xor.mir
index 862ad0ccd2fa7..dfcf0398fa3dc 100644
--- a/llvm/test/CodeGen/AArch64/GlobalISel/legalize-xor.mir
+++ b/llvm/test/CodeGen/AArch64/GlobalISel/legalize-xor.mir
@@ -5,20 +5,20 @@ name:            test_scalar_xor_small
 body:             |
   bb.0.entry:
     ; CHECK-LABEL: name: test_scalar_xor_small
-    ; CHECK: [[COPY:%[0-9]+]]:_(s64) = COPY $x0
-    ; CHECK-NEXT: [[COPY1:%[0-9]+]]:_(s64) = COPY $x1
-    ; CHECK-NEXT: [[TRUNC:%[0-9]+]]:_(s32) = G_TRUNC [[COPY]](s64)
-    ; CHECK-NEXT: [[TRUNC1:%[0-9]+]]:_(s32) = G_TRUNC [[COPY1]](s64)
-    ; CHECK-NEXT: [[XOR:%[0-9]+]]:_(s32) = G_XOR [[TRUNC]], [[TRUNC1]]
-    ; CHECK-NEXT: [[ANYEXT:%[0-9]+]]:_(s64) = G_ANYEXT [[XOR]](s32)
-    ; CHECK-NEXT: $x0 = COPY [[ANYEXT]](s64)
-    %0:_(s64) = COPY $x0
-    %1:_(s64) = COPY $x1
-    %2:_(s8) = G_TRUNC %0(s64)
-    %3:_(s8) = G_TRUNC %1(s64)
-    %4:_(s8) = G_XOR %2, %3
-    %5:_(s64) = G_ANYEXT %4(s8)
-    $x0 = COPY %5(s64)
+    ; CHECK: [[COPY:%[0-9]+]]:_(i64) = COPY $x0
+    ; CHECK-NEXT: [[COPY1:%[0-9]+]]:_(i64) = COPY $x1
+    ; CHECK-NEXT: [[TRUNC:%[0-9]+]]:_(i32) = G_TRUNC [[COPY]](i64)
+    ; CHECK-NEXT: [[TRUNC1:%[0-9]+]]:_(i32) = G_TRUNC [[COPY1]](i64)
+    ; CHECK-NEXT: [[XOR:%[0-9]+]]:_(i32) = G_XOR [[TRUNC]], [[TRUNC1]]
+    ; CHECK-NEXT: [[ANYEXT:%[0-9]+]]:_(i64) = G_ANYEXT [[XOR]](i32)
+    ; CHECK-NEXT: $x0 = COPY [[ANYEXT]](i64)
+    %0:_(i64) = COPY $x0
+    %1:_(i64) = COPY $x1
+    %2:_(i8) = G_TRUNC %0(i64)
+    %3:_(i8) = G_TRUNC %1(i64)
+    %4:_(i8) = G_XOR %2, %3
+    %5:_(i64) = G_ANYEXT %4(i8)
+    $x0 = COPY %5(i64)
 
 ...
 ---
@@ -30,13 +30,13 @@ body:             |
     ; CHECK-LABEL: name: test_s318_xor
     ; CHECK: liveins: $x0
     ; CHECK-NEXT: {{  $}}
-    ; CHECK-NEXT: [[DEF:%[0-9]+]]:_(s64) = G_IMPLICIT_DEF
+    ; CHECK-NEXT: [[DEF:%[0-9]+]]:_(i64) = G_IMPLICIT_DEF
     ; CHECK-NEXT: %ptr:_(p0) = COPY $x0
-    ; CHECK-NEXT: [[XOR:%[0-9]+]]:_(s64) = G_XOR [[DEF]], [[DEF]]
-    ; CHECK-NEXT: [[XOR1:%[0-9]+]]:_(s64) = G_XOR [[DEF]], [[DEF]]
-    ; CHECK-NEXT: [[XOR2:%[0-9]+]]:_(s64) = G_XOR [[DEF]], [[DEF]]
-    ; CHECK-NEXT: [[XOR3:%[0-9]+]]:_(s64) = G_XOR [[DEF]], [[DEF]]
-    ; CHECK-NEXT: [[XOR4:%[0-9]+]]:_(s64) = G_XOR [[DEF]], [[DEF]]
+    ; CHECK-NEXT: [[XOR:%[0-9]+]]:_(i64) = G_XOR [[DEF]], [[DEF]]
+    ; CHECK-NEXT: [[XOR1:%[0-9]+]]:_(i64) = G_XOR [[DEF]], [[DEF]]
+    ; CHECK-NEXT: [[XOR2:%[0-9]+]]:_(i64) = G_XOR [[DEF]], [[DEF]]
+    ; CHECK-NEXT: [[XOR3:%[0-9]+]]:_(i64) = G_XOR [[DEF]], [[DEF]]
+    ; CHECK-NEXT: [[XOR4:%[0-9]+]]:_(i64) = G_XOR [[DEF]], [[DEF]]
     ; CHECK-NEXT: [[C:%[0-9]+]]:_(i64) = G_CONSTANT i64 -1
     ; CHECK-NEXT: [[C1:%[0-9]+]]:_(i64) = G_CONSTANT i64 4611686018427387903
     ; CHECK-NEXT: [[AND:%[0-9]+]]:_(i64) = G_AND [[XOR]], [[C]]
@@ -58,11 +58,11 @@ body:             |
     ; CHECK-NEXT: [[PTR_ADD3:%[0-9]+]]:_(p0) = nuw inbounds G_PTR_ADD %ptr, [[C5]](i64)
     ; CHECK-NEXT: G_STORE [[AND4]](i64), [[PTR_ADD3]](p0) :: (store (i64) into unknown-address + 32, align 32)
     ; CHECK-NEXT: RET_ReallyLR implicit $x0
-    %a:_(s318) = G_IMPLICIT_DEF
-    %b:_(s318) = G_IMPLICIT_DEF
+    %a:_(i318) = G_IMPLICIT_DEF
+    %b:_(i318) = G_IMPLICIT_DEF
     %ptr:_(p0) = COPY $x0
-    %xor:_(s318) = G_XOR %a, %b
-    G_STORE %xor(s318), %ptr(p0) :: (store (s318))
+    %xor:_(i318) = G_XOR %a, %b
+    G_STORE %xor(i318), %ptr(p0) :: (store (i318))
     RET_ReallyLR implicit $x0
 ...
 ---
@@ -74,13 +74,13 @@ body:             |
     ; CHECK-LABEL: name: test_s319_xor
     ; CHECK: liveins: $x0
     ; CHECK-NEXT: {{  $}}
-    ; CHECK-NEXT: [[DEF:%[0-9]+]]:_(s64) = G_IMPLICIT_DEF
+    ; CHECK-NEXT: [[DEF:%[0-9]+]]:_(i64) = G_IMPLICIT_DEF
     ; CHECK-NEXT: %ptr:_(p0) = COPY $x0
-    ; CHECK-NEXT: [[XOR:%[0-9]+]]:_(s64) = G_XOR [[DEF]], [[DEF]]
-    ; CHECK-NEXT: [[XOR1:%[0-9]+]]:_(s64) = G_XOR [[DEF]], [[DEF]]
-    ; CHECK-NEXT: [[XOR2:%[0-9]+]]:_(s64) = G_XOR [[DEF]], [[DEF]]
-    ; CHECK-NEXT: [[XOR3:%[0-9]+]]:_(s64) = G_XOR [[DEF]], [[DEF]]
-    ; CHECK-NEXT: [[XOR4:%[0-9]+]]:_(s64) = G_XOR [[DEF]], [[DEF]]
+    ; CHECK-NEXT: [[XOR:%[0-9]+]]:_(i64) = G_XOR [[DEF]], [[DEF]]
+    ; CHECK-NEXT: [[XOR1:%[0-9]+]]:_(i64) = G_XOR [[DEF]], [[DEF]]
+    ; CHECK-NEXT: [[XOR2:%[0-9]+]]:_(i64) = G_XOR [[DEF]], [[DEF]]
+    ; CHECK-NEXT: [[XOR3:%[0-9]+]]:_(i64) = G_XOR [[DEF]], [[DEF]]
+    ; CHECK-NEXT: [[XOR4:%[0-9]+]]:_(i64) = G_XOR [[DEF]], [[DEF]]
     ; CHECK-NEXT: [[C:%[0-9]+]]:_(i64) = G_CONSTANT i64 -1
     ; CHECK-NEXT: [[C1:%[0-9]+]]:_(i64) = G_CONSTANT i64 9223372036854775807
     ; CHECK-NEXT: [[AND:%[0-9]+]]:_(i64) = G_AND [[XOR]], [[C]]
@@ -102,11 +102,11 @@ body:             |
     ; CHECK-NEXT: [[PTR_ADD3:%[0-9]+]]:_(p0) = nuw inbounds G_PTR_ADD %ptr, [[C5]](i64)
     ; CHECK-NEXT: G_STORE [[AND4]](i64), [[PTR_ADD3]](p0) :: (store (i64) into unknown-address + 32, align 32)
     ; CHECK-NEXT: RET_ReallyLR implicit $x0
-    %a:_(s319) = G_IMPLICIT_DEF
-    %b:_(s319) = G_IMPLICIT_DEF
+    %a:_(i319) = G_IMPLICIT_DEF
+    %b:_(i319) = G_IMPLICIT_DEF
     %ptr:_(p0) = COPY $x0
-    %xor:_(s319) = G_XOR %a, %b
-    G_STORE %xor(s319), %ptr(p0) :: (store (s319))
+    %xor:_(i319) = G_XOR %a, %b
+    G_STORE %xor(i319), %ptr(p0) :: (store (i319))
     RET_ReallyLR implicit $x0
 ...
 ---
@@ -118,11 +118,11 @@ body:             |
     ; CHECK-LABEL: name: test_s158_xor
     ; CHECK: liveins: $x0
     ; CHECK-NEXT: {{  $}}
-    ; CHECK-NEXT: [[DEF:%[0-9]+]]:_(s64) = G_IMPLICIT_DEF
+    ; CHECK-NEXT: [[DEF:%[0-9]+]]:_(i64) = G_IMPLICIT_DEF
     ; CHECK-NEXT: %ptr:_(p0) = COPY $x0
-    ; CHECK-NEXT: [[XOR:%[0-9]+]]:_(s64) = G_XOR [[DEF]], [[DEF]]
-    ; CHECK-NEXT: [[XOR1:%[0-9]+]]:_(s64) = G_XOR [[DEF]], [[DEF]]
-    ; CHECK-NEXT: [[XOR2:%[0-9]+]]:_(s64) = G_XOR [[DEF]], [[DEF]]
+    ; CHECK-NEXT: [[XOR:%[0-9]+]]:_(i64) = G_XOR [[DEF]], [[DEF]]
+    ; CHECK-NEXT: [[XOR1:%[0-9]+]]:_(i64) = G_XOR [[DEF]], [[DEF]]
+    ; CHECK-NEXT: [[XOR2:%[0-9]+]]:_(i64) = G_XOR [[DEF]], [[DEF]]
     ; CHECK-NEXT: [[C:%[0-9]+]]:_(i64) = G_CONSTANT i64 -1
     ; CHECK-NEXT: [[C1:%[0-9]+]]:_(i64) = G_CONSTANT i64 1073741823
     ; CHECK-NEXT: [[AND:%[0-9]+]]:_(i64) = G_AND [[XOR]], [[C]]
@@ -139,11 +139,11 @@ body:             |
     ; CHECK-NEXT: [[PTR_ADD1:%[0-9]+]]:_(p0) = nuw inbounds G_PTR_ADD %ptr, [[C3]](i64)
     ; CHECK-NEXT: G_STORE [[EXTRACT]](i32), [[PTR_ADD1]](p0) :: (store (i32) into unknown-address + 16, align 16)
     ; CHECK-NEXT: RET_ReallyLR implicit $x0
-    %a:_(s158) = G_IMPLICIT_DEF
-    %b:_(s158) = G_IMPLICIT_DEF
+    %a:_(i158) = G_IMPLICIT_DEF
+    %b:_(i158) = G_IMPLICIT_DEF
     %ptr:_(p0) = COPY $x0
-    %xor:_(s158) = G_XOR %a, %b
-    G_STORE %xor(s158), %ptr(p0) :: (store (s158))
+    %xor:_(i158) = G_XOR %a, %b
+    G_STORE %xor(i158), %ptr(p0) :: (store (i158))
     RET_ReallyLR implicit $x0
 
 ...
@@ -152,19 +152,19 @@ name:            test_vector_xor_v16s16
 body:             |
   bb.0.entry:
     ; CHECK-LABEL: name: test_vector_xor_v16s16
-    ; CHECK: [[COPY:%[0-9]+]]:_(<8 x s16>) = COPY $q0
-    ; CHECK-NEXT: [[COPY1:%[0-9]+]]:_(<8 x s16>) = COPY $q1
-    ; CHECK-NEXT: [[XOR:%[0-9]+]]:_(<8 x s16>) = G_XOR [[COPY]], [[COPY]]
-    ; CHECK-NEXT: [[XOR1:%[0-9]+]]:_(<8 x s16>) = G_XOR [[COPY1]], [[COPY1]]
-    ; CHECK-NEXT: $q0 = COPY [[XOR]](<8 x s16>)
-    ; CHECK-NEXT: $q1 = COPY [[XOR1]](<8 x s16>)
-    %1:_(<8 x s16>) = COPY $q0
-    %2:_(<8 x s16>) = COPY $q1
-    %0:_(<16 x s16>) = G_CONCAT_VECTORS %1(<8 x s16>), %2(<8 x s16>)
-    %3:_(<16 x s16>) = G_XOR %0, %0
-    %4:_(<8 x s16>), %5:_(<8 x s16>) = G_UNMERGE_VALUES %3(<16 x s16>)
-    $q0 = COPY %4(<8 x s16>)
-    $q1 = COPY %5(<8 x s16>)
+    ; CHECK: [[COPY:%[0-9]+]]:_(<8 x i16>) = COPY $q0
+    ; CHECK-NEXT: [[COPY1:%[0-9]+]]:_(<8 x i16>) = COPY $q1
+    ; CHECK-NEXT: [[XOR:%[0-9]+]]:_(<8 x i16>) = G_XOR [[COPY]], [[COPY]]
+    ; CHECK-NEXT: [[XOR1:%[0-9]+]]:_(<8 x i16>) = G_XOR [[COPY1]], [[COPY1]]
+    ; CHECK-NEXT: $q0 = COPY [[XOR]](<8 x i16>)
+    ; CHECK-NEXT: $q1 = COPY [[XOR1]](<8 x i16>)
+    %1:_(<8 x i16>) = COPY $q0
+    %2:_(<8 x i16>) = COPY $q1
+    %0:_(<16 x i16>) = G_CONCAT_VECTORS %1(<8 x i16>), %2(<8 x i16>)
+    %3:_(<16 x i16>) = G_XOR %0, %0
+    %4:_(<8 x i16>), %5:_(<8 x i16>) = G_UNMERGE_VALUES %3(<16 x i16>)
+    $q0 = COPY %4(<8 x i16>)
+    $q1 = COPY %5(<8 x i16>)
 
 ...
 ---
@@ -172,19 +172,19 @@ name:            test_vector_xor_v32s8
 body:             |
   bb.0.entry:
     ; CHECK-LABEL: name: test_vector_xor_v32s8
-    ; CHECK: [[COPY:%[0-9]+]]:_(<16 x s8>) = COPY $q0
-    ; CHECK-NEXT: [[COPY1:%[0-9]+]]:_(<16 x s8>) = COPY $q1
-    ; CHECK-NEXT: [[XOR:%[0-9]+]]:_(<16 x s8>) = G_XOR [[COPY]], [[COPY]]
-    ; CHECK-NEXT: [[XOR1:%[0-9]+]]:_(<16 x s8>) = G_XOR [[COPY1]], [[COPY1]]
-    ; CHECK-NEXT: $q0 = COPY [[XOR]](<16 x s8>)
-    ; CHECK-NEXT: $q1 = COPY [[XOR1]](<16 x s8>)
-    %0:_(<16 x s8>) = COPY $q0
-    %1:_(<16 x s8>) = COPY $q1
-    %2:_(<32 x s8>) = G_CONCAT_VECTORS %0, %1
-    %3:_(<32 x s8>) = G_XOR %2, %2
-    %7:_(<16 x s8>), %8:_(<16 x s8>) = G_UNMERGE_VALUES %3(<32 x s8>)
-    $q0 = COPY %7(<16 x s8>)
-    $q1 = COPY %8(<16 x s8>)
+    ; CHECK: [[COPY:%[0-9]+]]:_(<16 x i8>) = COPY $q0
+    ; CHECK-NEXT: [[COPY1:%[0-9]+]]:_(<16 x i8>) = COPY $q1
+    ; CHECK-NEXT: [[XOR:%[0-9]+]]:_(<16 x i8>) = G_XOR [[COPY]], [[COPY]]
+    ; CHECK-NEXT: [[XOR1:%[0-9]+]]:_(<16 x i8>) = G_XOR [[COPY1]], [[COPY1]]
+    ; CHECK-NEXT: $q0 = COPY [[XOR]](<16 x i8>)
+    ; CHECK-NEXT: $q1 = COPY [[XOR1]](<16 x i8>)
+    %0:_(<16 x i8>) = COPY $q0
+    %1:_(<16 x i8>) = COPY $q1
+    %2:_(<32 x i8>) = G_CONCAT_VECTORS %0, %1
+    %3:_(<32 x i8>) = G_XOR %2, %2
+    %7:_(<16 x i8>), %8:_(<16 x i8>) = G_UNMERGE_VALUES %3(<32 x i8>)
+    $q0 = COPY %7(<16 x i8>)
+    $q1 = COPY %8(<16 x i8>)
 
 ...
 ---
@@ -197,24 +197,24 @@ body:             |
     ; CHECK-LABEL: name: xor_v2s1
     ; CHECK: liveins: $d0, $d1, $d2, $d3
     ; CHECK-NEXT: {{  $}}
-    ; CHECK-NEXT: [[COPY:%[0-9]+]]:_(<2 x s32>) = COPY $d0
-    ; CHECK-NEXT: [[COPY1:%[0-9]+]]:_(<2 x s32>) = COPY $d1
-    ; CHECK-NEXT: [[COPY2:%[0-9]+]]:_(<2 x s32>) = COPY $d2
-    ; CHECK-NEXT: [[COPY3:%[0-9]+]]:_(<2 x s32>) = COPY $d3
-    ; CHECK-NEXT: [[ICMP:%[0-9]+]]:_(<2 x s32>) = G_ICMP intpred(eq), [[COPY]](<2 x s32>), [[COPY1]]
-    ; CHECK-NEXT: [[ICMP1:%[0-9]+]]:_(<2 x s32>) = G_ICMP intpred(eq), [[COPY2]](<2 x s32>), [[COPY3]]
-    ; CHECK-NEXT: [[XOR:%[0-9]+]]:_(<2 x s32>) = G_XOR [[ICMP]], [[ICMP1]]
-    ; CHECK-NEXT: $d0 = COPY [[XOR]](<2 x s32>)
+    ; CHECK-NEXT: [[COPY:%[0-9]+]]:_(<2 x i32>) = COPY $d0
+    ; CHECK-NEXT: [[COPY1:%[0-9]+]]:_(<2 x i32>) = COPY $d1
+    ; CHECK-NEXT: [[COPY2:%[0-9]+]]:_(<2 x i32>) = COPY $d2
+    ; CHECK-NEXT: [[COPY3:%[0-9]+]]:_(<2 x i32>) = COPY $d3
+    ; CHECK-NEXT: [[ICMP:%[0-9]+]]:_(<2 x i32>) = G_ICMP intpred(eq), [[COPY]](<2 x i32>), [[COPY1]]
+    ; CHECK-NEXT: [[ICMP1:%[0-9]+]]:_(<2 x i32>) = G_ICMP intpred(eq), [[COPY2]](<2 x i32>), [[COPY3]]
+    ; CHECK-NEXT: [[XOR:%[0-9]+]]:_(<2 x i32>) = G_XOR [[ICMP]], [[ICMP1]]
+    ; CHECK-NEXT: $d0 = COPY [[XOR]](<2 x i32>)
     ; CHECK-NEXT: RET_ReallyLR implicit $d0
-    %0:_(<2 x s32>) = COPY $d0
-    %1:_(<2 x s32>) = COPY $d1
-    %2:_(<2 x s32>) = COPY $d2
-    %3:_(<2 x s32>) = COPY $d3
-    %4:_(<2 x s1>) = G_ICMP intpred(eq), %0(<2 x s32>), %1
-    %5:_(<2 x s1>) = G_ICMP intpred(eq), %2(<2 x s32>), %3
-    %6:_(<2 x s1>) = G_XOR %4, %5
-    %7:_(<2 x s32>) = G_ANYEXT %6
-    $d0 = COPY %7:_(<2 x s32>)
+    %0:_(<2 x i32>) = COPY $d0
+    %1:_(<2 x i32>) = COPY $d1
+    %2:_(<2 x i32>) = COPY $d2
+    %3:_(<2 x i32>) = COPY $d3
+    %4:_(<2 x i1>) = G_ICMP intpred(eq), %0(<2 x i32>), %1
+    %5:_(<2 x i1>) = G_ICMP intpred(eq), %2(<2 x i32>), %3
+    %6:_(<2 x i1>) = G_XOR %4, %5
+    %7:_(<2 x i32>) = G_ANYEXT %6
+    $d0 = COPY %7:_(<2 x i32>)
     RET_ReallyLR implicit $d0
 ...
 ---
@@ -227,28 +227,28 @@ body:             |
     ; CHECK-LABEL: name: xor_v3s1
     ; CHECK: liveins: $b0, $b1, $b2
     ; CHECK-NEXT: {{  $}}
-    ; CHECK-NEXT: [[COPY:%[0-9]+]]:_(s8) = COPY $b0
-    ; CHECK-NEXT: [[COPY1:%[0-9]+]]:_(s8) = COPY $b1
-    ; CHECK-NEXT: [[COPY2:%[0-9]+]]:_(s8) = COPY $b2
-    ; CHECK-NEXT: [[ANYEXT:%[0-9]+]]:_(s16) = G_ANYEXT [[COPY]](s8)
-    ; CHECK-NEXT: [[ANYEXT1:%[0-9]+]]:_(s16) = G_ANYEXT [[COPY1]](s8)
-    ; CHECK-NEXT: [[ANYEXT2:%[0-9]+]]:_(s16) = G_ANYEXT [[COPY2]](s8)
-    ; CHECK-NEXT: [[DEF:%[0-9]+]]:_(s16) = G_IMPLICIT_DEF
-    ; CHECK-NEXT: [[BUILD_VECTOR:%[0-9]+]]:_(<4 x s16>) = G_BUILD_VECTOR [[ANYEXT]](s16), [[ANYEXT1]](s16), [[ANYEXT2]](s16), [[DEF]](s16)
-    ; CHECK-NEXT: [[XOR:%[0-9]+]]:_(<4 x s16>) = G_XOR [[BUILD_VECTOR]], [[BUILD_VECTOR]]
-    ; CHECK-NEXT: [[UV:%[0-9]+]]:_(s16), [[UV1:%[0-9]+]]:_(s16), [[UV2:%[0-9]+]]:_(s16), [[UV3:%[0-9]+]]:_(s16) = G_UNMERGE_VALUES [[XOR]](<4 x s16>)
-    ; CHECK-NEXT: [[TRUNC:%[0-9]+]]:_(s8) = G_TRUNC [[UV]](s16)
-    ; CHECK-NEXT: $b0 = COPY [[TRUNC]](s8)
+    ; CHECK-NEXT: [[COPY:%[0-9]+]]:_(i8) = COPY $b0
+    ; CHECK-NEXT: [[COPY1:%[0-9]+]]:_(i8) = COPY $b1
+    ; CHECK-NEXT: [[COPY2:%[0-9]+]]:_(i8) = COPY $b2
+    ; CHECK-NEXT: [[ANYEXT:%[0-9]+]]:_(i16) = G_ANYEXT [[COPY]](i8)
+    ; CHECK-NEXT: [[ANYEXT1:%[0-9]+]]:_(i16) = G_ANYEXT [[COPY1]](i8)
+    ; CHECK-NEXT: [[ANYEXT2:%[0-9]+]]:_(i16) = G_ANYEXT [[COPY2]](i8)
+    ; CHECK-NEXT: [[DEF:%[0-9]+]]:_(i16) = G_IMPLICIT_DEF
+    ; CHECK-NEXT: [[BUILD_VECTOR:%[0-9]+]]:_(<4 x i16>) = G_BUILD_VECTOR [[ANYEXT]](i16), [[ANYEXT1]](i16), [[ANYEXT2]](i16), [[DEF]](i16)
+    ; CHECK-NEXT: [[XOR:%[0-9]+]]:_(<4 x i16>) = G_XOR [[BUILD_VECTOR]], [[BUILD_VECTOR]]
+    ; CHECK-NEXT: [[UV:%[0-9]+]]:_(i16), [[UV1:%[0-9]+]]:_(i16), [[UV2:%[0-9]+]]:_(i16), [[UV3:%[0-9]+]]:_(i16) = G_UNMERGE_VALUES [[XOR]](<4 x i16>)
+    ; CHECK-NEXT: [[TRUNC:%[0-9]+]]:_(i8) = G_TRUNC [[UV]](i16)
+    ; CHECK-NEXT: $b0 = COPY [[TRUNC]](i8)
     ; CHECK-NEXT: RET_ReallyLR implicit $b0
-    %1:_(s8) = COPY $b0
-    %2:_(s8) = COPY $b1
-    %3:_(s8) = COPY $b2
-    %4:_(<3 x s8>) = G_BUILD_VECTOR %1(s8), %2(s8), %3(s8)
-    %0:_(<3 x s1>) = G_TRUNC %4(<3 x s8>)
-    %5:_(<3 x s1>) = G_XOR %0, %0
-    %7:_(<3 x s8>) = G_ANYEXT %5(<3 x s1>)
-    %8:_(s8), %9:_(s8), %10:_(s8) = G_UNMERGE_VALUES %7(<3 x s8>)
-    $b0 = COPY %8:_(s8)
+    %1:_(i8) = COPY $b0
+    %2:_(i8) = COPY $b1
+    %3:_(i8) = COPY $b2
+    %4:_(<3 x i8>) = G_BUILD_VECTOR %1(i8), %2(i8), %3(i8)
+    %0:_(<3 x i1>) = G_TRUNC %4(<3 x i8>)
+    %5:_(<3 x i1>) = G_XOR %0, %0
+    %7:_(<3 x i8>) = G_ANYEXT %5(<3 x i1>)
+    %8:_(i8), %9:_(i8), %10:_(i8) = G_UNMERGE_VALUES %7(<3 x i8>)
+    $b0 = COPY %8:_(i8)
     RET_ReallyLR implicit $b0
 ...
 ---
@@ -261,24 +261,24 @@ body:             |
     ; CHECK-LABEL: name: xor_v4s1
     ; CHECK: liveins: $d0, $d1, $d2, $d3
     ; CHECK-NEXT: {{  $}}
-    ; CHECK-NEXT: [[COPY:%[0-9]+]]:_(<4 x s16>) = COPY $d0
-    ; CHECK-NEXT: [[COPY1:%[0-9]+]]:_(<4 x s16>) = COPY $d1
-    ; CHECK-NEXT: [[COPY2:%[0-9]+]]:_(<4 x s16>) = COPY $d2
-    ; CHECK-NEXT: [[COPY3:%[0-9]+]]:_(<4 x s16>) = COPY $d3
-    ; CHECK-NEXT: [[ICMP:%[0-9]+]]:_(<4 x s16>) = G_ICMP intpred(eq), [[COPY]](<4 x s16>), [[COPY1]]
-    ; CHECK-NEXT: [[ICMP1:%[0-9]+]]:_(<4 x s16>) = G_ICMP intpred(eq), [[COPY2]](<4 x s16>), [[COPY3]]
-    ; CHECK-NEXT: [[XOR:%[0-9]+]]:_(<4 x s16>) = G_XOR [[ICMP]], [[ICMP1]]
-    ; CHECK-NEXT: $d0 = COPY [[XOR]](<4 x s16>)
+    ; CHECK-NEXT: [[COPY:%[0-9]+]]:_(<4 x i16>) = COPY $d0
+    ; CHECK-NEXT: [[COPY1:%[0-9]+]]:_(<4 x i16>) = COPY $d1
+    ; CHECK-NEXT: [[COPY2:%[0-9]+]]:_(<4 x i16>) = COPY $d2
+    ; CHECK-NEXT: [[COPY3:%[0-9]+]]:_(<4 x i16>) = COPY $d3
+    ; CHECK-NEXT: [[ICMP:%[0-9]+]]:_(<4 x i16>) = G_ICMP intpred(eq), [[COPY]](<4 x i16>), [[COPY1]]
+    ; CHECK-NEXT: [[ICMP1:%[0-9]+]]:_(<4 x i16>) = G_ICMP intpred(eq), [[COPY2]](<4 x i16>), [[COPY3]]
+    ; CHECK-NEXT: [[XOR:%[0-9]+]]:_(<4 x i16>) = G_XOR [[ICMP]], [[ICMP1]]
+    ; CHECK-NEXT: $d0 = COPY [[XOR]](<4 x i16>)
     ; CHECK-NEXT: RET_ReallyLR implicit $d0
-    %0:_(<4 x s16>) = COPY $d0
-    %1:_(<4 x s16>) = COPY $d1
-    %2:_(<4 x s16>) = COPY $d2
-    %3:_(<4 x s16>) = COPY $d3
-    %4:_(<4 x s1>) = G_ICMP intpred(eq), %0(<4 x s16>), %1
-    %5:_(<4 x s1>) = G_ICMP intpred(eq), %2(<4 x s16>), %3
-    %6:_(<4 x s1>) = G_XOR %4, %5
-    %7:_(<4 x s16>) = G_ANYEXT %6
-    $d0 = COPY %7:_(<4 x s16>)
+    %0:_(<4 x i16>) = COPY $d0
+    %1:_(<4 x i16>) = COPY $d1
+    %2:_(<4 x i16>) = COPY $d2
+    %3:_(<4 x i16>) = COPY $d3
+    %4:_(<4 x i1>) = G_ICMP intpred(eq), %0(<4 x i16>), %1
+    %5:_(<4 x i1>) = G_ICMP intpred(eq), %2(<4 x i16>), %3
+    %6:_(<4 x i1>) = G_XOR %4, %5
+    %7:_(<4 x i16>) = G_ANYEXT %6
+    $d0 = COPY %7:_(<4 x i16>)
     RET_ReallyLR implicit $d0
 ...
 ---
@@ -291,24 +291,24 @@ body:             |
     ; CHECK-LABEL: name: xor_v8s1
     ; CHECK: liveins: $d0, $d1, $d2, $d3
     ; CHECK-NEXT: {{  $}}
-    ; CHECK-NEXT: [[COPY:%[0-9]+]]:_(<8 x s8>) = COPY $d0
-    ; CHECK-NEXT: [[COPY1:%[0-9]+]]:_(<8 x s8>) = COPY $d1
-    ; CHECK-NEXT: [[COPY2:%[0-9]+]]:_(<8 x s8>) = COPY $d2
-    ; CHECK-NEXT: [[COPY3:%[0-9]+]]:_(<8 x s8>) = COPY $d3
-    ; CHECK-NEXT: [[ICMP:%[0-9]+]]:_(<8 x s8>) = G_ICMP intpred(eq), [[COPY]](<8 x s8>), [[COPY1]]
-    ; CHECK-NEXT: [[ICMP1:%[0-9]+]]:_(<8 x s8>) = G_ICMP intpred(eq), [[COPY2]](<8 x s8>), [[COPY3]]
-    ; CHECK-NEXT: [[XOR:%[0-9]+]]:_(<8 x s8>) = G_XOR [[ICMP]], [[ICMP1]]
-    ; CHECK-NEXT: $d0 = COPY [[XOR]](<8 x s8>)
+    ; CHECK-NEXT: [[COPY:%[0-9]+]]:_(<8 x i8>) = COPY $d0
+    ; CHECK-NEXT: [[COPY1:%[0-9]+]]:_(<8 x i8>) = COPY $d1
+    ; CHECK-NEXT: [[COPY2:%[0-9]+]]:_(<8 x i8>) = COPY $d2
+    ; CHECK-NEXT: [[COPY3:%[0-9]+]]:_(<8 x i8>) = COPY $d3
+    ; CHECK-NEXT: [[ICMP:%[0-9]+]]:_(<8 x i8>) = G_ICMP intpred(eq), [[COPY]](<8 x i8>), [[COPY1]]
+    ; CHECK-NEXT: [[ICMP1:%[0-9]+]]:_(<8 x i8>) = G_ICMP intpred(eq), [[COPY2]](<8 x i8>), [[COPY3]]
+    ; CHECK-NEXT: [[XOR:%[0-9]+]]:_(<8 x i8>) = G_XOR [[ICMP]], [[ICMP1]]
+    ; CHECK-NEXT: $d0 = COPY [[XOR]](<8 x i8>)
     ; CHECK-NEXT: RET_ReallyLR implicit $d0
-    %0:_(<8 x s8>) = COPY $d0
-    %1:_(<8 x s8>) = COPY $d1
-    %2:_(<8 x s8>) = COPY $d2
-    %3:_(<8 x s8>) = COPY $d3
-    %4:_(<8 x s1>) = G_ICMP intpred(eq), %0(<8 x s8>), %1
-    %5:_(<8 x s1>) = G_ICMP intpred(eq), %2(<8 x s8>), %3
-    %6:_(<8 x s1>) = G_XOR %4, %5
-    %7:_(<8 x s8>) = G_ANYEXT %6
-    $d0 = COPY %7:_(<8 x s8>)
+    %0:_(<8 x i8>) = COPY $d0
+    %1:_(<8 x i8>) = COPY $d1
+    %2:_(<8 x i8>) = COPY $d2
+    %3:_(<8 x i8>) = COPY $d3
+    %4:_(<8 x i1>) = G_ICMP intpred(eq), %0(<8 x i8>), %1
+    %5:_(<8 x i1>) = G_ICMP intpred(eq), %2(<8 x i8>), %3
+    %6:_(<8 x i1>) = G_XOR %4, %5
+    %7:_(<8 x i8>) = G_ANYEXT %6
+    $d0 = COPY %7:_(<8 x i8>)
     RET_ReallyLR implicit $d0
 ...
 ---
@@ -321,23 +321,23 @@ body:             |
     ; CHECK-LABEL: name: xor_v16s1
     ; CHECK: liveins: $q0, $q1, $q2, $q3
     ; CHECK-NEXT: {{  $}}
-    ; CHECK-NEXT: [[COPY:%[0-9]+]]:_(<16 x s8>) = COPY $q0
-    ; CHECK-NEXT: [[COPY1:%[0-9]+]]:_(<16 x s8>) = COPY $q1
-    ; CHECK-NEXT: [[COPY2:%[0-9]+]]:_(<16 x s8>) = COPY $q2
-    ; CHECK-NEXT: [[COPY3:%[0-9]+]]:_(<16 x s8>) = COPY $q3
-    ; CHECK-NEXT: [[ICMP:%[0-9]+]]:_(<16 x s8>) = G_ICMP intpred(eq), [[COPY]](<16 x s8>), [[COPY1]]
-    ; CHECK-NEXT: [[ICMP1:%[0-9]+]]:_(<16 x s8>) = G_ICMP intpred(eq), [[COPY2]](<16 x s8>), [[COPY3]]
-    ; CHECK-NEXT: [[XOR:%[0-9]+]]:_(<16 x s8>) = G_XOR [[ICMP]], [[ICMP1]]
-    ; CHECK-NEXT: $q0 = COPY [[XOR]](<16 x s8>)
+    ; CHECK-NEXT: [[COPY:%[0-9]+]]:_(<16 x i8>) = COPY $q0
+    ; CHECK-NEXT: [[COPY1:%[0-9]+]]:_(<16 x i8>) = COPY $q1
+    ; CHECK-NEXT: [[COPY2:%[0-9]+]]:_(<16 x i8>) = COPY $q2
+    ; CHECK-NEXT: [[COPY3:%[0-9]+]]:_(<16 x i8>) = COPY $q3
+    ; CHECK-NEXT: [[ICMP:%[0-9]+]]:_(<16 x i8>) = G_ICMP intpred(eq), [[COPY]](<16 x i8>), [[COPY1]]
+    ; CHECK-NEXT: [[ICMP1:%[0-9]+]]:_(<16 x i8>) = G_ICMP intpred(eq), [[COPY2]](<16 x i8>), [[COPY3]]
+    ; CHECK-NEXT: [[XOR:%[0-9]+]]:_(<16 x i8>) = G_XOR [[ICMP]], [[ICMP1]]
+    ; CHECK-NEXT: $q0 = COPY [[XOR]](<16 x i8>)
     ; CHECK-NEXT: RET_ReallyLR implicit $q0
-    %0:_(<16 x s8>) = COPY $q0
-    %1:_(<16 x s8>) = COPY $q1
-    %2:_(<16 x s8>) = COPY $q2
-    %3:_(<16 x s8>) = COPY $q3
-    %4:_(<16 x s1>) = G_ICMP intpred(eq), %0(<16 x s8>), %1
-    %5:_(<16 x s1>) = G_ICMP intpred(eq), %2(<16 x s8>), %3
-    %6:_(<16 x s1>) = G_XOR %4, %5
-    %7:_(<16 x s8>) = G_ANYEXT %6
-    $q0 = COPY %7:_(<16 x s8>)
+    %0:_(<16 x i8>) = COPY $q0
+    %1:_(<16 x i8>) = COPY $q1
+    %2:_(<16 x i8>) = COPY $q2
+    %3:_(<16 x i8>) = COPY $q3
+    %4:_(<16 x i1>) = G_ICMP intpred(eq), %0(<16 x i8>), %1
+    %5:_(<16 x i1>) = G_ICMP intpred(eq), %2(<16 x i8>), %3
+    %6:_(<16 x i1>) = G_XOR %4, %5
+    %7:_(<16 x i8>) = G_ANYEXT %6
+    $q0 = COPY %7:_(<16 x i8>)
     RET_ReallyLR implicit $q0
 ...



More information about the llvm-commits mailing list