Skip to content

Commit 2c92335

Browse files
authored
[RISCV] Copy call frame size when splitting basic block in emitSelectPseudo. (#99823)
Fixes #97304.
1 parent b1ca2a9 commit 2c92335

File tree

2 files changed

+56
-0
lines changed

2 files changed

+56
-0
lines changed

llvm/lib/Target/RISCV/RISCVISelLowering.cpp

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18478,6 +18478,11 @@ static MachineBasicBlock *emitSelectPseudo(MachineInstr &MI,
1847818478
F->insert(I, IfFalseMBB);
1847918479
F->insert(I, TailMBB);
1848018480

18481+
// Set the call frame size on entry to the new basic blocks.
18482+
unsigned CallFrameSize = TII.getCallFrameSizeAt(MI);
18483+
IfFalseMBB->setCallFrameSize(CallFrameSize);
18484+
TailMBB->setCallFrameSize(CallFrameSize);
18485+
1848118486
// Transfer debug instructions associated with the selects to TailMBB.
1848218487
for (MachineInstr *DebugInstr : SelectDebugValues) {
1848318488
TailMBB->push_back(DebugInstr->removeFromParent());

llvm/test/CodeGen/RISCV/pr97304.ll

Lines changed: 51 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,51 @@
1+
; NOTE: Assertions have been autogenerated by utils/update_mir_test_checks.py UTC_ARGS: --version 5
2+
; RUN: llc < %s -mtriple=riscv64 -verify-machineinstrs -stop-after=finalize-isel | FileCheck %s
3+
4+
define i32 @_ZNK2cv12LMSolverImpl3runERKNS_17_InputOutputArrayE(i1 %cmp436) {
5+
; CHECK-LABEL: name: _ZNK2cv12LMSolverImpl3runERKNS_17_InputOutputArrayE
6+
; CHECK: bb.0.entry:
7+
; CHECK-NEXT: successors: %bb.1(0x80000000)
8+
; CHECK-NEXT: liveins: $x10
9+
; CHECK-NEXT: {{ $}}
10+
; CHECK-NEXT: [[COPY:%[0-9]+]]:gpr = COPY $x10
11+
; CHECK-NEXT: [[COPY1:%[0-9]+]]:gpr = COPY [[COPY]]
12+
; CHECK-NEXT: {{ $}}
13+
; CHECK-NEXT: bb.1.for.cond:
14+
; CHECK-NEXT: successors: %bb.2(0x40000000), %bb.3(0x40000000)
15+
; CHECK-NEXT: {{ $}}
16+
; CHECK-NEXT: [[ANDI:%[0-9]+]]:gpr = ANDI [[COPY1]], 1
17+
; CHECK-NEXT: ADJCALLSTACKDOWN 8, 0, implicit-def dead $x2, implicit $x2
18+
; CHECK-NEXT: [[COPY2:%[0-9]+]]:gpr = COPY $x2
19+
; CHECK-NEXT: [[COPY3:%[0-9]+]]:gprjalr = COPY $x0
20+
; CHECK-NEXT: SD [[COPY3]], [[COPY2]], 0 :: (store (s64))
21+
; CHECK-NEXT: [[ADDI:%[0-9]+]]:gpr = ADDI $x0, 1
22+
; CHECK-NEXT: [[ADDI1:%[0-9]+]]:gpr = ADDI $x0, 32
23+
; CHECK-NEXT: BNE [[ANDI]], $x0, %bb.3
24+
; CHECK-NEXT: {{ $}}
25+
; CHECK-NEXT: bb.2.for.cond (call-frame-size 8):
26+
; CHECK-NEXT: successors: %bb.3(0x80000000)
27+
; CHECK-NEXT: {{ $}}
28+
; CHECK-NEXT: bb.3.for.cond (call-frame-size 8):
29+
; CHECK-NEXT: successors: %bb.1(0x80000000)
30+
; CHECK-NEXT: {{ $}}
31+
; CHECK-NEXT: [[PHI:%[0-9]+]]:gpr = PHI [[ADDI1]], %bb.1, [[ADDI]], %bb.2
32+
; CHECK-NEXT: $x10 = COPY [[COPY3]]
33+
; CHECK-NEXT: $x11 = COPY [[PHI]]
34+
; CHECK-NEXT: $x12 = COPY [[COPY3]]
35+
; CHECK-NEXT: $x13 = COPY [[COPY3]]
36+
; CHECK-NEXT: $x14 = COPY [[COPY3]]
37+
; CHECK-NEXT: $x15 = COPY [[COPY3]]
38+
; CHECK-NEXT: $x16 = COPY [[COPY3]]
39+
; CHECK-NEXT: $x17 = COPY [[COPY3]]
40+
; CHECK-NEXT: PseudoCALLIndirect [[COPY3]], csr_ilp32_lp64, implicit-def dead $x1, implicit $x10, implicit $x11, implicit $x12, implicit $x13, implicit $x14, implicit $x15, implicit $x16, implicit $x17, implicit-def $x2, implicit-def $x10
41+
; CHECK-NEXT: ADJCALLSTACKUP 8, 0, implicit-def dead $x2, implicit $x2
42+
; CHECK-NEXT: [[COPY4:%[0-9]+]]:gpr = COPY $x10
43+
; CHECK-NEXT: PseudoBR %bb.1
44+
entry:
45+
br label %for.cond
46+
47+
for.cond: ; preds = %for.cond, %entry
48+
%conv = select i1 %cmp436, i32 32, i32 1
49+
%call479 = call i32 (ptr, ...) null(ptr null, i32 %conv, i32 0, i32 0, double 0.000000e+00, double 0.000000e+00, double 0.000000e+00, double 0.000000e+00, double 0.000000e+00)
50+
br label %for.cond
51+
}

0 commit comments

Comments
 (0)