[llvm-branch-commits] [lld] 0e332ad - Revert "[Mips] Fix MipsJmpLink and MipsTailCall to use compact branch instruc…"

via llvm-branch-commits llvm-branch-commits at lists.llvm.org
Wed Nov 4 17:01:15 PST 2026


Author: Ying Huang
Date: 2026-11-05T09:01:10+08:00
New Revision: 0e332adc4d567857eec2ad240537650d1e89443f

URL: https://github.com/llvm/llvm-project/commit/0e332adc4d567857eec2ad240537650d1e89443f
DIFF: https://github.com/llvm/llvm-project/commit/0e332adc4d567857eec2ad240537650d1e89443f.diff

LOG: Revert "[Mips] Fix MipsJmpLink and MipsTailCall to use compact branch instruc…"

This reverts commit 48d0dc8f61a7680190a144ef89bd80543c0ec4f9.

Added: 
    

Modified: 
    lld/test/ELF/mips-npic-call-pic.s
    lld/test/ELF/mips-plt-r6.s
    llvm/lib/Target/Mips/Mips32r6InstrInfo.td
    llvm/lib/Target/Mips/Mips64InstrInfo.td
    llvm/lib/Target/Mips/Mips64r6InstrInfo.td
    llvm/lib/Target/Mips/MipsInstrInfo.td
    llvm/lib/Target/Mips/MipsScheduleGeneric.td
    llvm/test/CodeGen/Mips/analyzebranch.ll
    llvm/test/CodeGen/Mips/atomic-min-max-LiveVariables.ll
    llvm/test/CodeGen/Mips/compactbranches/compact-branches.ll
    llvm/test/CodeGen/Mips/fp-intrinsics.ll
    llvm/test/CodeGen/Mips/msa/remat-ldi.ll
    llvm/test/CodeGen/Mips/rint-r6-features.ll
    llvm/test/CodeGen/Mips/rint-r6.ll
    llvm/test/CodeGen/Mips/tailcall/tailcall-wrong-isa.ll
    llvm/test/CodeGen/Mips/word-normalization.ll
    llvm/test/MC/Mips/mips32r6/valid.s
    llvm/test/MC/Mips/mips64r6/valid.s

Removed: 
    


################################################################################
diff  --git a/lld/test/ELF/mips-npic-call-pic.s b/lld/test/ELF/mips-npic-call-pic.s
index de59f78202120d..902d5064c1d32a 100644
--- a/lld/test/ELF/mips-npic-call-pic.s
+++ b/lld/test/ELF/mips-npic-call-pic.s
@@ -28,7 +28,7 @@
 # RUN: llvm-mc -filetype=obj -triple=mips-unknown-linux -mcpu=mips32r6 \
 # RUN:   %p/Inputs/mips-pic.s -o %t-pic-r6.o
 # RUN: llvm-mc -filetype=obj -triple=mips-unknown-linux -mcpu=mips32r6 \
-# RUN:   %s --defsym MIPSR6=1 -o %t-npic-r6.o
+# RUN:   %s -o %t-npic-r6.o
 # RUN: ld.lld %t-npic-r6.o %t-pic-r6.o %t-sto-pic-r6.o \
 # RUN:        -script %t.script -o %t-r6.exe
 # RUN: llvm-objdump --no-print-imm-hex -d --no-show-raw-insn %t-r6.exe \
@@ -37,92 +37,68 @@
 # CHECK:     Disassembly of section .text:
 # CHECK-EMPTY:
 # CHECK-NEXT: <__start>:
-# R2-NEXT:    20100:       jal     {{.*}} <__LA25Thunk_foo1a>
-# R2-NEXT:                 nop
-# R2-NEXT:                 jal     {{.*}} <__LA25Thunk_foo2>
-# R2-NEXT:                 nop
-# R2-NEXT:                 jal     {{.*}} <__LA25Thunk_foo1b>
-# R2-NEXT:                 nop
-# R2-NEXT:                 jal     {{.*}} <__LA25Thunk_foo2>
-# R2-NEXT:                 nop
-# R2-NEXT:                 jal     {{.*}} <__LA25Thunk_fpic>
-# R2-NEXT:                 nop
-# R2-NEXT:                 jal     {{.*}} <fnpic>
-# R2-NEXT:                 nop
-# R6-NEXT:    20100:       balc     {{.*}} <__LA25Thunk_foo1a>
-# R6-NEXT:                 balc     {{.*}} <__LA25Thunk_foo2>
-# R6-NEXT:                 balc     {{.*}} <__LA25Thunk_foo1b>
-# R6-NEXT:                 balc     {{.*}} <__LA25Thunk_foo2>
-# R6-NEXT:                 balc     {{.*}} <__LA25Thunk_fpic>
-# R6-NEXT:                 balc     {{.*}} <fnpic>
+# CHECK-NEXT:    20100:       jal     {{.*}} <__LA25Thunk_foo1a>
+# CHECK-NEXT:                 nop
+# CHECK-NEXT:                 jal     {{.*}} <__LA25Thunk_foo2>
+# CHECK-NEXT:                 nop
+# CHECK-NEXT:                 jal     {{.*}} <__LA25Thunk_foo1b>
+# CHECK-NEXT:                 nop
+# CHECK-NEXT:                 jal     {{.*}} <__LA25Thunk_foo2>
+# CHECK-NEXT:                 nop
+# CHECK-NEXT:                 jal     {{.*}} <__LA25Thunk_fpic>
+# CHECK-NEXT:                 nop
+# CHECK-NEXT:                 jal     {{.*}} <fnpic>
+# CHECK-NEXT:                 nop
 
 # CHECK: <__LA25Thunk_fpic>:
 # R2:            20130:       lui     $25, 2
-# R6:            20120:       aui     $25, $zero, 2
+# R6:            20130:       aui     $25, $zero, 2
 # CHECK-NEXT:                 j       {{.*}} <fpic>
-# R2-NEXT:                    addiu   $25, $25, 320
-# R6-NEXT:                    addiu   $25, $25, 304
+# CHECK-NEXT:                 addiu   $25, $25, 320
 # CHECK-NEXT:                 nop
 
 # CHECK: <fpic>:
-# R2-NEXT:    20140:       nop
-# R6-NEXT:    20130:       nop
+# CHECK-NEXT:    20140:       nop
 
 # CHECK: <fnpic>:
-# R2-NEXT:    20150:       nop
-# R6-NEXT:    20140:       nop
+# CHECK-NEXT:    20150:       nop
 
 # CHECK: <__LA25Thunk_foo1a>:
 # R2:            20154:       lui     $25, 2
-# R6:            20144:       aui     $25, $zero, 2
+# R6:            20154:       aui     $25, $zero, 2
 # CHECK:                      j       {{.*}} <foo1a>
-# R2-NEXT:                    addiu   $25, $25, 384
-# R6-NEXT:                    addiu   $25, $25, 368
+# CHECK-NEXT:                 addiu   $25, $25, 384
 # CHECK-NEXT:                 nop
 
 # CHECK: <__LA25Thunk_foo1b>:
 # R2:            20164:       lui     $25, 2
 # R6:                         aui     $25, $zero, 2
 # CHECK-NEXT:                 j       {{.*}} <foo1b>
-# R2-NEXT:                    addiu   $25, $25, 388
-# R6-NEXT:                    addiu   $25, $25, 372
+# CHECK-NEXT:                 addiu   $25, $25, 388
 # CHECK-NEXT:                 nop
 
 # CHECK: <foo1a>:
-# R2-NEXT:    20180:       nop
-# R6-NEXT:    20170:       nop
+# CHECK-NEXT:    20180:       nop
 
 # CHECK: <foo1b>:
-# R2-NEXT:    20184:       nop
-# R6-NEXT:    20174:       nop
+# CHECK-NEXT:    20184:       nop
 
 # CHECK: <__LA25Thunk_foo2>:
 # R2:            20188:       lui     $25, 2
 # R6:                         aui     $25, $zero, 2
 # CHECK-NEXT:                 j       {{.*}} <foo2>
-# R2-NEXT:                    addiu   $25, $25, 416
-# R6-NEXT:                    addiu   $25, $25, 400
+# CHECK-NEXT:                 addiu   $25, $25, 416
 # CHECK-NEXT:                 nop
 
 # CHECK: <foo2>:
