diff options
Diffstat (limited to 'llvm')
| -rw-r--r-- | llvm/lib/Analysis/AliasSetTracker.cpp | 3 | ||||
| -rw-r--r-- | llvm/test/Transforms/LICM/invariant.start.ll | 9 |
2 files changed, 6 insertions, 6 deletions
diff --git a/llvm/lib/Analysis/AliasSetTracker.cpp b/llvm/lib/Analysis/AliasSetTracker.cpp index 23c598d4edb..0470247cf6c 100644 --- a/llvm/lib/Analysis/AliasSetTracker.cpp +++ b/llvm/lib/Analysis/AliasSetTracker.cpp @@ -174,7 +174,8 @@ void AliasSet::addUnknownInst(Instruction *I, AliasAnalysis &AA) { // but don't actually modify any specific memory location. using namespace PatternMatch; bool MayWriteMemory = I->mayWriteToMemory() && - !match(I, m_Intrinsic<Intrinsic::experimental_guard>()); + !match(I, m_Intrinsic<Intrinsic::experimental_guard>()) && + !(I->use_empty() && match(I, m_Intrinsic<Intrinsic::invariant_start>())); if (!MayWriteMemory) { Alias = SetMayAlias; Access |= RefAccess; diff --git a/llvm/test/Transforms/LICM/invariant.start.ll b/llvm/test/Transforms/LICM/invariant.start.ll index 3ac6793d185..9049e54ab85 100644 --- a/llvm/test/Transforms/LICM/invariant.start.ll +++ b/llvm/test/Transforms/LICM/invariant.start.ll @@ -7,9 +7,9 @@ define void @test1(i1 %cond, i32* %ptr) { ; CHECK-LABEL: @test1( ; CHECK-LABEL: entry: +; CHECK: %val = load i32, i32* %ptr ; CHECK-LABEL: loop: ; CHECK: call {}* @llvm.invariant.start.p0i32(i64 4, i32* %ptr) -; CHECK: %val = load i32, i32* %ptr ; ALIAS-N2-LABEL: @test1( ; ALIAS-N2-LABEL: entry: @@ -28,14 +28,14 @@ loop: br label %loop } -;; TODO: By default, despite the loop varying invariant.start, we should be +;; despite the loop varying invariant.start, we should be ;; able to hoist the load define void @test2(i1 %cond, i32* %ptr) { ; CHECK-LABEL: @test2( ; CHECK-LABEL: entry: +; CHECK: %val = load i32, i32* %ptr ; CHECK-LABEL: loop: ; CHECK: call {}* @llvm.invariant.start.p0i32(i64 4, i32* %piv) -; CHECK: %val = load i32, i32* %ptr ; ALIAS-N2-LABEL: @test2( ; ALIAS-N2-LABEL: entry: @@ -54,13 +54,12 @@ loop: br label %loop } -; By default, should be able to hoist since store doesn't alias define void @test3(i1 %cond, i32* %ptr) { ; CHECK-LABEL: @test3( ; CHECK-LABEL: entry: +; CHECK: %val = load i32, i32* %ptr ; CHECK-LABEL: loop: ; CHECK: call {}* @llvm.invariant.start.p0i32(i64 4, i32* %ptr) -; CHECK: %val = load i32, i32* %ptr ; ALIAS-N2-LABEL: @test3( ; ALIAS-N2-LABEL: entry: |
