6502/llvm-6502
1
0
Fork 0
mirror of https://github.com/c64scene-ar/llvm-6502.git synced 2025-02-20 14:29:27 +00:00
Code Issues Projects Releases Wiki Activity

If there is an empty block between a source and its successor block, it still requires a unconditional branch.

Browse Source 
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@37344 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Evan Cheng 2007-05-29 22:31:16 +00:00
parent ea12a06a81
commit c8ed9badfa
1 changed files with 37 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

67
lib/CodeGen/IfConversion.cpp
View File

@ -339,6 +339,14 @@ void IfConverter::InvalidatePreds(MachineBasicBlock *BB) {
} }
} }
/// InsertUncondBranch - Inserts an unconditional branch from BB to ToBB.
///
static void InsertUncondBranch(MachineBasicBlock *BB, MachineBasicBlock *ToBB,
const TargetInstrInfo *TII) {
std::vector<MachineOperand> NoCond;
TII->InsertBranch(*BB, ToBB, NULL, NoCond);
}
/// IfConvertEarlyExit - If convert a early exit sub-CFG. /// IfConvertEarlyExit - If convert a early exit sub-CFG.
/// ///
bool IfConverter::IfConvertEarlyExit(BBInfo &BBI) { bool IfConverter::IfConvertEarlyExit(BBInfo &BBI) {
@ -369,10 +377,8 @@ bool IfConverter::IfConvertEarlyExit(BBInfo &BBI) {
// unconditional one. // unconditional one.
BBI.NonPredSize -= TII->RemoveBranch(*BBI.BB); BBI.NonPredSize -= TII->RemoveBranch(*BBI.BB);
MergeBlocks(BBI, *CvtBBI); MergeBlocks(BBI, *CvtBBI);
if (!isNextBlock(BBI.BB, NextBBI->BB)) { if (!isNextBlock(BBI.BB, NextBBI->BB))
std::vector<MachineOperand> NoCond; InsertUncondBranch(BBI.BB, NextBBI->BB, TII);
TII->InsertBranch(*BBI.BB, NextBBI->BB, NULL, NoCond);
}
std::copy(NewCond.begin(), NewCond.end(), std::back_inserter(BBI.Predicate)); std::copy(NewCond.begin(), NewCond.end(), std::back_inserter(BBI.Predicate));
// Update block info. BB can be iteratively if-converted. // Update block info. BB can be iteratively if-converted.
@ -430,8 +436,8 @@ bool IfConverter::IfConvertTriangle(BBInfo &BBI) {
bool IfConverter::IfConvertDiamond(BBInfo &BBI) { bool IfConverter::IfConvertDiamond(BBInfo &BBI) {
BBI.Kind = ICNotClassfied; BBI.Kind = ICNotClassfied;
bool TrueNeedCBr; bool TrueNeedBr;
bool FalseNeedCBr; bool FalseNeedBr;
BBInfo &TrueBBI = BBAnalysis[BBI.TrueBB->getNumber()]; BBInfo &TrueBBI = BBAnalysis[BBI.TrueBB->getNumber()];
BBInfo &FalseBBI = BBAnalysis[BBI.FalseBB->getNumber()]; BBInfo &FalseBBI = BBAnalysis[BBI.FalseBB->getNumber()];
FeasibilityAnalysis(TrueBBI, BBI.BrCond); FeasibilityAnalysis(TrueBBI, BBI.BrCond);
@ -444,14 +450,14 @@ bool IfConverter::IfConvertDiamond(BBInfo &BBI) {
if (Proceed) { if (Proceed) {
// Check the 'true' and 'false' blocks if either isn't ended with a branch. // Check the 'true' and 'false' blocks if either isn't ended with a branch.
// Either the block fallthrough to another block or it ends with a // Either the block fallthrough to another block or it ends with a
// return. If it's the former, add a conditional branch to its successor. // return. If it's the former, add a branch to its successor.
TrueNeedCBr = !TrueBBI.TrueBB && BBI.TrueBB->succ_size(); TrueNeedBr = !TrueBBI.TrueBB && BBI.TrueBB->succ_size();
FalseNeedCBr = !FalseBBI.TrueBB && BBI.FalseBB->succ_size(); FalseNeedBr = !FalseBBI.TrueBB && BBI.FalseBB->succ_size();
if (TrueNeedCBr && TrueBBI.ModifyPredicate) { if (TrueNeedBr && TrueBBI.ModifyPredicate) {
TrueBBI.isPredicable = false; TrueBBI.isPredicable = false;
Proceed = false; Proceed = false;
} }
if (FalseNeedCBr && FalseBBI.ModifyPredicate) { if (FalseNeedBr && FalseBBI.ModifyPredicate) {
FalseBBI.isPredicable = false; FalseBBI.isPredicable = false;
Proceed = false; Proceed = false;
} }
@ -502,32 +508,35 @@ bool IfConverter::IfConvertDiamond(BBInfo &BBI) {
TrueBBI.NonPredSize -= TII->RemoveBranch(*BBI.TrueBB); TrueBBI.NonPredSize -= TII->RemoveBranch(*BBI.TrueBB);
PredicateBlock(TrueBBI, BBI.BrCond); PredicateBlock(TrueBBI, BBI.BrCond);
// Add a conditional branch to 'true' successor if needed.
if (TrueNeedCBr && TrueBBI.ModifyPredicate &&
isNextBlock(BBI.TrueBB, *BBI.TrueBB->succ_begin()))
TrueNeedCBr = false;
if (TrueNeedCBr)
TII->InsertBranch(*BBI.TrueBB, *BBI.TrueBB->succ_begin(), NULL, BBI.BrCond);
// Predicate the 'false' block. // Predicate the 'false' block.
PredicateBlock(FalseBBI, RevCond, true); PredicateBlock(FalseBBI, RevCond, true);
// Add a conditional branch to 'false' successor if needed.
if (FalseNeedCBr && !TrueBBI.ModifyPredicate &&
isNextBlock(BBI.FalseBB, *BBI.FalseBB->succ_begin()))
FalseNeedCBr = false;
if (FalseNeedCBr)
TII->InsertBranch(*BBI.FalseBB, *BBI.FalseBB->succ_begin(), NULL,
RevCond);
// Merge the 'true' and 'false' blocks by copying the instructions // Merge the 'true' and 'false' blocks by copying the instructions
// from the 'false' block to the 'true' block. That is, unless the true // from the 'false' block to the 'true' block. That is, unless the true
// block would clobber the predicate, in that case, do the opposite. // block would clobber the predicate, in that case, do the opposite.
BBInfo *CvtBBI; BBInfo *CvtBBI;
if (!TrueBBI.ModifyPredicate) { if (!TrueBBI.ModifyPredicate) {
// Add a conditional branch from 'true' to 'true' successor if needed.
if (TrueNeedBr)
TII->InsertBranch(*BBI.TrueBB, *BBI.TrueBB->succ_begin(), NULL,
BBI.BrCond);
// Add an unconditional branch from 'false' to to 'false' successor if it
// will not be the fallthrough block.
if (FalseNeedBr &&
!isNextBlock(BBI.BB, *BBI.FalseBB->succ_begin()))
InsertUncondBranch(BBI.FalseBB, *BBI.FalseBB->succ_begin(), TII);
MergeBlocks(TrueBBI, FalseBBI); MergeBlocks(TrueBBI, FalseBBI);
CvtBBI = &TrueBBI; CvtBBI = &TrueBBI;
} else { } else {
// Add a conditional branch from 'false' to 'false' successor if needed.
if (FalseNeedBr)
TII->InsertBranch(*BBI.FalseBB, *BBI.FalseBB->succ_begin(), NULL,
RevCond);
// Add an unconditional branch from 'true' to to 'true' successor if it
// will not be the fallthrough block.
if (TrueNeedBr &&
!isNextBlock(BBI.BB, *BBI.TrueBB->succ_begin()))
InsertUncondBranch(BBI.TrueBB, *BBI.TrueBB->succ_begin(), TII);
MergeBlocks(FalseBBI, TrueBBI); MergeBlocks(FalseBBI, TrueBBI);
CvtBBI = &FalseBBI; CvtBBI = &FalseBBI;
} }
@ -543,10 +552,8 @@ bool IfConverter::IfConvertDiamond(BBInfo &BBI) {
MergeBlocks(BBI, *CvtBBI); MergeBlocks(BBI, *CvtBBI);
CvtBBI = &BBI; CvtBBI = &BBI;
OkToIfcvt = false; OkToIfcvt = false;
} else { } else
std::vector<MachineOperand> NoCond; InsertUncondBranch(BBI.BB, CvtBBI->BB, TII);
TII->InsertBranch(*BBI.BB, CvtBBI->BB, NULL, NoCond);
}
// If the if-converted block fallthrough into the tail block, then // If the if-converted block fallthrough into the tail block, then
// fold the tail block in as well. // fold the tail block in as well.