Skip to content

Support more image_channel_types in image_accessors read/write API for half4 datatype on host device. #1502

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 8 commits into from
Apr 22, 2020
Merged

Support more image_channel_types in image_accessors read/write API for half4 datatype on host device. #1502

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
33f405f
[SYCL] Support more image_channel_types in image_accessors read/write…
garimagu Apr 9, 2020
f743679
[SYCL] Clean up of image_accessor_readwrite test.
garimagu Apr 10, 2020
027d674
Use of git-clang-format
garimagu Apr 11, 2020
1ad6104
small change
garimagu Apr 11, 2020
280dbc6
[SYCL]Correction of lit test case.
garimagu Apr 13, 2020
0184595
[SYCL] Addition of comments.
garimagu Apr 14, 2020
69b3a1f
Added test support for CUDA. The test passes since it doesn't support
garimagu Apr 15, 2020
7d48115
XFAIL to UNSUPPORTED.
garimagu Apr 15, 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: 33 additions & 7 deletions sycl/include/CL/sycl/detail/image_accessor_util.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -423,12 +423,26 @@ template <typename ChannelType>
void convertReadData(const vec<ChannelType, 4> PixelData,
const image_channel_type ImageChannelType,
vec<cl_half, 4> &RetData) {

vec<cl_float, 4> RetDataFloat;
switch (ImageChannelType) {
case image_channel_type::snorm_int8:
// max(-1.0f, (half)c / 127.0f)
RetDataFloat = (PixelData.template convert<cl_float>()) / 127.0f;
RetDataFloat = cl::sycl::fmax(RetDataFloat, -1);
break;
case image_channel_type::snorm_int16:
// max(-1.0f, (half)c / 32767.0f)
RetDataFloat = (PixelData.template convert<cl_float>()) / 32767.0f;
RetDataFloat = cl::sycl::fmax(RetDataFloat, -1);
break;
case image_channel_type::unorm_int8:
// (half)c / 255.0f
RetDataFloat = (PixelData.template convert<cl_float>()) / 255.0f;
break;
case image_channel_type::unorm_int16:
// (half)c / 65535.0f
RetDataFloat = (PixelData.template convert<cl_float>()) / 65535.0f;
break;
case image_channel_type::unorm_short_565:
case image_channel_type::unorm_short_555:
case image_channel_type::unorm_int_101010:
Expand All @@ -452,7 +466,7 @@ void convertReadData(const vec<ChannelType, 4> PixelData,
PI_INVALID_VALUE);
case image_channel_type::fp16:
RetData = PixelData.template convert<cl_half>();
break;
return;
case image_channel_type::fp32:
throw cl::sycl::invalid_parameter_error(
"Datatype to read - cl_half4 is incompatible with the "
Expand All @@ -461,6 +475,7 @@ void convertReadData(const vec<ChannelType, 4> PixelData,
default:
break;
}
RetData = RetDataFloat.template convert<cl_half>();
}

// Converts data to write into appropriate datatype based on the channel of the
Expand Down Expand Up @@ -629,12 +644,20 @@ template <typename ChannelType>
vec<ChannelType, 4>
convertWriteData(const vec<cl_half, 4> WriteData,
const image_channel_type ImageChannelType) {

vec<cl_float, 4> WriteDataFloat = WriteData.convert<cl_float>();
switch (ImageChannelType) {
case image_channel_type::snorm_int8:
// convert_char_sat_rte(h * 127.0f)
return processFloatDataToPixel<ChannelType>(WriteDataFloat, 127.0f);
case image_channel_type::snorm_int16:
// convert_short_sat_rte(h * 32767.0f)
return processFloatDataToPixel<ChannelType>(WriteDataFloat, 32767.0f);
case image_channel_type::unorm_int8:
// convert_uchar_sat_rte(h * 255.0f)
return processFloatDataToPixel<ChannelType>(WriteDataFloat, 255.0f);
case image_channel_type::unorm_int16:
// convert_ushort_sat_rte(h * 65535.0f)
return processFloatDataToPixel<ChannelType>(WriteDataFloat, 65535.0f);
case image_channel_type::unorm_short_565:
case image_channel_type::unorm_short_555:
case image_channel_type::unorm_int_101010:
Expand Down Expand Up @@ -994,10 +1017,13 @@ DataT ReadPixelDataLinearFiltMode(const cl_int8 CoordValues,
// ImgChannelType.
// Convert to DataT as per conversion rules in section 8.3 in OpenCL Spec.
//
// TODO:
// Extend support for Step2 and Step3 for Linear Filtering Mode.
// Extend support to find out of bounds Coordinates and return appropriate
// value based on Addressing Mode.
// TODO: Add additional check for half datatype read.
// Based on OpenCL spec 2.0:
// "The read_imageh calls that take integer coordinates must use a sampler with
// filter mode set to CLK_FILTER_NEAREST, normalized coordinates set to
// CLK_NORMALIZED_COORDS_FALSE and addressing mode set to
// CLK_ADDRESS_CLAMP_TO_EDGE, CLK_ADDRESS_CLAMP or CLK_ADDRESS_NONE; otherwise
// the values returned are undefined."

template <typename CoordT, typename DataT>
DataT imageReadSamplerHostImpl(const CoordT &Coords, const sampler &Smpl,
Expand Down
Loading