Commit 77dfa84a authored by Wang Nan's avatar Wang Nan Committed by Arnaldo Carvalho de Melo

perf clang: Use real file system for #include

Utilize clang's OverlayFileSystem facility, allow CompilerInstance to
access real file system.

With this patch the '#include' directive can be used.

Add a new getModuleFromSource for real file.
Signed-off-by: default avatarWang Nan <wangnan0@huawei.com>
Cc: Alexei Starovoitov <ast@fb.com>
Cc: He Kuang <hekuang@huawei.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Joe Stringer <joe@ovn.org>
Cc: Zefan Li <lizefan@huawei.com>
Cc: pi3orama@163.com
Link: http://lkml.kernel.org/r/20161126070354.141764-12-wangnan0@huawei.comSigned-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent 00b86691
...@@ -15,6 +15,7 @@ ...@@ -15,6 +15,7 @@
#include "clang/Tooling/Tooling.h" #include "clang/Tooling/Tooling.h"
#include "llvm/IR/Module.h" #include "llvm/IR/Module.h"
#include "llvm/Option/Option.h" #include "llvm/Option/Option.h"
#include "llvm/Support/FileSystem.h"
#include "llvm/Support/ManagedStatic.h" #include "llvm/Support/ManagedStatic.h"
#include <memory> #include <memory>
...@@ -27,14 +28,6 @@ static std::unique_ptr<llvm::LLVMContext> LLVMCtx; ...@@ -27,14 +28,6 @@ static std::unique_ptr<llvm::LLVMContext> LLVMCtx;
using namespace clang; using namespace clang;
static vfs::InMemoryFileSystem *
buildVFS(StringRef& Name, StringRef& Content)
{
vfs::InMemoryFileSystem *VFS = new vfs::InMemoryFileSystem(true);
VFS->addFile(Twine(Name), 0, llvm::MemoryBuffer::getMemBuffer(Content));
return VFS;
}
static CompilerInvocation * static CompilerInvocation *
createCompilerInvocation(StringRef& Path, DiagnosticsEngine& Diags) createCompilerInvocation(StringRef& Path, DiagnosticsEngine& Diags)
{ {
...@@ -60,17 +53,17 @@ createCompilerInvocation(StringRef& Path, DiagnosticsEngine& Diags) ...@@ -60,17 +53,17 @@ createCompilerInvocation(StringRef& Path, DiagnosticsEngine& Diags)
return CI; return CI;
} }
std::unique_ptr<llvm::Module> static std::unique_ptr<llvm::Module>
getModuleFromSource(StringRef Name, StringRef Content) getModuleFromSource(StringRef Path,
IntrusiveRefCntPtr<vfs::FileSystem> VFS)
{ {
CompilerInstance Clang; CompilerInstance Clang;
Clang.createDiagnostics(); Clang.createDiagnostics();
IntrusiveRefCntPtr<vfs::FileSystem> VFS = buildVFS(Name, Content);
Clang.setVirtualFileSystem(&*VFS); Clang.setVirtualFileSystem(&*VFS);
IntrusiveRefCntPtr<CompilerInvocation> CI = IntrusiveRefCntPtr<CompilerInvocation> CI =
createCompilerInvocation(Name, Clang.getDiagnostics()); createCompilerInvocation(Path, Clang.getDiagnostics());
Clang.setInvocation(&*CI); Clang.setInvocation(&*CI);
std::unique_ptr<CodeGenAction> Act(new EmitLLVMOnlyAction(&*LLVMCtx)); std::unique_ptr<CodeGenAction> Act(new EmitLLVMOnlyAction(&*LLVMCtx));
...@@ -80,6 +73,33 @@ getModuleFromSource(StringRef Name, StringRef Content) ...@@ -80,6 +73,33 @@ getModuleFromSource(StringRef Name, StringRef Content)
return Act->takeModule(); return Act->takeModule();
} }
std::unique_ptr<llvm::Module>
getModuleFromSource(StringRef Name, StringRef Content)
{
using namespace vfs;
llvm::IntrusiveRefCntPtr<OverlayFileSystem> OverlayFS(
new OverlayFileSystem(getRealFileSystem()));
llvm::IntrusiveRefCntPtr<InMemoryFileSystem> MemFS(
new InMemoryFileSystem(true));
/*
* pushOverlay helps setting working dir for MemFS. Must call
* before addFile.
*/
OverlayFS->pushOverlay(MemFS);
MemFS->addFile(Twine(Name), 0, llvm::MemoryBuffer::getMemBuffer(Content));
return getModuleFromSource(Name, OverlayFS);
}
std::unique_ptr<llvm::Module>
getModuleFromSource(StringRef Path)
{
IntrusiveRefCntPtr<vfs::FileSystem> VFS(vfs::getRealFileSystem());
return getModuleFromSource(Path, VFS);
}
} }
extern "C" { extern "C" {
......
...@@ -12,5 +12,8 @@ using namespace llvm; ...@@ -12,5 +12,8 @@ using namespace llvm;
std::unique_ptr<Module> std::unique_ptr<Module>
getModuleFromSource(StringRef Name, StringRef Content); getModuleFromSource(StringRef Name, StringRef Content);
std::unique_ptr<Module>
getModuleFromSource(StringRef Path);
} }
#endif #endif
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment