From: Chad Rosier <mcrosier@codeaurora.org>
Date: Tue, 9 Feb 2016 19:17:18 +0000 (+0000)
Subject: [AArch64] Hoist now common logic. NFC.
X-Git-Tag: android-x86-7.1-r4~37998
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=9c3c7d8479f69597c85f01dc2bff5811e63a695e;p=android-x86%2Fexternal-llvm.git

[AArch64] Hoist now common logic. NFC.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@260257 91177308-0d34-0410-b5e6-96231b3b80d8
---

diff --git a/lib/Target/AArch64/AArch64LoadStoreOptimizer.cpp b/lib/Target/AArch64/AArch64LoadStoreOptimizer.cpp
index 8e24c8d3f6b..7e035135bf4 100644
--- a/lib/Target/AArch64/AArch64LoadStoreOptimizer.cpp
+++ b/lib/Target/AArch64/AArch64LoadStoreOptimizer.cpp
@@ -650,8 +650,8 @@ AArch64LoadStoreOpt::mergeNarrowInsns(MachineBasicBlock::iterator I,
     ++NextI;
 
   unsigned Opc = I->getOpcode();
-  bool IsUnscaled = isUnscaledLdSt(Opc);
-  int OffsetStride = IsUnscaled ? getMemScale(I) : 1;
+  bool IsScaled = !isUnscaledLdSt(Opc);
+  int OffsetStride = IsScaled ? 1 : getMemScale(I);
 
   bool MergeForward = Flags.getMergeForward();
   // Insert our new paired instruction after whichever of the paired
@@ -674,12 +674,13 @@ AArch64LoadStoreOpt::mergeNarrowInsns(MachineBasicBlock::iterator I,
   }
 
   int OffsetImm = getLdStOffsetOp(RtMI).getImm();
+  // Change the scaled offset from small to large type.
+  if (IsScaled) {
+    assert(((OffsetImm & 1) == 0) && "Unexpected offset to merge");
+    OffsetImm /= 2;
+  }
+
   if (isNarrowLoad(Opc)) {
-    // Change the scaled offset from small to large type.
-    if (!IsUnscaled) {
-      assert(((OffsetImm & 1) == 0) && "Unexpected offset to merge");
-      OffsetImm /= 2;
-    }
     MachineInstr *RtNewDest = MergeForward ? I : MergeMI;
     // When merging small (< 32 bit) loads for big-endian targets, the order of
     // the component parts gets swapped.
@@ -770,15 +771,10 @@ AArch64LoadStoreOpt::mergeNarrowInsns(MachineBasicBlock::iterator I,
     MergeMI->eraseFromParent();
     return NextI;
   }
+  assert(isNarrowStore(Opc) && "Expected narrow store");
 
   // Construct the new instruction.
   MachineInstrBuilder MIB;
-  assert(isNarrowStore(Opc) && "Expected narrow store");
-  // Change the scaled offset from small to large type.
-  if (!IsUnscaled) {
-    assert(((OffsetImm & 1) == 0) && "Unexpected offset to merge");
-    OffsetImm /= 2;
-  }
   MIB = BuildMI(*I->getParent(), InsertionPoint, I->getDebugLoc(),
                 TII->get(getMatchingWideOpcode(Opc)))
             .addOperand(getLdStRegOp(I))