Skip to content

Commit 3f1b271

Browse files
kmclaughlin-armkmclaughlin-arm
committed
- Fixed misplaced brackets in needsAsyncDwarfUnwindInfo()
1 parent 3e63e6a commit 3f1b271

File tree

4 files changed

+16
-16
lines changed

4 files changed

+16
-16
lines changed

‎llvm/lib/Target/AArch64/AArch64MachineFunctionInfo.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -201,9 +201,9 @@ bool AArch64FunctionInfo::needsAsyncDwarfUnwindInfo(
201201
// (yet) for homogeneous epilogues, outlined functions, and functions
202202
// outlined from.
203203
NeedsAsyncDwarfUnwindInfo =
204-
(needsDwarfUnwindInfo(MF) && F.getUWTableKind() == UWTableKind::Async &&
205-
!F.hasMinSize()) ||
206-
AFI->hasStreamingModeChanges();
204+
needsDwarfUnwindInfo(MF) &&
205+
((F.getUWTableKind() == UWTableKind::Async && !F.hasMinSize()) ||
206+
AFI->hasStreamingModeChanges());
207207
}
208208
return *NeedsAsyncDwarfUnwindInfo;
209209
}

‎llvm/test/CodeGen/AArch64/sme-lazy-save-call.ll

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -133,9 +133,9 @@ define void @test_lazy_save_and_conditional_smstart() nounwind "aarch64_inout_za
133133
; CHECK-NEXT: stp d11, d10, [sp, #32] // 16-byte Folded Spill
134134
; CHECK-NEXT: stp d9, d8, [sp, #48] // 16-byte Folded Spill
135135
; CHECK-NEXT: stp x29, x30, [sp, #64] // 16-byte Folded Spill
136+
; CHECK-NEXT: add x29, sp, #64
136137
; CHECK-NEXT: str x9, [sp, #80] // 8-byte Folded Spill
137138
; CHECK-NEXT: stp x20, x19, [sp, #96] // 16-byte Folded Spill
138-
; CHECK-NEXT: add x29, sp, #64
139139
; CHECK-NEXT: sub sp, sp, #16
140140
; CHECK-NEXT: rdsvl x8, #1
141141
; CHECK-NEXT: mov x9, sp

‎llvm/test/CodeGen/AArch64/sme-streaming-body-streaming-compatible-interface.ll

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,13 +80,13 @@ define void @streaming_body_and_streaming_compatible_interface_multi_basic_block
8080
; CHECK-NEXT: stp d15, d14, [sp, #-96]! // 16-byte Folded Spill
8181
; CHECK-NEXT: rdsvl x9, #1
8282
; CHECK-NEXT: stp d13, d12, [sp, #16] // 16-byte Folded Spill
83+
; CHECK-NEXT: mov w8, w0
8384
; CHECK-NEXT: lsr x9, x9, #3
8485
; CHECK-NEXT: stp d11, d10, [sp, #32] // 16-byte Folded Spill
8586
; CHECK-NEXT: stp d9, d8, [sp, #48] // 16-byte Folded Spill
8687
; CHECK-NEXT: stp x30, x9, [sp, #64] // 16-byte Folded Spill
8788
; CHECK-NEXT: cntd x9
8889
; CHECK-NEXT: stp x9, x19, [sp, #80] // 16-byte Folded Spill
89-
; CHECK-NEXT: mov w8, w0
9090
; CHECK-NEXT: bl __arm_sme_state
9191
; CHECK-NEXT: and x19, x0, #0x1
9292
; CHECK-NEXT: tbnz w19, #0, .LBB2_2

‎llvm/test/CodeGen/AArch64/streaming-compatible-memory-ops.ll

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -24,12 +24,12 @@ define void @se_memcpy(i64 noundef %n) "aarch64_pstate_sm_enabled" nounwind {
2424
; CHECK-NO-SME-ROUTINES-NEXT: stp d15, d14, [sp, #-80]! // 16-byte Folded Spill
2525
; CHECK-NO-SME-ROUTINES-NEXT: cntd x9
2626
; CHECK-NO-SME-ROUTINES-NEXT: stp d13, d12, [sp, #16] // 16-byte Folded Spill
27-
; CHECK-NO-SME-ROUTINES-NEXT: stp d11, d10, [sp, #32] // 16-byte Folded Spill
28-
; CHECK-NO-SME-ROUTINES-NEXT: stp d9, d8, [sp, #48] // 16-byte Folded Spill
29-
; CHECK-NO-SME-ROUTINES-NEXT: stp x30, x9, [sp, #64] // 16-byte Folded Spill
3027
; CHECK-NO-SME-ROUTINES-NEXT: mov x2, x0
28+
; CHECK-NO-SME-ROUTINES-NEXT: stp d11, d10, [sp, #32] // 16-byte Folded Spill
3129
; CHECK-NO-SME-ROUTINES-NEXT: adrp x0, :got:dst
3230
; CHECK-NO-SME-ROUTINES-NEXT: adrp x1, :got:src
31+
; CHECK-NO-SME-ROUTINES-NEXT: stp d9, d8, [sp, #48] // 16-byte Folded Spill
32+
; CHECK-NO-SME-ROUTINES-NEXT: stp x30, x9, [sp, #64] // 16-byte Folded Spill
3333
; CHECK-NO-SME-ROUTINES-NEXT: ldr x0, [x0, :got_lo12:dst]
3434
; CHECK-NO-SME-ROUTINES-NEXT: ldr x1, [x1, :got_lo12:src]
3535
; CHECK-NO-SME-ROUTINES-NEXT: smstop sm
@@ -73,12 +73,12 @@ define void @se_memset(i64 noundef %n) "aarch64_pstate_sm_enabled" nounwind {
7373
; CHECK-NO-SME-ROUTINES: // %bb.0: // %entry
7474
; CHECK-NO-SME-ROUTINES-NEXT: stp d15, d14, [sp, #-80]! // 16-byte Folded Spill
7575
; CHECK-NO-SME-ROUTINES-NEXT: cntd x9
76+
; CHECK-NO-SME-ROUTINES-NEXT: mov x2, x0
77+
; CHECK-NO-SME-ROUTINES-NEXT: adrp x0, :got:dst
7678
; CHECK-NO-SME-ROUTINES-NEXT: stp d13, d12, [sp, #16] // 16-byte Folded Spill
7779
; CHECK-NO-SME-ROUTINES-NEXT: stp d11, d10, [sp, #32] // 16-byte Folded Spill
7880
; CHECK-NO-SME-ROUTINES-NEXT: stp d9, d8, [sp, #48] // 16-byte Folded Spill
7981
; CHECK-NO-SME-ROUTINES-NEXT: stp x30, x9, [sp, #64] // 16-byte Folded Spill
80-
; CHECK-NO-SME-ROUTINES-NEXT: mov x2, x0
81-
; CHECK-NO-SME-ROUTINES-NEXT: adrp x0, :got:dst
8282
; CHECK-NO-SME-ROUTINES-NEXT: ldr x0, [x0, :got_lo12:dst]
8383
; CHECK-NO-SME-ROUTINES-NEXT: smstop sm
8484
; CHECK-NO-SME-ROUTINES-NEXT: mov w1, #2 // =0x2
@@ -123,12 +123,12 @@ define void @se_memmove(i64 noundef %n) "aarch64_pstate_sm_enabled" nounwind {
123123
; CHECK-NO-SME-ROUTINES-NEXT: stp d15, d14, [sp, #-80]! // 16-byte Folded Spill
124124
; CHECK-NO-SME-ROUTINES-NEXT: cntd x9
125125
; CHECK-NO-SME-ROUTINES-NEXT: stp d13, d12, [sp, #16] // 16-byte Folded Spill
126-
; CHECK-NO-SME-ROUTINES-NEXT: stp d11, d10, [sp, #32] // 16-byte Folded Spill
127-
; CHECK-NO-SME-ROUTINES-NEXT: stp d9, d8, [sp, #48] // 16-byte Folded Spill
128-
; CHECK-NO-SME-ROUTINES-NEXT: stp x30, x9, [sp, #64] // 16-byte Folded Spill
129126
; CHECK-NO-SME-ROUTINES-NEXT: mov x2, x0
127+
; CHECK-NO-SME-ROUTINES-NEXT: stp d11, d10, [sp, #32] // 16-byte Folded Spill
130128
; CHECK-NO-SME-ROUTINES-NEXT: adrp x0, :got:dst
131129
; CHECK-NO-SME-ROUTINES-NEXT: adrp x1, :got:src
130+
; CHECK-NO-SME-ROUTINES-NEXT: stp d9, d8, [sp, #48] // 16-byte Folded Spill
131+
; CHECK-NO-SME-ROUTINES-NEXT: stp x30, x9, [sp, #64] // 16-byte Folded Spill
132132
; CHECK-NO-SME-ROUTINES-NEXT: ldr x0, [x0, :got_lo12:dst]
133133
; CHECK-NO-SME-ROUTINES-NEXT: ldr x1, [x1, :got_lo12:src]
134134
; CHECK-NO-SME-ROUTINES-NEXT: smstop sm
@@ -174,11 +174,11 @@ define void @sc_memcpy(i64 noundef %n) "aarch64_pstate_sm_compatible" nounwind {
174174
; CHECK-NO-SME-ROUTINES-NEXT: stp d15, d14, [sp, #-96]! // 16-byte Folded Spill
175175
; CHECK-NO-SME-ROUTINES-NEXT: cntd x9
176176
; CHECK-NO-SME-ROUTINES-NEXT: stp d13, d12, [sp, #16] // 16-byte Folded Spill
177+
; CHECK-NO-SME-ROUTINES-NEXT: mov x2, x0
177178
; CHECK-NO-SME-ROUTINES-NEXT: stp d11, d10, [sp, #32] // 16-byte Folded Spill
178179
; CHECK-NO-SME-ROUTINES-NEXT: stp d9, d8, [sp, #48] // 16-byte Folded Spill
179180
; CHECK-NO-SME-ROUTINES-NEXT: stp x30, x9, [sp, #64] // 16-byte Folded Spill
180181
; CHECK-NO-SME-ROUTINES-NEXT: str x19, [sp, #80] // 8-byte Folded Spill
181-
; CHECK-NO-SME-ROUTINES-NEXT: mov x2, x0
182182
; CHECK-NO-SME-ROUTINES-NEXT: bl __arm_sme_state
183183
; CHECK-NO-SME-ROUTINES-NEXT: adrp x8, :got:dst
184184
; CHECK-NO-SME-ROUTINES-NEXT: and x19, x0, #0x1
@@ -224,13 +224,13 @@ define void @sb_memcpy(i64 noundef %n) "aarch64_pstate_sm_body" nounwind {
224224
; CHECK-NEXT: stp d15, d14, [sp, #-96]! // 16-byte Folded Spill
225225
; CHECK-NEXT: rdsvl x9, #1
226226
; CHECK-NEXT: stp d13, d12, [sp, #16] // 16-byte Folded Spill
227+
; CHECK-NEXT: mov x2, x0
227228
; CHECK-NEXT: lsr x9, x9, #3
228229
; CHECK-NEXT: stp d11, d10, [sp, #32] // 16-byte Folded Spill
229230
; CHECK-NEXT: stp d9, d8, [sp, #48] // 16-byte Folded Spill
230231
; CHECK-NEXT: stp x30, x9, [sp, #64] // 16-byte Folded Spill
231232
; CHECK-NEXT: cntd x9
232233
; CHECK-NEXT: str x9, [sp, #80] // 8-byte Folded Spill
233-
; CHECK-NEXT: mov x2, x0
234234
; CHECK-NEXT: smstart sm
235235
; CHECK-NEXT: adrp x0, :got:dst
236236
; CHECK-NEXT: adrp x1, :got:src
@@ -250,13 +250,13 @@ define void @sb_memcpy(i64 noundef %n) "aarch64_pstate_sm_body" nounwind {
250250
; CHECK-NO-SME-ROUTINES-NEXT: stp d15, d14, [sp, #-96]! // 16-byte Folded Spill
251251
; CHECK-NO-SME-ROUTINES-NEXT: rdsvl x9, #1
252252
; CHECK-NO-SME-ROUTINES-NEXT: stp d13, d12, [sp, #16] // 16-byte Folded Spill
253+
; CHECK-NO-SME-ROUTINES-NEXT: mov x2, x0
253254
; CHECK-NO-SME-ROUTINES-NEXT: lsr x9, x9, #3
254255
; CHECK-NO-SME-ROUTINES-NEXT: stp d11, d10, [sp, #32] // 16-byte Folded Spill
255256
; CHECK-NO-SME-ROUTINES-NEXT: stp d9, d8, [sp, #48] // 16-byte Folded Spill
256257
; CHECK-NO-SME-ROUTINES-NEXT: stp x30, x9, [sp, #64] // 16-byte Folded Spill
257258
; CHECK-NO-SME-ROUTINES-NEXT: cntd x9
258259
; CHECK-NO-SME-ROUTINES-NEXT: str x9, [sp, #80] // 8-byte Folded Spill
259-
; CHECK-NO-SME-ROUTINES-NEXT: mov x2, x0
260260
; CHECK-NO-SME-ROUTINES-NEXT: smstart sm
261261
; CHECK-NO-SME-ROUTINES-NEXT: adrp x0, :got:dst
262262
; CHECK-NO-SME-ROUTINES-NEXT: adrp x1, :got:src

0 commit comments

Comments
 (0)