Skip to content

Make auto-discovery error message handling more failsafe #110

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Apr 25, 2022
Merged

Make auto-discovery error message handling more failsafe #110

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3d1405c
Fix missing error message when device global name is not unique
pcolberg Apr 22, 2022
9e1c1e6
Make auto-discovery error message handling more failsafe
pcolberg Apr 22, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 10 additions & 3 deletions src/acl_auto_configure.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -198,13 +198,15 @@ bool acl_load_device_def_from_str(const std::string &config_str,
std::string &err_str) noexcept {
acl_assert_locked();

auto result = !config_str.empty();
bool result = !config_str.empty();
err_str.clear();

std::string::size_type curr_pos = 0;
std::stringstream err_ss;
int total_fields = 0;
std::vector<int> counters;

if (!result) {
std::stringstream err_ss;
err_ss << "FAILED to read auto-discovery string at byte " << curr_pos
<< ": Expected non-zero value. Full string value is " << config_str
<< "\n";
Expand All @@ -222,6 +224,7 @@ bool acl_load_device_def_from_str(const std::string &config_str,
static_cast<unsigned>(
ACL_AUTO_CONFIGURE_BACKWARDS_COMPATIBLE_WITH_VERSIONID)) {
result = false;
std::stringstream err_ss;
err_ss << "Error: The accelerator hardware currently programmed is "
"incompatible with this\nversion of the runtime (" ACL_VERSION
" Commit " ACL_GIT_COMMIT ")."
Expand Down Expand Up @@ -557,8 +560,10 @@ bool acl_load_device_def_from_str(const std::string &config_str,
if (!ok) {
// Device global name already exist in map, but it should have been
// unique.
std::stringstream err_ss;
err_ss << "Device global name should be unique. " << device_global_name
<< " is repeated.\n";
err_str = err_ss.str();
result = false;
}

Expand Down Expand Up @@ -651,6 +656,7 @@ bool acl_load_device_def_from_str(const std::string &config_str,
devdef.accel[i].is_workitem_invariant, counters);
if (!devdef.accel[i].is_workgroup_invariant &&
devdef.accel[i].is_workitem_invariant) {
std::stringstream err_ss;
err_ss << "FAILED to read auto-discovery string at byte " << curr_pos
<< ": kernel cannot be workitem-invariant while it is "
"workgroup-variant. "
Expand Down Expand Up @@ -974,7 +980,8 @@ bool acl_load_device_def_from_str(const std::string &config_str,
devdef.accel.clear();
devdef.hal_info.clear();
}
if (!result && err_ss.str().empty()) {
if (!result && err_str.empty()) {
std::stringstream err_ss;
err_ss << "FAILED to read auto-discovery string at byte " << curr_pos
<< ". Full auto-discovery string value is " << config_str << "\n";
err_str = err_ss.str();
Expand Down