Convert to long long correction

Signed-off-by: Aleksander Fadeev <[email protected]>

Author: fadeeval

sycl/include/CL/sycl/types.hpp

@@ -323,8 +323,10 @@ using Rtn = detail::bool_constant<Mode == rounding_mode::rtn>;
   template <typename T, typename R, rounding_mode roundingMode, typename OpenCLT, typename OpenCLR>                \
   detail::enable_if_t<                                                         \
       !std::is_same<T, R>::value && is_sint_to_sint<T, R>::value &&            \
-          std::is_same<OpenCLR, DestType>::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<OpenCLT, OpenCLR>::value,                               \
       R>                                                                       \
   convertImpl(T Value) {                                                       \
     OpenCLT OpValue = cl::sycl::detail::convertDataToType<T, OpenCLT>(Value);  \
@@ -429,7 +431,9 @@ __SYCL_GENERATE_CONVERT_IMPL_FOR_ROUNDING_MODE(rtn, Rtn)
                                      RoundingModeCondition)                    \
   template <typename T, typename R, rounding_mode roundingMode, typename OpenCLT, typename OpenCLR>                \
   detail::enable_if_t<is_float_to_int<T, R>::value &&                          \
-                          std::is_same<OpenCLR, DestType>::value &&                  \
+          (std::is_same<OpenCLR, DestType>::value ||                          \
+          std::is_same<OpenCLR, signed char>::value &&                        \
+          std::is_same<DestType, char>::value) &&                               \
                           RoundingModeCondition<roundingMode>::value,          \
                       R>                                                       \
   convertImpl(T Value) {                                                       \

sycl/test/basic_tests/vec_convert_half.cpp

@@ -10,10 +10,67 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "vec_convert.hpp"
+#include <CL/sycl.hpp>
+
+#include <cassert>
 
 // TODO make the convertion on CPU and HOST identical
 
+using namespace cl::sycl;
+
+template <typename T, typename convertT, int roundingMode>
+class kernel_name;
+
+template <int N>
+struct helper;
+
+template <>
+struct helper<0> {
+  template <typename T, int NumElements>
+  static void compare(const vec<T, NumElements> &x,
+                      const vec<T, NumElements> &y) {
+    const T xs = x.template swizzle<0>();
+    const T ys = y.template swizzle<0>();
+    assert(xs == ys);
+  }
+};
+
+template <int N>
+struct helper {
+  template <typename T, int NumElements>
+  static void compare(const vec<T, NumElements> &x,
+                      const vec<T, NumElements> &y) {
+    const T xs = x.template swizzle<N>();
+    const T ys = y.template swizzle<N>();
+    helper<N - 1>::compare(x, y);
+    assert(xs == ys);
+  }
+};
+
+template <typename T, typename convertT, int NumElements,
+          rounding_mode roundingMode>
+void test(const vec<T, NumElements> &ToConvert,
+          const vec<convertT, NumElements> &Expected) {
+  vec<convertT, NumElements> Converted{0};
+  {
+    buffer<vec<convertT, NumElements>, 1> Buffer{&Converted, range<1>{1}};
+    queue Queue;
+
+    cl::sycl::device D = Queue.get_device();
+    if (!D.has_extension("cl_khr_fp16"))
+      exit(0);
+
+    Queue.submit([&](handler &CGH) {
+      accessor<vec<convertT, NumElements>, 1, access::mode::write> Accessor(
+          Buffer, CGH);
+        CGH.single_task<class kernel_name<T, convertT, static_cast<int>(roundingMode)>>([=]() {
+          Accessor[0] = ToConvert.template convert<convertT, roundingMode>();
+        });
+    });
+  }
+  helper<NumElements - 1>::compare(Converted, Expected);
+}
+
 int main() {
   //automatic
   test<double, half, 4, rounding_mode::automatic>(