diff options
author | Francisco Jerez <[email protected]> | 2016-05-17 16:02:41 +0200 |
---|---|---|
committer | Francisco Jerez <[email protected]> | 2016-07-11 20:21:30 -0700 |
commit | 714b167f5705a5eec29b2b83dac0d61c5d5746f2 (patch) | |
tree | f446c86153d376ea0dd68e6c9dfe5b2af3815500 /src/gallium/state_trackers | |
parent | fa94055d534b2c2237cfb775066b5a4835dd0849 (diff) |
clover/llvm: Factor out LLVM context init.
So it can be shared between the compilation and linking codepaths.
Reviewed-by: Serge Martin <[email protected]>
Tested-by: Jan Vesely <[email protected]>
Diffstat (limited to 'src/gallium/state_trackers')
-rw-r--r-- | src/gallium/state_trackers/clover/llvm/invocation.cpp | 83 |
1 files changed, 43 insertions, 40 deletions
diff --git a/src/gallium/state_trackers/clover/llvm/invocation.cpp b/src/gallium/state_trackers/clover/llvm/invocation.cpp index 004014308d9..9c102d2428f 100644 --- a/src/gallium/state_trackers/clover/llvm/invocation.cpp +++ b/src/gallium/state_trackers/clover/llvm/invocation.cpp @@ -77,6 +77,7 @@ using namespace clover; using namespace clover::llvm; using ::llvm::Function; +using ::llvm::LLVMContext; using ::llvm::Module; using ::llvm::raw_string_ostream; @@ -118,6 +119,40 @@ namespace { std::string triple; }; + void + init_targets() { + static bool targets_initialized = false; + if (!targets_initialized) { + LLVMInitializeAllTargets(); + LLVMInitializeAllTargetInfos(); + LLVMInitializeAllTargetMCs(); + LLVMInitializeAllAsmPrinters(); + targets_initialized = true; + } + } + + void + diagnostic_handler(const llvm::DiagnosticInfo &di, void *data) { + if (di.getSeverity() == llvm::DS_Error) { + std::string message = *(std::string*)data; + llvm::raw_string_ostream stream(message); + llvm::DiagnosticPrinterRawOStream dp(stream); + di.print(dp); + stream.flush(); + *(std::string*)data = message; + + throw compile_error(); + } + } + + std::unique_ptr<LLVMContext> + create_context(std::string &r_log) { + init_targets(); + std::unique_ptr<LLVMContext> ctx { new LLVMContext }; + ctx->setDiagnosticHandler(diagnostic_handler, &r_log); + return ctx; + } + std::unique_ptr<clang::CompilerInstance> create_compiler_instance(const target &target, const std::vector<std::string> &opts, @@ -161,12 +196,12 @@ namespace { } llvm::Module * - compile_llvm(clang::CompilerInstance &c, - llvm::LLVMContext &llvm_ctx, const std::string &source, - const header_map &headers, const std::string &name, - const std::string &target, const std::string &opts, - std::string &r_log) { - clang::EmitLLVMOnlyAction act(&llvm_ctx); + compile_llvm(LLVMContext &ctx, clang::CompilerInstance &c, + const std::string &source, const header_map &headers, + const std::string &name, const std::string &target, + const std::string &opts, std::string &r_log) { + clang::EmitLLVMOnlyAction act(&ctx); + c.getFrontendOpts().ProgramAction = clang::frontend::EmitLLVMOnly; c.getHeaderSearchOpts().UseBuiltinIncludes = true; c.getHeaderSearchOpts().UseStandardSystemIncludes = true; @@ -723,32 +758,6 @@ namespace { return m; } - void - diagnostic_handler(const llvm::DiagnosticInfo &di, void *data) { - if (di.getSeverity() == llvm::DS_Error) { - std::string message = *(std::string*)data; - llvm::raw_string_ostream stream(message); - llvm::DiagnosticPrinterRawOStream dp(stream); - di.print(dp); - stream.flush(); - *(std::string*)data = message; - - throw compile_error(); - } - } - - void - init_targets() { - static bool targets_initialized = false; - if (!targets_initialized) { - LLVMInitializeAllTargets(); - LLVMInitializeAllTargetInfos(); - LLVMInitializeAllTargetMCs(); - LLVMInitializeAllAsmPrinters(); - targets_initialized = true; - } - } - #define DBG_CLC (1 << 0) #define DBG_LLVM (1 << 1) #define DBG_ASM (1 << 2) @@ -777,21 +786,15 @@ clover::compile_program_llvm(const std::string &source, const std::string &target, const std::string &opts, std::string &r_log) { - - init_targets(); - - ::llvm::LLVMContext llvm_ctx; - - llvm_ctx.setDiagnosticHandler(diagnostic_handler, &r_log); - if (get_debug_flags() & DBG_CLC) debug_log("// Build options: " + opts + '\n' + source, ".cl"); + auto ctx = create_context(r_log); // The input file name must have the .cl extension in order for the // CompilerInvocation class to recognize it as an OpenCL source file. const auto c = create_compiler_instance(target, tokenize(opts + " input.cl"), r_log); - Module *mod = compile_llvm(*c, llvm_ctx, source, headers, "input.cl", + Module *mod = compile_llvm(*ctx, *c, source, headers, "input.cl", target, opts, r_log); optimize(mod, c->getCodeGenOpts().OptimizationLevel); |