Skip to content

[SYCL] Fix race that occurs when using sampler in parallel #2267

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
Aug 13, 2020
Merged

[SYCL] Fix race that occurs when using sampler in parallel #2267

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fc88261
[SYCL] Fix race that occurs when using sampler in parallel
alexanderfle Aug 4, 2020
9dd0a9a
[SYCL] Minor improvement
alexanderfle Aug 6, 2020
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
40 changes: 23 additions & 17 deletions sycl/source/detail/sampler_impl.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,45 +16,50 @@ namespace detail {
sampler_impl::sampler_impl(coordinate_normalization_mode normalizationMode,
addressing_mode addressingMode,
filtering_mode filteringMode)
: m_CoordNormMode(normalizationMode), m_AddrMode(addressingMode),
m_FiltMode(filteringMode) {}
: MCoordNormMode(normalizationMode), MAddrMode(addressingMode),
MFiltMode(filteringMode) {}

sampler_impl::sampler_impl(cl_sampler clSampler, const context &syclContext) {

RT::PiSampler Sampler = pi::cast<RT::PiSampler>(clSampler);
m_contextToSampler[syclContext] = Sampler;
MContextToSampler[syclContext] = Sampler;
const detail::plugin &Plugin = getSyclObjImpl(syclContext)->getPlugin();
Plugin.call<PiApiKind::piSamplerRetain>(Sampler);
Plugin.call<PiApiKind::piSamplerGetInfo>(
Sampler, PI_SAMPLER_INFO_NORMALIZED_COORDS, sizeof(pi_bool),
&m_CoordNormMode, nullptr);
&MCoordNormMode, nullptr);
Plugin.call<PiApiKind::piSamplerGetInfo>(
Sampler, PI_SAMPLER_INFO_ADDRESSING_MODE,
sizeof(pi_sampler_addressing_mode), &m_AddrMode, nullptr);
sizeof(pi_sampler_addressing_mode), &MAddrMode, nullptr);
Plugin.call<PiApiKind::piSamplerGetInfo>(Sampler, PI_SAMPLER_INFO_FILTER_MODE,
sizeof(pi_sampler_filter_mode),
&m_FiltMode, nullptr);
&MFiltMode, nullptr);
}

sampler_impl::~sampler_impl() {
for (auto &Iter : m_contextToSampler) {
std::lock_guard<mutex_class> Lock(MMutex);
for (auto &Iter : MContextToSampler) {
// TODO catch an exception and add it to the list of asynchronous exceptions
const detail::plugin &Plugin = getSyclObjImpl(Iter.first)->getPlugin();
Plugin.call<PiApiKind::piSamplerRelease>(Iter.second);
}
}

RT::PiSampler sampler_impl::getOrCreateSampler(const context &Context) {
if (m_contextToSampler[Context])
return m_contextToSampler[Context];
{
std::lock_guard<mutex_class> Lock(MMutex);
auto It = MContextToSampler.find(Context);
if (It != MContextToSampler.end())
return It->second;
}

const pi_sampler_properties sprops[] = {
PI_SAMPLER_INFO_NORMALIZED_COORDS,
static_cast<pi_sampler_properties>(m_CoordNormMode),
static_cast<pi_sampler_properties>(MCoordNormMode),
PI_SAMPLER_INFO_ADDRESSING_MODE,
static_cast<pi_sampler_properties>(m_AddrMode),
static_cast<pi_sampler_properties>(MAddrMode),
PI_SAMPLER_INFO_FILTER_MODE,
static_cast<pi_sampler_properties>(m_FiltMode),
static_cast<pi_sampler_properties>(MFiltMode),
0};

RT::PiResult errcode_ret = PI_SUCCESS;
Expand All @@ -69,18 +74,19 @@ RT::PiSampler sampler_impl::getOrCreateSampler(const context &Context) {
errcode_ret);

Plugin.checkPiResult(errcode_ret);
m_contextToSampler[Context] = resultSampler;
std::lock_guard<mutex_class> Lock(MMutex);
MContextToSampler[Context] = resultSampler;

return m_contextToSampler[Context];
return resultSampler;
}

addressing_mode sampler_impl::get_addressing_mode() const { return m_AddrMode; }
addressing_mode sampler_impl::get_addressing_mode() const { return MAddrMode; }

filtering_mode sampler_impl::get_filtering_mode() const { return m_FiltMode; }
filtering_mode sampler_impl::get_filtering_mode() const { return MFiltMode; }

coordinate_normalization_mode
sampler_impl::get_coordinate_normalization_mode() const {
return m_CoordNormMode;
return MCoordNormMode;
}

} // namespace detail
Expand Down
18 changes: 10 additions & 8 deletions sycl/source/detail/sampler_impl.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,14 +23,6 @@ enum class coordinate_normalization_mode : unsigned int;

namespace detail {
class __SYCL_EXPORT sampler_impl {
public:
std::unordered_map<context, RT::PiSampler> m_contextToSampler;

private:
coordinate_normalization_mode m_CoordNormMode;
addressing_mode m_AddrMode;
filtering_mode m_FiltMode;

public:
sampler_impl(coordinate_normalization_mode normalizationMode,
addressing_mode addressingMode, filtering_mode filteringMode);
Expand All @@ -46,6 +38,16 @@ class __SYCL_EXPORT sampler_impl {
RT::PiSampler getOrCreateSampler(const context &Context);

~sampler_impl();

private:
/// Protects all the fields that can be changed by class' methods.
mutex_class MMutex;

std::unordered_map<context, RT::PiSampler> MContextToSampler;

coordinate_normalization_mode MCoordNormMode;
addressing_mode MAddrMode;
filtering_mode MFiltMode;
};

} // namespace detail
Expand Down