[llvm-branch-commits] [llvm-branch] r346735 - Merging r340931:

[Tom Stellard via llvm-branch-commits]

Author: tstellar
Date: Mon Nov 12 21:02:15 2018
New Revision: 346735

URL: http://llvm.org/viewvc/llvm-project?rev=346735&view=rev
Log:
Merging r340931:

------------------------------------------------------------------------
r340931 | atanasyan | 2018-08-29 07:53:55 -0700 (Wed, 29 Aug 2018) | 6 lines

[mips] Involves microMIPS's jump in the analyzable branch set

Involves microMIPS's jump in the analyzable branch set to reduce some
code patterns.

Differential revision: https://reviews.llvm.org/D50613
------------------------------------------------------------------------

Modified:
    llvm/branches/release_70/lib/Target/Mips/MipsSEInstrInfo.cpp
    llvm/branches/release_70/test/CodeGen/Mips/longbranch.ll

Modified: llvm/branches/release_70/lib/Target/Mips/MipsSEInstrInfo.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/release_70/lib/Target/Mips/MipsSEInstrInfo.cpp?rev=346735&r1=346734&r2=346735&view=diff
==============================================================================
--- llvm/branches/release_70/lib/Target/Mips/MipsSEInstrInfo.cpp (original)
+++ llvm/branches/release_70/lib/Target/Mips/MipsSEInstrInfo.cpp Mon Nov 12 21:02:15 2018
@@ -643,7 +643,7 @@ unsigned MipsSEInstrInfo::getAnalyzableB
           Opc == Mips::BNE64  || Opc == Mips::BGTZ64 || Opc == Mips::BGEZ64 ||
           Opc == Mips::BLTZ64 || Opc == Mips::BLEZ64 || Opc == Mips::BC1T   ||
           Opc == Mips::BC1F   || Opc == Mips::B      || Opc == Mips::J      ||
-          Opc == Mips::B_MM   || Opc == Mips::BEQZC_MM ||
+          Opc == Mips::J_MM   || Opc == Mips::B_MM   || Opc == Mips::BEQZC_MM ||
           Opc == Mips::BNEZC_MM || Opc == Mips::BEQC || Opc == Mips::BNEC   ||
           Opc == Mips::BLTC   || Opc == Mips::BGEC   || Opc == Mips::BLTUC  ||
           Opc == Mips::BGEUC  || Opc == Mips::BGTZC  || Opc == Mips::BLEZC  ||

Modified: llvm/branches/release_70/test/CodeGen/Mips/longbranch.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/release_70/test/CodeGen/Mips/longbranch.ll?rev=346735&r1=346734&r2=346735&view=diff
==============================================================================
--- llvm/branches/release_70/test/CodeGen/Mips/longbranch.ll (original)
+++ llvm/branches/release_70/test/CodeGen/Mips/longbranch.ll Mon Nov 12 21:02:15 2018
@@ -231,16 +231,13 @@ define void @test1(i32 signext %s) {
 ; MICROMIPSSTATIC:       # %bb.0: # %entry
 ; MICROMIPSSTATIC-NEXT:    bnezc $4, $BB0_2
 ; MICROMIPSSTATIC-NEXT:  # %bb.1: # %entry
-; MICROMIPSSTATIC-NEXT:    j $BB0_4
-; MICROMIPSSTATIC-NEXT:    nop
-; MICROMIPSSTATIC-NEXT:  $BB0_2: # %entry
 ; MICROMIPSSTATIC-NEXT:    j $BB0_3
 ; MICROMIPSSTATIC-NEXT:    nop
-; MICROMIPSSTATIC-NEXT:  $BB0_3: # %then
+; MICROMIPSSTATIC-NEXT:  $BB0_2: # %then
 ; MICROMIPSSTATIC-NEXT:    lui $1, %hi(x)
 ; MICROMIPSSTATIC-NEXT:    li16 $2, 1
 ; MICROMIPSSTATIC-NEXT:    sw $2, %lo(x)($1)
-; MICROMIPSSTATIC-NEXT:  $BB0_4: # %end
+; MICROMIPSSTATIC-NEXT:  $BB0_3: # %end
 ; MICROMIPSSTATIC-NEXT:    jrc $ra
 ;
 ; MICROMIPSR6STATIC-LABEL: test1: