Skip to content

[SYCL] Fix one more warning coming from SYCL headers #1758

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 5 commits into from
May 27, 2020
Merged

[SYCL] Fix one more warning coming from SYCL headers #1758

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
6203573
RUN fix and parentheses fix
fadeeval May 25, 2020
75ca18b
[SYCL] vec_convert_warnings add
fadeeval May 25, 2020
c9bb0f9
fix RUN for warnings and vec_convert_warnings
fadeeval May 26, 2020
4ceafd0
vec_warnings.cpp and warnings.cpp merge
fadeeval May 26, 2020
e84fd20
Formatting
fadeeval May 26, 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
16 changes: 8 additions & 8 deletions sycl/include/CL/sycl/types.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -330,8 +330,8 @@ convertImpl(T Value) {
detail::enable_if_t<is_sint_to_sint<T, R>::value && \
!std::is_same<OpenCLT, OpenCLR>::value && \
(std::is_same<OpenCLR, DestType>::value || \
std::is_same<OpenCLR, signed char>::value && \
std::is_same<DestType, char>::value), \
(std::is_same<OpenCLR, signed char>::value && \
std::is_same<DestType, char>::value)), \
R> \
convertImpl(T Value) { \
OpenCLT OpValue = cl::sycl::detail::convertDataToType<T, OpenCLT>(Value); \
Expand Down Expand Up @@ -382,8 +382,8 @@ convertImpl(T Value) {
typename OpenCLT, typename OpenCLR> \
detail::enable_if_t<is_sint_to_float<T, R>::value && \
(std::is_same<OpenCLR, DestType>::value || \
std::is_same<OpenCLR, _Float16>::value && \
std::is_same<DestType, half>::value), \
(std::is_same<OpenCLR, _Float16>::value && \
std::is_same<DestType, half>::value)), \
R> \
convertImpl(T Value) { \
OpenCLT OpValue = cl::sycl::detail::convertDataToType<T, OpenCLT>(Value); \
Expand All @@ -402,8 +402,8 @@ __SYCL_GENERATE_CONVERT_IMPL(SToF, double)
typename OpenCLT, typename OpenCLR> \
detail::enable_if_t<is_uint_to_float<T, R>::value && \
(std::is_same<OpenCLR, DestType>::value || \
std::is_same<OpenCLR, _Float16>::value && \
std::is_same<DestType, half>::value), \
(std::is_same<OpenCLR, _Float16>::value && \
std::is_same<DestType, half>::value)), \
R> \
convertImpl(T Value) { \
OpenCLT OpValue = cl::sycl::detail::convertDataToType<T, OpenCLT>(Value); \
Expand All @@ -424,8 +424,8 @@ __SYCL_GENERATE_CONVERT_IMPL(UToF, double)
detail::enable_if_t<is_float_to_float<T, R>::value && \
!std::is_same<OpenCLT, OpenCLR>::value && \
(std::is_same<OpenCLR, DestType>::value || \
std::is_same<OpenCLR, _Float16>::value && \
std::is_same<DestType, half>::value) && \
(std::is_same<OpenCLR, _Float16>::value && \
std::is_same<DestType, half>::value)) && \
RoundingModeCondition<roundingMode>::value, \
R> \
convertImpl(T Value) { \
Expand Down
21 changes: 9 additions & 12 deletions sycl/test/warnings/warnings.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,20 +1,17 @@
// RUN: %clangxx -fsycl --no-system-header-prefix=CL/ -Wall -Wextra -Wno-ignored-attributes -Wno-deprecated-declarations -Wpessimizing-move -Wunused-variable -Wmismatched-tags -Wunneeded-internal-declaration -Werror -Wno-unknown-cuda-version %s -o %t.out
// RUN: %clangxx -fsycl --no-system-header-prefix=CL/sycl -fsyntax-only -Wall -Wextra -Wno-ignored-attributes -Wno-deprecated-declarations -Wpessimizing-move -Wunused-variable -Wmismatched-tags -Wunneeded-internal-declaration -Werror -Wno-unknown-cuda-version %s -o %t.out

#include <CL/sycl.hpp>

using namespace cl::sycl;

int main(void) {
// add a very simple kernel to see if compilation succeeds with -Werror
int data1[10] = {-1, -1, -1, -1, -1, -1, -1, -1, -1, -1};
buffer<int, 1> B(data1, range<1>(10), {property::buffer::use_host_ptr()});
queue Q;
Q.submit([&](handler &CGH) {
auto Accessor = B.get_access<access::mode::read_write>(CGH);
CGH.parallel_for<class TheSimpleKernel>(range<1>{10}, [=](id<1> Item) {
Accessor[Item] = 0;
int main() {
vec<long, 4> newVec;
queue myQueue;
buffer<vec<long, 4>, 1> resultBuf{&newVec, range<1>{1}};
myQueue.submit([&](handler &cgh) {
auto writeResult = resultBuf.get_access<access::mode::write>(cgh);
cgh.single_task<class kernel_name>([=]() {
writeResult[0] = (vec<int, 4>{1, 2, 3, 4}).template convert<long>();
});
});
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Are there any cases that were covered with old test and not covered by the new test?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think no, there was just a simple program that launches the check of warnings.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

But maybe we should ask the code owner.


return 0;
}