Skip to content

Commit 9ebd329

Browse files
committed
Revert "Move assertion for AdjustsStack from PEI to MachineVerifier. (#85698)"
This reverts commit 05bde30. Reverting due to verifier complaints with expensive checks on build-bot.
1 parent 3deaa77 commit 9ebd329

30 files changed

+9
-74
lines changed

llvm/lib/CodeGen/MachineVerifier.cpp

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3697,9 +3697,6 @@ void MachineVerifier::verifyStackFrame() {
36973697
if (I.getOpcode() == FrameSetupOpcode) {
36983698
if (BBState.ExitIsSetup)
36993699
report("FrameSetup is after another FrameSetup", &I);
3700-
if (!MRI->isSSA() && !MF->getFrameInfo().adjustsStack())
3701-
report("AdjustsStack not set in presence of a frame pseudo "
3702-
"instruction.", &I);
37033700
BBState.ExitValue -= TII->getFrameTotalSize(I);
37043701
BBState.ExitIsSetup = true;
37053702
}
@@ -3715,9 +3712,6 @@ void MachineVerifier::verifyStackFrame() {
37153712
errs() << "FrameDestroy <" << Size << "> is after FrameSetup <"
37163713
<< AbsSPAdj << ">.\n";
37173714
}
3718-
if (!MRI->isSSA() && !MF->getFrameInfo().adjustsStack())
3719-
report("AdjustsStack not set in presence of a frame pseudo "
3720-
"instruction.", &I);
37213715
BBState.ExitValue += Size;
37223716
BBState.ExitIsSetup = false;
37233717
}