-# R2-NEXT:    201a0:       nop
-# R6-NEXT:    20190:       nop
+# CHECK-NEXT:    201a0:       nop
 
   .text
   .globl __start
 __start:
-.ifdef MIPSR6
-  balc foo1a
-  balc foo2
-  balc foo1b
-  balc foo2
-  balc fpic
-  balc fnpic
-.else
   jal foo1a
   jal foo2
   jal foo1b
   jal foo2
   jal fpic
   jal fnpic
-.endif

diff  --git a/lld/test/ELF/mips-plt-r6.s b/lld/test/ELF/mips-plt-r6.s
index de40508bc34392..eb65c34fdb252d 100644
--- a/lld/test/ELF/mips-plt-r6.s
+++ b/lld/test/ELF/mips-plt-r6.s
@@ -20,8 +20,9 @@
 # CHECK:      Disassembly of section .text:
 # CHECK-EMPTY:
 # CHECK-NEXT: <__start>:
-# CHECK-NEXT:   20000:       balc     0x20030
+# CHECK-NEXT:   20000:       jal     0x20030
 #                                    ^-- 0x20030 gotplt[foo0]
+# CHECK-NEXT:   20004:       nop
 #
 # CHECK-EMPTY:
 # CHECK-NEXT: Disassembly of section .plt:
@@ -46,4 +47,4 @@
   .text
   .global __start
 __start:
-  balc foo0        # R_MIPS_26 against 'foo0' from DSO
+  jal foo0        # R_MIPS_26 against 'foo0' from DSO

diff  --git a/llvm/lib/Target/Mips/Mips32r6InstrInfo.td b/llvm/lib/Target/Mips/Mips32r6InstrInfo.td
index 452d803a9863fa..ff2cc170394075 100644
--- a/llvm/lib/Target/Mips/Mips32r6InstrInfo.td
+++ b/llvm/lib/Target/Mips/Mips32r6InstrInfo.td
@@ -1243,41 +1243,3 @@ let AdditionalPredicates = [NotInMicroMips, UseCompactBranches] in {
   def : MipsPat<(brcond (i32 (setule GPR32:$rs, GPR32:$rt)), bb:$offset),
                 (BGEUC GPR32:$rt, GPR32:$rs, bb:$offset)>, ISA_MIPS32R6;
 }
-
-class JumpLinkR6<Instruction JumpInst, DAGOperand Opnd> :
-  PseudoSE<(outs), (ins calltarget:$target), []>,
-  PseudoInstExpansion<(JumpInst Opnd:$target)> {
-  let isCall = 1;
-  let isTerminator = 0;
-  let isReturn = 0;
-  let isBarrier = 0;
-  let hasDelaySlot = 0;
-  let isCTI = 1;
-  list<Register> Defs = [R31];
-}
-
-class TailCallR6<Instruction JumpInst, DAGOperand Opnd> :
-  PseudoSE<(outs), (ins calltarget:$target), []>,
-  PseudoInstExpansion<(JumpInst Opnd:$target)> {
-  let isCall = 1;
-  let isTerminator = 1;
-  let isReturn = 1;
-  let isBarrier = 1;
-  let hasDelaySlot = 0;
-  let isCTI = 1;
-  list<Register> Defs = [R1];
-}
-
-def JAL_R6 : JumpLinkR6<BALC, brtarget26>, ISA_MIPS32R6;
-def TAILCALL_R6 : TailCallR6<BC, brtarget26>, ISA_MIPS32R6;
-
-let AdditionalPredicates = [NotInMicroMips] in {
-  def : MipsPat<(MipsJmpLink (i32 texternalsym:$dst)),
-                (JAL_R6 texternalsym:$dst)>, ISA_MIPS32R6;
-  def : MipsPat<(MipsJmpLink (i32 tglobaladdr:$dst)),
-                (JAL_R6 tglobaladdr:$dst)>, ISA_MIPS32R6;
-  def : MipsPat<(MipsTailCall (i32 tglobaladdr:$dst)),
-                (TAILCALL_R6 tglobaladdr:$dst)>, ISA_MIPS32R6;
-  def : MipsPat<(MipsTailCall (i32 texternalsym:$dst)),
-                (TAILCALL_R6 texternalsym:$dst)>, ISA_MIPS32R6;
-}

diff  --git a/llvm/lib/Target/Mips/Mips64InstrInfo.td b/llvm/lib/Target/Mips/Mips64InstrInfo.td
index d6447c87c0ff8d..910f8e506c8c7c 100644
--- a/llvm/lib/Target/Mips/Mips64InstrInfo.td
+++ b/llvm/lib/Target/Mips/Mips64InstrInfo.td
@@ -695,7 +695,7 @@ def : MipsPat<(MipsTlsHi tglobaltlsaddr:$in), (LUi64 tglobaltlsaddr:$in)>,
 // highest/higher/hi/lo relocs
 let AdditionalPredicates = [NotInMicroMips] in {
   def : MipsPat<(MipsJmpLink (i64 texternalsym:$dst)),
-                (JAL texternalsym:$dst)>, ISA_MIPS3_NOT_32R6_64R6, GPR_64, SYM_64;
+                (JAL texternalsym:$dst)>, ISA_MIPS3, GPR_64, SYM_64;
 
   def : MipsPat<(MipsHighest (i64 tglobaladdr:$in)),
                 (LUi64 tglobaladdr:$in)>, ISA_MIPS3, GPR_64, SYM_64;

diff  --git a/llvm/lib/Target/Mips/Mips64r6InstrInfo.td b/llvm/lib/Target/Mips/Mips64r6InstrInfo.td
index 60475d23551fa5..35c047e02bb782 100644
--- a/llvm/lib/Target/Mips/Mips64r6InstrInfo.td
+++ b/llvm/lib/Target/Mips/Mips64r6InstrInfo.td
@@ -373,14 +373,3 @@ let AdditionalPredicates = [NotInMicroMips, UseCompactBranches] in {
   def : MipsPat<(brcond (i32 (setule GPR64:$rs, GPR64:$rt)), bb:$offset),
                 (BGEUC64 GPR64:$rt, GPR64:$rs, bb:$offset)>, ISA_MIPS64R6;
 }
-
-let AdditionalPredicates = [NotInMicroMips] in {
-  def : MipsPat<(MipsJmpLink (i64 texternalsym:$dst)),
-                (JAL_R6 texternalsym:$dst)>, ISA_MIPS64R6;
-  def : MipsPat<(MipsJmpLink (i64 tglobaladdr:$dst)),
-                (JAL_R6 tglobaladdr:$dst)>, ISA_MIPS64R6;
-  def : MipsPat<(MipsTailCall (i64 tglobaladdr:$dst)),
-                (TAILCALL_R6 tglobaladdr:$dst)>, ISA_MIPS64R6;
-  def : MipsPat<(MipsTailCall (i64 texternalsym:$dst)),
-                (TAILCALL_R6 texternalsym:$dst)>, ISA_MIPS64R6;
-}

diff  --git a/llvm/lib/Target/Mips/MipsInstrInfo.td b/llvm/lib/Target/Mips/MipsInstrInfo.td
index 8c8e4bb22fa5bd..afe25b78e91dcf 100644
--- a/llvm/lib/Target/Mips/MipsInstrInfo.td
+++ b/llvm/lib/Target/Mips/MipsInstrInfo.td
@@ -2329,7 +2329,8 @@ def BLTZL   : MMRel, CBranchZeroLikely<"bltzl", brtarget, GPR32Opnd>,
               BGEZ_FM<1, 2>, ISA_MIPS2_NOT_32R6_64R6;
 def B       : UncondBranch<BEQ, brtarget>, ISA_MIPS1;
 
-def JAL     : MMRel, JumpLink<"jal", calltarget>, FJ<3>, ISA_MIPS1_NOT_32R6_64R6;
+def JAL  : MMRel, JumpLink<"jal", calltarget>, FJ<3>, ISA_MIPS1;
+
 }
 
 let AdditionalPredicates = [NotInMicroMips, NoIndirectJumpGuards] in {
@@ -3235,16 +3236,16 @@ def : MipsPat<(MipsSync (i32 timmz)),
 
 // Call
 def : MipsPat<(MipsJmpLink (i32 texternalsym:$dst)),
-              (JAL texternalsym:$dst)>, ISA_MIPS1_NOT_32R6_64R6;
+              (JAL texternalsym:$dst)>, ISA_MIPS1;
 //def : MipsPat<(MipsJmpLink GPR32:$dst),
 //              (JALR GPR32:$dst)>;
 
 // Tail call
 let AdditionalPredicates = [NotInMicroMips] in {
   def : MipsPat<(MipsTailCall (iPTR tglobaladdr:$dst)),
-                (TAILCALL tglobaladdr:$dst)>, ISA_MIPS1_NOT_32R6_64R6;
+                (TAILCALL tglobaladdr:$dst)>, ISA_MIPS1;
   def : MipsPat<(MipsTailCall (iPTR texternalsym:$dst)),
-                (TAILCALL texternalsym:$dst)>, ISA_MIPS1_NOT_32R6_64R6;
+                (TAILCALL texternalsym:$dst)>, ISA_MIPS1;
 }
 // hi/lo relocs
 multiclass MipsHiLoRelocs<Instruction Lui, Instruction Addiu,

diff  --git a/llvm/lib/Target/Mips/MipsScheduleGeneric.td b/llvm/lib/Target/Mips/MipsScheduleGeneric.td
index 6bbe410387b42f..b240ca06ef02fb 100644
--- a/llvm/lib/Target/Mips/MipsScheduleGeneric.td
+++ b/llvm/lib/Target/Mips/MipsScheduleGeneric.td
@@ -313,7 +313,7 @@ def : InstRW<[GenericWriteTrap], (instrs BREAK, SYSCALL, TEQ, TEQI,
 def : InstRW<[GenericWriteJumpAndLink], (instrs BALC, BEQZALC, BGEZALC,
                                          BGTZALC, BLEZALC, BLTZALC,
                                          BNEZALC,
-                                         JIALC, JAL_R6)>;
+                                         JIALC)>;
 
 def : InstRW<[GenericWriteJump], (instrs BC, BC2EQZ, BC2NEZ, BEQC, BEQZC, BGEC,
                                   BGEUC, BGEZC, BGTZC, BLEZC, BLTC, BLTUC,
@@ -321,8 +321,7 @@ def : InstRW<[GenericWriteJump], (instrs BC, BC2EQZ, BC2NEZ, BEQC, BEQZC, BGEC,
                                   SIGRIE, PseudoIndirectBranchR6,
                                   PseudoIndrectHazardBranchR6)>;
 
-def : InstRW<[GenericWriteJump], (instrs TAILCALLR6REG, TAILCALLHBR6REG,
-                                  TAILCALL_R6)>;
+def : InstRW<[GenericWriteJump], (instrs TAILCALLR6REG, TAILCALLHBR6REG)>;
 
 def : InstRW<[GenericWriteTrap], (instrs SDBBP_R6)>;
 

diff  --git a/llvm/test/CodeGen/Mips/analyzebranch.ll b/llvm/test/CodeGen/Mips/analyzebranch.ll
index c39639b16642fe..054a59fa18c865 100644
--- a/llvm/test/CodeGen/Mips/analyzebranch.ll
+++ b/llvm/test/CodeGen/Mips/analyzebranch.ll
@@ -204,12 +204,14 @@ define void @f1(float %f) nounwind {
 ; MIPS32r6-NEXT:    bc1eqz $f0, $BB1_2
 ; MIPS32r6-NEXT:    nop
 ; MIPS32r6-NEXT:  # %bb.1: # %if.end
-; MIPS32r6-NEXT:    balc f2
+; MIPS32r6-NEXT:    jal f2
+; MIPS32r6-NEXT:    nop
 ; MIPS32r6-NEXT:    lw $ra, 20($sp) # 4-byte Folded Reload
 ; MIPS32r6-NEXT:    jr $ra
 ; MIPS32r6-NEXT:    addiu $sp, $sp, 24
 ; MIPS32r6-NEXT:  $BB1_2: # %if.then
-; MIPS32r6-NEXT:    balc abort
+; MIPS32r6-NEXT:    jal abort
+; MIPS32r6-NEXT:    nop
 ;
 ; MIPS4-LABEL: f1:
 ; MIPS4:       # %bb.0: # %entry
@@ -274,12 +276,14 @@ define void @f1(float %f) nounwind {
 ; MIPS64R6-NEXT:    bc1eqz $f0, .LBB1_2
 ; MIPS64R6-NEXT:    nop
 ; MIPS64R6-NEXT:  # %bb.1: # %if.end
-; MIPS64R6-NEXT:    balc f2
+; MIPS64R6-NEXT:    jal f2
+; MIPS64R6-NEXT:    nop
 ; MIPS64R6-NEXT:    ld $ra, 8($sp) # 8-byte Folded Reload
 ; MIPS64R6-NEXT:    jr $ra
 ; MIPS64R6-NEXT:    daddiu $sp, $sp, 16
 ; MIPS64R6-NEXT:  .LBB1_2: # %if.then
-; MIPS64R6-NEXT:    balc abort
+; MIPS64R6-NEXT:    jal abort
+; MIPS64R6-NEXT:    nop
 entry:
   %cmp = fcmp une float %f, 0.000000e+00
   br i1 %cmp, label %if.then, label %if.end

diff  --git a/llvm/test/CodeGen/Mips/atomic-min-max-LiveVariables.ll b/llvm/test/CodeGen/Mips/atomic-min-max-LiveVariables.ll
index 27a005ed2d3871..d07c7f61ece41f 100644
--- a/llvm/test/CodeGen/Mips/atomic-min-max-LiveVariables.ll
+++ b/llvm/test/CodeGen/Mips/atomic-min-max-LiveVariables.ll
@@ -89,7 +89,8 @@ define void @test_func(ptr %ptr, i32 %val, i1 %cond) nounwind {
 ; R6-O2-NEXT:  .LBB0_4: # %bb4
 ; R6-O2-NEXT:    daddiu $sp, $sp, -16
 ; R6-O2-NEXT:    sd $ra, 8($sp) # 8-byte Folded Spill
-; R6-O2-NEXT:    balc exit
+; R6-O2-NEXT:    jal exit
+; R6-O2-NEXT:    nop
 ;
 ; R6-O3-LABEL: test_func:
 ; R6-O3:       # %bb.0: # %entry
@@ -115,7 +116,8 @@ define void @test_func(ptr %ptr, i32 %val, i1 %cond) nounwind {
 ; R6-O3-NEXT:  .LBB0_4: # %bb4
 ; R6-O3-NEXT:    daddiu $sp, $sp, -16
 ; R6-O3-NEXT:    sd $ra, 8($sp) # 8-byte Folded Spill
-; R6-O3-NEXT:    balc exit
+; R6-O3-NEXT:    jal exit
+; R6-O3-NEXT:    nop
 entry:
   br i1 %cond, label %bb5, label %bb4
 

diff  --git a/llvm/test/CodeGen/Mips/compactbranches/compact-branches.ll b/llvm/test/CodeGen/Mips/compactbranches/compact-branches.ll
index 19b37816b3b3e9..e8ec97e421824c 100644
--- a/llvm/test/CodeGen/Mips/compactbranches/compact-branches.ll
+++ b/llvm/test/CodeGen/Mips/compactbranches/compact-branches.ll
@@ -187,7 +187,8 @@ define i32 @l9(ptr %i) #0 {
 entry:
   %i.addr = alloca ptr, align 4
   store ptr %i, ptr %i.addr, align 4
-; STATIC32: balc
+; STATIC32: jal
+; STATIC32: nop
 ; PIC: jalrc $25
   %call = call i32 @k()
 ; PIC: jalrc $25

diff  --git a/llvm/test/CodeGen/Mips/fp-intrinsics.ll b/llvm/test/CodeGen/Mips/fp-intrinsics.ll
index 61e843c16de647..a5cce37d73259c 100644
--- a/llvm/test/CodeGen/Mips/fp-intrinsics.ll
+++ b/llvm/test/CodeGen/Mips/fp-intrinsics.ll
@@ -35,16 +35,14 @@ define float @div_f32(float %x, float %y) #0 {
 
 define float @frem_f32(float %x, float %y) #0 {
 ; CHECK-LABEL: frem_f32:
-; CHECK-R2: jal fmodf
-; CHECK-R6: balc fmodf
+; CHECK: jal fmodf
   %val = call float @llvm.experimental.constrained.frem.f32(float %x, float %y, metadata !"round.tonearest", metadata !"fpexcept.strict") #0
   ret float %val
 }
 
 define float @fma_f32(float %x, float %y, float %z) #0 {
 ; CHECK-LABEL: fma_f32:
-; CHECK-R2: jal fmaf
-; CHECK-R6: balc fmaf
+; CHECK: jal fmaf
   %val = call float @llvm.experimental.constrained.fma.f32(float %x, float %y, float %z, metadata !"round.tonearest", metadata !"fpexcept.strict") #0
   ret float %val
 }
@@ -73,80 +71,70 @@ define float @sqrt_f32(float %x) #0 {
 
 define float @powi_f32(float %x, i32 %y) #0 {
 ; CHECK-LABEL: powi_f32:
-; CHECK-R2: jal __powisf2
-; CHECK-R6: balc __powisf2
+; CHECK: jal __powisf2
   %val = call float @llvm.experimental.constrained.powi.f32(float %x, i32 %y, metadata !"round.tonearest", metadata !"fpexcept.strict") #0
   ret float %val
 }
 
 define float @sin_f32(float %x) #0 {
 ; CHECK-LABEL: sin_f32:
-; CHECK-R2: jal sinf
-; CHECK-R6: balc sinf
+; CHECK: jal sinf
   %val = call float @llvm.experimental.constrained.sin.f32(float %x, metadata !"round.tonearest", metadata !"fpexcept.strict") #0
   ret float %val
 }
 
 define float @cos_f32(float %x) #0 {
 ; CHECK-LABEL: cos_f32:
-; CHECK-R2: jal cosf
-; CHECK-R6: balc cosf
+; CHECK: jal cosf
   %val = call float @llvm.experimental.constrained.cos.f32(float %x, metadata !"round.tonearest", metadata !"fpexcept.strict") #0
   ret float %val
 }
 
 define float @tan_f32(float %x) #0 {
 ; CHECK-LABEL: tan_f32:
-; CHECK-R2: jal tanf
-; CHECK-R6: balc tanf
+; CHECK: jal tanf
   %val = call float @llvm.experimental.constrained.tan.f32(float %x, metadata !"round.tonearest", metadata !"fpexcept.strict") #0
   ret float %val
 }
 
 define float @acos_f32(float %x, float %y) #0 {
 ; CHECK-LABEL: acos_f32:
-; CHECK-R2: jal acosf
-; CHECK-R6: balc acosf
+; CHECK: jal acosf
   %val = call float @llvm.experimental.constrained.acos.f32(float %x, metadata !"round.tonearest", metadata !"fpexcept.strict") #0
   ret float %val
 }
 
 define float @asin_f32(float %x, float %y) #0 {
 ; CHECK-LABEL: asin_f32:
-; CHECK-R2: jal asinf
-; CHECK-R6: balc asinf
+; CHECK: jal asinf
   %val = call float @llvm.experimental.constrained.asin.f32(float %x, metadata !"round.tonearest", metadata !"fpexcept.strict") #0
   ret float %val
 }
 
 define float @atan_f32(float %x, float %y) #0 {
 ; CHECK-LABEL: atan_f32:
-; CHECK-R2: jal atanf
-; CHECK-R6: balc atanf
+; CHECK: jal atanf
   %val = call float @llvm.experimental.constrained.atan.f32(float %x, metadata !"round.tonearest", metadata !"fpexcept.strict") #0
   ret float %val
 }
 
 define float @cosh_f32(float %x, float %y) #0 {
 ; CHECK-LABEL: cosh_f32:
-; CHECK-R2: jal coshf
-; CHECK-R6: balc coshf
+; CHECK: jal coshf
   %val = call float @llvm.experimental.constrained.cosh.f32(float %x, metadata !"round.tonearest", metadata !"fpexcept.strict") #0
   ret float %val
 }
 
 define float @sinh_f32(float %x, float %y) #0 {
 ; CHECK-LABEL: sinh_f32:
-; CHECK-R2: jal sinhf
-; CHECK-R6: balc sinhf
+; CHECK: jal sinhf
   %val = call float @llvm.experimental.constrained.sinh.f32(float %x, metadata !"round.tonearest", metadata !"fpexcept.strict") #0
   ret float %val
 }
 
 define float @tanh_f32(float %x, float %y) #0 {
 ; CHECK-LABEL: tanh_f32:
-; CHECK-R2: jal tanhf
-; CHECK-R6: balc tanhf
+; CHECK: jal tanhf
   %val = call float @llvm.experimental.constrained.tanh.f32(float %x, metadata !"round.tonearest", metadata !"fpexcept.strict") #0
   ret float %val
 }
@@ -162,16 +150,14 @@ define float @fmuladd_f32(float %x, float %y, float %z) #0 {
 
 define float @ldexp_f32(float %x, i32 %y) #0 {
 ; CHECK-LABEL: ldexp_f32:
-; CHECK-R2: jal ldexpf
-; CHECK-R6: balc ldexpf
+; CHECK: jal ldexpf
   %val = call float @llvm.experimental.constrained.ldexp.f32.i32(float %x, i32 %y, metadata !"round.tonearest", metadata !"fpexcept.strict") #0
   ret float %val
 }
 
 define float @roundeven_f32(float %x) #0 {
 ; CHECK-LABEL: roundeven_f32:
-; CHECK-R2: jal roundevenf
-; CHECK-R6: balc roundevenf
+; CHECK: jal roundevenf
   %val = call float @llvm.experimental.constrained.roundeven.f32(float %x, metadata !"fpexcept.strict") #0
   ret float %val
 }
@@ -190,40 +176,35 @@ define float @uitofp_f32_i32(i32 %x) #0 {
 
 define float @atan2_f32(float %x, float %y) #0 {
 ; CHECK-LABEL: atan2_f32:
-; CHECK-R2: jal atan2f
-; CHECK-R6: balc atan2f
+; CHECK: jal atan2f
   %val = call float @llvm.experimental.constrained.atan2.f32(float %x, float %y, metadata !"round.tonearest", metadata !"fpexcept.strict") #0
   ret float %val
 }
 
 define float @pow_f32(float %x, float %y) #0 {
 ; CHECK-LABEL: pow_f32:
-; CHECK-R2: jal powf
-; CHECK-R6: balc powf
+; CHECK: jal powf
   %val = call float @llvm.experimental.constrained.pow.f32(float %x, float %y, metadata !"round.tonearest", metadata !"fpexcept.strict") #0
   ret float %val
 }
 
 define float @log_f32(float %x) #0 {
 ; CHECK-LABEL: log_f32:
-; CHECK-R2: jal logf
-; CHECK-R6: balc logf
+; CHECK: jal logf
   %val = call float @llvm.experimental.constrained.log.f32(float %x, metadata !"round.tonearest", metadata !"fpexcept.strict") #0
   ret float %val
 }
 
 define float @log10_f32(float %x) #0 {
 ; CHECK-LABEL: log10_f32:
-; CHECK-R2: jal log10f
-; CHECK-R6: balc log10f
+; CHECK: jal log10f
   %val = call float @llvm.experimental.constrained.log10.f32(float %x, metadata !"round.tonearest", metadata !"fpexcept.strict") #0
   ret float %val
 }
 
 define float @log2_f32(float %x) #0 {
 ; CHECK-LABEL: log2_f32:
-; CHECK-R2: jal log2f
-; CHECK-R6: balc log2f
+; CHECK: jal log2f
   %val = call float @llvm.experimental.constrained.log2.f32(float %x, metadata !"round.tonearest", metadata !"fpexcept.strict") #0
   ret float %val
 }
@@ -237,8 +218,7 @@ define float @exp_f32(float %x) #0 {
 
 define float @exp2_f32(float %x) #0 {
 ; CHECK-LABEL: exp2_f32:
-; CHECK-R2: jal exp2f
-; CHECK-R6: balc exp2f
+; CHECK: jal exp2f
   %val = call float @llvm.experimental.constrained.exp2.f32(float %x, metadata !"round.tonearest", metadata !"fpexcept.strict") #0
   ret float %val
 }
@@ -253,24 +233,21 @@ define float @rint_f32(float %x) #0 {
 
 define float @nearbyint_f32(float %x) #0 {
 ; CHECK-LABEL: nearbyint_f32:
-; CHECK-R2: jal nearbyintf
-; CHECK-R6: balc nearbyintf
+; CHECK: jal nearbyintf
   %val = call float @llvm.experimental.constrained.nearbyint.f32(float %x, metadata !"round.tonearest", metadata !"fpexcept.strict") #0
   ret float %val
 }
 
 define i32 @lrint_f32(float %x) #0 {
 ; CHECK-LABEL: lrint_f32:
-; CHECK-R2: jal lrintf
-; CHECK-R6: balc lrintf
+; CHECK: jal lrintf
   %val = call i32 @llvm.experimental.constrained.lrint.i32.f32(float %x, metadata !"round.tonearest", metadata !"fpexcept.strict") #0
   ret i32 %val
 }
 
 define i32 @llrint_f32(float %x) #0 {
 ; CHECK-LABEL: llrint_f32:
-; CHECK-R2: jal llrintf
-; CHECK-R6: balc llrintf
+; CHECK: jal llrintf
   %val = call i32 @llvm.experimental.constrained.llrint.i32.f32(float %x, metadata !"round.tonearest", metadata !"fpexcept.strict") #0
   ret i32 %val
 }
@@ -293,48 +270,42 @@ define float @minnum_f32(float %x, float %y) #0 {
 
 define float @ceil_f32(float %x) #0 {
 ; CHECK-LABEL: ceil_f32:
-; CHECK-R2: jal ceilf
-; CHECK-R6: balc ceilf
+; CHECK: jal ceilf
   %val = call float @llvm.experimental.constrained.ceil.f32(float %x, metadata !"fpexcept.strict") #0
   ret float %val
 }
 
 define float @floor_f32(float %x) #0 {
 ; CHECK-LABEL: floor_f32:
-; CHECK-R2: jal floorf
-; CHECK-R6: balc floorf
+; CHECK: jal floorf
   %val = call float @llvm.experimental.constrained.floor.f32(float %x, metadata !"fpexcept.strict") #0
   ret float %val
 }
 
 define i32 @lround_f32(float %x) #0 {
 ; CHECK-LABEL: lround_f32:
-; CHECK-R2: jal lroundf
-; CHECK-R6: balc lroundf
+; CHECK: jal lroundf
   %val = call i32 @llvm.experimental.constrained.lround.i32.f32(float %x, metadata !"fpexcept.strict") #0
   ret i32 %val
 }
 
 define i32 @llround_f32(float %x) #0 {
 ; CHECK-LABEL: llround_f32:
-; CHECK-R2: jal llroundf
-; CHECK-R6: balc llroundf
+; CHECK: jal llroundf
   %val = call i32 @llvm.experimental.constrained.llround.i32.f32(float %x, metadata !"fpexcept.strict") #0
   ret i32 %val
 }
 
 define float @round_f32(float %x) #0 {
 ; CHECK-LABEL: round_f32:
-; CHECK-R2: jal roundf
-; CHECK-R6: balc roundf
+; CHECK: jal roundf
   %val = call float @llvm.experimental.constrained.round.f32(float %x, metadata !"fpexcept.strict") #0
   ret float %val
 }
 
 define float @trunc_f32(float %x) #0 {
 ; CHECK-LABEL: trunc_f32:
-; CHECK-R2: jal truncf
-; CHECK-R6: balc truncf
+; CHECK: jal truncf
   %val = call float @llvm.experimental.constrained.trunc.f32(float %x, metadata !"fpexcept.strict") #0
   ret float %val
 }
@@ -371,16 +342,14 @@ define double @div_f64(double %x, double %y) #0 {
 
 define double @frem_f64(double %x, double %y) #0 {
 ; CHECK-LABEL: frem_f64:
-; CHECK-R2: jal fmod
-; CHECK-R6: balc fmod
+; CHECK: jal fmod
   %val = call double @llvm.experimental.constrained.frem.f64(double %x, double %y, metadata !"round.tonearest", metadata !"fpexcept.strict") #0
   ret double %val
 }
 
 define double @fma_f64(double %x, double %y, double %z) #0 {
 ; CHECK-LABEL: fma_f64:
-; CHECK-R2: jal fma
-; CHECK-R6: balc fma
+; CHECK: jal fma
   %val = call double @llvm.experimental.constrained.fma.f64(double %x, double %y, double %z, metadata !"round.tonearest", metadata !"fpexcept.strict") #0
   ret double %val
 }
@@ -409,80 +378,70 @@ define double @sqrt_f64(double %x) #0 {
 
 define double @powi_f64(double %x, i32 %y) #0 {
 ; CHECK-LABEL: powi_f64:
-; CHECK-R2: jal __powidf2
-; CHECK-R6: balc __powidf2
+; CHECK: jal __powidf2
   %val = call double @llvm.experimental.constrained.powi.f64(double %x, i32 %y, metadata !"round.tonearest", metadata !"fpexcept.strict") #0
   ret double %val
 }
 
 define double @sin_f64(double %x) #0 {
 ; CHECK-LABEL: sin_f64:
-; CHECK-R2: jal sin
-; CHECK-R6: balc sin
+; CHECK: jal sin
   %val = call double @llvm.experimental.constrained.sin.f64(double %x, metadata !"round.tonearest", metadata !"fpexcept.strict") #0
   ret double %val
 }
 
 define double @cos_f64(double %x) #0 {
 ; CHECK-LABEL: cos_f64:
-; CHECK-R2: jal cos
-; CHECK-R6: balc cos
+; CHECK: jal cos
   %val = call double @llvm.experimental.constrained.cos.f64(double %x, metadata !"round.tonearest", metadata !"fpexcept.strict") #0
   ret double %val
 }
 
 define double @tan_f64(double %x) #0 {
 ; CHECK-LABEL: tan_f64:
-; CHECK-R2: jal tan
-; CHECK-R6: balc tan
+; CHECK: jal tan
   %val = call double @llvm.experimental.constrained.tan.f64(double %x, metadata !"round.tonearest", metadata !"fpexcept.strict") #0
   ret double %val
 }
 
 define double @acos_f64(double %x, double %y) #0 {
 ; CHECK-LABEL: acos_f64:
-; CHECK-R2: jal acos
-; CHECK-R6: balc acos
+; CHECK: jal acos
   %val = call double @llvm.experimental.constrained.acos.f64(double %x, metadata !"round.tonearest", metadata !"fpexcept.strict") #0
   ret double %val
 }
 
 define double @asin_f64(double %x, double %y) #0 {
 ; CHECK-LABEL: asin_f64:
-; CHECK-R2: jal asin
-; CHECK-R6: balc asin
+; CHECK: jal asin
   %val = call double @llvm.experimental.constrained.asin.f64(double %x, metadata !"round.tonearest", metadata !"fpexcept.strict") #0
   ret double %val
 }
 
 define double @atan_f64(double %x, double %y) #0 {
 ; CHECK-LABEL: atan_f64:
-; CHECK-R2: jal atan
-; CHECK-R6: balc atan
+; CHECK: jal atan
   %val = call double @llvm.experimental.constrained.atan.f64(double %x, metadata !"round.tonearest", metadata !"fpexcept.strict") #0
   ret double %val
 }
 
 define double @cosh_f64(double %x, double %y) #0 {
 ; CHECK-LABEL: cosh_f64:
-; CHECK-R2: jal cosh
-; CHECK-R6: balc cosh
+; CHECK: jal cosh
   %val = call double @llvm.experimental.constrained.cosh.f64(double %x, metadata !"round.tonearest", metadata !"fpexcept.strict") #0
   ret double %val
 }
 
 define double @sinh_f64(double %x, double %y) #0 {
 ; CHECK-LABEL: sinh_f64:
-; CHECK-R2: jal sinh
-; CHECK-R6: balc sinh
+; CHECK: jal sinh
   %val = call double @llvm.experimental.constrained.sinh.f64(double %x, metadata !"round.tonearest", metadata !"fpexcept.strict") #0
   ret double %val
 }
 
 define double @tanh_f64(double %x, double %y) #0 {
 ; CHECK-LABEL: tanh_f64:
-; CHECK-R2: jal tanh
-; CHECK-R6: balc tanh
+; CHECK: jal tanh
   %val = call double @llvm.experimental.constrained.tanh.f64(double %x, metadata !"round.tonearest", metadata !"fpexcept.strict") #0
   ret double %val
 }
@@ -498,16 +457,14 @@ define double @fmuladd_f64(double %x, double %y, double %z) #0 {
 
 define double @ldexp_f64(double %x, i32 %y) #0 {
 ; CHECK-LABEL: ldexp_f64:
-; CHECK-R2: jal ldexp
-; CHECK-R6: balc ldexp
+; CHECK: jal ldexp
   %val = call double @llvm.experimental.constrained.ldexp.f64.i32(double %x, i32 %y, metadata !"round.tonearest", metadata !"fpexcept.strict") #0
   ret double %val
 }
 
 define double @roundeven_f64(double %x) #0 {
 ; CHECK-LABEL: roundeven_f64:
-; CHECK-R2: jal roundeven
-; CHECK-R6: balc roundeven
+; CHECK: jal roundeven
   %val = call double @llvm.experimental.constrained.roundeven.f64(double %x, metadata !"fpexcept.strict") #0
   ret double %val
 }
@@ -525,56 +482,49 @@ define double @uitofp_f64_i32(i32 %x) #0 {
 
 define double @atan2_f64(double %x, double %y) #0 {
 ; CHECK-LABEL: atan2_f64:
-; CHECK-R2: jal atan2
-; CHECK-R6: balc atan2
+; CHECK: jal atan2
   %val = call double @llvm.experimental.constrained.atan2.f64(double %x, double %y, metadata !"round.tonearest", metadata !"fpexcept.strict") #0
   ret double %val
 }
 
 define double @pow_f64(double %x, double %y) #0 {
 ; CHECK-LABEL: pow_f64:
-; CHECK-R2: jal pow
-; CHECK-R6: balc pow
+; CHECK: jal pow
   %val = call double @llvm.experimental.constrained.pow.f64(double %x, double %y, metadata !"round.tonearest", metadata !"fpexcept.strict") #0
   ret double %val
 }
 
 define double @log_f64(double %x) #0 {
 ; CHECK-LABEL: log_f64:
-; CHECK-R2: jal log
-; CHECK-R6: balc log
+; CHECK: jal log
   %val = call double @llvm.experimental.constrained.log.f64(double %x, metadata !"round.tonearest", metadata !"fpexcept.strict") #0
   ret double %val
 }
 
 define double @log10_f64(double %x) #0 {
 ; CHECK-LABEL: log10_f64:
-; CHECK-R2: jal log10
-; CHECK-R6: balc log10
+; CHECK: jal log10
   %val = call double @llvm.experimental.constrained.log10.f64(double %x, metadata !"round.tonearest", metadata !"fpexcept.strict") #0
   ret double %val
 }
 
 define double @log2_f64(double %x) #0 {
 ; CHECK-LABEL: log2_f64:
-; CHECK-R2: jal log2
-; CHECK-R6: balc log2
+; CHECK: jal log2
   %val = call double @llvm.experimental.constrained.log2.f64(double %x, metadata !"round.tonearest", metadata !"fpexcept.strict") #0
   ret double %val
 }
 
 define double @exp_f64(double %x) #0 {
 ; CHECK-LABEL: exp_f64:
-; CHECK-R2: jal exp
-; CHECK-R6: balc exp
+; CHECK: jal exp
   %val = call double @llvm.experimental.constrained.exp.f64(double %x, metadata !"round.tonearest", metadata !"fpexcept.strict") #0
   ret double %val
 }
 
 define double @exp2_f64(double %x) #0 {
 ; CHECK-LABEL: exp2_f64:
-; CHECK-R2: jal exp2
-; CHECK-R6: balc exp2
+; CHECK: jal exp2
   %val = call double @llvm.experimental.constrained.exp2.f64(double %x, metadata !"round.tonearest", metadata !"fpexcept.strict") #0
   ret double %val
 }
@@ -589,24 +539,21 @@ define double @rint_f64(double %x) #0 {
 
 define double @nearbyint_f64(double %x) #0 {
 ; CHECK-LABEL: nearbyint_f64:
-; CHECK-R2: jal nearbyint
-; CHECK-R6: balc nearbyint
+; CHECK: jal nearbyint
   %val = call double @llvm.experimental.constrained.nearbyint.f64(double %x, metadata !"round.tonearest", metadata !"fpexcept.strict") #0
   ret double %val
 }
 
 define i32 @lrint_f64(double %x) #0 {
 ; CHECK-LABEL: lrint_f64:
-; CHECK-R2: jal lrint
-; CHECK-R6: balc lrint
+; CHECK: jal lrint
   %val = call i32 @llvm.experimental.constrained.lrint.i32.f64(double %x, metadata !"round.tonearest", metadata !"fpexcept.strict") #0
   ret i32 %val
 }
 
 define i32 @llrint_f64(double %x) #0 {
 ; CHECK-LABEL: llrint_f64:
-; CHECK-R2: jal llrint
-; CHECK-R6: balc llrint
+; CHECK: jal llrint
   %val = call i32 @llvm.experimental.constrained.llrint.i32.f64(double %x, metadata !"round.tonearest", metadata !"fpexcept.strict") #0
   ret i32 %val
 }
@@ -629,48 +576,42 @@ define double @minnum_f64(double %x, double %y) #0 {
 
 define double @ceil_f64(double %x) #0 {
 ; CHECK-LABEL: ceil_f64:
-; CHECK-R2: jal ceil
-; CHECK-R6: balc ceil
+; CHECK: jal ceil
   %val = call double @llvm.experimental.constrained.ceil.f64(double %x, metadata !"fpexcept.strict") #0
   ret double %val
 }
 
 define double @floor_f64(double %x) #0 {
 ; CHECK-LABEL: floor_f64:
-; CHECK-R2: jal floor
-; CHECK-R6: balc floor
+; CHECK: jal floor
   %val = call double @llvm.experimental.constrained.floor.f64(double %x, metadata !"fpexcept.strict") #0
   ret double %val
 }
 
 define i32 @lround_f64(double %x) #0 {
 ; CHECK-LABEL: lround_f64:
-; CHECK-R2: jal lround
-; CHECK-R6: balc lround
+; CHECK: jal lround
   %val = call i32 @llvm.experimental.constrained.lround.i32.f64(double %x, metadata !"fpexcept.strict") #0
   ret i32 %val
 }
 
 define i32 @llround_f64(double %x) #0 {
 ; CHECK-LABEL: llround_f64:
-; CHECK-R2: jal llround
-; CHECK-R6: balc llround
+; CHECK: jal llround
   %val = call i32 @llvm.experimental.constrained.llround.i32.f64(double %x, metadata !"fpexcept.strict") #0
   ret i32 %val
 }
 
 define double @round_f64(double %x) #0 {
 ; CHECK-LABEL: round_f64:
-; CHECK-R2: jal round
-; CHECK-R6: balc round
+; CHECK: jal round
   %val = call double @llvm.experimental.constrained.round.f64(double %x, metadata !"fpexcept.strict") #0
   ret double %val
 }
 
 define double @trunc_f64(double %x) #0 {
 ; CHECK-LABEL: trunc_f64:
-; CHECK-R2: jal trunc
-; CHECK-R6: balc trunc
+; CHECK: jal trunc
   %val = call double @llvm.experimental.constrained.trunc.f64(double %x, metadata !"fpexcept.strict") #0
   ret double %val
 }

diff  --git a/llvm/test/CodeGen/Mips/msa/remat-ldi.ll b/llvm/test/CodeGen/Mips/msa/remat-ldi.ll
index 8a601a184391fd..313b51ee31f4c1 100644
--- a/llvm/test/CodeGen/Mips/msa/remat-ldi.ll
+++ b/llvm/test/CodeGen/Mips/msa/remat-ldi.ll
@@ -16,7 +16,8 @@ define dso_local void @test_ldi_b() {
 ; CHECK-NEXT:    ldi.b $w0, 1
 ; CHECK-NEXT:    #APP
 ; CHECK-NEXT:    #NO_APP
-; CHECK-NEXT:    balc foo
+; CHECK-NEXT:    jal foo
+; CHECK-NEXT:    nop
 ; CHECK-NEXT:    ldi.b $w0, 1
 ; CHECK-NEXT:    #APP
 ; CHECK-NEXT:    #NO_APP
@@ -40,7 +41,8 @@ define dso_local void @test_ldi_h() {
 ; CHECK-NEXT:    ldi.h $w0, 2
 ; CHECK-NEXT:    #APP
 ; CHECK-NEXT:    #NO_APP
-; CHECK-NEXT:    balc foo
+; CHECK-NEXT:    jal foo
+; CHECK-NEXT:    nop
 ; CHECK-NEXT:    ldi.h $w0, 2
 ; CHECK-NEXT:    #APP
 ; CHECK-NEXT:    #NO_APP
@@ -64,7 +66,8 @@ define dso_local void @test_ldi_w() {
 ; CHECK-NEXT:    ldi.w $w0, 3
 ; CHECK-NEXT:    #APP
 ; CHECK-NEXT:    #NO_APP
-; CHECK-NEXT:    balc foo
+; CHECK-NEXT:    jal foo
+; CHECK-NEXT:    nop
 ; CHECK-NEXT:    ldi.w $w0, 3
 ; CHECK-NEXT:    #APP
 ; CHECK-NEXT:    #NO_APP
@@ -88,7 +91,8 @@ define dso_local void @test_ldi_d() {
 ; CHECK-NEXT:    ldi.d $w0, 4
 ; CHECK-NEXT:    #APP
 ; CHECK-NEXT:    #NO_APP
-; CHECK-NEXT:    balc foo
+; CHECK-NEXT:    jal foo
+; CHECK-NEXT:    nop
 ; CHECK-NEXT:    ldi.d $w0, 4
 ; CHECK-NEXT:    #APP
 ; CHECK-NEXT:    #NO_APP

diff  --git a/llvm/test/CodeGen/Mips/rint-r6-features.ll b/llvm/test/CodeGen/Mips/rint-r6-features.ll
index 0aa7db83e0f6ab..09a345a69da713 100644
--- a/llvm/test/CodeGen/Mips/rint-r6-features.ll
+++ b/llvm/test/CodeGen/Mips/rint-r6-features.ll
@@ -7,7 +7,7 @@
 ; but double precision must still use a libcall, including for strict rint.
 define float @rint_f32(float %x) {
 ; SOFT-LABEL: rint_f32:
-; SOFT:       balc rintf
+; SOFT:       jal rintf
 ; SINGLE-LABEL: rint_f32:
 ; SINGLE:       rint.s
 ; SINGLE32-LABEL: name: rint_f32
@@ -18,18 +18,18 @@ define float @rint_f32(float %x) {
 
 define double @rint_f64(double %x) {
 ; SOFT-LABEL: rint_f64:
-; SOFT:       balc rint{{$}}
+; SOFT:       jal rint{{$}}
 ; SINGLE-LABEL: rint_f64:
-; SINGLE:       balc rint{{$}}
+; SINGLE:       jal rint{{$}}
 ; SINGLE32-LABEL: name: rint_f64
-; SINGLE32:       JAL_R6 &rint,
+; SINGLE32:       JAL &rint,
   %r = call double @llvm.rint.f64(double %x)
   ret double %r
 }
 
 define float @strict_rint_f32(float %x) strictfp {
 ; SOFT-LABEL: strict_rint_f32:
-; SOFT:       balc rintf
+; SOFT:       jal rintf
 ; SINGLE-LABEL: strict_rint_f32:
 ; SINGLE:       rint.s
 ; SINGLE32-LABEL: name: strict_rint_f32
@@ -40,11 +40,11 @@ define float @strict_rint_f32(float %x) strictfp {
 
 define double @strict_rint_f64(double %x) strictfp {
 ; SOFT-LABEL: strict_rint_f64:
-; SOFT:       balc rint{{$}}
+; SOFT:       jal rint{{$}}
 ; SINGLE-LABEL: strict_rint_f64:
-; SINGLE:       balc rint{{$}}
+; SINGLE:       jal rint{{$}}
 ; SINGLE32-LABEL: name: strict_rint_f64
-; SINGLE32:       JAL_R6 &rint,
+; SINGLE32:       JAL &rint,
   %r = call double @llvm.experimental.constrained.rint.f64(double %x, metadata !"round.dynamic", metadata !"fpexcept.strict") strictfp
   ret double %r
 }

diff  --git a/llvm/test/CodeGen/Mips/rint-r6.ll b/llvm/test/CodeGen/Mips/rint-r6.ll
index 6032ff5d0d9ab0..ff880efe15d16a 100644
--- a/llvm/test/CodeGen/Mips/rint-r6.ll
+++ b/llvm/test/CodeGen/Mips/rint-r6.ll
@@ -86,7 +86,8 @@ define float @nearbyint_f32(float %x) {
 ; R6-O32-NEXT:    .cfi_def_cfa_offset 24
 ; R6-O32-NEXT:    sw $ra, 20($sp) # 4-byte Folded Spill
 ; R6-O32-NEXT:    .cfi_offset 31, -4
-; R6-O32-NEXT:    balc nearbyintf
+; R6-O32-NEXT:    jal nearbyintf
+; R6-O32-NEXT:    nop
 ; R6-O32-NEXT:    lw $ra, 20($sp) # 4-byte Folded Reload
 ; R6-O32-NEXT:    jr $ra
 ; R6-O32-NEXT:    addiu $sp, $sp, 24
@@ -97,7 +98,8 @@ define float @nearbyint_f32(float %x) {
 ; R6-N64-NEXT:    .cfi_def_cfa_offset 16
 ; R6-N64-NEXT:    sd $ra, 8($sp) # 8-byte Folded Spill
 ; R6-N64-NEXT:    .cfi_offset 31, -8
-; R6-N64-NEXT:    balc nearbyintf
+; R6-N64-NEXT:    jal nearbyintf
+; R6-N64-NEXT:    nop
 ; R6-N64-NEXT:    ld $ra, 8($sp) # 8-byte Folded Reload
 ; R6-N64-NEXT:    jr $ra
 ; R6-N64-NEXT:    daddiu $sp, $sp, 16
@@ -135,7 +137,8 @@ define double @nearbyint_f64(double %x) {
 ; R6-O32-NEXT:    .cfi_def_cfa_offset 24
 ; R6-O32-NEXT:    sw $ra, 20($sp) # 4-byte Folded Spill
 ; R6-O32-NEXT:    .cfi_offset 31, -4
-; R6-O32-NEXT:    balc nearbyint
+; R6-O32-NEXT:    jal nearbyint
+; R6-O32-NEXT:    nop
 ; R6-O32-NEXT:    lw $ra, 20($sp) # 4-byte Folded Reload
 ; R6-O32-NEXT:    jr $ra
 ; R6-O32-NEXT:    addiu $sp, $sp, 24
@@ -146,7 +149,8 @@ define double @nearbyint_f64(double %x) {
 ; R6-N64-NEXT:    .cfi_def_cfa_offset 16
 ; R6-N64-NEXT:    sd $ra, 8($sp) # 8-byte Folded Spill
 ; R6-N64-NEXT:    .cfi_offset 31, -8
-; R6-N64-NEXT:    balc nearbyint
+; R6-N64-NEXT:    jal nearbyint
+; R6-N64-NEXT:    nop
 ; R6-N64-NEXT:    ld $ra, 8($sp) # 8-byte Folded Reload
 ; R6-N64-NEXT:    jr $ra
 ; R6-N64-NEXT:    daddiu $sp, $sp, 16

diff  --git a/llvm/test/CodeGen/Mips/tailcall/tailcall-wrong-isa.ll b/llvm/test/CodeGen/Mips/tailcall/tailcall-wrong-isa.ll
index ca15ebbe22be6e..a578b8a4c30f31 100644
--- a/llvm/test/CodeGen/Mips/tailcall/tailcall-wrong-isa.ll
+++ b/llvm/test/CodeGen/Mips/tailcall/tailcall-wrong-isa.ll
@@ -47,7 +47,7 @@ define i8 @f1(i8 signext %i) nounwind {
 ; STATIC32MM: {{[0-9a-z]}}: 00 d4 00 00 j 0
 
 ; PIC32R6:    {{[0-9a-z]}}: 00 00 19 d8  jrc $25
-; STATIC32R6: {{[0-9a-z]}}: fd ff ff cb  bc 0
+; STATIC32R6: {{[0-9a-z]}}: 00 00 00 08  j 0
 
 ; PIC64R6:    {{[0-9a-z]+}}: 00 00 19 d8  jrc $25
-; STATIC64R6: {{[0-9]}}: fd ff ff cb bc 0
+; STATIC64R6: {{[0-9]}}: 00 00 00 08  j 0

diff  --git a/llvm/test/CodeGen/Mips/word-normalization.ll b/llvm/test/CodeGen/Mips/word-normalization.ll
index 381a100490a38e..7b768c81b75b57 100644
--- a/llvm/test/CodeGen/Mips/word-normalization.ll
+++ b/llvm/test/CodeGen/Mips/word-normalization.ll
@@ -711,8 +711,8 @@ define i64 @zext_call(i64 %x) {
 ; R6-N64-NEXT:    .cfi_def_cfa_offset 16
 ; R6-N64-NEXT:    sd $ra, 8($sp) # 8-byte Folded Spill
 ; R6-N64-NEXT:    .cfi_offset 31, -8
+; R6-N64-NEXT:    jal zeroext_argument
 ; R6-N64-NEXT:    dext $4, $4, 0, 32
-; R6-N64-NEXT:    balc zeroext_argument
 ; R6-N64-NEXT:    ld $ra, 8($sp) # 8-byte Folded Reload
 ; R6-N64-NEXT:    jr $ra
 ; R6-N64-NEXT:    daddiu $sp, $sp, 16
@@ -723,8 +723,8 @@ define i64 @zext_call(i64 %x) {
 ; R6-N32-NEXT:    .cfi_def_cfa_offset 16
 ; R6-N32-NEXT:    sd $ra, 8($sp) # 8-byte Folded Spill
 ; R6-N32-NEXT:    .cfi_offset 31, -8
+; R6-N32-NEXT:    jal zeroext_argument
 ; R6-N32-NEXT:    dext $4, $4, 0, 32
-; R6-N32-NEXT:    balc zeroext_argument
 ; R6-N32-NEXT:    ld $ra, 8($sp) # 8-byte Folded Reload
 ; R6-N32-NEXT:    jr $ra
 ; R6-N32-NEXT:    addiu $sp, $sp, 16
@@ -939,8 +939,8 @@ define i64 @zeroext_clear_call(i64 %x) {
 ; R6-N64-NEXT:    .cfi_def_cfa_offset 16
 ; R6-N64-NEXT:    sd $ra, 8($sp) # 8-byte Folded Spill
 ; R6-N64-NEXT:    .cfi_offset 31, -8
+; R6-N64-NEXT:    jal zeroext_clear
 ; R6-N64-NEXT:    dext $4, $4, 0, 32
-; R6-N64-NEXT:    balc zeroext_clear
 ; R6-N64-NEXT:    ld $ra, 8($sp) # 8-byte Folded Reload
 ; R6-N64-NEXT:    jr $ra
 ; R6-N64-NEXT:    daddiu $sp, $sp, 16
@@ -951,8 +951,8 @@ define i64 @zeroext_clear_call(i64 %x) {
 ; R6-N32-NEXT:    .cfi_def_cfa_offset 16
 ; R6-N32-NEXT:    sd $ra, 8($sp) # 8-byte Folded Spill
 ; R6-N32-NEXT:    .cfi_offset 31, -8
+; R6-N32-NEXT:    jal zeroext_clear
 ; R6-N32-NEXT:    dext $4, $4, 0, 32
-; R6-N32-NEXT:    balc zeroext_clear
 ; R6-N32-NEXT:    ld $ra, 8($sp) # 8-byte Folded Reload
 ; R6-N32-NEXT:    jr $ra
 ; R6-N32-NEXT:    addiu $sp, $sp, 16
@@ -1022,8 +1022,8 @@ define i64 @zeroext_or_call(i64 %x) {
 ; R6-N64-NEXT:    .cfi_def_cfa_offset 16
 ; R6-N64-NEXT:    sd $ra, 8($sp) # 8-byte Folded Spill
 ; R6-N64-NEXT:    .cfi_offset 31, -8
+; R6-N64-NEXT:    jal zeroext_or
 ; R6-N64-NEXT:    dext $4, $4, 0, 32
-; R6-N64-NEXT:    balc zeroext_or
 ; R6-N64-NEXT:    ld $ra, 8($sp) # 8-byte Folded Reload
 ; R6-N64-NEXT:    jr $ra
 ; R6-N64-NEXT:    daddiu $sp, $sp, 16
@@ -1034,8 +1034,8 @@ define i64 @zeroext_or_call(i64 %x) {
 ; R6-N32-NEXT:    .cfi_def_cfa_offset 16
 ; R6-N32-NEXT:    sd $ra, 8($sp) # 8-byte Folded Spill
 ; R6-N32-NEXT:    .cfi_offset 31, -8
+; R6-N32-NEXT:    jal zeroext_or
 ; R6-N32-NEXT:    dext $4, $4, 0, 32
-; R6-N32-NEXT:    balc zeroext_or
 ; R6-N32-NEXT:    ld $ra, 8($sp) # 8-byte Folded Reload
 ; R6-N32-NEXT:    jr $ra
 ; R6-N32-NEXT:    addiu $sp, $sp, 16

diff  --git a/llvm/test/MC/Mips/mips32r6/valid.s b/llvm/test/MC/Mips/mips32r6/valid.s
index 7fa9f1469d54b4..cabd35aaf01017 100644
--- a/llvm/test/MC/Mips/mips32r6/valid.s
+++ b/llvm/test/MC/Mips/mips32r6/valid.s
@@ -192,6 +192,7 @@ a:
         j       a                # CHECK: j a                    # encoding: [0b000010AA,A,A,A]
                                  # CHECK:                        #   fixup A - offset: 0, value: a, kind: fixup_Mips_26
         j       1328             # CHECK: j 1328                 # encoding: [0x08,0x00,0x01,0x4c]
+        jal       21100                # CHECK: jal 21100     # encoding: [0x0c,0x00,0x14,0x9b]
         jr.hb   $4               # CHECK: jr.hb $4               # encoding: [0x00,0x80,0x04,0x09]
         jr      $ra              # CHECK: jr $ra                 # encoding: [0x03,0xe0,0x00,0x09]
         jr      $25              # CHECK: jr $25                 # encoding: [0x03,0x20,0x00,0x09]

diff  --git a/llvm/test/MC/Mips/mips64r6/valid.s b/llvm/test/MC/Mips/mips64r6/valid.s
index 3515987b67fc29..ebf2984ddf4d22 100644
--- a/llvm/test/MC/Mips/mips64r6/valid.s
+++ b/llvm/test/MC/Mips/mips64r6/valid.s
@@ -160,6 +160,7 @@ a:
         j       a                # CHECK: j a                    # encoding: [0b000010AA,A,A,A]
                                  # CHECK:                        #   fixup A - offset: 0, value: a, kind: fixup_Mips_26
         j       1328             # CHECK: j 1328                 # encoding: [0x08,0x00,0x01,0x4c]
+        jal     21100            # CHECK: jal 21100              # encoding: [0x0c,0x00,0x14,0x9b]
         jr.hb   $4               # CHECK: jr.hb $4               # encoding: [0x00,0x80,0x04,0x09]
         jr      $ra              # CHECK: jr $ra                 # encoding: [0x03,0xe0,0x00,0x09]
         jr      $25              # CHECK: jr $25                 # encoding: [0x03,0x20,0x00,0x09]        


        


More information about the llvm-branch-commits mailing list