[PATCH] D39025: [GVNSink] Fix failing GVNSink tests in the reverse iteration bot
Mandeep Singh Grang via Phabricator via llvm-commits
llvm-commits at lists.llvm.org
Mon Oct 23 12:57:45 PDT 2017
This revision was automatically updated to reflect the committed changes.
Closed by commit rL316369: [GVNSink] Fix failing GVNSink tests in the reverse iteration bot (authored by mgrang).
Changed prior to commit:
https://reviews.llvm.org/D39025?vs=119406&id=119926#toc
Repository:
rL LLVM
https://reviews.llvm.org/D39025
Files:
llvm/trunk/lib/Transforms/Scalar/GVNSink.cpp
Index: llvm/trunk/lib/Transforms/Scalar/GVNSink.cpp
===================================================================
--- llvm/trunk/lib/Transforms/Scalar/GVNSink.cpp
+++ llvm/trunk/lib/Transforms/Scalar/GVNSink.cpp
@@ -118,7 +118,7 @@
/// list returned by operator*.
class LockstepReverseIterator {
ArrayRef<BasicBlock *> Blocks;
- SmallPtrSet<BasicBlock *, 4> ActiveBlocks;
+ SmallSetVector<BasicBlock *, 4> ActiveBlocks;
SmallVector<Instruction *, 4> Insts;
bool Fail;
@@ -136,7 +136,7 @@
for (BasicBlock *BB : Blocks) {
if (BB->size() <= 1) {
// Block wasn't big enough - only contained a terminator.
- ActiveBlocks.erase(BB);
+ ActiveBlocks.remove(BB);
continue;
}
Insts.push_back(BB->getTerminator()->getPrevNode());
@@ -147,13 +147,20 @@
bool isValid() const { return !Fail; }
ArrayRef<Instruction *> operator*() const { return Insts; }
- SmallPtrSet<BasicBlock *, 4> &getActiveBlocks() { return ActiveBlocks; }
- void restrictToBlocks(SmallPtrSetImpl<BasicBlock *> &Blocks) {
+ // Note: This needs to return a SmallSetVector as the elements of
+ // ActiveBlocks will be later copied to Blocks using std::copy. The
+ // resultant order of elements in Blocks needs to be deterministic.
+ // Using SmallPtrSet instead causes non-deterministic order while
+ // copying. And we cannot simply sort Blocks as they need to match the
+ // corresponding Values.
+ SmallSetVector<BasicBlock *, 4> &getActiveBlocks() { return ActiveBlocks; }
+
+ void restrictToBlocks(SmallSetVector<BasicBlock *, 4> &Blocks) {
for (auto II = Insts.begin(); II != Insts.end();) {
if (std::find(Blocks.begin(), Blocks.end(), (*II)->getParent()) ==
Blocks.end()) {
- ActiveBlocks.erase((*II)->getParent());
+ ActiveBlocks.remove((*II)->getParent());
II = Insts.erase(II);
} else {
++II;
@@ -167,7 +174,7 @@
SmallVector<Instruction *, 4> NewInsts;
for (auto *Inst : Insts) {
if (Inst == &Inst->getParent()->front())
- ActiveBlocks.erase(Inst->getParent());
+ ActiveBlocks.remove(Inst->getParent());
else
NewInsts.push_back(Inst->getPrevNode());
}
@@ -265,7 +272,7 @@
/// Restrict the PHI's contents down to only \c NewBlocks.
/// \c NewBlocks must be a subset of \c this->Blocks.
- void restrictToBlocks(const SmallPtrSetImpl<BasicBlock *> &NewBlocks) {
+ void restrictToBlocks(const SmallSetVector<BasicBlock *, 4> &NewBlocks) {
auto BI = Blocks.begin();
auto VI = Values.begin();
while (BI != Blocks.end()) {
@@ -658,7 +665,7 @@
SmallVector<Instruction *, 4> NewInsts;
for (auto *I : Insts) {
if (VN.lookup(I) != VNumToSink)
- ActivePreds.erase(I->getParent());
+ ActivePreds.remove(I->getParent());
else
NewInsts.push_back(I);
}
-------------- next part --------------
A non-text attachment was scrubbed...
Name: D39025.119926.patch
Type: text/x-patch
Size: 2878 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20171023/6bcb8c61/attachment.bin>
More information about the llvm-commits
mailing list