[llvm-branch-commits] [llvm-branch] r314553 - Merging r311599:

[Tom Stellard via llvm-branch-commits]

Author: tstellar
Date: Fri Sep 29 13:26:51 2017
New Revision: 314553

URL: http://llvm.org/viewvc/llvm-project?rev=314553&view=rev
Log:
Merging r311599:

------------------------------------------------------------------------
r311599 | gberry | 2017-08-23 14:11:28 -0700 (Wed, 23 Aug 2017) | 4 lines

[AArch64][Falkor] Fix bug in Falkor HWPF tag collision avoidance

LDPDi was incorrectly marked as ignoring the destination register in the
prefetcher tag.
------------------------------------------------------------------------

Modified:
    llvm/branches/release_50/lib/Target/AArch64/AArch64FalkorHWPFFix.cpp

Modified: llvm/branches/release_50/lib/Target/AArch64/AArch64FalkorHWPFFix.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/release_50/lib/Target/AArch64/AArch64FalkorHWPFFix.cpp?rev=314553&r1=314552&r2=314553&view=diff
==============================================================================
--- llvm/branches/release_50/lib/Target/AArch64/AArch64FalkorHWPFFix.cpp (original)
+++ llvm/branches/release_50/lib/Target/AArch64/AArch64FalkorHWPFFix.cpp Fri Sep 29 13:26:51 2017
@@ -572,7 +572,6 @@ static Optional<LoadInfo> getLoadInfo(co
     IsPrePost = true;
     break;
 
-  case AArch64::LDPDi:
   case AArch64::LDPQi:
     DestRegIdx = -1;
     BaseRegIdx = 2;
@@ -580,6 +579,7 @@ static Optional<LoadInfo> getLoadInfo(co
     IsPrePost = false;
     break;
 
+  case AArch64::LDPDi:
   case AArch64::LDPSWi:
   case AArch64::LDPSi:
   case AArch64::LDPWi: