replica
/
hanchenye-llvm-project
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[Orc][Kaleidoscope] More tutorial cleanup, a little extra debugging output. 

llvm-svn: 230705
This commit is contained in:
Lang Hames 2015-02-26 23:52:42 +00:00
parent aa57c0a2b9
commit bee2099c49
2 changed files with 19 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
llvm/examples/Kaleidoscope/Orc/fully_lazy/toy.cpp
View File

@ -1185,7 +1185,8 @@ public:
return MangledName;
}
void addFunctionDefinition(std::unique_ptr<FunctionAST> FnAST) {
void addFunctionAST(std::unique_ptr<FunctionAST> FnAST) {
std::cerr << "Adding AST: " << FnAST->Proto->Name << "\n";
FunctionDefs[mangle(FnAST->Proto->Name)] = std::move(FnAST);
}
@ -1201,7 +1202,7 @@ public:
// If we don't already have a definition of 'Name' then search
// the ASTs.
return searchUncompiledASTs(Name);
return searchFunctionASTs(Name);
},
[](const std::string &S) { return 0; } );
@ -1231,20 +1232,18 @@ private:
// This method searches the FunctionDefs map for a definition of 'Name'. If it
// finds one it generates a stub for it and returns the address of the stub.
TargetAddress searchUncompiledASTs(const std::string &Name) {
TargetAddress searchFunctionASTs(const std::string &Name) {
auto DefI = FunctionDefs.find(Name);
if (DefI == FunctionDefs.end())
return 0;
// We have AST for 'Name'. IRGen a stub for it and add it to the JIT.
// FIXME: What happens if IRGen fails?
auto H = irGenStub(std::move(DefI->second));
// Remove the function definition's AST now that we're
// finished with it.
// Return the address of the stub.
// Take the FunctionAST out of the map.
auto FnAST = std::move(DefI->second);
FunctionDefs.erase(DefI);
// Return the address of the stub.
// IRGen the AST, add it to the JIT, and return the address for it.
auto H = irGenStub(std::move(FnAST));
return findSymbolIn(H, Name).getAddress();
}
@ -1310,7 +1309,7 @@ private:
static void HandleDefinition(SessionContext &S, KaleidoscopeJIT &J) {
if (auto F = ParseDefinition()) {
S.addPrototypeAST(llvm::make_unique<PrototypeAST>(*F->Proto));
J.addFunctionDefinition(std::move(F));
J.addFunctionAST(std::move(F));
} else {
// Skip token for error recovery.
getNextToken();

21
llvm/examples/Kaleidoscope/Orc/lazy_irgen/toy.cpp
View File

@ -1174,7 +1174,8 @@ public:
return MangledName;
}
void addFunctionDefinition(std::unique_ptr<FunctionAST> FnAST) {
void addFunctionAST(std::unique_ptr<FunctionAST> FnAST) {
std::cerr << "Adding AST: " << FnAST->Proto->Name << "\n";
FunctionDefs[mangle(FnAST->Proto->Name)] = std::move(FnAST);
}
@ -1190,7 +1191,7 @@ public:
// If we don't already have a definition of 'Name' then search
// the ASTs.
return searchUncompiledASTs(Name);
return searchFunctionASTs(Name);
},
[](const std::string &S) { return 0; } );
@ -1216,21 +1217,17 @@ private:
// This method searches the FunctionDefs map for a definition of 'Name'. If it
// finds one it generates a stub for it and returns the address of the stub.
TargetAddress searchUncompiledASTs(const std::string &Name) {
TargetAddress searchFunctionASTs(const std::string &Name) {
auto DefI = FunctionDefs.find(Name);
if (DefI == FunctionDefs.end())
return 0;
// We have AST for 'Name'. IRGen it, add it to the JIT, and
// return the address for it.
// FIXME: What happens if IRGen fails?
auto H = addModule(IRGen(Session, *DefI->second));
// Remove the function definition's AST now that we're
// finished with it.
// Take the FunctionAST out of the map.
auto FnAST = std::move(DefI->second);
FunctionDefs.erase(DefI);
// Return the address of the function.
// IRGen the AST, add it to the JIT, and return the address for it.
auto H = addModule(IRGen(Session, *FnAST));
return findSymbolIn(H, Name).getAddress();
}
@ -1246,7 +1243,7 @@ private:
static void HandleDefinition(SessionContext &S, KaleidoscopeJIT &J) {
if (auto F = ParseDefinition()) {
S.addPrototypeAST(llvm::make_unique<PrototypeAST>(*F->Proto));
J.addFunctionDefinition(std::move(F));
J.addFunctionAST(std::move(F));
} else {
// Skip token for error recovery.
getNextToken();