[llvm-branch-commits] [llvm] users/zeyi2/gisel memop fix (PR #242176)

Zeyi Xu via llvm-branch-commits llvm-branch-commits at lists.llvm.org
Thu Nov 12 21:16:16 PST 2026


https://github.com/zeyi2 created https://github.com/llvm/llvm-project/pull/242176

<sub>Stack created with <a href="https://github.com/github/gh-stack">GitHub Stacks CLI</a> • <a href="https://gh.io/stacks-feedback">Give Feedback 💬</a></sub>

>From cb57f9ddd7499be8d80790861739db4521ef8994 Mon Sep 17 00:00:00 2001
From: Zeyi Xu <mitchell.xu2 at gmail.com>
Date: Thu, 12 Nov 2026 19:23:55 +0800
Subject: [PATCH] [GlobalISel] Halve the bit width when lowering memory
 operations

---
 llvm/lib/CodeGen/GlobalISel/Utils.cpp         |   2 +-
 .../Mips/GlobalISel/llvm-ir/memcpy_inline.ll  | 731 ++++--------------
 .../Mips/GlobalISel/llvm-ir/memset_inline.ll  | 401 +++-------
 .../inline-memcpy.mir                         |   9 +-
 .../inline-memset.mir                         |   8 +-
 .../legalizer/legalize-memcpy-inline.mir      |  18 +-
 .../legalizer/legalize-memset-inline.mir      |  14 +-
 .../CodeGen/RISCV/GlobalISel/memcpy-inline.ll | 160 +---
 .../CodeGen/RISCV/GlobalISel/memset-inline.ll | 111 ++-
 9 files changed, 420 insertions(+), 1034 deletions(-)

diff --git a/llvm/lib/CodeGen/GlobalISel/Utils.cpp b/llvm/lib/CodeGen/GlobalISel/Utils.cpp
index a4cd3082dd688..363c25bcbf303 100644
--- a/llvm/lib/CodeGen/GlobalISel/Utils.cpp
+++ b/llvm/lib/CodeGen/GlobalISel/Utils.cpp
@@ -2254,7 +2254,7 @@ static bool findGISelOptimalMemOpLowering(std::vector<LLT> &MemOps,
     if (Op.isFixedDstAlign())
       while (Op.getDstAlign() < Ty.getSizeInBytes() &&
              !TLI.allowsMisalignedMemoryAccesses(Ty, DstAS, Op.getDstAlign()))
-        Ty = LLT::integer(Ty.getSizeInBytes());
+        Ty = LLT::integer(Ty.getSizeInBits() / 2);
     assert(Ty.getSizeInBits() > 0 && "Could not find valid type");
     // FIXME: check for the largest legal type we can load/store to.
   }
diff --git a/llvm/test/CodeGen/Mips/GlobalISel/llvm-ir/memcpy_inline.ll b/llvm/test/CodeGen/Mips/GlobalISel/llvm-ir/memcpy_inline.ll
index 64ebead574789..215cf38e57e27 100644
--- a/llvm/test/CodeGen/Mips/GlobalISel/llvm-ir/memcpy_inline.ll
+++ b/llvm/test/CodeGen/Mips/GlobalISel/llvm-ir/memcpy_inline.ll
@@ -51,43 +51,27 @@ entry:
 define void @memcpy_inline_8_align2(ptr %dst, ptr %src) {
 ; MIPS32-LABEL: memcpy_inline_8_align2:
 ; MIPS32:       # %bb.0: # %entry
-; MIPS32-NEXT:    lbu $1, 0($5)
-; MIPS32-NEXT:    sb $1, 0($4)
-; MIPS32-NEXT:    lbu $1, 1($5)
-; MIPS32-NEXT:    sb $1, 1($4)
-; MIPS32-NEXT:    lbu $1, 2($5)
-; MIPS32-NEXT:    sb $1, 2($4)
-; MIPS32-NEXT:    lbu $1, 3($5)
-; MIPS32-NEXT:    sb $1, 3($4)
-; MIPS32-NEXT:    lbu $1, 4($5)
-; MIPS32-NEXT:    sb $1, 4($4)
-; MIPS32-NEXT:    lbu $1, 5($5)
-; MIPS32-NEXT:    sb $1, 5($4)
-; MIPS32-NEXT:    lbu $1, 6($5)
-; MIPS32-NEXT:    sb $1, 6($4)
-; MIPS32-NEXT:    lbu $1, 7($5)
-; MIPS32-NEXT:    sb $1, 7($4)
+; MIPS32-NEXT:    lhu $1, 0($5)
+; MIPS32-NEXT:    sh $1, 0($4)
+; MIPS32-NEXT:    lhu $1, 2($5)
+; MIPS32-NEXT:    sh $1, 2($4)
+; MIPS32-NEXT:    lhu $1, 4($5)
+; MIPS32-NEXT:    sh $1, 4($4)
+; MIPS32-NEXT:    lhu $1, 6($5)
+; MIPS32-NEXT:    sh $1, 6($4)
 ; MIPS32-NEXT:    jr $ra
 ; MIPS32-NEXT:    nop
 ;
 ; MIPS32R6-LABEL: memcpy_inline_8_align2:
 ; MIPS32R6:       # %bb.0: # %entry
-; MIPS32R6-NEXT:    lbu $1, 0($5)
-; MIPS32R6-NEXT:    sb $1, 0($4)
-; MIPS32R6-NEXT:    lbu $1, 1($5)
-; MIPS32R6-NEXT:    sb $1, 1($4)
-; MIPS32R6-NEXT:    lbu $1, 2($5)
-; MIPS32R6-NEXT:    sb $1, 2($4)
-; MIPS32R6-NEXT:    lbu $1, 3($5)
-; MIPS32R6-NEXT:    sb $1, 3($4)
-; MIPS32R6-NEXT:    lbu $1, 4($5)
-; MIPS32R6-NEXT:    sb $1, 4($4)
-; MIPS32R6-NEXT:    lbu $1, 5($5)
-; MIPS32R6-NEXT:    sb $1, 5($4)
-; MIPS32R6-NEXT:    lbu $1, 6($5)
-; MIPS32R6-NEXT:    sb $1, 6($4)
-; MIPS32R6-NEXT:    lbu $1, 7($5)
-; MIPS32R6-NEXT:    sb $1, 7($4)
+; MIPS32R6-NEXT:    lhu $1, 0($5)
+; MIPS32R6-NEXT:    sh $1, 0($4)
+; MIPS32R6-NEXT:    lhu $1, 2($5)
+; MIPS32R6-NEXT:    sh $1, 2($4)
+; MIPS32R6-NEXT:    lhu $1, 4($5)
+; MIPS32R6-NEXT:    sh $1, 4($4)
+; MIPS32R6-NEXT:    lhu $1, 6($5)
+; MIPS32R6-NEXT:    sh $1, 6($4)
 ; MIPS32R6-NEXT:    jrc $ra
 entry:
   call void @llvm.memcpy.inline.p0.p0.i32(ptr align 2 %dst, ptr align 2 %src, i32 8, i1 false)
@@ -97,43 +81,19 @@ entry:
 define void @memcpy_inline_8_align4(ptr %dst, ptr %src) {
 ; MIPS32-LABEL: memcpy_inline_8_align4:
 ; MIPS32:       # %bb.0: # %entry
-; MIPS32-NEXT:    lbu $1, 0($5)
-; MIPS32-NEXT:    sb $1, 0($4)
-; MIPS32-NEXT:    lbu $1, 1($5)
-; MIPS32-NEXT:    sb $1, 1($4)
-; MIPS32-NEXT:    lbu $1, 2($5)
-; MIPS32-NEXT:    sb $1, 2($4)
-; MIPS32-NEXT:    lbu $1, 3($5)
-; MIPS32-NEXT:    sb $1, 3($4)
-; MIPS32-NEXT:    lbu $1, 4($5)
-; MIPS32-NEXT:    sb $1, 4($4)
-; MIPS32-NEXT:    lbu $1, 5($5)
-; MIPS32-NEXT:    sb $1, 5($4)
-; MIPS32-NEXT:    lbu $1, 6($5)
-; MIPS32-NEXT:    sb $1, 6($4)
-; MIPS32-NEXT:    lbu $1, 7($5)
-; MIPS32-NEXT:    sb $1, 7($4)
+; MIPS32-NEXT:    lw $1, 0($5)
+; MIPS32-NEXT:    sw $1, 0($4)
+; MIPS32-NEXT:    lw $1, 4($5)
+; MIPS32-NEXT:    sw $1, 4($4)
 ; MIPS32-NEXT:    jr $ra
 ; MIPS32-NEXT:    nop
 ;
 ; MIPS32R6-LABEL: memcpy_inline_8_align4:
 ; MIPS32R6:       # %bb.0: # %entry
-; MIPS32R6-NEXT:    lbu $1, 0($5)
-; MIPS32R6-NEXT:    sb $1, 0($4)
-; MIPS32R6-NEXT:    lbu $1, 1($5)
-; MIPS32R6-NEXT:    sb $1, 1($4)
-; MIPS32R6-NEXT:    lbu $1, 2($5)
-; MIPS32R6-NEXT:    sb $1, 2($4)
-; MIPS32R6-NEXT:    lbu $1, 3($5)
-; MIPS32R6-NEXT:    sb $1, 3($4)
-; MIPS32R6-NEXT:    lbu $1, 4($5)
-; MIPS32R6-NEXT:    sb $1, 4($4)
-; MIPS32R6-NEXT:    lbu $1, 5($5)
-; MIPS32R6-NEXT:    sb $1, 5($4)
-; MIPS32R6-NEXT:    lbu $1, 6($5)
-; MIPS32R6-NEXT:    sb $1, 6($4)
-; MIPS32R6-NEXT:    lbu $1, 7($5)
-; MIPS32R6-NEXT:    sb $1, 7($4)
+; MIPS32R6-NEXT:    lw $1, 0($5)
+; MIPS32R6-NEXT:    sw $1, 0($4)
+; MIPS32R6-NEXT:    lw $1, 4($5)
+; MIPS32R6-NEXT:    sw $1, 4($4)
 ; MIPS32R6-NEXT:    jrc $ra
 entry:
   call void @llvm.memcpy.inline.p0.p0.i32(ptr align 4 %dst, ptr align 4 %src, i32 8, i1 false)
@@ -217,34 +177,20 @@ entry:
 define void @memcpy_inline_15_align2(ptr %dst, ptr %src) {
 ; MIPS32-LABEL: memcpy_inline_15_align2:
 ; MIPS32:       # %bb.0: # %entry
-; MIPS32-NEXT:    lbu $1, 0($5)
-; MIPS32-NEXT:    sb $1, 0($4)
-; MIPS32-NEXT:    lbu $1, 1($5)
-; MIPS32-NEXT:    sb $1, 1($4)
-; MIPS32-NEXT:    lbu $1, 2($5)
-; MIPS32-NEXT:    sb $1, 2($4)
-; MIPS32-NEXT:    lbu $1, 3($5)
-; MIPS32-NEXT:    sb $1, 3($4)
-; MIPS32-NEXT:    lbu $1, 4($5)
-; MIPS32-NEXT:    sb $1, 4($4)
-; MIPS32-NEXT:    lbu $1, 5($5)
-; MIPS32-NEXT:    sb $1, 5($4)
-; MIPS32-NEXT:    lbu $1, 6($5)
-; MIPS32-NEXT:    sb $1, 6($4)
-; MIPS32-NEXT:    lbu $1, 7($5)
-; MIPS32-NEXT:    sb $1, 7($4)
-; MIPS32-NEXT:    lbu $1, 8($5)
-; MIPS32-NEXT:    sb $1, 8($4)
-; MIPS32-NEXT:    lbu $1, 9($5)
-; MIPS32-NEXT:    sb $1, 9($4)
-; MIPS32-NEXT:    lbu $1, 10($5)
-; MIPS32-NEXT:    sb $1, 10($4)
-; MIPS32-NEXT:    lbu $1, 11($5)
-; MIPS32-NEXT:    sb $1, 11($4)
-; MIPS32-NEXT:    lbu $1, 12($5)
-; MIPS32-NEXT:    sb $1, 12($4)
-; MIPS32-NEXT:    lbu $1, 13($5)
-; MIPS32-NEXT:    sb $1, 13($4)
+; MIPS32-NEXT:    lhu $1, 0($5)
+; MIPS32-NEXT:    sh $1, 0($4)
+; MIPS32-NEXT:    lhu $1, 2($5)
+; MIPS32-NEXT:    sh $1, 2($4)
+; MIPS32-NEXT:    lhu $1, 4($5)
+; MIPS32-NEXT:    sh $1, 4($4)
+; MIPS32-NEXT:    lhu $1, 6($5)
+; MIPS32-NEXT:    sh $1, 6($4)
+; MIPS32-NEXT:    lhu $1, 8($5)
+; MIPS32-NEXT:    sh $1, 8($4)
+; MIPS32-NEXT:    lhu $1, 10($5)
+; MIPS32-NEXT:    sh $1, 10($4)
+; MIPS32-NEXT:    lhu $1, 12($5)
+; MIPS32-NEXT:    sh $1, 12($4)
 ; MIPS32-NEXT:    lbu $1, 14($5)
 ; MIPS32-NEXT:    sb $1, 14($4)
 ; MIPS32-NEXT:    jr $ra
@@ -252,34 +198,20 @@ define void @memcpy_inline_15_align2(ptr %dst, ptr %src) {
 ;
 ; MIPS32R6-LABEL: memcpy_inline_15_align2:
 ; MIPS32R6:       # %bb.0: # %entry
-; MIPS32R6-NEXT:    lbu $1, 0($5)
-; MIPS32R6-NEXT:    sb $1, 0($4)
-; MIPS32R6-NEXT:    lbu $1, 1($5)
-; MIPS32R6-NEXT:    sb $1, 1($4)
-; MIPS32R6-NEXT:    lbu $1, 2($5)
-; MIPS32R6-NEXT:    sb $1, 2($4)
-; MIPS32R6-NEXT:    lbu $1, 3($5)
-; MIPS32R6-NEXT:    sb $1, 3($4)
-; MIPS32R6-NEXT:    lbu $1, 4($5)
-; MIPS32R6-NEXT:    sb $1, 4($4)
-; MIPS32R6-NEXT:    lbu $1, 5($5)
-; MIPS32R6-NEXT:    sb $1, 5($4)
-; MIPS32R6-NEXT:    lbu $1, 6($5)
-; MIPS32R6-NEXT:    sb $1, 6($4)
-; MIPS32R6-NEXT:    lbu $1, 7($5)
-; MIPS32R6-NEXT:    sb $1, 7($4)
-; MIPS32R6-NEXT:    lbu $1, 8($5)
-; MIPS32R6-NEXT:    sb $1, 8($4)
-; MIPS32R6-NEXT:    lbu $1, 9($5)
-; MIPS32R6-NEXT:    sb $1, 9($4)
-; MIPS32R6-NEXT:    lbu $1, 10($5)
-; MIPS32R6-NEXT:    sb $1, 10($4)
-; MIPS32R6-NEXT:    lbu $1, 11($5)
-; MIPS32R6-NEXT:    sb $1, 11($4)
-; MIPS32R6-NEXT:    lbu $1, 12($5)
-; MIPS32R6-NEXT:    sb $1, 12($4)
-; MIPS32R6-NEXT:    lbu $1, 13($5)
-; MIPS32R6-NEXT:    sb $1, 13($4)
+; MIPS32R6-NEXT:    lhu $1, 0($5)
+; MIPS32R6-NEXT:    sh $1, 0($4)
+; MIPS32R6-NEXT:    lhu $1, 2($5)
+; MIPS32R6-NEXT:    sh $1, 2($4)
+; MIPS32R6-NEXT:    lhu $1, 4($5)
+; MIPS32R6-NEXT:    sh $1, 4($4)
+; MIPS32R6-NEXT:    lhu $1, 6($5)
+; MIPS32R6-NEXT:    sh $1, 6($4)
+; MIPS32R6-NEXT:    lhu $1, 8($5)
+; MIPS32R6-NEXT:    sh $1, 8($4)
+; MIPS32R6-NEXT:    lhu $1, 10($5)
+; MIPS32R6-NEXT:    sh $1, 10($4)
+; MIPS32R6-NEXT:    lhu $1, 12($5)
+; MIPS32R6-NEXT:    sh $1, 12($4)
 ; MIPS32R6-NEXT:    lbu $1, 14($5)
 ; MIPS32R6-NEXT:    sb $1, 14($4)
 ; MIPS32R6-NEXT:    jrc $ra
@@ -291,71 +223,30 @@ entry:
 define void @memcpy_inline_15_align4(ptr %dst, ptr %src) {
 ; MIPS32-LABEL: memcpy_inline_15_align4:
 ; MIPS32:       # %bb.0: # %entry
-; MIPS32-NEXT:    lbu $1, 0($5)
-; MIPS32-NEXT:    sb $1, 0($4)
-; MIPS32-NEXT:    lbu $1, 1($5)
-; MIPS32-NEXT:    sb $1, 1($4)
-; MIPS32-NEXT:    lbu $1, 2($5)
-; MIPS32-NEXT:    sb $1, 2($4)
-; MIPS32-NEXT:    lbu $1, 3($5)
-; MIPS32-NEXT:    sb $1, 3($4)
-; MIPS32-NEXT:    lbu $1, 4($5)
-; MIPS32-NEXT:    sb $1, 4($4)
-; MIPS32-NEXT:    lbu $1, 5($5)
-; MIPS32-NEXT:    sb $1, 5($4)
-; MIPS32-NEXT:    lbu $1, 6($5)
-; MIPS32-NEXT:    sb $1, 6($4)
-; MIPS32-NEXT:    lbu $1, 7($5)
-; MIPS32-NEXT:    sb $1, 7($4)
-; MIPS32-NEXT:    lbu $1, 8($5)
-; MIPS32-NEXT:    sb $1, 8($4)
-; MIPS32-NEXT:    lbu $1, 9($5)
-; MIPS32-NEXT:    sb $1, 9($4)
-; MIPS32-NEXT:    lbu $1, 10($5)
-; MIPS32-NEXT:    sb $1, 10($4)
-; MIPS32-NEXT:    lbu $1, 11($5)
-; MIPS32-NEXT:    sb $1, 11($4)
-; MIPS32-NEXT:    lbu $1, 12($5)
-; MIPS32-NEXT:    sb $1, 12($4)
-; MIPS32-NEXT:    lbu $1, 13($5)
-; MIPS32-NEXT:    sb $1, 13($4)
-; MIPS32-NEXT:    lbu $1, 14($5)
-; MIPS32-NEXT:    sb $1, 14($4)
+; MIPS32-NEXT:    lw $1, 0($5)
+; MIPS32-NEXT:    sw $1, 0($4)
+; MIPS32-NEXT:    lw $1, 4($5)
+; MIPS32-NEXT:    sw $1, 4($4)
+; MIPS32-NEXT:    lw $1, 8($5)
+; MIPS32-NEXT:    sw $1, 8($4)
+; MIPS32-NEXT:    # implicit-def: $r1
+; MIPS32-NEXT:    lwl $1, 14($5)
+; MIPS32-NEXT:    lwr $1, 11($5)
+; MIPS32-NEXT:    swl $1, 14($4)
+; MIPS32-NEXT:    swr $1, 11($4)
 ; MIPS32-NEXT:    jr $ra
 ; MIPS32-NEXT:    nop
 ;
 ; MIPS32R6-LABEL: memcpy_inline_15_align4:
 ; MIPS32R6:       # %bb.0: # %entry
-; MIPS32R6-NEXT:    lbu $1, 0($5)
-; MIPS32R6-NEXT:    sb $1, 0($4)
-; MIPS32R6-NEXT:    lbu $1, 1($5)
-; MIPS32R6-NEXT:    sb $1, 1($4)
-; MIPS32R6-NEXT:    lbu $1, 2($5)
-; MIPS32R6-NEXT:    sb $1, 2($4)
-; MIPS32R6-NEXT:    lbu $1, 3($5)
-; MIPS32R6-NEXT:    sb $1, 3($4)
-; MIPS32R6-NEXT:    lbu $1, 4($5)
-; MIPS32R6-NEXT:    sb $1, 4($4)
-; MIPS32R6-NEXT:    lbu $1, 5($5)
-; MIPS32R6-NEXT:    sb $1, 5($4)
-; MIPS32R6-NEXT:    lbu $1, 6($5)
-; MIPS32R6-NEXT:    sb $1, 6($4)
-; MIPS32R6-NEXT:    lbu $1, 7($5)
-; MIPS32R6-NEXT:    sb $1, 7($4)
-; MIPS32R6-NEXT:    lbu $1, 8($5)
-; MIPS32R6-NEXT:    sb $1, 8($4)
-; MIPS32R6-NEXT:    lbu $1, 9($5)
-; MIPS32R6-NEXT:    sb $1, 9($4)
-; MIPS32R6-NEXT:    lbu $1, 10($5)
-; MIPS32R6-NEXT:    sb $1, 10($4)
-; MIPS32R6-NEXT:    lbu $1, 11($5)
-; MIPS32R6-NEXT:    sb $1, 11($4)
-; MIPS32R6-NEXT:    lbu $1, 12($5)
-; MIPS32R6-NEXT:    sb $1, 12($4)
-; MIPS32R6-NEXT:    lbu $1, 13($5)
-; MIPS32R6-NEXT:    sb $1, 13($4)
-; MIPS32R6-NEXT:    lbu $1, 14($5)
-; MIPS32R6-NEXT:    sb $1, 14($4)
+; MIPS32R6-NEXT:    lw $1, 0($5)
+; MIPS32R6-NEXT:    sw $1, 0($4)
+; MIPS32R6-NEXT:    lw $1, 4($5)
+; MIPS32R6-NEXT:    sw $1, 4($4)
+; MIPS32R6-NEXT:    lw $1, 8($5)
+; MIPS32R6-NEXT:    sw $1, 8($4)
+; MIPS32R6-NEXT:    lw $1, 11($5)
+; MIPS32R6-NEXT:    sw $1, 11($4)
 ; MIPS32R6-NEXT:    jrc $ra
 entry:
   call void @llvm.memcpy.inline.p0.p0.i32(ptr align 4 %dst, ptr align 4 %src, i32 15, i1 false)
@@ -365,395 +256,107 @@ entry:
 define void @memcpy_inline_96_align4(ptr %dst, ptr %src) {
 ; MIPS32-LABEL: memcpy_inline_96_align4:
 ; MIPS32:       # %bb.0: # %entry
-; MIPS32-NEXT:    lbu $1, 0($5)
-; MIPS32-NEXT:    sb $1, 0($4)
-; MIPS32-NEXT:    lbu $1, 1($5)
-; MIPS32-NEXT:    sb $1, 1($4)
-; MIPS32-NEXT:    lbu $1, 2($5)
-; MIPS32-NEXT:    sb $1, 2($4)
-; MIPS32-NEXT:    lbu $1, 3($5)
-; MIPS32-NEXT:    sb $1, 3($4)
-; MIPS32-NEXT:    lbu $1, 4($5)
-; MIPS32-NEXT:    sb $1, 4($4)
-; MIPS32-NEXT:    lbu $1, 5($5)
-; MIPS32-NEXT:    sb $1, 5($4)
-; MIPS32-NEXT:    lbu $1, 6($5)
-; MIPS32-NEXT:    sb $1, 6($4)
-; MIPS32-NEXT:    lbu $1, 7($5)
-; MIPS32-NEXT:    sb $1, 7($4)
-; MIPS32-NEXT:    lbu $1, 8($5)
-; MIPS32-NEXT:    sb $1, 8($4)
-; MIPS32-NEXT:    lbu $1, 9($5)
-; MIPS32-NEXT:    sb $1, 9($4)
-; MIPS32-NEXT:    lbu $1, 10($5)
-; MIPS32-NEXT:    sb $1, 10($4)
-; MIPS32-NEXT:    lbu $1, 11($5)
-; MIPS32-NEXT:    sb $1, 11($4)
-; MIPS32-NEXT:    lbu $1, 12($5)
-; MIPS32-NEXT:    sb $1, 12($4)
-; MIPS32-NEXT:    lbu $1, 13($5)
-; MIPS32-NEXT:    sb $1, 13($4)
-; MIPS32-NEXT:    lbu $1, 14($5)
-; MIPS32-NEXT:    sb $1, 14($4)
-; MIPS32-NEXT:    lbu $1, 15($5)
-; MIPS32-NEXT:    sb $1, 15($4)
-; MIPS32-NEXT:    lbu $1, 16($5)
-; MIPS32-NEXT:    sb $1, 16($4)
-; MIPS32-NEXT:    lbu $1, 17($5)
-; MIPS32-NEXT:    sb $1, 17($4)
-; MIPS32-NEXT:    lbu $1, 18($5)
-; MIPS32-NEXT:    sb $1, 18($4)
-; MIPS32-NEXT:    lbu $1, 19($5)
-; MIPS32-NEXT:    sb $1, 19($4)
-; MIPS32-NEXT:    lbu $1, 20($5)
-; MIPS32-NEXT:    sb $1, 20($4)
-; MIPS32-NEXT:    lbu $1, 21($5)
-; MIPS32-NEXT:    sb $1, 21($4)
-; MIPS32-NEXT:    lbu $1, 22($5)
-; MIPS32-NEXT:    sb $1, 22($4)
-; MIPS32-NEXT:    lbu $1, 23($5)
-; MIPS32-NEXT:    sb $1, 23($4)
-; MIPS32-NEXT:    lbu $1, 24($5)
-; MIPS32-NEXT:    sb $1, 24($4)
-; MIPS32-NEXT:    lbu $1, 25($5)
-; MIPS32-NEXT:    sb $1, 25($4)
-; MIPS32-NEXT:    lbu $1, 26($5)
-; MIPS32-NEXT:    sb $1, 26($4)
-; MIPS32-NEXT:    lbu $1, 27($5)
-; MIPS32-NEXT:    sb $1, 27($4)
-; MIPS32-NEXT:    lbu $1, 28($5)
-; MIPS32-NEXT:    sb $1, 28($4)
-; MIPS32-NEXT:    lbu $1, 29($5)
-; MIPS32-NEXT:    sb $1, 29($4)
-; MIPS32-NEXT:    lbu $1, 30($5)
-; MIPS32-NEXT:    sb $1, 30($4)
-; MIPS32-NEXT:    lbu $1, 31($5)
-; MIPS32-NEXT:    sb $1, 31($4)
-; MIPS32-NEXT:    lbu $1, 32($5)
-; MIPS32-NEXT:    sb $1, 32($4)
-; MIPS32-NEXT:    lbu $1, 33($5)
-; MIPS32-NEXT:    sb $1, 33($4)
-; MIPS32-NEXT:    lbu $1, 34($5)
-; MIPS32-NEXT:    sb $1, 34($4)
-; MIPS32-NEXT:    lbu $1, 35($5)
-; MIPS32-NEXT:    sb $1, 35($4)
-; MIPS32-NEXT:    lbu $1, 36($5)
-; MIPS32-NEXT:    sb $1, 36($4)
-; MIPS32-NEXT:    lbu $1, 37($5)
-; MIPS32-NEXT:    sb $1, 37($4)
-; MIPS32-NEXT:    lbu $1, 38($5)
-; MIPS32-NEXT:    sb $1, 38($4)
-; MIPS32-NEXT:    lbu $1, 39($5)
-; MIPS32-NEXT:    sb $1, 39($4)
-; MIPS32-NEXT:    lbu $1, 40($5)
-; MIPS32-NEXT:    sb $1, 40($4)
-; MIPS32-NEXT:    lbu $1, 41($5)
-; MIPS32-NEXT:    sb $1, 41($4)
-; MIPS32-NEXT:    lbu $1, 42($5)
-; MIPS32-NEXT:    sb $1, 42($4)
-; MIPS32-NEXT:    lbu $1, 43($5)
-; MIPS32-NEXT:    sb $1, 43($4)
-; MIPS32-NEXT:    lbu $1, 44($5)
-; MIPS32-NEXT:    sb $1, 44($4)
-; MIPS32-NEXT:    lbu $1, 45($5)
-; MIPS32-NEXT:    sb $1, 45($4)
-; MIPS32-NEXT:    lbu $1, 46($5)
-; MIPS32-NEXT:    sb $1, 46($4)
-; MIPS32-NEXT:    lbu $1, 47($5)
-; MIPS32-NEXT:    sb $1, 47($4)
-; MIPS32-NEXT:    lbu $1, 48($5)
-; MIPS32-NEXT:    sb $1, 48($4)
-; MIPS32-NEXT:    lbu $1, 49($5)
-; MIPS32-NEXT:    sb $1, 49($4)
-; MIPS32-NEXT:    lbu $1, 50($5)
-; MIPS32-NEXT:    sb $1, 50($4)
-; MIPS32-NEXT:    lbu $1, 51($5)
-; MIPS32-NEXT:    sb $1, 51($4)
-; MIPS32-NEXT:    lbu $1, 52($5)
-; MIPS32-NEXT:    sb $1, 52($4)
-; MIPS32-NEXT:    lbu $1, 53($5)
-; MIPS32-NEXT:    sb $1, 53($4)
-; MIPS32-NEXT:    lbu $1, 54($5)
-; MIPS32-NEXT:    sb $1, 54($4)
-; MIPS32-NEXT:    lbu $1, 55($5)
-; MIPS32-NEXT:    sb $1, 55($4)
-; MIPS32-NEXT:    lbu $1, 56($5)
-; MIPS32-NEXT:    sb $1, 56($4)
-; MIPS32-NEXT:    lbu $1, 57($5)
-; MIPS32-NEXT:    sb $1, 57($4)
-; MIPS32-NEXT:    lbu $1, 58($5)
-; MIPS32-NEXT:    sb $1, 58($4)
-; MIPS32-NEXT:    lbu $1, 59($5)
-; MIPS32-NEXT:    sb $1, 59($4)
-; MIPS32-NEXT:    lbu $1, 60($5)
-; MIPS32-NEXT:    sb $1, 60($4)
-; MIPS32-NEXT:    lbu $1, 61($5)
-; MIPS32-NEXT:    sb $1, 61($4)
-; MIPS32-NEXT:    lbu $1, 62($5)
-; MIPS32-NEXT:    sb $1, 62($4)
-; MIPS32-NEXT:    lbu $1, 63($5)
-; MIPS32-NEXT:    sb $1, 63($4)
-; MIPS32-NEXT:    lbu $1, 64($5)
-; MIPS32-NEXT:    sb $1, 64($4)
-; MIPS32-NEXT:    lbu $1, 65($5)
-; MIPS32-NEXT:    sb $1, 65($4)
-; MIPS32-NEXT:    lbu $1, 66($5)
-; MIPS32-NEXT:    sb $1, 66($4)
-; MIPS32-NEXT:    lbu $1, 67($5)
-; MIPS32-NEXT:    sb $1, 67($4)
-; MIPS32-NEXT:    lbu $1, 68($5)
-; MIPS32-NEXT:    sb $1, 68($4)
-; MIPS32-NEXT:    lbu $1, 69($5)
-; MIPS32-NEXT:    sb $1, 69($4)
-; MIPS32-NEXT:    lbu $1, 70($5)
-; MIPS32-NEXT:    sb $1, 70($4)
-; MIPS32-NEXT:    lbu $1, 71($5)
-; MIPS32-NEXT:    sb $1, 71($4)
-; MIPS32-NEXT:    lbu $1, 72($5)
-; MIPS32-NEXT:    sb $1, 72($4)
-; MIPS32-NEXT:    lbu $1, 73($5)
-; MIPS32-NEXT:    sb $1, 73($4)
-; MIPS32-NEXT:    lbu $1, 74($5)
-; MIPS32-NEXT:    sb $1, 74($4)
-; MIPS32-NEXT:    lbu $1, 75($5)
-; MIPS32-NEXT:    sb $1, 75($4)
-; MIPS32-NEXT:    lbu $1, 76($5)
-; MIPS32-NEXT:    sb $1, 76($4)
-; MIPS32-NEXT:    lbu $1, 77($5)
-; MIPS32-NEXT:    sb $1, 77($4)
-; MIPS32-NEXT:    lbu $1, 78($5)
-; MIPS32-NEXT:    sb $1, 78($4)
-; MIPS32-NEXT:    lbu $1, 79($5)
-; MIPS32-NEXT:    sb $1, 79($4)
-; MIPS32-NEXT:    lbu $1, 80($5)
-; MIPS32-NEXT:    sb $1, 80($4)
-; MIPS32-NEXT:    lbu $1, 81($5)
-; MIPS32-NEXT:    sb $1, 81($4)
-; MIPS32-NEXT:    lbu $1, 82($5)
-; MIPS32-NEXT:    sb $1, 82($4)
-; MIPS32-NEXT:    lbu $1, 83($5)
-; MIPS32-NEXT:    sb $1, 83($4)
-; MIPS32-NEXT:    lbu $1, 84($5)
-; MIPS32-NEXT:    sb $1, 84($4)
-; MIPS32-NEXT:    lbu $1, 85($5)
-; MIPS32-NEXT:    sb $1, 85($4)
-; MIPS32-NEXT:    lbu $1, 86($5)
-; MIPS32-NEXT:    sb $1, 86($4)
-; MIPS32-NEXT:    lbu $1, 87($5)
-; MIPS32-NEXT:    sb $1, 87($4)
-; MIPS32-NEXT:    lbu $1, 88($5)
-; MIPS32-NEXT:    sb $1, 88($4)
-; MIPS32-NEXT:    lbu $1, 89($5)
-; MIPS32-NEXT:    sb $1, 89($4)
-; MIPS32-NEXT:    lbu $1, 90($5)
-; MIPS32-NEXT:    sb $1, 90($4)
-; MIPS32-NEXT:    lbu $1, 91($5)
-; MIPS32-NEXT:    sb $1, 91($4)
-; MIPS32-NEXT:    lbu $1, 92($5)
-; MIPS32-NEXT:    sb $1, 92($4)
-; MIPS32-NEXT:    lbu $1, 93($5)
-; MIPS32-NEXT:    sb $1, 93($4)
-; MIPS32-NEXT:    lbu $1, 94($5)
-; MIPS32-NEXT:    sb $1, 94($4)
-; MIPS32-NEXT:    lbu $1, 95($5)
-; MIPS32-NEXT:    sb $1, 95($4)
+; MIPS32-NEXT:    lw $1, 0($5)
+; MIPS32-NEXT:    sw $1, 0($4)
+; MIPS32-NEXT:    lw $1, 4($5)
+; MIPS32-NEXT:    sw $1, 4($4)
+; MIPS32-NEXT:    lw $1, 8($5)
+; MIPS32-NEXT:    sw $1, 8($4)
+; MIPS32-NEXT:    lw $1, 12($5)
+; MIPS32-NEXT:    sw $1, 12($4)
+; MIPS32-NEXT:    lw $1, 16($5)
+; MIPS32-NEXT:    sw $1, 16($4)
+; MIPS32-NEXT:    lw $1, 20($5)
+; MIPS32-NEXT:    sw $1, 20($4)
+; MIPS32-NEXT:    lw $1, 24($5)
+; MIPS32-NEXT:    sw $1, 24($4)
+; MIPS32-NEXT:    lw $1, 28($5)
+; MIPS32-NEXT:    sw $1, 28($4)
+; MIPS32-NEXT:    lw $1, 32($5)
+; MIPS32-NEXT:    sw $1, 32($4)
+; MIPS32-NEXT:    lw $1, 36($5)
+; MIPS32-NEXT:    sw $1, 36($4)
+; MIPS32-NEXT:    lw $1, 40($5)
+; MIPS32-NEXT:    sw $1, 40($4)
+; MIPS32-NEXT:    lw $1, 44($5)
+; MIPS32-NEXT:    sw $1, 44($4)
+; MIPS32-NEXT:    lw $1, 48($5)
+; MIPS32-NEXT:    sw $1, 48($4)
+; MIPS32-NEXT:    lw $1, 52($5)
+; MIPS32-NEXT:    sw $1, 52($4)
+; MIPS32-NEXT:    lw $1, 56($5)
+; MIPS32-NEXT:    sw $1, 56($4)
+; MIPS32-NEXT:    lw $1, 60($5)
+; MIPS32-NEXT:    sw $1, 60($4)
+; MIPS32-NEXT:    lw $1, 64($5)
+; MIPS32-NEXT:    sw $1, 64($4)
+; MIPS32-NEXT:    lw $1, 68($5)
+; MIPS32-NEXT:    sw $1, 68($4)
+; MIPS32-NEXT:    lw $1, 72($5)
+; MIPS32-NEXT:    sw $1, 72($4)
+; MIPS32-NEXT:    lw $1, 76($5)
+; MIPS32-NEXT:    sw $1, 76($4)
+; MIPS32-NEXT:    lw $1, 80($5)
+; MIPS32-NEXT:    sw $1, 80($4)
+; MIPS32-NEXT:    lw $1, 84($5)
+; MIPS32-NEXT:    sw $1, 84($4)
+; MIPS32-NEXT:    lw $1, 88($5)
+; MIPS32-NEXT:    sw $1, 88($4)
+; MIPS32-NEXT:    lw $1, 92($5)
+; MIPS32-NEXT:    sw $1, 92($4)
 ; MIPS32-NEXT:    jr $ra
 ; MIPS32-NEXT:    nop
 ;
 ; MIPS32R6-LABEL: memcpy_inline_96_align4:
 ; MIPS32R6:       # %bb.0: # %entry
-; MIPS32R6-NEXT:    lbu $1, 0($5)
-; MIPS32R6-NEXT:    sb $1, 0($4)
-; MIPS32R6-NEXT:    lbu $1, 1($5)
-; MIPS32R6-NEXT:    sb $1, 1($4)
-; MIPS32R6-NEXT:    lbu $1, 2($5)
-; MIPS32R6-NEXT:    sb $1, 2($4)
-; MIPS32R6-NEXT:    lbu $1, 3($5)
-; MIPS32R6-NEXT:    sb $1, 3($4)
-; MIPS32R6-NEXT:    lbu $1, 4($5)
-; MIPS32R6-NEXT:    sb $1, 4($4)
-; MIPS32R6-NEXT:    lbu $1, 5($5)
-; MIPS32R6-NEXT:    sb $1, 5($4)
-; MIPS32R6-NEXT:    lbu $1, 6($5)
-; MIPS32R6-NEXT:    sb $1, 6($4)
-; MIPS32R6-NEXT:    lbu $1, 7($5)
-; MIPS32R6-NEXT:    sb $1, 7($4)
-; MIPS32R6-NEXT:    lbu $1, 8($5)
-; MIPS32R6-NEXT:    sb $1, 8($4)
-; MIPS32R6-NEXT:    lbu $1, 9($5)
-; MIPS32R6-NEXT:    sb $1, 9($4)
-; MIPS32R6-NEXT:    lbu $1, 10($5)
-; MIPS32R6-NEXT:    sb $1, 10($4)
-; MIPS32R6-NEXT:    lbu $1, 11($5)
-; MIPS32R6-NEXT:    sb $1, 11($4)
-; MIPS32R6-NEXT:    lbu $1, 12($5)
-; MIPS32R6-NEXT:    sb $1, 12($4)
-; MIPS32R6-NEXT:    lbu $1, 13($5)
-; MIPS32R6-NEXT:    sb $1, 13($4)
-; MIPS32R6-NEXT:    lbu $1, 14($5)
-; MIPS32R6-NEXT:    sb $1, 14($4)
-; MIPS32R6-NEXT:    lbu $1, 15($5)
-; MIPS32R6-NEXT:    sb $1, 15($4)
-; MIPS32R6-NEXT:    lbu $1, 16($5)
-; MIPS32R6-NEXT:    sb $1, 16($4)
-; MIPS32R6-NEXT:    lbu $1, 17($5)
-; MIPS32R6-NEXT:    sb $1, 17($4)
-; MIPS32R6-NEXT:    lbu $1, 18($5)
-; MIPS32R6-NEXT:    sb $1, 18($4)
-; MIPS32R6-NEXT:    lbu $1, 19($5)
-; MIPS32R6-NEXT:    sb $1, 19($4)
-; MIPS32R6-NEXT:    lbu $1, 20($5)
-; MIPS32R6-NEXT:    sb $1, 20($4)
-; MIPS32R6-NEXT:    lbu $1, 21($5)
-; MIPS32R6-NEXT:    sb $1, 21($4)
-; MIPS32R6-NEXT:    lbu $1, 22($5)
-; MIPS32R6-NEXT:    sb $1, 22($4)
-; MIPS32R6-NEXT:    lbu $1, 23($5)
-; MIPS32R6-NEXT:    sb $1, 23($4)
-; MIPS32R6-NEXT:    lbu $1, 24($5)
-; MIPS32R6-NEXT:    sb $1, 24($4)
-; MIPS32R6-NEXT:    lbu $1, 25($5)
-; MIPS32R6-NEXT:    sb $1, 25($4)
-; MIPS32R6-NEXT:    lbu $1, 26($5)
-; MIPS32R6-NEXT:    sb $1, 26($4)
-; MIPS32R6-NEXT:    lbu $1, 27($5)
-; MIPS32R6-NEXT:    sb $1, 27($4)
-; MIPS32R6-NEXT:    lbu $1, 28($5)
-; MIPS32R6-NEXT:    sb $1, 28($4)
-; MIPS32R6-NEXT:    lbu $1, 29($5)
-; MIPS32R6-NEXT:    sb $1, 29($4)
-; MIPS32R6-NEXT:    lbu $1, 30($5)
-; MIPS32R6-NEXT:    sb $1, 30($4)
-; MIPS32R6-NEXT:    lbu $1, 31($5)
-; MIPS32R6-NEXT:    sb $1, 31($4)
-; MIPS32R6-NEXT:    lbu $1, 32($5)
-; MIPS32R6-NEXT:    sb $1, 32($4)
-; MIPS32R6-NEXT:    lbu $1, 33($5)
-; MIPS32R6-NEXT:    sb $1, 33($4)
-; MIPS32R6-NEXT:    lbu $1, 34($5)
-; MIPS32R6-NEXT:    sb $1, 34($4)
-; MIPS32R6-NEXT:    lbu $1, 35($5)
-; MIPS32R6-NEXT:    sb $1, 35($4)
-; MIPS32R6-NEXT:    lbu $1, 36($5)
-; MIPS32R6-NEXT:    sb $1, 36($4)
-; MIPS32R6-NEXT:    lbu $1, 37($5)
-; MIPS32R6-NEXT:    sb $1, 37($4)
-; MIPS32R6-NEXT:    lbu $1, 38($5)
-; MIPS32R6-NEXT:    sb $1, 38($4)
-; MIPS32R6-NEXT:    lbu $1, 39($5)
-; MIPS32R6-NEXT:    sb $1, 39($4)
-; MIPS32R6-NEXT:    lbu $1, 40($5)
-; MIPS32R6-NEXT:    sb $1, 40($4)
-; MIPS32R6-NEXT:    lbu $1, 41($5)
-; MIPS32R6-NEXT:    sb $1, 41($4)
-; MIPS32R6-NEXT:    lbu $1, 42($5)
-; MIPS32R6-NEXT:    sb $1, 42($4)
-; MIPS32R6-NEXT:    lbu $1, 43($5)
-; MIPS32R6-NEXT:    sb $1, 43($4)
-; MIPS32R6-NEXT:    lbu $1, 44($5)
-; MIPS32R6-NEXT:    sb $1, 44($4)
-; MIPS32R6-NEXT:    lbu $1, 45($5)
-; MIPS32R6-NEXT:    sb $1, 45($4)
-; MIPS32R6-NEXT:    lbu $1, 46($5)
-; MIPS32R6-NEXT:    sb $1, 46($4)
-; MIPS32R6-NEXT:    lbu $1, 47($5)
-; MIPS32R6-NEXT:    sb $1, 47($4)
-; MIPS32R6-NEXT:    lbu $1, 48($5)
-; MIPS32R6-NEXT:    sb $1, 48($4)
-; MIPS32R6-NEXT:    lbu $1, 49($5)
-; MIPS32R6-NEXT:    sb $1, 49($4)
-; MIPS32R6-NEXT:    lbu $1, 50($5)
-; MIPS32R6-NEXT:    sb $1, 50($4)
-; MIPS32R6-NEXT:    lbu $1, 51($5)
-; MIPS32R6-NEXT:    sb $1, 51($4)
-; MIPS32R6-NEXT:    lbu $1, 52($5)
-; MIPS32R6-NEXT:    sb $1, 52($4)
-; MIPS32R6-NEXT:    lbu $1, 53($5)
-; MIPS32R6-NEXT:    sb $1, 53($4)
-; MIPS32R6-NEXT:    lbu $1, 54($5)
-; MIPS32R6-NEXT:    sb $1, 54($4)
-; MIPS32R6-NEXT:    lbu $1, 55($5)
-; MIPS32R6-NEXT:    sb $1, 55($4)
-; MIPS32R6-NEXT:    lbu $1, 56($5)
-; MIPS32R6-NEXT:    sb $1, 56($4)
-; MIPS32R6-NEXT:    lbu $1, 57($5)
-; MIPS32R6-NEXT:    sb $1, 57($4)
-; MIPS32R6-NEXT:    lbu $1, 58($5)
-; MIPS32R6-NEXT:    sb $1, 58($4)
-; MIPS32R6-NEXT:    lbu $1, 59($5)
-; MIPS32R6-NEXT:    sb $1, 59($4)
-; MIPS32R6-NEXT:    lbu $1, 60($5)
-; MIPS32R6-NEXT:    sb $1, 60($4)
-; MIPS32R6-NEXT:    lbu $1, 61($5)
-; MIPS32R6-NEXT:    sb $1, 61($4)
-; MIPS32R6-NEXT:    lbu $1, 62($5)
-; MIPS32R6-NEXT:    sb $1, 62($4)
-; MIPS32R6-NEXT:    lbu $1, 63($5)
-; MIPS32R6-NEXT:    sb $1, 63($4)
-; MIPS32R6-NEXT:    lbu $1, 64($5)
-; MIPS32R6-NEXT:    sb $1, 64($4)
-; MIPS32R6-NEXT:    lbu $1, 65($5)
-; MIPS32R6-NEXT:    sb $1, 65($4)
-; MIPS32R6-NEXT:    lbu $1, 66($5)
-; MIPS32R6-NEXT:    sb $1, 66($4)
-; MIPS32R6-NEXT:    lbu $1, 67($5)
-; MIPS32R6-NEXT:    sb $1, 67($4)
-; MIPS32R6-NEXT:    lbu $1, 68($5)
-; MIPS32R6-NEXT:    sb $1, 68($4)
-; MIPS32R6-NEXT:    lbu $1, 69($5)
-; MIPS32R6-NEXT:    sb $1, 69($4)
-; MIPS32R6-NEXT:    lbu $1, 70($5)
-; MIPS32R6-NEXT:    sb $1, 70($4)
-; MIPS32R6-NEXT:    lbu $1, 71($5)
-; MIPS32R6-NEXT:    sb $1, 71($4)
-; MIPS32R6-NEXT:    lbu $1, 72($5)
-; MIPS32R6-NEXT:    sb $1, 72($4)
-; MIPS32R6-NEXT:    lbu $1, 73($5)
-; MIPS32R6-NEXT:    sb $1, 73($4)
-; MIPS32R6-NEXT:    lbu $1, 74($5)
-; MIPS32R6-NEXT:    sb $1, 74($4)
-; MIPS32R6-NEXT:    lbu $1, 75($5)
-; MIPS32R6-NEXT:    sb $1, 75($4)
-; MIPS32R6-NEXT:    lbu $1, 76($5)
-; MIPS32R6-NEXT:    sb $1, 76($4)
-; MIPS32R6-NEXT:    lbu $1, 77($5)
-; MIPS32R6-NEXT:    sb $1, 77($4)
-; MIPS32R6-NEXT:    lbu $1, 78($5)
-; MIPS32R6-NEXT:    sb $1, 78($4)
-; MIPS32R6-NEXT:    lbu $1, 79($5)
-; MIPS32R6-NEXT:    sb $1, 79($4)
-; MIPS32R6-NEXT:    lbu $1, 80($5)
-; MIPS32R6-NEXT:    sb $1, 80($4)
-; MIPS32R6-NEXT:    lbu $1, 81($5)
-; MIPS32R6-NEXT:    sb $1, 81($4)
-; MIPS32R6-NEXT:    lbu $1, 82($5)
-; MIPS32R6-NEXT:    sb $1, 82($4)
-; MIPS32R6-NEXT:    lbu $1, 83($5)
-; MIPS32R6-NEXT:    sb $1, 83($4)
-; MIPS32R6-NEXT:    lbu $1, 84($5)
-; MIPS32R6-NEXT:    sb $1, 84($4)
-; MIPS32R6-NEXT:    lbu $1, 85($5)
-; MIPS32R6-NEXT:    sb $1, 85($4)
-; MIPS32R6-NEXT:    lbu $1, 86($5)
-; MIPS32R6-NEXT:    sb $1, 86($4)
-; MIPS32R6-NEXT:    lbu $1, 87($5)
-; MIPS32R6-NEXT:    sb $1, 87($4)
-; MIPS32R6-NEXT:    lbu $1, 88($5)
-; MIPS32R6-NEXT:    sb $1, 88($4)
-; MIPS32R6-NEXT:    lbu $1, 89($5)
-; MIPS32R6-NEXT:    sb $1, 89($4)
-; MIPS32R6-NEXT:    lbu $1, 90($5)
-; MIPS32R6-NEXT:    sb $1, 90($4)
-; MIPS32R6-NEXT:    lbu $1, 91($5)
-; MIPS32R6-NEXT:    sb $1, 91($4)
-; MIPS32R6-NEXT:    lbu $1, 92($5)
-; MIPS32R6-NEXT:    sb $1, 92($4)
-; MIPS32R6-NEXT:    lbu $1, 93($5)
-; MIPS32R6-NEXT:    sb $1, 93($4)
-; MIPS32R6-NEXT:    lbu $1, 94($5)
-; MIPS32R6-NEXT:    sb $1, 94($4)
-; MIPS32R6-NEXT:    lbu $1, 95($5)
-; MIPS32R6-NEXT:    sb $1, 95($4)
+; MIPS32R6-NEXT:    lw $1, 0($5)
+; MIPS32R6-NEXT:    sw $1, 0($4)
+; MIPS32R6-NEXT:    lw $1, 4($5)
+; MIPS32R6-NEXT:    sw $1, 4($4)
+; MIPS32R6-NEXT:    lw $1, 8($5)
+; MIPS32R6-NEXT:    sw $1, 8($4)
+; MIPS32R6-NEXT:    lw $1, 12($5)
+; MIPS32R6-NEXT:    sw $1, 12($4)
+; MIPS32R6-NEXT:    lw $1, 16($5)
+; MIPS32R6-NEXT:    sw $1, 16($4)
+; MIPS32R6-NEXT:    lw $1, 20($5)
+; MIPS32R6-NEXT:    sw $1, 20($4)
+; MIPS32R6-NEXT:    lw $1, 24($5)
+; MIPS32R6-NEXT:    sw $1, 24($4)
+; MIPS32R6-NEXT:    lw $1, 28($5)
+; MIPS32R6-NEXT:    sw $1, 28($4)
+; MIPS32R6-NEXT:    lw $1, 32($5)
+; MIPS32R6-NEXT:    sw $1, 32($4)
+; MIPS32R6-NEXT:    lw $1, 36($5)
+; MIPS32R6-NEXT:    sw $1, 36($4)
+; MIPS32R6-NEXT:    lw $1, 40($5)
+; MIPS32R6-NEXT:    sw $1, 40($4)
+; MIPS32R6-NEXT:    lw $1, 44($5)
+; MIPS32R6-NEXT:    sw $1, 44($4)
+; MIPS32R6-NEXT:    lw $1, 48($5)
+; MIPS32R6-NEXT:    sw $1, 48($4)
+; MIPS32R6-NEXT:    lw $1, 52($5)
+; MIPS32R6-NEXT:    sw $1, 52($4)
+; MIPS32R6-NEXT:    lw $1, 56($5)
+; MIPS32R6-NEXT:    sw $1, 56($4)
+; MIPS32R6-NEXT:    lw $1, 60($5)
+; MIPS32R6-NEXT:    sw $1, 60($4)
+; MIPS32R6-NEXT:    lw $1, 64($5)
+; MIPS32R6-NEXT:    sw $1, 64($4)
+; MIPS32R6-NEXT:    lw $1, 68($5)
+; MIPS32R6-NEXT:    sw $1, 68($4)
+; MIPS32R6-NEXT:    lw $1, 72($5)
+; MIPS32R6-NEXT:    sw $1, 72($4)
+; MIPS32R6-NEXT:    lw $1, 76($5)
+; MIPS32R6-NEXT:    sw $1, 76($4)
+; MIPS32R6-NEXT:    lw $1, 80($5)
+; MIPS32R6-NEXT:    sw $1, 80($4)
+; MIPS32R6-NEXT:    lw $1, 84($5)
+; MIPS32R6-NEXT:    sw $1, 84($4)
+; MIPS32R6-NEXT:    lw $1, 88($5)
+; MIPS32R6-NEXT:    sw $1, 88($4)
+; MIPS32R6-NEXT:    lw $1, 92($5)
+; MIPS32R6-NEXT:    sw $1, 92($4)
 ; MIPS32R6-NEXT:    jrc $ra
 entry:
   call void @llvm.memcpy.inline.p0.p0.i32(ptr align 4 %dst, ptr align 4 %src, i32 96, i1 false)
diff --git a/llvm/test/CodeGen/Mips/GlobalISel/llvm-ir/memset_inline.ll b/llvm/test/CodeGen/Mips/GlobalISel/llvm-ir/memset_inline.ll
index 535e23aa70087..2f763897eaaa7 100644
--- a/llvm/test/CodeGen/Mips/GlobalISel/llvm-ir/memset_inline.ll
+++ b/llvm/test/CodeGen/Mips/GlobalISel/llvm-ir/memset_inline.ll
@@ -35,27 +35,25 @@ entry:
 define void @memset_inline_8_align2(ptr %dst, i8 %val) {
 ; MIPS32-LABEL: memset_inline_8_align2:
 ; MIPS32:       # %bb.0: # %entry
-; MIPS32-NEXT:    sb $5, 0($4)
-; MIPS32-NEXT:    sb $5, 1($4)
-; MIPS32-NEXT:    sb $5, 2($4)
-; MIPS32-NEXT:    sb $5, 3($4)
-; MIPS32-NEXT:    sb $5, 4($4)
-; MIPS32-NEXT:    sb $5, 5($4)
-; MIPS32-NEXT:    sb $5, 6($4)
-; MIPS32-NEXT:    sb $5, 7($4)
+; MIPS32-NEXT:    ori $2, $zero, 257
+; MIPS32-NEXT:    andi $1, $5, 255
+; MIPS32-NEXT:    mul $1, $1, $2
+; MIPS32-NEXT:    sh $1, 0($4)
+; MIPS32-NEXT:    sh $1, 2($4)
+; MIPS32-NEXT:    sh $1, 4($4)
+; MIPS32-NEXT:    sh $1, 6($4)
 ; MIPS32-NEXT:    jr $ra
 ; MIPS32-NEXT:    nop
 ;
 ; MIPS32R6-LABEL: memset_inline_8_align2:
 ; MIPS32R6:       # %bb.0: # %entry
-; MIPS32R6-NEXT:    sb $5, 0($4)
-; MIPS32R6-NEXT:    sb $5, 1($4)
-; MIPS32R6-NEXT:    sb $5, 2($4)
-; MIPS32R6-NEXT:    sb $5, 3($4)
-; MIPS32R6-NEXT:    sb $5, 4($4)
-; MIPS32R6-NEXT:    sb $5, 5($4)
-; MIPS32R6-NEXT:    sb $5, 6($4)
-; MIPS32R6-NEXT:    sb $5, 7($4)
+; MIPS32R6-NEXT:    ori $2, $zero, 257
+; MIPS32R6-NEXT:    andi $1, $5, 255
+; MIPS32R6-NEXT:    mul $1, $1, $2
+; MIPS32R6-NEXT:    sh $1, 0($4)
+; MIPS32R6-NEXT:    sh $1, 2($4)
+; MIPS32R6-NEXT:    sh $1, 4($4)
+; MIPS32R6-NEXT:    sh $1, 6($4)
 ; MIPS32R6-NEXT:    jrc $ra
 entry:
   call void @llvm.memset.inline.p0.i32(ptr align 2 %dst, i8 %val, i32 8, i1 false)
@@ -65,27 +63,23 @@ entry:
 define void @memset_inline_8_align4(ptr %dst, i8 %val) {
 ; MIPS32-LABEL: memset_inline_8_align4:
 ; MIPS32:       # %bb.0: # %entry
-; MIPS32-NEXT:    sb $5, 0($4)
-; MIPS32-NEXT:    sb $5, 1($4)
-; MIPS32-NEXT:    sb $5, 2($4)
-; MIPS32-NEXT:    sb $5, 3($4)
-; MIPS32-NEXT:    sb $5, 4($4)
-; MIPS32-NEXT:    sb $5, 5($4)
-; MIPS32-NEXT:    sb $5, 6($4)
-; MIPS32-NEXT:    sb $5, 7($4)
+; MIPS32-NEXT:    andi $1, $5, 255
+; MIPS32-NEXT:    lui $2, 257
+; MIPS32-NEXT:    ori $2, $2, 257
+; MIPS32-NEXT:    mul $1, $1, $2
+; MIPS32-NEXT:    sw $1, 0($4)
+; MIPS32-NEXT:    sw $1, 4($4)
 ; MIPS32-NEXT:    jr $ra
 ; MIPS32-NEXT:    nop
 ;
 ; MIPS32R6-LABEL: memset_inline_8_align4:
 ; MIPS32R6:       # %bb.0: # %entry
-; MIPS32R6-NEXT:    sb $5, 0($4)
-; MIPS32R6-NEXT:    sb $5, 1($4)
-; MIPS32R6-NEXT:    sb $5, 2($4)
-; MIPS32R6-NEXT:    sb $5, 3($4)
-; MIPS32R6-NEXT:    sb $5, 4($4)
-; MIPS32R6-NEXT:    sb $5, 5($4)
-; MIPS32R6-NEXT:    sb $5, 6($4)
-; MIPS32R6-NEXT:    sb $5, 7($4)
+; MIPS32R6-NEXT:    andi $1, $5, 255
+; MIPS32R6-NEXT:    lui $2, 257
+; MIPS32R6-NEXT:    ori $2, $2, 257
+; MIPS32R6-NEXT:    mul $1, $1, $2
+; MIPS32R6-NEXT:    sw $1, 0($4)
+; MIPS32R6-NEXT:    sw $1, 4($4)
 ; MIPS32R6-NEXT:    jrc $ra
 entry:
   call void @llvm.memset.inline.p0.i32(ptr align 4 %dst, i8 %val, i32 8, i1 false)
@@ -139,40 +133,32 @@ entry:
 define void @memset_inline_15_align2(ptr %dst, i8 %val) {
 ; MIPS32-LABEL: memset_inline_15_align2:
 ; MIPS32:       # %bb.0: # %entry
-; MIPS32-NEXT:    sb $5, 0($4)
-; MIPS32-NEXT:    sb $5, 1($4)
-; MIPS32-NEXT:    sb $5, 2($4)
-; MIPS32-NEXT:    sb $5, 3($4)
-; MIPS32-NEXT:    sb $5, 4($4)
-; MIPS32-NEXT:    sb $5, 5($4)
-; MIPS32-NEXT:    sb $5, 6($4)
-; MIPS32-NEXT:    sb $5, 7($4)
-; MIPS32-NEXT:    sb $5, 8($4)
-; MIPS32-NEXT:    sb $5, 9($4)
-; MIPS32-NEXT:    sb $5, 10($4)
-; MIPS32-NEXT:    sb $5, 11($4)
-; MIPS32-NEXT:    sb $5, 12($4)
-; MIPS32-NEXT:    sb $5, 13($4)
+; MIPS32-NEXT:    ori $2, $zero, 257
+; MIPS32-NEXT:    andi $1, $5, 255
+; MIPS32-NEXT:    mul $1, $1, $2
+; MIPS32-NEXT:    sh $1, 0($4)
+; MIPS32-NEXT:    sh $1, 2($4)
+; MIPS32-NEXT:    sh $1, 4($4)
+; MIPS32-NEXT:    sh $1, 6($4)
+; MIPS32-NEXT:    sh $1, 8($4)
+; MIPS32-NEXT:    sh $1, 10($4)
+; MIPS32-NEXT:    sh $1, 12($4)
 ; MIPS32-NEXT:    sb $5, 14($4)
 ; MIPS32-NEXT:    jr $ra
 ; MIPS32-NEXT:    nop
 ;
 ; MIPS32R6-LABEL: memset_inline_15_align2:
 ; MIPS32R6:       # %bb.0: # %entry
-; MIPS32R6-NEXT:    sb $5, 0($4)
-; MIPS32R6-NEXT:    sb $5, 1($4)
-; MIPS32R6-NEXT:    sb $5, 2($4)
-; MIPS32R6-NEXT:    sb $5, 3($4)
-; MIPS32R6-NEXT:    sb $5, 4($4)
-; MIPS32R6-NEXT:    sb $5, 5($4)
-; MIPS32R6-NEXT:    sb $5, 6($4)
-; MIPS32R6-NEXT:    sb $5, 7($4)
-; MIPS32R6-NEXT:    sb $5, 8($4)
-; MIPS32R6-NEXT:    sb $5, 9($4)
-; MIPS32R6-NEXT:    sb $5, 10($4)
-; MIPS32R6-NEXT:    sb $5, 11($4)
-; MIPS32R6-NEXT:    sb $5, 12($4)
-; MIPS32R6-NEXT:    sb $5, 13($4)
+; MIPS32R6-NEXT:    ori $2, $zero, 257
+; MIPS32R6-NEXT:    andi $1, $5, 255
+; MIPS32R6-NEXT:    mul $1, $1, $2
+; MIPS32R6-NEXT:    sh $1, 0($4)
+; MIPS32R6-NEXT:    sh $1, 2($4)
+; MIPS32R6-NEXT:    sh $1, 4($4)
+; MIPS32R6-NEXT:    sh $1, 6($4)
+; MIPS32R6-NEXT:    sh $1, 8($4)
+; MIPS32R6-NEXT:    sh $1, 10($4)
+; MIPS32R6-NEXT:    sh $1, 12($4)
 ; MIPS32R6-NEXT:    sb $5, 14($4)
 ; MIPS32R6-NEXT:    jrc $ra
 entry:
@@ -183,41 +169,28 @@ entry:
 define void @memset_inline_15_align4(ptr %dst, i8 %val) {
 ; MIPS32-LABEL: memset_inline_15_align4:
 ; MIPS32:       # %bb.0: # %entry
-; MIPS32-NEXT:    sb $5, 0($4)
-; MIPS32-NEXT:    sb $5, 1($4)
-; MIPS32-NEXT:    sb $5, 2($4)
-; MIPS32-NEXT:    sb $5, 3($4)
-; MIPS32-NEXT:    sb $5, 4($4)
-; MIPS32-NEXT:    sb $5, 5($4)
-; MIPS32-NEXT:    sb $5, 6($4)
-; MIPS32-NEXT:    sb $5, 7($4)
-; MIPS32-NEXT:    sb $5, 8($4)
-; MIPS32-NEXT:    sb $5, 9($4)
-; MIPS32-NEXT:    sb $5, 10($4)
-; MIPS32-NEXT:    sb $5, 11($4)
-; MIPS32-NEXT:    sb $5, 12($4)
-; MIPS32-NEXT:    sb $5, 13($4)
-; MIPS32-NEXT:    sb $5, 14($4)
+; MIPS32-NEXT:    andi $1, $5, 255
+; MIPS32-NEXT:    lui $2, 257
+; MIPS32-NEXT:    ori $2, $2, 257
+; MIPS32-NEXT:    mul $1, $1, $2
+; MIPS32-NEXT:    sw $1, 0($4)
+; MIPS32-NEXT:    sw $1, 4($4)
+; MIPS32-NEXT:    sw $1, 8($4)
+; MIPS32-NEXT:    swl $1, 14($4)
+; MIPS32-NEXT:    swr $1, 11($4)
 ; MIPS32-NEXT:    jr $ra
 ; MIPS32-NEXT:    nop
 ;
 ; MIPS32R6-LABEL: memset_inline_15_align4:
 ; MIPS32R6:       # %bb.0: # %entry
-; MIPS32R6-NEXT:    sb $5, 0($4)
-; MIPS32R6-NEXT:    sb $5, 1($4)
-; MIPS32R6-NEXT:    sb $5, 2($4)
-; MIPS32R6-NEXT:    sb $5, 3($4)
-; MIPS32R6-NEXT:    sb $5, 4($4)
-; MIPS32R6-NEXT:    sb $5, 5($4)
-; MIPS32R6-NEXT:    sb $5, 6($4)
-; MIPS32R6-NEXT:    sb $5, 7($4)
-; MIPS32R6-NEXT:    sb $5, 8($4)
-; MIPS32R6-NEXT:    sb $5, 9($4)
-; MIPS32R6-NEXT:    sb $5, 10($4)
-; MIPS32R6-NEXT:    sb $5, 11($4)
-; MIPS32R6-NEXT:    sb $5, 12($4)
-; MIPS32R6-NEXT:    sb $5, 13($4)
-; MIPS32R6-NEXT:    sb $5, 14($4)
+; MIPS32R6-NEXT:    andi $1, $5, 255
+; MIPS32R6-NEXT:    lui $2, 257
+; MIPS32R6-NEXT:    ori $2, $2, 257
+; MIPS32R6-NEXT:    mul $1, $1, $2
+; MIPS32R6-NEXT:    sw $1, 0($4)
+; MIPS32R6-NEXT:    sw $1, 4($4)
+; MIPS32R6-NEXT:    sw $1, 8($4)
+; MIPS32R6-NEXT:    sw $1, 11($4)
 ; MIPS32R6-NEXT:    jrc $ra
 entry:
   call void @llvm.memset.inline.p0.i32(ptr align 4 %dst, i8 %val, i32 15, i1 false)
@@ -227,203 +200,67 @@ entry:
 define void @memset_inline_96_align4(ptr %dst, i8 %val) {
 ; MIPS32-LABEL: memset_inline_96_align4:
 ; MIPS32:       # %bb.0: # %entry
-; MIPS32-NEXT:    sb $5, 0($4)
-; MIPS32-NEXT:    sb $5, 1($4)
-; MIPS32-NEXT:    sb $5, 2($4)
-; MIPS32-NEXT:    sb $5, 3($4)
-; MIPS32-NEXT:    sb $5, 4($4)
-; MIPS32-NEXT:    sb $5, 5($4)
-; MIPS32-NEXT:    sb $5, 6($4)
-; MIPS32-NEXT:    sb $5, 7($4)
-; MIPS32-NEXT:    sb $5, 8($4)
-; MIPS32-NEXT:    sb $5, 9($4)
-; MIPS32-NEXT:    sb $5, 10($4)
-; MIPS32-NEXT:    sb $5, 11($4)
-; MIPS32-NEXT:    sb $5, 12($4)
-; MIPS32-NEXT:    sb $5, 13($4)
-; MIPS32-NEXT:    sb $5, 14($4)
-; MIPS32-NEXT:    sb $5, 15($4)
-; MIPS32-NEXT:    sb $5, 16($4)
-; MIPS32-NEXT:    sb $5, 17($4)
-; MIPS32-NEXT:    sb $5, 18($4)
-; MIPS32-NEXT:    sb $5, 19($4)
-; MIPS32-NEXT:    sb $5, 20($4)
-; MIPS32-NEXT:    sb $5, 21($4)
-; MIPS32-NEXT:    sb $5, 22($4)
-; MIPS32-NEXT:    sb $5, 23($4)
-; MIPS32-NEXT:    sb $5, 24($4)
-; MIPS32-NEXT:    sb $5, 25($4)
-; MIPS32-NEXT:    sb $5, 26($4)
-; MIPS32-NEXT:    sb $5, 27($4)
-; MIPS32-NEXT:    sb $5, 28($4)
-; MIPS32-NEXT:    sb $5, 29($4)
-; MIPS32-NEXT:    sb $5, 30($4)
-; MIPS32-NEXT:    sb $5, 31($4)
-; MIPS32-NEXT:    sb $5, 32($4)
-; MIPS32-NEXT:    sb $5, 33($4)
-; MIPS32-NEXT:    sb $5, 34($4)
-; MIPS32-NEXT:    sb $5, 35($4)
-; MIPS32-NEXT:    sb $5, 36($4)
-; MIPS32-NEXT:    sb $5, 37($4)
-; MIPS32-NEXT:    sb $5, 38($4)
-; MIPS32-NEXT:    sb $5, 39($4)
-; MIPS32-NEXT:    sb $5, 40($4)
-; MIPS32-NEXT:    sb $5, 41($4)
-; MIPS32-NEXT:    sb $5, 42($4)
-; MIPS32-NEXT:    sb $5, 43($4)
-; MIPS32-NEXT:    sb $5, 44($4)
-; MIPS32-NEXT:    sb $5, 45($4)
-; MIPS32-NEXT:    sb $5, 46($4)
-; MIPS32-NEXT:    sb $5, 47($4)
-; MIPS32-NEXT:    sb $5, 48($4)
-; MIPS32-NEXT:    sb $5, 49($4)
-; MIPS32-NEXT:    sb $5, 50($4)
-; MIPS32-NEXT:    sb $5, 51($4)
-; MIPS32-NEXT:    sb $5, 52($4)
-; MIPS32-NEXT:    sb $5, 53($4)
-; MIPS32-NEXT:    sb $5, 54($4)
-; MIPS32-NEXT:    sb $5, 55($4)
-; MIPS32-NEXT:    sb $5, 56($4)
-; MIPS32-NEXT:    sb $5, 57($4)
-; MIPS32-NEXT:    sb $5, 58($4)
-; MIPS32-NEXT:    sb $5, 59($4)
-; MIPS32-NEXT:    sb $5, 60($4)
-; MIPS32-NEXT:    sb $5, 61($4)
-; MIPS32-NEXT:    sb $5, 62($4)
-; MIPS32-NEXT:    sb $5, 63($4)
-; MIPS32-NEXT:    sb $5, 64($4)
-; MIPS32-NEXT:    sb $5, 65($4)
-; MIPS32-NEXT:    sb $5, 66($4)
-; MIPS32-NEXT:    sb $5, 67($4)
-; MIPS32-NEXT:    sb $5, 68($4)
-; MIPS32-NEXT:    sb $5, 69($4)
-; MIPS32-NEXT:    sb $5, 70($4)
-; MIPS32-NEXT:    sb $5, 71($4)
-; MIPS32-NEXT:    sb $5, 72($4)
-; MIPS32-NEXT:    sb $5, 73($4)
-; MIPS32-NEXT:    sb $5, 74($4)
-; MIPS32-NEXT:    sb $5, 75($4)
-; MIPS32-NEXT:    sb $5, 76($4)
-; MIPS32-NEXT:    sb $5, 77($4)
-; MIPS32-NEXT:    sb $5, 78($4)
-; MIPS32-NEXT:    sb $5, 79($4)
-; MIPS32-NEXT:    sb $5, 80($4)
-; MIPS32-NEXT:    sb $5, 81($4)
-; MIPS32-NEXT:    sb $5, 82($4)
-; MIPS32-NEXT:    sb $5, 83($4)
-; MIPS32-NEXT:    sb $5, 84($4)
-; MIPS32-NEXT:    sb $5, 85($4)
-; MIPS32-NEXT:    sb $5, 86($4)
-; MIPS32-NEXT:    sb $5, 87($4)
-; MIPS32-NEXT:    sb $5, 88($4)
-; MIPS32-NEXT:    sb $5, 89($4)
-; MIPS32-NEXT:    sb $5, 90($4)
-; MIPS32-NEXT:    sb $5, 91($4)
-; MIPS32-NEXT:    sb $5, 92($4)
-; MIPS32-NEXT:    sb $5, 93($4)
-; MIPS32-NEXT:    sb $5, 94($4)
-; MIPS32-NEXT:    sb $5, 95($4)
+; MIPS32-NEXT:    andi $1, $5, 255
+; MIPS32-NEXT:    lui $2, 257
+; MIPS32-NEXT:    ori $2, $2, 257
+; MIPS32-NEXT:    mul $1, $1, $2
+; MIPS32-NEXT:    sw $1, 0($4)
+; MIPS32-NEXT:    sw $1, 4($4)
+; MIPS32-NEXT:    sw $1, 8($4)
+; MIPS32-NEXT:    sw $1, 12($4)
+; MIPS32-NEXT:    sw $1, 16($4)
+; MIPS32-NEXT:    sw $1, 20($4)
+; MIPS32-NEXT:    sw $1, 24($4)
+; MIPS32-NEXT:    sw $1, 28($4)
+; MIPS32-NEXT:    sw $1, 32($4)
+; MIPS32-NEXT:    sw $1, 36($4)
+; MIPS32-NEXT:    sw $1, 40($4)
+; MIPS32-NEXT:    sw $1, 44($4)
+; MIPS32-NEXT:    sw $1, 48($4)
+; MIPS32-NEXT:    sw $1, 52($4)
+; MIPS32-NEXT:    sw $1, 56($4)
+; MIPS32-NEXT:    sw $1, 60($4)
+; MIPS32-NEXT:    sw $1, 64($4)
+; MIPS32-NEXT:    sw $1, 68($4)
+; MIPS32-NEXT:    sw $1, 72($4)
+; MIPS32-NEXT:    sw $1, 76($4)
+; MIPS32-NEXT:    sw $1, 80($4)
+; MIPS32-NEXT:    sw $1, 84($4)
+; MIPS32-NEXT:    sw $1, 88($4)
+; MIPS32-NEXT:    sw $1, 92($4)
 ; MIPS32-NEXT:    jr $ra
 ; MIPS32-NEXT:    nop
 ;
 ; MIPS32R6-LABEL: memset_inline_96_align4:
 ; MIPS32R6:       # %bb.0: # %entry
-; MIPS32R6-NEXT:    sb $5, 0($4)
-; MIPS32R6-NEXT:    sb $5, 1($4)
-; MIPS32R6-NEXT:    sb $5, 2($4)
-; MIPS32R6-NEXT:    sb $5, 3($4)
-; MIPS32R6-NEXT:    sb $5, 4($4)
-; MIPS32R6-NEXT:    sb $5, 5($4)
-; MIPS32R6-NEXT:    sb $5, 6($4)
-; MIPS32R6-NEXT:    sb $5, 7($4)
-; MIPS32R6-NEXT:    sb $5, 8($4)
-; MIPS32R6-NEXT:    sb $5, 9($4)
-; MIPS32R6-NEXT:    sb $5, 10($4)
-; MIPS32R6-NEXT:    sb $5, 11($4)
-; MIPS32R6-NEXT:    sb $5, 12($4)
-; MIPS32R6-NEXT:    sb $5, 13($4)
-; MIPS32R6-NEXT:    sb $5, 14($4)
-; MIPS32R6-NEXT:    sb $5, 15($4)
-; MIPS32R6-NEXT:    sb $5, 16($4)
-; MIPS32R6-NEXT:    sb $5, 17($4)
-; MIPS32R6-NEXT:    sb $5, 18($4)
-; MIPS32R6-NEXT:    sb $5, 19($4)
-; MIPS32R6-NEXT:    sb $5, 20($4)
-; MIPS32R6-NEXT:    sb $5, 21($4)
-; MIPS32R6-NEXT:    sb $5, 22($4)
-; MIPS32R6-NEXT:    sb $5, 23($4)
-; MIPS32R6-NEXT:    sb $5, 24($4)
-; MIPS32R6-NEXT:    sb $5, 25($4)
-; MIPS32R6-NEXT:    sb $5, 26($4)
-; MIPS32R6-NEXT:    sb $5, 27($4)
-; MIPS32R6-NEXT:    sb $5, 28($4)
-; MIPS32R6-NEXT:    sb $5, 29($4)
-; MIPS32R6-NEXT:    sb $5, 30($4)
-; MIPS32R6-NEXT:    sb $5, 31($4)
-; MIPS32R6-NEXT:    sb $5, 32($4)
-; MIPS32R6-NEXT:    sb $5, 33($4)
-; MIPS32R6-NEXT:    sb $5, 34($4)
-; MIPS32R6-NEXT:    sb $5, 35($4)
-; MIPS32R6-NEXT:    sb $5, 36($4)
-; MIPS32R6-NEXT:    sb $5, 37($4)
-; MIPS32R6-NEXT:    sb $5, 38($4)
-; MIPS32R6-NEXT:    sb $5, 39($4)
-; MIPS32R6-NEXT:    sb $5, 40($4)
-; MIPS32R6-NEXT:    sb $5, 41($4)
-; MIPS32R6-NEXT:    sb $5, 42($4)
-; MIPS32R6-NEXT:    sb $5, 43($4)
-; MIPS32R6-NEXT:    sb $5, 44($4)
-; MIPS32R6-NEXT:    sb $5, 45($4)
-; MIPS32R6-NEXT:    sb $5, 46($4)
-; MIPS32R6-NEXT:    sb $5, 47($4)
-; MIPS32R6-NEXT:    sb $5, 48($4)
-; MIPS32R6-NEXT:    sb $5, 49($4)
-; MIPS32R6-NEXT:    sb $5, 50($4)
-; MIPS32R6-NEXT:    sb $5, 51($4)
-; MIPS32R6-NEXT:    sb $5, 52($4)
-; MIPS32R6-NEXT:    sb $5, 53($4)
-; MIPS32R6-NEXT:    sb $5, 54($4)
-; MIPS32R6-NEXT:    sb $5, 55($4)
-; MIPS32R6-NEXT:    sb $5, 56($4)
-; MIPS32R6-NEXT:    sb $5, 57($4)
-; MIPS32R6-NEXT:    sb $5, 58($4)
-; MIPS32R6-NEXT:    sb $5, 59($4)
-; MIPS32R6-NEXT:    sb $5, 60($4)
-; MIPS32R6-NEXT:    sb $5, 61($4)
-; MIPS32R6-NEXT:    sb $5, 62($4)
-; MIPS32R6-NEXT:    sb $5, 63($4)
-; MIPS32R6-NEXT:    sb $5, 64($4)
-; MIPS32R6-NEXT:    sb $5, 65($4)
-; MIPS32R6-NEXT:    sb $5, 66($4)
-; MIPS32R6-NEXT:    sb $5, 67($4)
-; MIPS32R6-NEXT:    sb $5, 68($4)
-; MIPS32R6-NEXT:    sb $5, 69($4)
-; MIPS32R6-NEXT:    sb $5, 70($4)
-; MIPS32R6-NEXT:    sb $5, 71($4)
-; MIPS32R6-NEXT:    sb $5, 72($4)
-; MIPS32R6-NEXT:    sb $5, 73($4)
-; MIPS32R6-NEXT:    sb $5, 74($4)
-; MIPS32R6-NEXT:    sb $5, 75($4)
-; MIPS32R6-NEXT:    sb $5, 76($4)
-; MIPS32R6-NEXT:    sb $5, 77($4)
-; MIPS32R6-NEXT:    sb $5, 78($4)
-; MIPS32R6-NEXT:    sb $5, 79($4)
-; MIPS32R6-NEXT:    sb $5, 80($4)
-; MIPS32R6-NEXT:    sb $5, 81($4)
-; MIPS32R6-NEXT:    sb $5, 82($4)
-; MIPS32R6-NEXT:    sb $5, 83($4)
-; MIPS32R6-NEXT:    sb $5, 84($4)
-; MIPS32R6-NEXT:    sb $5, 85($4)
-; MIPS32R6-NEXT:    sb $5, 86($4)
-; MIPS32R6-NEXT:    sb $5, 87($4)
-; MIPS32R6-NEXT:    sb $5, 88($4)
-; MIPS32R6-NEXT:    sb $5, 89($4)
-; MIPS32R6-NEXT:    sb $5, 90($4)
-; MIPS32R6-NEXT:    sb $5, 91($4)
-; MIPS32R6-NEXT:    sb $5, 92($4)
-; MIPS32R6-NEXT:    sb $5, 93($4)
-; MIPS32R6-NEXT:    sb $5, 94($4)
-; MIPS32R6-NEXT:    sb $5, 95($4)
+; MIPS32R6-NEXT:    andi $1, $5, 255
+; MIPS32R6-NEXT:    lui $2, 257
+; MIPS32R6-NEXT:    ori $2, $2, 257
+; MIPS32R6-NEXT:    mul $1, $1, $2
+; MIPS32R6-NEXT:    sw $1, 0($4)
+; MIPS32R6-NEXT:    sw $1, 4($4)
+; MIPS32R6-NEXT:    sw $1, 8($4)
+; MIPS32R6-NEXT:    sw $1, 12($4)
+; MIPS32R6-NEXT:    sw $1, 16($4)
+; MIPS32R6-NEXT:    sw $1, 20($4)
+; MIPS32R6-NEXT:    sw $1, 24($4)
+; MIPS32R6-NEXT:    sw $1, 28($4)
+; MIPS32R6-NEXT:    sw $1, 32($4)
+; MIPS32R6-NEXT:    sw $1, 36($4)
+; MIPS32R6-NEXT:    sw $1, 40($4)
+; MIPS32R6-NEXT:    sw $1, 44($4)
+; MIPS32R6-NEXT:    sw $1, 48($4)
+; MIPS32R6-NEXT:    sw $1, 52($4)
+; MIPS32R6-NEXT:    sw $1, 56($4)
+; MIPS32R6-NEXT:    sw $1, 60($4)
+; MIPS32R6-NEXT:    sw $1, 64($4)
+; MIPS32R6-NEXT:    sw $1, 68($4)
+; MIPS32R6-NEXT:    sw $1, 72($4)
+; MIPS32R6-NEXT:    sw $1, 76($4)
+; MIPS32R6-NEXT:    sw $1, 80($4)
+; MIPS32R6-NEXT:    sw $1, 84($4)
+; MIPS32R6-NEXT:    sw $1, 88($4)
+; MIPS32R6-NEXT:    sw $1, 92($4)
 ; MIPS32R6-NEXT:    jrc $ra
 entry:
   call void @llvm.memset.inline.p0.i32(ptr align 4 %dst, i8 %val, i32 96, i1 false)
diff --git a/llvm/test/CodeGen/Mips/GlobalISel/mips-prelegalizer-combiner/inline-memcpy.mir b/llvm/test/CodeGen/Mips/GlobalISel/mips-prelegalizer-combiner/inline-memcpy.mir
index e816e590d2d0f..f36403d45d1a6 100644
--- a/llvm/test/CodeGen/Mips/GlobalISel/mips-prelegalizer-combiner/inline-memcpy.mir
+++ b/llvm/test/CodeGen/Mips/GlobalISel/mips-prelegalizer-combiner/inline-memcpy.mir
@@ -42,13 +42,8 @@ body:             |
     ; MIPS32-NEXT: {{  $}}
     ; MIPS32-NEXT: [[COPY:%[0-9]+]]:_(p0) = COPY $r4
     ; MIPS32-NEXT: [[COPY1:%[0-9]+]]:_(p0) = COPY $r5
-    ; MIPS32-NEXT: [[LOAD:%[0-9]+]]:_(s8) = G_LOAD [[COPY1]](p0) :: (load (s8) from %ir.1, align 4)
-    ; MIPS32-NEXT: G_STORE [[LOAD]](s8), [[COPY]](p0) :: (store (s8) into %ir.0, align 4)
-    ; MIPS32-NEXT: [[C:%[0-9]+]]:_(s32) = G_CONSTANT i32 1
-    ; MIPS32-NEXT: [[PTR_ADD:%[0-9]+]]:_(p0) = nuw inbounds G_PTR_ADD [[COPY1]], [[C]](s32)
-    ; MIPS32-NEXT: [[LOAD1:%[0-9]+]]:_(s8) = G_LOAD [[PTR_ADD]](p0) :: (load (s8) from %ir.1 + 1, basealign 4)
-    ; MIPS32-NEXT: [[PTR_ADD1:%[0-9]+]]:_(p0) = nuw inbounds G_PTR_ADD [[COPY]], [[C]](s32)
-    ; MIPS32-NEXT: G_STORE [[LOAD1]](s8), [[PTR_ADD1]](p0) :: (store (s8) into %ir.0 + 1, basealign 4)
+    ; MIPS32-NEXT: [[LOAD:%[0-9]+]]:_(s16) = G_LOAD [[COPY1]](p0) :: (load (s16) from %ir.1, align 4)
+    ; MIPS32-NEXT: G_STORE [[LOAD]](s16), [[COPY]](p0) :: (store (s16) into %ir.0, align 4)
     ; MIPS32-NEXT: RetRA
     %0:_(p0) = COPY $r4
     %1:_(p0) = COPY $r5
diff --git a/llvm/test/CodeGen/Mips/GlobalISel/mips-prelegalizer-combiner/inline-memset.mir b/llvm/test/CodeGen/Mips/GlobalISel/mips-prelegalizer-combiner/inline-memset.mir
index 561016ecdc5c8..585f83837fb2a 100644
--- a/llvm/test/CodeGen/Mips/GlobalISel/mips-prelegalizer-combiner/inline-memset.mir
+++ b/llvm/test/CodeGen/Mips/GlobalISel/mips-prelegalizer-combiner/inline-memset.mir
@@ -40,10 +40,10 @@ body:             |
     ; MIPS32-NEXT: [[COPY:%[0-9]+]]:_(p0) = COPY $r4
     ; MIPS32-NEXT: [[COPY1:%[0-9]+]]:_(s32) = COPY $r5
     ; MIPS32-NEXT: [[TRUNC:%[0-9]+]]:_(s8) = G_TRUNC [[COPY1]](s32)
-    ; MIPS32-NEXT: G_STORE [[TRUNC]](s8), [[COPY]](p0) :: (store (s8) into %ir.dst, align 4)
-    ; MIPS32-NEXT: [[C:%[0-9]+]]:_(s32) = G_CONSTANT i32 1
-    ; MIPS32-NEXT: [[PTR_ADD:%[0-9]+]]:_(p0) = nuw inbounds G_PTR_ADD [[COPY]], [[C]](s32)
-    ; MIPS32-NEXT: G_STORE [[TRUNC]](s8), [[PTR_ADD]](p0) :: (store (s8) into %ir.dst + 1, basealign 4)
+    ; MIPS32-NEXT: [[ZEXT:%[0-9]+]]:_(s16) = G_ZEXT [[TRUNC]](s8)
+    ; MIPS32-NEXT: [[C:%[0-9]+]]:_(s16) = G_CONSTANT i16 257
+    ; MIPS32-NEXT: [[MUL:%[0-9]+]]:_(s16) = G_MUL [[ZEXT]], [[C]]
+    ; MIPS32-NEXT: G_STORE [[MUL]](s16), [[COPY]](p0) :: (store (s16) into %ir.dst, align 4)
     ; MIPS32-NEXT: RetRA
     %0:_(p0) = COPY $r4
     %1:_(s32) = COPY $r5
diff --git a/llvm/test/CodeGen/RISCV/GlobalISel/legalizer/legalize-memcpy-inline.mir b/llvm/test/CodeGen/RISCV/GlobalISel/legalizer/legalize-memcpy-inline.mir
index 91b43f69de131..628ef5622c0e0 100644
--- a/llvm/test/CodeGen/RISCV/GlobalISel/legalizer/legalize-memcpy-inline.mir
+++ b/llvm/test/CodeGen/RISCV/GlobalISel/legalizer/legalize-memcpy-inline.mir
@@ -16,13 +16,8 @@ body:             |
     ; RISCV32-NEXT: {{  $}}
     ; RISCV32-NEXT: [[COPY:%[0-9]+]]:_(p0) = COPY $x10
     ; RISCV32-NEXT: [[COPY1:%[0-9]+]]:_(p0) = COPY $x11
-    ; RISCV32-NEXT: [[LOAD:%[0-9]+]]:_(s16) = G_LOAD [[COPY1]](p0) :: (load (s8), align 4)
-    ; RISCV32-NEXT: G_STORE [[LOAD]](s16), [[COPY]](p0) :: (store (s8), align 4)
-    ; RISCV32-NEXT: [[C:%[0-9]+]]:_(s32) = G_CONSTANT i32 1
-    ; RISCV32-NEXT: [[PTR_ADD:%[0-9]+]]:_(p0) = nuw inbounds G_PTR_ADD [[COPY1]], [[C]](s32)
-    ; RISCV32-NEXT: [[LOAD1:%[0-9]+]]:_(s16) = G_LOAD [[PTR_ADD]](p0) :: (load (s8) from unknown-address + 1)
-    ; RISCV32-NEXT: [[PTR_ADD1:%[0-9]+]]:_(p0) = nuw inbounds G_PTR_ADD [[COPY]], [[C]](s32)
-    ; RISCV32-NEXT: G_STORE [[LOAD1]](s16), [[PTR_ADD1]](p0) :: (store (s8) into unknown-address + 1)
+    ; RISCV32-NEXT: [[LOAD:%[0-9]+]]:_(s16) = G_LOAD [[COPY1]](p0) :: (load (s16), align 4)
+    ; RISCV32-NEXT: G_STORE [[LOAD]](s16), [[COPY]](p0) :: (store (s16), align 4)
     ; RISCV32-NEXT: PseudoRET
     ;
     ; RISCV64-LABEL: name: test_memcpy_inline
@@ -30,13 +25,8 @@ body:             |
     ; RISCV64-NEXT: {{  $}}
     ; RISCV64-NEXT: [[COPY:%[0-9]+]]:_(p0) = COPY $x10
     ; RISCV64-NEXT: [[COPY1:%[0-9]+]]:_(p0) = COPY $x11
-    ; RISCV64-NEXT: [[LOAD:%[0-9]+]]:_(s16) = G_LOAD [[COPY1]](p0) :: (load (s8), align 4)
-    ; RISCV64-NEXT: G_STORE [[LOAD]](s16), [[COPY]](p0) :: (store (s8), align 4)
-    ; RISCV64-NEXT: [[C:%[0-9]+]]:_(s64) = G_CONSTANT i64 1
-    ; RISCV64-NEXT: [[PTR_ADD:%[0-9]+]]:_(p0) = nuw inbounds G_PTR_ADD [[COPY1]], [[C]](s64)
-    ; RISCV64-NEXT: [[LOAD1:%[0-9]+]]:_(s16) = G_LOAD [[PTR_ADD]](p0) :: (load (s8) from unknown-address + 1)
-    ; RISCV64-NEXT: [[PTR_ADD1:%[0-9]+]]:_(p0) = nuw inbounds G_PTR_ADD [[COPY]], [[C]](s64)
-    ; RISCV64-NEXT: G_STORE [[LOAD1]](s16), [[PTR_ADD1]](p0) :: (store (s8) into unknown-address + 1)
+    ; RISCV64-NEXT: [[LOAD:%[0-9]+]]:_(s16) = G_LOAD [[COPY1]](p0) :: (load (s16), align 4)
+    ; RISCV64-NEXT: G_STORE [[LOAD]](s16), [[COPY]](p0) :: (store (s16), align 4)
     ; RISCV64-NEXT: PseudoRET
     %0:_(p0) = COPY $x10
     %1:_(p0) = COPY $x11
diff --git a/llvm/test/CodeGen/RISCV/GlobalISel/legalizer/legalize-memset-inline.mir b/llvm/test/CodeGen/RISCV/GlobalISel/legalizer/legalize-memset-inline.mir
index 3e6ec4c56b548..3ce9e51dc536f 100644
--- a/llvm/test/CodeGen/RISCV/GlobalISel/legalizer/legalize-memset-inline.mir
+++ b/llvm/test/CodeGen/RISCV/GlobalISel/legalizer/legalize-memset-inline.mir
@@ -14,24 +14,18 @@ body:             |
     ; RISCV32: liveins: $x10
     ; RISCV32-NEXT: {{  $}}
     ; RISCV32-NEXT: [[COPY:%[0-9]+]]:_(p0) = COPY $x10
-    ; RISCV32-NEXT: [[C:%[0-9]+]]:_(s32) = G_CONSTANT i32 7
+    ; RISCV32-NEXT: [[C:%[0-9]+]]:_(s32) = G_CONSTANT i32 1799
     ; RISCV32-NEXT: [[TRUNC:%[0-9]+]]:_(s16) = G_TRUNC [[C]](s32)
-    ; RISCV32-NEXT: G_STORE [[TRUNC]](s16), [[COPY]](p0) :: (store (s8), align 4)
-    ; RISCV32-NEXT: [[C1:%[0-9]+]]:_(s32) = G_CONSTANT i32 1
-    ; RISCV32-NEXT: [[PTR_ADD:%[0-9]+]]:_(p0) = nuw inbounds G_PTR_ADD [[COPY]], [[C1]](s32)
-    ; RISCV32-NEXT: G_STORE [[TRUNC]](s16), [[PTR_ADD]](p0) :: (store (s8) into unknown-address + 1)
+    ; RISCV32-NEXT: G_STORE [[TRUNC]](s16), [[COPY]](p0) :: (store (s16), align 4)
     ; RISCV32-NEXT: PseudoRET
     ;
     ; RISCV64-LABEL: name: test_memset_inline
     ; RISCV64: liveins: $x10
     ; RISCV64-NEXT: {{  $}}
     ; RISCV64-NEXT: [[COPY:%[0-9]+]]:_(p0) = COPY $x10
-    ; RISCV64-NEXT: [[C:%[0-9]+]]:_(s64) = G_CONSTANT i64 7
+    ; RISCV64-NEXT: [[C:%[0-9]+]]:_(s64) = G_CONSTANT i64 1799
     ; RISCV64-NEXT: [[TRUNC:%[0-9]+]]:_(s16) = G_TRUNC [[C]](s64)
-    ; RISCV64-NEXT: G_STORE [[TRUNC]](s16), [[COPY]](p0) :: (store (s8), align 4)
-    ; RISCV64-NEXT: [[C1:%[0-9]+]]:_(s64) = G_CONSTANT i64 1
-    ; RISCV64-NEXT: [[PTR_ADD:%[0-9]+]]:_(p0) = nuw inbounds G_PTR_ADD [[COPY]], [[C1]](s64)
-    ; RISCV64-NEXT: G_STORE [[TRUNC]](s16), [[PTR_ADD]](p0) :: (store (s8) into unknown-address + 1)
+    ; RISCV64-NEXT: G_STORE [[TRUNC]](s16), [[COPY]](p0) :: (store (s16), align 4)
     ; RISCV64-NEXT: PseudoRET
     %0:_(p0) = COPY $x10
     %1:_(s64) = G_CONSTANT i64 7
diff --git a/llvm/test/CodeGen/RISCV/GlobalISel/memcpy-inline.ll b/llvm/test/CodeGen/RISCV/GlobalISel/memcpy-inline.ll
index 0379ac8ee1ba2..e169af867426c 100644
--- a/llvm/test/CodeGen/RISCV/GlobalISel/memcpy-inline.ll
+++ b/llvm/test/CodeGen/RISCV/GlobalISel/memcpy-inline.ll
@@ -233,42 +233,26 @@ define void @test_memcpy_inline_8bytes(ptr %dst, ptr readonly %src) {
 define void @test_memcpy_inline_8bytes_align2(ptr %dst, ptr readonly %src) {
 ; RV32I-LABEL: test_memcpy_inline_8bytes_align2:
 ; RV32I:       # %bb.0:
-; RV32I-NEXT:    lbu a2, 0(a1)
-; RV32I-NEXT:    sb a2, 0(a0)
-; RV32I-NEXT:    lbu a2, 1(a1)
-; RV32I-NEXT:    sb a2, 1(a0)
-; RV32I-NEXT:    lbu a2, 2(a1)
-; RV32I-NEXT:    sb a2, 2(a0)
-; RV32I-NEXT:    lbu a2, 3(a1)
-; RV32I-NEXT:    sb a2, 3(a0)
-; RV32I-NEXT:    lbu a2, 4(a1)
-; RV32I-NEXT:    sb a2, 4(a0)
-; RV32I-NEXT:    lbu a2, 5(a1)
-; RV32I-NEXT:    sb a2, 5(a0)
-; RV32I-NEXT:    lbu a2, 6(a1)
-; RV32I-NEXT:    sb a2, 6(a0)
-; RV32I-NEXT:    lbu a1, 7(a1)
-; RV32I-NEXT:    sb a1, 7(a0)
+; RV32I-NEXT:    lh a2, 0(a1)
+; RV32I-NEXT:    sh a2, 0(a0)
+; RV32I-NEXT:    lh a2, 2(a1)
+; RV32I-NEXT:    sh a2, 2(a0)
+; RV32I-NEXT:    lh a2, 4(a1)
+; RV32I-NEXT:    sh a2, 4(a0)
+; RV32I-NEXT:    lh a1, 6(a1)
+; RV32I-NEXT:    sh a1, 6(a0)
 ; RV32I-NEXT:    ret
 ;
 ; RV64I-LABEL: test_memcpy_inline_8bytes_align2:
 ; RV64I:       # %bb.0:
-; RV64I-NEXT:    lbu a2, 0(a1)
-; RV64I-NEXT:    sb a2, 0(a0)
-; RV64I-NEXT:    lbu a2, 1(a1)
-; RV64I-NEXT:    sb a2, 1(a0)
-; RV64I-NEXT:    lbu a2, 2(a1)
-; RV64I-NEXT:    sb a2, 2(a0)
-; RV64I-NEXT:    lbu a2, 3(a1)
-; RV64I-NEXT:    sb a2, 3(a0)
-; RV64I-NEXT:    lbu a2, 4(a1)
-; RV64I-NEXT:    sb a2, 4(a0)
-; RV64I-NEXT:    lbu a2, 5(a1)
-; RV64I-NEXT:    sb a2, 5(a0)
-; RV64I-NEXT:    lbu a2, 6(a1)
-; RV64I-NEXT:    sb a2, 6(a0)
-; RV64I-NEXT:    lbu a1, 7(a1)
-; RV64I-NEXT:    sb a1, 7(a0)
+; RV64I-NEXT:    lh a2, 0(a1)
+; RV64I-NEXT:    sh a2, 0(a0)
+; RV64I-NEXT:    lh a2, 2(a1)
+; RV64I-NEXT:    sh a2, 2(a0)
+; RV64I-NEXT:    lh a2, 4(a1)
+; RV64I-NEXT:    sh a2, 4(a0)
+; RV64I-NEXT:    lh a1, 6(a1)
+; RV64I-NEXT:    sh a1, 6(a0)
 ; RV64I-NEXT:    ret
 ;
 ; RV32I-UNALIGNED-LABEL: test_memcpy_inline_8bytes_align2:
@@ -291,42 +275,18 @@ define void @test_memcpy_inline_8bytes_align2(ptr %dst, ptr readonly %src) {
 define void @test_memcpy_inline_8bytes_align4(ptr %dst, ptr readonly %src) {
 ; RV32I-LABEL: test_memcpy_inline_8bytes_align4:
 ; RV32I:       # %bb.0:
-; RV32I-NEXT:    lbu a2, 0(a1)
-; RV32I-NEXT:    sb a2, 0(a0)
-; RV32I-NEXT:    lbu a2, 1(a1)
-; RV32I-NEXT:    sb a2, 1(a0)
-; RV32I-NEXT:    lbu a2, 2(a1)
-; RV32I-NEXT:    sb a2, 2(a0)
-; RV32I-NEXT:    lbu a2, 3(a1)
-; RV32I-NEXT:    sb a2, 3(a0)
-; RV32I-NEXT:    lbu a2, 4(a1)
-; RV32I-NEXT:    sb a2, 4(a0)
-; RV32I-NEXT:    lbu a2, 5(a1)
-; RV32I-NEXT:    sb a2, 5(a0)
-; RV32I-NEXT:    lbu a2, 6(a1)
-; RV32I-NEXT:    sb a2, 6(a0)
-; RV32I-NEXT:    lbu a1, 7(a1)
-; RV32I-NEXT:    sb a1, 7(a0)
+; RV32I-NEXT:    lw a2, 0(a1)
+; RV32I-NEXT:    sw a2, 0(a0)
+; RV32I-NEXT:    lw a1, 4(a1)
+; RV32I-NEXT:    sw a1, 4(a0)
 ; RV32I-NEXT:    ret
 ;
 ; RV64I-LABEL: test_memcpy_inline_8bytes_align4:
 ; RV64I:       # %bb.0:
-; RV64I-NEXT:    lbu a2, 0(a1)
-; RV64I-NEXT:    sb a2, 0(a0)
-; RV64I-NEXT:    lbu a2, 1(a1)
-; RV64I-NEXT:    sb a2, 1(a0)
-; RV64I-NEXT:    lbu a2, 2(a1)
-; RV64I-NEXT:    sb a2, 2(a0)
-; RV64I-NEXT:    lbu a2, 3(a1)
-; RV64I-NEXT:    sb a2, 3(a0)
-; RV64I-NEXT:    lbu a2, 4(a1)
-; RV64I-NEXT:    sb a2, 4(a0)
-; RV64I-NEXT:    lbu a2, 5(a1)
-; RV64I-NEXT:    sb a2, 5(a0)
-; RV64I-NEXT:    lbu a2, 6(a1)
-; RV64I-NEXT:    sb a2, 6(a0)
-; RV64I-NEXT:    lbu a1, 7(a1)
-; RV64I-NEXT:    sb a1, 7(a0)
+; RV64I-NEXT:    lw a2, 0(a1)
+; RV64I-NEXT:    sw a2, 0(a0)
+; RV64I-NEXT:    lw a1, 4(a1)
+; RV64I-NEXT:    sw a1, 4(a0)
 ; RV64I-NEXT:    ret
 ;
 ; RV32I-UNALIGNED-LABEL: test_memcpy_inline_8bytes_align4:
@@ -349,68 +309,28 @@ define void @test_memcpy_inline_8bytes_align4(ptr %dst, ptr readonly %src) {
 define void @test_memcpy_inline_15bytes_align4(ptr %dst, ptr readonly %src) {
 ; RV32I-LABEL: test_memcpy_inline_15bytes_align4:
 ; RV32I:       # %bb.0:
-; RV32I-NEXT:    lbu a2, 0(a1)
-; RV32I-NEXT:    sb a2, 0(a0)
-; RV32I-NEXT:    lbu a2, 1(a1)
-; RV32I-NEXT:    sb a2, 1(a0)
-; RV32I-NEXT:    lbu a2, 2(a1)
-; RV32I-NEXT:    sb a2, 2(a0)
-; RV32I-NEXT:    lbu a2, 3(a1)
-; RV32I-NEXT:    sb a2, 3(a0)
-; RV32I-NEXT:    lbu a2, 4(a1)
-; RV32I-NEXT:    sb a2, 4(a0)
-; RV32I-NEXT:    lbu a2, 5(a1)
-; RV32I-NEXT:    sb a2, 5(a0)
-; RV32I-NEXT:    lbu a2, 6(a1)
-; RV32I-NEXT:    sb a2, 6(a0)
-; RV32I-NEXT:    lbu a2, 7(a1)
-; RV32I-NEXT:    sb a2, 7(a0)
-; RV32I-NEXT:    lbu a2, 8(a1)
-; RV32I-NEXT:    sb a2, 8(a0)
-; RV32I-NEXT:    lbu a2, 9(a1)
-; RV32I-NEXT:    sb a2, 9(a0)
-; RV32I-NEXT:    lbu a2, 10(a1)
-; RV32I-NEXT:    sb a2, 10(a0)
-; RV32I-NEXT:    lbu a2, 11(a1)
-; RV32I-NEXT:    sb a2, 11(a0)
-; RV32I-NEXT:    lbu a2, 12(a1)
-; RV32I-NEXT:    sb a2, 12(a0)
-; RV32I-NEXT:    lbu a2, 13(a1)
-; RV32I-NEXT:    sb a2, 13(a0)
+; RV32I-NEXT:    lw a2, 0(a1)
+; RV32I-NEXT:    sw a2, 0(a0)
+; RV32I-NEXT:    lw a2, 4(a1)
+; RV32I-NEXT:    sw a2, 4(a0)
+; RV32I-NEXT:    lw a2, 8(a1)
+; RV32I-NEXT:    sw a2, 8(a0)
+; RV32I-NEXT:    lh a2, 12(a1)
+; RV32I-NEXT:    sh a2, 12(a0)
 ; RV32I-NEXT:    lbu a1, 14(a1)
 ; RV32I-NEXT:    sb a1, 14(a0)
 ; RV32I-NEXT:    ret
 ;
 ; RV64I-LABEL: test_memcpy_inline_15bytes_align4:
 ; RV64I:       # %bb.0:
-; RV64I-NEXT:    lbu a2, 0(a1)
-; RV64I-NEXT:    sb a2, 0(a0)
-; RV64I-NEXT:    lbu a2, 1(a1)
-; RV64I-NEXT:    sb a2, 1(a0)
-; RV64I-NEXT:    lbu a2, 2(a1)
-; RV64I-NEXT:    sb a2, 2(a0)
-; RV64I-NEXT:    lbu a2, 3(a1)
-; RV64I-NEXT:    sb a2, 3(a0)
-; RV64I-NEXT:    lbu a2, 4(a1)
-; RV64I-NEXT:    sb a2, 4(a0)
-; RV64I-NEXT:    lbu a2, 5(a1)
-; RV64I-NEXT:    sb a2, 5(a0)
-; RV64I-NEXT:    lbu a2, 6(a1)
-; RV64I-NEXT:    sb a2, 6(a0)
-; RV64I-NEXT:    lbu a2, 7(a1)
-; RV64I-NEXT:    sb a2, 7(a0)
-; RV64I-NEXT:    lbu a2, 8(a1)
-; RV64I-NEXT:    sb a2, 8(a0)
-; RV64I-NEXT:    lbu a2, 9(a1)
-; RV64I-NEXT:    sb a2, 9(a0)
-; RV64I-NEXT:    lbu a2, 10(a1)
-; RV64I-NEXT:    sb a2, 10(a0)
-; RV64I-NEXT:    lbu a2, 11(a1)
-; RV64I-NEXT:    sb a2, 11(a0)
-; RV64I-NEXT:    lbu a2, 12(a1)
-; RV64I-NEXT:    sb a2, 12(a0)
-; RV64I-NEXT:    lbu a2, 13(a1)
-; RV64I-NEXT:    sb a2, 13(a0)
+; RV64I-NEXT:    lw a2, 0(a1)
+; RV64I-NEXT:    sw a2, 0(a0)
+; RV64I-NEXT:    lw a2, 4(a1)
+; RV64I-NEXT:    sw a2, 4(a0)
+; RV64I-NEXT:    lw a2, 8(a1)
+; RV64I-NEXT:    sw a2, 8(a0)
+; RV64I-NEXT:    lh a2, 12(a1)
+; RV64I-NEXT:    sh a2, 12(a0)
 ; RV64I-NEXT:    lbu a1, 14(a1)
 ; RV64I-NEXT:    sb a1, 14(a0)
 ; RV64I-NEXT:    ret
diff --git a/llvm/test/CodeGen/RISCV/GlobalISel/memset-inline.ll b/llvm/test/CodeGen/RISCV/GlobalISel/memset-inline.ll
index c26ae999011b7..b6982cd590e52 100644
--- a/llvm/test/CodeGen/RISCV/GlobalISel/memset-inline.ll
+++ b/llvm/test/CodeGen/RISCV/GlobalISel/memset-inline.ll
@@ -71,26 +71,50 @@ define void @test_memset_inline_8bytes(ptr %dst, i8 %val) {
 define void @test_memset_inline_8bytes_align2(ptr %dst, i8 %val) {
 ; RV32I-LABEL: test_memset_inline_8bytes_align2:
 ; RV32I:       # %bb.0:
-; RV32I-NEXT:    sb a1, 0(a0)
-; RV32I-NEXT:    sb a1, 1(a0)
-; RV32I-NEXT:    sb a1, 2(a0)
-; RV32I-NEXT:    sb a1, 3(a0)
-; RV32I-NEXT:    sb a1, 4(a0)
-; RV32I-NEXT:    sb a1, 5(a0)
-; RV32I-NEXT:    sb a1, 6(a0)
-; RV32I-NEXT:    sb a1, 7(a0)
+; RV32I-NEXT:    addi sp, sp, -16
+; RV32I-NEXT:    .cfi_def_cfa_offset 16
+; RV32I-NEXT:    sw ra, 12(sp) # 4-byte Folded Spill
+; RV32I-NEXT:    sw s0, 8(sp) # 4-byte Folded Spill
+; RV32I-NEXT:    .cfi_offset ra, -4
+; RV32I-NEXT:    .cfi_offset s0, -8
+; RV32I-NEXT:    mv s0, a0
+; RV32I-NEXT:    zext.b a0, a1
+; RV32I-NEXT:    li a1, 257
+; RV32I-NEXT:    call __mulsi3
+; RV32I-NEXT:    sh a0, 0(s0)
+; RV32I-NEXT:    sh a0, 2(s0)
+; RV32I-NEXT:    sh a0, 4(s0)
+; RV32I-NEXT:    sh a0, 6(s0)
+; RV32I-NEXT:    lw ra, 12(sp) # 4-byte Folded Reload
+; RV32I-NEXT:    lw s0, 8(sp) # 4-byte Folded Reload
+; RV32I-NEXT:    .cfi_restore ra
+; RV32I-NEXT:    .cfi_restore s0
+; RV32I-NEXT:    addi sp, sp, 16
+; RV32I-NEXT:    .cfi_def_cfa_offset 0
 ; RV32I-NEXT:    ret
 ;
 ; RV64I-LABEL: test_memset_inline_8bytes_align2:
 ; RV64I:       # %bb.0:
-; RV64I-NEXT:    sb a1, 0(a0)
-; RV64I-NEXT:    sb a1, 1(a0)
-; RV64I-NEXT:    sb a1, 2(a0)
-; RV64I-NEXT:    sb a1, 3(a0)
-; RV64I-NEXT:    sb a1, 4(a0)
-; RV64I-NEXT:    sb a1, 5(a0)
-; RV64I-NEXT:    sb a1, 6(a0)
-; RV64I-NEXT:    sb a1, 7(a0)
+; RV64I-NEXT:    addi sp, sp, -16
+; RV64I-NEXT:    .cfi_def_cfa_offset 16
+; RV64I-NEXT:    sd ra, 8(sp) # 8-byte Folded Spill
+; RV64I-NEXT:    sd s0, 0(sp) # 8-byte Folded Spill
+; RV64I-NEXT:    .cfi_offset ra, -8
+; RV64I-NEXT:    .cfi_offset s0, -16
+; RV64I-NEXT:    mv s0, a0
+; RV64I-NEXT:    zext.b a0, a1
+; RV64I-NEXT:    li a1, 257
+; RV64I-NEXT:    call __muldi3
+; RV64I-NEXT:    sh a0, 0(s0)
+; RV64I-NEXT:    sh a0, 2(s0)
+; RV64I-NEXT:    sh a0, 4(s0)
+; RV64I-NEXT:    sh a0, 6(s0)
+; RV64I-NEXT:    ld ra, 8(sp) # 8-byte Folded Reload
+; RV64I-NEXT:    ld s0, 0(sp) # 8-byte Folded Reload
+; RV64I-NEXT:    .cfi_restore ra
+; RV64I-NEXT:    .cfi_restore s0
+; RV64I-NEXT:    addi sp, sp, 16
+; RV64I-NEXT:    .cfi_def_cfa_offset 0
 ; RV64I-NEXT:    ret
   call void @llvm.memset.inline.p0.i64(ptr align 2 %dst, i8 %val, i64 8, i1 false)
   ret void
@@ -99,26 +123,49 @@ define void @test_memset_inline_8bytes_align2(ptr %dst, i8 %val) {
 define void @test_memset_inline_8bytes_align4(ptr %dst, i8 %val) {
 ; RV32I-LABEL: test_memset_inline_8bytes_align4:
 ; RV32I:       # %bb.0:
-; RV32I-NEXT:    sb a1, 0(a0)
-; RV32I-NEXT:    sb a1, 1(a0)
-; RV32I-NEXT:    sb a1, 2(a0)
-; RV32I-NEXT:    sb a1, 3(a0)
-; RV32I-NEXT:    sb a1, 4(a0)
-; RV32I-NEXT:    sb a1, 5(a0)
-; RV32I-NEXT:    sb a1, 6(a0)
-; RV32I-NEXT:    sb a1, 7(a0)
+; RV32I-NEXT:    addi sp, sp, -16
+; RV32I-NEXT:    .cfi_def_cfa_offset 16
+; RV32I-NEXT:    sw ra, 12(sp) # 4-byte Folded Spill
+; RV32I-NEXT:    sw s0, 8(sp) # 4-byte Folded Spill
+; RV32I-NEXT:    .cfi_offset ra, -4
+; RV32I-NEXT:    .cfi_offset s0, -8
+; RV32I-NEXT:    mv s0, a0
+; RV32I-NEXT:    lui a2, 4112
+; RV32I-NEXT:    zext.b a0, a1
+; RV32I-NEXT:    addi a1, a2, 257
+; RV32I-NEXT:    call __mulsi3
+; RV32I-NEXT:    sw a0, 0(s0)
+; RV32I-NEXT:    sw a0, 4(s0)
+; RV32I-NEXT:    lw ra, 12(sp) # 4-byte Folded Reload
+; RV32I-NEXT:    lw s0, 8(sp) # 4-byte Folded Reload
+; RV32I-NEXT:    .cfi_restore ra
+; RV32I-NEXT:    .cfi_restore s0
+; RV32I-NEXT:    addi sp, sp, 16
+; RV32I-NEXT:    .cfi_def_cfa_offset 0
 ; RV32I-NEXT:    ret
 ;
 ; RV64I-LABEL: test_memset_inline_8bytes_align4:
 ; RV64I:       # %bb.0:
-; RV64I-NEXT:    sb a1, 0(a0)
-; RV64I-NEXT:    sb a1, 1(a0)
-; RV64I-NEXT:    sb a1, 2(a0)
-; RV64I-NEXT:    sb a1, 3(a0)
-; RV64I-NEXT:    sb a1, 4(a0)
-; RV64I-NEXT:    sb a1, 5(a0)
-; RV64I-NEXT:    sb a1, 6(a0)
-; RV64I-NEXT:    sb a1, 7(a0)
+; RV64I-NEXT:    addi sp, sp, -16
+; RV64I-NEXT:    .cfi_def_cfa_offset 16
+; RV64I-NEXT:    sd ra, 8(sp) # 8-byte Folded Spill
+; RV64I-NEXT:    sd s0, 0(sp) # 8-byte Folded Spill
+; RV64I-NEXT:    .cfi_offset ra, -8
+; RV64I-NEXT:    .cfi_offset s0, -16
+; RV64I-NEXT:    mv s0, a0
+; RV64I-NEXT:    lui a2, 4112
+; RV64I-NEXT:    addi a2, a2, 257
+; RV64I-NEXT:    zext.b a0, a1
+; RV64I-NEXT:    mv a1, a2
+; RV64I-NEXT:    call __muldi3
+; RV64I-NEXT:    sw a0, 0(s0)
+; RV64I-NEXT:    sw a0, 4(s0)
+; RV64I-NEXT:    ld ra, 8(sp) # 8-byte Folded Reload
+; RV64I-NEXT:    ld s0, 0(sp) # 8-byte Folded Reload
+; RV64I-NEXT:    .cfi_restore ra
+; RV64I-NEXT:    .cfi_restore s0
+; RV64I-NEXT:    addi sp, sp, 16
+; RV64I-NEXT:    .cfi_def_cfa_offset 0
 ; RV64I-NEXT:    ret
   call void @llvm.memset.inline.p0.i64(ptr align 4 %dst, i8 %val, i64 8, i1 false)
   ret void



More information about the llvm-branch-commits mailing list