6502/llvm-6502
1
0
Fork 0
mirror of https://github.com/c64scene-ar/llvm-6502.git synced 2025-06-15 05:24:01 +00:00
Code Issues Projects Releases Wiki Activity

fix bug 20513 - Crash in SLP Vectorizer

Browse Source 
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@214638 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Erik Eckstein
2014-08-02 19:39:42 +00:00
parent 14d596a382
commit 8624519c0c
2 changed files with 61 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
lib/Transforms/Vectorize/SLPVectorizer.cpp
View File

@ -806,7 +806,7 @@ private:
/// Performs the "real" scheduling. Done before vectorization is actually
/// performed in a basic block.
void scheduleBlock(BasicBlock *BB);
void scheduleBlock(BlockScheduling *BS);
/// List of users to ignore during scheduling and that don't need extracting.
ArrayRef<Value *> UserIgnoreList;
@ -1741,8 +1741,6 @@ Value *BoUpSLP::vectorizeTree(TreeEntry *E) {
setInsertPointAfterBundle(E->Scalars);
return Gather(E->Scalars, VecTy);
}
BasicBlock *BB = VL0->getParent();
scheduleBlock(BB);
unsigned Opcode = getSameOpcode(E->Scalars);
@ -2076,6 +2074,12 @@ Value *BoUpSLP::vectorizeTree(TreeEntry *E) {
}
Value *BoUpSLP::vectorizeTree() {
// All blocks must be scheduled before any instructions are inserted.
for (auto &BSIter : BlocksSchedules) {
scheduleBlock(BSIter.second.get());
}
Builder.SetInsertPoint(F->getEntryBlock().begin());
vectorizeTree(&VectorizableTree[0]);
@ -2548,12 +2552,12 @@ void BoUpSLP::BlockScheduling::resetSchedule() {
ReadyInsts.clear();
}
void BoUpSLP::scheduleBlock(BasicBlock *BB) {
DEBUG(dbgs() << "SLP: schedule block " << BB->getName() << "\n");
BlockScheduling *BS = BlocksSchedules[BB].get();
if (!BS || !BS->ScheduleStart)
void BoUpSLP::scheduleBlock(BlockScheduling *BS) {
if (!BS->ScheduleStart)
return;
DEBUG(dbgs() << "SLP: schedule block " << BS->BB->getName() << "\n");
BS->resetSchedule();
@ -2598,8 +2602,8 @@ void BoUpSLP::scheduleBlock(BasicBlock *BB) {
while (BundleMember) {
Instruction *pickedInst = BundleMember->Inst;
if (LastScheduledInst->getNextNode() != pickedInst) {
BB->getInstList().remove(pickedInst);
BB->getInstList().insert(LastScheduledInst, pickedInst);
BS->BB->getInstList().remove(pickedInst);
BS->BB->getInstList().insert(LastScheduledInst, pickedInst);
}
LastScheduledInst = pickedInst;
BundleMember = BundleMember->NextInBundle;