summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHal Finkel <hfinkel@anl.gov>2017-04-09 12:57:50 +0000
committerHal Finkel <hfinkel@anl.gov>2017-04-09 12:57:50 +0000
commita9d67cf601538d2e599cd2057f96734e1f5dcf88 (patch)
tree371ea5f757301c56286d41d1cc73f2bee4cbd38d
parentafa07c5ef6a56ecab41680e3fc032bb76a360f67 (diff)
downloadbcm5719-llvm-a9d67cf601538d2e599cd2057f96734e1f5dcf88.tar.gz
bcm5719-llvm-a9d67cf601538d2e599cd2057f96734e1f5dcf88.zip
[MemorySSA] Fix use of pointsToConstantMemory in isUseTriviallyOptimizableToLiveOnEntry
In isUseTriviallyOptimizableToLiveOnEntry, pointsToConstantMemory needs to be called on the load's pointer operand, not on the result of the load (which might not even be a pointer). llvm-svn: 299823
-rw-r--r--llvm/lib/Transforms/Utils/MemorySSA.cpp3
-rw-r--r--llvm/test/Transforms/Util/MemorySSA/ptr-const-mem.ll23
2 files changed, 25 insertions, 1 deletions
diff --git a/llvm/lib/Transforms/Utils/MemorySSA.cpp b/llvm/lib/Transforms/Utils/MemorySSA.cpp
index d1cf6f4d655..f2fc7e165b5 100644
--- a/llvm/lib/Transforms/Utils/MemorySSA.cpp
+++ b/llvm/lib/Transforms/Utils/MemorySSA.cpp
@@ -316,7 +316,8 @@ static bool isUseTriviallyOptimizableToLiveOnEntry(AliasAnalysis &AA,
// FIXME: We should handle invariant groups, as well. It's a bit harder,
// because we need to pay close attention to invariant group barriers.
return isa<LoadInst>(I) && (I->getMetadata(LLVMContext::MD_invariant_load) ||
- AA.pointsToConstantMemory(I));
+ AA.pointsToConstantMemory(cast<LoadInst>(I)->
+ getPointerOperand()));
}
/// Verifies that `Start` is clobbered by `ClobberAt`, and that nothing
diff --git a/llvm/test/Transforms/Util/MemorySSA/ptr-const-mem.ll b/llvm/test/Transforms/Util/MemorySSA/ptr-const-mem.ll
new file mode 100644
index 00000000000..a326d8d717a
--- /dev/null
+++ b/llvm/test/Transforms/Util/MemorySSA/ptr-const-mem.ll
@@ -0,0 +1,23 @@
+; RUN: opt -basicaa -print-memoryssa -verify-memoryssa -analyze -memssa-check-limit=0 < %s 2>&1 | FileCheck %s
+; RUN: opt -aa-pipeline=basic-aa -passes='print<memoryssa>' -verify-memoryssa -disable-output -memssa-check-limit=0 < %s 2>&1 | FileCheck %s
+target datalayout = "e-p:32:32-p1:64:64-p2:64:64-p3:32:32-p4:64:64-p5:32:32-i64:64-v16:16-v24:32-v32:32-v48:64-v96:128-v192:256-v256:256-v512:512-v1024:1024-v2048:2048-n32:64"
+target triple = "amdgcn"
+
+@g4 = external unnamed_addr constant i8, align 1
+
+define signext i8 @cmp_constant(i8* %q, i8 %v) local_unnamed_addr {
+entry:
+
+ store i8 %v, i8* %q, align 1
+; CHECK: 1 = MemoryDef(liveOnEntry)
+; CHECK-NEXT: store i8 %v, i8* %q, align 1
+
+ %0 = load i8, i8* @g4, align 1
+; Make sure that this load is liveOnEntry just based on the fact that @g4 is
+; constant memory.
+; CHECK: MemoryUse(liveOnEntry)
+; CHECK-NEXT: load i8, i8* @g4, align 1
+
+ ret i8 %0
+}
+
OpenPOWER on IntegriCloud