Revert "[RISCV] Avoid Splitting MBB in RISCVExpandPseudo"
This reverts commit 97106f9d80f6ba1bf5eafbd5a6f88d72913ec5a1.
This is based on feedback from https://reviews.llvm.org/D82988#2147105
diff --git a/llvm/test/CodeGen/RISCV/tls-models.ll b/llvm/test/CodeGen/RISCV/tls-models.ll
index 27f63ff..25a2f71 100644
--- a/llvm/test/CodeGen/RISCV/tls-models.ll
+++ b/llvm/test/CodeGen/RISCV/tls-models.ll
@@ -23,9 +23,10 @@
; RV32-PIC: # %bb.0: # %entry
; RV32-PIC-NEXT: addi sp, sp, -16
; RV32-PIC-NEXT: sw ra, 12(sp)
-; RV32-PIC-NEXT: .Ltmp0:
+; RV32-PIC-NEXT: .LBB0_1: # %entry
+; RV32-PIC-NEXT: # Label of block must be emitted
; RV32-PIC-NEXT: auipc a0, %tls_gd_pcrel_hi(unspecified)
-; RV32-PIC-NEXT: addi a0, a0, %pcrel_lo(.Ltmp0)
+; RV32-PIC-NEXT: addi a0, a0, %pcrel_lo(.LBB0_1)
; RV32-PIC-NEXT: call __tls_get_addr@plt
; RV32-PIC-NEXT: lw ra, 12(sp)
; RV32-PIC-NEXT: addi sp, sp, 16
@@ -35,9 +36,10 @@
; RV64-PIC: # %bb.0: # %entry
; RV64-PIC-NEXT: addi sp, sp, -16
; RV64-PIC-NEXT: sd ra, 8(sp)
-; RV64-PIC-NEXT: .Ltmp0:
+; RV64-PIC-NEXT: .LBB0_1: # %entry
+; RV64-PIC-NEXT: # Label of block must be emitted
; RV64-PIC-NEXT: auipc a0, %tls_gd_pcrel_hi(unspecified)
-; RV64-PIC-NEXT: addi a0, a0, %pcrel_lo(.Ltmp0)
+; RV64-PIC-NEXT: addi a0, a0, %pcrel_lo(.LBB0_1)
; RV64-PIC-NEXT: call __tls_get_addr@plt
; RV64-PIC-NEXT: ld ra, 8(sp)
; RV64-PIC-NEXT: addi sp, sp, 16
@@ -45,17 +47,19 @@
;
; RV32-NOPIC-LABEL: f1:
; RV32-NOPIC: # %bb.0: # %entry
-; RV32-NOPIC-NEXT: .Ltmp0:
+; RV32-NOPIC-NEXT: .LBB0_1: # %entry
+; RV32-NOPIC-NEXT: # Label of block must be emitted
; RV32-NOPIC-NEXT: auipc a0, %tls_ie_pcrel_hi(unspecified)
-; RV32-NOPIC-NEXT: lw a0, %pcrel_lo(.Ltmp0)(a0)
+; RV32-NOPIC-NEXT: lw a0, %pcrel_lo(.LBB0_1)(a0)
; RV32-NOPIC-NEXT: add a0, a0, tp
; RV32-NOPIC-NEXT: ret
;
; RV64-NOPIC-LABEL: f1:
; RV64-NOPIC: # %bb.0: # %entry
-; RV64-NOPIC-NEXT: .Ltmp0:
+; RV64-NOPIC-NEXT: .LBB0_1: # %entry
+; RV64-NOPIC-NEXT: # Label of block must be emitted
; RV64-NOPIC-NEXT: auipc a0, %tls_ie_pcrel_hi(unspecified)
-; RV64-NOPIC-NEXT: ld a0, %pcrel_lo(.Ltmp0)(a0)
+; RV64-NOPIC-NEXT: ld a0, %pcrel_lo(.LBB0_1)(a0)
; RV64-NOPIC-NEXT: add a0, a0, tp
; RV64-NOPIC-NEXT: ret
entry:
@@ -70,9 +74,10 @@
; RV32-PIC: # %bb.0: # %entry
; RV32-PIC-NEXT: addi sp, sp, -16
; RV32-PIC-NEXT: sw ra, 12(sp)
-; RV32-PIC-NEXT: .Ltmp1:
+; RV32-PIC-NEXT: .LBB1_1: # %entry
+; RV32-PIC-NEXT: # Label of block must be emitted
; RV32-PIC-NEXT: auipc a0, %tls_gd_pcrel_hi(ld)
-; RV32-PIC-NEXT: addi a0, a0, %pcrel_lo(.Ltmp1)
+; RV32-PIC-NEXT: addi a0, a0, %pcrel_lo(.LBB1_1)
; RV32-PIC-NEXT: call __tls_get_addr@plt
; RV32-PIC-NEXT: lw ra, 12(sp)
; RV32-PIC-NEXT: addi sp, sp, 16
@@ -82,9 +87,10 @@
; RV64-PIC: # %bb.0: # %entry
; RV64-PIC-NEXT: addi sp, sp, -16
; RV64-PIC-NEXT: sd ra, 8(sp)
-; RV64-PIC-NEXT: .Ltmp1:
+; RV64-PIC-NEXT: .LBB1_1: # %entry
+; RV64-PIC-NEXT: # Label of block must be emitted
; RV64-PIC-NEXT: auipc a0, %tls_gd_pcrel_hi(ld)
-; RV64-PIC-NEXT: addi a0, a0, %pcrel_lo(.Ltmp1)
+; RV64-PIC-NEXT: addi a0, a0, %pcrel_lo(.LBB1_1)
; RV64-PIC-NEXT: call __tls_get_addr@plt
; RV64-PIC-NEXT: ld ra, 8(sp)
; RV64-PIC-NEXT: addi sp, sp, 16
@@ -92,17 +98,19 @@
;
; RV32-NOPIC-LABEL: f2:
; RV32-NOPIC: # %bb.0: # %entry
-; RV32-NOPIC-NEXT: .Ltmp1:
+; RV32-NOPIC-NEXT: .LBB1_1: # %entry
+; RV32-NOPIC-NEXT: # Label of block must be emitted
; RV32-NOPIC-NEXT: auipc a0, %tls_ie_pcrel_hi(ld)
-; RV32-NOPIC-NEXT: lw a0, %pcrel_lo(.Ltmp1)(a0)
+; RV32-NOPIC-NEXT: lw a0, %pcrel_lo(.LBB1_1)(a0)
; RV32-NOPIC-NEXT: add a0, a0, tp
; RV32-NOPIC-NEXT: ret
;
; RV64-NOPIC-LABEL: f2:
; RV64-NOPIC: # %bb.0: # %entry
-; RV64-NOPIC-NEXT: .Ltmp1:
+; RV64-NOPIC-NEXT: .LBB1_1: # %entry
+; RV64-NOPIC-NEXT: # Label of block must be emitted
; RV64-NOPIC-NEXT: auipc a0, %tls_ie_pcrel_hi(ld)
-; RV64-NOPIC-NEXT: ld a0, %pcrel_lo(.Ltmp1)(a0)
+; RV64-NOPIC-NEXT: ld a0, %pcrel_lo(.LBB1_1)(a0)
; RV64-NOPIC-NEXT: add a0, a0, tp
; RV64-NOPIC-NEXT: ret
entry:
@@ -115,33 +123,37 @@
define i32* @f3() nounwind {
; RV32-PIC-LABEL: f3:
; RV32-PIC: # %bb.0: # %entry
-; RV32-PIC-NEXT: .Ltmp2:
+; RV32-PIC-NEXT: .LBB2_1: # %entry
+; RV32-PIC-NEXT: # Label of block must be emitted
; RV32-PIC-NEXT: auipc a0, %tls_ie_pcrel_hi(ie)
-; RV32-PIC-NEXT: lw a0, %pcrel_lo(.Ltmp2)(a0)
+; RV32-PIC-NEXT: lw a0, %pcrel_lo(.LBB2_1)(a0)
; RV32-PIC-NEXT: add a0, a0, tp
; RV32-PIC-NEXT: ret
;
; RV64-PIC-LABEL: f3:
; RV64-PIC: # %bb.0: # %entry
-; RV64-PIC-NEXT: .Ltmp2:
+; RV64-PIC-NEXT: .LBB2_1: # %entry
+; RV64-PIC-NEXT: # Label of block must be emitted
; RV64-PIC-NEXT: auipc a0, %tls_ie_pcrel_hi(ie)
-; RV64-PIC-NEXT: ld a0, %pcrel_lo(.Ltmp2)(a0)
+; RV64-PIC-NEXT: ld a0, %pcrel_lo(.LBB2_1)(a0)
; RV64-PIC-NEXT: add a0, a0, tp
; RV64-PIC-NEXT: ret
;
; RV32-NOPIC-LABEL: f3:
; RV32-NOPIC: # %bb.0: # %entry
-; RV32-NOPIC-NEXT: .Ltmp2:
+; RV32-NOPIC-NEXT: .LBB2_1: # %entry
+; RV32-NOPIC-NEXT: # Label of block must be emitted
; RV32-NOPIC-NEXT: auipc a0, %tls_ie_pcrel_hi(ie)
-; RV32-NOPIC-NEXT: lw a0, %pcrel_lo(.Ltmp2)(a0)
+; RV32-NOPIC-NEXT: lw a0, %pcrel_lo(.LBB2_1)(a0)
; RV32-NOPIC-NEXT: add a0, a0, tp
; RV32-NOPIC-NEXT: ret
;
; RV64-NOPIC-LABEL: f3:
; RV64-NOPIC: # %bb.0: # %entry
-; RV64-NOPIC-NEXT: .Ltmp2:
+; RV64-NOPIC-NEXT: .LBB2_1: # %entry
+; RV64-NOPIC-NEXT: # Label of block must be emitted
; RV64-NOPIC-NEXT: auipc a0, %tls_ie_pcrel_hi(ie)
-; RV64-NOPIC-NEXT: ld a0, %pcrel_lo(.Ltmp2)(a0)
+; RV64-NOPIC-NEXT: ld a0, %pcrel_lo(.LBB2_1)(a0)
; RV64-NOPIC-NEXT: add a0, a0, tp
; RV64-NOPIC-NEXT: ret
entry: