Skip to content

[SYCL] Fix bug in sampler implementation #136

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
bader merged 1 commit into from
May 21, 2019
Merged

[SYCL] Fix bug in sampler implementation #136

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 0 additions & 3 deletions sycl/include/CL/sycl/detail/sampler_impl.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,15 +27,12 @@ class sampler_impl {
__spirv::OpTypeSampler *m_Sampler;
sampler_impl(__spirv::OpTypeSampler *Sampler) : m_Sampler(Sampler) {}
#else
cl_sampler m_Sampler = nullptr;
context m_SyclContext;
std::unordered_map<context, cl_sampler> m_contextToSampler;

private:
coordinate_normalization_mode m_CoordNormMode;
addressing_mode m_AddrMode;
filtering_mode m_FiltMode;
bool m_ReleaseSampler;

public:
sampler_impl(coordinate_normalization_mode normalizationMode,
Expand Down
27 changes: 13 additions & 14 deletions sycl/source/detail/sampler_impl.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
//==----------------- sampler_impl.cpp - SYCL standard header file ---------==//
//==----------------- sampler_impl.cpp - SYCL sampler ----------------------==//
//
// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
// See https://llvm.org/LICENSE.txt for license information.
Expand All @@ -17,28 +17,28 @@ sampler_impl::sampler_impl(coordinate_normalization_mode normalizationMode,
addressing_mode addressingMode,
filtering_mode filteringMode)
: m_CoordNormMode(normalizationMode), m_AddrMode(addressingMode),
m_FiltMode(filteringMode), m_ReleaseSampler(false) {}
m_FiltMode(filteringMode) {}

sampler_impl::sampler_impl(cl_sampler clSampler, const context &syclContext)
: m_Sampler(clSampler), m_SyclContext(syclContext), m_ReleaseSampler(true) {
sampler_impl::sampler_impl(cl_sampler clSampler, const context &syclContext) {

m_contextToSampler[syclContext] = m_Sampler;
CHECK_OCL_CODE(clRetainSampler(m_Sampler));
CHECK_OCL_CODE(clGetSamplerInfo(m_Sampler, CL_SAMPLER_NORMALIZED_COORDS,
m_contextToSampler[syclContext] = clSampler;
CHECK_OCL_CODE(clRetainSampler(clSampler));
CHECK_OCL_CODE(clGetSamplerInfo(clSampler, CL_SAMPLER_NORMALIZED_COORDS,
sizeof(cl_bool), &m_CoordNormMode, nullptr));
CHECK_OCL_CODE(clGetSamplerInfo(m_Sampler, CL_SAMPLER_ADDRESSING_MODE,
CHECK_OCL_CODE(clGetSamplerInfo(clSampler, CL_SAMPLER_ADDRESSING_MODE,
sizeof(cl_addressing_mode), &m_AddrMode,
nullptr));
CHECK_OCL_CODE(clGetSamplerInfo(m_Sampler, CL_SAMPLER_FILTER_MODE,
CHECK_OCL_CODE(clGetSamplerInfo(clSampler, CL_SAMPLER_FILTER_MODE,
sizeof(cl_filter_mode), &m_FiltMode,
nullptr));
}

sampler_impl::~sampler_impl() {
if (m_ReleaseSampler)
CHECK_OCL_CODE_NO_EXC(clReleaseSampler(m_Sampler));
// TODO replace CHECK_OCL_CODE_NO_EXC to CHECK_OCL_CODE and
// TODO catch an exception and add it to the list of asynchronous exceptions
for (auto &Iter : m_contextToSampler) {
// TODO replace CHECK_OCL_CODE_NO_EXC to CHECK_OCL_CODE and
// TODO catch an exception and add it to the list of asynchronous exceptions
CHECK_OCL_CODE_NO_EXC(clReleaseSampler(Iter.second));
}
}

cl_sampler sampler_impl::getOrCreateSampler(const context &Context) {
Expand All @@ -64,7 +64,6 @@ cl_sampler sampler_impl::getOrCreateSampler(const context &Context) {
static_cast<cl_filter_mode>(m_FiltMode), &errcode_ret);
#endif
CHECK_OCL_CODE(errcode_ret);
m_ReleaseSampler = true;
return m_contextToSampler[Context];
}

Expand Down