llvm/lib/CodeGen/PrologEpilogInserter.cpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -372,6 +372,8 @@ void PEI::calculateCallFrameInfo(MachineFunction &MF) {
372372
MFI.computeMaxCallFrameSize(MF, &FrameSDOps);
373373
assert(MFI.getMaxCallFrameSize() <= MaxCFSIn &&
374374
"Recomputing MaxCFS gave a larger value.");
375+
assert((FrameSDOps.empty() || MF.getFrameInfo().adjustsStack()) &&
376+
"AdjustsStack not set in presence of a frame pseudo instruction.");
375377

376378
if (TFI->canSimplifyCallFramePseudos(MF)) {
377379
// If call frames are not being included as part of the stack frame, and

llvm/test/CodeGen/AArch64/clear-dead-implicit-def-impdef.mir

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,6 @@
22
# RUN: llc -mtriple=arm64-apple-macosx -mcpu=apple-m1 -verify-regalloc -run-pass=greedy -o - %s | FileCheck %s
33
---
44
name: func
5-
frameInfo:
6-
adjustsStack: true
75
tracksRegLiveness: true
86
body: |
97
bb.0:

llvm/test/CodeGen/AArch64/implicit-def-remat-requires-impdef-check.mir

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222
name: inst_stores_to_dead_spill_implicit_def_impdef
2323
tracksRegLiveness: true
2424
frameInfo:
25-
adjustsStack: true
2625
hasCalls: true
2726
body: |
2827
bb.0:
@@ -60,7 +59,6 @@ body: |
6059
name: inst_stores_to_dead_spill_movimm_impdef
6160
tracksRegLiveness: true
6261
frameInfo:
63-
adjustsStack: true
6462
hasCalls: true
6563
body: |
6664
bb.0:

llvm/test/CodeGen/AArch64/implicit-def-with-impdef-greedy-assert.mir

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,6 @@
33

44
---
55
name: widget
6-
frameInfo:
7-
adjustsStack: true
86
tracksRegLiveness: true
97
jumpTable:
108
kind: label-difference32

llvm/test/CodeGen/AMDGPU/fold-restore-undef-use.mir

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,6 @@
77

88
---
99
name: restore_undef_copy_use
10-
frameInfo:
11-
adjustsStack: true
1210
tracksRegLiveness: true
1311
machineFunctionInfo:
1412
maxKernArgAlign: 1

llvm/test/CodeGen/AMDGPU/greedy-alloc-fail-sgpr1024-spill.mir

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313
name: greedy_fail_alloc_sgpr1024_spill
1414
tracksRegLiveness: true
1515
frameInfo:
16-
adjustsStack: true
1716
hasCalls: true
1817
machineFunctionInfo:
1918
explicitKernArgSize: 16

llvm/test/CodeGen/AMDGPU/ran-out-of-sgprs-allocation-failure.mir

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@ registers:
2424
- { id: 10, class: sreg_64_xexec, preferred-register: '$vcc' }
2525
frameInfo:
2626
maxAlignment: 1
27-
adjustsStack: true
2827
hasCalls: true
2928
machineFunctionInfo:
3029
maxKernArgAlign: 1

llvm/test/CodeGen/AMDGPU/sched-crash-dbg-value.mir

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -180,8 +180,6 @@ exposesReturnsTwice: false
180180
legalized: false
181181
regBankSelected: false
182182
selected: false
183-
frameInfo:
184-
adjustsStack: true
185183
tracksRegLiveness: true
186184
liveins:
187185
- { reg: '$vgpr0', virtual-reg: '%0' }

llvm/test/CodeGen/AMDGPU/sgpr-spill-wrong-stack-id.mir

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,6 @@
7878
name: sgpr_spill_wrong_stack_id
7979
tracksRegLiveness: true
8080
frameInfo:
81-
adjustsStack: true
8281
hasCalls: true
8382
machineFunctionInfo:
8483
scratchRSrcReg: $sgpr0_sgpr1_sgpr2_sgpr3

llvm/test/CodeGen/AMDGPU/snippet-copy-bundle-regression.mir

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
2121
name: kernel
2222
tracksRegLiveness: true
2323
frameInfo:
24-
adjustsStack: true
2524
hasCalls: true
2625
machineFunctionInfo:
2726
isEntryFunction: true

llvm/test/CodeGen/AMDGPU/virtregrewrite-undef-identity-copy.mir

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ name: undef_identity_copy
2020
tracksRegLiveness: true
2121
frameInfo:
2222
maxAlignment: 4
23-
adjustsStack: true
2423
hasCalls: true
2524
machineFunctionInfo:
2625
isEntryFunction: true

llvm/test/CodeGen/ARM/no-register-coalescing-in-returnsTwice.mir

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -86,8 +86,6 @@
8686
---
8787
name: main
8888
exposesReturnsTwice: true
89-
frameInfo:
90-
adjustsStack: true
9189
stack:
9290
- { id: 0, name: P0, size: 80, alignment: 8, local-offset: -80 }
9391
- { id: 1, name: jb1, size: 160, alignment: 8, local-offset: -240 }

llvm/test/CodeGen/Hexagon/regalloc-bad-undef.mir

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@ frameInfo:
135135
stackSize: 0
136136
offsetAdjustment: 0
137137
maxAlignment: 0
138-
adjustsStack: true
138+
adjustsStack: false
139139
hasCalls: true
140140
maxCallFrameSize: 0
141141
hasOpaqueSPAdjustment: false

llvm/test/CodeGen/SystemZ/RAbasic-invalid-LR-update.mir

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,6 @@
2424
---
2525
name: autogen_SD21418
2626
alignment: 4
27-
frameInfo:
28-
adjustsStack: true
2927
tracksRegLiveness: true
3028
registers:
3129
- { id: 0, class: vr128bit }

llvm/test/CodeGen/SystemZ/clear-liverange-spillreg.mir

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,6 @@ registers:
157157
- { id: 129, class: grx32bit }
158158
- { id: 130, class: fp64bit }
159159
frameInfo:
160-
adjustsStack: true
161160
hasCalls: true
162161
body: |
163162
bb.0:

llvm/test/CodeGen/SystemZ/int-cmp-56.mir

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,6 @@ liveins:
4848
- { reg: '$r2d', virtual-reg: '%0' }
4949
frameInfo:
5050
maxAlignment: 1
51-
adjustsStack: true
5251
hasCalls: true
5352
machineFunctionInfo: {}
5453
body: |
@@ -126,7 +125,6 @@ liveins:
126125
- { reg: '$r2d', virtual-reg: '%0' }
127126
frameInfo:
128127
maxAlignment: 1
129-
adjustsStack: true
130128
hasCalls: true
131129
machineFunctionInfo: {}
132130
body: |
@@ -204,7 +202,6 @@ liveins:
204202
- { reg: '$r2d', virtual-reg: '%0' }
205203
frameInfo:
206204
maxAlignment: 1
207-
adjustsStack: true
208205
hasCalls: true
209206
machineFunctionInfo: {}
210207
body: |
@@ -282,7 +279,6 @@ liveins:
282279
- { reg: '$r2d', virtual-reg: '%0' }
283280
frameInfo:
284281
maxAlignment: 1
285-
adjustsStack: true
286282
hasCalls: true
287283
machineFunctionInfo: {}
288284
body: |

llvm/test/CodeGen/SystemZ/regcoal-subranges-update.mir

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,8 +48,6 @@ body: |
4848
# represented for the value carried by %7.
4949
---
5050
name: segfault
51-
frameInfo:
52-
adjustsStack: true
5351
tracksRegLiveness: true
5452
liveins: []
5553
body: |

llvm/test/CodeGen/X86/callbr-asm-kill.mir

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,6 @@ liveins:
4545
- { reg: '$rsi', virtual-reg: '%3' }
4646
frameInfo:
4747
maxAlignment: 1
48-
adjustsStack: true
4948
hasCalls: true
5049
machineFunctionInfo: {}
5150
body: |

llvm/test/CodeGen/X86/regalloc-copy-hints.mir

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,6 @@ registers:
103103
- { id: 82, class: gr32 }
104104
frameInfo:
105105
maxAlignment: 4
106-
adjustsStack: true
107106
hasCalls: true
108107
fixedStack:
109108
- { id: 0, size: 4, alignment: 4, stack-id: default, isImmutable: true }

llvm/test/CodeGen/X86/statepoint-fastregalloc.mir

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,6 @@
55
# Tied def/use must be assigned to the same register.
66
---
77
name: test_relocate
8-
frameInfo:
9-
adjustsStack: true
108
tracksRegLiveness: true
119
body: |
1210
bb.0.entry:
@@ -26,8 +24,6 @@ body: |
2624
# These regmasks have no real meaning and chosen to allow only single register to be assignable ($rbp)
2725
---
2826
name: test_relocate_multi_regmasks
29-
frameInfo:
30-
adjustsStack: true
3127
tracksRegLiveness: true
3228
body: |
3329
bb.0.entry:

llvm/test/CodeGen/X86/statepoint-invoke-ra-enter-at-end.mir

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -231,7 +231,7 @@ frameInfo:
231231
stackSize: 0
232232
offsetAdjustment: 0
233233
maxAlignment: 1
234-
adjustsStack: true
234+
adjustsStack: false
235235
hasCalls: true
236236
stackProtector: ''
237237
maxCallFrameSize: 4294967295

llvm/test/CodeGen/X86/statepoint-invoke-ra-hoist-copies.mir

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -398,7 +398,7 @@ frameInfo:
398398
stackSize: 0
399399
offsetAdjustment: 0
400400
maxAlignment: 1
401-
adjustsStack: true
401+
adjustsStack: false
402402
hasCalls: true
403403
stackProtector: ''
404404
maxCallFrameSize: 4294967295

llvm/test/CodeGen/X86/statepoint-invoke-ra-inline-spiller.mir

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -175,7 +175,7 @@ frameInfo:
175175
stackSize: 0
176176
offsetAdjustment: 0
177177
maxAlignment: 4
178-
adjustsStack: true
178+
adjustsStack: false
179179
hasCalls: true
180180
stackProtector: ''
181181
maxCallFrameSize: 4294967295

llvm/test/CodeGen/X86/statepoint-invoke-ra-remove-back-copies.mir

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -226,7 +226,7 @@ frameInfo:
226226
stackSize: 0
227227
offsetAdjustment: 0
228228
maxAlignment: 4
229-
adjustsStack: true
229+
adjustsStack: false
230230
hasCalls: true
231231
stackProtector: ''
232232
maxCallFrameSize: 4294967295

llvm/test/CodeGen/X86/statepoint-invoke-ra.mir

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -172,7 +172,7 @@ frameInfo:
172172
stackSize: 0
173173
offsetAdjustment: 0
174174
maxAlignment: 4
175-
adjustsStack: true
175+
adjustsStack: false
176176
hasCalls: true
177177
stackProtector: ''
178178
maxCallFrameSize: 4294967295

llvm/test/CodeGen/X86/statepoint-vreg-folding.mir

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ frameInfo:
114114
stackSize: 0
115115
offsetAdjustment: 0
116116
maxAlignment: 8
117-
adjustsStack: true
117+
adjustsStack: false
118118
hasCalls: true
119119
stackProtector: ''
120120
maxCallFrameSize: 4294967295

llvm/test/DebugInfo/MIR/InstrRef/phi-coalescing.mir

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,6 @@ liveins:
106106
- { reg: '$rsi', virtual-reg: '%5' }
107107
frameInfo:
108108
maxAlignment: 1
109-
adjustsStack: true
110109
hasCalls: true
111110
machineFunctionInfo: {}
112111
body: |

llvm/test/DebugInfo/MIR/Mips/livedebugvars-stop-trimming-loc.mir

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -71,8 +71,6 @@
7171
---
7272
name: fn2
7373
alignment: 4
74-
frameInfo:
75-
adjustsStack: true
7674
tracksRegLiveness: true
7775
registers:
7876
- { id: 0, class: gpr32, preferred-register: '' }

llvm/test/MachineVerifier/test_adjustsstack.mir

Lines changed: 0 additions & 26 deletions
This file was deleted.

0 commit comments

Comments
 (0)