We'll need to be able to detect device version to define the appropriate
__OPENCL_VERSION__ header.
v2: Rebase after removing the previous patch (Pierre)
- Removed "clover: Add device_clc_version to llvm::create_compiler_instance"
Signed-off-by: Aaron Watry <awa...@gmail.com>
Cc: Pierre Moreau <pierre.mor...@free.fr>
---
src/gallium/state_trackers/clover/llvm/invocation.cpp | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/src/gallium/state_trackers/clover/llvm/invocation.cpp
b/src/gallium/state_trackers/clover/llvm/invocation.cpp
index 42aabfb9a3..1924c0317f 100644
--- a/src/gallium/state_trackers/clover/llvm/invocation.cpp
+++ b/src/gallium/state_trackers/clover/llvm/invocation.cpp
@@ -146,7 +146,7 @@ namespace {
std::unique_ptr<Module>
compile(LLVMContext &ctx, clang::CompilerInstance &c,
const std::string &name, const std::string &source,
- const header_map &headers, const std::string &target,
+ const header_map &headers, const device &dev,
const std::string &opts, std::string &r_log) {
c.getFrontendOpts().ProgramAction = clang::frontend::EmitLLVMOnly;
c.getHeaderSearchOpts().UseBuiltinIncludes = true;
@@ -190,7 +190,7 @@ namespace {
// barrier() (e.g. Moving barrier() inside a conditional that is
// no executed by all threads) during its optimizaton passes.
compat::add_link_bitcode_file(c.getCodeGenOpts(),
- LIBCLC_LIBEXECDIR + target + ".bc");
+ LIBCLC_LIBEXECDIR + dev.ir_target() +
".bc");
// Compile the code
clang::EmitLLVMOnlyAction act(&ctx);
@@ -212,8 +212,7 @@ clover::llvm::compile_program(const std::string &source,
auto ctx = create_context(r_log);
auto c = create_compiler_instance(dev, tokenize(opts + " input.cl"), r_log);
- auto mod = compile(*ctx, *c, "input.cl", source, headers, dev.ir_target(),
- opts, r_log);
+ auto mod = compile(*ctx, *c, "input.cl", source, headers, dev, opts, r_log);
if (has_flag(debug::llvm))
debug::log(".ll", print_module_bitcode(*mod));
--
2.14.1
_______________________________________________
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev
