[llvm] r314252 - [AArch64][Falkor] Fix bug in falkor prefetcher fix pass.
Geoff Berry via llvm-commits
llvm-commits at lists.llvm.org
Tue Sep 26 14:40:47 PDT 2017
Author: gberry
Date: Tue Sep 26 14:40:46 2017
New Revision: 314252
URL: http://llvm.org/viewvc/llvm-project?rev=314252&view=rev
Log:
[AArch64][Falkor] Fix bug in falkor prefetcher fix pass.
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
Modified:
llvm/trunk/lib/Target/AArch64/AArch64FalkorHWPFFix.cpp
llvm/trunk/test/CodeGen/AArch64/falkor-hwpf-fix.mir
Modified: llvm/trunk/lib/Target/AArch64/AArch64FalkorHWPFFix.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/AArch64/AArch64FalkorHWPFFix.cpp?rev=314252&r1=314251&r2=314252&view=diff
==============================================================================
--- llvm/trunk/lib/Target/AArch64/AArch64FalkorHWPFFix.cpp (original)
+++ llvm/trunk/lib/Target/AArch64/AArch64FalkorHWPFFix.cpp Tue Sep 26 14:40:46 2017
@@ -710,9 +710,14 @@ void FalkorHWPFFix::runOnLoop(MachineLoo
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;
Modified: llvm/trunk/test/CodeGen/AArch64/falkor-hwpf-fix.mir
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/AArch64/falkor-hwpf-fix.mir?rev=314252&r1=314251&r2=314252&view=diff
==============================================================================
--- llvm/trunk/test/CodeGen/AArch64/falkor-hwpf-fix.mir (original)
+++ llvm/trunk/test/CodeGen/AArch64/falkor-hwpf-fix.mir Tue Sep 26 14:40:46 2017
@@ -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
+...
More information about the llvm-commits
mailing list