Skip to content

[AArch64] Fix ldp rename through a bundle #146415

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.

Sign up for GitHub

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

Merged
davemgreen merged 1 commit into from
Jul 1, 2025
Merged

[AArch64] Fix ldp rename through a bundle #146415

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions llvm/lib/Target/AArch64/AArch64LoadStoreOptimizer.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1081,8 +1081,8 @@ AArch64LoadStoreOpt::mergePairedInsns(MachineBasicBlock::iterator I,
LLVM_DEBUG(dbgs() << "Renamed " << MI);
return true;
};
forAllMIsUntilDef(MergeForward ? *I : *std::prev(Paired), RegToRename, TRI,
UINT32_MAX, UpdateMIs);
forAllMIsUntilDef(MergeForward ? *I : *Paired->getPrevNode(), RegToRename,
TRI, UINT32_MAX, UpdateMIs);

#if !defined(NDEBUG)
// For forward merging store:
Expand Down
29 changes: 29 additions & 0 deletions llvm/test/CodeGen/AArch64/stp-opt-with-renaming.mir
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -735,6 +735,35 @@ body: |
RET undef $lr
...
---
name: bundled_load_rename
alignment: 4
tracksRegLiveness: true
frameInfo:
maxAlignment: 1
maxCallFrameSize: 0
machineFunctionInfo:
hasRedZone: false
body: |
bb.0.entry:
liveins: $z3, $z19, $p0, $z16
; CHECK-LABEL: name: bundled_load_rename
; CHECK: liveins: $z3, $z19, $p0, $z16
; CHECK-NEXT: {{ $}}
; CHECK-NEXT: renamable $q16, $q20 = LDPQi $sp, 0 :: (load (s128)), (load (s128), align 32)
; CHECK-NEXT: BUNDLE implicit-def $z3, implicit-def $q3, implicit-def $d3, implicit-def $s3, implicit-def $h3, implicit-def $b3, implicit $z19, implicit $p0, implicit $z20 {
; CHECK-NEXT: $z3 = MOVPRFX_ZZ $z19
; CHECK-NEXT: $z3 = FMUL_ZPmZ_S renamable $p0, killed $z3, $z20
; CHECK-NEXT: }
; CHECK-NEXT: RET undef $lr
renamable $q16 = LDRQui $sp, 1 :: (load 16)
BUNDLE implicit-def $z3, implicit-def $q3, implicit-def $d3, implicit-def $s3, implicit-def $h3, implicit-def $b3, implicit $z19, implicit $p0, implicit $z16 {
$z3 = MOVPRFX_ZZ $z19
$z3 = FMUL_ZPmZ_S renamable $p0, killed $z3, renamable $z16
}
renamable $q16 = LDRQui $sp, 0 :: (load 16, align 32)
RET undef $lr
...
---
#
# CHECK-LABEL: name: bundled_use
# CHECK: renamable $q0 = LDRQui $sp, 1
Expand Down
Loading