Skip to content

Commit

Permalink
[AArch64][Falkor] Fix bug in falkor prefetcher fix pass.
Browse files Browse the repository at this point in the history
Summary:
In rare cases, loads that don't get prefetched that were marked as
strided loads could cause a crash if they occurred in a loop with other
colliding loads.

Reviewers: mcrosier

Subscribers: aemerson, rengolin, javed.absar, kristof.beyls

Differential Revision: https://reviews.llvm.org/D38261

llvm-svn: 314252
  • Loading branch information
geoffberry committed Sep 26, 2017
1 parent a4b2f5d commit bbfa246
Show file tree
Hide file tree
Showing 2 changed files with 33 additions and 3 deletions.
11 changes: 8 additions & 3 deletions llvm/lib/Target/AArch64/AArch64FalkorHWPFFix.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -710,9 +710,14 @@ void FalkorHWPFFix::runOnLoop(MachineLoop &L, MachineFunction &Fn) {
if (!TII->isStridedAccess(MI))
continue;

LoadInfo LdI = *getLoadInfo(MI);
unsigned OldTag = *getTag(TRI, MI, LdI);
auto &OldCollisions = TagMap[OldTag];
Optional<LoadInfo> OptLdI = getLoadInfo(MI);
if (!OptLdI)
continue;
LoadInfo LdI = *OptLdI;
Optional<unsigned> OptOldTag = getTag(TRI, MI, LdI);
if (!OptOldTag)
continue;
auto &OldCollisions = TagMap[*OptOldTag];
if (OldCollisions.size() <= 1)
continue;

Expand Down
25 changes: 25 additions & 0 deletions llvm/test/CodeGen/AArch64/falkor-hwpf-fix.mir
Original file line number Diff line number Diff line change
Expand Up @@ -305,3 +305,28 @@ body: |
bb.1:
RET_ReallyLR
...
---
# Check that we handle case of strided load with no HW prefetcher tag correctly.

# CHECK-LABEL: name: hwpf_notagbug
# CHECK-NOT: ORRXrs %xzr
# CHECK: LDARW %x1
# CHECK-NOT: ORRXrs %xzr
# CHECK: LDRWui %x1
name: hwpf_notagbug
tracksRegLiveness: true
body: |
bb.0:
liveins: %w0, %x1, %x17
%w1 = LDARW %x1 :: ("aarch64-strided-access" load 4)
%w1 = LDRWui %x1, 0 :: ("aarch64-strided-access" load 4)
%w17 = LDRWui %x17, 0 :: ("aarch64-strided-access" load 4)
%w0 = SUBWri %w0, 1, 0
%wzr = SUBSWri %w0, 0, 0, implicit-def %nzcv
Bcc 9, %bb.0, implicit %nzcv
bb.1:
RET_ReallyLR
...

0 comments on commit bbfa246

Please sign in to comment.