[llvm] 012e06b - [AArch64][GlobalISel] Update a number of combiner tests to concrete types. NFC (#213522)
via llvm-commits
llvm-commits at lists.llvm.org
Sun Aug 2 03:04:21 PDT 2026
Author: David Green
Date: 2026-08-02T11:04:17+01:00
New Revision: 012e06b43f7345492b9f5792a74c56c04663ae7d
URL: https://github.com/llvm/llvm-project/commit/012e06b43f7345492b9f5792a74c56c04663ae7d
DIFF: https://github.com/llvm/llvm-project/commit/012e06b43f7345492b9f5792a74c56c04663ae7d.diff
LOG: [AArch64][GlobalISel] Update a number of combiner tests to concrete types. NFC (#213522)
Added:
Modified:
llvm/test/CodeGen/AArch64/GlobalISel/fold-global-offsets-insertpt.mir
llvm/test/CodeGen/AArch64/GlobalISel/fold-global-offsets-target-features.mir
llvm/test/CodeGen/AArch64/GlobalISel/fold-global-offsets.mir
llvm/test/CodeGen/AArch64/GlobalISel/form-bitfield-extract-from-and.mir
llvm/test/CodeGen/AArch64/GlobalISel/icmp-flags.mir
llvm/test/CodeGen/AArch64/GlobalISel/inline-memcpy-forced.mir
llvm/test/CodeGen/AArch64/GlobalISel/non-pow-2-extload-combine.mir
llvm/test/CodeGen/AArch64/GlobalISel/opt-overlapping-and-postlegalize.mir
llvm/test/CodeGen/AArch64/GlobalISel/opt-overlapping-and.mir
llvm/test/CodeGen/AArch64/extractvector-of-load.mir
llvm/test/CodeGen/AArch64/extractvector-oob-load.mir
Removed:
################################################################################
diff --git a/llvm/test/CodeGen/AArch64/GlobalISel/fold-global-offsets-insertpt.mir b/llvm/test/CodeGen/AArch64/GlobalISel/fold-global-offsets-insertpt.mir
index 293f8cf0b952f..9d84c2f36778a 100644
--- a/llvm/test/CodeGen/AArch64/GlobalISel/fold-global-offsets-insertpt.mir
+++ b/llvm/test/CodeGen/AArch64/GlobalISel/fold-global-offsets-insertpt.mir
@@ -21,23 +21,23 @@ name: wibble
body: |
bb.1:
; CHECK-LABEL: name: wibble
- ; CHECK: [[C:%[0-9]+]]:_(s32) = G_CONSTANT i32 0
+ ; CHECK: [[C:%[0-9]+]]:_(i32) = G_CONSTANT i32 0
; CHECK-NEXT: [[GV:%[0-9]+]]:_(p0) = G_GLOBAL_VALUE @global + 40004
- ; CHECK-NEXT: [[C1:%[0-9]+]]:_(s64) = G_CONSTANT i64 16
- ; CHECK-NEXT: [[PTR_ADD:%[0-9]+]]:_(p0) = G_PTR_ADD [[GV]], [[C1]](s64)
- ; CHECK-NEXT: [[BUILD_VECTOR:%[0-9]+]]:_(<4 x s32>) = G_BUILD_VECTOR [[C]](s32), [[C]](s32), [[C]](s32), [[C]](s32)
- ; CHECK-NEXT: G_STORE [[C]](s32), [[PTR_ADD]](p0) :: (store (s32) into `ptr getelementptr inbounds (%struct.wibble, ptr @global, i64 0, i32 10)`)
- ; CHECK-NEXT: G_STORE [[BUILD_VECTOR]](<4 x s32>), [[GV]](p0) :: (store (<4 x s32>) into `ptr getelementptr inbounds (%struct.wibble, ptr @global, i64 0, i32 6)`, align 4)
+ ; CHECK-NEXT: [[C1:%[0-9]+]]:_(i64) = G_CONSTANT i64 16
+ ; CHECK-NEXT: [[PTR_ADD:%[0-9]+]]:_(p0) = G_PTR_ADD [[GV]], [[C1]](i64)
+ ; CHECK-NEXT: [[BUILD_VECTOR:%[0-9]+]]:_(<4 x i32>) = G_BUILD_VECTOR [[C]](i32), [[C]](i32), [[C]](i32), [[C]](i32)
+ ; CHECK-NEXT: G_STORE [[C]](i32), [[PTR_ADD]](p0) :: (store (i32) into `ptr getelementptr inbounds (%struct.wibble, ptr @global, i64 0, i32 10)`)
+ ; CHECK-NEXT: G_STORE [[BUILD_VECTOR]](<4 x i32>), [[GV]](p0) :: (store (<4 x i32>) into `ptr getelementptr inbounds (%struct.wibble, ptr @global, i64 0, i32 6)`, align 4)
; CHECK-NEXT: RET_ReallyLR
- %0:_(s32) = G_CONSTANT i32 0
+ %0:_(i32) = G_CONSTANT i32 0
%2:_(p0) = G_GLOBAL_VALUE @global
- %3:_(s64) = G_CONSTANT i64 40020
- %1:_(p0) = G_PTR_ADD %2, %3(s64)
- %4:_(<4 x s32>) = G_BUILD_VECTOR %0(s32), %0(s32), %0(s32), %0(s32)
- %6:_(s64) = G_CONSTANT i64 40004
- %5:_(p0) = G_PTR_ADD %2, %6(s64)
- G_STORE %0(s32), %1(p0) :: (store (s32) into `ptr getelementptr inbounds (%struct.wibble, ptr @global, i64 0, i32 10)`)
- G_STORE %4(<4 x s32>), %5(p0) :: (store (<4 x s32>) into `ptr getelementptr inbounds (%struct.wibble, ptr @global, i64 0, i32 6)`, align 4)
+ %3:_(i64) = G_CONSTANT i64 40020
+ %1:_(p0) = G_PTR_ADD %2, %3(i64)
+ %4:_(<4 x i32>) = G_BUILD_VECTOR %0(i32), %0(i32), %0(i32), %0(i32)
+ %6:_(i64) = G_CONSTANT i64 40004
+ %5:_(p0) = G_PTR_ADD %2, %6(i64)
+ G_STORE %0(i32), %1(p0) :: (store (i32) into `ptr getelementptr inbounds (%struct.wibble, ptr @global, i64 0, i32 10)`)
+ G_STORE %4(<4 x i32>), %5(p0) :: (store (<4 x i32>) into `ptr getelementptr inbounds (%struct.wibble, ptr @global, i64 0, i32 6)`, align 4)
RET_ReallyLR
...
diff --git a/llvm/test/CodeGen/AArch64/GlobalISel/fold-global-offsets-target-features.mir b/llvm/test/CodeGen/AArch64/GlobalISel/fold-global-offsets-target-features.mir
index 8197bf9e63220..dc41931ede4d3 100644
--- a/llvm/test/CodeGen/AArch64/GlobalISel/fold-global-offsets-target-features.mir
+++ b/llvm/test/CodeGen/AArch64/GlobalISel/fold-global-offsets-target-features.mir
@@ -43,8 +43,8 @@ body: |
;
; LARGE-MACHO-LABEL: name: test_external_linkage
; LARGE-MACHO: %global:_(p0) = G_GLOBAL_VALUE @external_linkage
- ; LARGE-MACHO-NEXT: %imm:_(s64) = G_CONSTANT i64 1
- ; LARGE-MACHO-NEXT: %ptr_add:_(p0) = G_PTR_ADD %global, %imm(s64)
+ ; LARGE-MACHO-NEXT: %imm:_(i64) = G_CONSTANT i64 1
+ ; LARGE-MACHO-NEXT: %ptr_add:_(p0) = G_PTR_ADD %global, %imm(i64)
; LARGE-MACHO-NEXT: $x0 = COPY %ptr_add(p0)
; LARGE-MACHO-NEXT: RET_ReallyLR implicit $x0
;
@@ -68,8 +68,8 @@ body: |
; WINDOWS-NEXT: $x0 = COPY [[GV]](p0)
; WINDOWS-NEXT: RET_ReallyLR implicit $x0
%global:_(p0) = G_GLOBAL_VALUE @external_linkage
- %imm:_(s64) = G_CONSTANT i64 1
- %ptr_add:_(p0) = G_PTR_ADD %global, %imm(s64)
+ %imm:_(i64) = G_CONSTANT i64 1
+ %ptr_add:_(p0) = G_PTR_ADD %global, %imm(i64)
$x0 = COPY %ptr_add(p0)
RET_ReallyLR implicit $x0
@@ -90,8 +90,8 @@ body: |
;
; LARGE-MACHO-LABEL: name: test_internal_linkage
; LARGE-MACHO: %global:_(p0) = G_GLOBAL_VALUE @internal_linkage
- ; LARGE-MACHO-NEXT: %imm:_(s64) = G_CONSTANT i64 1
- ; LARGE-MACHO-NEXT: %ptr_add:_(p0) = G_PTR_ADD %global, %imm(s64)
+ ; LARGE-MACHO-NEXT: %imm:_(i64) = G_CONSTANT i64 1
+ ; LARGE-MACHO-NEXT: %ptr_add:_(p0) = G_PTR_ADD %global, %imm(i64)
; LARGE-MACHO-NEXT: $x0 = COPY %ptr_add(p0)
; LARGE-MACHO-NEXT: RET_ReallyLR implicit $x0
;
@@ -115,8 +115,8 @@ body: |
; WINDOWS-NEXT: $x0 = COPY [[GV]](p0)
; WINDOWS-NEXT: RET_ReallyLR implicit $x0
%global:_(p0) = G_GLOBAL_VALUE @internal_linkage
- %imm:_(s64) = G_CONSTANT i64 1
- %ptr_add:_(p0) = G_PTR_ADD %global, %imm(s64)
+ %imm:_(i64) = G_CONSTANT i64 1
+ %ptr_add:_(p0) = G_PTR_ADD %global, %imm(i64)
$x0 = COPY %ptr_add(p0)
RET_ReallyLR implicit $x0
@@ -130,36 +130,36 @@ body: |
bb.0:
; DEFAULT-LABEL: name: test_common_linkage
; DEFAULT: %global:_(p0) = G_GLOBAL_VALUE @common_linkage
- ; DEFAULT-NEXT: %imm:_(s64) = G_CONSTANT i64 1
- ; DEFAULT-NEXT: %ptr_add:_(p0) = G_PTR_ADD %global, %imm(s64)
+ ; DEFAULT-NEXT: %imm:_(i64) = G_CONSTANT i64 1
+ ; DEFAULT-NEXT: %ptr_add:_(p0) = G_PTR_ADD %global, %imm(i64)
; DEFAULT-NEXT: $x0 = COPY %ptr_add(p0)
; DEFAULT-NEXT: RET_ReallyLR implicit $x0
;
; LARGE-MACHO-LABEL: name: test_common_linkage
; LARGE-MACHO: %global:_(p0) = G_GLOBAL_VALUE @common_linkage
- ; LARGE-MACHO-NEXT: %imm:_(s64) = G_CONSTANT i64 1
- ; LARGE-MACHO-NEXT: %ptr_add:_(p0) = G_PTR_ADD %global, %imm(s64)
+ ; LARGE-MACHO-NEXT: %imm:_(i64) = G_CONSTANT i64 1
+ ; LARGE-MACHO-NEXT: %ptr_add:_(p0) = G_PTR_ADD %global, %imm(i64)
; LARGE-MACHO-NEXT: $x0 = COPY %ptr_add(p0)
; LARGE-MACHO-NEXT: RET_ReallyLR implicit $x0
;
; SMALL-MACHO-LABEL: name: test_common_linkage
; SMALL-MACHO: %global:_(p0) = G_GLOBAL_VALUE @common_linkage
- ; SMALL-MACHO-NEXT: %imm:_(s64) = G_CONSTANT i64 1
- ; SMALL-MACHO-NEXT: %ptr_add:_(p0) = G_PTR_ADD %global, %imm(s64)
+ ; SMALL-MACHO-NEXT: %imm:_(i64) = G_CONSTANT i64 1
+ ; SMALL-MACHO-NEXT: %ptr_add:_(p0) = G_PTR_ADD %global, %imm(i64)
; SMALL-MACHO-NEXT: $x0 = COPY %ptr_add(p0)
; SMALL-MACHO-NEXT: RET_ReallyLR implicit $x0
;
; LARGE-ELF-LABEL: name: test_common_linkage
; LARGE-ELF: %global:_(p0) = G_GLOBAL_VALUE @common_linkage
- ; LARGE-ELF-NEXT: %imm:_(s64) = G_CONSTANT i64 1
- ; LARGE-ELF-NEXT: %ptr_add:_(p0) = G_PTR_ADD %global, %imm(s64)
+ ; LARGE-ELF-NEXT: %imm:_(i64) = G_CONSTANT i64 1
+ ; LARGE-ELF-NEXT: %ptr_add:_(p0) = G_PTR_ADD %global, %imm(i64)
; LARGE-ELF-NEXT: $x0 = COPY %ptr_add(p0)
; LARGE-ELF-NEXT: RET_ReallyLR implicit $x0
;
; TINY-LABEL: name: test_common_linkage
; TINY: %global:_(p0) = G_GLOBAL_VALUE @common_linkage
- ; TINY-NEXT: %imm:_(s64) = G_CONSTANT i64 1
- ; TINY-NEXT: %ptr_add:_(p0) = G_PTR_ADD %global, %imm(s64)
+ ; TINY-NEXT: %imm:_(i64) = G_CONSTANT i64 1
+ ; TINY-NEXT: %ptr_add:_(p0) = G_PTR_ADD %global, %imm(i64)
; TINY-NEXT: $x0 = COPY %ptr_add(p0)
; TINY-NEXT: RET_ReallyLR implicit $x0
;
@@ -168,8 +168,8 @@ body: |
; WINDOWS-NEXT: $x0 = COPY [[GV]](p0)
; WINDOWS-NEXT: RET_ReallyLR implicit $x0
%global:_(p0) = G_GLOBAL_VALUE @common_linkage
- %imm:_(s64) = G_CONSTANT i64 1
- %ptr_add:_(p0) = G_PTR_ADD %global, %imm(s64)
+ %imm:_(i64) = G_CONSTANT i64 1
+ %ptr_add:_(p0) = G_PTR_ADD %global, %imm(i64)
$x0 = COPY %ptr_add(p0)
RET_ReallyLR implicit $x0
@@ -183,13 +183,13 @@ body: |
bb.0:
; CHECK-LABEL: name: test_extern_weak_linkage
; CHECK: %global:_(p0) = G_GLOBAL_VALUE @extern_weak_linkage
- ; CHECK-NEXT: %imm:_(s64) = G_CONSTANT i64 1
- ; CHECK-NEXT: %ptr_add:_(p0) = G_PTR_ADD %global, %imm(s64)
+ ; CHECK-NEXT: %imm:_(i64) = G_CONSTANT i64 1
+ ; CHECK-NEXT: %ptr_add:_(p0) = G_PTR_ADD %global, %imm(i64)
; CHECK-NEXT: $x0 = COPY %ptr_add(p0)
; CHECK-NEXT: RET_ReallyLR implicit $x0
%global:_(p0) = G_GLOBAL_VALUE @extern_weak_linkage
- %imm:_(s64) = G_CONSTANT i64 1
- %ptr_add:_(p0) = G_PTR_ADD %global, %imm(s64)
+ %imm:_(i64) = G_CONSTANT i64 1
+ %ptr_add:_(p0) = G_PTR_ADD %global, %imm(i64)
$x0 = COPY %ptr_add(p0)
RET_ReallyLR implicit $x0
@@ -203,13 +203,13 @@ body: |
bb.0:
; CHECK-LABEL: name: never_fold_tagged_globals
; CHECK: %global:_(p0) = G_GLOBAL_VALUE @external_linkage
- ; CHECK-NEXT: %imm:_(s64) = G_CONSTANT i64 1
- ; CHECK-NEXT: %ptr_add:_(p0) = G_PTR_ADD %global, %imm(s64)
+ ; CHECK-NEXT: %imm:_(i64) = G_CONSTANT i64 1
+ ; CHECK-NEXT: %ptr_add:_(p0) = G_PTR_ADD %global, %imm(i64)
; CHECK-NEXT: $x0 = COPY %ptr_add(p0)
; CHECK-NEXT: RET_ReallyLR implicit $x0
%global:_(p0) = G_GLOBAL_VALUE @external_linkage
- %imm:_(s64) = G_CONSTANT i64 1
- %ptr_add:_(p0) = G_PTR_ADD %global, %imm(s64)
+ %imm:_(i64) = G_CONSTANT i64 1
+ %ptr_add:_(p0) = G_PTR_ADD %global, %imm(i64)
$x0 = COPY %ptr_add(p0)
RET_ReallyLR implicit $x0
@@ -223,12 +223,12 @@ body: |
bb.0:
; CHECK-LABEL: name: test_dll_import
; CHECK: %global:_(p0) = G_GLOBAL_VALUE @dll_import
- ; CHECK-NEXT: %imm:_(s64) = G_CONSTANT i64 1
- ; CHECK-NEXT: %ptr_add:_(p0) = G_PTR_ADD %global, %imm(s64)
+ ; CHECK-NEXT: %imm:_(i64) = G_CONSTANT i64 1
+ ; CHECK-NEXT: %ptr_add:_(p0) = G_PTR_ADD %global, %imm(i64)
; CHECK-NEXT: $x0 = COPY %ptr_add(p0)
; CHECK-NEXT: RET_ReallyLR implicit $x0
%global:_(p0) = G_GLOBAL_VALUE @dll_import
- %imm:_(s64) = G_CONSTANT i64 1
- %ptr_add:_(p0) = G_PTR_ADD %global, %imm(s64)
+ %imm:_(i64) = G_CONSTANT i64 1
+ %ptr_add:_(p0) = G_PTR_ADD %global, %imm(i64)
$x0 = COPY %ptr_add(p0)
RET_ReallyLR implicit $x0
diff --git a/llvm/test/CodeGen/AArch64/GlobalISel/fold-global-offsets.mir b/llvm/test/CodeGen/AArch64/GlobalISel/fold-global-offsets.mir
index f0fbfecf219fd..b246796dbbff6 100644
--- a/llvm/test/CodeGen/AArch64/GlobalISel/fold-global-offsets.mir
+++ b/llvm/test/CodeGen/AArch64/GlobalISel/fold-global-offsets.mir
@@ -38,8 +38,8 @@ body: |
; CHECK-NEXT: $x0 = COPY [[GV]](p0)
; CHECK-NEXT: RET_ReallyLR implicit $x0
%global:_(p0) = G_GLOBAL_VALUE @g
- %offset:_(s64) = G_CONSTANT i64 1
- %ptr_add:_(p0) = G_PTR_ADD %global, %offset(s64)
+ %offset:_(i64) = G_CONSTANT i64 1
+ %ptr_add:_(p0) = G_PTR_ADD %global, %offset(i64)
$x0 = COPY %ptr_add
RET_ReallyLR implicit $x0
@@ -62,8 +62,8 @@ body: |
; CHECK-NEXT: $x0 = COPY [[GV]](p0)
; CHECK-NEXT: RET_ReallyLR implicit $x0
%global:_(p0) = G_GLOBAL_VALUE @g + 3
- %offset:_(s64) = G_CONSTANT i64 1
- %ptr_add:_(p0) = G_PTR_ADD %global, %offset(s64)
+ %offset:_(i64) = G_CONSTANT i64 1
+ %ptr_add:_(p0) = G_PTR_ADD %global, %offset(i64)
$x0 = COPY %ptr_add
RET_ReallyLR implicit $x0
@@ -82,20 +82,20 @@ body: |
; CHECK-LABEL: name: two_ptr_adds_same_offset
; CHECK: liveins: $x0, $x1
; CHECK-NEXT: {{ $}}
- ; CHECK-NEXT: %val1:_(s64) = COPY $x0
- ; CHECK-NEXT: %val2:_(s64) = COPY $x1
+ ; CHECK-NEXT: %val1:_(i64) = COPY $x0
+ ; CHECK-NEXT: %val2:_(i64) = COPY $x1
; CHECK-NEXT: [[GV:%[0-9]+]]:_(p0) = G_GLOBAL_VALUE @g + 1
- ; CHECK-NEXT: G_STORE %val1(s64), [[GV]](p0) :: (store (s64))
- ; CHECK-NEXT: G_STORE %val2(s64), [[GV]](p0) :: (store (s64))
+ ; CHECK-NEXT: G_STORE %val1(i64), [[GV]](p0) :: (store (i64))
+ ; CHECK-NEXT: G_STORE %val2(i64), [[GV]](p0) :: (store (i64))
; CHECK-NEXT: RET_ReallyLR implicit $x0
- %val1:_(s64) = COPY $x0
- %val2:_(s64) = COPY $x1
+ %val1:_(i64) = COPY $x0
+ %val2:_(i64) = COPY $x1
%global:_(p0) = G_GLOBAL_VALUE @g
- %offset:_(s64) = G_CONSTANT i64 1
- %ptr_add1:_(p0) = G_PTR_ADD %global, %offset(s64)
- %ptr_add2:_(p0) = G_PTR_ADD %global, %offset(s64)
- G_STORE %val1:_(s64), %ptr_add1 :: (store (s64))
- G_STORE %val2:_(s64), %ptr_add2 :: (store (s64))
+ %offset:_(i64) = G_CONSTANT i64 1
+ %ptr_add1:_(p0) = G_PTR_ADD %global, %offset(i64)
+ %ptr_add2:_(p0) = G_PTR_ADD %global, %offset(i64)
+ G_STORE %val1:_(i64), %ptr_add1 :: (store (i64))
+ G_STORE %val2:_(i64), %ptr_add2 :: (store (i64))
RET_ReallyLR implicit $x0
...
@@ -114,23 +114,23 @@ body: |
; CHECK-LABEL: name: two_ptr_adds_
diff erent_offset
; CHECK: liveins: $x0, $x1
; CHECK-NEXT: {{ $}}
- ; CHECK-NEXT: %val1:_(s64) = COPY $x0
- ; CHECK-NEXT: %val2:_(s64) = COPY $x1
+ ; CHECK-NEXT: %val1:_(i64) = COPY $x0
+ ; CHECK-NEXT: %val2:_(i64) = COPY $x1
; CHECK-NEXT: [[GV:%[0-9]+]]:_(p0) = G_GLOBAL_VALUE @g + 2
- ; CHECK-NEXT: [[C:%[0-9]+]]:_(s64) = G_CONSTANT i64 8
- ; CHECK-NEXT: %ptr_add2:_(p0) = G_PTR_ADD [[GV]], [[C]](s64)
- ; CHECK-NEXT: G_STORE %val1(s64), [[GV]](p0) :: (store (s64))
- ; CHECK-NEXT: G_STORE %val2(s64), %ptr_add2(p0) :: (store (s64))
+ ; CHECK-NEXT: [[C:%[0-9]+]]:_(i64) = G_CONSTANT i64 8
+ ; CHECK-NEXT: %ptr_add2:_(p0) = G_PTR_ADD [[GV]], [[C]](i64)
+ ; CHECK-NEXT: G_STORE %val1(i64), [[GV]](p0) :: (store (i64))
+ ; CHECK-NEXT: G_STORE %val2(i64), %ptr_add2(p0) :: (store (i64))
; CHECK-NEXT: RET_ReallyLR implicit $x0
- %val1:_(s64) = COPY $x0
- %val2:_(s64) = COPY $x1
+ %val1:_(i64) = COPY $x0
+ %val2:_(i64) = COPY $x1
%global:_(p0) = G_GLOBAL_VALUE @g
- %offset1:_(s64) = G_CONSTANT i64 2
- %offset2:_(s64) = G_CONSTANT i64 10
- %ptr_add1:_(p0) = G_PTR_ADD %global, %offset1(s64)
- %ptr_add2:_(p0) = G_PTR_ADD %global, %offset2(s64)
- G_STORE %val1:_(s64), %ptr_add1 :: (store (s64))
- G_STORE %val2:_(s64), %ptr_add2 :: (store (s64))
+ %offset1:_(i64) = G_CONSTANT i64 2
+ %offset2:_(i64) = G_CONSTANT i64 10
+ %ptr_add1:_(p0) = G_PTR_ADD %global, %offset1(i64)
+ %ptr_add2:_(p0) = G_PTR_ADD %global, %offset2(i64)
+ G_STORE %val1:_(i64), %ptr_add1 :: (store (i64))
+ G_STORE %val2:_(i64), %ptr_add2 :: (store (i64))
RET_ReallyLR implicit $x0
...
@@ -152,17 +152,17 @@ body: |
; CHECK: liveins: $x0
; CHECK-NEXT: {{ $}}
; CHECK-NEXT: [[GV:%[0-9]+]]:_(p0) = G_GLOBAL_VALUE @g + 4
- ; CHECK-NEXT: %offset:_(s64) = G_CONSTANT i64 1
- ; CHECK-NEXT: %dont_fold_me:_(p0) = G_PTR_ADD [[GV]], %offset(s64)
+ ; CHECK-NEXT: %offset:_(i64) = G_CONSTANT i64 1
+ ; CHECK-NEXT: %dont_fold_me:_(p0) = G_PTR_ADD [[GV]], %offset(i64)
; CHECK-NEXT: $x0 = COPY %dont_fold_me(p0)
; CHECK-NEXT: RET_ReallyLR implicit $x0
%global:_(p0) = G_GLOBAL_VALUE @g
- %offset:_(s64) = G_CONSTANT i64 1
- %ptr_add1:_(p0) = G_PTR_ADD %global, %offset(s64)
- %ptr_add2:_(p0) = G_PTR_ADD %ptr_add1, %offset(s64)
- %ptr_add3:_(p0) = G_PTR_ADD %ptr_add2, %offset(s64)
- %ptr_add4:_(p0) = G_PTR_ADD %ptr_add3, %offset(s64)
- %dont_fold_me:_(p0) = G_PTR_ADD %ptr_add4, %offset(s64)
+ %offset:_(i64) = G_CONSTANT i64 1
+ %ptr_add1:_(p0) = G_PTR_ADD %global, %offset(i64)
+ %ptr_add2:_(p0) = G_PTR_ADD %ptr_add1, %offset(i64)
+ %ptr_add3:_(p0) = G_PTR_ADD %ptr_add2, %offset(i64)
+ %ptr_add4:_(p0) = G_PTR_ADD %ptr_add3, %offset(i64)
+ %dont_fold_me:_(p0) = G_PTR_ADD %ptr_add4, %offset(i64)
$x0 = COPY %dont_fold_me
RET_ReallyLR implicit $x0
@@ -181,13 +181,13 @@ body: |
; CHECK: liveins: $x0
; CHECK-NEXT: {{ $}}
; CHECK-NEXT: %global:_(p0) = G_GLOBAL_VALUE @g
- ; CHECK-NEXT: %offset:_(s64) = G_CONSTANT i64 -1
- ; CHECK-NEXT: %ptr_add:_(p0) = G_PTR_ADD %global, %offset(s64)
+ ; CHECK-NEXT: %offset:_(i64) = G_CONSTANT i64 -1
+ ; CHECK-NEXT: %ptr_add:_(p0) = G_PTR_ADD %global, %offset(i64)
; CHECK-NEXT: $x0 = COPY %ptr_add(p0)
; CHECK-NEXT: RET_ReallyLR implicit $x0
%global:_(p0) = G_GLOBAL_VALUE @g
- %offset:_(s64) = G_CONSTANT i64 -1
- %ptr_add:_(p0) = G_PTR_ADD %global, %offset(s64)
+ %offset:_(i64) = G_CONSTANT i64 -1
+ %ptr_add:_(p0) = G_PTR_ADD %global, %offset(i64)
$x0 = COPY %ptr_add
RET_ReallyLR implicit $x0
@@ -206,13 +206,13 @@ body: |
; CHECK: liveins: $x0
; CHECK-NEXT: {{ $}}
; CHECK-NEXT: %global:_(p0) = G_GLOBAL_VALUE @g + 3
- ; CHECK-NEXT: %offset:_(s64) = G_CONSTANT i64 -1
- ; CHECK-NEXT: %ptr_add:_(p0) = G_PTR_ADD %global, %offset(s64)
+ ; CHECK-NEXT: %offset:_(i64) = G_CONSTANT i64 -1
+ ; CHECK-NEXT: %ptr_add:_(p0) = G_PTR_ADD %global, %offset(i64)
; CHECK-NEXT: $x0 = COPY %ptr_add(p0)
; CHECK-NEXT: RET_ReallyLR implicit $x0
%global:_(p0) = G_GLOBAL_VALUE @g + 3
- %offset:_(s64) = G_CONSTANT i64 -1
- %ptr_add:_(p0) = G_PTR_ADD %global, %offset(s64)
+ %offset:_(i64) = G_CONSTANT i64 -1
+ %ptr_add:_(p0) = G_PTR_ADD %global, %offset(i64)
$x0 = COPY %ptr_add
RET_ReallyLR implicit $x0
@@ -232,13 +232,13 @@ body: |
; CHECK: liveins: $x0
; CHECK-NEXT: {{ $}}
; CHECK-NEXT: %global:_(p0) = G_GLOBAL_VALUE @g
- ; CHECK-NEXT: %offset:_(s64) = G_CONSTANT i64 4292870144
- ; CHECK-NEXT: %ptr_add:_(p0) = G_PTR_ADD %global, %offset(s64)
+ ; CHECK-NEXT: %offset:_(i64) = G_CONSTANT i64 4292870144
+ ; CHECK-NEXT: %ptr_add:_(p0) = G_PTR_ADD %global, %offset(i64)
; CHECK-NEXT: $x0 = COPY %ptr_add(p0)
; CHECK-NEXT: RET_ReallyLR implicit $x0
%global:_(p0) = G_GLOBAL_VALUE @g
- %offset:_(s64) = G_CONSTANT i64 4292870144 ; 1 << 21
- %ptr_add:_(p0) = G_PTR_ADD %global, %offset(s64)
+ %offset:_(i64) = G_CONSTANT i64 4292870144 ; 1 << 21
+ %ptr_add:_(p0) = G_PTR_ADD %global, %offset(i64)
$x0 = COPY %ptr_add
RET_ReallyLR implicit $x0
@@ -254,13 +254,13 @@ body: |
; CHECK-LABEL: name: dont_fold_offset_larger_than_type_alloc
; CHECK: %global:_(p0) = G_GLOBAL_VALUE @g
- ; CHECK-NEXT: %offset:_(s64) = G_CONSTANT i64 16
- ; CHECK-NEXT: %ptr_add:_(p0) = G_PTR_ADD %global, %offset(s64)
+ ; CHECK-NEXT: %offset:_(i64) = G_CONSTANT i64 16
+ ; CHECK-NEXT: %ptr_add:_(p0) = G_PTR_ADD %global, %offset(i64)
; CHECK-NEXT: $x0 = COPY %ptr_add(p0)
; CHECK-NEXT: RET_ReallyLR implicit $x0
%global:_(p0) = G_GLOBAL_VALUE @g
- %offset:_(s64) = G_CONSTANT i64 16
- %ptr_add:_(p0) = G_PTR_ADD %global, %offset(s64)
+ %offset:_(i64) = G_CONSTANT i64 16
+ %ptr_add:_(p0) = G_PTR_ADD %global, %offset(i64)
$x0 = COPY %ptr_add(p0)
RET_ReallyLR implicit $x0
@@ -276,13 +276,13 @@ body: |
; CHECK-LABEL: name: dont_fold_unsized_type
; CHECK: %global:_(p0) = G_GLOBAL_VALUE @unsized
- ; CHECK-NEXT: %offset:_(s64) = G_CONSTANT i64 16
- ; CHECK-NEXT: %ptr_add:_(p0) = G_PTR_ADD %global, %offset(s64)
+ ; CHECK-NEXT: %offset:_(i64) = G_CONSTANT i64 16
+ ; CHECK-NEXT: %ptr_add:_(p0) = G_PTR_ADD %global, %offset(i64)
; CHECK-NEXT: $x0 = COPY %ptr_add(p0)
; CHECK-NEXT: RET_ReallyLR implicit $x0
%global:_(p0) = G_GLOBAL_VALUE @unsized
- %offset:_(s64) = G_CONSTANT i64 16
- %ptr_add:_(p0) = G_PTR_ADD %global, %offset(s64)
+ %offset:_(i64) = G_CONSTANT i64 16
+ %ptr_add:_(p0) = G_PTR_ADD %global, %offset(i64)
$x0 = COPY %ptr_add(p0)
RET_ReallyLR implicit $x0
@@ -298,12 +298,12 @@ body: |
; CHECK-LABEL: name: dont_fold_thread_local
; CHECK: %global:_(p0) = G_GLOBAL_VALUE @thread_local
- ; CHECK-NEXT: %offset:_(s64) = G_CONSTANT i64 16
- ; CHECK-NEXT: %ptr_add:_(p0) = G_PTR_ADD %global, %offset(s64)
+ ; CHECK-NEXT: %offset:_(i64) = G_CONSTANT i64 16
+ ; CHECK-NEXT: %ptr_add:_(p0) = G_PTR_ADD %global, %offset(i64)
; CHECK-NEXT: $x0 = COPY %ptr_add(p0)
; CHECK-NEXT: RET_ReallyLR implicit $x0
%global:_(p0) = G_GLOBAL_VALUE @thread_local
- %offset:_(s64) = G_CONSTANT i64 16
- %ptr_add:_(p0) = G_PTR_ADD %global, %offset(s64)
+ %offset:_(i64) = G_CONSTANT i64 16
+ %ptr_add:_(p0) = G_PTR_ADD %global, %offset(i64)
$x0 = COPY %ptr_add(p0)
RET_ReallyLR implicit $x0
diff --git a/llvm/test/CodeGen/AArch64/GlobalISel/form-bitfield-extract-from-and.mir b/llvm/test/CodeGen/AArch64/GlobalISel/form-bitfield-extract-from-and.mir
index 49ffdf4f3ddaf..3abd11b3d5762 100644
--- a/llvm/test/CodeGen/AArch64/GlobalISel/form-bitfield-extract-from-and.mir
+++ b/llvm/test/CodeGen/AArch64/GlobalISel/form-bitfield-extract-from-and.mir
@@ -24,17 +24,17 @@ body: |
; CHECK-LABEL: name: ubfx_s32
; CHECK: liveins: $w0
; CHECK-NEXT: {{ $}}
- ; CHECK-NEXT: %x:_(s32) = COPY $w0
- ; CHECK-NEXT: %lsb:_(s32) = G_CONSTANT i32 5
- ; CHECK-NEXT: [[C:%[0-9]+]]:_(s32) = G_CONSTANT i32 8
- ; CHECK-NEXT: %and:_(s32) = G_UBFX %x, %lsb(s32), [[C]]
- ; CHECK-NEXT: $w0 = COPY %and(s32)
+ ; CHECK-NEXT: %x:_(i32) = COPY $w0
+ ; CHECK-NEXT: %lsb:_(i32) = G_CONSTANT i32 5
+ ; CHECK-NEXT: [[C:%[0-9]+]]:_(i32) = G_CONSTANT i32 8
+ ; CHECK-NEXT: %and:_(i32) = G_UBFX %x, %lsb(i32), [[C]]
+ ; CHECK-NEXT: $w0 = COPY %and(i32)
; CHECK-NEXT: RET_ReallyLR implicit $w0
- %x:_(s32) = COPY $w0
- %lsb:_(s32) = G_CONSTANT i32 5
- %mask:_(s32) = G_CONSTANT i32 255
- %shift:_(s32) = G_LSHR %x, %lsb
- %and:_(s32) = G_AND %shift, %mask
+ %x:_(i32) = COPY $w0
+ %lsb:_(i32) = G_CONSTANT i32 5
+ %mask:_(i32) = G_CONSTANT i32 255
+ %shift:_(i32) = G_LSHR %x, %lsb
+ %and:_(i32) = G_AND %shift, %mask
$w0 = COPY %and
RET_ReallyLR implicit $w0
@@ -54,17 +54,17 @@ body: |
; CHECK-LABEL: name: ubfx_s64
; CHECK: liveins: $x0
; CHECK-NEXT: {{ $}}
- ; CHECK-NEXT: %x:_(s64) = COPY $x0
- ; CHECK-NEXT: %lsb:_(s64) = G_CONSTANT i64 5
- ; CHECK-NEXT: %mask:_(s64) = G_CONSTANT i64 1
- ; CHECK-NEXT: %and:_(s64) = G_UBFX %x, %lsb(s64), %mask
- ; CHECK-NEXT: $x0 = COPY %and(s64)
+ ; CHECK-NEXT: %x:_(i64) = COPY $x0
+ ; CHECK-NEXT: %lsb:_(i64) = G_CONSTANT i64 5
+ ; CHECK-NEXT: %mask:_(i64) = G_CONSTANT i64 1
+ ; CHECK-NEXT: %and:_(i64) = G_UBFX %x, %lsb(i64), %mask
+ ; CHECK-NEXT: $x0 = COPY %and(i64)
; CHECK-NEXT: RET_ReallyLR implicit $x0
- %x:_(s64) = COPY $x0
- %lsb:_(s64) = G_CONSTANT i64 5
- %mask:_(s64) = G_CONSTANT i64 1
- %shift:_(s64) = G_LSHR %x, %lsb
- %and:_(s64) = G_AND %shift, %mask
+ %x:_(i64) = COPY $x0
+ %lsb:_(i64) = G_CONSTANT i64 5
+ %mask:_(i64) = G_CONSTANT i64 1
+ %shift:_(i64) = G_LSHR %x, %lsb
+ %and:_(i64) = G_AND %shift, %mask
$x0 = COPY %and
RET_ReallyLR implicit $x0
@@ -83,18 +83,18 @@ body: |
; CHECK-LABEL: name: dont_combine_no_and_cst
; CHECK: liveins: $w0, $w1
; CHECK-NEXT: {{ $}}
- ; CHECK-NEXT: %x:_(s32) = COPY $w0
- ; CHECK-NEXT: %y:_(s32) = COPY $w1
- ; CHECK-NEXT: %lsb:_(s32) = G_CONSTANT i32 5
- ; CHECK-NEXT: %shift:_(s32) = G_LSHR %x, %lsb(s32)
- ; CHECK-NEXT: %and:_(s32) = G_AND %shift, %y
- ; CHECK-NEXT: $w0 = COPY %and(s32)
+ ; CHECK-NEXT: %x:_(i32) = COPY $w0
+ ; CHECK-NEXT: %y:_(i32) = COPY $w1
+ ; CHECK-NEXT: %lsb:_(i32) = G_CONSTANT i32 5
+ ; CHECK-NEXT: %shift:_(i32) = G_LSHR %x, %lsb(i32)
+ ; CHECK-NEXT: %and:_(i32) = G_AND %shift, %y
+ ; CHECK-NEXT: $w0 = COPY %and(i32)
; CHECK-NEXT: RET_ReallyLR implicit $w0
- %x:_(s32) = COPY $w0
- %y:_(s32) = COPY $w1
- %lsb:_(s32) = G_CONSTANT i32 5
- %shift:_(s32) = G_LSHR %x, %lsb
- %and:_(s32) = G_AND %shift, %y
+ %x:_(i32) = COPY $w0
+ %y:_(i32) = COPY $w1
+ %lsb:_(i32) = G_CONSTANT i32 5
+ %shift:_(i32) = G_LSHR %x, %lsb
+ %and:_(i32) = G_AND %shift, %y
$w0 = COPY %and
RET_ReallyLR implicit $w0
@@ -109,18 +109,18 @@ body: |
; CHECK-LABEL: name: dont_combine_and_cst_not_mask
; CHECK: liveins: $w0
; CHECK-NEXT: {{ $}}
- ; CHECK-NEXT: %x:_(s32) = COPY $w0
- ; CHECK-NEXT: %lsb:_(s32) = G_CONSTANT i32 5
- ; CHECK-NEXT: %not_a_mask:_(s32) = G_CONSTANT i32 2
- ; CHECK-NEXT: %shift:_(s32) = G_LSHR %x, %lsb(s32)
- ; CHECK-NEXT: %and:_(s32) = G_AND %shift, %not_a_mask
- ; CHECK-NEXT: $w0 = COPY %and(s32)
+ ; CHECK-NEXT: %x:_(i32) = COPY $w0
+ ; CHECK-NEXT: %lsb:_(i32) = G_CONSTANT i32 5
+ ; CHECK-NEXT: %not_a_mask:_(i32) = G_CONSTANT i32 2
+ ; CHECK-NEXT: %shift:_(i32) = G_LSHR %x, %lsb(i32)
+ ; CHECK-NEXT: %and:_(i32) = G_AND %shift, %not_a_mask
+ ; CHECK-NEXT: $w0 = COPY %and(i32)
; CHECK-NEXT: RET_ReallyLR implicit $w0
- %x:_(s32) = COPY $w0
- %lsb:_(s32) = G_CONSTANT i32 5
- %not_a_mask:_(s32) = G_CONSTANT i32 2
- %shift:_(s32) = G_LSHR %x, %lsb
- %and:_(s32) = G_AND %shift, %not_a_mask
+ %x:_(i32) = COPY $w0
+ %lsb:_(i32) = G_CONSTANT i32 5
+ %not_a_mask:_(i32) = G_CONSTANT i32 2
+ %shift:_(i32) = G_LSHR %x, %lsb
+ %and:_(i32) = G_AND %shift, %not_a_mask
$w0 = COPY %and
RET_ReallyLR implicit $w0
@@ -135,20 +135,20 @@ body: |
; CHECK-LABEL: name: dont_combine_shift_more_than_one_use
; CHECK: liveins: $x0
; CHECK-NEXT: {{ $}}
- ; CHECK-NEXT: %x:_(s64) = COPY $x0
- ; CHECK-NEXT: %lsb:_(s64) = G_CONSTANT i64 5
- ; CHECK-NEXT: %mask:_(s64) = G_CONSTANT i64 1
- ; CHECK-NEXT: %shift:_(s64) = G_LSHR %x, %lsb(s64)
- ; CHECK-NEXT: %and:_(s64) = G_AND %shift, %mask
- ; CHECK-NEXT: %sub:_(s64) = G_SUB %and, %shift
- ; CHECK-NEXT: $x0 = COPY %sub(s64)
+ ; CHECK-NEXT: %x:_(i64) = COPY $x0
+ ; CHECK-NEXT: %lsb:_(i64) = G_CONSTANT i64 5
+ ; CHECK-NEXT: %mask:_(i64) = G_CONSTANT i64 1
+ ; CHECK-NEXT: %shift:_(i64) = G_LSHR %x, %lsb(i64)
+ ; CHECK-NEXT: %and:_(i64) = G_AND %shift, %mask
+ ; CHECK-NEXT: %sub:_(i64) = G_SUB %and, %shift
+ ; CHECK-NEXT: $x0 = COPY %sub(i64)
; CHECK-NEXT: RET_ReallyLR implicit $x0
- %x:_(s64) = COPY $x0
- %lsb:_(s64) = G_CONSTANT i64 5
- %mask:_(s64) = G_CONSTANT i64 1
- %shift:_(s64) = G_LSHR %x, %lsb
- %and:_(s64) = G_AND %shift, %mask
- %sub:_(s64) = G_SUB %and, %shift
+ %x:_(i64) = COPY $x0
+ %lsb:_(i64) = G_CONSTANT i64 5
+ %mask:_(i64) = G_CONSTANT i64 1
+ %shift:_(i64) = G_LSHR %x, %lsb
+ %and:_(i64) = G_AND %shift, %mask
+ %sub:_(i64) = G_SUB %and, %shift
$x0 = COPY %sub
RET_ReallyLR implicit $x0
@@ -167,18 +167,18 @@ body: |
; CHECK-LABEL: name: dont_combine_negative_lsb
; CHECK: liveins: $w0
; CHECK-NEXT: {{ $}}
- ; CHECK-NEXT: %x:_(s32) = COPY $w0
- ; CHECK-NEXT: %negative:_(s32) = G_CONSTANT i32 -1
- ; CHECK-NEXT: %mask:_(s32) = G_CONSTANT i32 255
- ; CHECK-NEXT: %shift:_(s32) = G_LSHR %x, %negative(s32)
- ; CHECK-NEXT: %and:_(s32) = G_AND %shift, %mask
- ; CHECK-NEXT: $w0 = COPY %and(s32)
+ ; CHECK-NEXT: %x:_(i32) = COPY $w0
+ ; CHECK-NEXT: %negative:_(i32) = G_CONSTANT i32 -1
+ ; CHECK-NEXT: %mask:_(i32) = G_CONSTANT i32 255
+ ; CHECK-NEXT: %shift:_(i32) = G_LSHR %x, %negative(i32)
+ ; CHECK-NEXT: %and:_(i32) = G_AND %shift, %mask
+ ; CHECK-NEXT: $w0 = COPY %and(i32)
; CHECK-NEXT: RET_ReallyLR implicit $w0
- %x:_(s32) = COPY $w0
- %negative:_(s32) = G_CONSTANT i32 -1
- %mask:_(s32) = G_CONSTANT i32 255
- %shift:_(s32) = G_LSHR %x, %negative
- %and:_(s32) = G_AND %shift, %mask
+ %x:_(i32) = COPY $w0
+ %negative:_(i32) = G_CONSTANT i32 -1
+ %mask:_(i32) = G_CONSTANT i32 255
+ %shift:_(i32) = G_LSHR %x, %negative
+ %and:_(i32) = G_AND %shift, %mask
$w0 = COPY %and
RET_ReallyLR implicit $w0
@@ -197,18 +197,18 @@ body: |
; CHECK-LABEL: name: dont_combine_lsb_too_large
; CHECK: liveins: $w0
; CHECK-NEXT: {{ $}}
- ; CHECK-NEXT: %x:_(s32) = COPY $w0
- ; CHECK-NEXT: %too_large:_(s32) = G_CONSTANT i32 32
- ; CHECK-NEXT: %mask:_(s32) = G_CONSTANT i32 255
- ; CHECK-NEXT: %shift:_(s32) = G_LSHR %x, %too_large(s32)
- ; CHECK-NEXT: %and:_(s32) = G_AND %shift, %mask
- ; CHECK-NEXT: $w0 = COPY %and(s32)
+ ; CHECK-NEXT: %x:_(i32) = COPY $w0
+ ; CHECK-NEXT: %too_large:_(i32) = G_CONSTANT i32 32
+ ; CHECK-NEXT: %mask:_(i32) = G_CONSTANT i32 255
+ ; CHECK-NEXT: %shift:_(i32) = G_LSHR %x, %too_large(i32)
+ ; CHECK-NEXT: %and:_(i32) = G_AND %shift, %mask
+ ; CHECK-NEXT: $w0 = COPY %and(i32)
; CHECK-NEXT: RET_ReallyLR implicit $w0
- %x:_(s32) = COPY $w0
- %too_large:_(s32) = G_CONSTANT i32 32
- %mask:_(s32) = G_CONSTANT i32 255
- %shift:_(s32) = G_LSHR %x, %too_large
- %and:_(s32) = G_AND %shift, %mask
+ %x:_(i32) = COPY $w0
+ %too_large:_(i32) = G_CONSTANT i32 32
+ %mask:_(i32) = G_CONSTANT i32 255
+ %shift:_(i32) = G_LSHR %x, %too_large
+ %and:_(i32) = G_AND %shift, %mask
$w0 = COPY %and
RET_ReallyLR implicit $w0
@@ -223,22 +223,22 @@ body: |
; CHECK-LABEL: name: dont_combine_vector
; CHECK: liveins: $d0
; CHECK-NEXT: {{ $}}
- ; CHECK-NEXT: %x:_(<2 x s32>) = COPY $d0
- ; CHECK-NEXT: %lsb_cst:_(s32) = G_CONSTANT i32 5
- ; CHECK-NEXT: %lsb:_(<2 x s32>) = G_BUILD_VECTOR %lsb_cst(s32), %lsb_cst(s32)
- ; CHECK-NEXT: %mask_cst:_(s32) = G_CONSTANT i32 255
- ; CHECK-NEXT: %mask:_(<2 x s32>) = G_BUILD_VECTOR %mask_cst(s32), %mask_cst(s32)
- ; CHECK-NEXT: %shift:_(<2 x s32>) = G_LSHR %x, %lsb(<2 x s32>)
- ; CHECK-NEXT: %and:_(<2 x s32>) = G_AND %shift, %mask
- ; CHECK-NEXT: $d0 = COPY %and(<2 x s32>)
+ ; CHECK-NEXT: %x:_(<2 x i32>) = COPY $d0
+ ; CHECK-NEXT: %lsb_cst:_(i32) = G_CONSTANT i32 5
+ ; CHECK-NEXT: %lsb:_(<2 x i32>) = G_BUILD_VECTOR %lsb_cst(i32), %lsb_cst(i32)
+ ; CHECK-NEXT: %mask_cst:_(i32) = G_CONSTANT i32 255
+ ; CHECK-NEXT: %mask:_(<2 x i32>) = G_BUILD_VECTOR %mask_cst(i32), %mask_cst(i32)
+ ; CHECK-NEXT: %shift:_(<2 x i32>) = G_LSHR %x, %lsb(<2 x i32>)
+ ; CHECK-NEXT: %and:_(<2 x i32>) = G_AND %shift, %mask
+ ; CHECK-NEXT: $d0 = COPY %and(<2 x i32>)
; CHECK-NEXT: RET_ReallyLR implicit $d0
- %x:_(<2 x s32>) = COPY $d0
- %lsb_cst:_(s32) = G_CONSTANT i32 5
- %lsb:_(<2 x s32>) = G_BUILD_VECTOR %lsb_cst, %lsb_cst
- %mask_cst:_(s32) = G_CONSTANT i32 255
- %mask:_(<2 x s32>) = G_BUILD_VECTOR %mask_cst, %mask_cst
- %shift:_(<2 x s32>) = G_LSHR %x, %lsb
- %and:_(<2 x s32>) = G_AND %shift, %mask
+ %x:_(<2 x i32>) = COPY $d0
+ %lsb_cst:_(i32) = G_CONSTANT i32 5
+ %lsb:_(<2 x i32>) = G_BUILD_VECTOR %lsb_cst, %lsb_cst
+ %mask_cst:_(i32) = G_CONSTANT i32 255
+ %mask:_(<2 x i32>) = G_BUILD_VECTOR %mask_cst, %mask_cst
+ %shift:_(<2 x i32>) = G_LSHR %x, %lsb
+ %and:_(<2 x i32>) = G_AND %shift, %mask
$d0 = COPY %and
RET_ReallyLR implicit $d0
@@ -256,17 +256,17 @@ body: |
; CHECK-LABEL: name: max_signed_int_mask
; CHECK: liveins: $x0
; CHECK-NEXT: {{ $}}
- ; CHECK-NEXT: %x:_(s64) = COPY $x0
- ; CHECK-NEXT: %lsb:_(s64) = G_CONSTANT i64 0
- ; CHECK-NEXT: [[C:%[0-9]+]]:_(s64) = G_CONSTANT i64 63
- ; CHECK-NEXT: %and:_(s64) = G_UBFX %x, %lsb(s64), [[C]]
- ; CHECK-NEXT: $x0 = COPY %and(s64)
+ ; CHECK-NEXT: %x:_(i64) = COPY $x0
+ ; CHECK-NEXT: %lsb:_(i64) = G_CONSTANT i64 0
+ ; CHECK-NEXT: [[C:%[0-9]+]]:_(i64) = G_CONSTANT i64 63
+ ; CHECK-NEXT: %and:_(i64) = G_UBFX %x, %lsb(i64), [[C]]
+ ; CHECK-NEXT: $x0 = COPY %and(i64)
; CHECK-NEXT: RET_ReallyLR implicit $x0
- %x:_(s64) = COPY $x0
- %lsb:_(s64) = G_CONSTANT i64 0
- %mask:_(s64) = G_CONSTANT i64 9223372036854775807
- %shift:_(s64) = G_LSHR %x, %lsb
- %and:_(s64) = G_AND %shift, %mask
+ %x:_(i64) = COPY $x0
+ %lsb:_(i64) = G_CONSTANT i64 0
+ %mask:_(i64) = G_CONSTANT i64 9223372036854775807
+ %shift:_(i64) = G_LSHR %x, %lsb
+ %and:_(i64) = G_AND %shift, %mask
$x0 = COPY %and
RET_ReallyLR implicit $x0
@@ -284,16 +284,16 @@ body: |
; CHECK-LABEL: name: max_unsigned_int_mask
; CHECK: liveins: $x0
; CHECK-NEXT: {{ $}}
- ; CHECK-NEXT: %x:_(s64) = COPY $x0
- ; CHECK-NEXT: %lsb:_(s64) = G_CONSTANT i64 5
- ; CHECK-NEXT: [[C:%[0-9]+]]:_(s64) = G_CONSTANT i64 64
- ; CHECK-NEXT: %and:_(s64) = G_UBFX %x, %lsb(s64), [[C]]
- ; CHECK-NEXT: $x0 = COPY %and(s64)
+ ; CHECK-NEXT: %x:_(i64) = COPY $x0
+ ; CHECK-NEXT: %lsb:_(i64) = G_CONSTANT i64 5
+ ; CHECK-NEXT: [[C:%[0-9]+]]:_(i64) = G_CONSTANT i64 64
+ ; CHECK-NEXT: %and:_(i64) = G_UBFX %x, %lsb(i64), [[C]]
+ ; CHECK-NEXT: $x0 = COPY %and(i64)
; CHECK-NEXT: RET_ReallyLR implicit $x0
- %x:_(s64) = COPY $x0
- %lsb:_(s64) = G_CONSTANT i64 5
- %mask:_(s64) = G_CONSTANT i64 18446744073709551615
- %shift:_(s64) = G_LSHR %x, %lsb
- %and:_(s64) = G_AND %shift, %mask
+ %x:_(i64) = COPY $x0
+ %lsb:_(i64) = G_CONSTANT i64 5
+ %mask:_(i64) = G_CONSTANT i64 18446744073709551615
+ %shift:_(i64) = G_LSHR %x, %lsb
+ %and:_(i64) = G_AND %shift, %mask
$x0 = COPY %and
RET_ReallyLR implicit $x0
diff --git a/llvm/test/CodeGen/AArch64/GlobalISel/icmp-flags.mir b/llvm/test/CodeGen/AArch64/GlobalISel/icmp-flags.mir
index 59e4de9440416..ead76579b90ac 100644
--- a/llvm/test/CodeGen/AArch64/GlobalISel/icmp-flags.mir
+++ b/llvm/test/CodeGen/AArch64/GlobalISel/icmp-flags.mir
@@ -9,16 +9,16 @@ body: |
; CHECK-LABEL: name: icmp_samesign
; CHECK: liveins: $w0, $w1
; CHECK-NEXT: {{ $}}
- ; CHECK-NEXT: %x:_(s32) = COPY $w0
- ; CHECK-NEXT: %y:_(s32) = COPY $w1
- ; CHECK-NEXT: %cmp:_(s1) = samesign G_ICMP intpred(eq), %y(s32), %y
- ; CHECK-NEXT: %zext:_(s32) = G_ZEXT %cmp(s1)
- ; CHECK-NEXT: $w0 = COPY %zext(s32)
+ ; CHECK-NEXT: %x:_(i32) = COPY $w0
+ ; CHECK-NEXT: %y:_(i32) = COPY $w1
+ ; CHECK-NEXT: %cmp:_(i1) = samesign G_ICMP intpred(eq), %y(i32), %y
+ ; CHECK-NEXT: %zext:_(i32) = G_ZEXT %cmp(i1)
+ ; CHECK-NEXT: $w0 = COPY %zext(i32)
; CHECK-NEXT: RET_ReallyLR implicit $w0
- %x:_(s32) = COPY $w0
- %y:_(s32) = COPY $w1
- %cmp:_(s1) = samesign G_ICMP intpred(eq), %y:_(s32), %y:_
- %zext:_(s32) = G_ZEXT %cmp:_(s1)
+ %x:_(i32) = COPY $w0
+ %y:_(i32) = COPY $w1
+ %cmp:_(i1) = samesign G_ICMP intpred(eq), %y:_(i32), %y:_
+ %zext:_(i32) = G_ZEXT %cmp:_(i1)
$w0 = COPY %zext
RET_ReallyLR implicit $w0
...
@@ -30,16 +30,16 @@ body: |
; CHECK-LABEL: name: icmp_
diff erentsign
; CHECK: liveins: $w0, $w1
; CHECK-NEXT: {{ $}}
- ; CHECK-NEXT: %x:_(s32) = COPY $w0
- ; CHECK-NEXT: %y:_(s32) = COPY $w1
- ; CHECK-NEXT: %cmp:_(s1) = G_ICMP intpred(eq), %y(s32), %y
- ; CHECK-NEXT: %zext:_(s32) = G_ZEXT %cmp(s1)
- ; CHECK-NEXT: $w0 = COPY %zext(s32)
+ ; CHECK-NEXT: %x:_(i32) = COPY $w0
+ ; CHECK-NEXT: %y:_(i32) = COPY $w1
+ ; CHECK-NEXT: %cmp:_(i1) = G_ICMP intpred(eq), %y(i32), %y
+ ; CHECK-NEXT: %zext:_(i32) = G_ZEXT %cmp(i1)
+ ; CHECK-NEXT: $w0 = COPY %zext(i32)
; CHECK-NEXT: RET_ReallyLR implicit $w0
- %x:_(s32) = COPY $w0
- %y:_(s32) = COPY $w1
- %cmp:_(s1) = G_ICMP intpred(eq), %y:_(s32), %y:_
- %zext:_(s32) = G_ZEXT %cmp:_(s1)
+ %x:_(i32) = COPY $w0
+ %y:_(i32) = COPY $w1
+ %cmp:_(i1) = G_ICMP intpred(eq), %y:_(i32), %y:_
+ %zext:_(i32) = G_ZEXT %cmp:_(i1)
$w0 = COPY %zext
RET_ReallyLR implicit $w0
---
diff --git a/llvm/test/CodeGen/AArch64/GlobalISel/inline-memcpy-forced.mir b/llvm/test/CodeGen/AArch64/GlobalISel/inline-memcpy-forced.mir
index 2dd0a721b8c8c..5e86809e33d71 100644
--- a/llvm/test/CodeGen/AArch64/GlobalISel/inline-memcpy-forced.mir
+++ b/llvm/test/CodeGen/AArch64/GlobalISel/inline-memcpy-forced.mir
@@ -80,8 +80,8 @@ body: |
; CHECK-NEXT: RET_ReallyLR
%0:_(p0) = COPY $x0
%1:_(p0) = COPY $x1
- %2:_(s64) = G_CONSTANT i64 143
- G_MEMCPY_INLINE %0(p0), %1(p0), %2(s64) :: (store (s8) into %ir.0, align 4), (load (s8) from %ir.1, align 4)
+ %2:_(i64) = G_CONSTANT i64 143
+ G_MEMCPY_INLINE %0(p0), %1(p0), %2(i64) :: (store (i8) into %ir.0, align 4), (load (i8) from %ir.1, align 4)
RET_ReallyLR
...
diff --git a/llvm/test/CodeGen/AArch64/GlobalISel/non-pow-2-extload-combine.mir b/llvm/test/CodeGen/AArch64/GlobalISel/non-pow-2-extload-combine.mir
index 5bc845fb35037..7a0477834ead6 100644
--- a/llvm/test/CodeGen/AArch64/GlobalISel/non-pow-2-extload-combine.mir
+++ b/llvm/test/CodeGen/AArch64/GlobalISel/non-pow-2-extload-combine.mir
@@ -24,15 +24,15 @@ body: |
; CHECK: liveins: $x0, $x1
; CHECK-NEXT: {{ $}}
; CHECK-NEXT: [[COPY:%[0-9]+]]:_(p0) = COPY $x0
- ; CHECK-NEXT: [[LOAD:%[0-9]+]]:_(s24) = G_LOAD [[COPY]](p0) :: (load (s24) from %ir.ptr, align 1)
- ; CHECK-NEXT: [[ZEXT:%[0-9]+]]:_(s32) = G_ZEXT [[LOAD]](s24)
- ; CHECK-NEXT: $w0 = COPY [[ZEXT]](s32)
+ ; CHECK-NEXT: [[LOAD:%[0-9]+]]:_(i24) = G_LOAD [[COPY]](p0) :: (load (i24) from %ir.ptr, align 1)
+ ; CHECK-NEXT: [[ZEXT:%[0-9]+]]:_(i32) = G_ZEXT [[LOAD]](i24)
+ ; CHECK-NEXT: $w0 = COPY [[ZEXT]](i32)
; CHECK-NEXT: RET_ReallyLR implicit $w0
%0:_(p0) = COPY $x0
%1:_(p0) = COPY $x1
- %2:_(s24) = G_LOAD %0(p0) :: (load (s24) from %ir.ptr, align 1)
- %3:_(s32) = G_ZEXT %2(s24)
- $w0 = COPY %3(s32)
+ %2:_(i24) = G_LOAD %0(p0) :: (load (i24) from %ir.ptr, align 1)
+ %3:_(i32) = G_ZEXT %2(i24)
+ $w0 = COPY %3(i32)
RET_ReallyLR implicit $w0
...
diff --git a/llvm/test/CodeGen/AArch64/GlobalISel/opt-overlapping-and-postlegalize.mir b/llvm/test/CodeGen/AArch64/GlobalISel/opt-overlapping-and-postlegalize.mir
index eb2dfd10b89f1..277a52efca6a6 100644
--- a/llvm/test/CodeGen/AArch64/GlobalISel/opt-overlapping-and-postlegalize.mir
+++ b/llvm/test/CodeGen/AArch64/GlobalISel/opt-overlapping-and-postlegalize.mir
@@ -16,16 +16,16 @@ body: |
; CHECK-LABEL: name: test
; CHECK: liveins: $w0
; CHECK-NEXT: {{ $}}
- ; CHECK-NEXT: %copy:_(s32) = COPY $w0
- ; CHECK-NEXT: [[C:%[0-9]+]]:_(s32) = G_CONSTANT i32 192
- ; CHECK-NEXT: %and2:_(s32) = G_AND %copy, [[C]]
- ; CHECK-NEXT: $w0 = COPY %and2(s32)
+ ; CHECK-NEXT: %copy:_(i32) = COPY $w0
+ ; CHECK-NEXT: [[C:%[0-9]+]]:_(i32) = G_CONSTANT i32 192
+ ; CHECK-NEXT: %and2:_(i32) = G_AND %copy, [[C]]
+ ; CHECK-NEXT: $w0 = COPY %and2(i32)
; CHECK-NEXT: RET_ReallyLR implicit $w0
- %copy:_(s32) = COPY $w0
- %cst_neg_64:_(s32) = G_CONSTANT i32 -64
- %and1:_(s32) = G_AND %copy, %cst_neg_64
- %cst_255:_(s32) = G_CONSTANT i32 255
- %and2:_(s32) = G_AND %and1, %cst_255
- $w0 = COPY %and2(s32)
+ %copy:_(i32) = COPY $w0
+ %cst_neg_64:_(i32) = G_CONSTANT i32 -64
+ %and1:_(i32) = G_AND %copy, %cst_neg_64
+ %cst_255:_(i32) = G_CONSTANT i32 255
+ %and2:_(i32) = G_AND %and1, %cst_255
+ $w0 = COPY %and2(i32)
RET_ReallyLR implicit $w0
...
diff --git a/llvm/test/CodeGen/AArch64/GlobalISel/opt-overlapping-and.mir b/llvm/test/CodeGen/AArch64/GlobalISel/opt-overlapping-and.mir
index 351d6b39d56e5..8a7e15e0574c2 100644
--- a/llvm/test/CodeGen/AArch64/GlobalISel/opt-overlapping-and.mir
+++ b/llvm/test/CodeGen/AArch64/GlobalISel/opt-overlapping-and.mir
@@ -6,17 +6,17 @@ name: bitmask_overlap1
body: |
bb.1:
; CHECK-LABEL: name: bitmask_overlap1
- ; CHECK: [[COPY:%[0-9]+]]:_(s32) = COPY $w0
- ; CHECK-NEXT: [[C:%[0-9]+]]:_(s32) = G_CONSTANT i32 128
- ; CHECK-NEXT: [[AND:%[0-9]+]]:_(s32) = G_AND [[COPY]], [[C]]
- ; CHECK-NEXT: $w0 = COPY [[AND]](s32)
+ ; CHECK: [[COPY:%[0-9]+]]:_(i32) = COPY $w0
+ ; CHECK-NEXT: [[C:%[0-9]+]]:_(i32) = G_CONSTANT i32 128
+ ; CHECK-NEXT: [[AND:%[0-9]+]]:_(i32) = G_AND [[COPY]], [[C]]
+ ; CHECK-NEXT: $w0 = COPY [[AND]](i32)
; CHECK-NEXT: RET_ReallyLR implicit $w0
- %0:_(s32) = COPY $w0
- %1:_(s32) = G_CONSTANT i32 -128
- %3:_(s32) = G_CONSTANT i32 255
- %2:_(s32) = G_AND %0, %1
- %4:_(s32) = G_AND %2, %3
- $w0 = COPY %4(s32)
+ %0:_(i32) = COPY $w0
+ %1:_(i32) = G_CONSTANT i32 -128
+ %3:_(i32) = G_CONSTANT i32 255
+ %2:_(i32) = G_AND %0, %1
+ %4:_(i32) = G_AND %2, %3
+ $w0 = COPY %4(i32)
RET_ReallyLR implicit $w0
...
@@ -25,17 +25,17 @@ name: bitmask_overlap2
body: |
bb.1:
; CHECK-LABEL: name: bitmask_overlap2
- ; CHECK: [[COPY:%[0-9]+]]:_(s32) = COPY $w0
- ; CHECK-NEXT: [[C:%[0-9]+]]:_(s32) = G_CONSTANT i32 128
- ; CHECK-NEXT: [[AND:%[0-9]+]]:_(s32) = G_AND [[COPY]], [[C]]
- ; CHECK-NEXT: $w0 = COPY [[AND]](s32)
+ ; CHECK: [[COPY:%[0-9]+]]:_(i32) = COPY $w0
+ ; CHECK-NEXT: [[C:%[0-9]+]]:_(i32) = G_CONSTANT i32 128
+ ; CHECK-NEXT: [[AND:%[0-9]+]]:_(i32) = G_AND [[COPY]], [[C]]
+ ; CHECK-NEXT: $w0 = COPY [[AND]](i32)
; CHECK-NEXT: RET_ReallyLR implicit $w0
- %0:_(s32) = COPY $w0
- %1:_(s32) = G_CONSTANT i32 255
- %3:_(s32) = G_CONSTANT i32 -128
- %2:_(s32) = G_AND %1, %0
- %4:_(s32) = G_AND %2, %3
- $w0 = COPY %4(s32)
+ %0:_(i32) = COPY $w0
+ %1:_(i32) = G_CONSTANT i32 255
+ %3:_(i32) = G_CONSTANT i32 -128
+ %2:_(i32) = G_AND %1, %0
+ %4:_(i32) = G_AND %2, %3
+ $w0 = COPY %4(i32)
RET_ReallyLR implicit $w0
...
@@ -44,17 +44,17 @@ name: bitmask_overlap3
body: |
bb.1:
; CHECK-LABEL: name: bitmask_overlap3
- ; CHECK: [[COPY:%[0-9]+]]:_(s32) = COPY $w0
- ; CHECK-NEXT: [[C:%[0-9]+]]:_(s32) = G_CONSTANT i32 128
- ; CHECK-NEXT: [[AND:%[0-9]+]]:_(s32) = G_AND [[COPY]], [[C]]
- ; CHECK-NEXT: $w0 = COPY [[AND]](s32)
+ ; CHECK: [[COPY:%[0-9]+]]:_(i32) = COPY $w0
+ ; CHECK-NEXT: [[C:%[0-9]+]]:_(i32) = G_CONSTANT i32 128
+ ; CHECK-NEXT: [[AND:%[0-9]+]]:_(i32) = G_AND [[COPY]], [[C]]
+ ; CHECK-NEXT: $w0 = COPY [[AND]](i32)
; CHECK-NEXT: RET_ReallyLR implicit $w0
- %0:_(s32) = COPY $w0
- %1:_(s32) = G_CONSTANT i32 255
- %3:_(s32) = G_CONSTANT i32 -128
- %2:_(s32) = G_AND %1, %0
- %4:_(s32) = G_AND %3, %2
- $w0 = COPY %4(s32)
+ %0:_(i32) = COPY $w0
+ %1:_(i32) = G_CONSTANT i32 255
+ %3:_(i32) = G_CONSTANT i32 -128
+ %2:_(i32) = G_AND %1, %0
+ %4:_(i32) = G_AND %3, %2
+ $w0 = COPY %4(i32)
RET_ReallyLR implicit $w0
...
@@ -63,17 +63,17 @@ name: bitmask_overlap4
body: |
bb.1:
; CHECK-LABEL: name: bitmask_overlap4
- ; CHECK: [[COPY:%[0-9]+]]:_(s32) = COPY $w0
- ; CHECK-NEXT: [[C:%[0-9]+]]:_(s32) = G_CONSTANT i32 128
- ; CHECK-NEXT: [[AND:%[0-9]+]]:_(s32) = G_AND [[COPY]], [[C]]
- ; CHECK-NEXT: $w0 = COPY [[AND]](s32)
+ ; CHECK: [[COPY:%[0-9]+]]:_(i32) = COPY $w0
+ ; CHECK-NEXT: [[C:%[0-9]+]]:_(i32) = G_CONSTANT i32 128
+ ; CHECK-NEXT: [[AND:%[0-9]+]]:_(i32) = G_AND [[COPY]], [[C]]
+ ; CHECK-NEXT: $w0 = COPY [[AND]](i32)
; CHECK-NEXT: RET_ReallyLR implicit $w0
- %0:_(s32) = COPY $w0
- %1:_(s32) = G_CONSTANT i32 255
- %3:_(s32) = G_CONSTANT i32 -128
- %2:_(s32) = G_AND %0, %1
- %4:_(s32) = G_AND %3, %2
- $w0 = COPY %4(s32)
+ %0:_(i32) = COPY $w0
+ %1:_(i32) = G_CONSTANT i32 255
+ %3:_(i32) = G_CONSTANT i32 -128
+ %2:_(i32) = G_AND %0, %1
+ %4:_(i32) = G_AND %3, %2
+ $w0 = COPY %4(i32)
RET_ReallyLR implicit $w0
...
@@ -82,15 +82,15 @@ name: bitmask_no_overlap
body: |
bb.1:
; CHECK-LABEL: name: bitmask_no_overlap
- ; CHECK: [[C:%[0-9]+]]:_(s32) = G_CONSTANT i32 0
- ; CHECK-NEXT: $w0 = COPY [[C]](s32)
+ ; CHECK: [[C:%[0-9]+]]:_(i32) = G_CONSTANT i32 0
+ ; CHECK-NEXT: $w0 = COPY [[C]](i32)
; CHECK-NEXT: RET_ReallyLR implicit $w0
- %0:_(s32) = COPY $w0
- %1:_(s32) = G_CONSTANT i32 1
- %3:_(s32) = G_CONSTANT i32 2
- %2:_(s32) = G_AND %0, %1
- %4:_(s32) = G_AND %2, %3
- $w0 = COPY %4(s32)
+ %0:_(i32) = COPY $w0
+ %1:_(i32) = G_CONSTANT i32 1
+ %3:_(i32) = G_CONSTANT i32 2
+ %2:_(i32) = G_AND %0, %1
+ %4:_(i32) = G_AND %2, %3
+ $w0 = COPY %4(i32)
RET_ReallyLR implicit $w0
...
@@ -99,23 +99,23 @@ name: bitmask_overlap_extrause
body: |
bb.1:
; CHECK-LABEL: name: bitmask_overlap_extrause
- ; CHECK: [[COPY:%[0-9]+]]:_(s32) = COPY $w0
+ ; CHECK: [[COPY:%[0-9]+]]:_(i32) = COPY $w0
; CHECK-NEXT: [[COPY1:%[0-9]+]]:_(p0) = COPY $x1
- ; CHECK-NEXT: [[C:%[0-9]+]]:_(s32) = G_CONSTANT i32 255
- ; CHECK-NEXT: [[AND:%[0-9]+]]:_(s32) = G_AND [[COPY]], [[C]]
- ; CHECK-NEXT: [[C1:%[0-9]+]]:_(s32) = G_CONSTANT i32 128
- ; CHECK-NEXT: [[AND1:%[0-9]+]]:_(s32) = G_AND [[COPY]], [[C1]]
- ; CHECK-NEXT: G_STORE [[AND]](s32), [[COPY1]](p0) :: (store (s32))
- ; CHECK-NEXT: $w0 = COPY [[AND1]](s32)
+ ; CHECK-NEXT: [[C:%[0-9]+]]:_(i32) = G_CONSTANT i32 255
+ ; CHECK-NEXT: [[AND:%[0-9]+]]:_(i32) = G_AND [[COPY]], [[C]]
+ ; CHECK-NEXT: [[C1:%[0-9]+]]:_(i32) = G_CONSTANT i32 128
+ ; CHECK-NEXT: [[AND1:%[0-9]+]]:_(i32) = G_AND [[COPY]], [[C1]]
+ ; CHECK-NEXT: G_STORE [[AND]](i32), [[COPY1]](p0) :: (store (i32))
+ ; CHECK-NEXT: $w0 = COPY [[AND1]](i32)
; CHECK-NEXT: RET_ReallyLR implicit $w0
- %0:_(s32) = COPY $w0
+ %0:_(i32) = COPY $w0
%1:_(p0) = COPY $x1
- %2:_(s32) = G_CONSTANT i32 255
- %4:_(s32) = G_CONSTANT i32 -128
- %3:_(s32) = G_AND %0, %2
- %5:_(s32) = G_AND %3, %4
- G_STORE %3(s32), %1(p0) :: (store (s32))
- $w0 = COPY %5(s32)
+ %2:_(i32) = G_CONSTANT i32 255
+ %4:_(i32) = G_CONSTANT i32 -128
+ %3:_(i32) = G_AND %0, %2
+ %5:_(i32) = G_AND %3, %4
+ G_STORE %3(i32), %1(p0) :: (store (i32))
+ $w0 = COPY %5(i32)
RET_ReallyLR implicit $w0
...
diff --git a/llvm/test/CodeGen/AArch64/extractvector-of-load.mir b/llvm/test/CodeGen/AArch64/extractvector-of-load.mir
index 43051232b436d..1c54682a4a1ee 100644
--- a/llvm/test/CodeGen/AArch64/extractvector-of-load.mir
+++ b/llvm/test/CodeGen/AArch64/extractvector-of-load.mir
@@ -25,22 +25,22 @@ body: |
; CHECK: liveins: $x0
; CHECK-NEXT: {{ $}}
; CHECK-NEXT: [[COPY:%[0-9]+]]:_(p0) = COPY $x0
- ; CHECK-NEXT: [[C:%[0-9]+]]:_(s32) = G_CONSTANT i32 0
- ; CHECK-NEXT: [[BUILD_VECTOR:%[0-9]+]]:_(<4 x s32>) = G_BUILD_VECTOR [[C]](s32), [[C]](s32), [[C]](s32), [[C]](s32)
- ; CHECK-NEXT: [[C1:%[0-9]+]]:_(s64) = G_CONSTANT i64 0
- ; CHECK-NEXT: [[LOAD:%[0-9]+]]:_(<2 x s32>) = G_LOAD [[COPY]](p0) :: (load (<2 x s32>))
- ; CHECK-NEXT: G_STORE [[BUILD_VECTOR]](<4 x s32>), [[COPY]](p0) :: (store (<4 x s32>))
- ; CHECK-NEXT: [[EVEC:%[0-9]+]]:_(s32) = G_EXTRACT_VECTOR_ELT [[LOAD]](<2 x s32>), [[C1]](s64)
- ; CHECK-NEXT: $w0 = COPY [[EVEC]](s32)
+ ; CHECK-NEXT: [[C:%[0-9]+]]:_(i32) = G_CONSTANT i32 0
+ ; CHECK-NEXT: [[BUILD_VECTOR:%[0-9]+]]:_(<4 x i32>) = G_BUILD_VECTOR [[C]](i32), [[C]](i32), [[C]](i32), [[C]](i32)
+ ; CHECK-NEXT: [[C1:%[0-9]+]]:_(i64) = G_CONSTANT i64 0
+ ; CHECK-NEXT: [[LOAD:%[0-9]+]]:_(<2 x i32>) = G_LOAD [[COPY]](p0) :: (load (<2 x i32>))
+ ; CHECK-NEXT: G_STORE [[BUILD_VECTOR]](<4 x i32>), [[COPY]](p0) :: (store (<4 x i32>))
+ ; CHECK-NEXT: [[EVEC:%[0-9]+]]:_(i32) = G_EXTRACT_VECTOR_ELT [[LOAD]](<2 x i32>), [[C1]](i64)
+ ; CHECK-NEXT: $w0 = COPY [[EVEC]](i32)
; CHECK-NEXT: RET_ReallyLR implicit $w0
%0:_(p0) = COPY $x0
- %3:_(s32) = G_CONSTANT i32 0
- %2:_(<4 x s32>) = G_BUILD_VECTOR %3(s32), %3(s32), %3(s32), %3(s32)
- %5:_(s64) = G_CONSTANT i64 0
- %1:_(<2 x s32>) = G_LOAD %0(p0) :: (load (<2 x s32>))
- G_STORE %2(<4 x s32>), %0(p0) :: (store (<4 x s32>))
- %4:_(s32) = G_EXTRACT_VECTOR_ELT %1(<2 x s32>), %5(s64)
- $w0 = COPY %4(s32)
+ %3:_(i32) = G_CONSTANT i32 0
+ %2:_(<4 x i32>) = G_BUILD_VECTOR %3(i32), %3(i32), %3(i32), %3(i32)
+ %5:_(i64) = G_CONSTANT i64 0
+ %1:_(<2 x i32>) = G_LOAD %0(p0) :: (load (<2 x i32>))
+ G_STORE %2(<4 x i32>), %0(p0) :: (store (<4 x i32>))
+ %4:_(i32) = G_EXTRACT_VECTOR_ELT %1(<2 x i32>), %5(i64)
+ $w0 = COPY %4(i32)
RET_ReallyLR implicit $w0
...
diff --git a/llvm/test/CodeGen/AArch64/extractvector-oob-load.mir b/llvm/test/CodeGen/AArch64/extractvector-oob-load.mir
index e7e8c93991094..b9972f3d31fc8 100644
--- a/llvm/test/CodeGen/AArch64/extractvector-oob-load.mir
+++ b/llvm/test/CodeGen/AArch64/extractvector-oob-load.mir
@@ -22,14 +22,14 @@ body: |
; CHECK-LABEL: name: f
; CHECK: liveins: $x0
; CHECK-NEXT: {{ $}}
- ; CHECK-NEXT: [[DEF:%[0-9]+]]:_(s64) = G_IMPLICIT_DEF
- ; CHECK-NEXT: $x0 = COPY [[DEF]](s64)
+ ; CHECK-NEXT: [[DEF:%[0-9]+]]:_(i64) = G_IMPLICIT_DEF
+ ; CHECK-NEXT: $x0 = COPY [[DEF]](i64)
; CHECK-NEXT: RET_ReallyLR implicit $x0
%0:_(p0) = COPY $x0
- %3:_(s64) = G_CONSTANT i64 224567957
- %1:_(<3 x s64>) = G_LOAD %0(p0) :: (load (<3 x s64>), align 32)
- %2:_(s64) = G_EXTRACT_VECTOR_ELT %1(<3 x s64>), %3(s64)
- $x0 = COPY %2(s64)
+ %3:_(i64) = G_CONSTANT i64 224567957
+ %1:_(<3 x i64>) = G_LOAD %0(p0) :: (load (<3 x i64>), align 32)
+ %2:_(i64) = G_EXTRACT_VECTOR_ELT %1(<3 x i64>), %3(i64)
+ $x0 = COPY %2(i64)
RET_ReallyLR implicit $x0
...
More information about the llvm-commits
mailing list