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

clover/api: Rework the validation of devices for building 

Reviewed-by: Francisco Jerez <currojerez@riseup.net>
This commit is contained in:
Pierre Moreau 2018-01-27 18:11:17 +01:00 committed by Karol Herbst
parent 505ec3a530
commit 25d4e65eb7
2 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -41,7 +41,7 @@ namespace {
throw error(CL_INVALID_OPERATION); throw error(CL_INVALID_OPERATION);
if (any_of([&](const device &dev) { if (any_of([&](const device &dev) {
return !count(dev, prog.context().devices()); return !count(dev, prog.devices());
}, objs<allow_empty_tag>(d_devs, num_devs))) }, objs<allow_empty_tag>(d_devs, num_devs)))
throw error(CL_INVALID_DEVICE); throw error(CL_INVALID_DEVICE);
} }
@ -176,8 +176,8 @@ clBuildProgram(cl_program d_prog, cl_uint num_devs,
void (*pfn_notify)(cl_program, void *), void (*pfn_notify)(cl_program, void *),
void *user_data) try { void *user_data) try {
auto &prog = obj(d_prog); auto &prog = obj(d_prog);
auto devs = (d_devs ? objs(d_devs, num_devs) : auto devs =
ref_vector<device>(prog.context().devices())); (d_devs ? objs(d_devs, num_devs) : ref_vector<device>(prog.devices()));
const auto opts = std::string(p_opts ? p_opts : "") + " " + const auto opts = std::string(p_opts ? p_opts : "") + " " +
debug_get_option("CLOVER_EXTRA_BUILD_OPTIONS", ""); debug_get_option("CLOVER_EXTRA_BUILD_OPTIONS", "");
@ -202,8 +202,8 @@ clCompileProgram(cl_program d_prog, cl_uint num_devs,
void (*pfn_notify)(cl_program, void *), void (*pfn_notify)(cl_program, void *),
void *user_data) try { void *user_data) try {
auto &prog = obj(d_prog); auto &prog = obj(d_prog);
auto devs = (d_devs ? objs(d_devs, num_devs) : auto devs =
ref_vector<device>(prog.context().devices())); (d_devs ? objs(d_devs, num_devs) : ref_vector<device>(prog.devices()));
const auto opts = std::string(p_opts ? p_opts : "") + " " + const auto opts = std::string(p_opts ? p_opts : "") + " " +
debug_get_option("CLOVER_EXTRA_COMPILE_OPTIONS", ""); debug_get_option("CLOVER_EXTRA_COMPILE_OPTIONS", "");
header_map headers; header_map headers;
@ -279,10 +279,10 @@ clLinkProgram(cl_context d_ctx, cl_uint num_devs, const cl_device_id *d_devs,
const auto opts = std::string(p_opts ? p_opts : "") + " " + const auto opts = std::string(p_opts ? p_opts : "") + " " +
debug_get_option("CLOVER_EXTRA_LINK_OPTIONS", ""); debug_get_option("CLOVER_EXTRA_LINK_OPTIONS", "");
auto progs = objs(d_progs, num_progs); auto progs = objs(d_progs, num_progs);
auto prog = create<program>(ctx); auto all_devs =
auto devs = validate_link_devices(progs, (d_devs ? objs(d_devs, num_devs) : ref_vector<device>(ctx.devices()));
(d_devs ? objs(d_devs, num_devs) : auto prog = create<program>(ctx, all_devs);
ref_vector<device>(ctx.devices()))); auto devs = validate_link_devices(progs, all_devs);
validate_build_common(prog, num_devs, d_devs, pfn_notify, user_data); validate_build_common(prog, num_devs, d_devs, pfn_notify, user_data);

3
src/gallium/state_trackers/clover/core/program.cpp
View File

@ -26,7 +26,8 @@
using namespace clover; using namespace clover;
program::program(clover::context &ctx, const std::string &source) : program::program(clover::context &ctx, const std::string &source) :
has_source(true), context(ctx), _source(source), _kernel_ref_counter(0) { has_source(true), context(ctx), _devices(ctx.devices()), _source(source),
_kernel_ref_counter(0) {
} }
program::program(clover::context &ctx, program::program(clover::context &ctx,