clover/llvm: Implement library bitcode codegen.

Reviewed-by: Serge Martin <edb+mesa@sigluy.net>
Tested-by: Jan Vesely <jan.vesely@rutgers.edu>

diff --git a/src/gallium/state_trackers/clover/llvm/codegen.hpp b/src/gallium/state_trackers/clover/llvm/codegen.hpp
index c4d4997dfed3eff7353546b368ba373c3131b9dc..e0e990190d28026ebd9107641a96d082d6c08d1e 100644 (file)
--- a/src/gallium/state_trackers/clover/llvm/codegen.hpp
+++ b/src/gallium/state_trackers/clover/llvm/codegen.hpp
@@ -45,6 +45,13 @@ namespace clover {
       std::string
       print_module_bitcode(const ::llvm::Module &mod);
 
+      module
+      build_module_library(const ::llvm::Module &mod);
+
+      std::unique_ptr<::llvm::Module>
+      parse_module_library(const module &m, ::llvm::LLVMContext &ctx,
+                           std::string &r_log);
+
       module
       build_module_native(::llvm::Module &mod, const target &target,
                           const clang::CompilerInstance &c,

diff --git a/src/gallium/state_trackers/clover/llvm/codegen/bitcode.cpp b/src/gallium/state_trackers/clover/llvm/codegen/bitcode.cpp
index d2baa07fdf968a9d0f48ce07173d12ef0f4477b0..658cce923c97639687bc4ea3a46d99a07d15f5ad 100644 (file)
--- a/src/gallium/state_trackers/clover/llvm/codegen/bitcode.cpp
+++ b/src/gallium/state_trackers/clover/llvm/codegen/bitcode.cpp
@@ -24,7 +24,11 @@
 ///
 /// \file
 /// Trivial codegen back-end that simply passes through the existing LLVM IR
-/// and formats it so it can be consumed by pipe drivers.
+/// and either formats it so it can be consumed by pipe drivers (if
+/// build_module_bitcode() is used) or serializes so it can be deserialized at
+/// a later point and passed to the actual codegen back-end (if
+/// build_module_library() / parse_module_library() is used), potentially
+/// after linking against other bitcode object files.
 ///
 
 #include "llvm/codegen.hpp"
@@ -74,3 +78,22 @@ clover::llvm::print_module_bitcode(const ::llvm::Module &mod) {
    mod.print(os, NULL);
    return os.str();
 }
+
+module
+clover::llvm::build_module_library(const ::llvm::Module &mod) {
+   module m;
+   const auto code = emit_code(mod);
+   m.secs.emplace_back(0, module::section::text, code.size(), code);
+   return m;
+}
+
+std::unique_ptr<::llvm::Module>
+clover::llvm::parse_module_library(const module &m, ::llvm::LLVMContext &ctx,
+                                   std::string &r_log) {
+   auto mod = ::llvm::parseBitcodeFile(::llvm::MemoryBufferRef(
+                                        as_string(m.secs[0].data), " "), ctx);
+   if (!mod)
+      fail(r_log, error(CL_INVALID_PROGRAM), mod.getError().message());
+
+   return std::unique_ptr<::llvm::Module>(std::move(*mod));
+}