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

Rewrite ExtractGV, removing a bunch of stuff that didn't fully work,

Browse Source 
and was over-complicated, and replacing it with a simple implementation.


git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@112120 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Dan Gohman 2010-08-26 00:22:55 +00:00
parent 2ac124c561
commit b4e3cda118
3 changed files with 32 additions and 130 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
include/llvm/Transforms/IPO.h
View File

@ -93,8 +93,7 @@ ModulePass *createGlobalDCEPass();
/// possible, except for the global values specified.
///
ModulePass *createGVExtractionPass(std::vector<GlobalValue*>& GVs, bool
deleteFn = false,
bool relinkCallees = false);
deleteFn = false);
//===----------------------------------------------------------------------===//
/// createFunctionInliningPass - Return a new pass object that uses a heuristic

153
lib/Transforms/IPO/ExtractGV.cpp
View File

@ -17,15 +17,15 @@
#include "llvm/Pass.h"
#include "llvm/Constants.h"
#include "llvm/Transforms/IPO.h"
#include "llvm/ADT/SetVector.h"
#include <algorithm>
using namespace llvm;
namespace {
/// @brief A pass to extract specific functions and their dependencies.
class GVExtractorPass : public ModulePass {
std::vector<GlobalValue*> Named;
SetVector<GlobalValue *> Named;
bool deleteStuff;
bool reLink;
public:
static char ID; // Pass identification, replacement for typeid
@ -33,135 +33,42 @@ namespace {
/// specified function. Otherwise, it deletes as much of the module as
/// possible, except for the function specified.
///
explicit GVExtractorPass(std::vector<GlobalValue*>& GVs, bool deleteS = true,
bool relinkCallees = false)
: ModulePass(ID), Named(GVs), deleteStuff(deleteS),
reLink(relinkCallees) {}
explicit GVExtractorPass(std::vector<GlobalValue*>& GVs, bool deleteS = true)
: ModulePass(ID), Named(GVs.begin(), GVs.end()), deleteStuff(deleteS) {}
bool runOnModule(Module &M) {
if (Named.size() == 0) {
return false; // Nothing to extract
}
if (deleteStuff)
return deleteGV();
M.setModuleInlineAsm("");
return isolateGV(M);
}
// Visit the global inline asm.
if (!deleteStuff)
M.setModuleInlineAsm("");
bool deleteGV() {
for (std::vector<GlobalValue*>::iterator GI = Named.begin(),
GE = Named.end(); GI != GE; ++GI) {
if (Function* NamedFunc = dyn_cast<Function>(*GI)) {
// If we're in relinking mode, set linkage of all internal callees to
// external. This will allow us extract function, and then - link
// everything together
if (reLink) {
for (Function::iterator B = NamedFunc->begin(), BE = NamedFunc->end();
B != BE; ++B) {
for (BasicBlock::iterator I = B->begin(), E = B->end();
I != E; ++I) {
if (CallInst* callInst = dyn_cast<CallInst>(&*I)) {
Function* Callee = callInst->getCalledFunction();
if (Callee && Callee->hasLocalLinkage())
Callee->setLinkage(GlobalValue::ExternalLinkage);
}
}
}
}
NamedFunc->setLinkage(GlobalValue::ExternalLinkage);
NamedFunc->deleteBody();
assert(NamedFunc->isDeclaration() && "This didn't make the function external!");
} else {
if (!(*GI)->isDeclaration()) {
cast<GlobalVariable>(*GI)->setInitializer(0); //clear the initializer
(*GI)->setLinkage(GlobalValue::ExternalLinkage);
}
}
}
return true;
}
// For simplicity, just give all GlobalValues ExternalLinkage. A trickier
// implementation could figure out which GlobalValues are actually
// referenced by the Named set, and which GlobalValues in the rest of
// the module are referenced by the NamedSet, and get away with leaving
// more internal and private things internal and private. But for now,
// be conservative and simple.
bool isolateGV(Module &M) {
// Mark all globals internal
// FIXME: what should we do with private linkage?
for (Module::global_iterator I = M.global_begin(), E = M.global_end(); I != E; ++I)
// Visit the GlobalVariables.
for (Module::global_iterator I = M.global_begin(), E = M.global_end();
I != E; ++I)
if (!I->isDeclaration()) {
I->setLinkage(GlobalValue::InternalLinkage);
if (I->hasLocalLinkage())
I->setVisibility(GlobalValue::HiddenVisibility);
I->setLinkage(GlobalValue::ExternalLinkage);
if (deleteStuff == Named.count(I))
I->setInitializer(0);
}
// Visit the Functions.
for (Module::iterator I = M.begin(), E = M.end(); I != E; ++I)
if (!I->isDeclaration()) {
I->setLinkage(GlobalValue::InternalLinkage);
if (I->hasLocalLinkage())
I->setVisibility(GlobalValue::HiddenVisibility);
I->setLinkage(GlobalValue::ExternalLinkage);
if (deleteStuff == Named.count(I))
I->deleteBody();
}
// Make sure our result is globally accessible...
// by putting them in the used array
{
std::vector<Constant *> AUGs;
const Type *SBP=
Type::getInt8PtrTy(M.getContext());
for (std::vector<GlobalValue*>::iterator GI = Named.begin(),
GE = Named.end(); GI != GE; ++GI) {
(*GI)->setLinkage(GlobalValue::ExternalLinkage);
AUGs.push_back(ConstantExpr::getBitCast(*GI, SBP));
}
ArrayType *AT = ArrayType::get(SBP, AUGs.size());
Constant *Init = ConstantArray::get(AT, AUGs);
GlobalValue *gv = new GlobalVariable(M, AT, false,
GlobalValue::AppendingLinkage,
Init, "llvm.used");
gv->setSection("llvm.metadata");
}
// All of the functions may be used by global variables or the named
// globals. Loop through them and create a new, external functions that
// can be "used", instead of ones with bodies.
std::vector<Function*> NewFunctions;
Function *Last = --M.end(); // Figure out where the last real fn is.
for (Module::iterator I = M.begin(); ; ++I) {
if (std::find(Named.begin(), Named.end(), &*I) == Named.end()) {
Function *New = Function::Create(I->getFunctionType(),
GlobalValue::ExternalLinkage);
New->copyAttributesFrom(I);
// If it's not the named function, delete the body of the function
I->dropAllReferences();
M.getFunctionList().push_back(New);
NewFunctions.push_back(New);
New->takeName(I);
}
if (&*I == Last) break; // Stop after processing the last function
}
// Now that we have replacements all set up, loop through the module,
// deleting the old functions, replacing them with the newly created
// functions.
if (!NewFunctions.empty()) {
unsigned FuncNum = 0;
Module::iterator I = M.begin();
do {
if (std::find(Named.begin(), Named.end(), &*I) == Named.end()) {
// Make everything that uses the old function use the new dummy fn
I->replaceAllUsesWith(NewFunctions[FuncNum++]);
Function *Old = I;
++I; // Move the iterator to the new function
// Delete the old function!
M.getFunctionList().erase(Old);
} else {
++I; // Skip the function we are extracting
}
} while (&*I != NewFunctions[0]);
}
return true;
}
};
@ -170,6 +77,6 @@ namespace {
}
ModulePass *llvm::createGVExtractionPass(std::vector<GlobalValue*>& GVs,
bool deleteFn, bool relinkCallees) {
return new GVExtractorPass(GVs, deleteFn, relinkCallees);
bool deleteFn) {
return new GVExtractorPass(GVs, deleteFn);
}

6
tools/llvm-extract/llvm-extract.cpp
View File

@ -44,10 +44,6 @@ Force("f", cl::desc("Enable binary output on terminals"));
static cl::opt<bool>
DeleteFn("delete", cl::desc("Delete specified Globals from Module"));
static cl::opt<bool>
Relink("relink",
cl::desc("Turn external linkage for callees of function to delete"));
// ExtractFuncs - The functions to extract from the module...
static cl::list<std::string>
ExtractFuncs("func", cl::desc("Specify function to extract"),
@ -122,7 +118,7 @@ int main(int argc, char **argv) {
PassManager Passes;
Passes.add(new TargetData(M.get())); // Use correct TargetData
Passes.add(createGVExtractionPass(GVs, DeleteFn, Relink));
Passes.add(createGVExtractionPass(GVs, DeleteFn));
if (!DeleteFn)
Passes.add(createGlobalDCEPass()); // Delete unreachable globals
Passes.add(createStripDeadDebugInfoPass()); // Remove dead debug info