[llvm] 7feafa0 - [ARM] Fix pointer offset when splitting stores from VMOVDRR

[David Green via llvm-commits]

Author: David Green
Date: 2020-10-03T16:47:50+01:00
New Revision: 7feafa0286f1f5e059d70a9a9f4168f32db3b444

URL: https://github.com/llvm/llvm-project/commit/7feafa0286f1f5e059d70a9a9f4168f32db3b444
DIFF: https://github.com/llvm/llvm-project/commit/7feafa0286f1f5e059d70a9a9f4168f32db3b444.diff

LOG: [ARM] Fix pointer offset when splitting stores from VMOVDRR

We were not accounting for the pointer offset when splitting a store from
a VMOVDRR node, which could lead to incorrect aliasing info. In this
case it is the fneg via integer arithmetic that gives us a store->load
pair that we started getting wrong.

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

Added: 
    

Modified: 
    llvm/lib/Target/ARM/ARMISelLowering.cpp
    llvm/test/CodeGen/Thumb2/vmovdrroffset.ll

Removed: 
    


################################################################################
diff  --git a/llvm/lib/Target/ARM/ARMISelLowering.cpp b/llvm/lib/Target/ARM/ARMISelLowering.cpp
index 774f057b625b..798ecf248763 100644
--- a/llvm/lib/Target/ARM/ARMISelLowering.cpp
+++ b/llvm/lib/Target/ARM/ARMISelLowering.cpp
@@ -14546,15 +14546,15 @@ static SDValue PerformSTORECombine(SDNode *N,
     SDValue BasePtr = St->getBasePtr();
     SDValue NewST1 = DAG.getStore(
         St->getChain(), DL, StVal.getNode()->getOperand(isBigEndian ? 1 : 0),
-        BasePtr, St->getPointerInfo(), St->getAlignment(),
+        BasePtr, St->getPointerInfo(), St->getOriginalAlign(),
         St->getMemOperand()->getFlags());
 
     SDValue OffsetPtr = DAG.getNode(ISD::ADD, DL, MVT::i32, BasePtr,
                                     DAG.getConstant(4, DL, MVT::i32));
     return DAG.getStore(NewST1.getValue(0), DL,
                         StVal.getNode()->getOperand(isBigEndian ? 0 : 1),
-                        OffsetPtr, St->getPointerInfo(),
-                        std::min(4U, St->getAlignment() / 2),
+                        OffsetPtr, St->getPointerInfo().getWithOffset(4),
+                        St->getOriginalAlign(),
                         St->getMemOperand()->getFlags());
   }
 

diff  --git a/llvm/test/CodeGen/Thumb2/vmovdrroffset.ll b/llvm/test/CodeGen/Thumb2/vmovdrroffset.ll
index 07656e60a568..9d0c9c0ed35c 100644
--- a/llvm/test/CodeGen/Thumb2/vmovdrroffset.ll
+++ b/llvm/test/CodeGen/Thumb2/vmovdrroffset.ll
@@ -21,9 +21,9 @@ define arm_aapcs_vfpcc double @zero(double %a, double %b, double %c) {
 ; CHECK-NEXT:    vmov r2, r3, d8
 ; CHECK-NEXT:    vmov r0, r1, d0
 ; CHECK-NEXT:    bl __aeabi_dadd
+; CHECK-NEXT:    str r1, [sp, #4]
 ; CHECK-NEXT:    mov r4, r0
 ; CHECK-NEXT:    ldrb.w r0, [sp, #7]
-; CHECK-NEXT:    str r1, [sp, #4]
 ; CHECK-NEXT:    eor r0, r0, #128
 ; CHECK-NEXT:    strb.w r0, [sp, #7]
 ; CHECK-NEXT:    vmov r0, r1, d9