Copying the individual fields from the device when compiling/linking
will lead to an unnecessarily large number of fields getting passed
around.
Signed-off-by: Aaron Watry <awa...@gmail.com>
Cc: Jan Vesey <jan.ves...@rutgers.edu>
---
src/gallium/state_trackers/clover/core/program.cpp | 9 +++------
.../state_trackers/clover/llvm/invocation.cpp | 22 ++++++++++------------
.../state_trackers/clover/llvm/invocation.hpp | 7 ++-----
3 files changed, 15 insertions(+), 23 deletions(-)
diff --git a/src/gallium/state_trackers/clover/core/program.cpp
b/src/gallium/state_trackers/clover/core/program.cpp
index f0f0f38548..4e74fccd97 100644
--- a/src/gallium/state_trackers/clover/core/program.cpp
+++ b/src/gallium/state_trackers/clover/core/program.cpp
@@ -53,9 +53,8 @@ program::compile(const ref_vector<device> &devs, const
std::string &opts,
try {
const module m = (dev.ir_format() == PIPE_SHADER_IR_TGSI ?
tgsi::compile_program(_source, log) :
- llvm::compile_program(_source, headers,
- dev.ir_target(), opts,
- dev.device_clc_version(),
log));
+ llvm::compile_program(_source, headers, dev,
+ opts, log));
_builds[&dev] = { m, opts, log };
} catch (...) {
_builds[&dev] = { module(), opts, log };
@@ -79,9 +78,7 @@ program::link(const ref_vector<device> &devs, const
std::string &opts,
try {
const module m = (dev.ir_format() == PIPE_SHADER_IR_TGSI ?
tgsi::link_program(ms) :
- llvm::link_program(ms, dev.ir_format(),
- dev.ir_target(), opts,
- dev.device_clc_version(), log));
+ llvm::link_program(ms, dev, opts, log));
_builds[&dev] = { m, opts, log };
} catch (...) {
_builds[&dev] = { module(), opts, log };
diff --git a/src/gallium/state_trackers/clover/llvm/invocation.cpp
b/src/gallium/state_trackers/clover/llvm/invocation.cpp
index ca75596b05..e761ca188d 100644
--- a/src/gallium/state_trackers/clover/llvm/invocation.cpp
+++ b/src/gallium/state_trackers/clover/llvm/invocation.cpp
@@ -261,17 +261,16 @@ namespace {
module
clover::llvm::compile_program(const std::string &source,
const header_map &headers,
- const std::string &target,
+ const device &dev,
const std::string &opts,
- const std::string &device_version,
std::string &r_log) {
if (has_flag(debug::clc))
debug::log(".cl", "// Options: " + opts + '\n' + source);
auto ctx = create_context(r_log);
- auto c = create_compiler_instance(target, tokenize(opts + " input.cl"),
- device_version, r_log);
- auto mod = compile(*ctx, *c, "input.cl", source, headers, target, opts,
+ auto c = create_compiler_instance(dev.ir_target(), tokenize(opts + "
input.cl"),
+ dev.device_clc_version(), r_log);
+ auto mod = compile(*ctx, *c, "input.cl", source, headers, dev.ir_target(),
opts,
r_log);
if (has_flag(debug::llvm))
@@ -330,16 +329,15 @@ namespace {
module
clover::llvm::link_program(const std::vector<module> &modules,
- enum pipe_shader_ir ir, const std::string &target,
+ const device &dev,
const std::string &opts,
- const std::string &device_version,
std::string &r_log) {
std::vector<std::string> options = tokenize(opts + " input.cl");
const bool create_library = count("-create-library", options);
erase_if(equals("-create-library"), options);
auto ctx = create_context(r_log);
- auto c = create_compiler_instance(target, options, device_version, r_log);
+ auto c = create_compiler_instance(dev.ir_target(), options,
dev.device_clc_version(), r_log);
auto mod = link(*ctx, *c, modules, r_log);
optimize(*mod, c->getCodeGenOpts().OptimizationLevel, !create_library);
@@ -354,14 +352,14 @@ clover::llvm::link_program(const std::vector<module>
&modules,
if (create_library) {
return build_module_library(*mod, module::section::text_library);
- } else if (ir == PIPE_SHADER_IR_LLVM) {
+ } else if (dev.ir_format() == PIPE_SHADER_IR_LLVM) {
return build_module_bitcode(*mod, *c);
- } else if (ir == PIPE_SHADER_IR_NATIVE) {
+ } else if (dev.ir_format() == PIPE_SHADER_IR_NATIVE) {
if (has_flag(debug::native))
- debug::log(id + ".asm", print_module_native(*mod, target));
+ debug::log(id + ".asm", print_module_native(*mod, dev.ir_target()));
- return build_module_native(*mod, target, *c, r_log);
+ return build_module_native(*mod, dev.ir_target(), *c, r_log);
} else {
unreachable("Unsupported IR.");
diff --git a/src/gallium/state_trackers/clover/llvm/invocation.hpp
b/src/gallium/state_trackers/clover/llvm/invocation.hpp
index 959ef755b1..ff9caa457c 100644
--- a/src/gallium/state_trackers/clover/llvm/invocation.hpp
+++ b/src/gallium/state_trackers/clover/llvm/invocation.hpp
@@ -32,16 +32,13 @@ namespace clover {
namespace llvm {
module compile_program(const std::string &source,
const header_map &headers,
- const std::string &target,
+ const device &device,
const std::string &opts,
- const std::string &device_version,
std::string &r_log);
module link_program(const std::vector<module> &modules,
- enum pipe_shader_ir ir,
- const std::string &target,
+ const device &device,
const std::string &opts,
- const std::string &device_version,
std::string &r_log);
}
}
--
2.11.0
_______________________________________________
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev
