6502/llvm-6502
1
0
Fork 0
mirror of https://github.com/c64scene-ar/llvm-6502.git synced 2024-07-08 18:30:04 +00:00
Code Issues Projects Releases Wiki Activity

[LoopVectorizer] Restructurize code for emitting RT checks. NFCI.

Browse Source 
Place all code corresponding to a run-time check in one place.
Previously we generated some code, then proceeded to a next check, then
finished the code for the first check (like splitting blocks and
generating branches). Now the code for generating a check is
self-contained.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@241741 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Michael Zolotukhin 2015-07-08 21:47:59 +00:00
parent f26da26d05
commit c196e8f18b
1 changed files with 22 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
lib/Transforms/Vectorize/LoopVectorize.cpp
View File

@ -2571,10 +2571,8 @@ void InnerLoopVectorizer::createEmptyLoop() {
LoopBypassBlocks.push_back(BypassBlock);
// Split the single block loop into the two loop structure described above.
BasicBlock *VectorPH =
BypassBlock->splitBasicBlock(BypassBlock->getTerminator(), "vector.ph");
BasicBlock *VecBody =
VectorPH->splitBasicBlock(VectorPH->getTerminator(), "vector.body");
BypassBlock->splitBasicBlock(BypassBlock->getTerminator(), "vector.body");
BasicBlock *MiddleBlock =
VecBody->splitBasicBlock(VecBody->getTerminator(), "middle.block");
BasicBlock *ScalarPH =
@ -2589,7 +2587,6 @@ void InnerLoopVectorizer::createEmptyLoop() {
if (ParentLoop) {
ParentLoop->addChildLoop(Lp);
ParentLoop->addBasicBlockToLoop(ScalarPH, *LI);
ParentLoop->addBasicBlockToLoop(VectorPH, *LI);
ParentLoop->addBasicBlockToLoop(MiddleBlock, *LI);
} else {
LI->addTopLevelLoop(Lp);
@ -2613,7 +2610,6 @@ void InnerLoopVectorizer::createEmptyLoop() {
BypassBlock->getTerminator(), "overflow.checked");
if (ParentLoop)
ParentLoop->addBasicBlockToLoop(CheckBlock, *LI);
LoopBypassBlocks.push_back(CheckBlock);
ReplaceInstWithInst(
BypassBlock->getTerminator(),
BranchInst::Create(ScalarPH, CheckBlock, CheckBCOverflow));
@ -2650,6 +2646,14 @@ void InnerLoopVectorizer::createEmptyLoop() {
// jump to the scalar loop.
Value *Cmp =
BypassBuilder.CreateICmpEQ(IdxEndRoundDown, StartIdx, "cmp.zero");
CheckBlock =
BypassBlock->splitBasicBlock(BypassBlock->getTerminator(), "vector.ph");
if (ParentLoop)
ParentLoop->addBasicBlockToLoop(CheckBlock, *LI);
LoopBypassBlocks.push_back(BypassBlock);
ReplaceInstWithInst(BypassBlock->getTerminator(),
BranchInst::Create(MiddleBlock, CheckBlock, Cmp));
BypassBlock = CheckBlock;
// Generate the code to check that the strides we assumed to be one are really
// one. We want the new basic block to start at the first instruction in a
@ -2661,18 +2665,19 @@ void InnerLoopVectorizer::createEmptyLoop() {
if (StrideCheck) {
AddedSafetyChecks = true;
// Create a new block containing the stride check.
BypassBlock->setName("vector.stridecheck");
BasicBlock *CheckBlock =
BypassBlock->splitBasicBlock(FirstCheckInst, "vector.stridecheck");
BypassBlock->splitBasicBlock(BypassBlock->getTerminator(), "vector.ph");
if (ParentLoop)
ParentLoop->addBasicBlockToLoop(CheckBlock, *LI);
LoopBypassBlocks.push_back(CheckBlock);
LoopBypassBlocks.push_back(BypassBlock);
// Replace the branch into the memory check block with a conditional branch
// for the "few elements case".
ReplaceInstWithInst(BypassBlock->getTerminator(),
BranchInst::Create(MiddleBlock, CheckBlock, Cmp));
ReplaceInstWithInst(
BypassBlock->getTerminator(),
BranchInst::Create(MiddleBlock, CheckBlock, StrideCheck));
Cmp = StrideCheck;
BypassBlock = CheckBlock;
}
@ -2685,23 +2690,22 @@ void InnerLoopVectorizer::createEmptyLoop() {
if (MemRuntimeCheck) {
AddedSafetyChecks = true;
// Create a new block containing the memory check.
BypassBlock->setName("vector.memcheck");
BasicBlock *CheckBlock =
BypassBlock->splitBasicBlock(FirstCheckInst, "vector.memcheck");
BypassBlock->splitBasicBlock(BypassBlock->getTerminator(), "vector.ph");
if (ParentLoop)
ParentLoop->addBasicBlockToLoop(CheckBlock, *LI);
LoopBypassBlocks.push_back(CheckBlock);
LoopBypassBlocks.push_back(BypassBlock);
// Replace the branch into the memory check block with a conditional branch
// for the "few elements case".
ReplaceInstWithInst(BypassBlock->getTerminator(),
BranchInst::Create(MiddleBlock, CheckBlock, Cmp));
ReplaceInstWithInst(
BypassBlock->getTerminator(),
BranchInst::Create(MiddleBlock, CheckBlock, MemRuntimeCheck));
Cmp = MemRuntimeCheck;
BypassBlock = CheckBlock;
}
ReplaceInstWithInst(BypassBlock->getTerminator(),
BranchInst::Create(MiddleBlock, VectorPH, Cmp));
BasicBlock *VectorPH = BypassBlock;
// We are going to resume the execution of the scalar loop.
// Go over all of the induction variables that we found and fix the