diff --git a/sycl/include/sycl/detail/generic_type_traits.hpp b/sycl/include/sycl/detail/generic_type_traits.hpp index 6adad81f47457..40cfdd39d4f80 100644 --- a/sycl/include/sycl/detail/generic_type_traits.hpp +++ b/sycl/include/sycl/detail/generic_type_traits.hpp @@ -128,17 +128,6 @@ using is_intn = is_contained; template using is_genint = is_contained; -template -using is_ulongn = is_contained; - -template -using is_ugenlong = is_contained; - -template -using is_longn = is_contained; - -template using is_genlong = is_contained; - template using is_ulonglongn = is_contained; diff --git a/sycl/test/basic_tests/generic_type_traits.cpp b/sycl/test/basic_tests/generic_type_traits.cpp index 3378fab4769e1..8f88f2e6c6de9 100644 --- a/sycl/test/basic_tests/generic_type_traits.cpp +++ b/sycl/test/basic_tests/generic_type_traits.cpp @@ -99,42 +99,6 @@ int main() { is_genint */ - // is_ulongn - static_assert(d::is_ulongn::value == false, ""); - static_assert(d::is_ulongn::value == false, ""); - static_assert(d::is_ulongn::value == true, ""); - static_assert(d::is_ulongn::value == true, ""); - static_assert(d::is_ulongn::value == true, ""); - static_assert(d::is_ulongn::value == true, ""); - static_assert(d::is_ulongn::value == true, ""); - - // is_ugenlong - static_assert(d::is_ugenlong::value == false, ""); - static_assert(d::is_ugenlong::value == true, ""); - static_assert(d::is_ugenlong::value == true, ""); - static_assert(d::is_ugenlong::value == true, ""); - static_assert(d::is_ugenlong::value == true, ""); - static_assert(d::is_ugenlong::value == true, ""); - static_assert(d::is_ugenlong::value == true, ""); - - // is_longn - static_assert(d::is_longn::value == false, ""); - static_assert(d::is_longn::value == false, ""); - static_assert(d::is_longn::value == true, ""); - static_assert(d::is_longn::value == true, ""); - static_assert(d::is_longn::value == true, ""); - static_assert(d::is_longn::value == true, ""); - static_assert(d::is_longn::value == true, ""); - - // is_genlong - static_assert(d::is_genlong::value == false, ""); - static_assert(d::is_genlong::value == true, ""); - static_assert(d::is_genlong::value == true, ""); - static_assert(d::is_genlong::value == true, ""); - static_assert(d::is_genlong::value == true, ""); - static_assert(d::is_genlong::value == true, ""); - static_assert(d::is_genlong::value == true, ""); - /* is_ulonglongn is_ugenlonglong diff --git a/sycl/test/basic_tests/vectors/vectors.cpp b/sycl/test/basic_tests/vectors/vectors.cpp index 777fa07bb9086..929e77abbab13 100644 --- a/sycl/test/basic_tests/vectors/vectors.cpp +++ b/sycl/test/basic_tests/vectors/vectors.cpp @@ -11,6 +11,8 @@ #define SYCL_SIMPLE_SWIZZLES #include +#include + void check_vectors(sycl::int4 a, sycl::int4 b, sycl::int4 c, sycl::int4 gold) { sycl::int4 result = a * (sycl::int4)b.y() + c; assert((int)result.x() == (int)gold.x()); @@ -100,17 +102,17 @@ int main() { auto asVec = inputVec.template swizzle() .template as>(); - // Check that [u]long[n] type aliases match vec<[unsigned] long, n> types. - assert((std::is_same, sycl::long2>::value)); - assert((std::is_same, sycl::long3>::value)); - assert((std::is_same, sycl::long4>::value)); - assert((std::is_same, sycl::long8>::value)); - assert((std::is_same, sycl::long16>::value)); - assert((std::is_same, sycl::ulong2>::value)); - assert((std::is_same, sycl::ulong3>::value)); - assert((std::is_same, sycl::ulong4>::value)); - assert((std::is_same, sycl::ulong8>::value)); - assert((std::is_same, sycl::ulong16>::value)); + // Check that [u]long[n] type aliases match vec<[u]int64_t, n> types. + assert((std::is_same, sycl::long2>::value)); + assert((std::is_same, sycl::long3>::value)); + assert((std::is_same, sycl::long4>::value)); + assert((std::is_same, sycl::long8>::value)); + assert((std::is_same, sycl::long16>::value)); + assert((std::is_same, sycl::ulong2>::value)); + assert((std::is_same, sycl::ulong3>::value)); + assert((std::is_same, sycl::ulong4>::value)); + assert((std::is_same, sycl::ulong8>::value)); + assert((std::is_same, sycl::ulong16>::value)); // Check convert() from and to various types. check_convert_from();