6502/llvm-6502
1
0
Fork 0
mirror of https://github.com/c64scene-ar/llvm-6502.git synced 2025-02-13 10:32:06 +00:00
Code Issues Projects Releases Wiki Activity

Rework inline pass to use cloning infrastructure to do the dirty work

Browse Source 
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@4766 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Chris Lattner 2002-11-19 21:54:07 +00:00
parent b499419def
commit dcd8040d11
2 changed files with 52 additions and 119 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

150
lib/Transforms/IPO/InlineSimple.cpp
View File

@ -32,27 +32,6 @@
static Statistic<> NumInlined("inline", "Number of functions inlined"); static Statistic<> NumInlined("inline", "Number of functions inlined");
using std::cerr; using std::cerr;
// RemapInstruction - Convert the instruction operands from referencing the
// current values into those specified by ValueMap.
//
static inline void RemapInstruction(Instruction *I,
std::map<const Value *, Value*> &ValueMap) {
for (unsigned op = 0, E = I->getNumOperands(); op != E; ++op) {
const Value *Op = I->getOperand(op);
Value *V = ValueMap[Op];
if (!V && (isa<GlobalValue>(Op) || isa<Constant>(Op)))
continue; // Globals and constants don't get relocated
if (!V) {
cerr << "Val = \n" << Op << "Addr = " << (void*)Op;
cerr << "\nInst = " << I;
}
assert(V && "Referenced value not in value map!");
I->setOperand(op, V);
}
}
// InlineFunction - This function forcibly inlines the called function into the // InlineFunction - This function forcibly inlines the called function into the
// basic block of the caller. This returns false if it is not possible to // basic block of the caller. This returns false if it is not possible to
// inline this call. The program is still in a well defined state if this // inline this call. The program is still in a well defined state if this
@ -92,7 +71,7 @@ bool InlineFunction(CallInst *CI) {
// function. // function.
// //
PHINode *PHI = 0; PHINode *PHI = 0;
if (CalledFunc->getReturnType() != Type::VoidTy) { if (!CI->use_empty()) {
// The PHI node should go at the front of the new basic block to merge all // The PHI node should go at the front of the new basic block to merge all
// possible incoming values. // possible incoming values.
// //
@ -105,102 +84,52 @@ bool InlineFunction(CallInst *CI) {
CI->replaceAllUsesWith(PHI); CI->replaceAllUsesWith(PHI);
} }
// Keep a mapping between the original function's values and the new // Get a pointer to the last basic block in the function, which will have the
// duplicated code's values. This includes all of: Function arguments, // new function inlined after it.
// instruction values, constant pool entries, and basic blocks.
// //
std::map<const Value *, Value*> ValueMap; Function::iterator LastBlock = &OrigBB->getParent()->back();
// Add the function arguments to the mapping: (start counting at 1 to skip the // Calculate the vector of arguments to pass into the function cloner...
// function reference itself) std::vector<Value*> ArgVector;
// for (unsigned i = 1, e = CI->getNumOperands(); i != e; ++i)
Function::const_aiterator PTI = CalledFunc->abegin(); ArgVector.push_back(CI->getOperand(i));
for (unsigned a = 1, E = CI->getNumOperands(); a != E; ++a, ++PTI)
ValueMap[PTI] = CI->getOperand(a);
ValueMap[NewBB] = NewBB; // Returns get converted to reference NewBB
// Loop over all of the basic blocks in the function, inlining them as // Since we are now done with the CallInst, we can delete it.
// appropriate. Keep track of the first basic block of the function... delete CI;
//
for (Function::const_iterator BB = CalledFunc->begin();
BB != CalledFunc->end(); ++BB) {
assert(BB->getTerminator() && "BasicBlock doesn't have terminator!?!?");
// Create a new basic block to copy instructions into!
BasicBlock *IBB = new BasicBlock("", NewBB->getParent());
if (BB->hasName()) IBB->setName(BB->getName()+".i"); // .i = inlined once
ValueMap[BB] = IBB; // Add basic block mapping. // Make a vector to capture the return instructions in the cloned function...
std::vector<ReturnInst*> Returns;
// Make sure to capture the mapping that a return will use... // Do all of the hard part of cloning the callee into the caller...
// TODO: This assumes that the RET is returning a value computed in the same CloneFunctionInto(OrigBB->getParent(), CalledFunc, ArgVector, Returns, ".i");
// basic block as the return was issued from!
// // Loop over all of the return instructions, turning them into unconditional
const TerminatorInst *TI = BB->getTerminator(); // branches to the merge point now...
for (unsigned i = 0, e = Returns.size(); i != e; ++i) {
// Loop over all instructions copying them over... ReturnInst *RI = Returns[i];
Instruction *NewInst; BasicBlock *BB = RI->getParent();
for (BasicBlock::const_iterator II = BB->begin();
II != --BB->end(); ++II) { // Add a branch to the merge point where the PHI node would live...
IBB->getInstList().push_back((NewInst = II->clone())); new BranchInst(NewBB, RI);
ValueMap[II] = NewInst; // Add instruction map to value.
if (II->hasName()) if (PHI) { // The PHI node should include this value!
NewInst->setName(II->getName()+".i"); // .i = inlined once assert(RI->getReturnValue() && "Ret should have value!");
assert(RI->getReturnValue()->getType() == PHI->getType() &&
"Ret value not consistent in function!");
PHI->addIncoming(RI->getReturnValue(), BB);
} }
// Copy over the terminator now... // Delete the return instruction now
switch (TI->getOpcode()) { BB->getInstList().erase(RI);
case Instruction::Ret: {
const ReturnInst *RI = cast<ReturnInst>(TI);
if (PHI) { // The PHI node should include this value!
assert(RI->getReturnValue() && "Ret should have value!");
assert(RI->getReturnValue()->getType() == PHI->getType() &&
"Ret value not consistent in function!");
PHI->addIncoming((Value*)RI->getReturnValue(),
(BasicBlock*)cast<BasicBlock>(&*BB));
}
// Add a branch to the code that was after the original Call.
IBB->getInstList().push_back(new BranchInst(NewBB));
break;
}
case Instruction::Br:
IBB->getInstList().push_back(TI->clone());
break;
default:
cerr << "FunctionInlining: Don't know how to handle terminator: " << TI;
abort();
}
} }
// Check to see if the PHI node only has one argument. This is a common
// Loop over all of the instructions in the function, fixing up operand // case resulting from there only being a single return instruction in the
// references as we go. This uses ValueMap to do all the hard work. // function call. Because this is so common, eliminate the PHI node.
// //
for (Function::const_iterator BB = CalledFunc->begin(); if (PHI && PHI->getNumIncomingValues() == 1) {
BB != CalledFunc->end(); ++BB) { PHI->replaceAllUsesWith(PHI->getIncomingValue(0));
BasicBlock *NBB = (BasicBlock*)ValueMap[BB]; PHI->getParent()->getInstList().erase(PHI);
// Loop over all instructions, fixing each one as we find it...
//
for (BasicBlock::iterator II = NBB->begin(); II != NBB->end(); ++II)
RemapInstruction(II, ValueMap);
}
if (PHI) {
RemapInstruction(PHI, ValueMap); // Fix the PHI node also...
// Check to see if the PHI node only has one argument. This is a common
// case resulting from there only being a single return instruction in the
// function call. Because this is so common, eliminate the PHI node.
//
if (PHI->getNumIncomingValues() == 1) {
PHI->replaceAllUsesWith(PHI->getIncomingValue(0));
PHI->getParent()->getInstList().erase(PHI);
}
} }
// Change the branch that used to go to NewBB to branch to the first basic // Change the branch that used to go to NewBB to branch to the first basic
@ -209,10 +138,7 @@ bool InlineFunction(CallInst *CI) {
TerminatorInst *Br = OrigBB->getTerminator(); TerminatorInst *Br = OrigBB->getTerminator();
assert(Br && Br->getOpcode() == Instruction::Br && assert(Br && Br->getOpcode() == Instruction::Br &&
"splitBasicBlock broken!"); "splitBasicBlock broken!");
Br->setOperand(0, ValueMap[&CalledFunc->front()]); Br->setOperand(0, ++LastBlock);
// Since we are now done with the CallInst, we can finally delete it.
delete CI;
return true; return true;
} }

21
lib/Transforms/Utils/CloneFunction.cpp
View File

@ -4,6 +4,7 @@
// FIXME: document // FIXME: document
#include "llvm/Transforms/Utils/Cloning.h" #include "llvm/Transforms/Utils/Cloning.h"
#include "llvm/iTerminators.h"
#include "llvm/Function.h" #include "llvm/Function.h"
#include <map> #include <map>
@ -35,9 +36,10 @@ static inline void RemapInstruction(Instruction *I,
// ArgMap values. // ArgMap values.
// //
void CloneFunctionInto(Function *NewFunc, const Function *OldFunc, void CloneFunctionInto(Function *NewFunc, const Function *OldFunc,
const std::vector<Value*> &ArgMap) { const std::vector<Value*> &ArgMap,
assert(OldFunc->aempty() || !NewFunc->aempty() && std::vector<ReturnInst*> &Returns,
"Synthesization of arguments is not implemented yet!"); const char *NameSuffix) {
assert(NameSuffix && "NameSuffix cannot be null!");
assert(OldFunc->asize() == ArgMap.size() && assert(OldFunc->asize() == ArgMap.size() &&
"Improper number of argument values to map specified!"); "Improper number of argument values to map specified!");
@ -55,25 +57,30 @@ void CloneFunctionInto(Function *NewFunc, const Function *OldFunc,
// Loop over all of the basic blocks in the function, cloning them as // Loop over all of the basic blocks in the function, cloning them as
// appropriate. // appropriate. Note that we save BE this way in order to handle cloning of
// recursive functions into themselves.
// //
for (Function::const_iterator BI = OldFunc->begin(), BE = OldFunc->end(); for (Function::const_iterator BI = OldFunc->begin(), BE = OldFunc->end();
BI != BE; ++BI) { BI != BE; ++BI) {
const BasicBlock &BB = *BI; const BasicBlock &BB = *BI;
assert(BB.getTerminator() && "BasicBlock doesn't have terminator!?!?");
// Create a new basic block to copy instructions into! // Create a new basic block to copy instructions into!
BasicBlock *CBB = new BasicBlock(BB.getName(), NewFunc); BasicBlock *CBB = new BasicBlock("", NewFunc);
if (BB.hasName()) CBB->setName(BB.getName()+NameSuffix);
ValueMap[&BB] = CBB; // Add basic block mapping. ValueMap[&BB] = CBB; // Add basic block mapping.
// Loop over all instructions copying them over... // Loop over all instructions copying them over...
for (BasicBlock::const_iterator II = BB.begin(), IE = BB.end(); for (BasicBlock::const_iterator II = BB.begin(), IE = BB.end();
II != IE; ++II) { II != IE; ++II) {
Instruction *NewInst = II->clone(); Instruction *NewInst = II->clone();
NewInst->setName(II->getName()); // Name is not cloned... if (II->hasName())
NewInst->setName(II->getName()+NameSuffix); // Name is not cloned...
CBB->getInstList().push_back(NewInst); CBB->getInstList().push_back(NewInst);
ValueMap[II] = NewInst; // Add instruction map to value. ValueMap[II] = NewInst; // Add instruction map to value.
} }
if (ReturnInst *RI = dyn_cast<ReturnInst>(CBB->getTerminator()))
Returns.push_back(RI);
} }
// Loop over all of the instructions in the function, fixing up operand // Loop over all of the instructions in the function, fixing up operand