-
Notifications
You must be signed in to change notification settings - Fork 15k
[ARM][MVE] Invalid tail predication in LowOverheadLoop pass #163217
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Closed
Closed
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit
Hold shift + click to select a range
f050ab5
[ARM][MVE] Invalid tail predication in LowOverheadLoop pass
statham-arm 7dc18e7
Remove special case for MQPRCopy at end
statham-arm 477af29
Add assertion justifying (and checking) the i+3 magic number
statham-arm 0dc637a
git-clang-format
statham-arm File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
237 changes: 237 additions & 0 deletions
237
llvm/test/CodeGen/Thumb2/LowOverheadLoops/vctp-vs-unpredicated-copy.mir
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,237 @@ | ||
| # NOTE: Assertions have been autogenerated by utils/update_mir_test_checks.py UTC_ARGS: --version 6 | ||
| # RUN: llc -mtriple=thumbv8.1m.main -mattr=+mve -run-pass=arm-low-overhead-loops %s -verify-machineinstrs -o - | FileCheck %s | ||
|
|
||
| # Wrong output is | ||
| # $q2 = MVE_VORR killed $q0, killed $q0, 0, $noreg, $noreg, undef $q2 | ||
| # renamable $r0, renamable $q3 = MVE_VLDRWU32_post killed renamable $r0, 16, 0, $noreg, renamable $lr :: (load unknown-size from %ir.13, align 4) | ||
| # $q0 = MVE_VORR $q1, $q1, 0, $noreg, $noreg, undef $q0 | ||
| # renamable $q0 = MVE_VADDf32 killed renamable $q2, killed renamable $q3, 0, killed $noreg, renamable $lr, killed renamable $q0 | ||
| # $lr = MVE_LETP killed renamable $lr, %bb.1 | ||
|
|
||
| # in which the problem is that the second MVE_VORR, copying q1 into | ||
| # q0, is required to be unpredicated so that the inactive lanes will | ||
| # be copied. | ||
|
|
||
| --- | | ||
| ; ModuleID = '162644.c' | ||
| source_filename = "162644.c" | ||
| target datalayout = "e-m:e-p:32:32-Fi8-i64:64-v128:64:128-a:0:32-n32-S64" | ||
| target triple = "thumbv8.1m.main-unknown-none-eabihf" | ||
|
|
||
| @inactive = dso_local local_unnamed_addr global <4 x float> zeroinitializer, align 16 | ||
|
|
||
| ; Function Attrs: nofree noinline norecurse nosync nounwind memory(read, inaccessiblemem: none) | ||
| define dso_local <4 x float> @test_func(ptr noundef readonly captures(none) %0, i32 noundef %1) local_unnamed_addr #0 { | ||
| %3 = load <4 x float>, ptr @inactive, align 16, !tbaa !3 | ||
| %4 = add i32 %1, 3 | ||
| %5 = call i32 @llvm.smin.i32(i32 %1, i32 4) | ||
| %6 = sub i32 %4, %5 | ||
| %7 = lshr i32 %6, 2 | ||
| %8 = add nuw nsw i32 %7, 1 | ||
| %9 = call i32 @llvm.start.loop.iterations.i32(i32 %8) | ||
| br label %10 | ||
|
|
||
| 10: ; preds = %10, %2 | ||
| %11 = phi <4 x float> [ splat (float 0x3FB99999A0000000), %2 ], [ %17, %10 ] | ||
| %12 = phi i32 [ %1, %2 ], [ %19, %10 ] | ||
| %13 = phi ptr [ %0, %2 ], [ %18, %10 ] | ||
| %14 = phi i32 [ %9, %2 ], [ %20, %10 ] | ||
| %15 = tail call <4 x i1> @llvm.arm.mve.vctp32(i32 %12) | ||
| %16 = tail call <4 x float> @llvm.masked.load.v4f32.p0(ptr %13, i32 4, <4 x i1> %15, <4 x float> zeroinitializer) | ||
| %17 = tail call <4 x float> @llvm.arm.mve.add.predicated.v4f32.v4i1(<4 x float> %11, <4 x float> %16, <4 x i1> %15, <4 x float> %3) | ||
| %18 = getelementptr inbounds nuw i8, ptr %13, i32 16 | ||
| %19 = add i32 %12, -4 | ||
| %20 = call i32 @llvm.loop.decrement.reg.i32(i32 %14, i32 1) | ||
| %21 = icmp ne i32 %20, 0 | ||
| br i1 %21, label %10, label %22, !llvm.loop !6 | ||
|
|
||
| 22: ; preds = %10 | ||
| ret <4 x float> %17 | ||
| } | ||
|
|
||
| ; Function Attrs: mustprogress nocallback nofree nosync nounwind willreturn memory(none) | ||
| declare <4 x i1> @llvm.arm.mve.vctp32(i32) #1 | ||
|
|
||
| ; Function Attrs: mustprogress nocallback nofree nosync nounwind willreturn memory(argmem: read) | ||
| declare <4 x float> @llvm.masked.load.v4f32.p0(ptr captures(none), i32 immarg, <4 x i1>, <4 x float>) #2 | ||
|
|
||
| ; Function Attrs: mustprogress nocallback nofree nosync nounwind willreturn memory(none) | ||
| declare <4 x float> @llvm.arm.mve.add.predicated.v4f32.v4i1(<4 x float>, <4 x float>, <4 x i1>, <4 x float>) #1 | ||
|
|
||
| ; Function Attrs: nocallback nofree nosync nounwind speculatable willreturn memory(none) | ||
| declare i32 @llvm.smin.i32(i32, i32) #3 | ||
|
|
||
| ; Function Attrs: nocallback noduplicate nofree nosync nounwind willreturn | ||
| declare i32 @llvm.start.loop.iterations.i32(i32) #4 | ||
|
|
||
| ; Function Attrs: nocallback noduplicate nofree nosync nounwind willreturn | ||
| declare i32 @llvm.loop.decrement.reg.i32(i32, i32) #4 | ||
|
|
||
| attributes #0 = { nofree noinline norecurse nosync nounwind memory(read, inaccessiblemem: none) "no-trapping-math"="true" "stack-protector-buffer-size"="8" "target-cpu"="cortex-m52" "target-features"="+armv8.1-m.main,+dsp,+fp-armv8d16,+fp-armv8d16sp,+fp16,+fp64,+fullfp16,+hwdiv,+lob,+mve,+mve.fp,+pacbti,+ras,+thumb-mode,+vfp2,+vfp2sp,+vfp3d16,+vfp3d16sp,+vfp4d16,+vfp4d16sp,-aes,-bf16,-cdecp0,-cdecp1,-cdecp2,-cdecp3,-cdecp4,-cdecp5,-cdecp6,-cdecp7,-crc,-crypto,-d32,-dotprod,-fp-armv8,-fp-armv8sp,-fp16fml,-hwdiv-arm,-i8mm,-neon,-sb,-sha2,-vfp3,-vfp3sp,-vfp4,-vfp4sp" } | ||
| attributes #1 = { mustprogress nocallback nofree nosync nounwind willreturn memory(none) } | ||
| attributes #2 = { mustprogress nocallback nofree nosync nounwind willreturn memory(argmem: read) } | ||
| attributes #3 = { nocallback nofree nosync nounwind speculatable willreturn memory(none) } | ||
| attributes #4 = { nocallback noduplicate nofree nosync nounwind willreturn } | ||
|
|
||
| !llvm.module.flags = !{!0, !1} | ||
| !llvm.ident = !{!2} | ||
|
|
||
| !0 = !{i32 1, !"wchar_size", i32 4} | ||
| !1 = !{i32 1, !"min_enum_size", i32 4} | ||
| !2 = !{!"clang version 22.0.0git"} | ||
| !3 = !{!4, !4, i64 0} | ||
| !4 = !{!"omnipotent char", !5, i64 0} | ||
| !5 = !{!"Simple C/C++ TBAA"} | ||
| !6 = distinct !{!6, !7, !8} | ||
| !7 = !{!"llvm.loop.mustprogress"} | ||
| !8 = !{!"llvm.loop.unroll.disable"} | ||
| ... | ||
| --- | ||
| name: test_func | ||
| alignment: 4 | ||
| exposesReturnsTwice: false | ||
| legalized: false | ||
| regBankSelected: false | ||
| selected: false | ||
| failedISel: false | ||
| tracksRegLiveness: true | ||
| hasWinCFI: false | ||
| noPhis: true | ||
| isSSA: false | ||
| noVRegs: true | ||
| hasFakeUses: false | ||
| callsEHReturn: false | ||
| callsUnwindInit: false | ||
| hasEHContTarget: false | ||
| hasEHScopes: false | ||
| hasEHFunclets: false | ||
| isOutlined: false | ||
| debugInstrRef: false | ||
| failsVerification: false | ||
| tracksDebugUserValues: true | ||
| registers: [] | ||
| liveins: | ||
| - { reg: '$r0', virtual-reg: '' } | ||
| - { reg: '$r1', virtual-reg: '' } | ||
| frameInfo: | ||
| isFrameAddressTaken: false | ||
| isReturnAddressTaken: false | ||
| hasStackMap: false | ||
| hasPatchPoint: false | ||
| stackSize: 8 | ||
| offsetAdjustment: 0 | ||
| maxAlignment: 4 | ||
| adjustsStack: false | ||
| hasCalls: false | ||
| stackProtector: '' | ||
| functionContext: '' | ||
| maxCallFrameSize: 0 | ||
| cvBytesOfCalleeSavedRegisters: 0 | ||
| hasOpaqueSPAdjustment: false | ||
| hasVAStart: false | ||
| hasMustTailInVarArgFunc: false | ||
| hasTailCall: false | ||
| isCalleeSavedInfoValid: true | ||
| localFrameSize: 0 | ||
| fixedStack: [] | ||
| stack: | ||
| - { id: 0, name: '', type: spill-slot, offset: -4, size: 4, alignment: 4, | ||
| stack-id: default, callee-saved-register: '$lr', callee-saved-restored: false, | ||
| debug-info-variable: '', debug-info-expression: '', debug-info-location: '' } | ||
| - { id: 1, name: '', type: spill-slot, offset: -8, size: 4, alignment: 4, | ||
| stack-id: default, callee-saved-register: '$r7', callee-saved-restored: true, | ||
| debug-info-variable: '', debug-info-expression: '', debug-info-location: '' } | ||
| entry_values: [] | ||
| callSites: [] | ||
| debugValueSubstitutions: [] | ||
| constants: [] | ||
| machineFunctionInfo: | ||
| isLRSpilled: true | ||
| body: | | ||
| ; CHECK-LABEL: name: test_func | ||
| ; CHECK: bb.0 (%ir-block.2): | ||
| ; CHECK-NEXT: successors: %bb.1(0x80000000) | ||
| ; CHECK-NEXT: liveins: $lr, $r0, $r1, $r7 | ||
| ; CHECK-NEXT: {{ $}} | ||
| ; CHECK-NEXT: frame-setup tPUSH 14 /* CC::al */, $noreg, killed $r7, killed $lr, implicit-def $sp, implicit $sp | ||
| ; CHECK-NEXT: frame-setup CFI_INSTRUCTION def_cfa_offset 8 | ||
| ; CHECK-NEXT: frame-setup CFI_INSTRUCTION offset $lr, -4 | ||
| ; CHECK-NEXT: frame-setup CFI_INSTRUCTION offset $r7, -8 | ||
| ; CHECK-NEXT: $r2 = t2MOVi16 target-flags(arm-lo16) @inactive, 14 /* CC::al */, $noreg | ||
| ; CHECK-NEXT: tCMPi8 renamable $r1, 4, 14 /* CC::al */, $noreg, implicit-def $cpsr | ||
| ; CHECK-NEXT: $r2 = t2MOVTi16 killed $r2, target-flags(arm-hi16) @inactive, 14 /* CC::al */, $noreg | ||
| ; CHECK-NEXT: renamable $r3 = t2MOVi 1, 14 /* CC::al */, $noreg, $noreg | ||
| ; CHECK-NEXT: renamable $q1 = MVE_VLDRWU32 killed renamable $r2, 0, 0, $noreg, $noreg :: (dereferenceable load (s128) from @inactive, !tbaa !3) | ||
| ; CHECK-NEXT: $r2 = tMOVr $r1, 14 /* CC::al */, $noreg | ||
| ; CHECK-NEXT: t2IT 10, 8, implicit-def $itstate | ||
| ; CHECK-NEXT: renamable $r2 = tMOVi8 $noreg, 4, 10 /* CC::ge */, killed $cpsr, implicit killed renamable $r2, implicit killed $itstate | ||
| ; CHECK-NEXT: renamable $r2, dead $cpsr = tSUBrr renamable $r1, killed renamable $r2, 14 /* CC::al */, $noreg | ||
| ; CHECK-NEXT: renamable $r2, dead $cpsr = tADDi8 killed renamable $r2, 3, 14 /* CC::al */, $noreg | ||
| ; CHECK-NEXT: renamable $r2 = nuw nsw t2ADDrs killed renamable $r3, killed renamable $r2, 19, 14 /* CC::al */, $noreg, $noreg | ||
| ; CHECK-NEXT: $r3 = t2MOVi16 52429, 14 /* CC::al */, $noreg | ||
| ; CHECK-NEXT: $r3 = t2MOVTi16 killed $r3, 15820, 14 /* CC::al */, $noreg | ||
| ; CHECK-NEXT: renamable $q0 = MVE_VDUP32 killed renamable $r3, 0, $noreg, $noreg, undef renamable $q0 | ||
| ; CHECK-NEXT: $lr = t2DLS killed renamable $r2 | ||
| ; CHECK-NEXT: {{ $}} | ||
| ; CHECK-NEXT: bb.1 (%ir-block.10, align 4): | ||
| ; CHECK-NEXT: successors: %bb.1(0x7c000000), %bb.2(0x04000000) | ||
| ; CHECK-NEXT: liveins: $lr, $q0, $q1, $r0, $r1 | ||
| ; CHECK-NEXT: {{ $}} | ||
| ; CHECK-NEXT: renamable $vpr = MVE_VCTP32 renamable $r1, 0, $noreg, $noreg | ||
| ; CHECK-NEXT: $q2 = MVE_VORR killed $q0, killed $q0, 0, $noreg, $noreg, undef $q2 | ||
| ; CHECK-NEXT: MVE_VPST 8, implicit $vpr | ||
| ; CHECK-NEXT: renamable $r0, renamable $q3 = MVE_VLDRWU32_post killed renamable $r0, 16, 1, renamable $vpr, renamable $lr :: (load unknown-size from %ir.13, align 4) | ||
| ; CHECK-NEXT: $q0 = MVE_VORR $q1, $q1, 0, $noreg, $noreg, undef $q0 | ||
| ; CHECK-NEXT: MVE_VPST 8, implicit $vpr | ||
| ; CHECK-NEXT: renamable $q0 = MVE_VADDf32 killed renamable $q2, killed renamable $q3, 1, killed renamable $vpr, renamable $lr, killed renamable $q0 | ||
| ; CHECK-NEXT: renamable $r1, dead $cpsr = tSUBi8 killed renamable $r1, 4, 14 /* CC::al */, $noreg | ||
| ; CHECK-NEXT: $lr = t2LEUpdate killed renamable $lr, %bb.1 | ||
| ; CHECK-NEXT: {{ $}} | ||
| ; CHECK-NEXT: bb.2 (%ir-block.22): | ||
| ; CHECK-NEXT: liveins: $q0 | ||
| ; CHECK-NEXT: {{ $}} | ||
| ; CHECK-NEXT: frame-destroy tPOP_RET 14 /* CC::al */, $noreg, def $r7, def $pc, implicit killed $q0 | ||
| bb.0 (%ir-block.2): | ||
| successors: %bb.1(0x80000000) | ||
| liveins: $r0, $r1, $r7, $lr | ||
|
|
||
| frame-setup tPUSH 14 /* CC::al */, $noreg, killed $r7, killed $lr, implicit-def $sp, implicit $sp | ||
| frame-setup CFI_INSTRUCTION def_cfa_offset 8 | ||
| frame-setup CFI_INSTRUCTION offset $lr, -4 | ||
| frame-setup CFI_INSTRUCTION offset $r7, -8 | ||
| $r2 = t2MOVi16 target-flags(arm-lo16) @inactive, 14 /* CC::al */, $noreg | ||
| tCMPi8 renamable $r1, 4, 14 /* CC::al */, $noreg, implicit-def $cpsr | ||
| $r2 = t2MOVTi16 killed $r2, target-flags(arm-hi16) @inactive, 14 /* CC::al */, $noreg | ||
| renamable $r3 = t2MOVi 1, 14 /* CC::al */, $noreg, $noreg | ||
| renamable $q1 = MVE_VLDRWU32 killed renamable $r2, 0, 0, $noreg, $noreg :: (dereferenceable load (s128) from @inactive, !tbaa !3) | ||
| $r2 = tMOVr $r1, 14 /* CC::al */, $noreg | ||
| t2IT 10, 8, implicit-def $itstate | ||
| renamable $r2 = tMOVi8 $noreg, 4, 10 /* CC::ge */, killed $cpsr, implicit killed renamable $r2, implicit killed $itstate | ||
| renamable $r2, dead $cpsr = tSUBrr renamable $r1, killed renamable $r2, 14 /* CC::al */, $noreg | ||
| renamable $r2, dead $cpsr = tADDi8 killed renamable $r2, 3, 14 /* CC::al */, $noreg | ||
| renamable $r2 = nuw nsw t2ADDrs killed renamable $r3, killed renamable $r2, 19, 14 /* CC::al */, $noreg, $noreg | ||
| $r3 = t2MOVi16 52429, 14 /* CC::al */, $noreg | ||
| $r3 = t2MOVTi16 killed $r3, 15820, 14 /* CC::al */, $noreg | ||
| renamable $q0 = MVE_VDUP32 killed renamable $r3, 0, $noreg, $noreg, undef renamable $q0 | ||
| renamable $lr = t2DoLoopStartTP killed renamable $r2, renamable $r1 | ||
|
|
||
| bb.1 (%ir-block.10, align 4): | ||
| successors: %bb.1(0x7c000000), %bb.2(0x04000000) | ||
| liveins: $lr, $q0, $q1, $r0, $r1 | ||
|
|
||
| renamable $vpr = MVE_VCTP32 renamable $r1, 0, $noreg, $noreg | ||
| $q2 = MQPRCopy killed $q0 | ||
| MVE_VPST 8, implicit $vpr | ||
| renamable $r0, renamable $q3 = MVE_VLDRWU32_post killed renamable $r0, 16, 1, renamable $vpr, renamable $lr :: (load unknown-size from %ir.13, align 4) | ||
| $q0 = MQPRCopy $q1 | ||
| MVE_VPST 8, implicit $vpr | ||
| renamable $q0 = MVE_VADDf32 killed renamable $q2, killed renamable $q3, 1, killed renamable $vpr, renamable $lr, killed renamable $q0 | ||
| renamable $r1, dead $cpsr = tSUBi8 killed renamable $r1, 4, 14 /* CC::al */, $noreg | ||
| renamable $lr = t2LoopEndDec killed renamable $lr, %bb.1, implicit-def dead $cpsr | ||
| tB %bb.2, 14 /* CC::al */, $noreg | ||
|
|
||
| bb.2 (%ir-block.22): | ||
| liveins: $q0 | ||
|
|
||
| frame-destroy tPOP_RET 14 /* CC::al */, $noreg, def $r7, def $pc, implicit killed $q0 | ||
| ... |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Can we use a named constant for this magic '3'?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
There's no existing set of constant definitions I know of at the moment which tells you what sub-operands a
VPRED_Rhas and which one goes where.The number of them changed in 9cb8f4d, adding a new one just before the tied operand I'm referring to here – before that commit my function here would have had to return
i+2. You can see in that commit that it also has no alternative but to refer to numeric offsets from the firstVPRED_Roperand, such as the part of the patch that touchesARMDisassembler.cpp.I could imagine making Tablegen write out some constants of this kind into a header file. The definition of
vpred_rinARMInstrFormats.tdassigns a name to each sub-operand in theMIOperandInfofield, so we could write out a giant enum defining constants likeARM::SUBOP_VPRED_R_inactive, and then clean up all the magic numbers in that patch as well as this one. But that seems quite a long way beyond the scope of this change!On the theory that the main aim of removing magic numbers is to make sure everything is updated correctly when (if) the right number changes, I can add an assert here, which checks that operand
i+3is the one with a TIED_TO constraint. Is that good enough for now?There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Okay, cheers, this seems good enough to me.