diff options
| author | Alina Sbirlea <asbirlea@google.com> | 2019-09-12 18:09:47 +0000 |
|---|---|---|
| committer | Alina Sbirlea <asbirlea@google.com> | 2019-09-12 18:09:47 +0000 |
| commit | 18f5204db4a9d5df3cb89833de4805a78f5034ee (patch) | |
| tree | 38c6ce889dcf286f7a464dd3e78d4721043463e7 | |
| parent | 57a014d31fb2e731867623d355e98801596814f8 (diff) | |
| download | llvm-18f5204db4a9d5df3cb89833de4805a78f5034ee.zip llvm-18f5204db4a9d5df3cb89833de4805a78f5034ee.tar.gz llvm-18f5204db4a9d5df3cb89833de4805a78f5034ee.tar.bz2 | |
[LICM/AST] Check if the AliasAny set is removed from the tracker.
Summary:
Resolves PR38513.
Credit to @bjope for debugging this.
Reviewers: hfinkel, uabelho, bjope
Subscribers: sanjoy.google, bjope, llvm-commits
Tags: #llvm
Differential Revision: https://reviews.llvm.org/D67417
llvm-svn: 371752
| -rw-r--r-- | llvm/lib/Analysis/AliasSetTracker.cpp | 12 | ||||
| -rw-r--r-- | llvm/test/Transforms/LICM/pr38513.ll | 27 |
2 files changed, 37 insertions, 2 deletions
diff --git a/llvm/lib/Analysis/AliasSetTracker.cpp b/llvm/lib/Analysis/AliasSetTracker.cpp index a6e5b9f..79fbcd4 100644 --- a/llvm/lib/Analysis/AliasSetTracker.cpp +++ b/llvm/lib/Analysis/AliasSetTracker.cpp @@ -119,6 +119,12 @@ void AliasSetTracker::removeAliasSet(AliasSet *AS) { TotalMayAliasSetSize -= AS->size(); AliasSets.erase(AS); + // If we've removed the saturated alias set, set saturated marker back to + // nullptr and ensure this tracker is empty. + if (AS == AliasAnyAS) { + AliasAnyAS = nullptr; + assert(AliasSets.empty() && "Tracker not empty"); + } } void AliasSet::removeFromTracker(AliasSetTracker &AST) { @@ -690,8 +696,10 @@ void AliasSet::print(raw_ostream &OS) const { } void AliasSetTracker::print(raw_ostream &OS) const { - OS << "Alias Set Tracker: " << AliasSets.size() << " alias sets for " - << PointerMap.size() << " pointer values.\n"; + OS << "Alias Set Tracker: " << AliasSets.size(); + if (AliasAnyAS) + OS << " (Saturated)"; + OS << " alias sets for " << PointerMap.size() << " pointer values.\n"; for (const AliasSet &AS : *this) AS.print(OS); OS << "\n"; diff --git a/llvm/test/Transforms/LICM/pr38513.ll b/llvm/test/Transforms/LICM/pr38513.ll new file mode 100644 index 0000000..ebc2751 --- /dev/null +++ b/llvm/test/Transforms/LICM/pr38513.ll @@ -0,0 +1,27 @@ +; RUN: opt -enable-mssa-loop-dependency=false -disable-basicaa -alias-set-saturation-threshold=2 -licm -S < %s | FileCheck %s +; REQUIRES: asserts + +; CHECK-LABEL: @f1() +define void @f1() { + %lc1.10 = alloca [3 x i16] + br label %bb1 + +bb1: ; preds = %bb6, %0 + store i16 undef, i16* undef + br label %bb2 + +bb2: ; preds = %bb8, %bb1 + %_tmp18.fca.0.gep = getelementptr inbounds [3 x i16], [3 x i16]* %lc1.10, i32 0, i32 0 + %_tmp18.fca.0.load = load i16, i16* %_tmp18.fca.0.gep + %_tmp18.fca.1.gep = getelementptr inbounds [3 x i16], [3 x i16]* %lc1.10, i32 0, i32 1 + %_tmp18.fca.1.load = load i16, i16* %_tmp18.fca.1.gep + %_tmp18.fca.2.gep = getelementptr inbounds [3 x i16], [3 x i16]* %lc1.10, i32 0, i32 2 + %_tmp18.fca.2.load = load i16, i16* %_tmp18.fca.2.gep + br label %bb8 + +bb8: ; preds = %bb2 + br i1 undef, label %bb2, label %bb6 + +bb6: ; preds = %bb8 + br label %bb1 +} |