KonstantinSeurer
/
mesa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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>
This commit is contained in:
Francisco Jerez 2016-06-05 19:12:22 -07:00
parent f29ed2da24
commit e300696304
1 changed files with 31 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
src/gallium/state_trackers/clover/api/program.cpp
View File

@ -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);