Skip to content

Commit d4bada9

Browse files
nikictru
nikic
authored and
tru
committed
[CodeGen] Don't zero callee-save registers with zero-call-used-regs (PR57692)
Callee save registers must be preserved, so -fzero-call-used-regs should not be zeroing them. The previous implementation only did not zero callee save registers that were saved&restored inside the function, but we need preserve all of them. Fixes #57692. Differential Revision: https://reviews.llvm.org/D133946 (cherry picked from commit b430980)
1 parent 433f2aa commit d4bada9

File tree

3 files changed

+4
-55
lines changed

3 files changed

+4
-55
lines changed

‎llvm/lib/CodeGen/PrologEpilogInserter.cpp‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1262,9 +1262,10 @@ void PEI::insertZeroCallUsedRegs(MachineFunction &MF) {
12621262
}
12631263
}
12641264

1265-
// Don't clear registers that are reset before exiting.
1266-
for (const CalleeSavedInfo &CSI : MF.getFrameInfo().getCalleeSavedInfo())
1267-
for (MCRegister Reg : TRI.sub_and_superregs_inclusive(CSI.getReg()))
1265+
// Don't clear registers that must be preserved.
1266+
for (const MCPhysReg *CSRegs = TRI.getCalleeSavedRegs(&MF);
1267+
MCPhysReg CSReg = *CSRegs; ++CSRegs)
1268+
for (MCRegister Reg : TRI.sub_and_superregs_inclusive(CSReg))
12681269
RegsToZero.reset(Reg);
12691270

12701271
const TargetFrameLowering &TFI = *MF.getSubtarget().getFrameLowering();

‎llvm/test/CodeGen/AArch64/zero-call-used-regs.ll‎

Lines changed: 0 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -220,14 +220,6 @@ define dso_local i32 @all(i32 noundef %a, i32 noundef %b, i32 noundef %c) local_
220220
; DEFAULT-NEXT: movi v5.2d, #0000000000000000
221221
; DEFAULT-NEXT: movi v6.2d, #0000000000000000
222222
; DEFAULT-NEXT: movi v7.2d, #0000000000000000
223-
; DEFAULT-NEXT: movi v8.2d, #0000000000000000
224-
; DEFAULT-NEXT: movi v9.2d, #0000000000000000
225-
; DEFAULT-NEXT: movi v10.2d, #0000000000000000
226-
; DEFAULT-NEXT: movi v11.2d, #0000000000000000
227-
; DEFAULT-NEXT: movi v12.2d, #0000000000000000
228-
; DEFAULT-NEXT: movi v13.2d, #0000000000000000
229-
; DEFAULT-NEXT: movi v14.2d, #0000000000000000
230-
; DEFAULT-NEXT: movi v15.2d, #0000000000000000
231223
; DEFAULT-NEXT: movi v16.2d, #0000000000000000
232224
; DEFAULT-NEXT: movi v17.2d, #0000000000000000
233225
; DEFAULT-NEXT: movi v18.2d, #0000000000000000
@@ -276,14 +268,6 @@ define dso_local i32 @all(i32 noundef %a, i32 noundef %b, i32 noundef %c) local_
276268
; SVE-NEXT: mov z5.d, #0 // =0x0
277269
; SVE-NEXT: mov z6.d, #0 // =0x0
278270
; SVE-NEXT: mov z7.d, #0 // =0x0
279-
; SVE-NEXT: mov z8.d, #0 // =0x0
280-
; SVE-NEXT: mov z9.d, #0 // =0x0
281-
; SVE-NEXT: mov z10.d, #0 // =0x0
282-
; SVE-NEXT: mov z11.d, #0 // =0x0
283-
; SVE-NEXT: mov z12.d, #0 // =0x0
284-
; SVE-NEXT: mov z13.d, #0 // =0x0
285-
; SVE-NEXT: mov z14.d, #0 // =0x0
286-
; SVE-NEXT: mov z15.d, #0 // =0x0
287271
; SVE-NEXT: mov z16.d, #0 // =0x0
288272
; SVE-NEXT: mov z17.d, #0 // =0x0
289273
; SVE-NEXT: mov z18.d, #0 // =0x0
@@ -548,14 +532,6 @@ define dso_local double @all_float(double noundef %a, float noundef %b) local_un
548532
; DEFAULT-NEXT: movi v5.2d, #0000000000000000
549533
; DEFAULT-NEXT: movi v6.2d, #0000000000000000
550534
; DEFAULT-NEXT: movi v7.2d, #0000000000000000
551-
; DEFAULT-NEXT: movi v8.2d, #0000000000000000
552-
; DEFAULT-NEXT: movi v9.2d, #0000000000000000
553-
; DEFAULT-NEXT: movi v10.2d, #0000000000000000
554-
; DEFAULT-NEXT: movi v11.2d, #0000000000000000
555-
; DEFAULT-NEXT: movi v12.2d, #0000000000000000
556-
; DEFAULT-NEXT: movi v13.2d, #0000000000000000
557-
; DEFAULT-NEXT: movi v14.2d, #0000000000000000
558-
; DEFAULT-NEXT: movi v15.2d, #0000000000000000
559535
; DEFAULT-NEXT: movi v16.2d, #0000000000000000
560536
; DEFAULT-NEXT: movi v17.2d, #0000000000000000
561537
; DEFAULT-NEXT: movi v18.2d, #0000000000000000
@@ -604,14 +580,6 @@ define dso_local double @all_float(double noundef %a, float noundef %b) local_un
604580
; SVE-NEXT: mov z5.d, #0 // =0x0
605581
; SVE-NEXT: mov z6.d, #0 // =0x0
606582
; SVE-NEXT: mov z7.d, #0 // =0x0
607-
; SVE-NEXT: mov z8.d, #0 // =0x0
608-
; SVE-NEXT: mov z9.d, #0 // =0x0
609-
; SVE-NEXT: mov z10.d, #0 // =0x0
610-
; SVE-NEXT: mov z11.d, #0 // =0x0
611-
; SVE-NEXT: mov z12.d, #0 // =0x0
612-
; SVE-NEXT: mov z13.d, #0 // =0x0
613-
; SVE-NEXT: mov z14.d, #0 // =0x0
614-
; SVE-NEXT: mov z15.d, #0 // =0x0
615583
; SVE-NEXT: mov z16.d, #0 // =0x0
616584
; SVE-NEXT: mov z17.d, #0 // =0x0
617585
; SVE-NEXT: mov z18.d, #0 // =0x0

‎llvm/test/CodeGen/X86/zero-call-used-regs.ll‎

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -110,19 +110,13 @@ define dso_local i32 @all_gpr(i32 returned %x) local_unnamed_addr #0 "zero-call-
110110
; I386-LABEL: all_gpr:
111111
; I386: # %bb.0: # %entry
112112
; I386-NEXT: movl {{[0-9]+}}(%esp), %eax
113-
; I386-NEXT: xorl %ebp, %ebp
114-
; I386-NEXT: xorl %ebx, %ebx
115113
; I386-NEXT: xorl %ecx, %ecx
116-
; I386-NEXT: xorl %edi, %edi
117114
; I386-NEXT: xorl %edx, %edx
118-
; I386-NEXT: xorl %esi, %esi
119115
; I386-NEXT: retl
120116
;
121117
; X86-64-LABEL: all_gpr:
122118
; X86-64: # %bb.0: # %entry
123119
; X86-64-NEXT: movl %edi, %eax
124-
; X86-64-NEXT: xorl %ebp, %ebp
125-
; X86-64-NEXT: xorl %ebx, %ebx
126120
; X86-64-NEXT: xorl %ecx, %ecx
127121
; X86-64-NEXT: xorl %edi, %edi
128122
; X86-64-NEXT: xorl %edx, %edx
@@ -131,10 +125,6 @@ define dso_local i32 @all_gpr(i32 returned %x) local_unnamed_addr #0 "zero-call-
131125
; X86-64-NEXT: xorl %r9d, %r9d
132126
; X86-64-NEXT: xorl %r10d, %r10d
133127
; X86-64-NEXT: xorl %r11d, %r11d
134-
; X86-64-NEXT: xorl %r12d, %r12d
135-
; X86-64-NEXT: xorl %r13d, %r13d
136-
; X86-64-NEXT: xorl %r14d, %r14d
137-
; X86-64-NEXT: xorl %r15d, %r15d
138128
; X86-64-NEXT: retq
139129

140130
entry:
@@ -190,12 +180,8 @@ define dso_local i32 @all(i32 returned %x) local_unnamed_addr #0 "zero-call-used
190180
; I386-NEXT: fstp %st(0)
191181
; I386-NEXT: fstp %st(0)
192182
; I386-NEXT: fstp %st(0)
193-
; I386-NEXT: xorl %ebp, %ebp
194-
; I386-NEXT: xorl %ebx, %ebx
195183
; I386-NEXT: xorl %ecx, %ecx
196-
; I386-NEXT: xorl %edi, %edi
197184
; I386-NEXT: xorl %edx, %edx
198-
; I386-NEXT: xorl %esi, %esi
199185
; I386-NEXT: xorps %xmm0, %xmm0
200186
; I386-NEXT: xorps %xmm1, %xmm1
201187
; I386-NEXT: xorps %xmm2, %xmm2
@@ -225,8 +211,6 @@ define dso_local i32 @all(i32 returned %x) local_unnamed_addr #0 "zero-call-used
225211
; X86-64-NEXT: fstp %st(0)
226212
; X86-64-NEXT: fstp %st(0)
227213
; X86-64-NEXT: fstp %st(0)
228-
; X86-64-NEXT: xorl %ebp, %ebp
229-
; X86-64-NEXT: xorl %ebx, %ebx
230214
; X86-64-NEXT: xorl %ecx, %ecx
231215
; X86-64-NEXT: xorl %edi, %edi
232216
; X86-64-NEXT: xorl %edx, %edx
@@ -235,10 +219,6 @@ define dso_local i32 @all(i32 returned %x) local_unnamed_addr #0 "zero-call-used
235219
; X86-64-NEXT: xorl %r9d, %r9d
236220
; X86-64-NEXT: xorl %r10d, %r10d
237221
; X86-64-NEXT: xorl %r11d, %r11d
238-
; X86-64-NEXT: xorl %r12d, %r12d
239-
; X86-64-NEXT: xorl %r13d, %r13d
240-
; X86-64-NEXT: xorl %r14d, %r14d
241-
; X86-64-NEXT: xorl %r15d, %r15d
242222
; X86-64-NEXT: xorps %xmm0, %xmm0
243223
; X86-64-NEXT: xorps %xmm1, %xmm1
244224
; X86-64-NEXT: xorps %xmm2, %xmm2

0 commit comments

Comments
 (0)