Skip to content

Commit 9a2cfae

Browse files
committed
Merging r358042:
------------------------------------------------------------------------ r358042 | jimlin | 2019-04-09 18:56:32 -0700 (Tue, 09 Apr 2019) | 34 lines [Sparc] Fix incorrect MI insertion position for spilling f128. Summary: Obviously, new built MI (sethi+add or sethi+xor+add) for constructing large offset should be inserted before new created MI for storing even register into memory. So the insertion position should be *StMI instead of II. before fixed: std %f0, [%g1+80] sethi 4, %g1 <<< add %g1, %sp, %g1 <<< this two instructions should be put before "std %f0, [%g1+80]". sethi 4, %g1 add %g1, %sp, %g1 std %f2, [%g1+88] after fixed: sethi 4, %g1 add %g1, %sp, %g1 std %f0, [%g1+80] sethi 4, %g1 add %g1, %sp, %g1 std %f2, [%g1+88] Reviewers: venkatra, jyknight Reviewed By: jyknight Subscribers: jyknight, fedor.sergeev, jrtc27, llvm-commits Tags: #llvm Differential Revision: https://reviews.llvm.org/D60397 ------------------------------------------------------------------------ llvm-svn: 363010
1 parent 90c370c commit 9a2cfae

File tree

2 files changed

+25
-2
lines changed

2 files changed

+25
-2
lines changed

llvm/lib/Target/Sparc/SparcRegisterInfo.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -189,7 +189,7 @@ SparcRegisterInfo::eliminateFrameIndex(MachineBasicBlock::iterator II,
189189
MachineInstr *StMI =
190190
BuildMI(*MI.getParent(), II, dl, TII.get(SP::STDFri))
191191
.addReg(FrameReg).addImm(0).addReg(SrcEvenReg);
192-
replaceFI(MF, II, *StMI, dl, 0, Offset, FrameReg);
192+
replaceFI(MF, *StMI, *StMI, dl, 0, Offset, FrameReg);
193193
MI.setDesc(TII.get(SP::STDFri));
194194
MI.getOperand(2).setReg(SrcOddReg);
195195
Offset += 8;
@@ -201,7 +201,7 @@ SparcRegisterInfo::eliminateFrameIndex(MachineBasicBlock::iterator II,
201201
MachineInstr *StMI =
202202
BuildMI(*MI.getParent(), II, dl, TII.get(SP::LDDFri), DestEvenReg)
203203
.addReg(FrameReg).addImm(0);
204-
replaceFI(MF, II, *StMI, dl, 1, Offset, FrameReg);
204+
replaceFI(MF, *StMI, *StMI, dl, 1, Offset, FrameReg);
205205

206206
MI.setDesc(TII.get(SP::LDDFri));
207207
MI.getOperand(0).setReg(DestOddReg);

llvm/test/CodeGen/SPARC/fp128.ll

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,29 @@ entry:
5353
ret void
5454
}
5555

56+
; CHECK-LABEL: f128_spill_large:
57+
; CHECK: sethi 4, %g1
58+
; CHECK: sethi 4, %g1
59+
; CHECK-NEXT: add %g1, %sp, %g1
60+
; CHECK-NEXT: std %f{{.+}}, [%g1]
61+
; CHECK: sethi 4, %g1
62+
; CHECK-NEXT: add %g1, %sp, %g1
63+
; CHECK-NEXT: std %f{{.+}}, [%g1+8]
64+
; CHECK: sethi 4, %g1
65+
; CHECK-NEXT: add %g1, %sp, %g1
66+
; CHECK-NEXT: ldd [%g1], %f{{.+}}
67+
; CHECK: sethi 4, %g1
68+
; CHECK-NEXT: add %g1, %sp, %g1
69+
; CHECK-NEXT: ldd [%g1+8], %f{{.+}}
70+
71+
define void @f128_spill_large(<251 x fp128>* noalias sret %scalar.result, <251 x fp128>* byval %a) {
72+
entry:
73+
%0 = load <251 x fp128>, <251 x fp128>* %a, align 8
74+
call void asm sideeffect "", "~{f0},~{f1},~{f2},~{f3},~{f4},~{f5},~{f6},~{f7},~{f8},~{f9},~{f10},~{f11},~{f12},~{f13},~{f14},~{f15},~{f16},~{f17},~{f18},~{f19},~{f20},~{f21},~{f22},~{f23},~{f24},~{f25},~{f26},~{f27},~{f28},~{f29},~{f30},~{f31}"()
75+
store <251 x fp128> %0, <251 x fp128>* %scalar.result, align 8
76+
ret void
77+
}
78+
5679
; CHECK-LABEL: f128_compare:
5780
; HARD: fcmpq
5881
; HARD-NEXT: nop

0 commit comments

Comments
 (0)