Skip to content
Merged
Changes from all commits
Commits
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
15 changes: 7 additions & 8 deletions sycl/source/device_selector.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -237,6 +237,12 @@ aspect_selector(const std::vector<aspect> &RequireList,
return [=](const sycl::device &Dev) {
auto DevHas = [&](const aspect &Asp) -> bool { return Dev.has(Asp); };

// SYCL 2020 4.6.1.1. Device selector:
// If no aspects are passed in, the generated selector behaves like
// default_selector_v.
if (RequireList.empty() && DenyList.empty())
return default_selector_v(Dev);

// All aspects from require list are required.
if (!std::all_of(RequireList.begin(), RequireList.end(), DevHas))
return detail::REJECT_DEVICE_SCORE;
Expand All @@ -245,14 +251,7 @@ aspect_selector(const std::vector<aspect> &RequireList,
if (std::any_of(DenyList.begin(), DenyList.end(), DevHas))
return detail::REJECT_DEVICE_SCORE;

if (RequireList.size() > 0) {
return 1000 + detail::getDevicePreference(Dev);
} else {
// No required aspects specified.
// SYCL 2020 4.6.1.1 "If no aspects are passed in, the generated selector
// behaves like default_selector."
return default_selector_v(Dev);
}
return 1000 + detail::getDevicePreference(Dev);
};
}

Expand Down