summaryrefslogtreecommitdiffstats
path: root/src/gallium/state_trackers
diff options
context:
space:
mode:
authorFrancisco Jerez <currojerez@riseup.net>2016-06-05 19:12:22 -0700
committerFrancisco Jerez <currojerez@riseup.net>2016-07-11 20:34:35 -0700
commite30069630407e49008aaa160acb4c5684532b2c2 (patch)
tree444bdd28760050cb0066767296411566b58e34f5 /src/gallium/state_trackers
parentf29ed2da2423c8be8a6745f4e98ee16cd699533e (diff)
clover/api: Implement clLinkProgram per-device binary presence validation rule.
Reviewed-by: Serge Martin <edb+mesa@sigluy.net> Tested-by: Jan Vesely <jan.vesely@rutgers.edu>
Diffstat (limited to 'src/gallium/state_trackers')
-rw-r--r--src/gallium/state_trackers/clover/api/program.cpp33
1 files changed, 31 insertions, 2 deletions
diff --git a/src/gallium/state_trackers/clover/api/program.cpp b/src/gallium/state_trackers/clover/api/program.cpp
index 0303c1e9e6e..c3f9cb97f5b 100644
--- a/src/gallium/state_trackers/clover/api/program.cpp
+++ b/src/gallium/state_trackers/clover/api/program.cpp
@@ -237,17 +237,46 @@ clCompileProgram(cl_program d_prog, cl_uint num_devs,
return e.get();
}
+namespace {
+ ref_vector<device>
+ validate_link_devices(const ref_vector<program> &progs,
+ const ref_vector<device> &all_devs) {
+ std::vector<device *> devs;
+
+ for (auto &dev : all_devs) {
+ const auto has_binary = [&](const program &prog) {
+ return !prog.build(dev).binary.secs.empty();
+ };
+
+ // According to the CL 1.2 spec, when "all programs specified [..]
+ // contain a compiled binary or library for the device [..] a link is
+ // performed",
+ if (all_of(has_binary, progs))
+ devs.push_back(&dev);
+
+ // otherwise if "none of the programs contain a compiled binary or
+ // library for that device [..] no link is performed. All other
+ // cases will return a CL_INVALID_OPERATION error."
+ else if (any_of(has_binary, progs))
+ throw error(CL_INVALID_OPERATION);
+ }
+
+ return map(derefs(), devs);
+ }
+}
+
CLOVER_API cl_program
clLinkProgram(cl_context d_ctx, cl_uint num_devs, const cl_device_id *d_devs,
const char *p_opts, cl_uint num_progs, const cl_program *d_progs,
void (*pfn_notify) (cl_program, void *), void *user_data,
cl_int *r_errcode) try {
auto &ctx = obj(d_ctx);
- auto devs = (d_devs ? objs(d_devs, num_devs) :
- ref_vector<device>(ctx.devices()));
auto opts = (p_opts ? p_opts : "");
auto progs = objs(d_progs, num_progs);
auto prog = create<program>(ctx);
+ auto devs = validate_link_devices(progs,
+ (d_devs ? objs(d_devs, num_devs) :
+ ref_vector<device>(ctx.devices())));
validate_build_common(prog, num_devs, d_devs, pfn_notify, user_data);