[llvm] 79ea83e - [SelectionDAG] memcpy expansion of const volatile struct ignores const zero

[Simon Wallis via llvm-commits]

Author: Simon Wallis
Date: 2020-09-07T13:22:09+01:00
New Revision: 79ea83e104e368ef0f520f1bfa74c15d91baef93

URL: https://github.com/llvm/llvm-project/commit/79ea83e104e368ef0f520f1bfa74c15d91baef93
DIFF: https://github.com/llvm/llvm-project/commit/79ea83e104e368ef0f520f1bfa74c15d91baef93.diff

LOG: [SelectionDAG] memcpy expansion of const volatile struct ignores const zero

In getMemcpyLoadsAndStores(), a memcpy where the source is a zero constant is expanded to a MemOp::Set instead of a MemOp::Copy, even when the memcpy is volatile.
This is incorrect.

The fix is to add a check for volatile, and expand to MemOp::Copy in the volatile case.

Reviewed By: chill

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

Added: 
    llvm/test/CodeGen/ARM/memcpy-const-vol-struct.ll

Modified: 
    llvm/lib/CodeGen/SelectionDAG/SelectionDAG.cpp

Removed: 
    


################################################################################
diff  --git a/llvm/lib/CodeGen/SelectionDAG/SelectionDAG.cpp b/llvm/lib/CodeGen/SelectionDAG/SelectionDAG.cpp
index d2b3e009c202..2350248626c7 100644
--- a/llvm/lib/CodeGen/SelectionDAG/SelectionDAG.cpp
+++ b/llvm/lib/CodeGen/SelectionDAG/SelectionDAG.cpp
@@ -6037,7 +6037,8 @@ static SDValue getMemcpyLoadsAndStores(SelectionDAG &DAG, const SDLoc &dl,
     SrcAlign = Alignment;
   assert(SrcAlign && "SrcAlign must be set");
   ConstantDataArraySlice Slice;
-  bool CopyFromConstant = isMemSrcFromConstant(Src, Slice);
+  // If marked as volatile, perform a copy even when marked as constant.
+  bool CopyFromConstant = !isVol && isMemSrcFromConstant(Src, Slice);
   bool isZeroConstant = CopyFromConstant && Slice.Array == nullptr;
   unsigned Limit = AlwaysInline ? ~0U : TLI.getMaxStoresPerMemcpy(OptSize);
   const MemOp Op = isZeroConstant

diff  --git a/llvm/test/CodeGen/ARM/memcpy-const-vol-struct.ll b/llvm/test/CodeGen/ARM/memcpy-const-vol-struct.ll
new file mode 100644
index 000000000000..74f675876834
--- /dev/null
+++ b/llvm/test/CodeGen/ARM/memcpy-const-vol-struct.ll
@@ -0,0 +1,18 @@
+; RUN: llc -mtriple=armv7-arm-none-eabi -o - %s | FileCheck %s
+
+%struct.sMyType = type { i32 }
+
+ at val = hidden constant %struct.sMyType zeroinitializer, align 4
+ at v = internal global %struct.sMyType zeroinitializer, align 4
+
+define hidden void @InitVal() local_unnamed_addr {
+entry:
+  call void @llvm.memcpy.p0i8.p0i8.i32(i8* align 4 bitcast (%struct.sMyType* @v to i8*), i8* align 4 bitcast (%struct.sMyType* @val to i8*), i32 4, i1 true)
+; The last argument is the isvolatile argument. This is a volatile memcpy.
+; Test that the memcpy expansion does not optimize away the load.
+; CHECK: ldr
+; CHECK: str
+  ret void
+}
+
+declare void @llvm.memcpy.p0i8.p0i8.i32(i8* noalias nocapture writeonly, i8* noalias nocapture readonly, i32, i1 immarg)